Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated OAuth2IntrospectionClaimAccessor 

Closes gh-11499
This commit is contained in:
Joe Grandja 2022-07-13 15:08:55 -04:00
parent 7b18336c6a
commit f87df42500
4 changed files with 3 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etc/checkstyle/checkstyle-suppressions.xml
View File

@ -15,9 +15,6 @@
<suppress files="BCrypt\.java|BCryptTests\.java" checks=".*"/>
<suppress files="org[\\/]springframework[\\/]security[\\/]core[\\/]ComparableVersion\.java" checks=".*"/>
<!-- InterfaceIsType rules we can't fix until a major revision due to back compatibility -->
<suppress files="OAuth2IntrospectionClaimNames\.java" checks="InterfaceIsType"/>
<!-- Method Visibility that we can't reduce -->
<suppress files="AbstractAclVoterTests\.java" checks="SpringMethodVisibility"/>
<suppress files="AbstractSecurityWebSocketMessageBrokerConfigurerTests\.java" checks="SpringMethodVisibility"/>

5
oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/introspection/OAuth2IntrospectionAuthenticatedPrincipal.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2022 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.
@ -23,6 +23,7 @@ import java.util.Map;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.oauth2.core.DefaultOAuth2AuthenticatedPrincipal;
import org.springframework.security.oauth2.core.OAuth2AuthenticatedPrincipal;
import org.springframework.security.oauth2.core.OAuth2TokenIntrospectionClaimAccessor;
/**
* A domain object that wraps the attributes of OAuth 2.0 Token Introspection.
@ -33,7 +34,7 @@ import org.springframework.security.oauth2.core.OAuth2AuthenticatedPrincipal;
* "https://tools.ietf.org/html/rfc7662#section-2.2">Introspection Response</a>
*/
public final class OAuth2IntrospectionAuthenticatedPrincipal
implements OAuth2IntrospectionClaimAccessor, OAuth2AuthenticatedPrincipal, Serializable {
implements OAuth2TokenIntrospectionClaimAccessor, OAuth2AuthenticatedPrincipal, Serializable {
private final OAuth2AuthenticatedPrincipal delegate;

50
oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/introspection/OAuth2IntrospectionClaimAccessor.java
View File

@ -1,50 +0,0 @@
/*
* Copyright 2002-2021 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.resource.introspection;
import org.springframework.lang.Nullable;
import org.springframework.security.oauth2.core.ClaimAccessor;
import org.springframework.security.oauth2.core.OAuth2TokenIntrospectionClaimAccessor;
import org.springframework.security.oauth2.core.OAuth2TokenIntrospectionClaimNames;
/**
* A {@link ClaimAccessor} for the &quot;claims&quot; that may be contained in the
* Introspection Response.
*
* @author David Kovac
* @since 5.4
* @see ClaimAccessor
* @see OAuth2IntrospectionClaimNames
* @see OAuth2IntrospectionAuthenticatedPrincipal
* @see <a target="_blank" href=
* "https://tools.ietf.org/html/rfc7662#section-2.2">Introspection Response</a>
* @deprecated Use {@link OAuth2TokenIntrospectionClaimAccessor} instead
*/
@Deprecated
public interface OAuth2IntrospectionClaimAccessor extends OAuth2TokenIntrospectionClaimAccessor {
/**
* Returns the scopes {@code (scope)} associated with the token
* @return the scopes associated with the token
* @deprecated Since 5.6. Use {@link #getScopes()} instead
*/
@Nullable
default String getScope() {
return getClaimAsString(OAuth2TokenIntrospectionClaimNames.SCOPE);
}
}

70
oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/introspection/OAuth2IntrospectionClaimNames.java
View File

@ -1,70 +0,0 @@
/*
* Copyright 2002-2021 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.resource.introspection;
import org.springframework.security.oauth2.core.OAuth2TokenIntrospectionClaimNames;
/**
* The names of the &quot;Introspection Claims&quot; defined by an
* <a target="_blank" href="https://tools.ietf.org/html/rfc7662#section-2.2">Introspection
* Response</a>.
*
* @author Josh Cummings
* @since 5.2
* @deprecated Use {@link OAuth2TokenIntrospectionClaimNames} instead
*/
@Deprecated
public interface OAuth2IntrospectionClaimNames extends OAuth2TokenIntrospectionClaimNames {
/**
* {@code exp} - A timestamp indicating when the token expires
* @deprecated use {@link #EXP} instead
*/
String EXPIRES_AT = EXP;
/**
* {@code iat} - A timestamp indicating when the token was issued
* @deprecated use {@link #IAT} instead
*/
String ISSUED_AT = IAT;
/**
* {@code nbf} - A timestamp indicating when the token is not to be used before
* @deprecated use {@link #NBF} instead
*/
String NOT_BEFORE = NBF;
/**
* {@code sub} - Usually a machine-readable identifier of the resource owner who
* authorized the token
* @deprecated use {@link #SUB} instead
*/
String SUBJECT = SUB;
/**
* {@code aud} - The intended audience for the token
* @deprecated use {@link #AUD} instead
*/
String AUDIENCE = AUD;
/**
* {@code iss} - The issuer of the token
* @deprecated use {@link #ISS} instead
*/
String ISSUER = ISS;
}