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.

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

x-pack/filebeat/input/{cel,httpjson}: fix oauth2 config validation #38962

Merged
merged 1 commit into from
Apr 16, 2024

Conversation

efd6
Copy link
Contributor

@efd6 efd6 commented Apr 16, 2024

Proposed commit message

The logic for validation assumed that client.id and client.secret must be present, but this is not the case for password grant, so relax the requirement.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

@efd6 efd6 added Filebeat Filebeat bugfix Team:Security-Service Integrations Security Service Integrations Team backport-v8.13.0 Automated backport with mergify labels Apr 16, 2024
@efd6 efd6 self-assigned this Apr 16, 2024
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Apr 16, 2024
@efd6 efd6 force-pushed the oauth_pw_check_relax branch from 74176a7 to 5949d94 Compare April 16, 2024 02:26
@elasticmachine
Copy link
Collaborator

elasticmachine commented Apr 16, 2024

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Duration: 121 min 16 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@efd6 efd6 marked this pull request as ready for review April 16, 2024 04:49
@efd6 efd6 requested a review from a team as a code owner April 16, 2024 04:49
@elasticmachine
Copy link
Collaborator

Pinging @elastic/security-service-integrations (Team:Security-Service Integrations)

Copy link
Contributor

@kcreddy kcreddy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍🏼

Copy link
Contributor

mergify bot commented Apr 16, 2024

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b oauth_pw_check_relax upstream/oauth_pw_check_relax
git merge upstream/main
git push upstream oauth_pw_check_relax

The logic for validation assumed that client.id and client.secret must
be present, but this is not the case for password grant, so relax the
requirement.
@efd6 efd6 force-pushed the oauth_pw_check_relax branch from 5949d94 to 0a7e95e Compare April 16, 2024 21:38
@efd6 efd6 enabled auto-merge (squash) April 16, 2024 21:43
@efd6 efd6 merged commit aae9185 into elastic:main Apr 16, 2024
22 of 26 checks passed
mergify bot pushed a commit that referenced this pull request Apr 16, 2024
…38962)

The logic for validation assumed that client.id and client.secret must
be present, but this is not the case for password grant, so relax the
requirement.

(cherry picked from commit aae9185)
efd6 added a commit that referenced this pull request Apr 17, 2024
…th2 config validation (#38995)

* x-pack/filebeat/input/{cel,httpjson}: fix oauth2 config validation (#38962)

The logic for validation assumed that client.id and client.secret must
be present, but this is not the case for password grant, so relax the
requirement.

(cherry picked from commit aae9185)

* remove irrelevant changelog entries

---------

Co-authored-by: Dan Kortschak <dan.kortschak@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-v8.13.0 Automated backport with mergify bugfix Filebeat Filebeat Team:Security-Service Integrations Security Service Integrations Team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants