DeforaNetworks/corteza
3
0
Fork 0
Code Activity

Add provisions for messaging & compose settings

Browse Source
This commit is contained in:
Tomaž Jerman
2019-10-08 16:09:44 +02:00
parent 08860a90e4
commit ed45f8e348
6 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compose/service/access_control.go
+4
View File
@@ -37,6 +37,8 @@ func (svc accessControl) Effective(ctx context.Context) (ee permissions.Effectiv
ee.Push(types.ComposePermissionResource, "access", svc.CanAccess(ctx))
ee.Push(types.ComposePermissionResource, "grant", svc.CanGrant(ctx))
ee.Push(types.ComposePermissionResource, "namespace.create", svc.CanCreateNamespace(ctx))
ee.Push(types.ComposePermissionResource, "settings.read", svc.CanReadSettings(ctx))
ee.Push(types.ComposePermissionResource, "settings.manage", svc.CanManageSettings(ctx))
return
}
@@ -206,6 +208,8 @@ func (svc accessControl) Whitelist() permissions.Whitelist {
"access",
"grant",
"namespace.create",
"settings.read",
"settings.manage",
)
wl.Set(
messaging/service/access_control.go
+4
View File
@@ -36,6 +36,8 @@ func (svc accessControl) Effective(ctx context.Context) (ee permissions.Effectiv
ee.Push(types.MessagingPermissionResource, "access", svc.CanAccess(ctx))
ee.Push(types.MessagingPermissionResource, "grant", svc.CanGrant(ctx))
ee.Push(types.MessagingPermissionResource, "settings.read", svc.CanReadSettings(ctx))
ee.Push(types.MessagingPermissionResource, "settings.manage", svc.CanManageSettings(ctx))
ee.Push(types.MessagingPermissionResource, "channel.public.create", svc.CanCreatePublicChannel(ctx))
ee.Push(types.MessagingPermissionResource, "channel.private.create", svc.CanCreatePrivateChannel(ctx))
ee.Push(types.MessagingPermissionResource, "channel.group.create", svc.CanCreateGroupChannel(ctx))
@@ -245,6 +247,8 @@ func (svc accessControl) Whitelist() permissions.Whitelist {
types.MessagingPermissionResource,
"access",
"grant",
"settings.read",
"settings.manage",
"channel.public.create",
"channel.private.create",
"channel.group.create",
provision/compose/src/0000_access_control.yaml
+2
View File
@@ -7,6 +7,8 @@ allow:
compose:
- access
- grant
- settings.read
- settings.manage
- namespace.create
compose:namespace:
provision/compose/static.go
+1 -1
View File
File diff suppressed because one or more lines are too long
provision/messaging/src/0000_access_control.yaml
+2
View File
@@ -7,6 +7,8 @@ allow:
messaging:
- access
- grant
- settings.read
- settings.manage
- channel.public.create
- channel.private.create
- channel.group.create
provision/messaging/static.go
+1 -1
View File
@@ -3,4 +3,4 @@
// Package contains static assets.
package messaging
var Asset = "PK\x03\x04\x14\x00\x08\x00\x00\x00\x00\x00!(\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x18\x00 \x000000_access_control.yamlUT\x05\x00\x01\x80Cm8allow:\n everyone:\n messaging:\n - access\n\n admins:\n messaging:\n - access\n - grant\n - channel.public.create\n - channel.private.create\n - channel.group.create\n\n messaging:channel:\n - update\n - leave\n - read\n - join\n - delete\n - undelete\n - archive\n - unarchive\n - members.manage\n - attachments.manage\n - message.attach\n - message.update.all\n - message.update.own\n - message.delete.all\n - message.delete.own\n - message.embed\n - message.send\n - message.reply\n - message.react\n\nPK\x07\x08\xa5\xf4PT`\x02\x00\x00`\x02\x00\x00PK\x03\x04\x14\x00\x08\x00\x00\x00\x00\x00!(\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x12\x00 \x001000_channels.yamlUT\x05\x00\x01\x80Cm8channels:\n - name: General\n type: public\n - name: Random\n type: public\nPK\x07\x08\xe8\x83F\xf8O\x00\x00\x00O\x00\x00\x00PK\x01\x02\x14\x03\x14\x00\x08\x00\x00\x00\x00\x00!(\xa5\xf4PT`\x02\x00\x00`\x02\x00\x00\x18\x00 \x00\x00\x00\x00\x00\x00\x00\x00\x00\xb4\x81\x00\x00\x00\x000000_access_control.yamlUT\x05\x00\x01\x80Cm8PK\x01\x02\x14\x03\x14\x00\x08\x00\x00\x00\x00\x00!(\xe8\x83F\xf8O\x00\x00\x00O\x00\x00\x00\x12\x00 \x00\x00\x00\x00\x00\x00\x00\x00\x00\xb4\x81\xaf\x02\x00\x001000_channels.yamlUT\x05\x00\x01\x80Cm8PK\x05\x06\x00\x00\x00\x00\x02\x00\x02\x00\x98\x00\x00\x00G\x03\x00\x00\x00\x00"
var Asset = "PK\x03\x04\x14\x00\x08\x00\x00\x00\x00\x00!(\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x18\x00 \x000000_access_control.yamlUT\x05\x00\x01\x80Cm8allow:\n everyone:\n messaging:\n - access\n\n admins:\n messaging:\n - access\n - grant\n - settings.read\n - settings.manage\n - channel.public.create\n - channel.private.create\n - channel.group.create\n\n messaging:channel:\n - update\n - leave\n - read\n - join\n - delete\n - undelete\n - archive\n - unarchive\n - members.manage\n - attachments.manage\n - message.attach\n - message.update.all\n - message.update.own\n - message.delete.all\n - message.delete.own\n - message.embed\n - message.send\n - message.reply\n - message.react\n\nPK\x07\x08\xae\x83\x83d\x8e\x02\x00\x00\x8e\x02\x00\x00PK\x03\x04\x14\x00\x08\x00\x00\x00\x00\x00!(\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x12\x00 \x001000_channels.yamlUT\x05\x00\x01\x80Cm8channels:\n - name: General\n type: public\n - name: Random\n type: public\nPK\x07\x08\xe8\x83F\xf8O\x00\x00\x00O\x00\x00\x00PK\x01\x02\x14\x03\x14\x00\x08\x00\x00\x00\x00\x00!(\xae\x83\x83d\x8e\x02\x00\x00\x8e\x02\x00\x00\x18\x00 \x00\x00\x00\x00\x00\x00\x00\x00\x00\xb4\x81\x00\x00\x00\x000000_access_control.yamlUT\x05\x00\x01\x80Cm8PK\x01\x02\x14\x03\x14\x00\x08\x00\x00\x00\x00\x00!(\xe8\x83F\xf8O\x00\x00\x00O\x00\x00\x00\x12\x00 \x00\x00\x00\x00\x00\x00\x00\x00\x00\xb4\x81\xdd\x02\x00\x001000_channels.yamlUT\x05\x00\x01\x80Cm8PK\x05\x06\x00\x00\x00\x00\x02\x00\x02\x00\x98\x00\x00\x00u\x03\x00\x00\x00\x00"