Repository: ambari Updated Branches: refs/heads/branch-1.7.0 3a2039166 -> 122d11110 refs/heads/trunk 0800415ca -> 811ea5860
AMBARI-7659. Security: clarify Ambari automatic download + use of JCE (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/811ea586 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/811ea586 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/811ea586 Branch: refs/heads/trunk Commit: 811ea5860bfd27fb95aa5da04073835188742b89 Parents: 0800415 Author: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Authored: Mon Oct 6 22:32:14 2014 +0300 Committer: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Committed: Mon Oct 6 22:55:11 2014 +0300 ---------------------------------------------------------------------- ambari-server/src/main/python/ambari-server.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/811ea586/ambari-server/src/main/python/ambari-server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/python/ambari-server.py b/ambari-server/src/main/python/ambari-server.py index 080b4ad..bb2cf75 100755 --- a/ambari-server/src/main/python/ambari-server.py +++ b/ambari-server/src/main/python/ambari-server.py @@ -1807,7 +1807,12 @@ def download_jdk(args): raise FatalException(1, err) jdk_num = str(JDK_INDEX + 1) jdk_num = get_validated_string_input( - "[1] - Oracle JDK 1.7\n[2] - Oracle JDK 1.6\n[3] - Custom JDK\n==============================================================================\nEnter choice (" + jdk_num + "): ", + """ + [1] - Oracle JDK 1.7 + Java Cryptography Extension (JCE) Policy Files 7 + [2] - Oracle JDK 1.6 + Java Cryptography Extension (JCE) Policy Files 6 + [3] - Custom JDK + ============================================================================== + Enter choice (""" + jdk_num + "):", jdk_num, "^[123]$", "Invalid number.", @@ -1840,11 +1845,13 @@ def download_jdk(args): if os.path.exists(dest_file): print "JDK already exists, using " + dest_file else: - ok = get_YN_input("To download the Oracle JDK you must accept the " + ok = get_YN_input("To download the Oracle JDK and the Java Cryptography Extension (JCE) " + "Policy Files you must accept the " "license terms found at " "http://www.oracle.com/technetwork/java/javase/"; "terms/license/index.html and not accepting will " - "cancel the Ambari Server setup.\nDo you accept the " + "cancel the Ambari Server setup and you must install the JDK and JCE " + "files manually.\nDo you accept the " "Oracle Binary Code License Agreement [y/n] (y)? ", True) if not ok: print 'Exiting...'
