Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Add support for extra in validating webhook #98

Merged
merged 4 commits into from
Dec 11, 2024
Merged

chore: Add support for extra in validating webhook #98

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5adf1a9
chore: Add support for extra in validating webhook
miketonks-form3 Dec 10, 2024
f36f8b6
chore: rename imports
miketonks-form3 Dec 11, 2024
b6f86f1
Update pkg/webhook/validate_auth.go
miketonks-form3 Dec 11, 2024
bc5e0b2
fix: make map
miketonks-form3 Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions pkg/webhook/validate_auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ import (

"github.com/go-logr/logr"
"github.com/pkg/errors"
authv1 "k8s.io/api/authorization/v1"
authnv1 "k8s.io/api/authentication/v1"
authzv1 "k8s.io/api/authorization/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
authorizationv1 "k8s.io/client-go/kubernetes/typed/authorization/v1"
Expand Down Expand Up @@ -103,7 +104,7 @@ func (v *AuthValidator) Handle(ctx context.Context, req admission.Request) admis
requireClusterPrivileges, affectedNamespaces := affectedNamespaces(chaos)

if requireClusterPrivileges {
allow, err := v.auth(username, groups, "", requestKind)
allow, err := v.auth(req.UserInfo, "", requestKind)
if err != nil {
return admission.Errored(http.StatusBadRequest, err)
}
Expand All @@ -116,7 +117,7 @@ func (v *AuthValidator) Handle(ctx context.Context, req admission.Request) admis
v.logger.Info("start validating user", "user", username, "groups", groups, "namespace", affectedNamespaces)

for namespace := range affectedNamespaces {
allow, err := v.auth(username, groups, namespace, requestKind)
allow, err := v.auth(req.UserInfo, namespace, requestKind)
if err != nil {
return admission.Errored(http.StatusBadRequest, err)
}
Expand All @@ -132,21 +133,23 @@ func (v *AuthValidator) Handle(ctx context.Context, req admission.Request) admis
return admission.Allowed("")
}

func (v *AuthValidator) auth(username string, groups []string, namespace string, chaosKind string) (bool, error) {
func (v *AuthValidator) auth(userInfo authnv1.UserInfo, namespace string, chaosKind string) (bool, error) {
resourceName, err := v.resourceFor(chaosKind)
if err != nil {
return false, err
}
sar := authv1.SubjectAccessReview{
Spec: authv1.SubjectAccessReviewSpec{
ResourceAttributes: &authv1.ResourceAttributes{

sar := authzv1.SubjectAccessReview{
Spec: authzv1.SubjectAccessReviewSpec{
ResourceAttributes: &authzv1.ResourceAttributes{
Namespace: namespace,
Verb: "create",
Group: "chaos-mesh.org",
Resource: resourceName,
},
User: username,
Groups: groups,
User: userInfo.Username,
Groups: userInfo.Groups,
Extra: convertExtra(userInfo.Extra),
},
}

Expand All @@ -172,3 +175,12 @@ func contains(arr []string, target string) bool {
}
return false
}

func convertExtra(in map[string]authnv1.ExtraValue) map[string]authzv1.ExtraValue {
// map from authentication and authorization types
extra := make(map[string]authzv1.ExtraValue{}, len(in))
for key, value := range in {
extra[key] = authzv1.ExtraValue(value)
}
return extra
}
Loading