e1f491bd61
Added support for client secret POST authentication method. Added validation of client authentication method when authenticating a client. Closes gh-134
85 lines
3.5 KiB
Java
85 lines
3.5 KiB
Java
/*
|
|
* Copyright 2020 the original author or authors.
|
|
*
|
|
* Licensed 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
|
|
*
|
|
* https://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.
|
|
*/
|
|
package org.springframework.security.oauth2.server.authorization.web;
|
|
|
|
import org.springframework.security.core.Authentication;
|
|
import org.springframework.security.oauth2.core.ClientAuthenticationMethod;
|
|
import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
|
|
import org.springframework.security.oauth2.core.OAuth2Error;
|
|
import org.springframework.security.oauth2.core.OAuth2ErrorCodes;
|
|
import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
|
|
import org.springframework.security.oauth2.server.authorization.authentication.OAuth2ClientAuthenticationToken;
|
|
import org.springframework.security.web.authentication.AuthenticationConverter;
|
|
import org.springframework.util.MultiValueMap;
|
|
import org.springframework.util.StringUtils;
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import java.util.Collections;
|
|
import java.util.HashMap;
|
|
import java.util.Map;
|
|
|
|
/**
|
|
* Attempts to extract client credentials from POST parameters of {@link HttpServletRequest}
|
|
* and then converts to an {@link OAuth2ClientAuthenticationToken} used for authenticating the client.
|
|
*
|
|
* @author Anoop Garlapati
|
|
* @since 0.1.0
|
|
* @see OAuth2ClientAuthenticationToken
|
|
* @see OAuth2ClientAuthenticationFilter
|
|
* @see <a target="_blank" href="https://tools.ietf.org/html/rfc6749#section-2.3.1">Section 2.3.1 Client Password</a>
|
|
*/
|
|
public class ClientSecretPostAuthenticationConverter implements AuthenticationConverter {
|
|
|
|
@Override
|
|
public Authentication convert(HttpServletRequest request) {
|
|
MultiValueMap<String, String> parameters = OAuth2EndpointUtils.getParameters(request);
|
|
|
|
// client_id (REQUIRED)
|
|
String clientId = parameters.getFirst(OAuth2ParameterNames.CLIENT_ID);
|
|
if (!StringUtils.hasText(clientId)) {
|
|
return null;
|
|
}
|
|
|
|
if (parameters.get(OAuth2ParameterNames.CLIENT_ID).size() != 1) {
|
|
throw new OAuth2AuthenticationException(new OAuth2Error(OAuth2ErrorCodes.INVALID_REQUEST));
|
|
}
|
|
|
|
// client_secret (REQUIRED)
|
|
String clientSecret = parameters.getFirst(OAuth2ParameterNames.CLIENT_SECRET);
|
|
if (!StringUtils.hasText(clientSecret)) {
|
|
return null;
|
|
}
|
|
|
|
if (parameters.get(OAuth2ParameterNames.CLIENT_SECRET).size() != 1) {
|
|
throw new OAuth2AuthenticationException(new OAuth2Error(OAuth2ErrorCodes.INVALID_REQUEST));
|
|
}
|
|
|
|
return new OAuth2ClientAuthenticationToken(clientId, clientSecret, ClientAuthenticationMethod.POST,
|
|
extractAdditionalParameters(request));
|
|
}
|
|
|
|
private static Map<String, Object> extractAdditionalParameters(HttpServletRequest request) {
|
|
Map<String, Object> additionalParameters = Collections.emptyMap();
|
|
if (OAuth2EndpointUtils.matchesPkceTokenRequest(request)) {
|
|
// Confidential clients can also leverage PKCE
|
|
additionalParameters = new HashMap<>(OAuth2EndpointUtils.getParameters(request).toSingleValueMap());
|
|
additionalParameters.remove(OAuth2ParameterNames.CLIENT_ID);
|
|
additionalParameters.remove(OAuth2ParameterNames.CLIENT_SECRET);
|
|
}
|
|
return additionalParameters;
|
|
}
|
|
}
|