Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id AD30D200B34 for ; Fri, 17 Jun 2016 13:50:55 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id AC0D5160A61; Fri, 17 Jun 2016 11:50:55 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id F3A62160A50 for ; Fri, 17 Jun 2016 13:50:54 +0200 (CEST) Received: (qmail 64676 invoked by uid 500); 17 Jun 2016 11:50:54 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 64664 invoked by uid 99); 17 Jun 2016 11:50:54 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Jun 2016 11:50:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EFC48DFC6F; Fri, 17 Jun 2016 11:50:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@directory.apache.org Date: Fri, 17 Jun 2016 11:50:54 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] directory-kerby git commit: No need to check the request type to set the token archived-at: Fri, 17 Jun 2016 11:50:55 -0000 No need to check the request type to set the token Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/79d4a584 Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/79d4a584 Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/79d4a584 Branch: refs/heads/trunk Commit: 79d4a584129026bcf920dd1ae5c28c27c6971412 Parents: f39f005 Author: Colm O hEigeartaigh Authored: Fri Jun 17 12:44:05 2016 +0100 Committer: Colm O hEigeartaigh Committed: Fri Jun 17 12:44:05 2016 +0100 ---------------------------------------------------------------------- .../kerberos/kerb/server/preauth/token/TokenPreauth.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/79d4a584/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/token/TokenPreauth.java ---------------------------------------------------------------------- diff --git a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/token/TokenPreauth.java b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/token/TokenPreauth.java index 5abca91..81ce5dd 100644 --- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/token/TokenPreauth.java +++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/token/TokenPreauth.java @@ -30,9 +30,7 @@ import org.apache.kerby.kerberos.kerb.preauth.PluginRequestContext; import org.apache.kerby.kerberos.kerb.preauth.token.TokenPreauthMeta; import org.apache.kerby.kerberos.kerb.provider.TokenDecoder; import org.apache.kerby.kerberos.kerb.server.preauth.AbstractPreauthPlugin; -import org.apache.kerby.kerberos.kerb.server.request.AsRequest; import org.apache.kerby.kerberos.kerb.server.request.KdcRequest; -import org.apache.kerby.kerberos.kerb.server.request.TgsRequest; import org.apache.kerby.kerberos.kerb.type.base.AuthToken; import org.apache.kerby.kerberos.kerb.type.base.EncryptedData; import org.apache.kerby.kerberos.kerb.type.base.EncryptionKey; @@ -108,13 +106,7 @@ public class TokenPreauth extends AbstractPreauthPlugin { if (!audiences.contains(serverPrincipal.getName())) { throw new KrbException("The token audience does not match with the target server principal!"); } - if (kdcRequest instanceof AsRequest) { - AsRequest asRequest = (AsRequest) kdcRequest; - asRequest.setToken(authToken); - } else if (kdcRequest instanceof TgsRequest) { - TgsRequest tgsRequest = (TgsRequest) kdcRequest; - tgsRequest.setToken(authToken); - } + kdcRequest.setToken(authToken); return true; } else { return false;