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 2018/07/13 02:32:58 UTC
directory-kerby git commit: Check the ssl config file exist.
Repository: directory-kerby
Updated Branches:
refs/heads/trunk 5747dd130 -> 0ec5a00a9
Check the ssl config file exist.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/0ec5a00a
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/0ec5a00a
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/0ec5a00a
Branch: refs/heads/trunk
Commit: 0ec5a00a9c768e74af00b9facd5d8f56a23d82aa
Parents: 5747dd1
Author: plusplusjiajia <ji...@intel.com>
Authored: Fri Jul 13 10:29:49 2018 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Fri Jul 13 10:29:49 2018 +0800
----------------------------------------------------------------------
.../main/java/org/apache/kerby/has/client/HasClient.java | 3 +--
.../java/org/apache/kerby/has/client/HasClientUtil.java | 7 +++++++
.../java/org/apache/kerby/has/server/web/WebServer.java | 7 ++++++-
.../apache/kerby/has/server/web/rest/AsRequestApi.java | 1 -
.../kerby/kerberos/tool/hclient/HasClientLoginTool.java | 10 +++++-----
5 files changed, 19 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/0ec5a00a/has-project/has-client/src/main/java/org/apache/kerby/has/client/HasClient.java
----------------------------------------------------------------------
diff --git a/has-project/has-client/src/main/java/org/apache/kerby/has/client/HasClient.java b/has-project/has-client/src/main/java/org/apache/kerby/has/client/HasClient.java
index 0fbc898..66e150a 100755
--- a/has-project/has-client/src/main/java/org/apache/kerby/has/client/HasClient.java
+++ b/has-project/has-client/src/main/java/org/apache/kerby/has/client/HasClient.java
@@ -274,7 +274,6 @@ public class HasClient {
}
conn.setDoOutput(true);
conn.setDoInput(true);
-
try {
conn.connect();
@@ -304,7 +303,7 @@ public class HasClient {
}
}
if (!success) {
- throw new HasException("Failed : HTTP error code : "
+ throw new HasException("Failed: HTTP error code : "
+ responseStatus);
}
} else {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/0ec5a00a/has-project/has-client/src/main/java/org/apache/kerby/has/client/HasClientUtil.java
----------------------------------------------------------------------
diff --git a/has-project/has-client/src/main/java/org/apache/kerby/has/client/HasClientUtil.java b/has-project/has-client/src/main/java/org/apache/kerby/has/client/HasClientUtil.java
index 56ebd98..93b2c5b 100644
--- a/has-project/has-client/src/main/java/org/apache/kerby/has/client/HasClientUtil.java
+++ b/has-project/has-client/src/main/java/org/apache/kerby/has/client/HasClientUtil.java
@@ -20,11 +20,13 @@
package org.apache.kerby.has.client;
import org.apache.kerby.has.common.HasConfig;
+import org.apache.kerby.has.common.HasException;
import org.apache.kerby.has.common.ssl.SSLFactory;
import org.apache.kerby.has.common.util.URLConnectionFactory;
import org.apache.kerby.kerberos.kerb.KrbException;
import java.io.BufferedReader;
+import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -40,6 +42,11 @@ public class HasClientUtil {
conf.setString(SSLFactory.SSL_HOSTNAME_VERIFIER_KEY, "ALLOW_ALL");
String sslClientConf = hasConfig.getSslClientConf();
+ File sslClientConfFile = new File(sslClientConf);
+ if (!sslClientConfFile.exists()) {
+ throw new HasException("The ssl client config file "
+ + sslClientConf + " does not exist.");
+ }
conf.setString(SSLFactory.SSL_CLIENT_CONF_KEY, sslClientConf);
conf.setBoolean(SSLFactory.SSL_REQUIRE_CLIENT_CERT_KEY, false);
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/0ec5a00a/has-project/has-server/src/main/java/org/apache/kerby/has/server/web/WebServer.java
----------------------------------------------------------------------
diff --git a/has-project/has-server/src/main/java/org/apache/kerby/has/server/web/WebServer.java b/has-project/has-server/src/main/java/org/apache/kerby/has/server/web/WebServer.java
index 1b1f9e6..7191383 100644
--- a/has-project/has-server/src/main/java/org/apache/kerby/has/server/web/WebServer.java
+++ b/has-project/has-server/src/main/java/org/apache/kerby/has/server/web/WebServer.java
@@ -274,8 +274,13 @@ public class WebServer {
WebConfigKey.HAS_SERVER_HTTPS_KEYSTORE_RESOURCE_KEY,
WebConfigKey.HAS_SERVER_HTTPS_KEYSTORE_RESOURCE_DEFAULT);
LOG.info("Get the ssl config file: " + sslConfigString);
+ File sslConfig = new File(sslConfigString);
+ if (!sslConfig.exists()) {
+ throw new HasException("The ssl server config file "
+ + sslConfigString + " does not exist.");
+ }
try {
- sslConf.addIniConfig(new File(sslConfigString));
+ sslConf.addIniConfig(sslConfig);
} catch (IOException e) {
throw new HasException("Errors occurred when adding config. " + e.getMessage());
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/0ec5a00a/has-project/has-server/src/main/java/org/apache/kerby/has/server/web/rest/AsRequestApi.java
----------------------------------------------------------------------
diff --git a/has-project/has-server/src/main/java/org/apache/kerby/has/server/web/rest/AsRequestApi.java b/has-project/has-server/src/main/java/org/apache/kerby/has/server/web/rest/AsRequestApi.java
index c40ee38..2bc6a53 100644
--- a/has-project/has-server/src/main/java/org/apache/kerby/has/server/web/rest/AsRequestApi.java
+++ b/has-project/has-server/src/main/java/org/apache/kerby/has/server/web/rest/AsRequestApi.java
@@ -84,7 +84,6 @@ public class AsRequestApi {
String js = null;
ObjectMapper mapper = new ObjectMapper();
final Map<String, Object> m = new TreeMap<String, Object>();
-
if (hasServer.getKdcServer() == null) {
errMessage = "Please start the has KDC server.";
} else if (tokenStr != null && !tokenStr.isEmpty()) {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/0ec5a00a/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/hclient/HasClientLoginTool.java
----------------------------------------------------------------------
diff --git a/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/hclient/HasClientLoginTool.java b/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/hclient/HasClientLoginTool.java
index a49a7e7..de8aed1 100644
--- a/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/hclient/HasClientLoginTool.java
+++ b/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/hclient/HasClientLoginTool.java
@@ -53,7 +53,7 @@ public class HasClientLoginTool {
private static final String TGT_USAGE = (OSUtil.isWindows()
? "Usage: bin\\k=login-test.cmd" : "Usage: sh bin/login-test.sh")
- + " tgt [conf_dir]\n"
+ + " tgt [conf_dir] [plugin_type]\n"
+ "\n";
private static void printKeytabUsage(String error) {
@@ -91,7 +91,7 @@ public class HasClientLoginTool {
public static void main(String[] args) {
- if (args.length < 2) {
+ if (args.length < 3) {
System.err.println(TGT_USAGE);
System.err.println(KEYTAB_USAGE);
return;
@@ -102,8 +102,8 @@ public class HasClientLoginTool {
File workDir;
if (cmd.equals("tgt")) {
- if (args.length != 2) {
- printTgtUsage("Need 2 args.");
+ if (args.length != 3) {
+ printTgtUsage("Need 3 args.");
return;
}
@@ -126,7 +126,7 @@ public class HasClientLoginTool {
}
String host = hasConfig.getHttpsHost();
String port = hasConfig.getHttpsPort();
- String type = hasConfig.getPluginName();
+ String type = args[2];
HasClient hasClient = new HasClient();
TgtTicket tgtTicket;