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 2015/07/16 08:25:30 UTC
[1/3] incubator-ranger git commit: RANGER-575 : Allow KMS policies to
be assigned to all users
Repository: incubator-ranger
Updated Branches:
refs/heads/tag-policy 28a48c07c -> f2124c464
RANGER-575 : Allow KMS policies to be assigned to all users
Signed-off-by: sneethiraj <sn...@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/36518629
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/36518629
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/36518629
Branch: refs/heads/tag-policy
Commit: 3651862943b5ac9b3fe353adb1c7948ef00ff919
Parents: 07ab4e8
Author: Gautam Borad <gb...@gmail.com>
Authored: Mon Jul 6 13:58:41 2015 +0530
Committer: sneethiraj <sn...@apache.org>
Committed: Mon Jul 6 05:11:43 2015 -0400
----------------------------------------------------------------------
.../main/webapp/scripts/views/policies/PermissionList.js | 11 +----------
.../src/main/webapp/scripts/views/users/UserForm.js | 3 ++-
2 files changed, 3 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/36518629/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js b/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js
index 0901892..0cba319 100644
--- a/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js
+++ b/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js
@@ -200,16 +200,7 @@ define(function(require) {
url: url,
dataType: 'json',
data: function (term, page) {
- var data = { name : term, isVisible : XAEnums.VisibilityStatus.STATUS_VISIBLE.value };
- var userRoleList = []
- _.each(XAEnums.UserRoles,function(val, key){
- if(SessionMgr.isKeyAdmin() && XAEnums.UserRoles.ROLE_KEY_ADMIN.value == val.value){
- userRoleList.push(key)
- }else if(!SessionMgr.isKeyAdmin() && XAEnums.UserRoles.ROLE_KEY_ADMIN.value != val.value){
- userRoleList.push(key)
- }
- })
- return _.extend(data,{'userRoleList' : userRoleList });
+ return {name : term, isVisible : XAEnums.VisibilityStatus.STATUS_VISIBLE.value};
},
results: function (data, page) {
var results = [] , selectedVals = [];
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/36518629/security-admin/src/main/webapp/scripts/views/users/UserForm.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/views/users/UserForm.js b/security-admin/src/main/webapp/scripts/views/users/UserForm.js
index 31e99ce..52a278d 100644
--- a/security-admin/src/main/webapp/scripts/views/users/UserForm.js
+++ b/security-admin/src/main/webapp/scripts/views/users/UserForm.js
@@ -144,7 +144,8 @@ define(function(require){
if(SessionMgr.getUserProfile().get('loginId') != "admin"){
if(this.model.get('name') != "admin"){
- if(_.contains(SessionMgr.getUserProfile().get('userRoleList'),'ROLE_SYS_ADMIN')){
+ if(_.contains(SessionMgr.getUserProfile().get('userRoleList'),'ROLE_SYS_ADMIN')
+ || _.contains(SessionMgr.getUserProfile().get('userRoleList'),'ROLE_KEY_ADMIN')){
this.fields.userRoleList.editor.$el.attr('disabled',false);
}else{
if(!SessionMgr.isKeyAdmin()){
[3/3] incubator-ranger git commit: Merge branch 'master' into
tag-policy
Posted by ma...@apache.org.
Merge branch 'master' into tag-policy
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/f2124c46
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/f2124c46
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/f2124c46
Branch: refs/heads/tag-policy
Commit: f2124c4640907b66b6bab6d622fe044903e6ad9b
Parents: 28a48c0 f34eb3d
Author: Madhan Neethiraj <ma...@apache.org>
Authored: Thu Jul 16 11:48:46 2015 +0530
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Thu Jul 16 11:48:46 2015 +0530
----------------------------------------------------------------------
.../main/webapp/scripts/views/policies/PermissionList.js | 11 +----------
.../src/main/webapp/scripts/views/users/UserForm.js | 3 ++-
.../ranger/authorization/storm/StormRangerPlugin.java | 1 +
3 files changed, 4 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f2124c46/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js
----------------------------------------------------------------------
[2/3] incubator-ranger git commit: RANGER-576:Storm audit not showing
access type in the Ranger Admin Audit UI
Posted by ma...@apache.org.
RANGER-576:Storm audit not showing access type in the Ranger Admin Audit UI
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/f34eb3d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/f34eb3d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/f34eb3d0
Branch: refs/heads/tag-policy
Commit: f34eb3d0704e57129dd5f12a58cae8db9cc2c385
Parents: 3651862
Author: rmani <rm...@hortonworks.com>
Authored: Thu Jul 9 17:37:06 2015 -0700
Committer: rmani <rm...@hortonworks.com>
Committed: Thu Jul 9 17:37:06 2015 -0700
----------------------------------------------------------------------
.../org/apache/ranger/authorization/storm/StormRangerPlugin.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f34eb3d0/storm-agent/src/main/java/org/apache/ranger/authorization/storm/StormRangerPlugin.java
----------------------------------------------------------------------
diff --git a/storm-agent/src/main/java/org/apache/ranger/authorization/storm/StormRangerPlugin.java b/storm-agent/src/main/java/org/apache/ranger/authorization/storm/StormRangerPlugin.java
index 323ab58..f8663af 100644
--- a/storm-agent/src/main/java/org/apache/ranger/authorization/storm/StormRangerPlugin.java
+++ b/storm-agent/src/main/java/org/apache/ranger/authorization/storm/StormRangerPlugin.java
@@ -68,6 +68,7 @@ public class StormRangerPlugin extends RangerBasePlugin {
}
request.setAccessType(_operation);
request.setClientIPAddress(_clientIp);
+ request.setAction(_operation);
// build resource and connect stuff into request
RangerAccessResourceImpl resource = new RangerAccessResourceImpl();
resource.setValue(ResourceName.Topology, _topology);