rancher/steve
1
0
Fork 0
mirror of https://github.com/rancher/steve.git synced 2025-09-01 07:27:46 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Make view link related to GET RBAC permission. (#699)" (#703)

Browse Source 
This reverts commit 542c471584.
This commit is contained in:
Sakala Venkata Krishna Rohit
2025-07-04 14:27:43 -07:00
committed by GitHub
parent 542c471584
commit 8cd7bd0a8f
2 changed files with 8 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/resources/common/formatter.go
View File

@@ -121,22 +121,15 @@ func formatter(summarycache common.SummaryCache, asl accesscontrol.AccessSetLook
return
}
}
hasGet := accessSet.Grants("get", gvr.GroupResource(), resource.APIObject.Namespace(), resource.APIObject.Name())
hasUpdate := accessSet.Grants("update", gvr.GroupResource(), resource.APIObject.Namespace(), resource.APIObject.Name())
hasDelete := accessSet.Grants("delete", gvr.GroupResource(), resource.APIObject.Namespace(), resource.APIObject.Name())
hasPatch := accessSet.Grants("patch", gvr.GroupResource(), resource.APIObject.Namespace(), resource.APIObject.Name())
selfLink := selfLink(gvr, meta)
u := request.URLBuilder.RelativeToRoot(selfLink)
resource.Links["view"] = u
if hasGet {
if attributes.DisallowMethods(resource.Schema)[http.MethodGet] {
resource.Links["view"] = "blocked"
}
} else {
delete(resource.Links, "view")
}
if hasUpdate {
if attributes.DisallowMethods(resource.Schema)[http.MethodPut] {
resource.Links["update"] = "blocked"

82
pkg/resources/common/formatter_test.go
View File

@@ -648,75 +648,6 @@ func Test_formatterLinks(t *testing.T) {
currentLinks map[string]string
wantLinks map[string]string
}{
{
name: "get permission granted",
hasUser: true,
permissions: &permissions{
hasGet: true,
},
schema: &types.APISchema{
Schema: &schemas.Schema{
ID: "example",
Attributes: map[string]interface{}{
"group": "",
"version": "v1",
"resource": "pods",
},
},
},
apiObject: types.APIObject{
ID: "example",
Object: &v1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: "example-pod",
Namespace: "example-ns",
},
},
},
currentLinks: map[string]string{
"default": "defaultVal",
},
wantLinks: map[string]string{
"default": "defaultVal",
"view": "/api/v1/namespaces/example-ns/pods/example-pod",
},
},
{
name: "get permission granted, but disallowed in schema",
hasUser: true,
permissions: &permissions{
hasGet: true,
},
schema: &types.APISchema{
Schema: &schemas.Schema{
ID: "example",
Attributes: map[string]interface{}{
"group": "",
"version": "v1",
"resource": "pods",
"disallowMethods": map[string]bool{
http.MethodGet: true,
},
},
},
},
apiObject: types.APIObject{
ID: "example",
Object: &v1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: "example-pod",
Namespace: "example-ns",
},
},
},
currentLinks: map[string]string{
"default": "defaultVal",
},
wantLinks: map[string]string{
"default": "defaultVal",
"view": "blocked",
},
},
{
name: "no schema",
currentLinks: map[string]string{
@@ -853,6 +784,7 @@ func Test_formatterLinks(t *testing.T) {
},
wantLinks: map[string]string{
"default": "defaultVal",
"view": "/api/v1/namespaces/example-ns/pods/example-pod",
},
},
{
@@ -888,6 +820,7 @@ func Test_formatterLinks(t *testing.T) {
wantLinks: map[string]string{
"default": "defaultVal",
"update": "../v1/namespaces/example-ns/pods/example-pod",
"view": "/api/v1/namespaces/example-ns/pods/example-pod",
},
},
{
@@ -923,6 +856,7 @@ func Test_formatterLinks(t *testing.T) {
wantLinks: map[string]string{
"default": "defaultVal",
"remove": "../v1/namespaces/example-ns/pods/example-pod",
"view": "/api/v1/namespaces/example-ns/pods/example-pod",
},
},
{
@@ -960,6 +894,7 @@ func Test_formatterLinks(t *testing.T) {
"default": "defaultVal",
"update": "../v1/namespaces/example-ns/pods/example-pod",
"remove": "../v1/namespaces/example-ns/pods/example-pod",
"view": "/api/v1/namespaces/example-ns/pods/example-pod",
},
},
{
@@ -1001,6 +936,7 @@ func Test_formatterLinks(t *testing.T) {
"default": "defaultVal",
"update": "blocked",
"remove": "blocked",
"view": "/api/v1/namespaces/example-ns/pods/example-pod",
},
},
{
@@ -1036,6 +972,7 @@ func Test_formatterLinks(t *testing.T) {
wantLinks: map[string]string{
"default": "defaultVal",
"patch": "/v1/apps.deployments/example-ns/example-deployment",
"view": "/apis/apps/v1/namespaces/example-ns/deployments/example-deployment",
},
},
{
@@ -1074,6 +1011,7 @@ func Test_formatterLinks(t *testing.T) {
wantLinks: map[string]string{
"default": "defaultVal",
"patch": "blocked",
"view": "/apis/apps/v1/namespaces/example-ns/deployments/example-deployment",
},
},
}
@@ -1093,12 +1031,6 @@ func Test_formatterLinks(t *testing.T) {
meta, err := meta.Accessor(test.apiObject.Object)
accessSet := accesscontrol.AccessSet{}
require.NoError(t, err)
if test.permissions.hasGet {
accessSet.Add("get", gvr.GroupResource(), accesscontrol.Access{
Namespace: meta.GetNamespace(),
ResourceName: meta.GetName(),
})
}
if test.permissions.hasUpdate {
accessSet.Add("update", gvr.GroupResource(), accesscontrol.Access{
Namespace: meta.GetNamespace(),