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/08/01 02:57:28 UTC
[1/4] directory-kerby git commit: Adding whitespace test for
DIRKRB-717
Repository: directory-kerby
Updated Branches:
refs/heads/kerby-2.0.0 54127a1dc -> 1cde8948c
Adding whitespace test for DIRKRB-717
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/4d98e948
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/4d98e948
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/4d98e948
Branch: refs/heads/kerby-2.0.0
Commit: 4d98e94854610aa30cbce1072111cf2f1e8b4ad2
Parents: 54127a1
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Jul 27 12:14:52 2018 +0100
Committer: plusplusjiajia <ji...@intel.com>
Committed: Wed Aug 1 10:54:15 2018 +0800
----------------------------------------------------------------------
.../apache/kerby/kerberos/kerb/common/Krb5Parser.java | 3 +--
kerby-kerb/kerb-common/src/test/resources/krb5.conf | 11 +++++++++--
2 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4d98e948/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/Krb5Parser.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/Krb5Parser.java b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/Krb5Parser.java
index 13492fd..a226c90 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/Krb5Parser.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/Krb5Parser.java
@@ -98,8 +98,7 @@ public class Krb5Parser {
* @return a list of section names.
*/
public List<String> getSections() {
- List<String> al = new ArrayList<String>(items.keySet());
- return al;
+ return new ArrayList<String>(items.keySet());
}
/**
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4d98e948/kerby-kerb/kerb-common/src/test/resources/krb5.conf
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/test/resources/krb5.conf b/kerby-kerb/kerb-common/src/test/resources/krb5.conf
index a3b0d49..9d633b1 100644
--- a/kerby-kerb/kerb-common/src/test/resources/krb5.conf
+++ b/kerby-kerb/kerb-common/src/test/resources/krb5.conf
@@ -16,8 +16,12 @@
# limitations under the License.
#
; this is also a comment
+ ; So is this
+ # and this
include /etc
[libdefaults]
+ # Comment1
+ # Comment2
default_realm = KRB.COM
kdc_host = kdc-server.example.com
kdc_realm = TEST.COM
@@ -34,6 +38,8 @@ include /etc
default_tkt_enctypes = des-cbc-crc
[realms]
ATHENA.MIT.EDU = {
+ # Comment
+ # Comment2
admin_server = KERBEROS.MIT.EDU
default_domain = MIT.EDU
v4_instance_convert = {
@@ -55,7 +61,8 @@ include /etc
.media.mit.edu = MEDIA-LAB.MIT.EDU
media.mit.edu = MEDIA-LAB.MIT.EDU
.ucsc.edu = CATS.UCSC.EDU
-[logging]
+ [logging]
default = FILE:/var/log/krb5libs.log
kdc = FILE:/var/log/krb5kdc.log
- admin_server = FILE:/var/log/kadmind.log
\ No newline at end of file
+ admin_server = FILE:/var/log/kadmind.log
+ # Comment
[3/4] directory-kerby git commit: BouncyCastle upgrade
Posted by pl...@apache.org.
BouncyCastle upgrade
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/0ed06474
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/0ed06474
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/0ed06474
Branch: refs/heads/kerby-2.0.0
Commit: 0ed064743eddb9c14b5494fff00b226b54ec03d6
Parents: 3cbc7e1
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Jul 27 15:40:44 2018 +0100
Committer: plusplusjiajia <ji...@intel.com>
Committed: Wed Aug 1 10:54:23 2018 +0800
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/0ed06474/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a786972..d1ef710 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@
<mockito.version>2.7.22</mockito.version>
<netty.version>4.0.52.Final</netty.version>
<hadoop.version>3.0.0</hadoop.version>
- <bouncycastle.version>1.59</bouncycastle.version>
+ <bouncycastle.version>1.60</bouncycastle.version>
<jersey.container.version>2.17</jersey.container.version>
<jersey.version>1.19</jersey.version>
<commons-text.version>1.1</commons-text.version>
[4/4] directory-kerby git commit: Add get CA file REST API.
Posted by pl...@apache.org.
Add get CA file REST API.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/1cde8948
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/1cde8948
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/1cde8948
Branch: refs/heads/kerby-2.0.0
Commit: 1cde8948c0b24633392c7b7e80fa63c5100b325d
Parents: 0ed0647
Author: plusplusjiajia <ji...@intel.com>
Authored: Wed Aug 1 10:38:54 2018 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Wed Aug 1 10:54:26 2018 +0800
----------------------------------------------------------------------
.../org/apache/kerby/has/client/HasClient.java | 26 ++++++++------
.../kerby/has/server/web/rest/ConfigApi.java | 38 ++++++++++++++++++++
2 files changed, 53 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/1cde8948/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 c59e70d..f208033 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
@@ -382,7 +382,7 @@ public class HasClient {
try {
kdcRep = KrbCodec.decodeMessage(byteBuffer);
} catch (IOException e) {
- throw new HasException("Krb decoding message failed", e);
+ throw new HasException("Krb decoding message failed. " + e.getMessage());
}
return kdcRep;
} else {
@@ -433,7 +433,7 @@ public class HasClient {
try {
encKdcRepPart.decode(decryptedData);
} catch (IOException e) {
- throw new HasException("Failed to decode EncAsRepPart", e);
+ throw new HasException("Failed to decode EncAsRepPart. " + e.getMessage());
}
kdcRep.setEncPart(encKdcRepPart);
@@ -458,7 +458,7 @@ public class HasClient {
try {
cCache.store(ccacheFile);
} catch (IOException e) {
- throw new HasException("Failed to store tgt", e);
+ throw new HasException("Failed to store tgt. " + e.getMessage());
}
} else {
throw new IllegalArgumentException("Invalid ccache file, "
@@ -482,7 +482,7 @@ public class HasClient {
}
} catch (IOException e) {
throw new HasException("Failed to create ccache file "
- + ccacheFile.getAbsolutePath(), e);
+ + ccacheFile.getAbsolutePath() + ". " + e.getMessage());
}
}
@@ -554,7 +554,7 @@ public class HasClient {
try {
url = new URL("http://" + host + ":" + port + "/has/v1/getcert");
} catch (MalformedURLException e) {
- throw new HasException("Failed to create a URL object.", e);
+ throw new HasException("Failed to create a URL object." + e.getMessage());
}
try {
httpConn = (HttpURLConnection) url.openConnection();
@@ -566,7 +566,7 @@ public class HasClient {
httpConn.setRequestMethod("GET");
} catch (ProtocolException e) {
LOG.error("Fail to add principal. " + e);
- throw new HasException("Failed to set the method for URL request.", e);
+ throw new HasException("Failed to set the method for URL request. " + e.getMessage());
}
try {
@@ -579,11 +579,12 @@ public class HasClient {
InputStream in = HasClientUtil.getInputStream(httpConn);
certificate = (X509Certificate) factory.generateCertificate(in);
} catch (CertificateException e) {
- throw new HasException("Failed to get certificate from HAS server", e);
+ throw new HasException("Failed to get certificate from HAS server. "
+ + e.getMessage());
}
} catch (IOException e) {
- throw new HasException("IO error occurred.", e);
+ throw new HasException("IO error occurred. " + e.getMessage());
}
return certificate;
@@ -624,7 +625,8 @@ public class HasClient {
caRoot = (X509Certificate) factory.generateCertificate(in);
}
} catch (CertificateException | IOException e) {
- throw new HasException("Failed to get certificate from ca root file", e);
+ throw new HasException("Failed to get certificate from ca root file. "
+ + e.getMessage());
}
// Verify certificate with root certificate
@@ -661,7 +663,8 @@ public class HasClient {
trustStore.store(out, password.toCharArray());
out.close();
} catch (IOException | GeneralSecurityException e) {
- throw new HasException("Failed to create and save truststore file", e);
+ throw new HasException("Failed to create and save truststore file. "
+ + e.getMessage());
}
return password;
}
@@ -681,7 +684,8 @@ public class HasClient {
IOUtil.writeFile(content, new File(clientConfigFolder + "/ssl-client.conf"));
} catch (IOException e) {
- throw new HasException("Failed to create client ssl configuration file", e);
+ throw new HasException("Failed to create client ssl configuration file. "
+ + e.getMessage());
}
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/1cde8948/has-project/has-server/src/main/java/org/apache/kerby/has/server/web/rest/ConfigApi.java
----------------------------------------------------------------------
diff --git a/has-project/has-server/src/main/java/org/apache/kerby/has/server/web/rest/ConfigApi.java b/has-project/has-server/src/main/java/org/apache/kerby/has/server/web/rest/ConfigApi.java
index 2a70a34..262ad77 100644
--- a/has-project/has-server/src/main/java/org/apache/kerby/has/server/web/rest/ConfigApi.java
+++ b/has-project/has-server/src/main/java/org/apache/kerby/has/server/web/rest/ConfigApi.java
@@ -275,4 +275,42 @@ public class ConfigApi {
}
return Response.status(Response.Status.FORBIDDEN).entity("HTTPS required.\n").build();
}
+
+ /**
+ * Get CA file.
+ *
+ * @return Response
+ */
+ @GET
+ @Path("/getcert")
+ @Produces(MediaType.TEXT_PLAIN)
+ public Response getCert() {
+ final HasServer hasServer = WebServer.getHasServerFromContext(context);
+ String errMessage = null;
+ File cert = null;
+ try {
+ HasConfig hasConfig = HasUtil.getHasConfig(
+ new File(hasServer.getConfDir(), "has-server.conf"));
+ if (hasConfig != null) {
+ String certPath = hasConfig.getSslClientCert();
+ cert = new File(certPath);
+ if (!cert.exists()) {
+ errMessage = "Cert file not found in HAS server.";
+ WebServer.LOG.error("Cert file not found in HAS server.");
+ }
+ } else {
+ errMessage = "has-server.conf not found.";
+ WebServer.LOG.error("has-server.conf not found.");
+ }
+ } catch (HasException e) {
+ errMessage = "Failed to get cert file" + e.getMessage();
+ WebServer.LOG.error("Failed to get cert file" + e.getMessage());
+ }
+ if (errMessage == null) {
+ return Response.ok(cert).header("Content-Disposition",
+ "attachment;filename=" + cert.getName()).build();
+ } else {
+ return Response.status(Response.Status.NOT_FOUND).entity(errMessage).build();
+ }
+ }
}
[2/4] directory-kerby git commit: Upgrading Apache parent version
Posted by pl...@apache.org.
Upgrading Apache parent version
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/3cbc7e1d
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/3cbc7e1d
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/3cbc7e1d
Branch: refs/heads/kerby-2.0.0
Commit: 3cbc7e1d1393e9223903e73d52c7539c43620a89
Parents: 4d98e94
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Jul 27 12:21:31 2018 +0100
Committer: plusplusjiajia <ji...@intel.com>
Committed: Wed Aug 1 10:54:20 2018 +0800
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/3cbc7e1d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2f43123..a786972 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>19</version>
+ <version>20</version>
<relativePath />
</parent>