GUACAMOLE-839: Ensure each NonceService instance has its own context (will not validate the nonces of other contexts).

This commit is contained in:
Michael Jumper
2023-01-26 11:30:51 -08:00
parent 841190df5a
commit e51d548995
2 changed files with 2 additions and 3 deletions

View File

@@ -20,7 +20,6 @@
package org.apache.guacamole.auth.sso; package org.apache.guacamole.auth.sso;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.Iterator; import java.util.Iterator;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
@@ -30,7 +29,6 @@ import java.util.concurrent.ConcurrentHashMap;
* Service for generating and validating single-use random tokens (nonces). * Service for generating and validating single-use random tokens (nonces).
* Each generated nonce is at least 128 bits and case-insensitive. * Each generated nonce is at least 128 bits and case-insensitive.
*/ */
@Singleton
public class NonceService { public class NonceService {
/** /**

View File

@@ -20,6 +20,7 @@
package org.apache.guacamole.auth.openid; package org.apache.guacamole.auth.openid;
import com.google.inject.AbstractModule; import com.google.inject.AbstractModule;
import com.google.inject.Scopes;
import org.apache.guacamole.auth.openid.conf.ConfigurationService; import org.apache.guacamole.auth.openid.conf.ConfigurationService;
import org.apache.guacamole.auth.sso.NonceService; import org.apache.guacamole.auth.sso.NonceService;
import org.apache.guacamole.auth.openid.token.TokenValidationService; import org.apache.guacamole.auth.openid.token.TokenValidationService;
@@ -32,7 +33,7 @@ public class OpenIDAuthenticationProviderModule extends AbstractModule {
@Override @Override
protected void configure() { protected void configure() {
bind(ConfigurationService.class); bind(ConfigurationService.class);
bind(NonceService.class); bind(NonceService.class).in(Scopes.SINGLETON);
bind(TokenValidationService.class); bind(TokenValidationService.class);
} }