diff --git a/security-admin/src/main/webapp/scripts/controllers/Controller.js b/security-admin/src/main/webapp/scripts/controllers/Controller.js index 92dac6abc8..2be915f327 100755 --- a/security-admin/src/main/webapp/scripts/controllers/Controller.js +++ b/security-admin/src/main/webapp/scripts/controllers/Controller.js @@ -102,7 +102,7 @@ define(function(require) { var view = require('views/user/UserProfile'); App.rContent.show(new view({ - model : App.userProfile.clone() + model : App.userProfile })); }, diff --git a/security-admin/src/main/webapp/scripts/mgrs/SessionMgr.js b/security-admin/src/main/webapp/scripts/mgrs/SessionMgr.js index 529a589b5f..e7a3856b2f 100644 --- a/security-admin/src/main/webapp/scripts/mgrs/SessionMgr.js +++ b/security-admin/src/main/webapp/scripts/mgrs/SessionMgr.js @@ -134,11 +134,5 @@ define(function(require){ SessionMgr.isUser = function(){ return this.userInRole('ROLE_USER') ? true : false; }; - SessionMgr.isAuditor = function(){ - return this.userInRole('ROLE_ADMIN_AUDITOR') ? true : false; - }; - SessionMgr.isKMSAuditor = function(){ - return this.userInRole('ROLE_KEY_ADMIN_AUDITOR') ? true : false; - }; return SessionMgr; }); diff --git a/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js b/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js index c3b41c163f..92dad79e62 100644 --- a/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js +++ b/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js @@ -241,11 +241,8 @@ define(function(require) { download : 'Download', lastUpdate : 'Last Update', modules : 'Modules', - clusterName : 'Cluster Name', - policyLabels : 'Policy Labels', - activeStatus : 'Active Status', - selectTagService : 'Tag Service' - + clusterName : 'Cluster Name', + policyLabels : 'Policy Labels' }, btn : { add : 'Add', @@ -353,9 +350,7 @@ define(function(require) { custom :'CUSTOM', mask :'Mask', rowFilter : 'Row Filter', - policyLabelsinfo : 'Label of policy', - serviceDetails :'Service Details', - configProperties : 'Config Properties' + policyLabelsinfo : 'Label of policy' }, msg : { deletePolicyValidationMsg : 'Policy does not have any settings for the specific resource. Policy will be deleted. Press [Ok] to continue. Press [Cancel] to edit the policy.', diff --git a/security-admin/src/main/webapp/scripts/utils/XAEnums.js b/security-admin/src/main/webapp/scripts/utils/XAEnums.js index 4aa21c18df..0e0958df36 100644 --- a/security-admin/src/main/webapp/scripts/utils/XAEnums.js +++ b/security-admin/src/main/webapp/scripts/utils/XAEnums.js @@ -57,8 +57,6 @@ define(function(require) { ROLE_SYS_ADMIN:{value:0, label:'Admin', rbkey:'xa.enum.AccessResult.ACCESS_RESULT_ALLOWED', tt: 'lbl.AccessResult_ACCESS_RESULT_ALLOWED'}, ROLE_USER:{value:1, label:'User', rbkey:'xa.enum.AccessResult.ACCESS_RESULT_DENIED', tt: 'lbl.AccessResult_ACCESS_RESULT_DENIED'}, ROLE_KEY_ADMIN:{value:2, label:'KeyAdmin', rbkey:'xa.enum.AccessResult.ACCESS_RESULT_ALLOWED', tt: 'lbl.AccessResult_ACCESS_RESULT_ALLOWED'}, - ROLE_ADMIN_AUDITOR:{value:3, label:'Auditor', rbkey:'xa.enum.AccessResult.ACCESS_RESULT_ALLOWED', tt: 'lbl.AccessResult_ACCESS_RESULT_ALLOWED'}, - ROLE_KEY_ADMIN_AUDITOR:{value:4, label:'KMSAuditor', rbkey:'xa.enum.AccessResult.ACCESS_RESULT_ALLOWED', tt: 'lbl.AccessResult_ACCESS_RESULT_ALLOWED'} }); XAEnums.UserTypes = mergeParams(XAEnums.UserTypes, { @@ -367,12 +365,11 @@ define(function(require) { }); XAEnums.MenuPermissions = mergeParams(XAEnums.MenuPermissions, { - XA_RESOURCE_BASED_POLICIES:{value:1, label:'Resource Based Policies', rbkey:'xa.enum.MenuPermissions.XA_RESOURCE_BASED_POLICIES', tt: 'lbl.XAPermForType_XA_RESOURCE_BASED_POLICIES'}, - XA_USER_GROUPS:{value:2, label:'Users/Groups', rbkey:'xa.enum.MenuPermissions.XA_USER_GROUP', tt: 'lbl.XAPermForType_XA_USER_GROUPS'}, - XA_REPORTS:{value:3, label:'Reports', rbkey:'xa.enum.MenuPermissions.XA_REPORTS', tt: 'lbl.XAPermForType_XA_REPORTS'}, - XA_AUDITS:{value:4, label:'Audit', rbkey:'xa.enum.MenuPermissions.XA_AUDITS', tt: 'lbl.XAPermForType_XA_AUDITS'}, - XA_KEY_MANAGER:{value:5, label:'Key Manager', rbkey:'xa.enum.MenuPermissions.XA_KEY_MANAGER', tt: 'lbl.XAPermForType_XA_KEY_MANAGER'}, - XA_TAG_BASED_POLICIES:{value:6, label:'Tag Based Policies', rbkey:'xa.enum.MenuPermissions.XA_TAG_BASED_POLICIES', tt: 'lbl.XAPermForType_XA_TAG_BASED_POLICIES'} + XA_RESOURCE_BASED_POLICIES:{value:0, label:'Resource Based Policies', rbkey:'xa.enum.MenuPermissions.XA_RESOURCE_BASED_POLICIES', tt: 'lbl.XAPermForType_XA_PERM_FOR_UNKNOWN'}, + XA_USER_GROUPS:{value:1, label:'Users/Groups', rbkey:'xa.enum.MenuPermissions.XA_USER_GROUP', tt: 'lbl.XAPermForType_XA_PERM_FOR_USER'}, + XA_REPORTS:{value:2, label:'Reports', rbkey:'xa.enum.MenuPermissions.XA_REPORTS', tt: 'lbl.XAPermForType_XA_PERM_FOR_GROUP'}, + XA_AUDITS:{value:3, label:'Audit', rbkey:'xa.enum.MenuPermissions.XA_AUDITS', tt: 'lbl.XAPermForType_XA_PERM_FOR_GROUP'}, + XA_KEY_MANAGER:{value:4, label:'Key Manager', rbkey:'xa.enum.MenuPermissions.XA_KEY_MANAGER', tt: 'lbl.XAPermForType_XA_PERM_FOR_GROUP'} }); return XAEnums; diff --git a/security-admin/src/main/webapp/scripts/utils/XAUtils.js b/security-admin/src/main/webapp/scripts/utils/XAUtils.js index c1e6ef5cce..4fe7263a86 100644 --- a/security-admin/src/main/webapp/scripts/utils/XAUtils.js +++ b/security-admin/src/main/webapp/scripts/utils/XAUtils.js @@ -1148,7 +1148,7 @@ define(function(require) { var denyControllerActions = [], denyModulesObj = []; var userModuleNames = _.pluck(vXPortalUser.get('userPermList'),'moduleName'); //add by default permission module to admin user - if (XAUtils.isAuditorOrSystemAdmin(SessionMgr)){ + if (SessionMgr.isSystemAdmin()){ userModuleNames.push('Permissions') } var groupModuleNames = _.pluck(vXPortalUser.get('groupPermissions'), 'moduleName'), @@ -1216,23 +1216,16 @@ define(function(require) { var SessionMgr = require('mgrs/SessionMgr'); var userRoleList = [] _.each(XAEnums.UserRoles,function(val, key){ - if(SessionMgr.isKeyAdmin() && XAEnums.UserRoles.ROLE_SYS_ADMIN.value != val.value - && XAEnums.UserRoles.ROLE_ADMIN_AUDITOR.value != val.value){ + if(SessionMgr.isKeyAdmin() && XAEnums.UserRoles.ROLE_SYS_ADMIN.value != val.value){ userRoleList.push(key) - }else if(SessionMgr.isSystemAdmin() && XAEnums.UserRoles.ROLE_KEY_ADMIN.value != val.value - && XAEnums.UserRoles.ROLE_KEY_ADMIN_AUDITOR.value != val.value){ + }else if(SessionMgr.isSystemAdmin() && XAEnums.UserRoles.ROLE_KEY_ADMIN.value != val.value){ userRoleList.push(key) }else if(SessionMgr.isUser() && XAEnums.UserRoles.ROLE_USER.value == val.value){ userRoleList.push(key) - }else if(SessionMgr.isAuditor() && XAEnums.UserRoles.ROLE_KEY_ADMIN.value != val.value - && XAEnums.UserRoles.ROLE_KEY_ADMIN_AUDITOR.value != val.value){ - userRoleList.push(key) - }else if(SessionMgr.isKMSAuditor() && XAEnums.UserRoles.ROLE_SYS_ADMIN.value != val.value - && XAEnums.UserRoles.ROLE_ADMIN_AUDITOR.value != val.value){ - userRoleList.push(key) } }) - return {'userRoleList' : userRoleList }; }; + return {'userRoleList' : userRoleList }; + }; XAUtils.showErrorMsg = function(respMsg){ var respArr = respMsg.split(/\([0-9]*\)/); respArr = respArr.filter(function(str){ return str; }); @@ -1383,11 +1376,5 @@ define(function(require) { newLabelArr.push(''); return newLabelArr.length ? newLabelArr.join(' ') : '--'; }; - XAUtils.isAuditorOrSystemAdmin = function(SessionMgr){ - return (SessionMgr.isAuditor() || SessionMgr.isSystemAdmin()) ? true : false ; - }; - XAUtils.isAuditorOrKMSAuditor = function(SessionMgr){ - return (SessionMgr.isAuditor() || SessionMgr.isKMSAuditor()) ? true : false ; - } return XAUtils; }); \ No newline at end of file diff --git a/security-admin/src/main/webapp/scripts/views/common/TopNav.js b/security-admin/src/main/webapp/scripts/views/common/TopNav.js index 0f4a708961..aba71efe03 100644 --- a/security-admin/src/main/webapp/scripts/views/common/TopNav.js +++ b/security-admin/src/main/webapp/scripts/views/common/TopNav.js @@ -23,9 +23,7 @@ define(function(require){ var Backbone = require('backbone'); - var TopNav_tmpl = require('hbs!tmpl/common/TopNav_tmpl'); - var SessionMgr = require('mgrs/SessionMgr'); - var XAUtil = require('utils/XAUtils'); + var TopNav_tmpl = require('hbs!tmpl/common/TopNav_tmpl'); require('jquery.cookie'); var TopNav = Backbone.Marionette.ItemView.extend( /** @lends TopNav */ @@ -34,9 +32,7 @@ define(function(require){ template: TopNav_tmpl, templateHelpers : function(){ - return{ - showPermissionTab : XAUtil.isAuditorOrSystemAdmin(SessionMgr) - } + }, /** ui selector cache */ diff --git a/security-admin/src/main/webapp/scripts/views/kms/KMSTableLayout.js b/security-admin/src/main/webapp/scripts/views/kms/KMSTableLayout.js index 38c01772e5..2749cea52e 100755 --- a/security-admin/src/main/webapp/scripts/views/kms/KMSTableLayout.js +++ b/security-admin/src/main/webapp/scripts/views/kms/KMSTableLayout.js @@ -32,7 +32,6 @@ define(function(require){ var KmsKey = require('models/VXKmsKey'); var XATableLayout = require('views/common/XATableLayout'); var KmsTablelayoutTmpl = require('hbs!tmpl/kms/KmsTableLayout_tmpl'); - var SessionMgr = require('mgrs/SessionMgr'); var KmsTableLayout = Backbone.Marionette.Layout.extend( /** @lends KmsTableLayout */ @@ -41,9 +40,6 @@ define(function(require){ template: KmsTablelayoutTmpl, templateHelpers : function(){ - return { - isKeyadmin : SessionMgr.isKeyAdmin() ? true :false - } }, breadCrumbs :[XALinks.get('KmsManage')], /** Layout sub regions */ @@ -235,9 +231,6 @@ define(function(require){ } }; - if(!SessionMgr.isKeyAdmin()){ - delete cols.operation; - } return this.collection.constructor.getTableCols(cols, this.collection); }, diff --git a/security-admin/src/main/webapp/scripts/views/permissions/ModulePermissionForm.js b/security-admin/src/main/webapp/scripts/views/permissions/ModulePermissionForm.js index 47c69dec92..d9c522c47e 100644 --- a/security-admin/src/main/webapp/scripts/views/permissions/ModulePermissionForm.js +++ b/security-admin/src/main/webapp/scripts/views/permissions/ModulePermissionForm.js @@ -161,23 +161,15 @@ define(function(require) { return { name : term, isVisible : XAEnums.VisibilityStatus.STATUS_VISIBLE.value }; }, results: function (data, page) { + var results = []; var results = [], selectedVals = []; //Get selected values of groups/users dropdown selectedVals = that.getSelectedValues(options); if(data.resultSize != "0"){ if(!_.isUndefined(data.vXGroups)){ - results = data.vXGroups.map(function(m, i){ return {id : m.id, text: _.escape(m.name) }; }); + results = data.vXGroups.map(function(m, i){ return {id : m.id, text: _.escape(m.name) }; }); } else if(!_.isUndefined(data.vXUsers)){ -// tag base policy tab hide from KeyAdmin and KMSAuditor users - if(that.model.get('module') === XAEnums.MenuPermissions.XA_TAG_BASED_POLICIES.label){ - _.map(data.vXUsers ,function(m, i){ - if(XAEnums.UserRoles[m.userRoleList[0]].label != 'KeyAdmin' && XAEnums.UserRoles[m.userRoleList[0]].label != 'KMSAuditor'){ - results.push({id : m.id, text: _.escape(m.name) }); - } - }); - }else{ - results = data.vXUsers.map(function(m, i){ return {id : m.id, text: _.escape(m.name) }; }); - } + results = data.vXUsers.map(function(m, i){ return {id : m.id, text: _.escape(m.name) }; }); } if(!_.isEmpty(selectedVals)){ results = XAUtil.filterResultByText(results, selectedVals); diff --git a/security-admin/src/main/webapp/scripts/views/permissions/ModulePermsTableLayout.js b/security-admin/src/main/webapp/scripts/views/permissions/ModulePermsTableLayout.js index 9db72a7a24..b46d526a9c 100644 --- a/security-admin/src/main/webapp/scripts/views/permissions/ModulePermsTableLayout.js +++ b/security-admin/src/main/webapp/scripts/views/permissions/ModulePermsTableLayout.js @@ -124,7 +124,7 @@ define(function(require){ cell : "uri", reName : 'module', href: function(model){ - return '#!/permissions/'+model.id+'/edit'; + return '#!/permissions/'+model.id+'/edit'; }, label : localization.tt("lbl.modules"), editable: false, @@ -162,7 +162,6 @@ define(function(require){ sortable : false }, }; - if(SessionMgr.isSystemAdmin()){ cols['permissions'] = { cell : "html", label : localization.tt("lbl.action"), @@ -175,10 +174,6 @@ define(function(require){ sortable : false }; - } - if(SessionMgr.isAuditor()){ - cols.module.cell = "string"; - } return this.collection.constructor.getTableCols(cols, this.collection); }, onShowMore : function(e){ diff --git a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js index b4006ce0b1..618207d2e6 100644 --- a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js +++ b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js @@ -55,8 +55,7 @@ define(function(require){ rangerServiceDef : this.rangerServiceDefModel, rangerPolicyType : this.collection.queryParams['policyType'], isRenderAccessTab : XAUtil.isRenderMasking(this.rangerServiceDefModel.get('dataMaskDef')) ? true - : XAUtil.isRenderRowFilter(this.rangerServiceDefModel.get('rowFilterDef')) ? true : false, - isNotAuditorAdminOrKmsAuditor : !(XAUtil.isAuditorOrKMSAuditor(SessionMgr)) + : XAUtil.isRenderRowFilter(this.rangerServiceDefModel.get('rowFilterDef')) ? true : false }; }, @@ -206,7 +205,7 @@ define(function(require){ id : { cell : "uri", href: function(model){ - return '#!/service/'+that.rangerService.id+'/policies/'+model.id+'/edit'; + return '#!/service/'+that.rangerService.id+'/policies/'+model.id+'/edit'; }, label : localization.tt("lbl.policyId"), editable: false, @@ -288,28 +287,22 @@ define(function(require){ sortable : false }, }; + cols['permissions'] = { cell : "html", label : localization.tt("lbl.action"), formatter: _.extend({}, Backgrid.CellFormatter.prototype, { fromRaw: function (rawValue,model) { - if(XAUtil.isAuditorOrKMSAuditor(SessionMgr)){ - return ''; - }else{ - return '\ - \ - '; + return '\ + \ + '; //You can use rawValue to custom your html, you can change this value using the name parameter. - } } }), editable: false, sortable : false }; - if(XAUtil.isAuditorOrKMSAuditor(SessionMgr)){ - cols.id.cell = 'string'; - } return this.collection.constructor.getTableCols(cols, this.collection); }, onDelete :function(e){ diff --git a/security-admin/src/main/webapp/scripts/views/policymanager/ServiceLayout.js b/security-admin/src/main/webapp/scripts/views/policymanager/ServiceLayout.js index 118abf04a4..7aab1e2c33 100644 --- a/security-admin/src/main/webapp/scripts/views/policymanager/ServiceLayout.js +++ b/security-admin/src/main/webapp/scripts/views/policymanager/ServiceLayout.js @@ -32,7 +32,6 @@ define(function(require){ var ServicemanagerlayoutTmpl = require('hbs!tmpl/common/ServiceManagerLayout_tmpl'); var vUploadServicePolicy = require('views/UploadServicePolicy'); var vDownloadServicePolicy = require('views/DownloadServicePolicy'); - var RangerServiceViewDetail = require('views/service/RangerServiceViewDetail'); require('Backbone.BootstrapModal'); return Backbone.Marionette.Layout.extend( /** @lends Servicemanagerlayout */ @@ -46,7 +45,7 @@ define(function(require){ operation : SessionMgr.isSystemAdmin() || SessionMgr.isKeyAdmin(), serviceDefs : this.collection.models, services : this.services.groupBy("type"), - showImportExportBtn : (SessionMgr.isUser() || XAUtil.isAuditorOrKMSAuditor(SessionMgr)) ? false : true + showImportExportBtn : SessionMgr.isUser() ? false : true }; }, @@ -66,8 +65,7 @@ define(function(require){ 'downloadReport' : '[data-id="downloadBtnOnService"]', 'uploadServiceReport' :'[data-id="uploadBtnOnServices"]', 'exportReport' : '[data-id="exportBtn"]', - 'importServiceReport' :'[data-id="importBtn"]', - 'viewServices' : '[data-name="viewService"]' + 'importServiceReport' :'[data-id="importBtn"]' }, /** ui events hash */ @@ -78,7 +76,6 @@ define(function(require){ events['click ' + this.ui.uploadServiceReport] = 'uploadServiceReport'; events['click ' + this.ui.exportReport] = 'downloadReport'; events['click ' + this.ui.importServiceReport] = 'uploadServiceReport'; - events['click ' + this.ui.viewServices] = 'viewServices'; return events; }, /** @@ -243,26 +240,6 @@ define(function(require){ }); } }, - viewServices : function(e){ - var that =this; - var serviceId = $(e.currentTarget).data('id'); - var rangerService = that.services.find(function(m){return m.id == serviceId}); - var serviceDef = that.collection.find(function(m){return m.get('name') == rangerService.get('type')}); - var view = new RangerServiceViewDetail({ - serviceDef : serviceDef, - rangerService : rangerService, - - }); - var modal = new Backbone.BootstrapModal({ - animate : true, - content : view, - title: localization.tt("h.serviceDetails"), - okText :localization.tt("lbl.ok"), - allowCancel : true, - escape : true - }).open(); - modal.$el.find('.cancel').hide(); - }, /** on close */ onClose: function(){ } diff --git a/security-admin/src/main/webapp/scripts/views/reports/OperationDiffDetail.js b/security-admin/src/main/webapp/scripts/views/reports/OperationDiffDetail.js index 5d929c18f1..c8fc050613 100644 --- a/security-admin/src/main/webapp/scripts/views/reports/OperationDiffDetail.js +++ b/security-admin/src/main/webapp/scripts/views/reports/OperationDiffDetail.js @@ -370,20 +370,12 @@ define(function(require){ m.set('newValue',XAEnums.UserRoles.ROLE_SYS_ADMIN.label) else if(newRole == "ROLE_KEY_ADMIN") m.set('newValue',XAEnums.UserRoles.ROLE_KEY_ADMIN.label) - else if(newRole == "ROLE_KEY_ADMIN_AUDITOR") - m.set('newValue',XAEnums.UserRoles.ROLE_KEY_ADMIN_AUDITOR.label) - else if(newRole == "ROLE_ADMIN_AUDITOR") - m.set('newValue',XAEnums.UserRoles.ROLE_ADMIN_AUDITOR.label) if(prevRole == "ROLE_USER") m.set('previousValue',XAEnums.UserRoles.ROLE_USER.label) else if(prevRole == "ROLE_SYS_ADMIN") m.set('previousValue',XAEnums.UserRoles.ROLE_SYS_ADMIN.label) else if(prevRole == "ROLE_KEY_ADMIN") m.set('previousValue',XAEnums.UserRoles.ROLE_KEY_ADMIN.label) - else if(prevRole == "ROLE_KEY_ADMIN_AUDITOR") - m.set('previousValue',XAEnums.UserRoles.ROLE_KEY_ADMIN_AUIDTOR.label) - else if(prevRole == "ROLE_ADMIN_AUDITOR") - m.set('previousValue',XAEnums.UserRoles.ROLE_ADMIN_AUDITOR.label) } else { if(!m.has('attributeName')) modelArr.push(m); diff --git a/security-admin/src/main/webapp/scripts/views/reports/UserAccessLayout.js b/security-admin/src/main/webapp/scripts/views/reports/UserAccessLayout.js index 95ee3c7d17..4de9257a67 100644 --- a/security-admin/src/main/webapp/scripts/views/reports/UserAccessLayout.js +++ b/security-admin/src/main/webapp/scripts/views/reports/UserAccessLayout.js @@ -34,7 +34,6 @@ define(function(require) {'use strict'; var RangerServiceDefList= require('collections/RangerServiceDefList'); var RangerPolicyList = require('collections/RangerPolicyList'); var UseraccesslayoutTmpl= require('hbs!tmpl/reports/UserAccessLayout_tmpl'); - var SessionMgr = require('mgrs/SessionMgr'); var UserAccessLayout = Backbone.Marionette.Layout.extend( /** @lends UserAccessLayout */ @@ -46,8 +45,7 @@ define(function(require) {'use strict'; templateHelpers :function(){ return { groupList : this.groupList, - policyHeaderList : this.policyCollList, - showImportExportBtn : (XAUtil.isAuditorOrKMSAuditor(SessionMgr)) ? false : true + policyHeaderList : this.policyCollList }; }, @@ -458,9 +456,6 @@ define(function(require) {'use strict'; }; var permissions = this.getPermissionColumns(this[collName],collName,serviceDefName,subcolumns); _.extend(columns,permissions); - if(XAUtil.isAuditorOrKMSAuditor(SessionMgr)){ - columns.id.cell = 'string'; - } return coll.constructor.getTableCols(columns, coll); }, getPermissionColumns: function (coll,collName,serviceDefName,subcolumns){ diff --git a/security-admin/src/main/webapp/scripts/views/service/RangerServiceViewDetail.js b/security-admin/src/main/webapp/scripts/views/service/RangerServiceViewDetail.js deleted file mode 100644 index 3b2f67c4b6..0000000000 --- a/security-admin/src/main/webapp/scripts/views/service/RangerServiceViewDetail.js +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - - -define(function(require) { - 'use strict'; - - var Backbone = require('backbone'); - var XAEnums = require('utils/XAEnums'); - var XAGlobals = require('utils/XAGlobals'); - var XAUtils = require('utils/XAUtils'); - var localization = require('utils/XALangSupport'); - - var RangerServiceViewDetailTmpl = require('hbs!tmpl/service/RangerServiceViewDetail_tmpl'); - var RangerService = require('models/RangerService'); - - var RangerServiceView = Backbone.Marionette.Layout.extend({ - _viewName: 'RangerServiceView', - - template: RangerServiceViewDetailTmpl, - templateHelpers: function() { - var that = this; - - return { - configsList : this.conf, - customConfigs : this.customConfigs, - serviceName : this.options.rangerService.get('name'), - description : this.options.rangerService.get('description'), - isEnabled : this.options.rangerService.get('isEnabled'), - tagService : (this.options.rangerService.get('tagService')) ? this.options.rangerService.get('tagService') : false, - } - }, - breadCrumbs: [], - - /** - * intialize a new RangerServiceDiffDetaile Layout - * @constructs - */ - initialize: function(options) { - console.log("initialized a Ranger Service View Diff"); - var that = this; - that.getTemplateForservice(this.options); - }, - getTemplateForservice : function(options){ - var configList = options.serviceDef.get('configs'); - var serviceConfigs = options.rangerService.get('configs'); - var configs = {} , customConfigs = serviceConfigs; - _.each(configList , function(m){ - if(m.label){ - configs[m.label] = serviceConfigs[m.name] - }else{ - configs[m.name] = serviceConfigs[m.name] - } - customConfigs = _.omit(customConfigs , m.name); - }) - this.conf = configs; - if(_.isEmpty(customConfigs)){ - this.customConfigs = false - }else{ - this.customConfigs = customConfigs; - } - }, - /** on close */ - onClose: function() {} - }); - - return RangerServiceView; -}); diff --git a/security-admin/src/main/webapp/scripts/views/user/UserProfileForm.js b/security-admin/src/main/webapp/scripts/views/user/UserProfileForm.js index 5ebd29048a..d545a05ebe 100644 --- a/security-admin/src/main/webapp/scripts/views/user/UserProfileForm.js +++ b/security-admin/src/main/webapp/scripts/views/user/UserProfileForm.js @@ -77,10 +77,6 @@ define(function(require){ this.fields.userRoleList.setValue(XAEnums.UserRoles.ROLE_USER.value); } else if(XAEnums.UserRoles[roleList[0]].value == XAEnums.UserRoles.ROLE_KEY_ADMIN.value){ this.fields.userRoleList.setValue(XAEnums.UserRoles.ROLE_KEY_ADMIN.value); - } else if(XAEnums.UserRoles[roleList[0]].value == XAEnums.UserRoles.ROLE_KEY_ADMIN_AUDITOR.value){ - this.fields.userRoleList.setValue(XAEnums.UserRoles.ROLE_KEY_ADMIN_AUDITOR.value); - } else if(XAEnums.UserRoles[roleList[0]].value == XAEnums.UserRoles.ROLE_ADMIN_AUDITOR.value){ - this.fields.userRoleList.setValue(XAEnums.UserRoles.ROLE_ADMIN_AUDITOR.value); } else { this.fields.userRoleList.setValue(XAEnums.UserRoles.ROLE_SYS_ADMIN.value); } @@ -122,10 +118,6 @@ define(function(require){ this.model.set('userRoleList',["ROLE_USER"]); } else if(this.model.get('userRoleList') == XAEnums.UserRoles.ROLE_KEY_ADMIN.value){ this.model.set('userRoleList',["ROLE_KEY_ADMIN"]); - } else if(this.model.get('userRoleList') == XAEnums.UserRoles.ROLE_KEY_ADMIN_AUDITOR.value){ - this.model.set('userRoleList',["ROLE_KEY_ADMIN_AUDITOR"]); - } else if(this.model.get('userRoleList') == XAEnums.UserRoles.ROLE_ADMIN_AUDITOR.value){ - this.model.set('userRoleList',["ROLE_ADMIN_AUDITOR"]); } }, /** all post render plugin initialization */ diff --git a/security-admin/src/main/webapp/scripts/views/users/GroupCreate.js b/security-admin/src/main/webapp/scripts/views/users/GroupCreate.js index a7643875ed..b73f755284 100644 --- a/security-admin/src/main/webapp/scripts/views/users/GroupCreate.js +++ b/security-admin/src/main/webapp/scripts/views/users/GroupCreate.js @@ -32,7 +32,6 @@ define(function(require){ var VXGroupList = require('collections/VXGroupList'); var GroupForm = require('views/users/GroupForm'); var GroupcreateTmpl = require('hbs!tmpl/users/GroupCreate_tmpl'); - var SessionMgr = require('mgrs/SessionMgr'); var GroupCreate = Backbone.Marionette.Layout.extend( /** @lends GroupCreate */ @@ -94,8 +93,7 @@ define(function(require){ this.rForm.show(this.form); this.rForm.$el.dirtyFields(); XAUtil.preventNavigation(localization.tt('dialogMsg.preventNavGroupForm'),this.rForm.$el); - if((!_.isUndefined(this.model.get('groupSource')) && this.model.get('groupSource') == XAEnums.GroupSource.XA_GROUP.value) - || XAUtil.isAuditorOrKMSAuditor(SessionMgr)){ + if(!_.isUndefined(this.model.get('groupSource')) && this.model.get('groupSource') == XAEnums.GroupSource.XA_GROUP.value){ this.ui.btnSave.prop( "disabled", true ); } }, diff --git a/security-admin/src/main/webapp/scripts/views/users/UserCreate.js b/security-admin/src/main/webapp/scripts/views/users/UserCreate.js index e1afff1659..b8c589449e 100644 --- a/security-admin/src/main/webapp/scripts/views/users/UserCreate.js +++ b/security-admin/src/main/webapp/scripts/views/users/UserCreate.js @@ -32,7 +32,6 @@ define(function(require){ var UserTableLayout = require('views/users/UserTableLayout'); var VXUserList = require('collections/VXUserList'); var UserCreateTmpl = require('hbs!tmpl/users/UserCreate_tmpl'); - var SessionMgr = require('mgrs/SessionMgr'); var UserCreate = Backbone.Marionette.Layout.extend( /** @lends UserCreate */ @@ -101,10 +100,7 @@ define(function(require){ this.renderForm(); this.rForm.$el.dirtyFields(); XAUtil.preventNavigation(localization.tt('dialogMsg.preventNavUserForm'),this.rForm.$el); - if(XAUtil.isAuditorOrKMSAuditor(SessionMgr)){ - this.ui.btnSave.attr("disabled", true); - } - }, + }, /** all post render plugin initialization */ initializePlugins: function(){ }, 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 ee0d256203..bd3730b8d3 100644 --- a/security-admin/src/main/webapp/scripts/views/users/UserForm.js +++ b/security-admin/src/main/webapp/scripts/views/users/UserForm.js @@ -113,13 +113,13 @@ define(function(require){ type : 'Select', options : function(callback, editor){ - var userTypes = _.filter(XAEnums.UserRoles,function(m){ - if(!SessionMgr.isKeyAdmin()){ - return m.label != 'Unknown' && m.label != 'KeyAdmin' && m.label != 'KMSAuditor'; - } else { - return m.label != 'Unknown' && m.label != 'Admin' && m.label != 'Auditor'; - } - }); + var userTypes = _.filter(XAEnums.UserRoles,function(m){ + if(!SessionMgr.isKeyAdmin()){ + return m.label != 'Unknown' && m.label != 'KeyAdmin'; + } else { + return m.label != 'Unknown' && m.label != 'Admin'; + } + }); var nvPairs = XAUtils.enumToSelectPairs(userTypes); callback(nvPairs); editor.$el.val("0"); @@ -144,10 +144,6 @@ define(function(require){ this.fields.userRoleList.setValue(XAEnums.UserRoles.ROLE_USER.value); } else if(XAEnums.UserRoles[roleList[0]].value == XAEnums.UserRoles.ROLE_KEY_ADMIN.value){ this.fields.userRoleList.setValue(XAEnums.UserRoles.ROLE_KEY_ADMIN.value); - } else if(XAEnums.UserRoles[roleList[0]].value == XAEnums.UserRoles.ROLE_KEY_ADMIN_AUDITOR.value){ - this.fields.userRoleList.setValue(XAEnums.UserRoles.ROLE_KEY_ADMIN_AUDITOR.value); - } else if(XAEnums.UserRoles[roleList[0]].value == XAEnums.UserRoles.ROLE_ADMIN_AUDITOR.value){ - this.fields.userRoleList.setValue(XAEnums.UserRoles.ROLE_ADMIN_AUDITOR.value); } else { this.fields.userRoleList.setValue(XAEnums.UserRoles.ROLE_SYS_ADMIN.value); } @@ -245,11 +241,7 @@ define(function(require){ this.model.set('userRoleList',["ROLE_USER"]); }else if(this.fields.userRoleList.getValue() == XAEnums.UserRoles.ROLE_KEY_ADMIN.value){ this.model.set('userRoleList',["ROLE_KEY_ADMIN"]); - } else if(this.fields.userRoleList.getValue() == XAEnums.UserRoles.ROLE_KEY_ADMIN_AUDITOR.value){ - this.model.set('userRoleList',["ROLE_KEY_ADMIN_AUDITOR"]); - } else if(this.fields.userRoleList.getValue() == XAEnums.UserRoles.ROLE_ADMIN_AUDITOR.value){ - this.model.set('userRoleList',["ROLE_ADMIN_AUDITOR"]); - } else{ + }else{ this.model.set('userRoleList',["ROLE_SYS_ADMIN"]); } return true; @@ -261,11 +253,7 @@ define(function(require){ this.model.set('userRoleList',["ROLE_USER"]); }else if(this.fields.userRoleList.getValue() == XAEnums.UserRoles.ROLE_KEY_ADMIN.value){ this.model.set('userRoleList',["ROLE_KEY_ADMIN"]); - } else if(this.fields.userRoleList.getValue() == XAEnums.UserRoles.ROLE_KEY_ADMIN_AUDITOR.value){ - this.model.set('userRoleList',["ROLE_KEY_ADMIN_AUDITOR"]); - } else if(this.fields.userRoleList.getValue() == XAEnums.UserRoles.ROLE_ADMIN_AUDITOR.value){ - this.model.set('userRoleList',["ROLE_ADMIN_AUDITOR"]); - } else{ + }else{ this.model.set('userRoleList',["ROLE_SYS_ADMIN"]); } }, diff --git a/security-admin/src/main/webapp/scripts/views/users/UserTableLayout.js b/security-admin/src/main/webapp/scripts/views/users/UserTableLayout.js index 886b789f32..1d43954672 100644 --- a/security-admin/src/main/webapp/scripts/views/users/UserTableLayout.js +++ b/security-admin/src/main/webapp/scripts/views/users/UserTableLayout.js @@ -292,7 +292,7 @@ define(function(require){ name : { label : localization.tt("lbl.userName"), href: function(model){ - return '#!/user/'+ model.id; + return '#!/user/'+ model.id; }, editable:false, sortable:false, @@ -374,12 +374,6 @@ define(function(require){ sortable:false } }; - if(!SessionMgr.isSystemAdmin()){ - delete cols.select; - } - if(XAUtil.isAuditorOrKMSAuditor(SessionMgr)){ - cols.name.cell = 'string'; - } return this.collection.constructor.getTableCols(cols, this.collection); }, @@ -424,7 +418,7 @@ define(function(require){ name : { label : localization.tt("lbl.groupName"), href: function(model){ - return '#!/group/'+ model.id; + return '#!/group/'+ model.id; }, editable:false, sortable:false, @@ -485,12 +479,6 @@ define(function(require){ }), } }; - if(!SessionMgr.isSystemAdmin()){ - delete cols.select; - } - if(XAUtil.isAuditorOrKMSAuditor(SessionMgr)){ - cols.name.cell = 'string'; - } return this.groupList.constructor.getTableCols(cols, this.groupList); }, @@ -735,12 +723,10 @@ define(function(require){ valueMatches :function(facet, searchTerm, callback) { switch (facet) { case 'Role': - var userRoles ={}; - _.map(XAUtil.getUserDataParams().userRoleList, function(obj){ - userRoles[obj] = XAEnums.UserRoles[obj]; - }) - var roles = XAUtil.hackForVSLabelValuePairs(userRoles); - callback(roles); + var roles = XAUtil.hackForVSLabelValuePairs(XAEnums.UserRoles); + var label = SessionMgr.isSystemAdmin() || SessionMgr.isUser() ? XAEnums.UserRoles.ROLE_KEY_ADMIN.label + : XAEnums.UserRoles.ROLE_SYS_ADMIN.label; + callback(_.filter(roles, function(o) { return o.label !== label; })); break; case 'User Source': callback(XAUtil.hackForVSLabelValuePairs(XAEnums.UserTypes)); diff --git a/security-admin/src/main/webapp/styles/xa.css b/security-admin/src/main/webapp/styles/xa.css index 1f04aa2a7c..2e1e1c63bc 100644 --- a/security-admin/src/main/webapp/styles/xa.css +++ b/security-admin/src/main/webapp/styles/xa.css @@ -386,6 +386,7 @@ body { } /* Seach Info btn*/ .searchInfo{ + margin-left:12px; color:#4c504b; font-size:larger; } @@ -2235,9 +2236,7 @@ textarea:read-only{ .label-margin{ margin-left: 10px; } -.margin-left-min-30{ - margin-left: -30px; -}.shorten-label { +.shorten-label { max-width: 180px; text-overflow: ellipsis; overflow: hidden; diff --git a/security-admin/src/main/webapp/templates/common/TopNav_tmpl.html b/security-admin/src/main/webapp/templates/common/TopNav_tmpl.html index 31a9c26565..d2ff9687de 100644 --- a/security-admin/src/main/webapp/templates/common/TopNav_tmpl.html +++ b/security-admin/src/main/webapp/templates/common/TopNav_tmpl.html @@ -50,9 +50,9 @@ {{#hasAccessToTab 'Users/Groups'}}
  • {{tt 'h.usersOrGroups'}}
    • {{/hasAccessToTab}} - {{#if showPermissionTab}} + {{#isSystemAdmin .}}
  • {{tt 'h.permissions'}}
    • - {{/if}} + {{/isSystemAdmin}} diff --git a/security-admin/src/main/webapp/templates/helpers/XAHelpers.js b/security-admin/src/main/webapp/templates/helpers/XAHelpers.js index 946b6a3e99..f8479e47ff 100644 --- a/security-admin/src/main/webapp/templates/helpers/XAHelpers.js +++ b/security-admin/src/main/webapp/templates/helpers/XAHelpers.js @@ -510,16 +510,10 @@ serviceName = serv.get('name'); if(SessionMgr.isSystemAdmin() || SessionMgr.isKeyAdmin()){ serviceOperationDiv = '
    \ - \ - \ - \ - \ -
    ' - } - if(XAUtil.isAuditorOrKMSAuditor(SessionMgr)){ - serviceOperationDiv = '
    \ - \ -
    ' + \ + \ + \ + ' } tr += '
    \ '+_.escape(serv.attributes.name)+''+serviceOperationDiv+'\ diff --git a/security-admin/src/main/webapp/templates/kms/KmsTableLayout_tmpl.html b/security-admin/src/main/webapp/templates/kms/KmsTableLayout_tmpl.html index 2f42791b55..8107148c1c 100644 --- a/security-admin/src/main/webapp/templates/kms/KmsTableLayout_tmpl.html +++ b/security-admin/src/main/webapp/templates/kms/KmsTableLayout_tmpl.html @@ -22,16 +22,13 @@

    {{tt 'lbl.keyManagement'}}

    Select Service :

    -
    -
    -
    -
    -
    - {{#isKeyadmin}} -
    - {{tt 'lbl.addNewKey'}} -
    - {{/isKeyadmin}} +
    +
    +
    +
    +
    + {{tt 'lbl.addNewKey'}} +
    diff --git a/security-admin/src/main/webapp/templates/permissions/ModulePermsTableLayout_tmpl.html b/security-admin/src/main/webapp/templates/permissions/ModulePermsTableLayout_tmpl.html index 4b35587478..52b36a1e79 100644 --- a/security-admin/src/main/webapp/templates/permissions/ModulePermsTableLayout_tmpl.html +++ b/security-admin/src/main/webapp/templates/permissions/ModulePermsTableLayout_tmpl.html @@ -22,6 +22,6 @@

    {{tt 'lbl.permissions'}}

    -
    +
    diff --git a/security-admin/src/main/webapp/templates/policies/RangerPolicyTableLayout_tmpl.html b/security-admin/src/main/webapp/templates/policies/RangerPolicyTableLayout_tmpl.html index bcd495cf69..c49dc32958 100644 --- a/security-admin/src/main/webapp/templates/policies/RangerPolicyTableLayout_tmpl.html +++ b/security-admin/src/main/webapp/templates/policies/RangerPolicyTableLayout_tmpl.html @@ -36,22 +36,18 @@

    {{tt 'lbl.listOfPolicies'}} : {{rangerService.attributes.name}}

    -
    -
    -
    -
    -
    - -
    -
    -
    - {{#if isNotAuditorAdminOrKmsAuditor}} - {{tt 'lbl.addNewPolicy'}} - {{/if}} +
    +
    +
    +
    + + + +
    + {{tt 'lbl.addNewPolicy'}} +
    -
    -
    -
    +
    diff --git a/security-admin/src/main/webapp/templates/reports/UserAccessLayout_tmpl.html b/security-admin/src/main/webapp/templates/reports/UserAccessLayout_tmpl.html index 3bd098d7fe..e185742911 100644 --- a/security-admin/src/main/webapp/templates/reports/UserAccessLayout_tmpl.html +++ b/security-admin/src/main/webapp/templates/reports/UserAccessLayout_tmpl.html @@ -107,7 +107,6 @@

    Search Criteria

    - {{#showImportExportBtn}}
    @@ -128,7 +127,6 @@

    Search Criteria

    - {{/showImportExportBtn}}
    {{#each policyHeaderList}}

    diff --git a/security-admin/src/main/webapp/templates/service/RangerServiceViewDetail_tmpl.html b/security-admin/src/main/webapp/templates/service/RangerServiceViewDetail_tmpl.html deleted file mode 100644 index d9fe51f1b6..0000000000 --- a/security-admin/src/main/webapp/templates/service/RangerServiceViewDetail_tmpl.html +++ /dev/null @@ -1,120 +0,0 @@ -{{!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---}} -
    -

    - {{tt 'h.serviceDetails'}} : -

    - - - - - - - - - {{#if description}} - - {{else}} - - {{/if}} - - - - {{#if isEnabled}} - - {{else}} - - {{/if}} - - - - - - -
    - {{tt 'lbl.serviceName'}} - - {{serviceName}} -
    - {{tt 'lbl.description'}} - - {{description}} - - -- -
    - {{tt 'lbl.activeStatus'}} - - Enabled - - Disabled -
    - {{tt 'lbl.selectTagService'}} - - {{#compare tagService "eq" ''}} - -- - {{else}} - {{tagService}} - {{/compare}} -
    -
    -
    -

    - {{tt 'h.configProperties'}} : -

    - - - {{#each configsList}} - - - - - {{/each}} - - - - {{#if customConfigs}} - {{#each customConfigs}} - - - - - {{/each}} - {{else}} - - - - - {{/if}} - -
    - {{@key}} - - {{#if this}} - {{this}} - {{else}} - -- - {{/if}} -
    {{tt 'lbl.addNewConfig'}} :
    - {{@key}} - - {{this}} -
    - -- - - -- -
    -
    \ No newline at end of file diff --git a/security-admin/src/main/webapp/templates/users/UserTableLayout_tmpl.html b/security-admin/src/main/webapp/templates/users/UserTableLayout_tmpl.html index 69d7c3efbd..b7d4967b37 100644 --- a/security-admin/src/main/webapp/templates/users/UserTableLayout_tmpl.html +++ b/security-admin/src/main/webapp/templates/users/UserTableLayout_tmpl.html @@ -33,7 +33,6 @@

    {{tt 'lbl.userListing'}}

    {{#isSystemAdmin .}} {{/isSystemAdmin}} - {{#isSystemAdmin .}}
    {{tt 'btn.setVisibility'}} @@ -46,9 +45,8 @@

    {{tt 'lbl.userListing'}}

    {{tt 'lbl.addNewUser'}} - {{/isSystemAdmin}}
    -
    +