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 2018/10/01 15:02:37 UTC
[1/2] directory-kerby git commit: Updating surefire + mockito to
support newer Java versions
Repository: directory-kerby
Updated Branches:
refs/heads/trunk 2ef226696 -> 4379a7aa0
Updating surefire + mockito to support newer Java versions
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/7705f16d
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/7705f16d
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/7705f16d
Branch: refs/heads/trunk
Commit: 7705f16d3362847795fe6598922cb27e85f96b7b
Parents: 2ef2266
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Oct 1 13:09:26 2018 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Oct 1 13:09:26 2018 +0100
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/7705f16d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d33954c..290e720 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
<jline.version>3.6.0</jline.version>
<maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
<maven-jxr-plugin.version>2.5</maven-jxr-plugin.version>
- <mockito.version>2.7.22</mockito.version>
+ <mockito.version>2.22.0</mockito.version>
<netty.version>4.0.52.Final</netty.version>
<hadoop.version>3.1.1</hadoop.version>
<bouncycastle.version>1.60</bouncycastle.version>
@@ -188,7 +188,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.20.1</version>
+ <version>2.21.0</version>
<configuration>
<skipTests>${skipTests}</skipTests>
<reuseForks>false</reuseForks>
[2/2] directory-kerby git commit: Fix build with JDK 9, 10, 11
Posted by co...@apache.org.
Fix build with JDK 9, 10, 11
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/4379a7aa
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/4379a7aa
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/4379a7aa
Branch: refs/heads/trunk
Commit: 4379a7aa0724911eaed72a57ee59614144e2407e
Parents: 7705f16
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Oct 1 16:02:27 2018 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Oct 1 16:02:27 2018 +0100
----------------------------------------------------------------------
.../integration/test/KerbyTokenAppTest.java | 11 ++++++++++
.../kerberos/kerb/gss/impl/GssContext.java | 23 ++++++++++++++++++++
2 files changed, 34 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4379a7aa/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/KerbyTokenAppTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/KerbyTokenAppTest.java b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/KerbyTokenAppTest.java
index 5696b89..ee2ad64 100644
--- a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/KerbyTokenAppTest.java
+++ b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/KerbyTokenAppTest.java
@@ -38,6 +38,7 @@ import org.apache.kerby.kerberos.kerb.type.base.AuthToken;
import org.apache.kerby.kerberos.kerb.type.base.KrbToken;
import org.apache.kerby.kerberos.kerb.type.base.TokenFormat;
import org.apache.kerby.kerberos.provider.token.JwtTokenEncoder;
+import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
@@ -63,6 +64,16 @@ public class KerbyTokenAppTest extends TokenAppTest {
// inserted into the AuthorizationData part of the service ticket.
@Test
public void testJwtAccessToken() throws Exception {
+ // See DIRKRB-728 - KerbyTokenAppTest fails with Java 11
+ String javaVersion = System.getProperty("java.version");
+ if (javaVersion != null) {
+ String version = javaVersion.trim();
+ if (version.contains(".")) {
+ version = version.substring(0, version.indexOf('.'));
+ }
+ Assume.assumeFalse(Integer.parseInt(version) >= 9);
+ }
+
runAppClientWithToken(createAppClient());
KrbToken receivedToken = ((GssAppServer) appServer).getReceivedAccessToken();
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4379a7aa/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssContext.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssContext.java b/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssContext.java
index 3da77d2..e8775ea 100644
--- a/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssContext.java
+++ b/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssContext.java
@@ -664,6 +664,29 @@ public class GssContext implements GSSContextSpi {
this.authTime = authTime;
}
+ public Object inquireSecContext(String type) throws GSSException {
+ if (ctxState != STATE_ESTABLISHED) {
+ throw new GSSException(GSSException.NO_CONTEXT, -1, "Invalid context");
+ }
+
+ switch (type) {
+ case "KRB5_GET_SESSION_KEY":
+ return getSessionKey();
+ case "KRB5_GET_TKT_FLAGS":
+ return GssUtil.ticketFlagsToBooleans(ticketFlags);
+ case "KRB5_GET_AUTHZ_DATA":
+ if (isInitiator()) {
+ throw new GSSException(GSSException.UNAVAILABLE, -1,
+ "Authorization data not available for initiator");
+ } else {
+ return GssUtil.kerbyAuthorizationDataToJgssAuthorizationDataEntries(authData);
+ }
+ case "KRB5_GET_AUTHTIME":
+ return authTime;
+ }
+ throw new GSSException(GSSException.UNAVAILABLE, -1, "Unsupported inquire type");
+ }
+
public Object inquireSecContext(InquireType type) throws GSSException {
if (ctxState != STATE_ESTABLISHED) {
throw new GSSException(GSSException.NO_CONTEXT, -1, "Invalid context");