Skip to content

Commit 19aba30

Browse files
EmyrkEmyrk
committed
LevelID -> OrganizationID
1 parent 26ef1e6 commit 19aba30

File tree

8 files changed

+77
-77
lines changed

8 files changed

+77
-77
lines changed

‎coderd/authz/authztest/iterator_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ func RandomPermission() authz.Permission {
5959
authz.ActionDelete,
6060
}
6161
return authz.Permission{
62-
Negate: must(crand.Intn(2))%2 == 0,
63-
Level: authz.PermissionLevels[must(crand.Intn(len(authz.PermissionLevels)))],
64-
LevelID: uuid.New().String(),
65-
ResourceType: authz.ResourceWorkspace,
66-
ResourceID: uuid.New().String(),
67-
Action: actions[must(crand.Intn(len(actions)))],
62+
Negate: must(crand.Intn(2))%2 == 0,
63+
Level: authz.PermissionLevels[must(crand.Intn(len(authz.PermissionLevels)))],
64+
OrganizationID: uuid.New().String(),
65+
ResourceType: authz.ResourceWorkspace,
66+
ResourceID: uuid.New().String(),
67+
Action: actions[must(crand.Intn(len(actions)))],
6868
}
6969
}
7070

‎coderd/authz/authztest/level.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func GroupedPermissions(perms Set) SetGroup {
5656
groups[LevelSiteKey][m] = append(groups[LevelSiteKey][m], p)
5757
case p.Level == authz.LevelOrg:
5858
groups[LevelOrgAllKey][m] = append(groups[LevelOrgAllKey][m], p)
59-
if p.LevelID == "" || p.LevelID == "*" {
59+
if p.OrganizationID == "" || p.OrganizationID == "*" {
6060
groups[LevelOrgKey][m] = append(groups[LevelOrgKey][m], p)
6161
} else {
6262
groups[LevelOrgMemKey][m] = append(groups[LevelOrgMemKey][m], p)

‎coderd/authz/authztest/level_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ func Test_GroupedPermissions(t *testing.T) {
1919
for _, a := range []authz.Action{authz.ActionRead, authztest.OtherOption} {
2020
if lvl == authz.LevelOrg {
2121
set = append(set, &authz.Permission{
22-
Negate: s,
23-
Level: lvl,
24-
LevelID: "mem",
25-
ResourceType: authz.ResourceWorkspace,
26-
Action: a,
22+
Negate: s,
23+
Level: lvl,
24+
OrganizationID: "mem",
25+
ResourceType: authz.ResourceWorkspace,
26+
Action: a,
2727
})
2828
total++
2929
}

‎coderd/authz/authztest/permissions.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,21 @@ func AllPermissions() Set {
3131
for _, a := range actions {
3232
if l == authz.LevelOrg {
3333
all = append(all, &authz.Permission{
34-
Negate: s,
35-
Level: l,
36-
LevelID: PermOrgID,
37-
ResourceType: t,
38-
ResourceID: i,
39-
Action: a,
34+
Negate: s,
35+
Level: l,
36+
OrganizationID: PermOrgID,
37+
ResourceType: t,
38+
ResourceID: i,
39+
Action: a,
4040
})
4141
}
4242
all = append(all, &authz.Permission{
43-
Negate: s,
44-
Level: l,
45-
LevelID: "",
46-
ResourceType: t,
47-
ResourceID: i,
48-
Action: a,
43+
Negate: s,
44+
Level: l,
45+
OrganizationID: "",
46+
ResourceType: t,
47+
ResourceID: i,
48+
Action: a,
4949
})
5050
}
5151
}

‎coderd/authz/authztest/set_test.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,21 +49,21 @@ func Test_Set(t *testing.T) {
4949

5050
set := authztest.Set{
5151
&authz.Permission{
52-
Negate: false,
53-
Level: authz.LevelOrg,
54-
LevelID: "1234",
55-
ResourceType: authz.ResourceWorkspace,
56-
ResourceID: "1234",
57-
Action: authz.ActionRead,
52+
Negate: false,
53+
Level: authz.LevelOrg,
54+
OrganizationID: "1234",
55+
ResourceType: authz.ResourceWorkspace,
56+
ResourceID: "1234",
57+
Action: authz.ActionRead,
5858
},
5959
nil,
6060
&authz.Permission{
61-
Negate: true,
62-
Level: authz.LevelSite,
63-
LevelID: "",
64-
ResourceType: authz.ResourceWorkspace,
65-
ResourceID: "*",
66-
Action: authz.ActionRead,
61+
Negate: true,
62+
Level: authz.LevelSite,
63+
OrganizationID: "",
64+
ResourceType: authz.ResourceWorkspace,
65+
ResourceID: "*",
66+
Action: authz.ActionRead,
6767
},
6868
}
6969

‎coderd/authz/permission.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ type Permission struct {
2222
// Negate makes this a negative permission
2323
Negate bool
2424
Level PermLevel
25-
// LevelID is used for identifying a particular org.
25+
// OrganizationID is used for identifying a particular org.
2626
// org:1234
27-
LevelID string
27+
OrganizationID string
2828

2929
ResourceType ResourceType
3030
ResourceID string
@@ -38,8 +38,8 @@ func (p Permission) String() string {
3838
sign = "-"
3939
}
4040
levelID := ""
41-
if p.LevelID != "" {
42-
levelID = ":" + p.LevelID
41+
if p.OrganizationID != "" {
42+
levelID = ":" + p.OrganizationID
4343
}
4444

4545
return fmt.Sprintf("%s%s%s.%s.%s.%s",
@@ -100,7 +100,7 @@ func ParsePermission(perm string) (Permission, error) {
100100
}
101101

102102
if len(levelParts) > 1 {
103-
permission.LevelID = levelParts[1]
103+
permission.OrganizationID = levelParts[1]
104104
}
105105

106106
// might want to check if these are valid resource types and actions.

‎coderd/authz/permission_test.go

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -19,36 +19,36 @@ func Test_PermissionString(t *testing.T) {
1919
{
2020
Name: "BasicPositive",
2121
Permission: authz.Permission{
22-
Negate: false,
23-
Level: authz.LevelSite,
24-
LevelID: "",
25-
ResourceType: authz.ResourceWorkspace,
26-
ResourceID: "*",
27-
Action: authz.ActionRead,
22+
Negate: false,
23+
Level: authz.LevelSite,
24+
OrganizationID: "",
25+
ResourceType: authz.ResourceWorkspace,
26+
ResourceID: "*",
27+
Action: authz.ActionRead,
2828
},
2929
Expected: "+site.workspace.*.read",
3030
},
3131
{
3232
Name: "BasicNegative",
3333
Permission: authz.Permission{
34-
Negate: true,
35-
Level: authz.LevelUser,
36-
LevelID: "",
37-
ResourceType: authz.ResourceDevURL,
38-
ResourceID: "1234",
39-
Action: authz.ActionCreate,
34+
Negate: true,
35+
Level: authz.LevelUser,
36+
OrganizationID: "",
37+
ResourceType: authz.ResourceDevURL,
38+
ResourceID: "1234",
39+
Action: authz.ActionCreate,
4040
},
4141
Expected: "-user.devurl.1234.create",
4242
},
4343
{
4444
Name: "OrgID",
4545
Permission: authz.Permission{
46-
Negate: true,
47-
Level: authz.LevelOrg,
48-
LevelID: "default",
49-
ResourceType: authz.ResourceProject,
50-
ResourceID: "456",
51-
Action: authz.ActionUpdate,
46+
Negate: true,
47+
Level: authz.LevelOrg,
48+
OrganizationID: "default",
49+
ResourceType: authz.ResourceProject,
50+
ResourceID: "456",
51+
Action: authz.ActionUpdate,
5252
},
5353
Expected: "-org:default.project.456.update",
5454
},
@@ -111,20 +111,20 @@ func Test_ParsePermissions(t *testing.T) {
111111
Str: "+org:1234.workspace.5678.read, -site.*.*.create",
112112
Permissions: []authz.Permission{
113113
{
114-
Negate: false,
115-
Level: "org",
116-
LevelID: "1234",
117-
ResourceType: authz.ResourceWorkspace,
118-
ResourceID: "5678",
119-
Action: authz.ActionRead,
114+
Negate: false,
115+
Level: "org",
116+
OrganizationID: "1234",
117+
ResourceType: authz.ResourceWorkspace,
118+
ResourceID: "5678",
119+
Action: authz.ActionRead,
120120
},
121121
{
122-
Negate: true,
123-
Level: "site",
124-
LevelID: "",
125-
ResourceType: "*",
126-
ResourceID: "*",
127-
Action: authz.ActionCreate,
122+
Negate: true,
123+
Level: "site",
124+
OrganizationID: "",
125+
ResourceType: "*",
126+
ResourceID: "*",
127+
Action: authz.ActionCreate,
128128
},
129129
},
130130
},

‎coderd/authz/subject.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ func (s SubjectTODO) OrgRoles(_ context.Context, orgID string) ([]Role, error) {
4646
return []Role{{
4747
Permissions: []Permission{
4848
{
49-
Negate: true,
50-
Level: "*",
51-
LevelID: "",
52-
ResourceType: "*",
53-
ResourceID: "*",
54-
Action: "*",
49+
Negate: true,
50+
Level: "*",
51+
OrganizationID: "",
52+
ResourceType: "*",
53+
ResourceID: "*",
54+
Action: "*",
5555
},
5656
},
5757
}}, nil

0 commit comments

Comments
 (0)