Skip to content

[18.0-fr6] Set service_type in [keystone_authtoken] for access rule validation #1140

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

Open
openshift-cherrypick-robot wants to merge 1 commit into
base: 18.0-fr6
Choose a base branch
from
+7 −2
Open

[18.0-fr6] Set service_type in [keystone_authtoken] for access rule validation #1140

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
1 change: 1 addition & 0 deletions templates/nova/nova.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,7 @@ username = {{ .nova_keystone_user }}
password = {{ .nova_keystone_password }}
{{ end }}
region_name = {{ .openstack_region_name }}
service_type = compute
# This is part of hardening related to CVE-2023-2088
# https://docs.openstack.org/nova/latest/configuration/config.html#keystone_authtoken.service_token_roles_required
# when enabled the service token user must have the service role to be considered valid.
Expand Down
1 change: 1 addition & 0 deletions templates/placement/api/config/placement.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ project_name = service
region_name = {{ .Region }}
{{ end -}}
interface = internal
service_type = placement

[oslo_policy]
policy_file=/etc/placement/policy.yaml
3 changes: 2 additions & 1 deletion test/functional/nova/novaapi_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,10 +326,11 @@ endpoint_service_type = compute`))
cfg, err := ini.Load([]byte(configData))
Expect(err).ShouldNot(HaveOccurred(), "Should be able to parse config as INI")

// Verify region_name in [keystone_authtoken]
// Verify region_name and service_type in [keystone_authtoken]
section := cfg.Section("keystone_authtoken")
Expect(section).ShouldNot(BeNil(), "Should find [keystone_authtoken] section")
Expect(section.Key("region_name").String()).Should(Equal(testRegion))
Expect(section.Key("service_type").String()).Should(Equal("compute"))

// Verify region_name in [placement]
section = cfg.Section("placement")
Expand Down
4 changes: 3 additions & 1 deletion test/functional/placement/api_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,13 +372,15 @@ var _ = Describe("PlacementAPI controller", func() {
cm := th.GetSecret(names.ConfigMapName)
conf := string(cm.Data["placement.conf"])

// Verify region_name is set in [keystone_authtoken] section
// Verify region_name and service_type are set in [keystone_authtoken] section
// GetRegion() returns Status.Region, so check that
Expect(keystoneAPI.Status.Region).ToNot(BeEmpty(), "KeystoneAPI should have a region set in status")
// The region_name should appear in the [keystone_authtoken] section (before [oslo_policy])
Expect(conf).Should(
MatchRegexp(fmt.Sprintf(
`\[keystone_authtoken\][\s\S]*region_name = %s[\s\S]*\[oslo_policy\]`, keystoneAPI.Status.Region)))
Expect(conf).Should(
MatchRegexp(`\[keystone_authtoken\][\s\S]*service_type = placement[\s\S]*\[oslo_policy\]`))
})

It("creates service account, role and rolebindig", func() {
Expand Down
Loading