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

[8.18](backport #42887) feat(fips): return an error when validating kerberos cfg #42954

Merged
merged 2 commits into from
Feb 27, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 27, 2025

Proposed commit message

setting kerberos config options in fips mode should return an error

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.

Disruptive User Impact

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs


This is an automatic backport of pull request #42887 done by [Mergify](https://mergify.com).

* feat(fips): return an error when validating kerberos cfg

setting kerberos config options should return an error

* Update config.go

* Update config_nofips.go

* Update client_nofips.go

(cherry picked from commit e532bbe)

# Conflicts:
#	libbeat/common/transport/kerberos/client_nofips.go
@mergify mergify bot requested a review from a team as a code owner February 27, 2025 20:24
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Feb 27, 2025
@mergify mergify bot requested review from mauri870 and faec and removed request for a team February 27, 2025 20:24
Copy link
Contributor Author

mergify bot commented Feb 27, 2025

Cherry-pick of e532bbe has failed:

On branch mergify/bp/8.18/pr-42887
Your branch is up to date with 'origin/8.18'.

You are currently cherry-picking commit e532bbe8d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   libbeat/common/transport/kerberos/config.go
	new file:   libbeat/common/transport/kerberos/config_fips.go
	new file:   libbeat/common/transport/kerberos/config_fips_test.go
	new file:   libbeat/common/transport/kerberos/config_nofips.go
	new file:   libbeat/common/transport/kerberos/config_nofips_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   libbeat/common/transport/kerberos/client_nofips.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Feb 27, 2025
@botelastic
Copy link

botelastic bot commented Feb 27, 2025

This pull request doesn't have a Team:<team> label.

Copy link
Contributor Author

mergify bot commented Feb 27, 2025

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 mergify/bp/8.18/pr-42887 upstream/mergify/bp/8.18/pr-42887
git merge upstream/8.18
git push upstream mergify/bp/8.18/pr-42887

@kruskall kruskall removed the conflicts There is a conflict in the backported pull request label Feb 27, 2025
@kruskall kruskall enabled auto-merge (squash) February 27, 2025 20:37
@kruskall kruskall merged commit 6505668 into 8.18 Feb 27, 2025
143 checks passed
@kruskall kruskall deleted the mergify/bp/8.18/pr-42887 branch February 27, 2025 22:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant