You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2010/10/26 21:48:08 UTC
svn commit: r1027710 - in
/tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider:
AtomBindingInvoker.java AtomReferenceBindingProvider.java
Author: nash
Date: Tue Oct 26 19:48:08 2010
New Revision: 1027710
URL: http://svn.apache.org/viewvc?rev=1027710&view=rev
Log:
TUSCANY-3735: Don't use HTTP authorization or authentication by default (merged 1.x commit r1027705)
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java
Modified: tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java?rev=1027710&r1=1027709&r2=1027710&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java Tue Oct 26 19:48:08 2010
@@ -90,7 +90,9 @@ class AtomBindingInvoker implements Invo
// Send an HTTP GET
GetMethod getMethod = new GetMethod(uri + "/" + id);
- getMethod.setRequestHeader("Authorization", authorizationHeader);
+ if (authorizationHeader != null) {
+ getMethod.setRequestHeader("Authorization", authorizationHeader);
+ }
boolean parsing = false;
try {
httpClient.executeMethod(getMethod);
@@ -167,7 +169,9 @@ class AtomBindingInvoker implements Invo
// Send an HTTP POST
PostMethod postMethod = new PostMethod(uri);
- postMethod.setRequestHeader("Authorization", authorizationHeader);
+ if (authorizationHeader != null) {
+ postMethod.setRequestHeader("Authorization", authorizationHeader);
+ }
boolean parsing = false;
try {
@@ -253,7 +257,9 @@ class AtomBindingInvoker implements Invo
// Send an HTTP PUT
PutMethod putMethod = new PutMethod(uri + "/" + id);
- putMethod.setRequestHeader("Authorization", authorizationHeader);
+ if (authorizationHeader != null) {
+ putMethod.setRequestHeader("Authorization", authorizationHeader);
+ }
try {
@@ -304,7 +310,9 @@ class AtomBindingInvoker implements Invo
// Send an HTTP DELETE
DeleteMethod deleteMethod = new DeleteMethod(uri + "/" + id);
- deleteMethod.setRequestHeader("Authorization", authorizationHeader);
+ if (authorizationHeader != null) {
+ deleteMethod.setRequestHeader("Authorization", authorizationHeader);
+ }
try {
httpClient.executeMethod(deleteMethod);
int status = deleteMethod.getStatusCode();
@@ -345,7 +353,9 @@ class AtomBindingInvoker implements Invo
// Send an HTTP GET
GetMethod getMethod = new GetMethod(uri);
- getMethod.setRequestHeader("Authorization", authorizationHeader);
+ if (authorizationHeader != null) {
+ getMethod.setRequestHeader("Authorization", authorizationHeader);
+ }
boolean parsing = false;
try {
httpClient.executeMethod(getMethod);
@@ -421,7 +431,9 @@ class AtomBindingInvoker implements Invo
// Send an HTTP GET
GetMethod getMethod = new GetMethod(uri);
- getMethod.setRequestHeader("Authorization", authorizationHeader);
+ if (authorizationHeader != null) {
+ getMethod.setRequestHeader("Authorization", authorizationHeader);
+ }
getMethod.setQueryString(queryString);
boolean parsing = false;
try {
Modified: tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java?rev=1027710&r1=1027709&r2=1027710&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java Tue Oct 26 19:48:08 2010
@@ -49,7 +49,7 @@ class AtomReferenceBindingProvider imple
private EndpointReference endpointReference;
private RuntimeComponentReference reference;
private AtomBinding binding;
- private String authorizationHeader;
+ private String authorizationHeader = null;
private HttpClient httpClient;
private Mediator mediator;
private DataType<?> itemClassType;
@@ -71,8 +71,10 @@ class AtomReferenceBindingProvider imple
this.mediator = mediator;
// Prepare authorization header
- String authorization = "admin" + ":" + "admin";
- authorizationHeader = "Basic " + new String(Base64.encodeBase64(authorization.getBytes()));
+ // TUSCANY-3735: Don't send authorization header by default as this can cause problems.
+ // Commented out the following two lines until we have a better way to control this.
+ //String authorization = "admin" + ":" + "admin";
+ //authorizationHeader = "Basic " + new String(Base64.encodeBase64(authorization.getBytes()));
// Create an HTTP client
HttpConnectionManager connectionManager = new MultiThreadedHttpConnectionManager();
@@ -123,10 +125,12 @@ class AtomReferenceBindingProvider imple
public void start() {
// Configure the HTTP client credentials
- Credentials credentials = new UsernamePasswordCredentials("admin", "admin");
- httpClient.getParams().setAuthenticationPreemptive(true);
- URI uri = URI.create(binding.getURI());
- httpClient.getState().setCredentials(new AuthScope(uri.getHost(), uri.getPort()), credentials);
+ // TUSCANY-3735: Don't use authentication by default as this can cause problems.
+ // Commented out the following four lines until we have a better way to control this.
+ //Credentials credentials = new UsernamePasswordCredentials("admin", "admin");
+ //httpClient.getParams().setAuthenticationPreemptive(true);
+ //URI uri = URI.create(binding.getURI());
+ //httpClient.getState().setCredentials(new AuthScope(uri.getHost(), uri.getPort()), credentials);
// Find the get operation on the reference interface
if (true) {