You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2015/06/22 22:11:19 UTC
directory-kerby git commit: Extract DN construction to method
Repository: directory-kerby
Updated Branches:
refs/heads/master 5c5c27d64 -> b8f7c7214
Extract DN construction to method
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/b8f7c721
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/b8f7c721
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/b8f7c721
Branch: refs/heads/master
Commit: b8f7c7214e12ca4c805aa4787d90b1e415b890d4
Parents: 5c5c27d
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
Authored: Mon Jun 22 22:10:43 2015 +0200
Committer: Stefan Seelmann <ma...@stefan-seelmann.de>
Committed: Mon Jun 22 22:10:43 2015 +0200
----------------------------------------------------------------------
.../identitybackend/LdapIdentityBackend.java | 22 ++++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/b8f7c721/kerby-backend/ldap-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/LdapIdentityBackend.java
----------------------------------------------------------------------
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 6e0cf12..69803dd 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
@@ -140,11 +140,10 @@ public class LdapIdentityBackend extends AbstractIdentityBackend {
protected KrbIdentity doAddIdentity(KrbIdentity identity) {
String principalName = identity.getPrincipalName();
String[] names = principalName.split("@");
- String uid = names[0];
Entry entry = new DefaultEntry();
KeysInfo keysInfo = new KeysInfo(identity);
try {
- Dn dn = new Dn(new Rdn("uid", uid), new Dn(BASE_DN));
+ Dn dn = toDn(principalName);
entry.setDn(dn);
entry.add("objectClass", "top", "person", "inetOrgPerson", "krb5principal", "krb5kdcentry");
entry.add("cn", names[0]);
@@ -173,11 +172,9 @@ public class LdapIdentityBackend extends AbstractIdentityBackend {
@Override
protected KrbIdentity doGetIdentity(String principalName) {
- String[] names = principalName.split("@");
- String uid = names[0];
KrbIdentity krbIdentity = new KrbIdentity(principalName);
try {
- Dn dn = new Dn(new Rdn("uid", uid), new Dn(BASE_DN));
+ Dn dn = toDn(principalName);
Entry entry = connection.lookup(dn, "*", "+");
if (entry == null) {
return null;
@@ -206,11 +203,9 @@ public class LdapIdentityBackend extends AbstractIdentityBackend {
@Override
protected KrbIdentity doUpdateIdentity(KrbIdentity identity) {
String principalName = identity.getPrincipalName();
- String[] names = principalName.split("@");
- String uid = names[0];
KeysInfo keysInfo = new KeysInfo(identity);
try {
- Dn dn = new Dn(new Rdn("uid", uid), new Dn(BASE_DN));
+ Dn dn = toDn(principalName);
ModifyRequest modifyRequest = new ModifyRequestImpl();
modifyRequest.setName(dn);
modifyRequest.replace(KerberosAttribute.KRB5_KEY_VERSION_NUMBER_AT, "" + identity.getKeyVersion());
@@ -230,16 +225,21 @@ public class LdapIdentityBackend extends AbstractIdentityBackend {
@Override
protected void doDeleteIdentity(String principalName) {
- String[] names = principalName.split("@");
- String uid = names[0];
try {
- Dn dn = new Dn(new Rdn("uid", uid), new Dn(BASE_DN));
+ Dn dn = toDn(principalName);
connection.delete(dn);
} catch (LdapException e) {
e.printStackTrace();
}
}
+ private Dn toDn(String principalName) throws LdapInvalidDnException {
+ String[] names = principalName.split("@");
+ String uid = names[0];
+ Dn dn = new Dn(new Rdn("uid", uid), new Dn(BASE_DN));
+ return dn;
+ }
+
@Override
public List<String> getIdentities(int start, int limit) {
return null;