AMBARI-20825.check_ambari_permissions.py does not run for all the files and directories listed (jmarron)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/acde0899 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/acde0899 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/acde0899 Branch: refs/heads/branch-feature-AMBARI-12556 Commit: acde08995f46b67f0acd656f6a52889385317217 Parents: 4b67234 Author: Juanjo Marron <jmar...@us.ibm.com> Authored: Mon Apr 24 14:39:02 2017 -0700 Committer: Juanjo Marron <jmar...@us.ibm.com> Committed: Mon Apr 24 14:42:29 2017 -0700 ---------------------------------------------------------------------- .../main/resources/scripts/check_ambari_permissions.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/acde0899/ambari-server/src/main/resources/scripts/check_ambari_permissions.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/scripts/check_ambari_permissions.py b/ambari-server/src/main/resources/scripts/check_ambari_permissions.py index 638f65f..bcb5fc0 100644 --- a/ambari-server/src/main/resources/scripts/check_ambari_permissions.py +++ b/ambari-server/src/main/resources/scripts/check_ambari_permissions.py @@ -146,9 +146,10 @@ def print_paths_with_wrong_permissions(list_of_paths): def do_work(args): print "\n*****Check file, or files in directory for valid permissions (without w for group and other)*****" + files_with_wrong_permissions = [] for path in files_to_check: path = os.path.join(args.ambari_root_dir, path.lstrip('/')) - files_with_wrong_permissions = check_files_in_directory_or_file_for_permissions(path, "/g=w,o=w") + files_with_wrong_permissions = files_with_wrong_permissions + check_files_in_directory_or_file_for_permissions(path, "/g=w,o=w") if files_with_wrong_permissions: print "\nFiles with wrong permissions:" @@ -186,9 +187,10 @@ def do_work(args): print "\n*****Check directories for valid permissions (without w for group and other)*****" + directories_with_wrong_permissions = [] for dir_path in directories_to_check: dir_path = os.path.join(args.ambari_root_dir, dir_path.lstrip('/')) - directories_with_wrong_permissions = check_directory_permissions(dir_path, "/g=w,o=w") + directories_with_wrong_permissions = directories_with_wrong_permissions + check_directory_permissions(dir_path, "/g=w,o=w") if directories_with_wrong_permissions: print "\nDirectories with wrong permissions:" @@ -196,9 +198,10 @@ def do_work(args): update_permissions(directories_with_wrong_permissions, DIRECTORY_PERMISSIONS, "Fix permissions for directories to " + str(DIRECTORY_PERMISSIONS) + " (recommended) ") print "\n*****Check secure directories for valid permissions (without r+w+x for group and other)*****" + secure_directories_with_wrong_permissions = [] for dir_path in secure_directories_to_check: dir_path = os.path.join(args.ambari_root_dir, dir_path.lstrip('/')) - secure_directories_with_wrong_permissions = check_directory_permissions(dir_path, "/g=r+w+x,o=r+w+x") + secure_directories_with_wrong_permissions = secure_directories_with_wrong_permissions + check_directory_permissions(dir_path, "/g=r+w+x,o=r+w+x") if secure_directories_with_wrong_permissions: print "\nSecure directories with wrong permissions:" @@ -206,9 +209,10 @@ def do_work(args): update_permissions(secure_directories_with_wrong_permissions, SECURE_DIRECTORY_PERMISSIONS, "Fix permissions for secure directories to " + str(SECURE_DIRECTORY_PERMISSIONS) + " (recommended) ") print "\n*****Check secure file, or files in directory for valid permissions (without r+w+x for group and other)*****" + secure_files_with_wrong_permissions = [] for path in secure_files_to_check: path = os.path.join(args.ambari_root_dir, path.lstrip('/')) - secure_files_with_wrong_permissions = check_files_in_directory_or_file_for_permissions(path, "/g=r+w+x,o=r+w+x") + secure_files_with_wrong_permissions = secure_files_with_wrong_permissions + check_files_in_directory_or_file_for_permissions(path, "/g=r+w+x,o=r+w+x") if secure_files_with_wrong_permissions: print "\nSecure files with wrong permissions:"
