Skip to content

ROX-13378: Access Control page permissions#3720

Merged
ivan-degtiarenko merged 10 commits intomasterfrom
ivan/rox-13378-fix-access-control-perms
Nov 14, 2022
Merged

ROX-13378: Access Control page permissions#3720
ivan-degtiarenko merged 10 commits intomasterfrom
ivan/rox-13378-fix-access-control-perms

Conversation

@ivan-degtiarenko
Copy link
Contributor

@ivan-degtiarenko ivan-degtiarenko commented Nov 7, 2022

Description

Before this PR: “Access Control” page forever loads when the user has Access permission but not Role permission.

After this PR:
Change to "by tab" permission check:

  • Access permission check for Auth providers
  • Role check for Roles, Permission sets and Access scopes

Checklist

  • Investigated and inspected CI test results
  • Unit test and regression tests added
  • Evaluated and added CHANGELOG entry if required
  • Determined and documented upgrade steps
  • Documented user facing changes (create PR based on openshift/openshift-docs and merge into rhacs-docs)

If any of these don't apply, please comment below.

Testing Performed

Screenshot 2022-11-07 at 13 26 12

Screenshot 2022-11-07 at 13 26 24

@openshift-ci
Copy link

openshift-ci bot commented Nov 7, 2022

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@ivan-degtiarenko ivan-degtiarenko changed the title (WIP) ROX-13378: Access Control page permissions ROX-13378: Access Control page permissions Nov 7, 2022
@ivan-degtiarenko ivan-degtiarenko marked this pull request as ready for review November 7, 2022 12:28
)}
<PageSection variant={isList ? 'default' : 'light'}>
{isFetchingAuthProviders || isFetchingRoles ? (
{isFetchingAuthProviders || (isFetchingRoles && hasReadAccessForRoles) ? (
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a bit unfortunate that we need to fetch roles and hence need Role permission here as well but I guess it's fine. I hope we will merge Role into Access soon anyway.

Copy link
Contributor

@pedrottimark pedrottimark Nov 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rukletsov is this a correct summary of current resource dependencies:

  • Auth providers depends on Access and Role
  • the other 3 tabs depend only on Role

But future change will send Access Control “ahead to the past” with Access as only resource dependency?

To help me plan ahead, how soon is soon? During 3.74?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pedrottimark correct. There is no timeline, we can't fuse Role and Access together until after Role is not required for managing scopes in vuln management (which I believe will happen around collections launch).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs follow up during 3.74

  1. There is a bug in UI code if error status code for roles request does not negate isFetchingRoles state.
  2. If I understand correctly that Access without Role permission allows some parts of Auth providers page to work but not others, then either or both of the following:
    • We need to evaluate whether user with split permission can misunderstand or do damage.
    • We need to clarify whether Role permission goes away in the same release as collections (tentatively 3.74) or in the following release to decide whether remedial action in needed.

</>
}
/>
{hasReadAccessForAccessControlPages ? (
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would have probably kept the check extending it to hasReadAccess('Access') || hasReadAccess('Role')

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In theory

  • We could have kept this logic by replacing Access with Role (if it is true that all 4 entities need Role)
  • We could have added only extra Access dependency for Auth providers page.

But if future improvement in resources means that Access is the only dependency for all 4 entities, then we will move resource dependency from container code to declarative description of routes. Therefore,

  • Deletions from this page now mean no more changes required here in the future.
  • Additions to other pages will need to be deleted in the future.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think currently(meaning until after Access is fused with Role+with changes in this PR) we get reasonable behaviour when giving user Access but no Role permission:

  1. Auth providers are visible
  2. Minimum access role name is visible but impossible to access
  3. It's impossible for user to create either groups or change minimum access role.

@ivan-degtiarenko ivan-degtiarenko force-pushed the ivan/rox-13378-fix-access-control-perms branch from 2664038 to 7563268 Compare November 7, 2022 15:46
<Alert
className="pf-u-mt-md"
title="You do not have permission to view Access Control"
title={`You do not have permission to view ${subPage}`}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is okay for current requirements. When we move responsibility from container to main body routing, it renders generic 404 page which for purpose of security does not reveal whether a page exists.

| 'NetworkPolicy'
| 'Node'
| 'Policy'
| 'Role'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aha, incorrectly deleted in #3098

@ivan-degtiarenko ivan-degtiarenko force-pushed the ivan/rox-13378-group-resources-ui branch from f777c6c to d49333f Compare November 7, 2022 17:48
@ivan-degtiarenko ivan-degtiarenko requested a review from a team as a code owner November 7, 2022 17:48
@ivan-degtiarenko ivan-degtiarenko force-pushed the ivan/rox-13378-fix-access-control-perms branch from 7563268 to 88466ed Compare November 7, 2022 18:11
Copy link
Contributor

@md2119 md2119 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will defer the review to UI and Merlin teams.

@ivan-degtiarenko ivan-degtiarenko force-pushed the ivan/rox-13378-group-resources-ui branch from 78d857d to 0f9af8e Compare November 8, 2022 12:18
@ivan-degtiarenko ivan-degtiarenko force-pushed the ivan/rox-13378-fix-access-control-perms branch from 88466ed to 1483ff5 Compare November 8, 2022 12:27
@ivan-degtiarenko ivan-degtiarenko force-pushed the ivan/rox-13378-fix-access-control-perms branch from d9289b9 to 45857c1 Compare November 8, 2022 16:14
An error occurred while trying to automatically change base from ivan/rox-13378-group-resources-ui to master November 9, 2022 07:57
An error occurred while trying to automatically change base from ivan/rox-13378-group-resources-ui to master November 9, 2022 07:57
An error occurred while trying to automatically change base from ivan/rox-13378-group-resources-ui to master November 9, 2022 07:57
Comment on lines +146 to +157
if (!hasReadAccessForAuthProviders) {
return (
<>
<AccessControlNoPermission subPage="auth providers" entityType={entityType} />
</>
);
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ivan-degtiarenko here are 2 thoughts:

  1. Move if statement up to follow immediately after useEffect call to communicate to human reader and TypeScript compiler that no other component code is executed if no access to 'Access' pardon pun.
  2. Although rules of hooks do not allow conditional code to affect whether or not a component calls a hook, it does allow conditional code within a hook (if you add the conditions to dependencies array). What do you think about conditions to make requests only if read access for resources? Something like:
    useEffect(() => {
        if (hasReadAccessForAuthProviders) {
            dispatch(authActions.fetchAuthProviders.request());
        }
        if (hasReadAccessForRoles) {
            dispatch(roleActions.fetchRoles.request());
            dispatch(groupActions.fetchGroups.request());
        }
    }, [dispatch, hasReadAccessForAuthProviders, hasReadAccessForRoles]);

@ivan-degtiarenko ivan-degtiarenko changed the base branch from ivan/rox-13378-group-resources-ui to master November 10, 2022 09:56
@ivan-degtiarenko ivan-degtiarenko force-pushed the ivan/rox-13378-fix-access-control-perms branch from 45857c1 to 731f8a9 Compare November 10, 2022 15:22
@ghost
Copy link

ghost commented Nov 10, 2022

Images are ready for the commit at 6113b92.

To use with deploy scripts, first export MAIN_IMAGE_TAG=3.72.x-576-g6113b92dce.

@openshift-ci
Copy link

openshift-ci bot commented Nov 14, 2022

@ivan-degtiarenko: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/gke-qa-e2e-tests 45857c1 link false /test gke-qa-e2e-tests
ci/prow/gke-nongroovy-e2e-tests 45857c1 link false /test gke-nongroovy-e2e-tests
ci/prow/gke-postgres-qa-e2e-tests 45857c1 link false /test gke-postgres-qa-e2e-tests
ci/prow/gke-postgres-nongroovy-e2e-tests 45857c1 link false /test gke-postgres-nongroovy-e2e-tests

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@ivan-degtiarenko
Copy link
Contributor Author

/retest

const [isSubmitting, setIsSubmitting] = useState(false);
const [alertSubmit, setAlertSubmit] = useState<ReactElement | null>(null);
const { hasReadWriteAccess } = usePermissions();
const hasWriteAccessForPage = hasReadWriteAccess('Role') && hasReadWriteAccess('Access');
Copy link
Contributor

@pedrottimark pedrottimark Nov 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a blocker to merge, but for my understanding: does access scope require 'Access' resource?

The following function calls which require 'Role' correct?

  • fetchAccessScopes
  • fetchRolesAsArray

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pedrottimark that's our agreement with @rukletsov(if I got it right): bring Access and Role permission in the UI closer - if one is required at Read/Write level , then the other is also treated as required at Read/Write level

@ivan-degtiarenko ivan-degtiarenko merged commit 6662c9f into master Nov 14, 2022
@ivan-degtiarenko ivan-degtiarenko deleted the ivan/rox-13378-fix-access-control-perms branch November 14, 2022 16:04
vikin91 added a commit that referenced this pull request Nov 25, 2022
7ffc6be ROX-13368: Skip failing nongroovy tests on PG (#3721)
bbdd7a0 Bump github.com/gofrs/uuid from 4.3.0+incompatible to 4.3.1+incompatible (#3642)
1f253f2 Bump github.com/google/certificate-transparency-go from 1.1.3 to 1.1.4 (#3543)
d434c8d [ROX-13030] : Add delete collection API endpoint and service implementation (#3648)
f062c21 Dashrews/ROX-13253 wait for central-db to come back after bounce and allow FATAL connection lost error (#3537)
edc1174 CI: Fill the gaps for https://testgrid.k8s.io/ (#3715)
86d7c54 ROX-13231: use passed context when non-postgres (#3540)
9093195 Add less specific type for BE collection response string (#3728)
5abb652 Only enable ROX_OBJECT_COLLECTIONS feature flag during gke-postgres-ui-e2e job (#3727)
4f64cd1 Add centralDBOnly mode in render (#3707)
d67bbe5 Dashrews/ROX-13082 UUID searcher and common updates to set allow use of postgres UUID PR 1 of 4 (#3679)
6f829d5 ROX-13259: graphInit called during init time (#3705)
f3bc50d ROX-13380: Conditional rendering edges for deployments and namespaces (#3641)
3764476 ROX-12319: implement smoke test step with groovy test filter (#3220)
f202fd4 ROX-11826: Disable kernel support package uploads for managed central (#3661)
61f03dc ROX-11101: Remove deprecated resources from central (#3115)
e6aa6d7 ROX-11101: Restore Role permission in UI (#3428)
3203e04 ROX-11101: Remove deprecated resources (#3036)
a35f41e Bump golang.org/x/sys from 0.1.0 to 0.2.0 (#3733)
4120524 Bump snakeyaml from 1.29 to 1.33 in /qa-tests-backend (#3732)
e1785c0 Bump github.com/coreos/go-systemd/v22 from 22.4.0 to 22.5.0 (#3724)
870df4a Bump google.golang.org/api from 0.101.0 to 0.102.0 (#3723)
721454c Generalize User-Agent setup (#3672)
6a11bf0 Bumps collector version to 3.11.x-145-gc345f72f5e (#3736)
ec5d343 [ROX-12923] Walk retries - remainder work (#3729)
40f3d43 ROX-13440: Replace ambiguous central with sensor in networkGraph integration test (#3730)
281ed22 Bump groovy-xml from 2.5.18 to 2.5.19 in /qa-tests-backend (#3741)
49d1651 Bump github.com/prometheus/client_golang from 1.13.1 to 1.14.0 (#3742)
b5544aa Bump cloud.google.com/go/storage from 1.27.0 to 1.28.0 (#3743)
9c61e53 ensure CVSS is present for istio vulns (#3706)
ae29d52 ROX-13452: don't always clobber scoped ctx when non-postgres (#3748)
517bf05 ROX-13261: DryRunUpdate on collection datastore (#3687)
baf7654 ROX-13378: Group new resources with deprecated in UI (#3690)
569922f ROX-13421: Enable roxctl netpol generate and add tech-preview messages (#3740)
2465fc5 Dashrews/ROX-13082 UUID generator templates PR 2 of 4 (#3681)
c093c68 Bump slack-api-client from 1.20.2 to 1.27.0 in /qa-tests-backend (#3752)
2c860bb Bump ubi8-micro from 8.6 to 8.7 in /operator (#3751)
80eb04c Make deploy.sh and deploy-local.sh pass shellcheck (#3582)
2182b43 Dashrews/ROX-13082 UUID test updates PR 3 of 4 (#3694)
6dc6ca5 [ROX-13403] : Fix node -> topVuln sub resolver bug when node cves is empty (#3689)
1b21361 Move integration tests for page title from general to specific containers (#3675)
e1a9f31 Bump google.golang.org/api from 0.102.0 to 0.103.0 (#3773)
a05ea31 Bump golang.org/x/crypto from 0.1.0 to 0.2.0 (#3772)
65ddf4f ROX-12824: Add roxctl commands to generate Central DB bundle (#3602)
c3f1e2f Remove obsolete authProviders request for Integrations page (#3759)
7ccd54d Dashrews/ROX-13082 UUID protos generated PR 4 of 4 (#3698)
9ab5c8f cleanup image digest utilities (#3764)
187ed44 ROX-11931: Convert junit failure artifacts to Slack attachments (#3438)
b5d8790 ROX-13432: leaning up unused code copied/pasted from topology demo (#3750)
ab05bfc Refactor collection form page for better composition (#3744)
c5562f7 Remove babel devDependencies in ui-components (#3761)
2b90b3a Extract collection form from drawer wrapper layout (#3745)
a779fc9 [ROX-12625 + ROX-13032] : Add GetCollectionCount and UpdateCollection endpoints and  services (#3749)
e77f0da Upgrade cypress 11.0.0 devDependencies in ui (#3760)
a3fba94 ROX-13068: Use real data for deployment details (#3688)
4c7d90e ROX-12617: Collection to search query converter (#3683)
3e98aec ROX-13067: fill out port configurations section of deployment details (#3714)
a48de36 ROX-12835: Add support for NodeScanV2 to Sensor (#3533)
30c5dc7 ROX-13466: Fix deletion of groups with empty properties (#3756)
5cb2470 Add autocomplete for name selector dropdowns (#3676)
b9a75ad ROX-13464 adding flows dropdown in NG (#3763)
3217a67 [ROX-13500] Perform type check for V1 CronJob (#3787)
af3790d Remove bulk delete from collections table (#3776)
dda123b Add more info in migration log (#3788)
179f0c9 ROX-13502: Remove the circular dependency between cluster datastore init and cscc notifier init (#3790)
029d584 Update SCANNER_VERSION (#3774)
cbca57c Bump github.com/ckaznocha/protoc-gen-lint from 0.2.4 to 0.3.0 (#3783)
3613b56 Bump golang.org/x/tools from 0.2.0 to 0.3.0 (#3782)
5fc0a6a Bump github.com/google/go-containerregistry from 0.12.0 to 0.12.1 (#3781)
1d1c687 Bump controller-gen version to 0.10.0 (#3754)
c3a5290 Untie documentation link from the product version (#3799)
ed822aa use correct package for migration (#3784)
397a0b4 Validate that label keys are valid k8s labels and ensure correct key splitting (#3777)
edd1050 Rename variable ScannerGRPCEndpoint to ScannerSlimGRPCEndpoint (#3657)
6662c9f ROX-13378: Access Control page permissions (#3720)
b0e73c5 fix Operator reconciliation for external Central DB (#3796)
b83bc1f ROX-13505: Fix error log scanning the postgres stat collection (#3795)
ca660cb Prevent the collection being edited from displaying in its own embedded list (#3778)
3f7b3fc [ROX-13441][POSTGRES] Propagate context correctly in retries (#3793)
e0cbc6f ROX-12839: Update changelog to announce removal of in-product docs (#3805)
696e8bc [ROX-12358] Follow up on vulnerability request proto change (#2851)
c4b46d8 Change getCollectionCount endpoint and updateCollection request type
5f2efbc remove make proto-fmt (#3804)
0c75540 Remove os.Std* from roxctl/central (#3758)
25a90de Add ability to view embedded collections in a pop up modal (#3747)
5c1bf81 ROX-13240: fix scanner-slim updates when WebSockets are used (#3704)
1d98577 Add more context to jira notifier logging (#3812)
da2fd28 ROX-13031: DryRun Collection API (#3766)
1c418d5 Test data migration code in postgres tests (#3803)
ed95b37 Update UI Collection requests for BE compatibiltiy (#3762)
09cc188 ROX-11931: Fix junit-parse install in CI (#3811)
d2b01e3 ROX-12814: Disable PolicyFieldsTest on openshift. (#3797)
d10ce27 ROX-13345: disable 'missing required registry' aspect on openshift (#3798)
3d22396 Update collector to 3.12 (#3809)
1eb33fb ROX-13347: Modify scope queries to included quoted cluster and nameace names, to allow exact matches instead of erroneous and unintended prefix matches. (#3767)
3811a69 ROX-12621: list collection selectors api (#3806)
f6d3f9d Add migration for groups with invalid values (#3789)
cc21125 Bugfixes for collection autocomplete (#3816)
7623dec ROX-9350 Use fine-grained host paths for compliance mounts (#2479)
b4bf5c2 Fix collector volumeMounts  (#3826)
0e9be05 ROX-12953: figure out last 4 versions of sensor automatically (#3611)
459c7ae ROX-12814: Add proper todo for reenabling the test (#3817)
9ee40ff ROX-13523: add isEnabled enum to central db spec (#3815)
535bc72 Replace requestConfig with routeMatcherMap in helper functions for integration tests (#3686)
2b75b61 `gosec` G104: Add `ShouldErr(err)` that returns `err` (#3830)
fb1b82f WIP: Introduce nodescan call
35f8a8f WIP: Prepare converter
716144b Moved and renamed fake nodescan tests
4748de7 Introduce real node scanner with conversion functions
5e6d9a8 wip: real scanner
0169868 wip: log results
1438d2c wip: Debug Analyze call
b09894c wip: Debug Analyze call
3ceed72 wip: Update and improve debug logs
d1669fd Remove copied lib, bump scanner version, add debug
14a3f73 Merge branch 'master' into mm/ROX-12967-real-nodescan
fbd0450 Fix style issues
17ccb31 Debug: let both scans finish to see what they return
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants