Skip to content

Commit 57f0b05

Browse files
authored
Fix default admin acl by adding WriteUserAttributes (#26071)
1 parent 0628ca4 commit 57f0b05

30 files changed

+56
-41
lines changed

ydb/core/viewer/tests/canondata/result.json

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1670,7 +1670,8 @@
16701670
"CreateTable",
16711671
"CreateQueue",
16721672
"RemoveSchema",
1673-
"AlterSchema"
1673+
"AlterSchema",
1674+
"WriteUserAttributes"
16741675
],
16751676
"AccessType": "Allow",
16761677
"InheritanceType": [
@@ -1750,7 +1751,8 @@
17501751
"CreateTable",
17511752
"CreateQueue",
17521753
"RemoveSchema",
1753-
"AlterSchema"
1754+
"AlterSchema",
1755+
"WriteUserAttributes"
17541756
],
17551757
"AccessType": "Allow",
17561758
"InheritanceType": [
@@ -1836,7 +1838,8 @@
18361838
"CreateTable",
18371839
"CreateQueue",
18381840
"RemoveSchema",
1839-
"AlterSchema"
1841+
"AlterSchema",
1842+
"WriteUserAttributes"
18401843
],
18411844
"AccessType": "Allow",
18421845
"InheritanceType": [
@@ -1916,7 +1919,8 @@
19161919
"CreateTable",
19171920
"CreateQueue",
19181921
"RemoveSchema",
1919-
"AlterSchema"
1922+
"AlterSchema",
1923+
"WriteUserAttributes"
19201924
],
19211925
"AccessType": "Allow",
19221926
"InheritanceType": [
@@ -2002,7 +2006,8 @@
20022006
"CreateTable",
20032007
"CreateQueue",
20042008
"RemoveSchema",
2005-
"AlterSchema"
2009+
"AlterSchema",
2010+
"WriteUserAttributes"
20062011
],
20072012
"AccessType": "Allow",
20082013
"InheritanceType": [
@@ -2082,7 +2087,8 @@
20822087
"CreateTable",
20832088
"CreateQueue",
20842089
"RemoveSchema",
2085-
"AlterSchema"
2090+
"AlterSchema",
2091+
"WriteUserAttributes"
20862092
],
20872093
"AccessType": "Allow",
20882094
"InheritanceType": [
@@ -2168,7 +2174,8 @@
21682174
"CreateTable",
21692175
"CreateQueue",
21702176
"RemoveSchema",
2171-
"AlterSchema"
2177+
"AlterSchema",
2178+
"WriteUserAttributes"
21722179
],
21732180
"AccessType": "Allow",
21742181
"InheritanceType": [
@@ -2248,7 +2255,8 @@
22482255
"CreateTable",
22492256
"CreateQueue",
22502257
"RemoveSchema",
2251-
"AlterSchema"
2258+
"AlterSchema",
2259+
"WriteUserAttributes"
22522260
],
22532261
"AccessType": "Allow",
22542262
"InheritanceType": [
@@ -2334,7 +2342,8 @@
23342342
"CreateTable",
23352343
"CreateQueue",
23362344
"RemoveSchema",
2337-
"AlterSchema"
2345+
"AlterSchema",
2346+
"WriteUserAttributes"
23382347
],
23392348
"AccessType": "Allow",
23402349
"InheritanceType": [
@@ -2414,7 +2423,8 @@
24142423
"CreateTable",
24152424
"CreateQueue",
24162425
"RemoveSchema",
2417-
"AlterSchema"
2426+
"AlterSchema",
2427+
"WriteUserAttributes"
24182428
],
24192429
"AccessType": "Allow",
24202430
"InheritanceType": [
@@ -2553,7 +2563,8 @@
25532563
"CreateTable",
25542564
"CreateQueue",
25552565
"RemoveSchema",
2556-
"AlterSchema"
2566+
"AlterSchema",
2567+
"WriteUserAttributes"
25572568
],
25582569
"AccessType": "Allow",
25592570
"InheritanceType": [
@@ -2726,7 +2737,8 @@
27262737
"CreateTable",
27272738
"CreateQueue",
27282739
"RemoveSchema",
2729-
"AlterSchema"
2740+
"AlterSchema",
2741+
"WriteUserAttributes"
27302742
],
27312743
"AccessType": "Allow",
27322744
"InheritanceType": [
@@ -2887,7 +2899,8 @@
28872899
"CreateTable",
28882900
"CreateQueue",
28892901
"RemoveSchema",
2890-
"AlterSchema"
2902+
"AlterSchema",
2903+
"WriteUserAttributes"
28912904
],
28922905
"AccessType": "Allow",
28932906
"InheritanceType": [

ydb/library/aclib/aclib.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -587,6 +587,8 @@ ui32 TACL::SpecialRightsFromString(const TString& string) {
587587
result |= EAccessRights::GrantAccessRights;
588588
if (r == "ConnDB")
589589
result |= EAccessRights::ConnectDatabase;
590+
if (r == "WUA")
591+
result |= EAccessRights::WriteUserAttributes;
590592
}
591593
return result;
592594
}

