You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by co...@apache.org on 2023/03/31 06:16:08 UTC
[directory-kerby] 01/04: DIRKRB-729 - Upgrade LDAP API
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 1.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/directory-kerby.git
commit e17c5013f20766686c37bf724dc3baa4b998e0be
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Dec 19 10:39:51 2018 +0000
DIRKRB-729 - Upgrade LDAP API
---
.../kerby/kerberos/kdc/identitybackend/LdapIdentityBackend.java | 4 +++-
.../kerby/kerberos/kdc/identitybackend/LdapIdentityGetHelper.java | 2 +-
pom.xml | 4 ++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/kerby-backend/ldap-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/LdapIdentityBackend.java b/kerby-backend/ldap-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/LdapIdentityBackend.java
index d5b090be..6e5ad958 100644
--- a/kerby-backend/ldap-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/LdapIdentityBackend.java
+++ b/kerby-backend/ldap-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/LdapIdentityBackend.java
@@ -24,6 +24,7 @@ import org.apache.directory.api.ldap.model.cursor.EntryCursor;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
import org.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.api.ldap.model.exception.LdapException;
+import org.apache.directory.api.ldap.model.exception.LdapInvalidAttributeValueException;
import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;
import org.apache.directory.api.ldap.model.message.ModifyRequest;
import org.apache.directory.api.ldap.model.message.ModifyRequestImpl;
@@ -311,8 +312,9 @@ public class LdapIdentityBackend extends AbstractIdentityBackend {
* @param principalName The principal name to be convert.
* @return
* @throws org.apache.directory.api.ldap.model.exception.LdapInvalidDnException if a remote exception occurs.
+ * @throws LdapInvalidAttributeValueException
*/
- private Dn toDn(String principalName) throws LdapInvalidDnException {
+ private Dn toDn(String principalName) throws LdapInvalidDnException, LdapInvalidAttributeValueException {
String[] names = principalName.split("@");
String uid = names[0];
Dn dn = new Dn(new Rdn("uid", uid), new Dn(getConfig().getString("base_dn")));
diff --git a/kerby-backend/ldap-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/LdapIdentityGetHelper.java b/kerby-backend/ldap-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/LdapIdentityGetHelper.java
index bc070dcc..eb8807f3 100644
--- a/kerby-backend/ldap-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/LdapIdentityGetHelper.java
+++ b/kerby-backend/ldap-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/LdapIdentityGetHelper.java
@@ -68,7 +68,7 @@ public class LdapIdentityGetHelper {
* @return keys
*/
public List<EncryptionKey> getKeys() throws IOException {
- Iterator<Value<?>> iterator1 = entry.get(KerberosAttribute.KRB5_KEY_AT).iterator();
+ Iterator<Value> iterator1 = entry.get(KerberosAttribute.KRB5_KEY_AT).iterator();
List<EncryptionKey> keys = new ArrayList<>();
while (iterator1.hasNext()) {
byte[] encryKey = iterator1.next().getBytes();
diff --git a/pom.xml b/pom.xml
index 3b16884e..27f9e3a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,10 +47,10 @@
</distributionManagement>
<properties>
- <apacheds.version>2.0.0-M24</apacheds.version>
+ <apacheds.version>2.0.0.AM25</apacheds.version>
<commons-io.version>2.8.0</commons-io.version>
<gson.version>2.8.9</gson.version>
- <ldap.api.version>1.0.1</ldap.api.version>
+ <ldap.api.version>2.0.0.AM1</ldap.api.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.13.2</junit.version>
<nimbus.jose.version>9.30.2</nimbus.jose.version>