cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r738537 - in /cxf/branches/2.0.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/transport/http/ rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/ rt/transports/http/src/main/resources/schemas/configuration/ r...
Date Wed, 28 Jan 2009 16:58:36 GMT
Author: dkulp
Date: Wed Jan 28 16:58:36 2009
New Revision: 738537

URL: http://svn.apache.org/viewvc?rev=738537&view=rev
Log:
Merged revisions 737730 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes

................
  r737730 | dkulp | 2009-01-26 11:30:00 -0500 (Mon, 26 Jan 2009) | 9 lines
  
  Merged revisions 737299 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r737299 | dkulp | 2009-01-23 23:01:19 -0500 (Fri, 23 Jan 2009) | 2 lines
    
    Implement old API overtop of new API
  ........
................

Added:
    cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpBasicAuthSupplier.java
      - copied unchanged from r737730, cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpBasicAuthSupplier.java
    cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpBasicAuthSupplierBeanDefinitionParser.java
      - copied unchanged from r737730, cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpBasicAuthSupplierBeanDefinitionParser.java
Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DigestAuthSupplier.java
    cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
    cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpAuthSupplier.java
  (props changed)
    cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpAuthSupplierBeanDefinitionParser.java
  (props changed)
    cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/NamespaceHandler.java
    cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd
    cxf/branches/2.0.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 28 16:58:36 2009
@@ -1,3 +1,3 @@
-/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884,733891,733893,733915,735132,735136,735789,736451,736453,736456,736761,736765,736771,736827,736853,737126,737706,737714,737716,737726,737729
-/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163
 1,731635,732320,732363,732411,732710,732827,733582,734666,734836,735734,736332,736343,736352,736408,736423,736491,736738,736766,736825,736852,737032,737069,737124,737237
+/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884,733891,733893,733915,735132,735136,735789,736451,736453,736456,736761,736765,736771,736827,736853,737126,737706,737714,737716,737726,737729-737730
+/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163
 1,731635,732320,732363,732411,732710,732827,733582,734666,734836,735734,736332,736343,736352,736408,736423,736491,736738,736766,736825,736852,737032,737069,737124,737237,737299
 /incubator/cxf/trunk:434594-651668

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DigestAuthSupplier.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DigestAuthSupplier.java?rev=738537&r1=738536&r2=738537&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DigestAuthSupplier.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DigestAuthSupplier.java
Wed Jan 28 16:58:36 2009
@@ -86,8 +86,8 @@
                 }
                 authInfo.put(currentURL, di);
                 return di.generateAuth(currentURL.getFile(), 
-                                       getUsername(message),
-                                       getPassword(message));
+                                       getUsername(conduit, message),
+                                       getPassword(conduit, message));
             }
             
         }
@@ -98,25 +98,35 @@
         DigestInfo di = authInfo.get(currentURL);
         if (di != null) {
             return di.generateAuth(currentURL.getFile(), 
-                                   getUsername(message),
-                                   getPassword(message));            
+                                   getUsername(conduit, message),
+                                   getPassword(conduit, message));            
         }
         return null;
     }
 
