mirror of
https://github.com/gyurix1968/guacamole-client.git
synced 2025-09-06 13:17:41 +00:00
GUACAMOLE-1289: Move AuthenticationSession components to guacamole-exit.
This commit is contained in:
committed by
Alex Leitner
parent
5a135f3361
commit
13494baa4a
@@ -19,7 +19,7 @@
|
||||
|
||||
package org.apache.guacamole.auth.saml.acs;
|
||||
|
||||
import org.apache.guacamole.auth.sso.AuthenticationSession;
|
||||
import org.apache.guacamole.net.auth.AuthenticationSession;
|
||||
|
||||
/**
|
||||
* Representation of an in-progress SAML authentication attempt.
|
||||
|
@@ -20,7 +20,7 @@
|
||||
package org.apache.guacamole.auth.saml.acs;
|
||||
|
||||
import com.google.inject.Singleton;
|
||||
import org.apache.guacamole.auth.sso.AuthenticationSessionManager;
|
||||
import org.apache.guacamole.net.auth.AuthenticationSessionManager;
|
||||
|
||||
/**
|
||||
* Manager service that temporarily stores SAML authentication attempts while
|
||||
|
@@ -36,7 +36,7 @@ import org.apache.guacamole.GuacamoleException;
|
||||
import org.apache.guacamole.GuacamoleSecurityException;
|
||||
import org.apache.guacamole.GuacamoleServerException;
|
||||
import org.apache.guacamole.auth.saml.conf.ConfigurationService;
|
||||
import org.apache.guacamole.auth.sso.IdentifierGenerator;
|
||||
import org.apache.guacamole.net.auth.IdentifierGenerator;
|
||||
import org.xml.sax.SAXException;
|
||||
|
||||
/**
|
||||
@@ -58,12 +58,6 @@ public class SAMLService {
|
||||
@Inject
|
||||
private SAMLAuthenticationSessionManager sessionManager;
|
||||
|
||||
/**
|
||||
* Generator of arbitrary, unique, unpredictable identifiers.
|
||||
*/
|
||||
@Inject
|
||||
private IdentifierGenerator idGenerator;
|
||||
|
||||
/**
|
||||
* Creates a new SAML request, beginning the overall authentication flow
|
||||
* that will ultimately result in an asserted user identity if the user is
|
||||
@@ -89,7 +83,7 @@ public class SAMLService {
|
||||
Auth auth = new Auth(samlSettings, null, null);
|
||||
|
||||
// Generate a unique ID to use for the relay state
|
||||
String identifier = idGenerator.generateIdentifier();
|
||||
String identifier = IdentifierGenerator.generateIdentifier();
|
||||
|
||||
// Create the request URL for the SAML IdP
|
||||
String requestUrl = auth.login(
|
||||
|
@@ -24,7 +24,6 @@ import com.onelogin.saml2.settings.IdPMetadataParser;
|
||||
import com.onelogin.saml2.settings.Saml2Settings;
|
||||
import com.onelogin.saml2.settings.SettingsBuilder;
|
||||
import com.onelogin.saml2.util.Constants;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.net.URI;
|
||||
|
Reference in New Issue
Block a user