stoty commented on code in PR #615:
URL: 
https://github.com/apache/httpcomponents-client/pull/615#discussion_r1971429280


##########
httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/MutualGssSchemeBase.java:
##########
@@ -0,0 +1,365 @@
+/*
+ * ====================================================================
+ * 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.hc.client5.http.impl.auth;
+
+import java.net.UnknownHostException;
+import java.security.Principal;
+
+import org.apache.hc.client5.http.DnsResolver;
+import org.apache.hc.client5.http.SystemDefaultDnsResolver;
+import org.apache.hc.client5.http.auth.AuthChallenge;
+import org.apache.hc.client5.http.auth.AuthScheme;
+import org.apache.hc.client5.http.auth.AuthScope;
+import org.apache.hc.client5.http.auth.AuthenticationException;
+import org.apache.hc.client5.http.auth.Credentials;
+import org.apache.hc.client5.http.auth.CredentialsProvider;
+import org.apache.hc.client5.http.auth.InvalidCredentialsException;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
+import org.apache.hc.client5.http.auth.MutualKerberosConfig;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
+import org.apache.hc.client5.http.utils.Base64;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.util.Args;
+import org.ietf.jgss.GSSContext;
+import org.ietf.jgss.GSSCredential;
+import org.ietf.jgss.GSSException;
+import org.ietf.jgss.GSSManager;
+import org.ietf.jgss.GSSName;
+import org.ietf.jgss.Oid;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Common behaviour for the new mutual authentication capable {@code GSS} 
based authentication
+ * schemes.
+ *
+ * This class is derived from the old {@link GGSSchemeBase} class, which was 
deprecated in 5.3.
+ *
+ * @since 5.5
+ *
+ * @see GGSSchemeBase
+ */
+public abstract class MutualGssSchemeBase implements AuthScheme {
+
+    enum State {
+        UNINITIATED,
+        TOKEN_READY,
+        TOKEN_SENT,
+        SUCCEEDED,
+        FAILED,
+    }
+
+    private static final Logger LOG = 
LoggerFactory.getLogger(MutualGssSchemeBase.class);
+    private static final String NO_TOKEN = "";
+    private static final String KERBEROS_SCHEME = "HTTP";
+
+    // The GSS spec does not specify how long the conversation can be. This 
should be plenty.
+    // Realistically, we get one initial token, then one maybe one more for 
mutual authentication.
+    private static final int MAX_GSS_CHALLENGES = 3;
+    private final MutualKerberosConfig config;
+    private final DnsResolver dnsResolver;
+    private final boolean mutualAuth;
+    private int challengesLeft = MAX_GSS_CHALLENGES;
+
+    /** Authentication process state */
+    private State state;
+    private GSSCredential gssCredential;
+    private GSSContext gssContext;
+    private String challenge;
+    private byte[] queuedToken = new byte[0];
+
+    MutualGssSchemeBase(final MutualKerberosConfig config, final DnsResolver 
dnsResolver) {
+        super();
+        this.config = config != null ? config : MutualKerberosConfig.DEFAULT;
+        this.dnsResolver = dnsResolver != null ? dnsResolver : 
SystemDefaultDnsResolver.INSTANCE;
+        this.mutualAuth = config.isRequestMutualAuth();
+        this.state = State.UNINITIATED;
+    }
+
+    MutualGssSchemeBase(final MutualKerberosConfig config) {
+        this(config, SystemDefaultDnsResolver.INSTANCE);
+    }
+
+    MutualGssSchemeBase() {
+        this(MutualKerberosConfig.DEFAULT, SystemDefaultDnsResolver.INSTANCE);
+    }
+
+    @Override
+    public String getRealm() {
+        return null;
+    }
+
+    // Required by AuthScheme for backwards compatibility
+    @Override
+    public void processChallenge(final AuthChallenge authChallenge,
+            final HttpContext context ) {
+        // If this gets called, then AuthScheme was changed in an incompatible 
way
+        throw new UnsupportedOperationException();
+    }
+
+    // The AuthScheme API maps awkwardly to GSSAPI, where proccessChallange 
and generateAuthResponse
+    // map to the same single method call. Hence the generated token is only 
stored in this method.
+    @Override
+    public void processChallenge(
+            final HttpHost host,
+            final boolean challenged,
+            final AuthChallenge authChallenge,
+            final HttpContext context
+            ) throws AuthenticationException {
+
+        if (challengesLeft-- <= 0 ) {
+            if (LOG.isDebugEnabled()) {
+                final HttpClientContext clientContext = 
HttpClientContext.cast(context);
+                final String exchangeId = clientContext.getExchangeId();
+                LOG.debug("{} GSS error: too many challenges received. 
Infinite loop ?", exchangeId);
+            }
+            // TODO: Should we throw an exception ? There is a test for this 
behaviour.
+            state = State.FAILED;
+            return;
+        }
+
+        final byte[] challengeToken = Base64.decodeBase64(authChallenge == 
null ? null : authChallenge.getValue());
+
+        final String gssHostname;
+        String hostname = host.getHostName();
+        if (config.isUseCanonicalHostname()) {
+            try {
+                 hostname = 
dnsResolver.resolveCanonicalHostname(host.getHostName());
+            } catch (final UnknownHostException ignore) {
+            }
+        }
+        if (config.isAddPort()) {
+            gssHostname = hostname + ":" + host.getPort();
+        } else {
+            gssHostname = hostname;
+        }
+
+        if (LOG.isDebugEnabled()) {
+            final HttpClientContext clientContext = 
HttpClientContext.cast(context);
+            final String exchangeId = clientContext.getExchangeId();
+            LOG.debug("{} GSS init {}", exchangeId, gssHostname);
+        }
+        try {
+            
setGssCredential(HttpClientContext.cast(context).getCredentialsProvider(), 
host, context);
+            queuedToken = generateToken(challengeToken, KERBEROS_SCHEME, 
gssHostname);
+            switch (state) {
+            case UNINITIATED:
+                if (challenge != NO_TOKEN) {
+                    if (LOG.isDebugEnabled()) {
+                        final HttpClientContext clientContext = 
HttpClientContext.cast(context);
+                        final String exchangeId = 
clientContext.getExchangeId();
+                        LOG.debug("{} Internal GSS error: token received when 
none was sent yet: {}", exchangeId, challengeToken);
+                    }
+                    // TODO Should we fail ? That would break existing tests 
that send a token
+                    // in the first response, which is against the RFC.
+                }
+                state = State.TOKEN_READY;
+                break;
+            case TOKEN_SENT:
+                if (challenged) {
+                    state = State.TOKEN_READY;
+                } else if (mutualAuth) {
+                    // We should have received a valid mutualAuth token
+                    if (!gssContext.isEstablished()) {
+                        if (LOG.isDebugEnabled()) {
+                            final HttpClientContext clientContext =
+                                    HttpClientContext.cast(context);
+                            final String exchangeId = 
clientContext.getExchangeId();
+                            LOG.debug("{} GSSContext is not established ", 
exchangeId);
+                        }
+                        state = State.FAILED;
+                        // TODO should we have specific exception(s) for these 
?
+                        throw new AuthenticationException(
+                                "requireMutualAuth is set but GSSContext is 
not established");
+                    } else if (!gssContext.getMutualAuthState()) {
+                        if (LOG.isDebugEnabled()) {
+                            final HttpClientContext clientContext =
+                                    HttpClientContext.cast(context);
+                            final String exchangeId = 
clientContext.getExchangeId();
+                            LOG.debug("{} requireMutualAuth is set but 
GSSAUthContext does not have"
+                                    + " mutualAuthState set", exchangeId);
+                        }
+                        state = State.FAILED;
+                        throw new AuthenticationException(
+                                "requireMutualAuth is set but GSSContext 
mutualAuthState is not set");
+                    } else {
+                        state = State.SUCCEEDED;
+                    }
+                }
+                break;
+            default:
+                state = State.FAILED;
+                throw new IllegalStateException("Illegal state: " + state);
+
+            }
+        } catch (final GSSException gsse) {
+            state = State.FAILED;
+            if (gsse.getMajor() == GSSException.DEFECTIVE_CREDENTIAL
+                    || gsse.getMajor() == GSSException.CREDENTIALS_EXPIRED) {
+                throw new InvalidCredentialsException(gsse.getMessage(), gsse);
+            }
+            if (gsse.getMajor() == GSSException.NO_CRED) {
+                throw new InvalidCredentialsException(gsse.getMessage(), gsse);
+            }
+            if (gsse.getMajor() == GSSException.DEFECTIVE_TOKEN
+                    || gsse.getMajor() == GSSException.DUPLICATE_TOKEN
+                    || gsse.getMajor() == GSSException.OLD_TOKEN) {
+                throw new AuthenticationException(gsse.getMessage(), gsse);
+            }
+            // other error
+            throw new AuthenticationException(gsse.getMessage(), gsse);
+        }
+    }
+
+    protected GSSManager getManager() {
+        return GSSManager.getInstance();
+    }
+
+    /**
+     * @since 4.4
+     */
+    protected byte[] generateGSSToken(
+            final byte[] input, final Oid oid, final String gssServiceName, 
final String gssHostname) throws GSSException {
+        final GSSManager manager = getManager();
+        final GSSName peerName = manager.createName(gssServiceName + "@" + 
gssHostname, GSSName.NT_HOSTBASED_SERVICE);
+
+        if (gssContext == null) {
+            gssContext = createGSSContext(manager, oid, peerName, 
gssCredential);
+        }
+        if (input != null) {
+            return gssContext.initSecContext(input, 0, input.length);
+        }
+        return gssContext.initSecContext(new byte[] {}, 0, 0);
+    }
+
+    /**
+     * @since 5.0
+     */
+    protected GSSContext createGSSContext(
+            final GSSManager manager,
+            final Oid oid,
+            final GSSName peerName,
+            final GSSCredential gssCredential) throws GSSException {
+        final GSSContext gssContext = 
manager.createContext(peerName.canonicalize(oid), oid, gssCredential,
+                GSSContext.DEFAULT_LIFETIME);
+        gssContext.requestMutualAuth(mutualAuth);
+        gssContext.requestCredDeleg(config.isRequestDelegCreds());
+        return gssContext;
+    }
+
+    /**
+     * @since 4.4
+     */
+    protected abstract byte[] generateToken(byte[] input, String 
gssServiceName, String gssHostname) throws GSSException;
+
+    @Override
+    public boolean isChallengeComplete() {
+        // For the mutual authentication response, this is should technically 
return true.
+        // However, the HttpAuthenticator immediately fails the authentication
+        // process if we return true, so we only return true here if the 
authentication has failed.
+        return this.state == State.FAILED;
+    }
+
+    @Override
+    public boolean isChallengeExpected() {
+        return state == State.TOKEN_SENT && mutualAuth;
+    }
+
+    @Override
+    public boolean isResponseReady(
+            final HttpHost host,
+            final CredentialsProvider credentialsProvider,
+            final HttpContext context) throws AuthenticationException {
+
+        Args.notNull(host, "Auth host");
+        Args.notNull(credentialsProvider, "CredentialsProvider");
+
+        setGssCredential(credentialsProvider, host, context);
+        return true;
+    }
+
+    protected void setGssCredential(final CredentialsProvider 
credentialsProvider,

Review Comment:
   This is the fix for the bug I found, @michael-o .
   When we specify an explicit Kerberos crential (as opposed to taking the 
Subject from the Security context)
   Then it was only set from isResponseReady() which is too late, as we need it 
earlier, in processChallenge().
   I had to add code to processChallange to process the credential, so that we 
can use it there.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@hc.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@hc.apache.org
For additional commands, e-mail: dev-h...@hc.apache.org

Reply via email to