-
Notifications
You must be signed in to change notification settings - Fork 529
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(fips): remove keystore subcommand and config handling
the keystore is providing obfuscation of data on disk by using an empty password by default. This fails in fips only mode with the following error: crypto/hmac: use of keys shorter than 112 bits is not allowed in FIPS 140-only mode Disable the keystore subcommand and do not try to create one when loading the config.
- Loading branch information
Showing
8 changed files
with
161 additions
and
48 deletions.
There are no files selected for viewing
This file contains 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 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 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,30 @@ | ||
| // 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 beatcmd | ||
|
|
||
| import ( | ||
| "github.com/elastic/elastic-agent-libs/config" | ||
| libkeystore "github.com/elastic/elastic-agent-libs/keystore" | ||
| ) | ||
|
|
||
| // loadKeystore returns the appropriate keystore based on the configuration. | ||
| func loadKeystore(cfg *config.C) (libkeystore.Keystore, error) { | ||
| return nil, nil | ||
| } |
This file contains 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,34 @@ | ||
| // 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 beatcmd | ||
|
|
||
| import ( | ||
| "github.com/elastic/beats/v7/libbeat/common" | ||
| "github.com/elastic/elastic-agent-libs/config" | ||
| libkeystore "github.com/elastic/elastic-agent-libs/keystore" | ||
| "github.com/elastic/elastic-agent-libs/paths" | ||
| ) | ||
|
|
||
| // loadKeystore returns the appropriate keystore based on the configuration. | ||
| func loadKeystore(cfg *config.C) (libkeystore.Keystore, error) { | ||
| keystoreCfg, _ := cfg.Child("keystore", -1) | ||
| defaultPathConfig := paths.Resolve(paths.Data, "apm-server.keystore") | ||
| return libkeystore.Factory(keystoreCfg, defaultPathConfig, common.IsStrictPerms()) | ||
| } |
This file contains 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,62 @@ | ||
| // 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. | ||
|
|
||
| package beatcmd | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
|
|
||
| "github.com/elastic/elastic-agent-libs/keystore" | ||
| ) | ||
|
|
||
| func TestLoadConfigKeystore(t *testing.T) { | ||
| initCfgfile(t, ` | ||
| apm-server: | ||
| auth.secret_token: ${APM_SECRET_TOKEN} | ||
| `) | ||
|
|
||
| cfg, _, _, err := LoadConfig(WithDisableConfigResolution()) | ||
| require.NoError(t, err) | ||
| assertConfigEqual(t, map[string]interface{}{ | ||
| "auth": map[string]interface{}{ | ||
| "secret_token": "${APM_SECRET_TOKEN}", | ||
| }, | ||
| }, cfg.APMServer) | ||
|
|
||
| cfg, _, ks, err := LoadConfig() | ||
| require.NoError(t, err) | ||
|
|
||
| err = cfg.APMServer.Unpack(new(map[string]interface{})) | ||
| require.Error(t, err) | ||
| assert.Contains(t, err.Error(), `missing field accessing 'apm-server.auth'`) | ||
|
|
||
| wks, err := keystore.AsWritableKeystore(ks) | ||
| require.NoError(t, err) | ||
| err = wks.Store("APM_SECRET_TOKEN", []byte("abc123")) | ||
| require.NoError(t, err) | ||
| err = wks.Save() | ||
| require.NoError(t, err) | ||
|
|
||
| assertConfigEqual(t, map[string]interface{}{ | ||
| "auth": map[string]interface{}{ | ||
| "secret_token": "abc123", | ||
| }, | ||
| }, cfg.APMServer) | ||
| } |
This file contains 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 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,24 @@ | ||
| // 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 beatcmd | ||
|
|
||
| import "github.com/spf13/cobra" | ||
|
|
||
| var keystoreCommand *cobra.Command = nil |
This file contains 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