diff options
author | Nils Schwabe | 2014-05-05 14:56:24 +0200 |
---|---|---|
committer | Nils Schwabe | 2014-05-05 14:56:24 +0200 |
commit | 65cd27a324a80a4ed956aaf68fe68ed8a939a3af (patch) | |
tree | 4ee402305cf17ab6dbff23c3e994dc0f280bc868 /src/main/java/org/openslx/imagemaster/db | |
parent | Removed todo from LDAPUser (diff) | |
download | masterserver-65cd27a324a80a4ed956aaf68fe68ed8a939a3af.tar.gz masterserver-65cd27a324a80a4ed956aaf68fe68ed8a939a3af.tar.xz masterserver-65cd27a324a80a4ed956aaf68fe68ed8a939a3af.zip |
Add login can be in format prefix_userid OR userid@organization
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/db')
-rw-r--r-- | src/main/java/org/openslx/imagemaster/db/DbSatellite.java | 11 | ||||
-rw-r--r-- | src/main/java/org/openslx/imagemaster/db/LdapUser.java | 9 |
2 files changed, 12 insertions, 8 deletions
diff --git a/src/main/java/org/openslx/imagemaster/db/DbSatellite.java b/src/main/java/org/openslx/imagemaster/db/DbSatellite.java index 9f3cd01..e6c8e03 100644 --- a/src/main/java/org/openslx/imagemaster/db/DbSatellite.java +++ b/src/main/java/org/openslx/imagemaster/db/DbSatellite.java @@ -3,14 +3,15 @@ package org.openslx.imagemaster.db; public class DbSatellite { - private String organization, address, name; + private String organization, address, name, prefix; // needs to be public in order to be found by MySQL - public DbSatellite(String organization, String address, String name) + public DbSatellite(String organization, String address, String name, String prefix) { this.organization = organization; this.address = address; this.name = name; + this.prefix = prefix; } public static DbSatellite fromOrganization( String organization ) @@ -18,7 +19,7 @@ public class DbSatellite return MySQL .findUniqueOrNull( DbSatellite.class, - "SELECT satellite.organization, satellite.address, satellite.name FROM satellite WHERE satellite.organization = ? LIMIT 1", + "SELECT satellite.organization, satellite.address, satellite.name, satellite.prefix FROM satellite WHERE satellite.organization = ? LIMIT 1", organization ); } @@ -36,4 +37,8 @@ public class DbSatellite { return organization; } + + public String getPrefix() { + return this.prefix; + } } diff --git a/src/main/java/org/openslx/imagemaster/db/LdapUser.java b/src/main/java/org/openslx/imagemaster/db/LdapUser.java index a887640..f9554c0 100644 --- a/src/main/java/org/openslx/imagemaster/db/LdapUser.java +++ b/src/main/java/org/openslx/imagemaster/db/LdapUser.java @@ -47,16 +47,15 @@ public class LdapUser extends User /** * Query LDAP for user with given login * - * @param login Login of user in the form "user@organization.com" + * @param login Login of user in the form "prefix_username" * @return instance of LDAPUser for matching entry from LDAP or null if sth went wrong */ public static LdapUser forLogin( final String login, final String password ) throws AuthenticationException { String username, organization, firstName, lastName, eMail, satelliteAddress; - -// String[] temp = login.split( "@" ); -// if ( temp.length != 2 ) -// throw new AuthenticationException( AuthenticationError.GENERIC_ERROR, "Login must be in form user@organization.com" ); + + if (login.split( "_" ).length != 2) + throw new AuthenticationException(AuthenticationError.GENERIC_ERROR, "Login must be in form: prefix_username"); LdapConnection connection = null; try { |