You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by sp...@apache.org on 2017/06/25 17:59:44 UTC
[2/3] ranger git commit: RANGER-1647: Made minor changes to the name,
label, and description fields in the tag service def
RANGER-1647: Made minor changes to the name, label, and description fields in the tag service def
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/1a24d019
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/1a24d019
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/1a24d019
Branch: refs/heads/master
Commit: 1a24d019e5875e97d13c833991f3c439d65a1dd7
Parents: 64a8c9f
Author: Sailaja Polavarapu <sp...@hortonworks.com>
Authored: Sun Jun 25 10:48:44 2017 -0700
Committer: Sailaja Polavarapu <sp...@hortonworks.com>
Committed: Sun Jun 25 10:48:44 2017 -0700
----------------------------------------------------------------------
.../resources/service-defs/ranger-servicedef-tag.json | 6 +++---
.../policyengine/test_policyengine_owner.json | 10 +++++-----
.../policyengine/test_policyengine_tag_hive.json | 14 +++++++-------
.../test_policyengine_tag_hive_filebased.json | 14 +++++++-------
.../patch/PatchForTagServiceDefUpdate_J10008.java | 2 +-
5 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/1a24d019/agents-common/src/main/resources/service-defs/ranger-servicedef-tag.json
----------------------------------------------------------------------
diff --git a/agents-common/src/main/resources/service-defs/ranger-servicedef-tag.json b/agents-common/src/main/resources/service-defs/ranger-servicedef-tag.json
index 8ca2679..c17b750 100644
--- a/agents-common/src/main/resources/service-defs/ranger-servicedef-tag.json
+++ b/agents-common/src/main/resources/service-defs/ranger-servicedef-tag.json
@@ -72,11 +72,11 @@
},
{
"itemId":2,
- "name":"Script",
+ "name":"expression",
"evaluator": "org.apache.ranger.plugin.conditionevaluator.RangerScriptConditionEvaluator",
"evaluatorOptions" : {"engineName":"JavaScript", "ui.isMultiline":"true"},
- "label":"Enter your Javascript here",
- "description": "Script to execute"
+ "label":"Enter boolean expression",
+ "description": "Boolean expression"
}
]
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/1a24d019/agents-common/src/test/resources/policyengine/test_policyengine_owner.json
----------------------------------------------------------------------
diff --git a/agents-common/src/test/resources/policyengine/test_policyengine_owner.json b/agents-common/src/test/resources/policyengine/test_policyengine_owner.json
index 83c42e8..223a0c6 100644
--- a/agents-common/src/test/resources/policyengine/test_policyengine_owner.json
+++ b/agents-common/src/test/resources/policyengine/test_policyengine_owner.json
@@ -16,11 +16,11 @@
"policyConditions": [
{
"itemId":1,
- "name":"Script",
- "evaluator": "org.apache.ranger.plugin.conditionevaluator.RangerScriptConditionEvaluator",
- "evaluatorOptions" : {"engineName":"JavaScript", "ui.isMultiline" : "true"},
- "label":"Enter your Javascript here: ",
- "description": "Script to execute"
+ "name":"expression",
+ "evaluator": "org.apache.ranger.plugin.conditionevaluator.RangerScriptConditionEvaluator",
+ "evaluatorOptions" : {"engineName":"JavaScript", "ui.isMultiline":"true"},
+ "label":"Enter boolean expression",
+ "description": "Boolean expression"
}
]
},
http://git-wip-us.apache.org/repos/asf/ranger/blob/1a24d019/agents-common/src/test/resources/policyengine/test_policyengine_tag_hive.json
----------------------------------------------------------------------
diff --git a/agents-common/src/test/resources/policyengine/test_policyengine_tag_hive.json b/agents-common/src/test/resources/policyengine/test_policyengine_tag_hive.json
index 075b167..11f31e3 100644
--- a/agents-common/src/test/resources/policyengine/test_policyengine_tag_hive.json
+++ b/agents-common/src/test/resources/policyengine/test_policyengine_tag_hive.json
@@ -143,11 +143,11 @@
"policyConditions": [
{
"itemId":1,
- "name":"Script",
- "evaluator": "org.apache.ranger.plugin.conditionevaluator.RangerScriptConditionEvaluator",
- "evaluatorOptions" : {"engineName":"JavaScript", "ui.isMultiline" : "true"},
- "label":"Enter your Javascript here: ",
- "description": "Script to execute"
+ "name":"expression",
+ "evaluator": "org.apache.ranger.plugin.conditionevaluator.RangerScriptConditionEvaluator",
+ "evaluatorOptions" : {"engineName":"JavaScript", "ui.isMultiline":"true"},
+ "label":"Enter boolean expression",
+ "description": "Boolean expression"
},
{
"itemId":2,
@@ -166,7 +166,7 @@
{
"accesses":[{"type":"hive:select","isAllowed":true}],"users":["hive", "user1"],"groups":[],"delegateAdmin":false,
"conditions":[{
- "type":"Script",
+ "type":"expression",
"values":["if ( ctx.isAccessedBefore('expiry') ) ctx.result = true;"]
}]
}
@@ -197,7 +197,7 @@
"denyExceptions":[
{"accesses":[{"type":"hive:select","isAllowed":true}],"users":["hive", "user1"],"groups":[],"delegateAdmin":false,
"conditions":[{
- "type":"Script",
+ "type":"expression",
"values":["if ( ctx.isAccessedBefore('expiry') ) ctx.result = true;"]
}]
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/1a24d019/agents-common/src/test/resources/policyengine/test_policyengine_tag_hive_filebased.json
----------------------------------------------------------------------
diff --git a/agents-common/src/test/resources/policyengine/test_policyengine_tag_hive_filebased.json b/agents-common/src/test/resources/policyengine/test_policyengine_tag_hive_filebased.json
index 3974a57..6b2863a 100644
--- a/agents-common/src/test/resources/policyengine/test_policyengine_tag_hive_filebased.json
+++ b/agents-common/src/test/resources/policyengine/test_policyengine_tag_hive_filebased.json
@@ -149,11 +149,11 @@
"policyConditions": [
{
"itemId":1,
- "name":"Script",
- "evaluator": "org.apache.ranger.plugin.conditionevaluator.RangerScriptConditionEvaluator",
- "evaluatorOptions" : {"engineName":"JavaScript", "ui.isMultiline" : "true"},
- "label":"Enter your Javascript here: ",
- "description": "Script to execute"
+ "name":"expression",
+ "evaluator": "org.apache.ranger.plugin.conditionevaluator.RangerScriptConditionEvaluator",
+ "evaluatorOptions" : {"engineName":"JavaScript", "ui.isMultiline":"true"},
+ "label":"Enter boolean expression",
+ "description": "Boolean expression"
},
{
"itemId":2,
@@ -172,7 +172,7 @@
{
"accesses":[{"type":"hive:select","isAllowed":true}],"users":["hive", "user1"],"groups":[],"delegateAdmin":false,
"conditions":[{
- "type":"Script",
+ "type":"expression",
"values":["if ( tagAttr.get('score') < 2 ) ctx.result = true;"]
}]
}
@@ -203,7 +203,7 @@
"denyExceptions":[
{"accesses":[{"type":"hive:select","isAllowed":true}],"users":["hive", "user1"],"groups":[],"delegateAdmin":false,
"conditions":[{
- "type":"Script",
+ "type":"expression",
"values":["if ( ctx.isAccessedBefore('activation_date') ) ctx.result = true;"]
}]
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/1a24d019/security-admin/src/main/java/org/apache/ranger/patch/PatchForTagServiceDefUpdate_J10008.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/patch/PatchForTagServiceDefUpdate_J10008.java b/security-admin/src/main/java/org/apache/ranger/patch/PatchForTagServiceDefUpdate_J10008.java
index 6f874b5..918fe1e 100644
--- a/security-admin/src/main/java/org/apache/ranger/patch/PatchForTagServiceDefUpdate_J10008.java
+++ b/security-admin/src/main/java/org/apache/ranger/patch/PatchForTagServiceDefUpdate_J10008.java
@@ -43,7 +43,7 @@ import java.util.Map;
public class PatchForTagServiceDefUpdate_J10008 extends BaseLoader {
private static final Logger logger = Logger.getLogger(PatchForTagServiceDefUpdate_J10008.class);
public static final String SERVICEDBSTORE_SERVICEDEFBYNAME_TAG_NAME = "tag";
- public static final String SCRIPT_POLICY_CONDITION_NAME = "Script";
+ public static final String SCRIPT_POLICY_CONDITION_NAME = "expression";
@Autowired
RangerDaoManager daoMgr;