-
Notifications
You must be signed in to change notification settings - Fork 5k
Allow Filebeat modules to be excluded from FIPS-capable artifacts #44920
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
Merged
ycombinator
merged 11 commits into
elastic:main
from
ycombinator:fips-disable-fb-modules
Jun 24, 2025
Merged
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
f2f122a
Add ability for Filebeat plugins (inputs) to specify that they should…
ycombinator 75fc147
Remove ExcludeForFIPS implementation
ycombinator f879dc4
Create and check FIPSAwareInput interface
ycombinator e930db2
Make o365 input use FIPSAwareInput interface
ycombinator af83f36
Running mage fmt
ycombinator bb0799e
Remove debugging statement
ycombinator f71dec5
Explain behavior for types not implementing the interface
ycombinator 3b05db8
Adding godoc comments for implementations of the IsFIPSCapable() method
ycombinator fe9973e
Add unit test for checkFIPSCapability()
ycombinator 72cf251
Running mage fmt
ycombinator ecfdbb8
Remove example implementation
ycombinator 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 hidden or 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 hidden or 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,43 @@ | ||
| // Licensed to Elasticsearch B.V. under one or more contributor | ||
| // license agreements. See the NOTICE file distributed with | ||
| // this work for additional information regarding copyright | ||
| // ownership. Elasticsearch B.V. licenses this file to you under | ||
| // the Apache License, Version 2.0 (the "License"); you may | ||
| // not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| //go:build requirefips | ||
|
|
||
| package beater | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| v2 "github.com/elastic/beats/v7/filebeat/input/v2" | ||
| "github.com/elastic/beats/v7/libbeat/cfgfile" | ||
| ) | ||
|
|
||
| func checkFIPSCapability(runner cfgfile.Runner) error { | ||
| fipsAwareInput, ok := runner.(v2.FIPSAwareInput) | ||
| if !ok { | ||
| // Input is not FIPS-aware; assume it's FIPS capable and proceed | ||
| // without error | ||
| return nil | ||
| } | ||
|
|
||
| if fipsAwareInput.IsFIPSCapable() { | ||
| // Input is FIPS-capable, proceed without error | ||
| return nil | ||
| } | ||
|
|
||
| return fmt.Errorf("running a FIPS-capable distribution but input %s is not FIPS capable", runner.String()) | ||
| } |
This file contains hidden or 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,28 @@ | ||
| // Licensed to Elasticsearch B.V. under one or more contributor | ||
| // license agreements. See the NOTICE file distributed with | ||
| // this work for additional information regarding copyright | ||
| // ownership. Elasticsearch B.V. licenses this file to you under | ||
| // the Apache License, Version 2.0 (the "License"); you may | ||
| // not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| //go:build !requirefips | ||
|
|
||
| package beater | ||
|
|
||
| import "github.com/elastic/beats/v7/libbeat/cfgfile" | ||
|
|
||
| func checkFIPSCapability(_ cfgfile.Runner) error { | ||
| // In non-FIPS builds, we assume all inputs are FIPS capable | ||
| // and proceed without error | ||
| return nil | ||
| } |
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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
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.
Uh oh!
There was an error while loading. Please reload this page.