Skip to content

ROX-13326: Access control UUID support in the UI #3818

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

Merged
rhybrillou merged 3 commits into from
Nov 17, 2022
Merged

ROX-13326: Access control UUID support in the UI #3818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59ce2c7
ROX-13326: Access control UUID support in the UI
rhybrillou Nov 15, 2022
dd74b38
Refactor Unrestricted access scope ID match to dedicated function
rhybrillou Nov 16, 2022
d17484b
Address UI review comments
rhybrillou Nov 17, 2022
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
7 changes: 4 additions & 3 deletions ui/apps/platform/src/Containers/AccessControl/AccessScopes/AccessScopeForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
LabelSelectorsKey,
computeEffectiveAccessScopeClusters,
defaultAccessScopeIds,
getIsUnrestrictedAccessScopeId
} from 'services/AccessScopesService';

import {
Expand Down Expand Up @@ -85,9 +86,9 @@ function AccessScopeForm({ hasAction, alertSubmit, formik }: AccessScopeFormProp
* before its first requirement or value has been added.
*/
const isValidRules =
values.id !== defaultAccessScopeIds.Unrestricted && getIsValidRules(values.rules);
!getIsUnrestrictedAccessScopeId(values.id) && getIsValidRules(values.rules);
useEffect(() => {
if (values.id === defaultAccessScopeIds.Unrestricted) {
if (getIsUnrestrictedAccessScopeId(values.id)) {
return;
}
setCounterComputing((counterPrev) => counterPrev + 1);
Expand Down Expand Up @@ -195,7 +196,7 @@ function AccessScopeForm({ hasAction, alertSubmit, formik }: AccessScopeFormProp
/>
</FormGroup>
{alertCompute}
{values.id !== defaultAccessScopeIds.Unrestricted && (
{ !getIsUnrestrictedAccessScopeId(values.id) && (
<Flex
direction={{ default: 'row' }}
spaceItems={{ default: 'spaceItemsSm', xl: 'spaceItemsLg' }}
Expand Down
8 changes: 6 additions & 2 deletions ui/apps/platform/src/Containers/AccessControl/AccessScopes/AccessScopeFormWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ import {
ToolbarItem,
} from '@patternfly/react-core';

import { AccessScope, defaultAccessScopeIds } from 'services/AccessScopesService';
import {
AccessScope,
defaultAccessScopeIds,
getIsUnrestrictedAccessScopeId
} from 'services/AccessScopesService';

import { AccessControlQueryAction } from '../accessControlPaths';

Expand Down Expand Up @@ -82,7 +86,7 @@ function AccessScopeFormWrapper({
* before its first requirement or value has been added.
*/
const isValidRules =
values.id !== defaultAccessScopeIds.Unrestricted && getIsValidRules(values.rules);
!getIsUnrestrictedAccessScopeId(values.id) && getIsValidRules(values.rules);

function onClickSubmit() {
// TODO submit through Formik, especially to update its initialValue.
Expand Down
10 changes: 10 additions & 0 deletions ui/apps/platform/src/services/AccessScopesService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,25 @@ import { Empty } from './types';

const accessScopessUrl = '/v1/simpleaccessscopes';

/*
* TODO: ROX-13585 - remove the pre-postgres constants once the migration to postgres
* is completed and the support for BoltDB, RocksDB and Bleve is dropped.
*/
export const defaultAccessScopeIds = {
Unrestricted: 'io.stackrox.authz.accessscope.unrestricted',
UnrestrictedPostgres: 'ffffffff-ffff-fff4-f5ff-ffffffffffff',
DenyAll: 'io.stackrox.authz.accessscope.denyall',
DenyAllPostgres: 'ffffffff-ffff-fff4-f5ff-fffffffffffe'
};

export function getIsDefaultAccessScopeId(id: string): boolean {
return Object.values(defaultAccessScopeIds).includes(id);
}

export function getIsUnrestrictedAccessScopeId(id: string): boolean {
return id === defaultAccessScopeIds.Unrestricted || id === defaultAccessScopeIds.UnrestrictedPostgres
}

export type SimpleAccessScopeNamespace = {
clusterName: string;
namespaceName: string;
Expand Down