Return-Path: X-Original-To: apmail-geode-commits-archive@minotaur.apache.org Delivered-To: apmail-geode-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6BF6B18ED0 for ; Fri, 8 Jan 2016 23:37:17 +0000 (UTC) Received: (qmail 85837 invoked by uid 500); 8 Jan 2016 23:37:17 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 85766 invoked by uid 500); 8 Jan 2016 23:37:17 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 85747 invoked by uid 99); 8 Jan 2016 23:37:17 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Jan 2016 23:37:17 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id B6259C0CFB for ; Fri, 8 Jan 2016 23:37:16 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.227 X-Spam-Level: * X-Spam-Status: No, score=1.227 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.554, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id 0BiBlwn6wN1z for ; Fri, 8 Jan 2016 23:37:09 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 3970243A78 for ; Fri, 8 Jan 2016 23:37:03 +0000 (UTC) Received: (qmail 83045 invoked by uid 99); 8 Jan 2016 23:37:03 -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, 08 Jan 2016 23:37:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2B7CAE3850; Fri, 8 Jan 2016 23:37:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: klund@apache.org To: commits@geode.incubator.apache.org Date: Fri, 08 Jan 2016 23:37:16 -0000 Message-Id: In-Reply-To: <28d9f2c3ae2c498882164a0dfa1c83c9@git.apache.org> References: <28d9f2c3ae2c498882164a0dfa1c83c9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [15/45] incubator-geode git commit: GEODE-574: for --ciphers and --protocols options, if the value is "any", it should behave the same as if they were not specified (default value) GEODE-574: for --ciphers and --protocols options, if the value is "any", it should behave the same as if they were not specified (default value) Closes #65 Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/f36310d7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/f36310d7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/f36310d7 Branch: refs/heads/feature/GEODE-715 Commit: f36310d78df388a926895169de7ac16ebdb07493 Parents: 8b6d8f2 Author: Jinmei Liao Authored: Tue Dec 22 14:17:46 2015 -0800 Committer: Jens Deppe Committed: Wed Jan 6 09:18:46 2016 -0800 ---------------------------------------------------------------------- .../internal/cli/shell/JmxOperationInvoker.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f36310d7/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java index e456bda..c2a1b2f 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java @@ -114,12 +114,14 @@ public class JmxOperationInvoker implements OperationInvoker { Set> entrySet = sslConfigProps.entrySet(); for (Iterator> it = entrySet.iterator(); it.hasNext();) { Entry entry = it.next(); - String key = entry.getKey(); + String key = entry.getKey(); + String value = entry.getValue(); if (key.startsWith("javax.") || key.startsWith("cluster-ssl") || key.startsWith("jmx-manager-ssl") ) { key = checkforSystemPropertyPrefix(entry.getKey()); - //TODO : If protocol is any lookup and set one of the following : Copied from SocketCreator - // String[] knownAlgorithms = {"SSL", "SSLv2", "SSLv3", "TLS", "TLSv1", "TLSv1.1"}; - System.setProperty(key, entry.getValue()); + if((key.equals(Gfsh.SSL_ENABLED_CIPHERS) || key.equals(Gfsh.SSL_ENABLED_PROTOCOLS)) && "any".equals(value)){ + continue; + } + System.setProperty(key, value); propsToClear.add(key); } }