From b584e4b139ec4a30a97ea42ff54c76753731d707 Mon Sep 17 00:00:00 2001 From: Laurence Maultsby Date: Wed, 12 Apr 2017 11:57:16 -0400 Subject: [PATCH] Init RBAC read only: composer Signed-off-by: Laurence Maultsby --- .../core/modules/routes/navigation.js | 2 +- skyquake/framework/utils/utils.js | 1 + .../widgets/skyquake_nav/skyquakeNav.jsx | 29 +++++++---- .../widgets/skyquake_rbac/skyquakeRBAC.jsx | 34 ++++++++----- .../composer/src/src/components/Button.js | 3 +- .../components/CatalogItemDetailsEditor.js | 21 +++++++- .../src/src/components/CatalogPanelToolbar.js | 26 ++++++---- .../src/src/components/ComposerApp.js | 13 ++++- .../src/src/components/DetailsPanel.js | 7 ++- .../EditDescriptorModelProperties.js | 51 +++++++++++-------- .../EditForwardingGraphPaths.js | 33 +++++++++--- 11 files changed, 152 insertions(+), 68 deletions(-) diff --git a/skyquake/framework/core/modules/routes/navigation.js b/skyquake/framework/core/modules/routes/navigation.js index bf9c47b4c..16ff25af5 100644 --- a/skyquake/framework/core/modules/routes/navigation.js +++ b/skyquake/framework/core/modules/routes/navigation.js @@ -1,6 +1,6 @@ /* - * + * * Copyright 2016 RIFT.IO Inc * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/skyquake/framework/utils/utils.js b/skyquake/framework/utils/utils.js index be3278d08..16037d740 100644 --- a/skyquake/framework/utils/utils.js +++ b/skyquake/framework/utils/utils.js @@ -26,6 +26,7 @@ var SockJS = require('sockjs-client'); var Utils = {}; Utils.DescriptorModelMeta = null; +// Utils.DescriptorModelMeta = require('./../../plugins/composer/src/src/libraries/model/DescriptorModelMeta.json'); var INACTIVITY_TIMEOUT = 600000; diff --git a/skyquake/framework/widgets/skyquake_nav/skyquakeNav.jsx b/skyquake/framework/widgets/skyquake_nav/skyquakeNav.jsx index 1aaaf4d45..c4df1e259 100644 --- a/skyquake/framework/widgets/skyquake_nav/skyquakeNav.jsx +++ b/skyquake/framework/widgets/skyquake_nav/skyquakeNav.jsx @@ -25,7 +25,7 @@ import 'style/common.scss'; import './skyquakeNav.scss'; import SelectOption from '../form_controls/selectOption.jsx'; import {FormSection} from '../form_controls/formControls.jsx'; -import SkyquakeRBAC from 'widgets/skyquake_rbac/skyquakeRBAC.jsx'; +import {isRBACValid, SkyquakeRBAC} from 'widgets/skyquake_rbac/skyquakeRBAC.jsx'; //Temporary, until api server is on same port as webserver var rw = require('utils/rw.js'); @@ -190,6 +190,9 @@ export default class skyquakeNav extends React.Component { skyquakeNav.defaultProps = { nav: {} } +skyquakeNav.contextTypes = { + userProfile: React.PropTypes.object +}; /** * Returns a React Component * @param {object} link Information about the nav link @@ -259,6 +262,7 @@ export function buildNav(nav, currentPlugin, props) { let secondaryNav = []; let adminNav = []; let self = this; + const User = this.context.userProfile; self.hasSubNav = {}; let secondaryNavHTML = (
@@ -318,16 +322,19 @@ export function buildNav(nav, currentPlugin, props) { )) } else { - navItem.html = ( - -

{dashboardLink} {self.hasSubNav[k] ? : ''}

-
    - { - NavList - } -
- - ); + let shouldAllow = nav[k].allow || ['*']; + if (isRBACValid(User, shouldAllow) ){ + navItem.html = ( +
+

{dashboardLink} {self.hasSubNav[k] ? : ''}

+
    + { + NavList + } +
+
+ ); + } navList.push(navItem) } diff --git a/skyquake/framework/widgets/skyquake_rbac/skyquakeRBAC.jsx b/skyquake/framework/widgets/skyquake_rbac/skyquakeRBAC.jsx index cbb6a567f..0245e235e 100644 --- a/skyquake/framework/widgets/skyquake_rbac/skyquakeRBAC.jsx +++ b/skyquake/framework/widgets/skyquake_rbac/skyquakeRBAC.jsx @@ -21,6 +21,25 @@ import React from 'react'; import ROLES from 'utils/roleConstants.js'; const PLATFORM = ROLES.PLATFORM; +export function isRBACValid(User, allow){ + const UserData = User.data; + if(UserData) { + const PlatformRole = UserData.platform.role; + const isPlatformSuper = PlatformRole[PLATFORM.SUPER]; + const isPlatformAdmin = PlatformRole[PLATFORM.ADMIN]; + const isPlatformOper = PlatformRole[PLATFORM.OPER]; + const hasRoleAccess = checkForRoleAccess(UserData.project[User.projectId], PlatformRole, allow)//false//(this.props.roles.indexOf(userProfile.projectRole) > -1) + if (isPlatformSuper) { + return true; + } else { + if (hasRoleAccess) { + return true; + } + } + } + return false; +} + export default class SkyquakeRBAC extends React.Component { constructor(props, context) { super(props); @@ -30,19 +49,8 @@ export default class SkyquakeRBAC extends React.Component { const UserData = User.data; let HTML = null; // If user object has platform property then it has been populated by the back end. - if(UserData) { - const PlatformRole = UserData.platform.role; - const isPlatformSuper = PlatformRole[PLATFORM.SUPER]; - const isPlatformAdmin = PlatformRole[PLATFORM.ADMIN]; - const isPlatformOper = PlatformRole[PLATFORM.OPER]; - const hasRoleAccess = checkForRoleAccess(UserData.project[User.projectId], PlatformRole, this.props.allow)//false//(this.props.roles.indexOf(userProfile.projectRole) > -1) - if (isPlatformSuper) { - HTML = this.props.children; - } else { - if (hasRoleAccess) { - HTML = this.props.children; - } - } + if(isRBACValid(User, this.props.allow)) { + HTML = this.props.children; } return (
{HTML}
) } diff --git a/skyquake/plugins/composer/src/src/components/Button.js b/skyquake/plugins/composer/src/src/components/Button.js index 76a569f86..6ef41bf93 100644 --- a/skyquake/plugins/composer/src/src/components/Button.js +++ b/skyquake/plugins/composer/src/src/components/Button.js @@ -40,6 +40,7 @@ const Button = React.createClass({ label: null, title: null, src: null, + disabled: false, onClick: () => {} }; }, @@ -58,7 +59,7 @@ const Button = React.createClass({ const draggable = this.props.draggable; const className = ClassNames(this.props.className, 'Button'); return ( -
+
{ src ? : null } {label}
diff --git a/skyquake/plugins/composer/src/src/components/CatalogItemDetailsEditor.js b/skyquake/plugins/composer/src/src/components/CatalogItemDetailsEditor.js index 752d678e7..fe4752180 100644 --- a/skyquake/plugins/composer/src/src/components/CatalogItemDetailsEditor.js +++ b/skyquake/plugins/composer/src/src/components/CatalogItemDetailsEditor.js @@ -1,5 +1,5 @@ /* - * + * * Copyright 2016 RIFT.IO Inc * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -20,6 +20,10 @@ import React from 'react' import PureRenderMixin from 'react-addons-pure-render-mixin' import EditDescriptorModelProperties from './EditDescriptorModelProperties' +import {SkyquakeRBAC, isRBACValid} from 'widgets/skyquake_rbac/skyquakeRBAC.jsx'; +import ROLES from 'utils/roleConstants.js'; +const PROJECT_ROLES = ROLES.PROJECT; +const PLATFORM = ROLES.PLATFORM; const CatalogItemDetailsEditor = React.createClass({ mixins: [PureRenderMixin], @@ -32,6 +36,10 @@ const CatalogItemDetailsEditor = React.createClass({ width: 0 }; }, + contextTypes: { + router: React.PropTypes.object, + userProfile: React.PropTypes.object + }, componentWillMount() { }, componentDidMount() { @@ -41,6 +49,7 @@ const CatalogItemDetailsEditor = React.createClass({ componentWillUnmount() { }, render() { + const User = this.context.userProfile; const container = this.props.container || {model: {}, uiState: {}}; if (!(container && container.model && container.uiState)) { @@ -51,7 +60,11 @@ const CatalogItemDetailsEditor = React.createClass({
- + { + isRBACValid(User, [PROJECT_ROLES.CAT_ADMIN]) ? + + : + }
@@ -60,4 +73,8 @@ const CatalogItemDetailsEditor = React.createClass({ } }); +CatalogItemDetailsEditor.contextTypes = { + router: React.PropTypes.object, + userProfile: React.PropTypes.object +}; export default CatalogItemDetailsEditor; diff --git a/skyquake/plugins/composer/src/src/components/CatalogPanelToolbar.js b/skyquake/plugins/composer/src/src/components/CatalogPanelToolbar.js index 5e3e3c091..896badd2f 100644 --- a/skyquake/plugins/composer/src/src/components/CatalogPanelToolbar.js +++ b/skyquake/plugins/composer/src/src/components/CatalogPanelToolbar.js @@ -1,6 +1,6 @@ /* - * + * * Copyright 2016 RIFT.IO Inc * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -32,6 +32,10 @@ import imgOnboard from '../../../node_modules/open-iconic/svg/cloud-upload.svg' import imgUpdate from '../../../node_modules/open-iconic/svg/rain.svg' import imgDownload from '../../../node_modules/open-iconic/svg/cloud-download.svg' import imgDelete from '../../../node_modules/open-iconic/svg/trash.svg' +import {SkyquakeRBAC, isRBACValid} from 'widgets/skyquake_rbac/skyquakeRBAC.jsx'; +import ROLES from 'utils/roleConstants.js'; +const PROJECT_ROLES = ROLES.PROJECT; +const PLATFORM = ROLES.PLATFORM; const CatalogHeader = React.createClass({ mixins: [PureRenderMixin], @@ -48,28 +52,32 @@ const CatalogHeader = React.createClass({ }, componentWillUnmount() { }, + contextTypes: { + userProfile: React.PropTypes.object + }, render() { + const disabled = !isRBACValid(this.context.userProfile, [PROJECT_ROLES.CAT_ADMIN]); return (

Descriptor Catalogs

-
-
-
-
diff --git a/skyquake/plugins/composer/src/src/components/ComposerApp.js b/skyquake/plugins/composer/src/src/components/ComposerApp.js index 861c38be0..fd3fc9460 100644 --- a/skyquake/plugins/composer/src/src/components/ComposerApp.js +++ b/skyquake/plugins/composer/src/src/components/ComposerApp.js @@ -48,6 +48,9 @@ import TooltipManager from '../libraries/TooltipManager' import CatalogItemsActions from '../actions/CatalogItemsActions' import CommonUtils from 'utils/utils.js' import FileManagerActions from './filemanager/FileManagerActions'; +import {SkyquakeRBAC, isRBACValid} from 'widgets/skyquake_rbac/skyquakeRBAC.jsx'; +import ROLES from 'utils/roleConstants.js'; + import 'normalize.css' import '../styles/AppRoot.scss' import 'style/layout.scss' @@ -60,6 +63,8 @@ const clearLocalStorage = utils.getSearchParams(window.location).hasOwnProperty( const preventDefault = e => e.preventDefault(); const clearDragState = () => ComposerAppActions.setDragState(null); +const PROJECT_ROLES = ROLES.PROJECT; +const PLATFORM = ROLES.PLATFORM; const ComposerApp = React.createClass({ mixins: [PureRenderMixin], @@ -69,6 +74,10 @@ const ComposerApp = React.createClass({ getDefaultProps() { return {}; }, + contextTypes: { + router: React.PropTypes.object, + userProfile: React.PropTypes.object + }, componentWillMount() { if (clearLocalStorage) { window.localStorage.clear(); @@ -147,6 +156,7 @@ const ComposerApp = React.createClass({ render() { let html = null; let self = this; + const User = this.context.userProfile || {}; if(this.state.hasModel) { function onClickUpdateSelection(event) { @@ -225,7 +235,7 @@ const ComposerApp = React.createClass({ isEditingVNFD={isEditingVNFD} isModified={isModified} isNew={isNew} - disabled={!hasItem} + disabled={!hasItem || !isRBACValid(User, [PROJECT_ROLES.CAT_ADMIN])} onClick={event => event.stopPropagation()} panelTabShown={self.state.panelTabShown}/>
@@ -270,4 +280,5 @@ const ComposerApp = React.createClass({ }); + export default ComposerApp; diff --git a/skyquake/plugins/composer/src/src/components/DetailsPanel.js b/skyquake/plugins/composer/src/src/components/DetailsPanel.js index a20679fd1..7af2ad148 100644 --- a/skyquake/plugins/composer/src/src/components/DetailsPanel.js +++ b/skyquake/plugins/composer/src/src/components/DetailsPanel.js @@ -1,6 +1,6 @@ /* - * + * * Copyright 2016 RIFT.IO Inc * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -73,4 +73,9 @@ const DetailsPanel = React.createClass({ } }); +DetailsPanel.contextTypes = { + router: React.PropTypes.object, + userProfile: React.PropTypes.object +}; + export default DetailsPanel; diff --git a/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js b/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js index 589eef976..e75f3cd53 100644 --- a/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js +++ b/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js @@ -74,7 +74,7 @@ function getTitle(model = {}) { export default function EditDescriptorModelProperties(props) { const container = props.container; - + const readonly = props.readonly; if (!(DescriptorModelFactory.isContainer(container))) { return } @@ -141,6 +141,9 @@ export default function EditDescriptorModelProperties(props) { } CatalogItemsActions.catalogItemDescriptorChanged(this.getRoot()); } + if(readonly) { + return null; + } return (