Skip to content

RANGER-203: Policy implementation to support permissions & policyCondition #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
gautamborad wants to merge 1 commit into from
Closed

RANGER-203: Policy implementation to support permissions & policyCondition #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions plugin-common/src/main/resources/service-defs/ranger-servicedef-hbase.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
],
"resources":
[
{"name":"table","type":"select2","level":1,"parent":"","mandatory":true,"lookupSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"HBase Table","description":"HBase Table"},
{"name":"column-family","type":"select2","level":2,"parent":"table","mandatory":true,"lookupSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"HBase Column-family","description":"HBase Column-family"},
{"name":"column","type":"select2","level":3,"parent":"column-family","mandatory":true,"lookupSupported":false,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"HBase Column","description":"HBase Column"}
{"name":"table","type":"string","level":1,"parent":"","mandatory":true,"lookupSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"HBase Table","description":"HBase Table"},
{"name":"column-family","type":"string","level":2,"parent":"table","mandatory":true,"lookupSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"HBase Column-family","description":"HBase Column-family"},
{"name":"column","type":"string","level":3,"parent":"column-family","mandatory":true,"lookupSupported":false,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"HBase Column","description":"HBase Column"}
],
"accessTypes":
[
Expand All @@ -46,7 +46,6 @@
],
"policyConditions":
[
{
}

]
}
3 changes: 1 addition & 2 deletions plugin-common/src/main/resources/service-defs/ranger-servicedef-hdfs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
],
"policyConditions":
[
{
}

]
}
8 changes: 4 additions & 4 deletions plugin-common/src/main/resources/service-defs/ranger-servicedef-hive.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
],
"resources":
[
{"name":"database","type":"select2","level":1,"mandatory":true,"lookupSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"Hive Database","description":"Hive Database"},
{"name":"table","type":"select2","level":2,"parent":"database","mandatory":true,"lookupSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"Hive Table","description":"Hive Table"},
{"name":"udf","type":"select2","level":2,"parent":"database","mandatory":true,"lookupSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"Hive UDF","description":"Hive UDF"},
{"name":"column","type":"select2","level":3,"parent":"table","mandatory":true,"lookupSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"Hive Column","description":"Hive Column"}
{"name":"database","type":"string","level":1,"mandatory":true,"lookupSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"Hive Database","description":"Hive Database"},
{"name":"table","type":"string","level":2,"parent":"database","mandatory":true,"lookupSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"Hive Table","description":"Hive Table"},
{"name":"udf","type":"string","level":2,"parent":"database","mandatory":true,"lookupSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"Hive UDF","description":"Hive UDF"},
{"name":"column","type":"string","level":3,"parent":"table","mandatory":true,"lookupSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"Hive Column","description":"Hive Column"}
],
"accessTypes":
[
Expand Down
4 changes: 2 additions & 2 deletions plugin-common/src/main/resources/service-defs/ranger-servicedef-knox.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
],
"resources":
[
{"name":"topology","type":"select2","level":1,"mandatory":true,"lookupSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"Knox Topology","description":"Knox Topology"},
{"name":"service","type":"select2","level":2,"parent":"topology","mandatory":true,"lookupSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"Knox Service","description":"Knox Service"}
{"name":"topology","type":"string","level":1,"mandatory":true,"lookupSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"Knox Topology","description":"Knox Topology"},
{"name":"service","type":"string","level":2,"parent":"topology","mandatory":true,"lookupSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"Knox Service","description":"Knox Service"}
],
"accessTypes":
[
Expand Down
2 changes: 1 addition & 1 deletion plugin-common/src/main/resources/service-defs/ranger-servicedef-storm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
],
"resources":
[
{"name":"topology","type":"select2","level":1,"mandatory":true,"lookupSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"Storm Topology","description":"Storm Topology"}
{"name":"topology","type":"string","level":1,"mandatory":true,"lookupSupported":true,"matcher":"org.apache.ranger.plugin.resourcematcher.RangerDefaultResourceMatcher","matcherOptions":"wildCard=true;ignoreCase=true","label":"Storm Topology","description":"Storm Topology"}
],
"accessTypes":
[
Expand Down
23 changes: 13 additions & 10 deletions security-admin/src/main/webapp/scripts/models/BackboneFormDataType.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,19 @@ define(function(require) {
if (v != null) {
var formObj = {};
switch (v.type) {
case 'string':formObj.type = 'Text';break;
case 'string':
if(!_.isUndefined(v.lookupSupported) && v.lookupSupported ){
formObj.type = 'Select2Remote';
formObj.pluginAttr = form.getPlugginAttr(false),
formObj.editorAttrs = {'data-placeholder': v.label },
formObj.options = function(callback, editor){
callback();
},
formObj.onFocusOpen = true
}else{
formObj.type = 'Text';
}
break;
case 'bool':
formObj.type = 'Checkbox';
formObj.options = { y : 'Yes',n : 'No'};
Expand All @@ -41,15 +53,6 @@ define(function(require) {
formObj.type = 'Select';
formObj.options = _.pluck(_.compact(enumObj.elements),'label');
break;
case 'select2' :
formObj.type = 'Select2Remote';
formObj.pluginAttr = form.getPlugginAttr(false),
formObj.editorAttrs = {'data-placeholder': v.label },
formObj.options = function(callback, editor){
callback();
},
formObj.onFocusOpen = true
break;
case 'path' :
formObj.type = 'Text';
form.initilializePathPlugin = true;
Expand Down
5 changes: 3 additions & 2 deletions security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ define(function(require) {
topologyName : 'Topology Name',
serivceName : 'Service Name',
ipAddress : 'IP Address',

delegatedAdmin : 'Delegate Admin'
},
btn : {
add : 'Add',
Expand Down Expand Up @@ -258,7 +258,8 @@ define(function(require) {
searchForPolicy :"Search for your policy...",
searchForYourUser :"Search for your users...",
searchForYourGroup :"Search for your groups...",
access : 'Access'
access : 'Access',
policyCondition : 'Policy Condtions'


},
Expand Down
78 changes: 71 additions & 7 deletions security-admin/src/main/webapp/scripts/utils/XAUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,13 @@ define(function(require) {

});
};
XAUtils.filterResultByText = function(results , selectedVals){
return _.filter(results,function(obj){
if($.inArray(obj.text,selectedVals) < 0)
return obj;

});
};
XAUtils.scrollToField = function(field){
$("html, body").animate({
scrollTop: field.position().top-80
Expand Down Expand Up @@ -376,14 +383,18 @@ define(function(require) {
if(!model.isNew()){
if(!_.isUndefined(model.get('policyItems'))){
var policyItems = model.get('policyItems');
var groupPolicyItems = _.filter(policyItems,function(m){if(!_.isEmpty(m.groups)) return m;});
_.each(groupPolicyItems,function(obj){
// var groupPolicyItems = _.filter(policyItems,function(m){if(!_.isEmpty(m.groups)) return m;});
_.each(policyItems,function(obj){
var groupNames = null, userNames = null;
if(!_.isEmpty(obj.groups)) groupNames = obj.groups.join(',');
if(!_.isEmpty(obj.users)) userNames = obj.users.join(',');
var m = new Backbone.Model({
// groupId : groupIds.join(','),
groupName : obj.groups.join(','),
// ipAddress : values[0].ipAddress,
groupName : groupNames,
userName : userNames,
accesses : obj.accesses,
conditions : obj.conditions,
delegateAdmin: obj.delegateAdmin,
editMode : true,
accesses : obj.accesses
});
formInputColl.add(m);

Expand All @@ -409,7 +420,8 @@ define(function(require) {
userName : obj.users.join(','),
// ipAddress : values[0].ipAddress,
editMode : true,
accesses : obj.accesses
accesses : obj.accesses,
conditions : obj.conditions
});
coll.add(m);

Expand Down Expand Up @@ -643,5 +655,57 @@ define(function(require) {
that.$(that.rForm.el).removeClass("policy-disabled");
}
};
XAUtils.customXEditableForPolicyCond = function(template) {
// $.fn.editable.defaults.mode = 'inline';
var PolicyConditions = function (options) {
this.init('policyConditions', options, PolicyConditions.defaults);
};

//inherit from Abstract input
$.fn.editableutils.inherit(PolicyConditions, $.fn.editabletypes.abstractinput);

$.extend(PolicyConditions.prototype, {
render: function() {
this.$input = this.$tpl.find('input');
},

value2str: function(value) {
var str = '';
if(value) {
for(var k in value) {
str = str + k + ':' + value[k] + ';';
}
}
return str;
},

value2input: function(value) {
_.each(value, function(val,name){
this.$input.filter('[name='+name+']').val(value[name]);
},this);
},

input2value: function() {
var obj={};
_.each(this.$input,function(input){
var name = input.name;
var val = this.$input.filter('[name="'+name+'"]').val()
obj[name] = val;
},this);

return obj;
},
activate: function() {
this.$input.first().focus()
},
});

PolicyConditions.defaults = $.extend({}, $.fn.editabletypes.abstractinput.defaults, {
tpl: template,

inputclass: ''
});
$.fn.editabletypes.policyConditions = PolicyConditions;
};
return XAUtils;
});
Loading