incubator-ranger git commit: RANGER-698: create pre-defined user, {USER}, during ranger-admin startup

[madhan]

Repository: incubator-ranger
Updated Branches:
  refs/heads/master 89e11bcc2 -> 2118a7163


RANGER-698: create pre-defined user, {USER}, during ranger-admin startup

Signed-off-by: Madhan Neethiraj <mad...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/2118a716
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/2118a716
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/2118a716

Branch: refs/heads/master
Commit: 2118a71638055f7d44a94cbaed90809c53aead67
Parents: 89e11bc
Author: Abhay Kulkarni <akulka...@hortonworks.com>
Authored: Thu Sep 1 07:39:58 2016 -0700
Committer: Madhan Neethiraj <mad...@apache.org>
Committed: Fri Sep 2 15:50:06 2016 -0700

----------------------------------------------------------------------
 .../apache/ranger/plugin/policyengine/RangerPolicyEngine.java | 3 ++-
 .../src/main/java/org/apache/ranger/biz/ServiceDBStore.java   | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/2118a716/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngine.java
----------------------------------------------------------------------
diff --git 
a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngine.java
 
b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngine.java
index 698d99a..2898a13 100644
--- 
a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngine.java
+++ 
b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngine.java
@@ -27,6 +27,7 @@ import java.util.Set;
 import org.apache.ranger.plugin.model.RangerPolicy;
 import org.apache.ranger.plugin.model.RangerServiceDef;
 import org.apache.ranger.plugin.model.RangerPolicy.RangerPolicyResource;
+import org.apache.ranger.plugin.util.RangerAccessRequestUtil;
 
 public interface RangerPolicyEngine {
        String GROUP_PUBLIC   = "public";
@@ -37,7 +38,7 @@ public interface RangerPolicyEngine {
        String AUDIT_NONE = "audit-none";
        String AUDIT_DEFAULT = "audit-default";
 
-       String USER_CURRENT = "{USER}";
+       String USER_CURRENT = "{" + RangerAccessRequestUtil.KEY_USER + "}";
 
        String getServiceName();
 

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/2118a716/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
----------------------------------------------------------------------
diff --git 
a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java 
b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
index 648944d..72eeb65 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
@@ -286,6 +286,7 @@ public class ServiceDBStore extends AbstractServiceStore {
                                                        public Object 
doInTransaction(TransactionStatus status) {
                                                                
EmbeddedServiceDefsUtil.instance().init(dbStore);
                                                                
getServiceUpgraded();
+                                                               
createGenericUser();
                                                                return null;
                                                        }
                                                });
@@ -3821,4 +3822,10 @@ public class ServiceDBStore extends AbstractServiceStore 
{
                }
                return RangerPolicyEngine.AUDIT_DEFAULT;
        }
+
+       private void createGenericUser() {
+               VXUser genericUser = new VXUser();
+               genericUser.setName(RangerPolicyEngine.USER_CURRENT);
+               xUserService.createXUserWithOutLogin(genericUser);
+       }
 }