-
Notifications
You must be signed in to change notification settings - Fork 4.7k
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.
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
update forbidden messages #2319
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| package authorizer | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "text/template" | ||
|
|
||
| authorizationapi "github.com/openshift/origin/pkg/authorization/api" | ||
| ) | ||
|
|
||
| const DefaultProjectRequestForbidden = "You may not request a new project via this API." | ||
|
|
||
| type ForbiddenMessageResolver struct { | ||
| // TODO if these maps were map[string]map[util.StringSet]ForbiddenMessageMaker, we'd be able to handle cases where sets of resources wanted slightly different messages | ||
| // unfortunately, maps don't support keys like that, requiring StringSet serialization and deserialization. | ||
| namespacedVerbsToResourcesToForbiddenMessageMaker map[string]map[string]ForbiddenMessageMaker | ||
| rootScopedVerbsToResourcesToForbiddenMessageMaker map[string]map[string]ForbiddenMessageMaker | ||
|
|
||
| nonResourceURLForbiddenMessageMaker ForbiddenMessageMaker | ||
| defaultForbiddenMessageMaker ForbiddenMessageMaker | ||
| } | ||
|
|
||
| func NewForbiddenMessageResolver(projectRequestForbiddenTemplate string) *ForbiddenMessageResolver { | ||
| messageResolver := &ForbiddenMessageResolver{ | ||
| namespacedVerbsToResourcesToForbiddenMessageMaker: map[string]map[string]ForbiddenMessageMaker{}, | ||
| rootScopedVerbsToResourcesToForbiddenMessageMaker: map[string]map[string]ForbiddenMessageMaker{}, | ||
| nonResourceURLForbiddenMessageMaker: newTemplateForbiddenMessageMaker(`User "{{.User.GetName}}" cannot "{{.Attributes.GetVerb}}" on "{{.Attributes.GetURL}}"`), | ||
| defaultForbiddenMessageMaker: newTemplateForbiddenMessageMaker(`User "{{.User.GetName}}" cannot "{{.Attributes.GetVerb}}" "{{.Attributes.GetResource}}" with name "{{.Attributes.GetResourceName}}" in project "{{.Namespace}}"`), | ||
| } | ||
|
|
||
| // general messages | ||
| messageResolver.addNamespacedForbiddenMessageMaker("create", authorizationapi.ResourceAll, newTemplateForbiddenMessageMaker(`User "{{.User.GetName}}" cannot create {{.Attributes.GetResource}} in project "{{.Namespace}}"`)) | ||
| messageResolver.addRootScopedForbiddenMessageMaker("create", authorizationapi.ResourceAll, newTemplateForbiddenMessageMaker(`User "{{.User.GetName}}" cannot create {{.Attributes.GetResource}} at the cluster scope`)) | ||
| messageResolver.addNamespacedForbiddenMessageMaker("get", authorizationapi.ResourceAll, newTemplateForbiddenMessageMaker(`User "{{.User.GetName}}" cannot get {{.Attributes.GetResource}} in project "{{.Namespace}}"`)) | ||
| messageResolver.addRootScopedForbiddenMessageMaker("get", authorizationapi.ResourceAll, newTemplateForbiddenMessageMaker(`User "{{.User.GetName}}" cannot get {{.Attributes.GetResource}} at the cluster scope`)) | ||
| messageResolver.addNamespacedForbiddenMessageMaker("list", authorizationapi.ResourceAll, newTemplateForbiddenMessageMaker(`User "{{.User.GetName}}" cannot list {{.Attributes.GetResource}} in project "{{.Namespace}}"`)) | ||
| messageResolver.addRootScopedForbiddenMessageMaker("list", authorizationapi.ResourceAll, newTemplateForbiddenMessageMaker(`User "{{.User.GetName}}" cannot list all {{.Attributes.GetResource}} in the cluster`)) | ||
| messageResolver.addNamespacedForbiddenMessageMaker("update", authorizationapi.ResourceAll, newTemplateForbiddenMessageMaker(`User "{{.User.GetName}}" cannot update {{.Attributes.GetResource}} in project "{{.Namespace}}"`)) | ||
| messageResolver.addRootScopedForbiddenMessageMaker("update", authorizationapi.ResourceAll, newTemplateForbiddenMessageMaker(`User "{{.User.GetName}}" cannot update {{.Attributes.GetResource}} at the cluster scope`)) | ||
| messageResolver.addNamespacedForbiddenMessageMaker("delete", authorizationapi.ResourceAll, newTemplateForbiddenMessageMaker(`User "{{.User.GetName}}" cannot delete {{.Attributes.GetResource}} in project "{{.Namespace}}"`)) | ||
| messageResolver.addRootScopedForbiddenMessageMaker("delete", authorizationapi.ResourceAll, newTemplateForbiddenMessageMaker(`User "{{.User.GetName}}" cannot delete {{.Attributes.GetResource}} at the cluster scope`)) | ||
|
|
||
| // project request rejection | ||
| projectRequestDeny := projectRequestForbiddenTemplate | ||
| if len(projectRequestDeny) == 0 { | ||
| projectRequestDeny = DefaultProjectRequestForbidden | ||
| } | ||
| messageResolver.addRootScopedForbiddenMessageMaker("create", "projectrequests", newTemplateForbiddenMessageMaker(projectRequestDeny)) | ||
|
|
||
| return messageResolver | ||
| } | ||
|
|
||
| func (m *ForbiddenMessageResolver) addNamespacedForbiddenMessageMaker(verb, resource string, messageMaker ForbiddenMessageMaker) { | ||
| m.addForbiddenMessageMaker(m.namespacedVerbsToResourcesToForbiddenMessageMaker, verb, resource, messageMaker) | ||
| } | ||
|
|
||
| func (m *ForbiddenMessageResolver) addRootScopedForbiddenMessageMaker(verb, resource string, messageMaker ForbiddenMessageMaker) { | ||
| m.addForbiddenMessageMaker(m.rootScopedVerbsToResourcesToForbiddenMessageMaker, verb, resource, messageMaker) | ||
| } | ||
|
|
||
| func (m *ForbiddenMessageResolver) addForbiddenMessageMaker(target map[string]map[string]ForbiddenMessageMaker, verb, resource string, messageMaker ForbiddenMessageMaker) { | ||
| resourcesToForbiddenMessageMaker, exists := target[verb] | ||
| if !exists { | ||
| resourcesToForbiddenMessageMaker = map[string]ForbiddenMessageMaker{} | ||
| target[verb] = resourcesToForbiddenMessageMaker | ||
| } | ||
|
|
||
| resourcesToForbiddenMessageMaker[resource] = messageMaker | ||
| } | ||
|
|
||
| func (m *ForbiddenMessageResolver) MakeMessage(ctx MessageContext) (string, error) { | ||
| if ctx.Attributes.IsNonResourceURL() { | ||
| return m.nonResourceURLForbiddenMessageMaker.MakeMessage(ctx) | ||
| } | ||
|
|
||
| messageMakerMap := m.namespacedVerbsToResourcesToForbiddenMessageMaker | ||
| if len(ctx.Namespace) == 0 { | ||
| messageMakerMap = m.rootScopedVerbsToResourcesToForbiddenMessageMaker | ||
| } | ||
|
|
||
| resourcesToForbiddenMessageMaker, exists := messageMakerMap[ctx.Attributes.GetVerb()] | ||
| if !exists { | ||
| resourcesToForbiddenMessageMaker, exists = messageMakerMap[authorizationapi.VerbAll] | ||
| if !exists { | ||
| return m.defaultForbiddenMessageMaker.MakeMessage(ctx) | ||
| } | ||
| } | ||
|
|
||
| messageMaker, exists := resourcesToForbiddenMessageMaker[ctx.Attributes.GetResource()] | ||
| if !exists { | ||
| messageMaker, exists = resourcesToForbiddenMessageMaker[authorizationapi.ResourceAll] | ||
| if !exists { | ||
| return m.defaultForbiddenMessageMaker.MakeMessage(ctx) | ||
| } | ||
| } | ||
|
|
||
| specificMessage, err := messageMaker.MakeMessage(ctx) | ||
| if err != nil { | ||
| return m.defaultForbiddenMessageMaker.MakeMessage(ctx) | ||
| } | ||
|
|
||
| return specificMessage, nil | ||
| } | ||
|
|
||
| type templateForbiddenMessageMaker struct { | ||
| parsedTemplate *template.Template | ||
| } | ||
|
|
||
| func newTemplateForbiddenMessageMaker(text string) templateForbiddenMessageMaker { | ||
| parsedTemplate := template.Must(template.New("").Parse(text)) | ||
|
|
||
| return templateForbiddenMessageMaker{parsedTemplate} | ||
| } | ||
|
|
||
| func (m templateForbiddenMessageMaker) MakeMessage(ctx MessageContext) (string, error) { | ||
| buffer := &bytes.Buffer{} | ||
| err := m.parsedTemplate.Execute(buffer, ctx) | ||
| return string(buffer.Bytes()), err | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This wins an award for Longest Variable Name in a Go struct, 2015.