From beabaef7835fa4331f2b889b69d8bb6fab436fcc Mon Sep 17 00:00:00 2001 From: Yuriy M <95305560+yuremm@users.noreply.github.com> Date: Wed, 13 Sep 2023 16:38:16 +0300 Subject: [PATCH] fix: fix schema and update ldap samples (#6024) * fix: failed to search session by deviceSecret if DB is PostgreSQL #6012 * feat: update LDAP samples --------- Co-authored-by: Yuriy Movchan --- .../io/jans/orm/ldap/LdapBatchJobSample.java | 1 + .../io/jans/orm/ldap/LdapDeleteSample.java | 1 + .../java/io/jans/orm/ldap/LdapSample.java | 31 ++++++++++++------- .../orm/ldap/LdapSimpleSessionSample.java | 1 + .../orm/ldap/LdapUpateMissingEntrySample.java | 1 + .../io/jans/orm/ldap/LdapUserFieldRemove.java | 1 + .../MailUniquenessConfigurationSample.java | 1 + .../LdapEntryManagerSample.java | 4 +-- 8 files changed, 27 insertions(+), 14 deletions(-) rename jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/{ => persistence}/LdapEntryManagerSample.java (92%) diff --git a/jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/LdapBatchJobSample.java b/jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/LdapBatchJobSample.java index 3b4d146b745..38a7f2af820 100644 --- a/jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/LdapBatchJobSample.java +++ b/jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/LdapBatchJobSample.java @@ -17,6 +17,7 @@ import io.jans.orm.ldap.model.SimpleClient; import io.jans.orm.ldap.model.SimpleSession; import io.jans.orm.ldap.model.SimpleTokenLdap; +import io.jans.orm.ldap.persistence.LdapEntryManagerSample; import io.jans.orm.model.BatchOperation; import io.jans.orm.model.DefaultBatchOperation; import io.jans.orm.model.ProcessBatchOperation; diff --git a/jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/LdapDeleteSample.java b/jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/LdapDeleteSample.java index bafdc6753c3..286e0430e47 100644 --- a/jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/LdapDeleteSample.java +++ b/jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/LdapDeleteSample.java @@ -10,6 +10,7 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.status.StatusLogger; import io.jans.orm.ldap.impl.LdapEntryManager; +import io.jans.orm.ldap.persistence.LdapEntryManagerSample; import io.jans.orm.model.base.DeletableEntity; import io.jans.orm.search.filter.Filter; diff --git a/jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/LdapSample.java b/jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/LdapSample.java index 958fbd073c4..3458f417095 100644 --- a/jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/LdapSample.java +++ b/jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/LdapSample.java @@ -6,34 +6,30 @@ package io.jans.orm.ldap; +import java.util.Arrays; +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import io.jans.orm.ldap.impl.LdapEntryManager; import io.jans.orm.ldap.model.SimpleAttribute; import io.jans.orm.ldap.model.SimpleGrant; import io.jans.orm.ldap.model.SimpleSession; import io.jans.orm.ldap.model.SimpleUser; +import io.jans.orm.ldap.persistence.LdapEntryManagerSample; import io.jans.orm.model.PagedResult; import io.jans.orm.model.SearchScope; import io.jans.orm.model.SortOrder; import io.jans.orm.model.base.CustomObjectAttribute; import io.jans.orm.search.filter.Filter; -import org.apache.log4j.Logger; -import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.status.StatusLogger; - -import java.util.List; /** * @author Yuriy Movchan Date: 11/03/2016 */ public final class LdapSample { - private static final Logger LOG; - - static { - StatusLogger.getLogger().setLevel(Level.OFF); - LoggingHelper.configureConsoleAppender(); - LOG = Logger.getLogger(LdapSample.class); - } + private static final Logger LOG = LoggerFactory.getLogger(LdapSample.class); private LdapSample() { } @@ -45,6 +41,17 @@ public static void main(String[] args) { // Create LDAP entry manager LdapEntryManager ldapEntryManager = ldapEntryManagerSample.createLdapEntryManager(); + SimpleUser newUser = new SimpleUser(); + newUser.setDn(String.format("inum=%s,ou=people,o=jans", System.currentTimeMillis())); + newUser.setUserId("sample_user_" + System.currentTimeMillis()); + newUser.setUserPassword("pwd"); + newUser.getCustomAttributes().add(new CustomObjectAttribute("address", Arrays.asList("London", "Texas", "Kiev"))); + newUser.getCustomAttributes().add(new CustomObjectAttribute("transientId", "transientId")); + ldapEntryManager.persist(newUser); + + SimpleUser dummyUser = ldapEntryManager.find(SimpleUser.class, newUser.getDn()); + LOG.info("Dummy User '{}'", dummyUser); + // Find all users which have specified object classes defined in SimpleUser List users = ldapEntryManager.findEntries("o=jans", SimpleUser.class, null); for (SimpleUser user : users) { diff --git a/jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/LdapSimpleSessionSample.java b/jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/LdapSimpleSessionSample.java index b7ba4b46121..8f77a059506 100644 --- a/jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/LdapSimpleSessionSample.java +++ b/jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/LdapSimpleSessionSample.java @@ -16,6 +16,7 @@ import org.apache.logging.log4j.status.StatusLogger; import io.jans.orm.ldap.impl.LdapEntryManager; import io.jans.orm.ldap.model.SimpleSessionState; +import io.jans.orm.ldap.persistence.LdapEntryManagerSample; /** * @author Yuriy Movchan Date: 01/25/2016 diff --git a/jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/LdapUpateMissingEntrySample.java b/jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/LdapUpateMissingEntrySample.java index e195bf6673a..19bb7884d91 100644 --- a/jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/LdapUpateMissingEntrySample.java +++ b/jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/LdapUpateMissingEntrySample.java @@ -16,6 +16,7 @@ import io.jans.orm.exception.EntryPersistenceException; import io.jans.orm.ldap.impl.LdapEntryManager; import io.jans.orm.ldap.model.SimpleSessionState; +import io.jans.orm.ldap.persistence.LdapEntryManagerSample; /** * @author Yuriy Movchan Date: 03/09/2020 diff --git a/jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/LdapUserFieldRemove.java b/jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/LdapUserFieldRemove.java index 1890b5d97c3..81bc33b1224 100644 --- a/jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/LdapUserFieldRemove.java +++ b/jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/LdapUserFieldRemove.java @@ -2,6 +2,7 @@ import io.jans.orm.ldap.impl.LdapEntryManager; import io.jans.orm.ldap.model.SimpleUser; +import io.jans.orm.ldap.persistence.LdapEntryManagerSample; import io.jans.orm.search.filter.Filter; import org.apache.log4j.Logger; import org.apache.logging.log4j.Level; diff --git a/jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/MailUniquenessConfigurationSample.java b/jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/MailUniquenessConfigurationSample.java index 42cdc52d0a8..d30b839b418 100644 --- a/jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/MailUniquenessConfigurationSample.java +++ b/jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/MailUniquenessConfigurationSample.java @@ -11,6 +11,7 @@ import org.apache.logging.log4j.status.StatusLogger; import io.jans.orm.ldap.impl.LdapEntryManager; import io.jans.orm.ldap.model.MailUniquenessConfiguration; +import io.jans.orm.ldap.persistence.LdapEntryManagerSample; /** * @author Yuriy Movchan Date: 11/03/2016 diff --git a/jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/LdapEntryManagerSample.java b/jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/persistence/LdapEntryManagerSample.java similarity index 92% rename from jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/LdapEntryManagerSample.java rename to jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/persistence/LdapEntryManagerSample.java index 8fa695d1498..254ed636756 100644 --- a/jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/LdapEntryManagerSample.java +++ b/jans-orm/ldap-sample/src/main/java/io/jans/orm/ldap/persistence/LdapEntryManagerSample.java @@ -4,7 +4,7 @@ * Copyright (c) 2020, Janssen Project */ -package io.jans.orm.ldap; +package io.jans.orm.ldap.persistence; import java.util.Properties; @@ -24,7 +24,7 @@ private Properties getSampleConnectionProperties() { Properties connectionProperties = new Properties(); connectionProperties.put("ldap#bindDN", "cn=Directory Manager"); - connectionProperties.put("ldap#bindPassword", "secret"); + connectionProperties.put("ldap#bindPassword", "Secret1!"); connectionProperties.put("ldap#servers", "localhost:1636"); connectionProperties.put("ldap#useSSL", "true"); connectionProperties.put("ldap#maxconnections", "3");