Skip to content

Commit

Permalink
Add allowlist.yml to 3 places in securityadmin tool (#2046)
Browse files Browse the repository at this point in the history
Signed-off-by: cliu123 <lc12251109@gmail.com>
(cherry picked from commit 287e945)
  • Loading branch information
cliu123 authored and github-actions[bot] committed Aug 23, 2022
1 parent 692747b commit 39c46a2
Showing 1 changed file with 5 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -736,6 +736,7 @@ public static int execute(final String[] args) throws Exception {
final boolean populateFileIfEmpty = true;
success = retrieveFile(restHighLevelClient, cd+"nodes_dn_"+date+".yml", index, "nodesdn", legacy, populateFileIfEmpty) && success;
success = retrieveFile(restHighLevelClient, cd+"whitelist_"+date+".yml", index, "whitelist", legacy, populateFileIfEmpty) && success;
success = retrieveFile(restHighLevelClient, cd+"allowlist_"+date+".yml", index, "allowlist", legacy, populateFileIfEmpty) && success;
return (success?0:-1);
}

@@ -1195,6 +1196,7 @@ private static int backup(RestHighLevelClient tc, String index, File backupDir,
}
success = retrieveFile(tc, backupDir.getAbsolutePath()+"/nodes_dn.yml", index, "nodesdn", legacy, true) && success;
success = retrieveFile(tc, backupDir.getAbsolutePath()+"/whitelist.yml", index, "whitelist", legacy, true) && success;
success = retrieveFile(tc, backupDir.getAbsolutePath()+"/allowlist.yml", index, "allowlist", legacy, true) && success;
success = retrieveFile(tc, backupDir.getAbsolutePath() + "/audit.yml", index, "audit", legacy) && success;

return success?0:-1;
@@ -1218,6 +1220,9 @@ private static int upload(RestHighLevelClient tc, String index, String cd, boole
if (new File(cd+"audit.yml").exists()) {
success = uploadFile(tc, cd + "audit.yml", index, "audit", legacy, resolveEnvVars) && success;
}
if (new File(cd+"allowlist.yml").exists()) {
success = uploadFile(tc, cd + "allowlist.yml", index, "allowlist", legacy, resolveEnvVars) && success;
}

if(!success) {
System.out.println("ERR: cannot upload configuration, see errors above");

0 comments on commit 39c46a2

Please sign in to comment.