Skip to content

Revert "Allow Filebeat modules to be excluded from FIPS-capable artifacts" #45037

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.

Sign up for GitHub

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 1 commit into from
Jun 25, 2025
Merged

Revert "Allow Filebeat modules to be excluded from FIPS-capable artifacts" #45037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions filebeat/beater/crawler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,6 @@ func (c *crawler) startInput(
inputRunner.Once = c.once
}

if err := checkFIPSCapability(runner); err != nil {
return err
}

c.inputs[id] = runner

c.log.Infof("Starting input (ID: %d)", id)
Expand Down
43 changes: 0 additions & 43 deletions filebeat/beater/crawler_fips.go
View file
Open in desktop

This file was deleted.

76 changes: 0 additions & 76 deletions filebeat/beater/crawler_fips_test.go
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions filebeat/beater/crawler_nofips.go
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions filebeat/input/v2/compat/compat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,14 +229,3 @@ func (f *factory) generateCheckConfig(config *conf.C) (*conf.C, error) {

return testCfg, nil
}

// IsFIPSCapable returns true if the input is capable of running with
// FIPS-compliant algorithms; false, otherwise.
func (r *runner) IsFIPSCapable() bool {
if fipsAwareInput, ok := r.input.(v2.FIPSAwareInput); ok {
return fipsAwareInput.IsFIPSCapable()
}

// Input does not implement FIPSAwareInput, assume it is FIPS-capable
return true
}
9 changes: 0 additions & 9 deletions filebeat/input/v2/input-cursor/input.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,6 @@
return nil
}

// IsFIPSCapable returns true if the input is capable of running with
// FIPS-compliant algorithms; false, otherwise.
func (inp *managedInput) IsFIPSCapable() bool {
if fipsAware, ok := inp.input.(input.FIPSAwareInput); ok {
return fipsAware.IsFIPSCapable()
}
return true
}

func (inp *managedInput) testSource(ctx input.TestContext, source Source) (err error) {
defer func() {
if v := recover(); v != nil {
Expand Down Expand Up @@ -233,6 +224,6 @@
if n == 0 {
return
}
private[last].(*updateOp).Execute(n)

Check failure on line 227 in filebeat/input/v2/input-cursor/input.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest) 

Error return value is not checked (errcheck)
})
}
8 changes: 0 additions & 8 deletions filebeat/input/v2/input.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,6 @@ type Input interface {
Run(Context, beat.PipelineConnector) error
}

// FIPSAwareInput is able to report if it is FIPS capable or not. If a type does
// not implement this interface, that type will be considered to be FIPS capable.
type FIPSAwareInput interface {
// IsFIPSCapable returns true if the input is capable of running with
// FIPS-compliant algorithms; false, otherwise.
IsFIPSCapable() bool
}

// Context provides the Input Run function with common environmental
// information and services.
type Context struct {
Expand Down
Loading