Skip to content
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

adds the fixes for access rules #427

Merged
merged 2 commits into from
Mar 20, 2024
Merged

adds the fixes for access rules #427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
875a68b
adds the fixes for access rules
ishpaul777 Mar 14, 2024
1142927
fixes regex for access rules
ishpaul777 Mar 18, 2024
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
4 changes: 2 additions & 2 deletions oathkeeper/access-rules/kavach-web.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"url": "http://kavach-web:3000"
},
"match": {
"url": "http://127.0.0.1:4455/.factly/kavach/web<(/(organisation|organisation/edit|organisation(/(\\d+/settings(/(tokens|tokens/create|roles|roles(/(\\d+/users|\\d+/create|\\d+/edit))|policies|users|users/new))))|settings|password|profile|profile/invite|users|users(/new)|applications(/(create|type|\\d+/edit|\\d+/detail|\\d+/settings|\\d+/settings(/(users|tokens|tokens/create|roles|roles/create|policies|policies/create|spaces|spaces(/(create|\\d+/settings|\\d+/settings(/(tokens|roles|policies|users))))))))?))?/?>",
"url": "http://127.0.0.1:4455/.factly/kavach/web<(/(organisation|organisation(/edit|/create)|organisation(/(\\d+/settings(/(tokens|tokens/create|roles|roles/create|roles(/\\d+(/users|/create|/edit))|policies|policies/create|policies(/\\d+(/view|/edit))|users|users/new))))|settings|password|profile|profile/invite|users|users(/new)|applications(/(create|type|\\d+(/edit|/detail)|\\d+/settings|\\d+/settings(/(users|tokens|tokens/create|roles|roles/create|roles(/\\d+(/users|/create|/edit))|policies|policies/create|policies(/\\d+(/view|/edit))|spaces|spaces(/(create|\\d+/edit|\\d+/settings|\\d+/settings(/(tokens|tokens/create|roles|roles/create|roles(/\\d+(/users|/create|/edit))|policies|policies/create|policies(/\\d+(/view|/edit))|users))))))))?))?/?>",
"methods": [
"GET"
]
Expand Down Expand Up @@ -60,4 +60,4 @@
}
]
}
]
]
2 changes: 1 addition & 1 deletion web/src/pages/application/settings/policies/components/CreateApplicationPolicy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export default function CreateApplicationPolicyForm() {
const { roles, loadingRoles } = useSelector((state) => {
var roleIDs = state.applications.details[appID]?.roleIDs || [];
return {
roles: roleIDs.map((id) => state.roles.application[appID][id]),
roles: roleIDs.map((id) => state.roles.application?.[appID]?.[id]),
loadingRoles: state.roles.loading,
};
});
Expand Down
4 changes: 2 additions & 2 deletions web/src/pages/application/settings/policies/components/EditApplicationPolicy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ export default function EditApplicationPolicy() {
policy: {
...state.policy?.application?.[appID]?.[policyID],
roles: state.policy.application?.[appID]?.[policyID]?.roles?.map(
(rID) => state.roles.application[appID][rID],
(rID) => state.roles.application?.[appID]?.[rID],
),
},
loading: state.policy.loading,
role: state.profile.roles[state.organisations.selected],
loadingRole: state.profile.loading,
application: state.applications.details[appID],
loadingApp: state.applications.loading,
roles: roleIDs.map((id) => state.roles.application[appID][id]),
roles: roleIDs.map((id) => state.roles.application?.[appID]?.[id]),
loadingRoles: state.roles.loading,
};
},
Expand Down
2 changes: 1 addition & 1 deletion web/src/pages/application/settings/policies/components/ViewApplicationPolicy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default function ViewApplicationPolicy() {
const { policy, loading } = useSelector((state) => {
return {
policy: {
...state.policy.application[appID][policyID],
...state.policy?.application?.[appID]?.[policyID],
roles:
state.policy.application[appID]?.[policyID]?.roles?.map((rId) => ({
...state.roles.application[appID]?.[rId],
Expand Down
2 changes: 1 addition & 1 deletion web/src/pages/application/settings/roles/components/RoleList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function ApplicationRoleList({ appID, role }) {
roleIDs = state.applications.details[appID]?.roleIDs || [];
return {
roles: roleIDs?.map((id) => ({
...state.roles.application[appID][id],
...state.roles.application?.[appID]?.[id],
})),
loading: state.roles.loading,
};
Expand Down
4 changes: 2 additions & 2 deletions web/src/pages/application/settings/roles/users/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ export default function ApplicationRoleUsers() {
(state) => {
var remUserIDs = [];
var roleUserIDs = [];
roleUserIDs = state.roles.application[appID][roleID].users || [];
const appUserIDs = state.applications.details[appID].users || [];
roleUserIDs = state.roles.application?.[appID]?.[roleID].users || [];
const appUserIDs = state.applications.details[appID]?.users || [];
remUserIDs = appUserIDs.filter((uID) => roleUserIDs.every((rUID) => !(rUID === uID)));
return {
roleUsers: roleUserIDs.map((id) => state.users.details[id]),
Expand Down
6 changes: 3 additions & 3 deletions web/src/pages/application/settings/spaces/settings/policies/components/ViewSpacePolicy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ export default function ViewSpacePolicy() {
policy: {
...state.policy.space?.[spaceID]?.[policyID],
roles:
state.policy.space[spaceID][policyID]?.roles?.map((rId) => ({
state.policy.space[spaceID]?.[policyID]?.roles?.map((rId) => ({
...state.roles.space[spaceID]?.[rId],
})) || [],
permissions: state.policy.space[spaceID][policyID]?.permissions || [],
permissions: state.policy.space[spaceID]?.[policyID]?.permissions || [],
},
loading: state.policy.loading,
};
});


const fetchPolicy = () => {
getSpacePolicyByID(appID, spaceID, policyID);
Expand Down
2 changes: 1 addition & 1 deletion web/src/pages/application/settings/spaces/settings/roles/components/EditRole.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export default function EditSpaceRole() {

const { role, loading, space, loadingSpace, userRole, loadingUserRole } = useSelector((state) => {
return {
role: state.roles.space[spaceID][roleID],
role: state.roles.space?.[spaceID]?.[roleID],
loading: state.roles.loading,
space: state.spaces.details[spaceID],
loadingSpace: state.spaces.loading,
Expand Down
2 changes: 1 addition & 1 deletion web/src/pages/application/settings/spaces/settings/roles/users/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default function SpaceRoleUsers() {
(state) => {
var remUserIDs = [];
var roleUserIDs = [];
roleUserIDs = state.roles.space[spaceID][roleID]?.users || [];
roleUserIDs = state?.roles?.space?.[spaceID]?.[roleID]?.users || [];
const spaceUserIDs = state.spaces.details[spaceID]?.users || [];
if (spaceUserIDs?.length) {
remUserIDs = spaceUserIDs.filter((uID) => roleUserIDs.every((rUID) => !(rUID === uID)));
Expand Down
10 changes: 5 additions & 5 deletions web/src/pages/application/settings/spaces/settings/users/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ export default function SpaceUser() {

const { appUsers, loadingApps, spaceUsers, loadingSpace, role } = useSelector((state) => {
return {
appUsers: state.applications.details[appID]?.users.map((id) => state.users.details[id]) || [],
loadingApps: state.applications.loading,
spaceUsers: state.spaces.details[spaceID]?.users.map((id) => state.users.details[id]) || [],
loadingSpace: state.spaces.loading,
role: state.profile.roles[state.organisations.selected],
appUsers: state?.applications?.details[appID]?.users.map((id) => state.users.details[id]) || [],
loadingApps: state?.applications?.loading,
spaceUsers: state?.spaces?.details[spaceID]?.users.map((id) => state.users.details[id]) || [],
loadingSpace: state?.spaces?.loading,
role: state?.profile?.roles[state.organisations.selected],
};
});

Expand Down
4 changes: 2 additions & 2 deletions web/src/pages/organisation/settings/policies/components/ViewOrganisationPolicy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ export default function ViewOrganisationPolicy() {
const { policy, loading } = useSelector((state) => {
return {
policy: {
...state.policy.organisation[orgID][policyID],
...state.policy?.organisation?.[orgID]?.[policyID],
roles:
state.policy.organisation[orgID][policyID]?.roles.map((rId) => ({
state.policy?.organisation?.[orgID]?.[policyID]?.roles.map((rId) => ({
...state.roles.organisation[orgID]?.[rId],
})) || [],
},
Expand Down
4 changes: 2 additions & 2 deletions web/src/pages/organisation/settings/roles/users/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ export default function OrganisationRoleUsers() {
(state) => {
var remUserIDs = [];
var roleUserIDs = [];
roleUserIDs = state.roles.organisation[orgID][roleID].users || [];
const orgUserIDs = state.organisations.details[orgID].users || [];
roleUserIDs = state.roles.organisation?.[orgID]?.[roleID].users || [];
const orgUserIDs = state.organisations.details?.[orgID]?.users || [];
remUserIDs = orgUserIDs.filter((uID) => roleUserIDs.every((rUID) => !(rUID === uID)));
return {
roleUsers: roleUserIDs.map((id) => state.users.details[id]),
Expand Down
Loading