You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pl...@apache.org on 2016/07/20 08:16:09 UTC
directory-kerby git commit: DIRKRB-596 Add some log in remote kadmin
module.
Repository: directory-kerby
Updated Branches:
refs/heads/trunk cdd88c5ea -> 65d9d29a6
DIRKRB-596 Add some log in remote kadmin module.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/65d9d29a
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/65d9d29a
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/65d9d29a
Branch: refs/heads/trunk
Commit: 65d9d29a6939c3a147bf2bbe5290530b327ae0cf
Parents: cdd88c5
Author: plusplusjiajia <ji...@intel.com>
Authored: Wed Jul 20 16:22:05 2016 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Wed Jul 20 16:22:05 2016 +0800
----------------------------------------------------------------------
.../admin/server/kadmin/AdminServerHandler.java | 6 ++-
.../admin/server/kadmin/AdminServerUtil.java | 43 --------------------
.../kadmin/impl/DefaultAdminServerHandler.java | 5 +--
3 files changed, 7 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/65d9d29a/kerby-kerb/kerb-admin-server/src/main/java/org/apache/kerby/kerberos/kerb/admin/server/kadmin/AdminServerHandler.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-admin-server/src/main/java/org/apache/kerby/kerberos/kerb/admin/server/kadmin/AdminServerHandler.java b/kerby-kerb/kerb-admin-server/src/main/java/org/apache/kerby/kerberos/kerb/admin/server/kadmin/AdminServerHandler.java
index 5b85d96..1f1197f 100644
--- a/kerby-kerb/kerb-admin-server/src/main/java/org/apache/kerby/kerberos/kerb/admin/server/kadmin/AdminServerHandler.java
+++ b/kerby-kerb/kerb-admin-server/src/main/java/org/apache/kerby/kerberos/kerb/admin/server/kadmin/AdminServerHandler.java
@@ -134,6 +134,7 @@ public class AdminServerHandler {
}
}
String message = "add principal of " + principal;
+ System.out.println(message);
LOG.info(message);
ByteBuffer responseMessage = infoPackageTool(message, "addPrincipal");
return responseMessage;
@@ -152,6 +153,7 @@ public class AdminServerHandler {
return response;
}
String message = "delete principal of " + principal;
+ System.out.println(message);
LOG.info(message);
ByteBuffer responseMessage = infoPackageTool(message, "deletePrincipal");
return responseMessage;
@@ -159,7 +161,6 @@ public class AdminServerHandler {
private ByteBuffer handleRenamePrincipalReq(LocalKadmin localKadmin, XdrFieldInfo[] fieldInfos) throws IOException {
/** message structure: msg_type, para_num(always equals 2), old name, new name*/
-
String[] oldPrincipalName = ((String) fieldInfos[2].getValue()).split("@");
String[] newPrincipalName = ((String) fieldInfos[3].getValue()).split("@");
try {
@@ -173,6 +174,8 @@ public class AdminServerHandler {
}
String message = "rename " + oldPrincipalName[0] + " to " + newPrincipalName[0];
+ System.out.println(message);
+ LOG.info(message);
ByteBuffer responseMessage = infoPackageTool(message, "renamePrincipal");
return responseMessage;
}
@@ -191,6 +194,7 @@ public class AdminServerHandler {
return responseMessage;
} catch (KrbException e) {
String error = "principal do not exist.";
+ LOG.error(error + e);
ByteBuffer responseError = infoPackageTool(error, "getPrincs");
return responseError;
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/65d9d29a/kerby-kerb/kerb-admin-server/src/main/java/org/apache/kerby/kerberos/kerb/admin/server/kadmin/AdminServerUtil.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-admin-server/src/main/java/org/apache/kerby/kerberos/kerb/admin/server/kadmin/AdminServerUtil.java b/kerby-kerb/kerb-admin-server/src/main/java/org/apache/kerby/kerberos/kerb/admin/server/kadmin/AdminServerUtil.java
index f48bf5b..f625c37 100644
--- a/kerby-kerb/kerb-admin-server/src/main/java/org/apache/kerby/kerberos/kerb/admin/server/kadmin/AdminServerUtil.java
+++ b/kerby-kerb/kerb-admin-server/src/main/java/org/apache/kerby/kerberos/kerb/admin/server/kadmin/AdminServerUtil.java
@@ -21,8 +21,6 @@ package org.apache.kerby.kerberos.kerb.admin.server.kadmin;
import org.apache.kerby.kerberos.kerb.KrbException;
import org.apache.kerby.kerberos.kerb.identity.backend.BackendConfig;
-import org.apache.kerby.kerberos.kerb.identity.backend.IdentityBackend;
-import org.apache.kerby.kerberos.kerb.identity.backend.MemoryIdentityBackend;
import org.apache.kerby.kerberos.kerb.server.KdcConfig;
import org.apache.kerby.kerberos.kerb.transport.TransportPair;
@@ -35,8 +33,6 @@ import java.net.InetSocketAddress;
*/
public final class AdminServerUtil {
- private AdminServerUtil() { }
-
/**
* Get adminServer configuration
* @param confDir configuration directory
@@ -55,7 +51,6 @@ public final class AdminServerUtil {
}
return adminServerConfig;
}
-
return null;
}
@@ -77,7 +72,6 @@ public final class AdminServerUtil {
}
return kdcConfig;
}
-
return null;
}
@@ -99,47 +93,10 @@ public final class AdminServerUtil {
}
return backendConfig;
}
-
return null;
}
/**
- * Init the identity backend from backend configuration.
- *
- * @throws KrbException e.
- * @param backendConfig backend configuration information
- * @return backend
- */
- public static IdentityBackend getBackend(
- BackendConfig backendConfig) throws KrbException {
- String backendClassName = backendConfig.getString(
- AdminServerConfigKey.KDC_IDENTITY_BACKEND, true);
- if (backendClassName == null) {
- backendClassName = MemoryIdentityBackend.class.getCanonicalName();
- }
-
- Class<?> backendClass;
- try {
- backendClass = Class.forName(backendClassName);
- } catch (ClassNotFoundException e) {
- throw new KrbException("Failed to load backend class: "
- + backendClassName);
- }
-
- IdentityBackend backend;
- try {
- backend = (IdentityBackend) backendClass.newInstance();
- } catch (InstantiationException | IllegalAccessException e) {
- throw new KrbException("Failed to create backend: "
- + backendClassName);
- }
-
- backend.setConfig(backendConfig);
- backend.initialize();
- return backend;
- }
-
- /**
* Get KDC network transport addresses according to KDC setting.
* @param setting kdc setting
* @return UDP and TCP addresses pair
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/65d9d29a/kerby-kerb/kerb-admin-server/src/main/java/org/apache/kerby/kerberos/kerb/admin/server/kadmin/impl/DefaultAdminServerHandler.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-admin-server/src/main/java/org/apache/kerby/kerberos/kerb/admin/server/kadmin/impl/DefaultAdminServerHandler.java b/kerby-kerb/kerb-admin-server/src/main/java/org/apache/kerby/kerberos/kerb/admin/server/kadmin/impl/DefaultAdminServerHandler.java
index 1dbb017..764befb 100644
--- a/kerby-kerb/kerb-admin-server/src/main/java/org/apache/kerby/kerberos/kerb/admin/server/kadmin/impl/DefaultAdminServerHandler.java
+++ b/kerby-kerb/kerb-admin-server/src/main/java/org/apache/kerby/kerberos/kerb/admin/server/kadmin/impl/DefaultAdminServerHandler.java
@@ -131,7 +131,7 @@ public class DefaultAdminServerHandler extends AdminServerHandler implements Run
while (!ss.isComplete()) {
int scComplete = message.getInt();
if (scComplete == 0) {
- System.out.println("success!!!");
+ logger.info("sasl negotiation success!!!");
sasl = true;
break;
}
@@ -164,6 +164,7 @@ public class DefaultAdminServerHandler extends AdminServerHandler implements Run
buffer.put(challenge);
buffer.flip();
transport.sendMessage(buffer);
+ logger.info("Send message to admin client.");
}
private static class SaslGssCallbackHandler implements CallbackHandler {
@@ -189,8 +190,6 @@ public class DefaultAdminServerHandler extends AdminServerHandler implements Run
ac.setAuthorized(false);
}
if (ac.isAuthorized()) {
- // System.out.println("SASL server GSSAPI callback: setting "
- //+ "canonicalized client ID: " + authzid);
ac.setAuthorizedID(authzid);
}
}