You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ma...@apache.org on 2017/01/03 08:17:09 UTC
[8/9] incubator-ranger git commit: RANGER-698: create pre-defined
user, {USER}, during ranger-admin startup
RANGER-698: create pre-defined user, {USER}, during ranger-admin startup
Signed-off-by: Madhan Neethiraj <ma...@apache.org>
(cherry picked from commit 2118a71638055f7d44a94cbaed90809c53aead67)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/c599bbb4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/c599bbb4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/c599bbb4
Branch: refs/heads/ranger-0.6
Commit: c599bbb4aa1c2948fbef9a1164a5a121de23ad8c
Parents: 9039504
Author: Abhay Kulkarni <ak...@hortonworks.com>
Authored: Thu Sep 1 07:39:58 2016 -0700
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Mon Jan 2 23:58:50 2017 -0800
----------------------------------------------------------------------
.../plugin/policyengine/RangerPolicyEngine.java | 3 ++-
.../org/apache/ranger/biz/ServiceDBStore.java | 28 +++++++++++++-------
2 files changed, 21 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/c599bbb4/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/c599bbb4/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 2338d36..47b0cf0 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
@@ -280,15 +280,19 @@ public class ServiceDBStore extends AbstractServiceStore {
final ServiceDBStore dbStore = this;
predicateUtil = new ServicePredicateUtil(dbStore);
-
- txTemplate.execute(new TransactionCallback<Object>() {
- @Override
- public Object doInTransaction(TransactionStatus status) {
- EmbeddedServiceDefsUtil.instance().init(dbStore);
- getServiceUpgraded();
- return null;
- }
- });
+ try {
+ txTemplate.execute(new TransactionCallback<Object>() {
+ @Override
+ public Object doInTransaction(TransactionStatus status) {
+ EmbeddedServiceDefsUtil.instance().init(dbStore);
+ getServiceUpgraded();
+ createGenericUser();
+ return null;
+ }
+ });
+ } catch (Throwable ex) {
+ LOG.fatal("ServiceDefDBStore.initStore(): Failed to update DB: " + ex);
+ }
legacyServiceDefsInitDone = true;
}
@@ -3817,4 +3821,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);
+ }
}