diff options
| author | Nils Schwabe | 2014-05-05 15:24:22 +0200 |
|---|---|---|
| committer | Nils Schwabe | 2014-05-05 15:24:22 +0200 |
| commit | 9bd1b2cbf195f167394d9f70cb376b35de262c29 (patch) | |
| tree | caf517c67c4cee4611b4ffaf836e8da267b97563 /src/main/java/org/openslx/imagemaster/session/Authenticator.java | |
| parent | Add login can be in format prefix_userid OR userid@organization (diff) | |
| download | masterserver-9bd1b2cbf195f167394d9f70cb376b35de262c29.tar.gz masterserver-9bd1b2cbf195f167394d9f70cb376b35de262c29.tar.xz masterserver-9bd1b2cbf195f167394d9f70cb376b35de262c29.zip | |
Fix login format
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/session/Authenticator.java')
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/session/Authenticator.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/org/openslx/imagemaster/session/Authenticator.java b/src/main/java/org/openslx/imagemaster/session/Authenticator.java index 3378662..85f56b2 100644 --- a/src/main/java/org/openslx/imagemaster/session/Authenticator.java +++ b/src/main/java/org/openslx/imagemaster/session/Authenticator.java @@ -28,17 +28,19 @@ public class Authenticator // } // log.debug( "Login successful: " + username ); - String prefix = ""; + String login = username; if (username.split( "@" ).length == 2) { // we are in userid@organization format // --> get prefix DbSatellite satellite = DbSatellite.fromOrganization( username.split( "@" )[1] ); if (satellite == null) throw new AuthenticationException( AuthenticationError.INVALID_CREDENTIALS, "Unkown Organization" ); - prefix = satellite.getPrefix(); + login = satellite.getPrefix() + "_" + username.split( "@" )[0]; } - LdapUser user = LdapUser.forLogin( prefix + "_" + username.split( "@" )[0], password ); // throws exception if credentials are invalid + log.info( "Loggin in with: " + login ); + + LdapUser user = LdapUser.forLogin( login, password ); // throws exception if credentials are invalid if ( user == null ) { log.debug( "Login failed: " + username ); throw new AuthenticationException( AuthenticationError.GENERIC_ERROR, "Could not login because of a weird error." ); |