mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-05-07 03:50:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3297 from owncloud/katherine-johnson

Browse Source 
add katherine to demo users
This commit is contained in:
Benedikt Kulmann
2022-03-14 09:14:38 +01:00
committed by GitHub
parent 6afa610f08 43321cc2cf
commit 96ad1708fd
4 changed files with 176 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
accounts/pkg/service/v0/service.go
+23
View File
@@ -253,6 +253,25 @@ func (s Service) createDefaultAccounts(withDemoAccounts bool) (err error) {
{Id: "509a9dcd-bb37-4f4f-a01a-19dca27d9cfa"}, // users
},
},
{
Id: "534bb038-6f9d-4093-946f-133be61fa4e7",
PreferredName: "katherine",
OnPremisesSamAccountName: "katherine",
Mail: "katherine@example.org",
DisplayName: "Katherine Johnson",
UidNumber: 20005,
GidNumber: 30000,
PasswordProfile: &accountsmsg.PasswordProfile{
Password: "$2a$11$6SIBlZ.8BzjBsDTRrThUyuz6OvP.XLo7101oFiwHHB.jufKGS9.Ji",
},
AccountEnabled: true,
MemberOf: []*accountsmsg.Group{
{Id: "509a9dcd-bb37-4f4f-a01a-19dca27d9cfa"}, // users
{Id: "6040aa17-9c64-4fef-9bd0-77234d71bad0"}, // sailing-lovers
{Id: "a1726108-01f8-4c30-88df-2b1a9d1cba1a"}, // quantum-lovers
{Id: "262982c1-2362-4afa-bfdf-8cbfef64a06e"}, // physics-lovers
},
},
// technical users for kopano and reva
{
Id: "820ba2a1-3f54-4538-80a4-2d73007e30bf",
@@ -353,9 +372,11 @@ func (s Service) createDefaultGroups(withDemoGroups bool) (err error) {
{Id: "4c510ada-c86b-4815-8820-42cdf82c3d51"}, // einstein
{Id: "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c"}, // marie
{Id: "932b4540-8d16-481e-8ef4-588e4b6b151c"}, // feynman
{Id: "534bb038-6f9d-4093-946f-133be61fa4e7"}, // katherine
}},
{Id: "6040aa17-9c64-4fef-9bd0-77234d71bad0", GidNumber: 30001, OnPremisesSamAccountName: "sailing-lovers", DisplayName: "Sailing lovers", Members: []*accountsmsg.Account{
{Id: "4c510ada-c86b-4815-8820-42cdf82c3d51"}, // einstein
{Id: "534bb038-6f9d-4093-946f-133be61fa4e7"}, // katherine
}},
{Id: "dd58e5ec-842e-498b-8800-61f2ec6f911f", GidNumber: 30002, OnPremisesSamAccountName: "violin-haters", DisplayName: "Violin haters", Members: []*accountsmsg.Account{
{Id: "4c510ada-c86b-4815-8820-42cdf82c3d51"}, // einstein
@@ -368,6 +389,7 @@ func (s Service) createDefaultGroups(withDemoGroups bool) (err error) {
}},
{Id: "a1726108-01f8-4c30-88df-2b1a9d1cba1a", GidNumber: 30005, OnPremisesSamAccountName: "quantum-lovers", DisplayName: "Quantum lovers", Members: []*accountsmsg.Account{
{Id: "932b4540-8d16-481e-8ef4-588e4b6b151c"}, // feynman
{Id: "534bb038-6f9d-4093-946f-133be61fa4e7"}, // katherine
}},
{Id: "167cbee2-0518-455a-bfb2-031fe0621e5d", GidNumber: 30006, OnPremisesSamAccountName: "philosophy-haters", DisplayName: "Philosophy haters", Members: []*accountsmsg.Account{
{Id: "932b4540-8d16-481e-8ef4-588e4b6b151c"}, // feynman
@@ -376,6 +398,7 @@ func (s Service) createDefaultGroups(withDemoGroups bool) (err error) {
{Id: "4c510ada-c86b-4815-8820-42cdf82c3d51"}, // einstein
{Id: "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c"}, // marie
{Id: "932b4540-8d16-481e-8ef4-588e4b6b151c"}, // feynman
{Id: "534bb038-6f9d-4093-946f-133be61fa4e7"}, // katherine
}},
}
docs/ocis/getting-started/demo-users.md
+8 -7
View File
@@ -16,12 +16,13 @@ To skip the generation of demo users, run the inital setup step with an addition
Following users are available in the demo set:
| username | password | email | role | groups |
| -------- | ------------- | -------------------- | ----- | ----------------------------------------------------------------------- |
| admin | admin | admin@example.org | admin | users |
| einstein | relativity | einstein@example.org | user | users, philosophy-haters, physics-lovers, sailing-lovers, violin-haters |
| marie | radioactivity | marie@example.org | user | users, physics-lovers, polonium-lovers, radium-lovers |
| moss | vista | moss@example.org | admin | users |
| richard | superfluidity | richard@example.org | user | users, philosophy-haters, physics-lovers, quantum-lovers |
| username | password | email | role | groups |
| --------- | ------------- | --------------------- | ------------------- | ----------------------------------------------------------------------- |
| admin | admin | admin@example.org | admin | users |
| einstein | relativity | einstein@example.org | user | users, philosophy-haters, physics-lovers, sailing-lovers, violin-haters |
| marie | radioactivity | marie@example.org | user | users, physics-lovers, polonium-lovers, radium-lovers |
| moss | vista | moss@example.org | admin | users |
| richard | superfluidity | richard@example.org | user | users, philosophy-haters, physics-lovers, quantum-lovers |
| katherine | gemini | katherine@example.org | user, space-manager | users, sailing-lovers, physics-lovers, quantum-lovers |
You may also want to run oCIS with only your custom users by [deleting the demo users]({{< ref "../deployment#delete-demo-users" >}}).
ocs/pkg/server/http/svc_test.go
+28 -14
View File
@@ -49,13 +49,14 @@ const (
)
const (
userEinstein string = "einstein"
userMarie string = "marie"
userRichard string = "richard"
userIDP string = "idp"
userReva string = "reva"
userMoss string = "moss"
userAdmin string = "admin"
userEinstein string = "einstein"
userMarie string = "marie"
userRichard string = "richard"
userIDP string = "idp"
userReva string = "reva"
userMoss string = "moss"
userAdmin string = "admin"
userKatherine string = "katherine"
)
const (
groupPhilosophyHaters string = "philosophy-haters"
@@ -100,6 +101,12 @@ var defaultMemberOf = map[string][]string{
userAdmin: {
groupUsers,
},
userKatherine: {
groupUsers,
groupSailingLovers,
groupQuantumLovers,
groupPhysicsLovers,
},
}
var defaultMembers = map[string][]string{
@@ -111,9 +118,11 @@ var defaultMembers = map[string][]string{
userEinstein,
userMarie,
userRichard,
userKatherine,
},
groupSailingLovers: {
userEinstein,
userKatherine,
},
groupViolinHaters: {
userEinstein,
@@ -123,6 +132,7 @@ var defaultMembers = map[string][]string{
},
groupQuantumLovers: {
userRichard,
userKatherine,
},
groupPhilosophyHaters: {
userRichard,
@@ -131,18 +141,20 @@ var defaultMembers = map[string][]string{
userEinstein,
userMarie,
userRichard,
userKatherine,
},
}
// These account ids are only needed for cleanup
const (
userIDEinstein string = "4c510ada-c86b-4815-8820-42cdf82c3d51"
userIDMarie string = "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c"
userIDFeynman string = "932b4540-8d16-481e-8ef4-588e4b6b151c"
userIDIDP string = "820ba2a1-3f54-4538-80a4-2d73007e30bf"
userIDReva string = "bc596f3c-c955-4328-80a0-60d018b4ad57"
userIDMoss string = "058bff95-6708-4fe5-91e4-9ea3d377588b"
userIDAdmin string = "ddc2004c-0977-11eb-9d3f-a793888cd0f8"
userIDEinstein string = "4c510ada-c86b-4815-8820-42cdf82c3d51"
userIDMarie string = "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c"
userIDFeynman string = "932b4540-8d16-481e-8ef4-588e4b6b151c"
userIDIDP string = "820ba2a1-3f54-4538-80a4-2d73007e30bf"
userIDReva string = "bc596f3c-c955-4328-80a0-60d018b4ad57"
userIDMoss string = "058bff95-6708-4fe5-91e4-9ea3d377588b"
userIDAdmin string = "ddc2004c-0977-11eb-9d3f-a793888cd0f8"
userIDKatherine string = "534bb038-6f9d-4093-946f-133be61fa4e7"
)
// These group ids are only needed for cleanup
@@ -181,6 +193,7 @@ var defaultUsers = []string{
userMarie,
userMoss,
userAdmin,
userKatherine,
}
var defaultUserIDs = []string{
userIDEinstein,
@@ -190,6 +203,7 @@ var defaultUserIDs = []string{
userIDMarie,
userIDMoss,
userIDAdmin,
userIDKatherine,
}
var defaultGroups = []string{
settings/pkg/service/v0/settings.go
+117 -1
View File
@@ -12,6 +12,9 @@ const (
// BundleUUIDRoleAdmin represents the admin role
BundleUUIDRoleAdmin = "71881883-1768-46bd-a24d-a356a2afdf7f"
// BundleUUIDRoleSpaceManager represents the space manager role
BundleUUIDRoleSpaceManager = "2aadd357-682c-406b-8874-293091995fdd"
// BundleUUIDRoleUser represents the user role.
BundleUUIDRoleUser = "d7beeea8-8ff4-406b-8fb6-ab2dd81e6b11"
@@ -63,6 +66,7 @@ const (
func generateBundlesDefaultRoles() []*settingsmsg.Bundle {
return []*settingsmsg.Bundle{
generateBundleAdminRole(),
generateBundleSpaceManagerRole(),
generateBundleUserRole(),
generateBundleGuestRole(),
generateBundleProfileRequest(),
@@ -83,6 +87,20 @@ func generateBundleAdminRole() *settingsmsg.Bundle {
}
}
func generateBundleSpaceManagerRole() *settingsmsg.Bundle {
return &settingsmsg.Bundle{
Id: BundleUUIDRoleSpaceManager,
Name: "spacemanager",
Type: settingsmsg.Bundle_TYPE_ROLE,
Extension: "ocis-roles",
DisplayName: "Spacemanager",
Resource: &settingsmsg.Resource{
Type: settingsmsg.Resource_TYPE_SYSTEM,
},
Settings: []*settingsmsg.Setting{},
}
}
func generateBundleUserRole() *settingsmsg.Bundle {
return &settingsmsg.Bundle{
Id: BundleUUIDRoleUser,
@@ -423,6 +441,97 @@ func generatePermissionRequests() []*settingssvc.AddSettingToBundleRequest {
},
},
},
{
BundleId: BundleUUIDRoleSpaceManager,
Setting: &settingsmsg.Setting{
Id: CreateSpacePermissionID,
Name: CreateSpacePermissionName,
DisplayName: "Create Space",
Description: "This permission allows to create new spaces.",
Resource: &settingsmsg.Resource{
Type: settingsmsg.Resource_TYPE_SYSTEM,
},
Value: &settingsmsg.Setting_PermissionValue{
PermissionValue: &settingsmsg.Permission{
Operation: settingsmsg.Permission_OPERATION_READWRITE,
Constraint: settingsmsg.Permission_CONSTRAINT_ALL,
},
},
},
},
{
BundleId: BundleUUIDRoleSpaceManager,
Setting: &settingsmsg.Setting{
Id: SetSpaceQuotaPermissionID,
Name: SetSpaceQuotaPermissionName,
DisplayName: "Set Space Quota",
Description: "This permission allows to manage space quotas.",
Resource: &settingsmsg.Resource{
Type: settingsmsg.Resource_TYPE_SYSTEM,
},
Value: &settingsmsg.Setting_PermissionValue{
PermissionValue: &settingsmsg.Permission{
Operation: settingsmsg.Permission_OPERATION_READWRITE,
Constraint: settingsmsg.Permission_CONSTRAINT_ALL,
},
},
},
},
{
BundleId: BundleUUIDRoleSpaceManager,
Setting: &settingsmsg.Setting{
Id: ListAllSpacesPermissionID,
Name: ListAllSpacesPermissionName,
DisplayName: "List All Spaces",
Description: "This permission allows list all spaces.",
Resource: &settingsmsg.Resource{
Type: settingsmsg.Resource_TYPE_SYSTEM,
},
Value: &settingsmsg.Setting_PermissionValue{
PermissionValue: &settingsmsg.Permission{
Operation: settingsmsg.Permission_OPERATION_READ,
Constraint: settingsmsg.Permission_CONSTRAINT_ALL,
},
},
},
},
{
BundleId: BundleUUIDRoleSpaceManager,
Setting: &settingsmsg.Setting{
Id: "640e00d2-4df8-41bd-b1c2-9f30a01e0e99",
Name: "language-readwrite",
DisplayName: "Permission to read and set the language (self)",
Resource: &settingsmsg.Resource{
Type: settingsmsg.Resource_TYPE_SETTING,
Id: settingUUIDProfileLanguage,
},
Value: &settingsmsg.Setting_PermissionValue{
PermissionValue: &settingsmsg.Permission{
Operation: settingsmsg.Permission_OPERATION_READWRITE,
Constraint: settingsmsg.Permission_CONSTRAINT_OWN,
},
},
},
},
{
BundleId: BundleUUIDRoleSpaceManager,
Setting: &settingsmsg.Setting{
Id: SelfManagementPermissionID,
Name: SelfManagementPermissionName,
DisplayName: "Self Management",
Description: "This permission gives access to self management.",
Resource: &settingsmsg.Resource{
Type: settingsmsg.Resource_TYPE_USER,
Id: "me",
},
Value: &settingsmsg.Setting_PermissionValue{
PermissionValue: &settingsmsg.Permission{
Operation: settingsmsg.Permission_OPERATION_READWRITE,
Constraint: settingsmsg.Permission_CONSTRAINT_OWN,
},
},
},
},
{
BundleId: BundleUUIDRoleMetadata,
Setting: &settingsmsg.Setting{
@@ -447,7 +556,6 @@ func generatePermissionRequests() []*settingssvc.AddSettingToBundleRequest {
func defaultRoleAssignments() []*settingsmsg.UserRoleAssignment {
return []*settingsmsg.UserRoleAssignment{
// accounts service user for the metadata user is allowed to create spaces
{
AccountUuid: "95cb8724-03b2-11eb-a0a6-c33ef8ef53ad",
RoleId: BundleUUIDRoleAdmin,
@@ -476,6 +584,14 @@ func defaultRoleAssignments() []*settingsmsg.UserRoleAssignment {
}, {
AccountUuid: "932b4540-8d16-481e-8ef4-588e4b6b151c",
RoleId: BundleUUIDRoleUser,
}, {
AccountUuid: "534bb038-6f9d-4093-946f-133be61fa4e7",
RoleId: BundleUUIDRoleUser,
},
// default users with role "spacemanager"
{
AccountUuid: "534bb038-6f9d-4093-946f-133be61fa4e7",
RoleId: BundleUUIDRoleSpaceManager,
},
}
}