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

Fix permission handling for editing/deleting roles #4265

Merged
merged 2 commits into from Oct 19, 2017

Conversation

Projects
None yet
2 participants
@joschi
Contributor

joschi commented Oct 18, 2017

This change set fixes the handling of permissions for roles in the /system/roles resource of the Graylog REST API and only displays the "Edit" and "Delete" buttons in the role overview (System / Authentication / Roles) if the user has sufficient permissions.

Fixes #4254

joschi added some commits Oct 18, 2017

@joschi joschi added this to the 3.0.0 milestone Oct 18, 2017

@kroepke

lgtm!

@kroepke kroepke merged commit 5c38d3a into master Oct 19, 2017

5 checks passed

ci-web-linter Jenkins build graylog-pr-linter-check 2015 has succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
graylog-project/pr Jenkins build graylog-project-pr-snapshot 620 has succeeded
Details
license/cla Contributor License Agreement is signed.
Details

@wafflebot wafflebot bot removed the ready-for-review label Oct 19, 2017

@kroepke kroepke deleted the issue-4254 branch Oct 19, 2017

kroepke added a commit that referenced this pull request Oct 19, 2017

Fix permission handling for editing/deleting roles (#4265)
* Fix permission checks in RoleResource

* Conditionally display buttons in RoleList component

(cherry picked from commit 5c38d3a)

kroepke added a commit that referenced this pull request Oct 19, 2017

Fix permission handling for editing/deleting roles (#4265)
* Fix permission checks in RoleResource

* Conditionally display buttons in RoleList component

(cherry picked from commit 5c38d3a)

joschi added a commit that referenced this pull request Oct 19, 2017

Fix permission handling for editing/deleting roles (#4265) (#4270)
* Fix permission checks in RoleResource
* Conditionally display buttons in RoleList component

Fixes #4254
Refs #4265
(cherry picked from commit 5c38d3a)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment