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

Check for permission before terminating input. #4867

Merged
merged 1 commit into from Jun 28, 2018

Conversation

Projects
None yet
2 participants
@dennisoelkers
Member

dennisoelkers commented Jun 26, 2018

Description

Motivation and Context

Before this change it was possible to terminate any input for every
authenticated user. This change introduces a check for the
inputs:terminate:<input id> permission before terminating an input.

Might be backported to 2.4.

Fixes #4858.

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.
Check for permission before terminating input.
Before this change it was possible to terminate any input for every
authenticated user. This change introduces a check for the
`inputs:terminate:<input id>` permission before terminating an input.

Fixes #4858.

@dennisoelkers dennisoelkers added this to the 3.0.0 milestone Jun 26, 2018

@bernd bernd self-assigned this Jun 27, 2018

@bernd

bernd approved these changes Jun 28, 2018

@bernd bernd merged commit 0582e31 into master Jun 28, 2018

4 of 5 checks passed

ci-web-linter Jenkins build graylog-pr-linter-check 2559 has failed
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 1480 has succeeded
Details
license/cla Contributor License Agreement is signed.
Details

@bernd bernd deleted the issue-4858 branch Jun 28, 2018

bernd added a commit that referenced this pull request Jun 28, 2018

Check for permission before terminating input. (#4867)
Before this change it was possible to terminate any input for every
authenticated user. This change introduces a check for the
`inputs:terminate:<input id>` permission before terminating an input.

Fixes #4858.

(cherry picked from commit 0582e31)

dennisoelkers added a commit that referenced this pull request Jun 28, 2018

Check for permission before terminating input. (#4867) (#4874)
Before this change it was possible to terminate any input for every
authenticated user. This change introduces a check for the
`inputs:terminate:<input id>` permission before terminating an input.

Fixes #4858.

(cherry picked from commit 0582e31)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment