Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Josh Cummings
|
a2d8a3206a | ||
|
dependabot[bot]
|
262b2f9366 | ||
|
Josh Cummings
|
47d6012d5d | ||
|
Josh Cummings
|
25c71e28a8 | ||
|
Josh Cummings
|
864c082a38 | ||
|
dependabot[bot]
|
ddcdd461e6 |
+3
-1
@@ -61,7 +61,9 @@ public final class GrantedAuthorityFromAssertionAttributesUserDetailsService
|
||||
if (value != null) {
|
||||
if (value instanceof List) {
|
||||
for (Object o : (List<?>) value) {
|
||||
grantedAuthorities.add(createSimpleGrantedAuthority(o));
|
||||
if (o != null) {
|
||||
grantedAuthorities.add(createSimpleGrantedAuthority(o));
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
||||
+1
-1
@@ -27,7 +27,7 @@ import java.util.StringTokenizer;
|
||||
import org.htmlunit.FormEncodingType;
|
||||
import org.htmlunit.WebClient;
|
||||
import org.htmlunit.WebRequest;
|
||||
import org.htmlunit.util.Cookie;
|
||||
import org.htmlunit.http.Cookie;
|
||||
import org.htmlunit.util.NameValuePair;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
|
||||
+3
-1
@@ -26,6 +26,8 @@ import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.StringTokenizer;
|
||||
|
||||
import org.jspecify.annotations.Nullable;
|
||||
|
||||
import org.springframework.beans.factory.InitializingBean;
|
||||
import org.springframework.security.core.GrantedAuthority;
|
||||
import org.springframework.security.core.authority.SimpleGrantedAuthority;
|
||||
@@ -121,7 +123,7 @@ public class MapBasedAttributes2GrantedAuthoritiesMapper
|
||||
* to the given result collection.
|
||||
* @param value The value to convert to a GrantedAuthority Collection
|
||||
*/
|
||||
private void addGrantedAuthorityCollection(Collection<GrantedAuthority> result, Object value) {
|
||||
private void addGrantedAuthorityCollection(Collection<GrantedAuthority> result, @Nullable Object value) {
|
||||
if (value == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
+1
-1
@@ -72,7 +72,7 @@ public class DelegatingSecurityContextAsyncTaskExecutor extends DelegatingSecuri
|
||||
}
|
||||
|
||||
@Override
|
||||
public final <T> Future<T> submit(Callable<T> task) {
|
||||
public final <T extends @Nullable Object> Future<T> submit(Callable<T> task) {
|
||||
return getDelegate().submit(wrap(task));
|
||||
}
|
||||
|
||||
|
||||
@@ -51,7 +51,7 @@ jakarta-websocket-jakarta-websocket-client-api = { module = "jakarta.websocket:j
|
||||
jakarta-xml-bind-jakarta-xml-bind-api = "jakarta.xml.bind:jakarta.xml.bind-api:4.0.5"
|
||||
ldapsdk = "ldapsdk:ldapsdk:4.1"
|
||||
net-sourceforge-htmlunit = "net.sourceforge.htmlunit:htmlunit:2.70.0"
|
||||
org-htmlunit-htmlunit = "org.htmlunit:htmlunit:4.21.0"
|
||||
org-htmlunit-htmlunit = "org.htmlunit:htmlunit:5.5.0"
|
||||
org-apache-httpcomponents-httpclient = "org.apache.httpcomponents.client5:httpclient5:5.6.4"
|
||||
org-apache-kerby-simplekdc='org.apache.kerby:kerb-simplekdc:2.1.2'
|
||||
org-apache-maven-maven-resolver-provider = "org.apache.maven:maven-resolver-provider:3.9.16"
|
||||
@@ -79,8 +79,8 @@ org-mockito-mockito-bom = { module = "org.mockito:mockito-bom", version.ref = "o
|
||||
org-opensaml-opensaml5-saml-api = { module = "org.opensaml:opensaml-saml-api", version.ref = "org-opensaml5" }
|
||||
org-opensaml-opensaml5-saml-impl = { module = "org.opensaml:opensaml-saml-impl", version.ref = "org-opensaml5" }
|
||||
org-python-jython = { module = "org.python:jython", version = "2.5.3" }
|
||||
org-seleniumhq-selenium-htmlunit-driver = "org.seleniumhq.selenium:htmlunit3-driver:4.43.0"
|
||||
org-seleniumhq-selenium-selenium-java = "org.seleniumhq.selenium:selenium-java:4.43.0"
|
||||
org-seleniumhq-selenium-htmlunit-driver = "org.seleniumhq.selenium:htmlunit3-driver:4.48.0"
|
||||
org-seleniumhq-selenium-selenium-java = "org.seleniumhq.selenium:selenium-java:4.48.0"
|
||||
org-seleniumhq-selenium-selenium-support = "org.seleniumhq.selenium:selenium-support:3.141.59"
|
||||
org-skyscreamer-jsonassert = "org.skyscreamer:jsonassert:1.5.3"
|
||||
org-slf4j-log4j-over-slf4j = "org.slf4j:log4j-over-slf4j:1.7.36"
|
||||
@@ -104,7 +104,7 @@ org-hidetake-gradle-ssh-plugin = "org.hidetake:gradle-ssh-plugin:2.10.1"
|
||||
org-jfrog-buildinfo-build-info-extractor-gradle = "org.jfrog.buildinfo:build-info-extractor-gradle:6.0.4"
|
||||
org-sonarsource-scanner-gradle-sonarqube-gradle-plugin = "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.8.0.1969"
|
||||
org-instancio-instancio-junit = "org.instancio:instancio-junit:3.7.1"
|
||||
spring-nullability = 'io.spring.nullability:io.spring.nullability.gradle.plugin:0.0.14'
|
||||
spring-nullability = 'io.spring.nullability:io.spring.nullability.gradle.plugin:0.0.16'
|
||||
webauthn4j-core = 'com.webauthn4j:webauthn4j-core:0.31.10.RELEASE'
|
||||
com-password4j-password4j = { module = "com.password4j:password4j", version.ref = "com-password4j" }
|
||||
|
||||
|
||||
Generated
+666
-264
File diff suppressed because it is too large
Load Diff
@@ -42,7 +42,7 @@
|
||||
"eslint-config-prettier": "^9.1.0",
|
||||
"eslint-plugin-prettier": "^5.1.3",
|
||||
"globals": "^15.8.0",
|
||||
"mocha": "~12.0",
|
||||
"mocha": "~10.8",
|
||||
"prettier": "^3.3.2",
|
||||
"prettier-eslint": "~15.0",
|
||||
"sinon": "^18.0.0"
|
||||
|
||||
+1
-1
@@ -50,7 +50,7 @@ public final class InMemoryOidcSessionRegistry implements OidcSessionRegistry {
|
||||
}
|
||||
|
||||
@Override
|
||||
public OidcSessionInformation removeSessionInformation(String clientSessionId) {
|
||||
public @Nullable OidcSessionInformation removeSessionInformation(String clientSessionId) {
|
||||
OidcSessionInformation information = this.sessions.remove(clientSessionId);
|
||||
if (information != null) {
|
||||
this.logger.trace("Removed client session");
|
||||
|
||||
+3
-1
@@ -16,6 +16,8 @@
|
||||
|
||||
package org.springframework.security.oauth2.client.oidc.session;
|
||||
|
||||
import org.jspecify.annotations.Nullable;
|
||||
|
||||
import org.springframework.security.oauth2.client.oidc.authentication.logout.OidcLogoutToken;
|
||||
|
||||
/**
|
||||
@@ -44,7 +46,7 @@ public interface OidcSessionRegistry {
|
||||
* @param clientSessionId the client session
|
||||
* @return any found {@link OidcSessionInformation}, could be {@code null}
|
||||
*/
|
||||
OidcSessionInformation removeSessionInformation(String clientSessionId);
|
||||
@Nullable OidcSessionInformation removeSessionInformation(String clientSessionId);
|
||||
|
||||
/**
|
||||
* Deregister the OIDC Provider sessions referenced by the provided OIDC Logout Token
|
||||
|
||||
Reference in New Issue
Block a user