Repository: incubator-ranger Updated Branches: refs/heads/master e85654b20 -> 992f00bb3
RANGER-1033 : Admin audit logging is not happening correctly while deletion of the configuration from the service repo Signed-off-by: Velmurugan Periasamy <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/3d2a7c82 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/3d2a7c82 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/3d2a7c82 Branch: refs/heads/master Commit: 3d2a7c82a4ef2dd65a7ee7cce65acf43418defe1 Parents: e85654b Author: Ankita Sinha <[email protected]> Authored: Wed Jun 22 14:31:00 2016 +0530 Committer: Velmurugan Periasamy <[email protected]> Committed: Wed Jun 22 19:12:51 2016 -0400 ---------------------------------------------------------------------- .../java/org/apache/ranger/service/RangerServiceService.java | 7 +++++++ .../main/resources/conf.dist/ranger-admin-default-site.xml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3d2a7c82/security-admin/src/main/java/org/apache/ranger/service/RangerServiceService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceService.java b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceService.java index 8c2e568..f0d2bb8 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceService.java @@ -249,6 +249,13 @@ public class RangerServiceService extends RangerServiceServiceBase<XXService, Ra oldConfig.put(key, xConfig.get(key)); } } + for (Entry<String, String> entry : xConfig.entrySet()) { + String key = entry.getKey(); + if (!vConfig.containsKey(key)) { + oldConfig.put(key, entry.getValue()); + newConfig.put(key,null); + } + } oldValue = jsonUtil.readMapToString(oldConfig); value = jsonUtil.readMapToString(newConfig); } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3d2a7c82/security-admin/src/main/resources/conf.dist/ranger-admin-default-site.xml ---------------------------------------------------------------------- diff --git a/security-admin/src/main/resources/conf.dist/ranger-admin-default-site.xml b/security-admin/src/main/resources/conf.dist/ranger-admin-default-site.xml index c91e7fc..e73b6c6 100644 --- a/security-admin/src/main/resources/conf.dist/ranger-admin-default-site.xml +++ b/security-admin/src/main/resources/conf.dist/ranger-admin-default-site.xml @@ -484,7 +484,7 @@ <value>^Mozilla.*,^Opera.*,^Chrome.*</value> </property> <property> - <value>ranger.krb.browser-useragents-regex</value> + <name>ranger.krb.browser-useragents-regex</name> <value>^Mozilla.*,^Opera.*,^Chrome.*</value> </property> </configuration>
