michael-o commented on code in PR #399: URL: https://github.com/apache/httpcomponents-client/pull/399#discussion_r1045590335
########## httpclient5/src/main/java/org/apache/hc/client5/http/auth/BearerToken.java: ########## @@ -0,0 +1,120 @@ +/* + * ==================================================================== + * 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.auth; + +import java.io.Serializable; +import java.security.Principal; +import java.util.Objects; + +import org.apache.hc.core5.annotation.Contract; +import org.apache.hc.core5.annotation.ThreadingBehavior; +import org.apache.hc.core5.util.Args; + +/** + * Opaque token {@link Credentials} usually representing a set of claims, often encrypted + * or signed. The JWT (JSON Web Token) is among most widely used tokens used at the time + * of writing. + * + * @since 5.3 + */ +@Contract(threading = ThreadingBehavior.IMMUTABLE) +public class BearerToken implements Credentials, Serializable { + + private final Principal principal; + private final String token; + + /** + * The constructor with the user principal and token arguments. + * + * @param userPrincipal the user principal + * @param token the token + * + * @see BasicUserPrincipal + * @see NTUserPrincipal Review Comment: I think this line is unnecessary. ########## httpclient5-testing/src/main/java/org/apache/hc/client5/testing/auth/BasicAuthenticationHandler.java: ########## @@ -0,0 +1,49 @@ +/* + * ==================================================================== + * 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.testing.auth; + +import java.nio.charset.StandardCharsets; + +import org.apache.hc.client5.http.auth.StandardAuthScheme; +import org.apache.hc.client5.http.utils.Base64; + +public class BasicAuthenticationHandler extends AbstractAuthenticationHandler { + + @Override + String getSchemeName() { + return StandardAuthScheme.BASIC; + } + + @Override + String decodeChallenge(final String challenge) throws IllegalArgumentException { + final byte[] bytes = challenge.getBytes(StandardCharsets.US_ASCII); + final Base64 codec = new Base64(); + return new String(codec.decode(bytes), StandardCharsets.US_ASCII); Review Comment: You assume that the bytes are always ASCII? What about UTF-8 these days? ########## httpclient5-testing/src/main/java/org/apache/hc/client5/testing/auth/Authenticator.java: ########## @@ -31,6 +31,13 @@ public interface Authenticator { + /** + * @since 5.3 + */ + default AuthResult auth(URIAuthority authority, String requestUri, String credentials) { Review Comment: Maybe `perform` is a better name? `auth` and `authenticate` seem to be to similar. ########## httpclient5-testing/src/main/java/org/apache/hc/client5/testing/auth/AuthenticationHandler.java: ########## @@ -0,0 +1,44 @@ +/* + * ==================================================================== + * 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.testing.auth; + +import java.util.List; + +import org.apache.hc.core5.http.HttpException; +import org.apache.hc.core5.http.NameValuePair; + +/** + * @since 5.3 + */ +public interface AuthenticationHandler<T> { + + String challenge(List<NameValuePair> params); + + T extractAuthToken(String header) throws HttpException; Review Comment: This is rather the header value, not the header, no? ########## httpclient5/src/main/java/org/apache/hc/client5/http/auth/BearerToken.java: ########## @@ -0,0 +1,120 @@ +/* + * ==================================================================== + * 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.auth; + +import java.io.Serializable; +import java.security.Principal; +import java.util.Objects; + +import org.apache.hc.core5.annotation.Contract; +import org.apache.hc.core5.annotation.ThreadingBehavior; +import org.apache.hc.core5.util.Args; + +/** + * Opaque token {@link Credentials} usually representing a set of claims, often encrypted + * or signed. The JWT (JSON Web Token) is among most widely used tokens used at the time + * of writing. + * + * @since 5.3 + */ +@Contract(threading = ThreadingBehavior.IMMUTABLE) +public class BearerToken implements Credentials, Serializable { + + private final Principal principal; + private final String token; + + /** + * The constructor with the user principal and token arguments. + * + * @param userPrincipal the user principal + * @param token the token + * + * @see BasicUserPrincipal + * @see NTUserPrincipal + */ + public BearerToken(final Principal userPrincipal, final String token) { + super(); + this.principal = Args.notNull(userPrincipal, "User principal"); Review Comment: How does a principal make sense here? The subject can be in the token or not since the token is an access token, not an authentication token. -- 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
