-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
39 changed files
with
1,004 additions
and
204 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -44,7 +44,7 @@ RUN apk update && apk add wget && wget -O "apache-tomcat-${TOMCAT_VERSION}.tar. | |
| FROM registry.cloudogu.com/official/java:21.0.4-1 | ||
|
|
||
| LABEL NAME="official/cas" \ | ||
| VERSION="7.0.8-3" \ | ||
| VERSION="7.0.8-4" \ | ||
| maintainer="[email protected]" | ||
|
|
||
| ARG TOMCAT_VERSION | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| MAKEFILES_VERSION=9.2.1 | ||
| MAKEFILES_VERSION=9.3.2 | ||
|
|
||
| .DEFAULT_GOAL:=dogu-release | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
app/src/main/java/de/triology/cas/ldap/CesInternalLdapUser.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| package de.triology.cas.ldap; | ||
|
|
||
| import lombok.EqualsAndHashCode; | ||
| import lombok.Getter; | ||
| import lombok.Setter; | ||
| import org.ldaptive.LdapEntry; | ||
|
|
||
| import java.lang.reflect.Array; | ||
| import java.util.HashSet; | ||
| import java.util.Set; | ||
|
|
||
| @Setter | ||
| @Getter | ||
| @EqualsAndHashCode | ||
| public class CesInternalLdapUser { | ||
| public static final String[] ObjectClasses = new String[]{"top", "person", "inetOrgPerson", "organizationalPerson", "cesperson"}; | ||
|
|
||
| public static final String UidAttribute = "uid"; | ||
| public static final String CnAttribute = "cn"; | ||
| public static final String SnAttribute = "sn"; | ||
| public static final String GivenNameAttribute = "givenname"; | ||
| public static final String DisplayNameAttribute = "displayName"; | ||
| public static final String MailAttribute = "mail"; | ||
| public static final String ExternalAttribute = "external"; | ||
| public static final String MemberOfAttribute = "memberOf"; | ||
|
|
||
| private String uid; | ||
| private String givenName; | ||
| private String familyName; | ||
| private String displayName; | ||
| private String mail; | ||
| private boolean external; | ||
| private Set<String> groups; | ||
|
|
||
| public CesInternalLdapUser(String uid, String givenName, String familyName, String displayName, String mail, boolean external) { | ||
| this.uid = uid; | ||
| this.givenName = givenName; | ||
| this.familyName = familyName; | ||
| this.displayName = displayName; | ||
| this.mail = mail; | ||
| this.external = external; | ||
| this.groups = new HashSet<>(); | ||
| } | ||
|
|
||
| public static CesInternalLdapUser UserFromEntry(LdapEntry entry) { | ||
| String uid = entry.getAttribute(CesInternalLdapUser.UidAttribute).getStringValue(); | ||
| String givenName = entry.getAttribute(CesInternalLdapUser.GivenNameAttribute).getStringValue(); | ||
| String familyName = entry.getAttribute(CesInternalLdapUser.SnAttribute).getStringValue(); | ||
| String displayName = entry.getAttribute(CesInternalLdapUser.DisplayNameAttribute).getStringValue(); | ||
| String mail = entry.getAttribute(CesInternalLdapUser.MailAttribute).getStringValue(); | ||
|
|
||
| String externalString = entry.getAttribute(CesInternalLdapUser.ExternalAttribute).getStringValue(); | ||
| boolean external = UserManager.LDAP_TRUE.equals(externalString); | ||
|
|
||
| CesInternalLdapUser user = new CesInternalLdapUser(uid, givenName, familyName, displayName, mail, external); | ||
|
|
||
| if (entry.getAttribute(CesInternalLdapUser.MemberOfAttribute) != null) { | ||
| for (String value : entry.getAttribute(CesInternalLdapUser.MemberOfAttribute).getStringValues()) { | ||
| String group = Util.extractGroupNameFromDn(value); | ||
| user.groups.add(group); | ||
| } | ||
| } | ||
|
|
||
| return user; | ||
| } | ||
|
|
||
|
|
||
| } |
11 changes: 11 additions & 0 deletions
11
app/src/main/java/de/triology/cas/ldap/CesLdapException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| package de.triology.cas.ldap; | ||
|
|
||
| public class CesLdapException extends Exception { | ||
| public CesLdapException(String msg) { | ||
| super(msg); | ||
| } | ||
|
|
||
| public CesLdapException(String msg, Throwable e) { | ||
| super(msg, e); | ||
| } | ||
| } |
27 changes: 27 additions & 0 deletions
27
app/src/main/java/de/triology/cas/ldap/LdapOperationFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| package de.triology.cas.ldap; | ||
|
|
||
| import org.ldaptive.AddOperation; | ||
| import org.ldaptive.ConnectionFactory; | ||
| import org.ldaptive.ModifyOperation; | ||
| import org.ldaptive.SearchOperation; | ||
|
|
||
| public class LdapOperationFactory { | ||
|
|
||
| private final ConnectionFactory connectionFactory; | ||
|
|
||
| public LdapOperationFactory(ConnectionFactory connectionFactory) { | ||
| this.connectionFactory = connectionFactory; | ||
| } | ||
|
|
||
| public SearchOperation searchOperation() { | ||
| return new SearchOperation(connectionFactory); | ||
| } | ||
|
|
||
| public AddOperation addOperation() { | ||
| return new AddOperation(connectionFactory); | ||
| } | ||
|
|
||
| public ModifyOperation modifyOperation() { | ||
| return new ModifyOperation(connectionFactory); | ||
| } | ||
| } |
144 changes: 144 additions & 0 deletions
144
app/src/main/java/de/triology/cas/ldap/UserManager.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| package de.triology.cas.ldap; | ||
|
|
||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.ldaptive.*; | ||
|
|
||
| /** | ||
| * UserManager can load, create and update {@link CesInternalLdapUser}s. | ||
| */ | ||
| @Slf4j | ||
| public class UserManager { | ||
| public static final String LDAP_TRUE = "TRUE"; | ||
| public static final String LDAP_FALSE = "FALSE"; | ||
|
|
||
| public static final String ObjectClassAttributeName = "objectClass"; | ||
|
|
||
| private final String baseDN; | ||
| private final LdapOperationFactory operationFactory; | ||
|
|
||
| /** | ||
| * Creates a new Usermanager that can load, create and update {@link CesInternalLdapUser}s. | ||
| */ | ||
| public UserManager(String baseDN, LdapOperationFactory operationFactory) { | ||
| this.baseDN = baseDN; | ||
| this.operationFactory = operationFactory; | ||
| } | ||
|
|
||
| /** | ||
| * Gets the {@link CesInternalLdapUser} for the given UID. | ||
| * | ||
| * @param uid the UID of the user to get | ||
| * @return null if the user for the given UID could not be found | ||
| * @throws CesLdapException for errors querying LDAP | ||
| */ | ||
| public CesInternalLdapUser getUserByUid(String uid) throws CesLdapException { | ||
| final SearchResponse response; | ||
| try { | ||
| final SearchRequest request = createGetUserRequest(uid); | ||
| response = operationFactory.searchOperation().execute(request); | ||
| } catch (final LdapException e) { | ||
| throw new CesLdapException("Failed executing LDAP query", e); | ||
| } | ||
|
|
||
| if (!response.isSuccess()) { | ||
| throw new CesLdapException(response.getDiagnosticMessage()); | ||
| } | ||
|
|
||
| if (response.getEntries().size() > 1) { | ||
| throw new CesLdapException("did not expect more then one result"); | ||
| } | ||
|
|
||
| LdapEntry entry = response.getEntry(); | ||
| if (entry == null) { | ||
| return null; | ||
| } | ||
|
|
||
| return CesInternalLdapUser.UserFromEntry(entry); | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * Creates a new {@link CesInternalLdapUser} | ||
| * | ||
| * @param user the user to create | ||
| * @throws CesLdapException for errors while creating the user in LDAP | ||
| */ | ||
| public void createUser(CesInternalLdapUser user) throws CesLdapException { | ||
| try { | ||
| final AddOperation modify = operationFactory.addOperation(); | ||
| final AddRequest request = AddRequest.builder() | ||
| .dn(createDnForUser(user)) | ||
| .attributes( | ||
| new LdapAttribute(ObjectClassAttributeName, CesInternalLdapUser.ObjectClasses), | ||
| new LdapAttribute(CesInternalLdapUser.CnAttribute, user.getUid()), | ||
| new LdapAttribute(CesInternalLdapUser.SnAttribute, user.getFamilyName()), | ||
| new LdapAttribute(CesInternalLdapUser.GivenNameAttribute, user.getGivenName()), | ||
| new LdapAttribute(CesInternalLdapUser.DisplayNameAttribute, user.getDisplayName()), | ||
| new LdapAttribute(CesInternalLdapUser.MailAttribute, user.getMail()), | ||
| new LdapAttribute(CesInternalLdapUser.ExternalAttribute, user.isExternal() ? LDAP_TRUE : LDAP_FALSE) | ||
| ) | ||
| .build(); | ||
|
|
||
| final AddResponse response = modify.execute(request); | ||
| if (!response.isSuccess()) { | ||
| throw new CesLdapException(response.getDiagnosticMessage()); | ||
| } | ||
|
|
||
| } catch (LdapException e) { | ||
| throw new CesLdapException("error while creating user", e); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Updates the given user in LDAP | ||
| * | ||
| * @param user the user to update | ||
| * @throws CesLdapException for errors while updating the user in LDAP | ||
| */ | ||
| public void updateUser(CesInternalLdapUser user) throws CesLdapException { | ||
| try { | ||
| final ModifyOperation modify = operationFactory.modifyOperation(); | ||
| final ModifyRequest request = ModifyRequest.builder() | ||
| .dn(createDnForUser(user)) | ||
| .modifications( | ||
| new AttributeModification(AttributeModification.Type.REPLACE, new LdapAttribute(CesInternalLdapUser.CnAttribute, user.getUid())), | ||
| new AttributeModification(AttributeModification.Type.REPLACE, new LdapAttribute(CesInternalLdapUser.SnAttribute, user.getFamilyName())), | ||
| new AttributeModification(AttributeModification.Type.REPLACE, new LdapAttribute(CesInternalLdapUser.GivenNameAttribute, user.getGivenName())), | ||
| new AttributeModification(AttributeModification.Type.REPLACE, new LdapAttribute(CesInternalLdapUser.DisplayNameAttribute, user.getDisplayName())), | ||
| new AttributeModification(AttributeModification.Type.REPLACE, new LdapAttribute(CesInternalLdapUser.MailAttribute, user.getMail())) | ||
| ) | ||
| .build(); | ||
| final ModifyResponse response = modify.execute(request); | ||
|
|
||
| if (!response.isSuccess()) { | ||
| throw new CesLdapException(response.getDiagnosticMessage()); | ||
| } | ||
| } catch (LdapException e) { | ||
| throw new CesLdapException("error while updating user", e); | ||
| } | ||
| } | ||
|
|
||
| private String createDnForUser(CesInternalLdapUser user) { | ||
| return CesInternalLdapUser.UidAttribute + "=" + user.getUid() + "," + this.baseDN; | ||
| } | ||
|
|
||
| private SearchRequest createGetUserRequest(String uid) { | ||
| String filter = String.format("(&%s%s)", uidFilter(uid), externalUsersFilter()); | ||
|
|
||
| SearchRequest request = new SearchRequest(); | ||
| request.setBaseDn(this.baseDN); | ||
| request.setReturnAttributes(CesInternalLdapUser.UidAttribute, CesInternalLdapUser.CnAttribute, CesInternalLdapUser.SnAttribute, CesInternalLdapUser.GivenNameAttribute, CesInternalLdapUser.DisplayNameAttribute, CesInternalLdapUser.MailAttribute, CesInternalLdapUser.ExternalAttribute, CesInternalLdapUser.MailAttribute, CesInternalLdapUser.ExternalAttribute, CesInternalLdapUser.MemberOfAttribute); | ||
| request.setFilter(filter); | ||
| request.setSearchScope(SearchScope.SUBTREE); | ||
| request.setSizeLimit(1); | ||
| return request; | ||
| } | ||
|
|
||
| private static String externalUsersFilter() { | ||
| return String.format("(%s=%s)", CesInternalLdapUser.ExternalAttribute, LDAP_TRUE); | ||
| } | ||
|
|
||
| private static String uidFilter(String uid) { | ||
| return String.format("(%s=%s)", CesInternalLdapUser.UidAttribute, uid); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| package de.triology.cas.ldap; | ||
|
|
||
| public class Util { | ||
| public static String extractGroupNameFromDn(String dn) { | ||
| String result = dn; | ||
| int eqindex = dn.indexOf('='); | ||
| int coindex = dn.indexOf(','); | ||
| if (eqindex > 0 && (coindex < 0 || eqindex < coindex) && dn.length() > eqindex + 1) { | ||
| dn = dn.substring(eqindex + 1); | ||
| coindex = dn.indexOf(','); | ||
| if (coindex > 0) { | ||
| result = dn.substring(0, coindex); | ||
| } else { | ||
| result = dn; | ||
| } | ||
| } | ||
| return result; | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.