Skip to content

Commit fe0cec4

Browse files
author
Yurii Myronchuk
committed
change permisions names
1 parent a96b146 commit fe0cec4

File tree

4 files changed

+35
-21
lines changed

4 files changed

+35
-21
lines changed

src/files/items.php

+16-8
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
'role:server.user',
100100
'server.read-wizzard',
101101
'server.read-legend',
102-
'server.read-all',
102+
'server.read-system-info',
103103
'server.wizzard',
104104
'server.set-label',
105105
'consumption.read',
@@ -121,7 +121,7 @@
121121
'server.set-label',
122122
'server.see-label',
123123
'server.read-legend',
124-
'server.read-all',
124+
'server.read-financial-info',
125125
'server.read-manager',
126126
'server.read-billing',
127127
],
@@ -1423,19 +1423,19 @@
14231423
],
14241424
'server.read-legend' => [
14251425
'type' => 2,
1426-
'description' => 'Prohibits reading of the server',
1426+
'description' => 'Prohibits reading legend of the server',
14271427
],
14281428
'deny:server.read-legend' => [
14291429
'type' => 2,
1430-
'description' => 'Prohibits reading label of the server',
1430+
'description' => 'Prohibits reading legend of the server',
14311431
],
1432-
'server.read-all' => [
1432+
'server.read-system-info' => [
14331433
'type' => 2,
1434-
'description' => 'Allows reading of extended data of the server',
1434+
'description' => 'Allows reading system info of the server',
14351435
],
1436-
'deny:server.read-all' => [
1436+
'deny:server.read-system-info' => [
14371437
'type' => 2,
1438-
'description' => 'Prohibits reading of extended data fo the server',
1438+
'description' => 'Prohibits reading system info of the server',
14391439
],
14401440
'server.wizzard' => [
14411441
'type' => 2,
@@ -1509,6 +1509,14 @@
15091509
'type' => 2,
15101510
'description' => 'Prohibits selling of the server',
15111511
],
1512+
'server.read-financial-info' => [
1513+
'type' => 2,
1514+
'description' => 'Allows reading financial info of the server',
1515+
],
1516+
'deny:server.read-financial-info' => [
1517+
'type' => 2,
1518+
'description' => 'Prohibits reading financial info of the server',
1519+
],
15121520
'server.read-manager' => [
15131521
'type' => 2,
15141522
],

src/files/source/metadata.php

+10-4
Original file line numberDiff line numberDiff line change
@@ -1024,8 +1024,11 @@
10241024
'deny:server.read' => [
10251025
'description' => 'Prohibits reading of the server',
10261026
],
1027-
'deny:server.read-all' => [
1028-
'description' => 'Prohibits reading of extended data fo the server',
1027+
'deny:server.read-financial-info' => [
1028+
'description' => 'Prohibits reading financial info of the server',
1029+
],
1030+
'deny:server.read-system-info' => [
1031+
'description' => 'Prohibits reading system info of the server',
10291032
],
10301033
'deny:server.read-billing' => [
10311034
'description' => 'Prohibits reading of tariff and sale information of server',
@@ -1468,8 +1471,11 @@
14681471
'server.read' => [
14691472
'description' => 'Allows reading of the server',
14701473
],
1471-
'server.read-all' => [
1472-
'description' => 'Allows reading of extended data of the server',
1474+
'server.read-financial-info' => [
1475+
'description' => 'Allows reading financial info of the server',
1476+
],
1477+
'server.read-system-info' => [
1478+
'description' => 'Allows reading system info of the server',
14731479
],
14741480
'server.read-wizzard' => [
14751481
'description' => 'Allows reading info about wizzarding of the server',

src/files/source/tree.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
'role:server.user',
4040
'server.read-wizzard',
4141
'server.read-legend',
42-
'server.read-all',
42+
'server.read-system-info',
4343
'server.wizzard', 'server.set-label', 'consumption.read', 'server.manage-settings',
4444
'server.see-label', 'server.move-disks',
4545
],
@@ -50,7 +50,7 @@
5050
'server.pay', 'server.sell', 'server.set-label',
5151
'server.see-label',
5252
'server.read-legend',
53-
'server.read-all',
53+
'server.read-financial-info',
5454
'server.read-manager',
5555
'server.read-billing',
5656
],

tests/unit/CheckAccessTrait.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public function testAdmin()
169169
'server.read', 'server.control-power',
170170
'server.control-system', 'server.wizzard', 'server.set-label', 'server.set-note', 'server.manage-settings',
171171
'server.see-label', 'server.move-disks',
172-
'server.read-wizzard', 'server.read-legend', 'server.read-all',
172+
'server.read-wizzard', 'server.read-legend', 'server.read-system-info',
173173

174174
'hub.read', 'hub.update',
175175
'consumption.read',
@@ -199,7 +199,7 @@ public function testStaffAdmin()
199199
$this->assertAccesses('role:staff-admin', [
200200
'access-subclients', 'support', 'admin',
201201
'server.create', 'server.update', 'server.delete',
202-
'server.read-wizzard', 'server.read-legend', 'server.read-all',
202+
'server.read-wizzard', 'server.read-legend', 'server.read-system-info',
203203
'access-subclients', 'support', 'admin',
204204
'ticket.read', 'ticket.create', 'ticket.answer', 'ticket.close', 'ticket.update', 'ticket.delete',
205205
'client.read', 'client.list',
@@ -277,7 +277,7 @@ public function testAccounter()
277277
'vhost.read', 'vhost.create', 'vhost.update', 'vhost.delete',
278278
'ip.read', 'service.read', 'client.notify',
279279
'blacklist.read', 'blacklist.create', 'blacklist.update', 'blacklist.delete',
280-
'purse.set-credit','server.read-wizzard','server.read-legend','server.read-all','server.read-manager',
280+
'purse.set-credit','server.read-wizzard','server.read-legend', 'server.read-financial-info', 'server.read-manager',
281281
'server.read-billing','charge.read','plan.set-note',
282282
]);
283283
}
@@ -318,7 +318,7 @@ public function testManager()
318318
'vhost.read', 'vhost.create', 'vhost.update', 'vhost.delete',
319319
'ip.read', 'service.read', 'client.notify',
320320
'blacklist.read', 'blacklist.create', 'blacklist.update', 'blacklist.delete',
321-
'purse.set-credit','server.read-wizzard','server.read-legend','server.read-all','server.read-manager',
321+
'purse.set-credit','server.read-wizzard','server.read-legend','server.read-financial-info','server.read-manager',
322322
'server.read-billing','charge.read','plan.set-note',
323323
]);
324324
}
@@ -360,7 +360,7 @@ public function testReseller()
360360
'ip.read', 'service.read', 'client.notify',
361361
'integration.read', 'integration.create', 'integration.update', 'integration.delete',
362362
'blacklist.read', 'blacklist.create', 'blacklist.update', 'blacklist.delete',
363-
'purse.set-credit','server.read-wizzard','server.read-legend','server.read-all','server.read-manager',
363+
'purse.set-credit','server.read-wizzard','server.read-legend','server.read-financial-info', 'server.read-manager',
364364
'server.read-billing','charge.read','plan.set-note',
365365
]);
366366
}
@@ -432,7 +432,7 @@ public function testMighty()
432432
'service.read', 'service.create', 'service.update', 'service.delete',
433433
'blacklist.read', 'blacklist.create', 'blacklist.update', 'blacklist.delete',
434434

435-
'purse.set-credit','server.read-wizzard','server.read-legend','server.read-all','server.read-manager',
435+
'purse.set-credit','server.read-wizzard','server.read-legend','server.read-system-info', 'server.read-financial-info', 'server.read-manager',
436436
'server.read-billing','server.asssign-hub','charge.read','plan.set-note',
437437
]);
438438
}
@@ -501,7 +501,7 @@ public function testAlmighty()
501501
'costprice.read', 'costprice.create', 'costprice.update', 'costprice.delete',
502502
'pnl.read', 'pnl.read-expenses', 'pnl.update',
503503
'blacklist.read', 'blacklist.create', 'blacklist.update', 'blacklist.delete',
504-
'purse.set-credit','server.read-wizzard','server.read-legend','server.read-all','server.read-manager',
504+
'purse.set-credit','server.read-wizzard','server.read-legend','server.read-financial-info', 'server.read-system-info', 'server.read-manager',
505505
'server.read-billing','server.asssign-hub','charge.read','plan.set-note',
506506
]);
507507
}

0 commit comments

Comments
 (0)