-    private String getPassword(Message message) {
+    private String getPassword(HTTPConduit conduit, Message message) {
         AuthorizationPolicy policy 
             = (AuthorizationPolicy)message.getContextualProperty(AuthorizationPolicy.class.getName());
-        if (policy != null) {
+        if (policy == null) {
+            policy = conduit.getAuthorization();
+        }
+        if (policy != null
+            && (!policy.isSetAuthorizationType()
+                || "Digest".equals(policy.getAuthorizationType()))) {
             return policy.getUserName();            
         }
         return null;
     }
 
-    private String getUsername(Message message) {
+    private String getUsername(HTTPConduit conduit, Message message) {
         AuthorizationPolicy policy 
             = (AuthorizationPolicy)message.getContextualProperty(AuthorizationPolicy.class.getName());
-        if (policy != null) {
+        if (policy == null) {
+            policy = conduit.getAuthorization();
+        }
+        if (policy != null
+            && (!policy.isSetAuthorizationType()
+                || "Digest".equals(policy.getAuthorizationType()))) {
             return policy.getPassword();            
         }
         return null;
@@ -135,7 +145,6 @@
         
         synchronized String generateAuth(String uri, String username, String password) {
             try {
-                StringBuilder builder = new StringBuilder("Digest qop=auth, realm=\"");
                 nc++;
                 String ncstring = Integer.toString(nc);
                 while (ncstring.length() < 8) {
@@ -172,7 +181,12 @@
                         + qop + ":" + hasha2;
                 }
                 serverDigestValue = encode(digester.digest(serverDigestValue.getBytes("US-ASCII")));
-                builder.append(realm).append("\", opaque=\"")
+                StringBuilder builder = new StringBuilder("Digest ");
+                if (qop != null) {
+                    builder.append("qop=auth, ");
+                }  
+                builder.append("realm=\"")
+                    .append(realm).append("\", opaque=\"")
                     .append(opaque)
                     .append("\", nonce=\"")
                     .append(nonce)

Modified: cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=738537&r1=738536&r2=738537&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Wed Jan 28 16:58:36 2009
@@ -522,6 +522,7 @@
                         "Auth Supplier, but no Premeptive User Pass." 
                         + " We must cache request.");
             }
+            message.put("AUTH_VALUE", auth);
         }
         if (getClient().isAutoRedirect()) {
             // If the AutoRedirect property is set then we cannot
@@ -1068,8 +1069,13 @@
             && (newPolicy == null
                 || (!"Basic".equals(newPolicy.getAuthorizationType())
                     && newPolicy.getAuthorization() == null))) {
-            authString = authSupplier.getPreemptiveAuthorization(
+            authString = (String)message.get("AUTH_VALUE");
+            if (authString == null) {
+                authString = authSupplier.getPreemptiveAuthorization(
                     this, url, message);
+            } else {
+                message.remove("AUTH_VALUE");
+            }
             if (authString != null) {
                 headers.put("Authorization",
                             createMutableList(authString));
@@ -2082,6 +2088,11 @@
     public boolean canAssert(QName type) {
         return PolicyUtils.HTTPCLIENTPOLICY_ASSERTION_QNAME.equals(type);  
     }
+
+    @Deprecated
+    public void setBasicAuthSupplier(HttpBasicAuthSupplier basicAuthSupplier) {
+        setAuthSupplier(basicAuthSupplier);
+    }
     
 }
 

Propchange: cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpAuthSupplier.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 28 16:58:36 2009
@@ -0,0 +1,2 @@
+/cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpAuthSupplier.java:737730
+/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpAuthSupplier.java:737299

Propchange: cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpAuthSupplierBeanDefinitionParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 28 16:58:36 2009
@@ -0,0 +1,2 @@
+/cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpAuthSupplierBeanDefinitionParser.java:737730
+/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpAuthSupplierBeanDefinitionParser.java:737299

Modified: cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/NamespaceHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/NamespaceHandler.java?rev=738537&r1=738536&r2=738537&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/NamespaceHandler.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/NamespaceHandler.java
Wed Jan 28 16:58:36 2009
@@ -28,6 +28,8 @@
                 new MessageTrustDeciderBeanDefinitionParser());        
         registerBeanDefinitionParser("authSupplier", 
                 new HttpAuthSupplierBeanDefinitionParser()); 
+        registerBeanDefinitionParser("basicAuthSupplier", 
+                                     new HttpBasicAuthSupplierBeanDefinitionParser()); 
         registerBeanDefinitionParser("destination", 
                 new HttpDestinationBeanDefinitionParser());        
     }

Modified: cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd?rev=738537&r1=738536&r2=738537&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd
(original)
+++ cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd
Wed Jan 28 16:58:36 2009
@@ -49,6 +49,7 @@
     <xs:element name="tlsClientParameters" type="sec:TLSClientParametersType"/>
     <xs:element name="trustDecider"        type="cxf-beans:ClassOrBeanType"/>
     <xs:element name="authSupplier"        type="cxf-beans:ClassOrBeanType"/>
+    <xs:element name="basicAuthSupplier"   type="cxf-beans:ClassOrBeanType"/>
     
     
     <xs:element name="conduit">
@@ -104,6 +105,18 @@
                      </xs:documentation>
                    </xs:annotation>
                 </xs:element>
+                <xs:element ref="http-conf:basicAuthSupplier" 
+                			minOccurs="0" maxOccurs="1">
+                   <xs:annotation>
+                     <xs:documentation>
+                       Holds the bean reference or class name
+                       of an object that supplies Auth information
+                       both preemptively and in response to a 401 HTTP
+                       Challenge. This class must extend the abstract class 
+                       org.apache.cxf.transport.http.HttpBasicAuthSupplier.
+                     </xs:documentation>
+                   </xs:annotation>
+                </xs:element>
                 <xs:element ref="http-conf:trustDecider" 
                 			minOccurs="0" maxOccurs="1">
                    <xs:annotation>

Modified: cxf/branches/2.0.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java?rev=738537&r1=738536&r2=738537&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java
Wed Jan 28 16:58:36 2009
@@ -82,17 +82,16 @@
      * This test class is a Basic Auth Supplier with a
      * preemptive UserPass.
      */
-    class BasicAuthSupplier extends HttpAuthSupplier {
-        public String getPreemptiveAuthorization(
-                HTTPConduit conduit, URL url, Message m) {
-            String userpass = "Gandalf:staff";
-            String token = Base64Utility.encode(userpass.getBytes());
-            return "Basic " + token;
+    class BasicAuthSupplier extends HttpBasicAuthSupplier {
+        public UserPass getPreemptiveUserPass(
+                String conduitName, URL url, Message m) {
+            return createUserPass("Gandalf", "staff");
         }
-        public String getAuthorizationForRealm(
-                HTTPConduit conduit, URL url, Message m, String r, String fh) {
+        public UserPass getUserPassForRealm(
+                String conduitName, URL url, Message m, String r) {
             return null;
         }
+
     }
 
     /**
@@ -218,11 +217,9 @@
         headers =
             CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
 
-        String head = headers.get("Authorization").get(0);
-        assertEquals("Unexpected Authorization Token: " 
-                     + new String(Base64Utility.decode(head.substring(6))),
+        assertEquals("Unexpected Authorization Token",
                 "Basic " + Base64Utility.encode("Gandalf:staff".getBytes()),
-                head);
+                headers.get("Authorization").get(0));
 
         // Setting authorization policy on the message should override all.
         AuthorizationPolicy authPolicy = new AuthorizationPolicy();



Mime
View raw message