-
Notifications
You must be signed in to change notification settings - Fork 4.8k
Add a new FIPS test #25362
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
Merged
Add a new FIPS test #25362
Changes from all commits
Commits
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| package security | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "strconv" | ||
| "strings" | ||
|
|
||
| g "github.com/onsi/ginkgo" | ||
| o "github.com/onsi/gomega" | ||
| exutil "github.com/openshift/origin/test/extended/util" | ||
| corev1 "k8s.io/api/core/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| clientcorev1 "k8s.io/client-go/kubernetes/typed/core/v1" | ||
| "sigs.k8s.io/yaml" | ||
| ) | ||
|
|
||
| const ( | ||
| installConfigName = "cluster-config-v1" | ||
| fipsFile = "/proc/sys/crypto/fips_enabled" | ||
| ) | ||
|
|
||
| // installConfig The subset of openshift-install's InstallConfig we parse for this test | ||
| type installConfig struct { | ||
| FIPS bool `json:"fips,omitempty"` | ||
| } | ||
|
|
||
| func installConfigFromCluster(client clientcorev1.ConfigMapsGetter) (*installConfig, error) { | ||
| cm, err := client.ConfigMaps("kube-system").Get(context.Background(), installConfigName, metav1.GetOptions{}) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| data, ok := cm.Data["install-config"] | ||
| if !ok { | ||
| return nil, fmt.Errorf("No install-config found in kube-system/%s", installConfigName) | ||
| } | ||
| config := &installConfig{} | ||
| if err := yaml.Unmarshal([]byte(data), config); err != nil { | ||
| return nil, err | ||
| } | ||
| return config, nil | ||
| } | ||
|
|
||
| func validateFIPSOnNode(oc *exutil.CLI, fipsExpected bool, node *corev1.Node) error { | ||
| command := []string{"cat", fipsFile} | ||
| out, err := exutil.ExecCommandOnMachineConfigDaemon(oc.AdminKubeClient(), oc, node, command) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| nodeFips, err := strconv.ParseBool(strings.TrimSuffix(string(out), "\n")) | ||
| if err != nil { | ||
| return fmt.Errorf("Error parsing %s on node %s: %v", fipsFile, node.Name, err) | ||
| } | ||
| if nodeFips != fipsExpected { | ||
| return fmt.Errorf("Expected FIPS state %v, found %v", fipsExpected, nodeFips) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| var _ = g.Describe("[sig-arch] [Conformance] FIPS", func() { | ||
| defer g.GinkgoRecover() | ||
| oc := exutil.NewCLI("fips") | ||
|
|
||
| g.It("TestFIPS", func() { | ||
| clusterAdminKubeClientset := oc.AdminKubeClient() | ||
| installConfig, err := installConfigFromCluster(clusterAdminKubeClientset.CoreV1()) | ||
| o.Expect(err).NotTo(o.HaveOccurred()) | ||
|
|
||
| // fetch one control plane and one worker, and validate FIPS state on it | ||
| masterNodes, err := clusterAdminKubeClientset.CoreV1().Nodes().List(context.Background(), metav1.ListOptions{ | ||
| LabelSelector: "node-role.kubernetes.io/master", | ||
| }) | ||
| o.Expect(err).NotTo(o.HaveOccurred()) | ||
| masterNode := &masterNodes.Items[0] | ||
| err = validateFIPSOnNode(oc, installConfig.FIPS, masterNode) | ||
| o.Expect(err).NotTo(o.HaveOccurred()) | ||
| workerNodes, err := clusterAdminKubeClientset.CoreV1().Nodes().List(context.Background(), metav1.ListOptions{ | ||
| LabelSelector: "node-role.kubernetes.io/worker", | ||
| }) | ||
| o.Expect(err).NotTo(o.HaveOccurred()) | ||
| if len(workerNodes.Items) > 0 { | ||
| workerNode := &workerNodes.Items[0] | ||
| err = validateFIPSOnNode(oc, installConfig.FIPS, workerNode) | ||
| o.Expect(err).NotTo(o.HaveOccurred()) | ||
| } | ||
| }) | ||
| }) | ||
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
2 changes: 2 additions & 0 deletions
2
test/extended/util/annotate/generated/zz_generated.annotations.go
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
don't read the install config to get FIPS enabled/disabled.
Use the machine config pool to figure out if FIPS is enabled using the rendered machine config and then use the target label from machine config pool to create a list of nodes to validate if the expected matched.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The thing is - that's what the MCO is already doing today. See previous discussion in openshift/release#10488
The intent of this test is to be a "triple check": if say there was a bug in the MCO that failed to get fips into the rendered machineconfig, this test would catch it.