Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove logging of user data #1304

Merged
merged 3 commits into from
Oct 4, 2023
Merged

remove logging of user data #1304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
043dffb
remove logging of user data
liga-oz Oct 4, 2023
ac21fa6
Improve error message in SpringSecurityContext.java
finkmanAtSap Oct 4, 2023
ccdbf3f
Improve error message in SpringSecurityContext.java
finkmanAtSap Oct 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion spring-security/src/main/java/com/sap/cloud/security/spring/token/SpringSecurityContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public static Token getToken() {
return (Token) principal;
}
throw new AccessDeniedException(
"Access forbidden: SecurityContextHolder does not contain a principal of type 'Token' " + principal);
"Access forbidden: SecurityContextHolder does not contain a principal of type 'Token'. Found instead a principal of type " + principal.getClass());
}

/**
Expand Down
15 changes: 7 additions & 8 deletions spring-xsuaa/src/main/java/com/sap/cloud/security/xsuaa/token/SpringSecurityContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,15 @@
*/
package com.sap.cloud.security.xsuaa.token;

import com.sap.cloud.security.xsuaa.extractor.AuthoritiesExtractor;
import com.sap.cloud.security.xsuaa.token.authentication.XsuaaJwtDecoder;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.oauth2.jwt.Jwt;
import org.springframework.security.oauth2.jwt.JwtDecoder;
import org.springframework.util.Assert;

import com.sap.cloud.security.xsuaa.extractor.AuthoritiesExtractor;
import com.sap.cloud.security.xsuaa.token.authentication.XsuaaJwtDecoder;

public class SpringSecurityContext {

private SpringSecurityContext() {
Expand All @@ -31,7 +30,7 @@ private SpringSecurityContext() {
* <p>
* Note: This method is introduced with xsuaa spring client lib.
*/
static public Token getToken() {
public static Token getToken() {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();

if (authentication == null) {
Expand All @@ -42,7 +41,7 @@ static public Token getToken() {
return (Token) principal;
}
throw new AccessDeniedException(
"Access forbidden: SecurityContextHolder does not contain a principal of type 'Token' " + principal);
"Access forbidden: SecurityContextHolder does not contain a principal of type 'Token'. Found instead a principal of type " + principal.getClass());
}

/**
Expand All @@ -58,7 +57,7 @@ static public Token getToken() {
* the extractor used to turn Jwt scopes into Spring Security
* authorities.
*/
static public void init(String encodedJwtToken, JwtDecoder xsuaaJwtDecoder,
public static void init(String encodedJwtToken, JwtDecoder xsuaaJwtDecoder,
AuthoritiesExtractor authoritiesExtractor) {
Assert.isInstanceOf(XsuaaJwtDecoder.class, xsuaaJwtDecoder,
"Passed JwtDecoder instance must be of type 'XsuaaJwtDecoder'");
Expand All @@ -75,7 +74,7 @@ static public void init(String encodedJwtToken, JwtDecoder xsuaaJwtDecoder,
* Cleans up the Spring Security Context {@link SecurityContextHolder} and
* release thread locals for Garbage Collector to avoid memory leaks resources.
*/
static public void clear() {
public static void clear() {
SecurityContextHolder.clearContext();
}
}
}
Loading