Skip to content

Commit e66d109

Browse files
committed
Remove unused connector-related security configurations and update dataset ones
Deleted unused connector-related scopes, paths, and roles from `AbstractSecurityConfiguration` to simplify the codebase.
1 parent 2ee0b5b commit e66d109

File tree

1 file changed

+14
-43
lines changed

1 file changed

+14
-43
lines changed

src/main/kotlin/com/cosmotech/api/security/AbstractSecurityConfiguration.kt

Lines changed: 14 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ const val ROLE_ORGANIZATION_USER = "Organization.User"
2121
const val ROLE_ORGANIZATION_VIEWER = "Organization.Viewer"
2222

2323
// Allowed read scopes
24-
const val SCOPE_CONNECTOR_READ = "SCOPE_csm.connector.read"
2524
const val SCOPE_ORGANIZATION_READ = "SCOPE_csm.organization.read"
2625
const val SCOPE_DATASET_READ = "SCOPE_csm.dataset.read"
2726
const val SCOPE_SOLUTION_READ = "SCOPE_csm.solution.read"
@@ -30,40 +29,29 @@ const val SCOPE_RUN_READ = "SCOPE_csm.run.read"
3029
const val SCOPE_RUNNER_READ = "SCOPE_csm.runner.read"
3130

3231
// Allowed write scopes
33-
const val SCOPE_CONNECTOR_WRITE = "SCOPE_csm.connector.write"
3432
const val SCOPE_ORGANIZATION_WRITE = "SCOPE_csm.organization.write"
3533
const val SCOPE_DATASET_WRITE = "SCOPE_csm.dataset.write"
3634
const val SCOPE_SOLUTION_WRITE = "SCOPE_csm.solution.write"
3735
const val SCOPE_WORKSPACE_WRITE = "SCOPE_csm.workspace.write"
3836
const val SCOPE_RUN_WRITE = "SCOPE_csm.run.write"
3937
const val SCOPE_RUNNER_WRITE = "SCOPE_csm.runner.write"
40-
41-
// Path Connectors
42-
val PATHS_CONNECTORS = listOf("/connectors", "/connectors/*")
4338
// Path Datasets
4439
val PATHS_DATASETS =
4540
listOf(
46-
"/organizations/*/datasets",
47-
"/organizations/*/datasets/copy",
48-
"/organizations/*/datasets/search",
49-
"/organizations/*/datasets/twingraph/download/*",
50-
"/organizations/*/datasets/*",
51-
"/organizations/*/datasets/*/batch",
52-
"/organizations/*/datasets/*/batch-query",
53-
"/organizations/*/datasets/*/compatibility",
54-
"/organizations/*/datasets/*/link",
55-
"/organizations/*/datasets/*/refresh",
56-
"/organizations/*/datasets/*/refresh/rollback",
57-
"/organizations/*/datasets/*/security",
58-
"/organizations/*/datasets/*/security/access",
59-
"/organizations/*/datasets/*/security/access/*",
60-
"/organizations/*/datasets/*/security/default",
61-
"/organizations/*/datasets/*/security/users",
62-
"/organizations/*/datasets/*/status",
63-
"/organizations/*/datasets/*/subdataset",
64-
"/organizations/*/datasets/*/twingraph",
65-
"/organizations/*/datasets/*/twingraph/*",
66-
"/organizations/*/datasets/*/unlink")
41+
"/organizations/*/workspaces/*/datasets",
42+
"/organizations/*/workspaces/*/datasets/search",
43+
"/organizations/*/workspaces/*/datasets/*",
44+
"/organizations/*/workspaces/*/datasets/*/security",
45+
"/organizations/*/workspaces/*/datasets/*/security/access",
46+
"/organizations/*/workspaces/*/datasets/*/security/access/*",
47+
"/organizations/*/workspaces/*/datasets/*/security/default",
48+
"/organizations/*/workspaces/*/datasets/*/security/users",
49+
"/organizations/*/workspaces/*/datasets/*/parts",
50+
"/organizations/*/workspaces/*/datasets/*/parts/search",
51+
"/organizations/*/workspaces/*/datasets/*/parts/*",
52+
"/organizations/*/workspaces/*/datasets/*/parts/*/download",
53+
"/organizations/*/workspaces/*/datasets/*/parts/*/query",
54+
)
6755

6856
// Path Organizations
6957
val PATHS_ORGANIZATIONS =
@@ -132,14 +120,12 @@ val PATHS_WORKSPACES =
132120
listOf(
133121
"/organizations/*/workspaces",
134122
"/organizations/*/workspaces/*",
135-
"/organizations/*/workspaces/*/link",
136123
"/organizations/*/workspaces/*/permissions/*",
137124
"/organizations/*/workspaces/*/security",
138125
"/organizations/*/workspaces/*/security/access",
139126
"/organizations/*/workspaces/*/security/access/*",
140127
"/organizations/*/workspaces/*/security/default",
141128
"/organizations/*/workspaces/*/security/users",
142-
"/organizations/*/workspaces/*/security/unlink",
143129
)
144130

145131
// Endpoints roles
@@ -173,17 +159,6 @@ internal fun endpointSecurityReaders(
173159
customOrganizationUser,
174160
customOrganizationViewer),
175161
customAdmin = customOrganizationAdmin),
176-
CsmSecurityEndpointsRolesReader(
177-
paths = PATHS_CONNECTORS,
178-
roles =
179-
arrayOf(
180-
ROLE_ORGANIZATION_USER,
181-
ROLE_ORGANIZATION_VIEWER,
182-
SCOPE_CONNECTOR_READ,
183-
SCOPE_CONNECTOR_WRITE,
184-
customOrganizationUser,
185-
customOrganizationViewer),
186-
customAdmin = customOrganizationAdmin),
187162
CsmSecurityEndpointsRolesReader(
188163
paths = PATHS_DATASETS,
189164
roles =
@@ -257,10 +232,6 @@ internal fun endpointSecurityWriters(
257232
customOrganizationUser: String
258233
) =
259234
listOf(
260-
CsmSecurityEndpointsRolesWriter(
261-
paths = PATHS_CONNECTORS,
262-
roles = arrayOf(SCOPE_CONNECTOR_WRITE),
263-
customAdmin = customOrganizationAdmin),
264235
CsmSecurityEndpointsRolesWriter(
265236
paths = PATHS_DATASETS,
266237
roles = arrayOf(ROLE_ORGANIZATION_USER, SCOPE_DATASET_WRITE, customOrganizationUser),

0 commit comments

Comments
 (0)