hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1529441 - in /httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client: DefaultAsyncUserTokenHandler.java HttpAsyncClientBuilder.java
Date Sat, 05 Oct 2013 12:34:17 GMT
Author: olegk
Date: Sat Oct  5 12:34:16 2013
New Revision: 1529441

URL: http://svn.apache.org/r1529441
Log:
HttpAsyncClient specific UserTokenHandler implementation

Added:
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncUserTokenHandler.java
  (with props)
Modified:
    httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java

Added: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncUserTokenHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncUserTokenHandler.java?rev=1529441&view=auto
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncUserTokenHandler.java
(added)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncUserTokenHandler.java
Sat Oct  5 12:34:16 2013
@@ -0,0 +1,102 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+package org.apache.http.impl.nio.client;
+
+import org.apache.http.HttpConnection;
+import org.apache.http.annotation.Immutable;
+import org.apache.http.auth.AuthScheme;
+import org.apache.http.auth.AuthState;
+import org.apache.http.auth.Credentials;
+import org.apache.http.client.UserTokenHandler;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.nio.conn.ManagedNHttpClientConnection;
+import org.apache.http.protocol.HttpContext;
+
+import javax.net.ssl.SSLSession;
+import java.security.Principal;
+
+/**
+ * Default implementation of {@link org.apache.http.client.UserTokenHandler}
+ * for asynchrounous HTTP client communication. This class will use
+ * an instance of {@link java.security.Principal} as a state object for
+ * non-blocking HTTP connections, if it can be obtained from the given
+ * execution context. This helps ensure persistent connections created with
+ * a particular user identity within a particular security context can be
+ * reused by the same user only.
+ * <p/>
+ * This implementation will use the user principle of connection based
+ * authentication schemes such as NTLM or that of the SSL session with
+ * the client authentication turned on. If both are unavailable,
+ * <code>null</code> token will be returned.
+ *
+ * @since 4.0
+ */
+@Immutable
+public class DefaultAsyncUserTokenHandler implements UserTokenHandler {
+
+    public static final DefaultAsyncUserTokenHandler INSTANCE = new DefaultAsyncUserTokenHandler();
+
+    public Object getUserToken(final HttpContext context) {
+
+        final HttpClientContext clientContext = HttpClientContext.adapt(context);
+
+        Principal userPrincipal = null;
+
+        final AuthState targetAuthState = clientContext.getTargetAuthState();
+        if (targetAuthState != null) {
+            userPrincipal = getAuthPrincipal(targetAuthState);
+            if (userPrincipal == null) {
+                final AuthState proxyAuthState = clientContext.getProxyAuthState();
+                userPrincipal = getAuthPrincipal(proxyAuthState);
+            }
+        }
+
+        if (userPrincipal == null) {
+            final HttpConnection conn = clientContext.getConnection();
+            if (conn.isOpen() && conn instanceof ManagedNHttpClientConnection) {
+                final SSLSession sslsession = ((ManagedNHttpClientConnection) conn).getSSLSession();
+                if (sslsession != null) {
+                    userPrincipal = sslsession.getLocalPrincipal();
+                }
+            }
+        }
+
+        return userPrincipal;
+    }
+
+    private static Principal getAuthPrincipal(final AuthState authState) {
+        final AuthScheme scheme = authState.getAuthScheme();
+        if (scheme != null && scheme.isComplete() && scheme.isConnectionBased())
{
+            final Credentials creds = authState.getCredentials();
+            if (creds != null) {
+                return creds.getUserPrincipal();
+            }
+        }
+        return null;
+    }
+
+}

Propchange: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncUserTokenHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncUserTokenHandler.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncUserTokenHandler.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java?rev=1529441&r1=1529440&r2=1529441&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java
(original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java
Sat Oct  5 12:34:16 2013
@@ -77,7 +77,6 @@ import org.apache.http.impl.client.Basic
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.client.DefaultConnectionKeepAliveStrategy;
 import org.apache.http.impl.client.DefaultRedirectStrategy;
-import org.apache.http.impl.client.DefaultUserTokenHandler;
 import org.apache.http.impl.client.NoopUserTokenHandler;
 import org.apache.http.impl.client.ProxyAuthenticationStrategy;
 import org.apache.http.impl.client.TargetAuthenticationStrategy;
@@ -658,7 +657,7 @@ public class HttpAsyncClientBuilder {
         UserTokenHandler userTokenHandler = this.userTokenHandler;
         if (userTokenHandler == null) {
             if (!connectionStateDisabled) {
-                userTokenHandler = DefaultUserTokenHandler.INSTANCE;
+                userTokenHandler = DefaultAsyncUserTokenHandler.INSTANCE;
             } else {
                 userTokenHandler = NoopUserTokenHandler.INSTANCE;
             }



Mime
View raw message