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 2017/04/25 07:13:35 UTC
directory-kerby git commit: Set renewable_life in ticket.
Repository: directory-kerby
Updated Branches:
refs/heads/trunk 698664421 -> 0b199d682
Set renewable_life in ticket.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/0b199d68
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/0b199d68
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/0b199d68
Branch: refs/heads/trunk
Commit: 0b199d6821a98c0087625b4464137484759e88be
Parents: 6986644
Author: plusplusjiajia <ji...@intel.com>
Authored: Tue Apr 25 15:20:31 2017 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Tue Apr 25 15:20:31 2017 +0800
----------------------------------------------------------------------
kerby-dist/kdc-dist/pom.xml | 4 +++-
.../kerby/kerberos/kerb/client/request/KdcRequest.java | 10 ++++++++++
.../apache/kerby/kerberos/kerb/server/KdcServerTest.java | 1 -
3 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/0b199d68/kerby-dist/kdc-dist/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-dist/kdc-dist/pom.xml b/kerby-dist/kdc-dist/pom.xml
index da3a2e1..7adb9cb 100644
--- a/kerby-dist/kdc-dist/pom.xml
+++ b/kerby-dist/kdc-dist/pom.xml
@@ -96,7 +96,7 @@
<version>${project.version}</version>
</dependency>
- <!-- For Zookeeper backend -->
+ <!-- For Zookeeper backend
<dependency>
<groupId>org.apache.kerby</groupId>
<artifactId>zookeeper-backend</artifactId>
@@ -112,6 +112,8 @@
<artifactId>netty</artifactId>
<version>3.7.0.Final</version>
</dependency>
+ -->
+
<!-- For json backend -->
<dependency>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/0b199d68/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/KdcRequest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/KdcRequest.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/KdcRequest.java
index 1900783..8b88097 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/KdcRequest.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/KdcRequest.java
@@ -24,6 +24,7 @@ import org.apache.kerby.KOptions;
import org.apache.kerby.kerberos.kerb.KrbException;
import org.apache.kerby.kerberos.kerb.client.KrbContext;
import org.apache.kerby.kerberos.kerb.client.KrbKdcOption;
+import org.apache.kerby.kerberos.kerb.client.KrbOption;
import org.apache.kerby.kerberos.kerb.client.KrbOptionGroup;
import org.apache.kerby.kerberos.kerb.client.preauth.KrbFastRequestState;
import org.apache.kerby.kerberos.kerb.client.preauth.PreauthContext;
@@ -189,6 +190,15 @@ public abstract class KdcRequest {
body.setTill(new KerberosTime(startTime + getTicketValidTime()));
+ long renewLifetime;
+ if (getRequestOptions().contains(KrbOption.RENEWABLE_TIME)) {
+ renewLifetime = getRequestOptions().getIntegerOption(KrbOption.RENEWABLE_TIME);
+ } else {
+ renewLifetime = getContext().getKrbSetting().getKrbConfig().getRenewLifetime();
+ }
+ KerberosTime rtime = new KerberosTime(startTime + renewLifetime * 1000);
+ body.setRtime(rtime);
+
int nonce = generateNonce();
body.setNonce(nonce);
setChosenNonce(nonce);
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/0b199d68/kerby-kerb/kerb-server/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcServerTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcServerTest.java b/kerby-kerb/kerb-server/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcServerTest.java
index 14394c9..9ed96c8 100644
--- a/kerby-kerb/kerb-server/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcServerTest.java
+++ b/kerby-kerb/kerb-server/src/test/java/org/apache/kerby/kerberos/kerb/server/KdcServerTest.java
@@ -28,7 +28,6 @@ import org.junit.Test;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
-import java.nio.ByteBuffer;
import java.nio.channels.SocketChannel;
public class KdcServerTest {