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 20B23200BCC for ; Mon, 14 Nov 2016 19:27:21 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 1F618160B18; Mon, 14 Nov 2016 18:27:21 +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 3A76B160B0F for ; Mon, 14 Nov 2016 19:27:19 +0100 (CET) Received: (qmail 26437 invoked by uid 500); 14 Nov 2016 18:27:16 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 25603 invoked by uid 99); 14 Nov 2016 18:27:15 -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; Mon, 14 Nov 2016 18:27:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B1B7AE3813; Mon, 14 Nov 2016 18:27:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ncole@apache.org To: commits@ambari.apache.org Date: Mon, 14 Nov 2016 18:27:57 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [44/50] [abbrv] ambari git commit: AMBARI-18860. LDAPS must be used to communicate with an Active Directory when Kerberos is being enabled (BE).(vbrodetskyi) archived-at: Mon, 14 Nov 2016 18:27:21 -0000 AMBARI-18860. LDAPS must be used to communicate with an Active Directory when Kerberos is being enabled (BE).(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5d7824ea Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5d7824ea Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5d7824ea Branch: refs/heads/branch-dev-patch-upgrade Commit: 5d7824ea3e6689e910ebc03b9bfe408cd4d30a15 Parents: f1200b7 Author: Vitaly Brodetskyi Authored: Sun Nov 13 21:49:58 2016 +0200 Committer: Vitaly Brodetskyi Committed: Sun Nov 13 21:49:58 2016 +0200 ---------------------------------------------------------------------- .../kerberos/ADKerberosOperationHandler.java | 3 +++ .../kerberos/ADKerberosOperationHandlerTest.java | 14 ++++++++++++++ 2 files changed, 17 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/5d7824ea/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandler.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandler.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandler.java index 48e04f4..32efa3e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandler.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandler.java @@ -149,6 +149,9 @@ public class ADKerberosOperationHandler extends KerberosOperationHandler { if (this.ldapUrl == null) { throw new KerberosKDCConnectionException("ldapUrl not provided"); } + if (!this.ldapUrl.startsWith("ldaps://")) { + throw new KerberosKDCConnectionException("ldapUrl is not valid ldaps URL"); + } this.principalContainerDn = kerberosConfiguration.get(KERBEROS_ENV_PRINCIPAL_CONTAINER_DN); if (this.principalContainerDn == null) { http://git-wip-us.apache.org/repos/asf/ambari/blob/5d7824ea/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandlerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandlerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandlerTest.java index 52cd372..a2304b8 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandlerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandlerTest.java @@ -91,6 +91,20 @@ public class ADKerberosOperationHandlerTest extends KerberosOperationHandlerTest handler.close(); } + @Test(expected = KerberosKDCConnectionException.class) + public void testOpenExceptionNoLdaps() throws Exception { + PrincipalKeyCredential kc = new PrincipalKeyCredential(DEFAULT_ADMIN_PRINCIPAL, "hello"); + KerberosOperationHandler handler = new ADKerberosOperationHandler(); + Map kerberosEnvMap = new HashMap() { + { + put(ADKerberosOperationHandler.KERBEROS_ENV_LDAP_URL, "ldap://this_wont_work"); + put(ADKerberosOperationHandler.KERBEROS_ENV_PRINCIPAL_CONTAINER_DN, DEFAULT_PRINCIPAL_CONTAINER_DN); + } + }; + handler.open(kc, DEFAULT_REALM, kerberosEnvMap); + handler.close(); + } + @Test(expected = KerberosAdminAuthenticationException.class) public void testTestAdministratorCredentialsIncorrectAdminPassword() throws Exception { PrincipalKeyCredential kc = new PrincipalKeyCredential(DEFAULT_ADMIN_PRINCIPAL, "wrong");