ydb/library/yaml_config/ut_transform/canondata/test_transform.TestYamlConfigTransformations.test_basic_args0-dump_/block-4-2.yaml.result.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@
326326
"+(DS|RA):METADATA-READERS",
327327
"+(SR):DATA-READERS",
328328
"+(UR|ER):DATA-WRITERS",
329-
"+(CD|CT|CQ|WA|AS|RS):DDL-ADMINS",
329+
"+(CD|CT|CQ|WA|WUA|AS|RS):DDL-ADMINS",
330330
"+(GAR):ACCESS-ADMINS",
331331
"+(CDB|DDB):DATABASE-ADMINS"
332332
],

ydb/library/yaml_config/ut_transform/canondata/test_transform.TestYamlConfigTransformations.test_basic_args0-dump_/bridge-mirror-3dc-3-nodes.yaml.result.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@
247247
"+(DS|RA):METADATA-READERS",
248248
"+(SR):DATA-READERS",
249249
"+(UR|ER):DATA-WRITERS",
250-
"+(CD|CT|CQ|WA|AS|RS):DDL-ADMINS",
250+
"+(CD|CT|CQ|WA|WUA|AS|RS):DDL-ADMINS",
251251
"+(GAR):ACCESS-ADMINS",
252252
"+(CDB|DDB):DATABASE-ADMINS"
253253
],

ydb/library/yaml_config/ut_transform/canondata/test_transform.TestYamlConfigTransformations.test_basic_args0-dump_/mirror-3dc-3-nodes-in-memory.yaml.result.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@
267267
"+(DS|RA):METADATA-READERS",
268268
"+(SR):DATA-READERS",
269269
"+(UR|ER):DATA-WRITERS",
270-
"+(CD|CT|CQ|WA|AS|RS):DDL-ADMINS",
270+
"+(CD|CT|CQ|WA|WUA|AS|RS):DDL-ADMINS",
271271
"+(GAR):ACCESS-ADMINS",
272272
"+(CDB|DDB):DATABASE-ADMINS"
273273
],

ydb/library/yaml_config/ut_transform/canondata/test_transform.TestYamlConfigTransformations.test_basic_args0-dump_/mirror-3dc-3-nodes.yaml.result.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@
268268
"+(DS|RA):METADATA-READERS",
269269
"+(SR):DATA-READERS",
270270
"+(UR|ER):DATA-WRITERS",
271-
"+(CD|CT|CQ|WA|AS|RS):DDL-ADMINS",
271+
"+(CD|CT|CQ|WA|WUA|AS|RS):DDL-ADMINS",
272272
"+(GAR):ACCESS-ADMINS",
273273
"+(CDB|DDB):DATABASE-ADMINS"
274274
],

ydb/library/yaml_config/ut_transform/canondata/test_transform.TestYamlConfigTransformations.test_basic_args0-dump_/mirror-3dc-9-nodes.yaml.result.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@
342342
"+(DS|RA):METADATA-READERS",
343343
"+(SR):DATA-READERS",
344344
"+(UR|ER):DATA-WRITERS",
345-
"+(CD|CT|CQ|WA|AS|RS):DDL-ADMINS",
345+
"+(CD|CT|CQ|WA|WUA|AS|RS):DDL-ADMINS",
346346
"+(GAR):ACCESS-ADMINS",
347347
"+(CDB|DDB):DATABASE-ADMINS"
348348
],

ydb/library/yaml_config/ut_transform/canondata/test_transform.TestYamlConfigTransformations.test_basic_args0-dump_/simple.yaml.result.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@
331331
"+(DS|RA):METADATA-READERS",
332332
"+(SR):DATA-READERS",
333333
"+(UR|ER):DATA-WRITERS",
334-
"+(CD|CT|CQ|WA|AS|RS):DDL-ADMINS",
334+
"+(CD|CT|CQ|WA|WUA|AS|RS):DDL-ADMINS",
335335
"+(GAR):ACCESS-ADMINS",
336336
"+(CDB|DDB):DATABASE-ADMINS"
337337
],

ydb/library/yaml_config/ut_transform/canondata/test_transform.TestYamlConfigTransformations.test_basic_args0-dump_/single-node-in-memory.yaml.result.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@
234234
"+(DS|RA):METADATA-READERS",
235235
"+(SR):DATA-READERS",
236236
"+(UR|ER):DATA-WRITERS",
237-
"+(CD|CT|CQ|WA|AS|RS):DDL-ADMINS",
237+
"+(CD|CT|CQ|WA|WUA|AS|RS):DDL-ADMINS",
238238
"+(GAR):ACCESS-ADMINS",
239239
"+(CDB|DDB):DATABASE-ADMINS"
240240
],

ydb/library/yaml_config/ut_transform/canondata/test_transform.TestYamlConfigTransformations.test_basic_args0-dump_/single-node-with-file.yaml.result.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@
234234
"+(DS|RA):METADATA-READERS",
235235
"+(SR):DATA-READERS",
236236
"+(UR|ER):DATA-WRITERS",
237-
"+(CD|CT|CQ|WA|AS|RS):DDL-ADMINS",
237+
"+(CD|CT|CQ|WA|WUA|AS|RS):DDL-ADMINS",
238238
"+(GAR):ACCESS-ADMINS",
239239
"+(CDB|DDB):DATABASE-ADMINS"
240240
],

0 commit comments

Comments
 (0)