diff --git a/jobs/cc_deployment_updater/spec b/jobs/cc_deployment_updater/spec index ae4c3152f3..35b3e730b2 100644 --- a/jobs/cc_deployment_updater/spec +++ b/jobs/cc_deployment_updater/spec @@ -58,6 +58,12 @@ consumes: optional: true properties: + cc.service_accounts.enabled: + description: Enable service account provisioning and runtime identity after compatible UAA, BBS, Diego and routing components are deployed. + default: false + cc.service_accounts.token_endpoint: + description: HTTPS UAA certificate-authenticated token endpoint exposed to bound workloads. + default: "" ccdb.databases: description: "Contains the name of the database on the database server" ccdb.roles: @@ -267,4 +273,3 @@ properties: description: "PEM-encoded certificate for secure, mutually authenticated TLS communication with prom_scraper" cc.prom_scraper_tls.private_key: description: "PEM-encoded key for secure, mutually authenticated TLS communication with prom_scraper" - diff --git a/jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb b/jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb index b8211663b5..22d583dcfb 100644 --- a/jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb +++ b/jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb @@ -20,6 +20,8 @@ %> --- +service_accounts_enabled: <%= p('cc.service_accounts.enabled') %> +service_account_token_endpoint: <%= p('cc.service_accounts.token_endpoint').to_json %> pid_filename: /var/vcap/sys/run/cc_deployment_updater/cc_deployment_updater.pid diff --git a/jobs/cloud_controller_clock/spec b/jobs/cloud_controller_clock/spec index b5745d9c8e..a60104c9b5 100644 --- a/jobs/cloud_controller_clock/spec +++ b/jobs/cloud_controller_clock/spec @@ -60,6 +60,12 @@ consumes: optional: true properties: + cc.service_accounts.enabled: + description: Enable service account provisioning and runtime identity after compatible UAA, BBS, Diego and routing components are deployed. + default: false + cc.service_accounts.token_endpoint: + description: HTTPS UAA certificate-authenticated token endpoint for account discovery. + default: "" ssl.skip_cert_verify: description: "specifies that the job is allowed to skip ssl cert verification" default: false diff --git a/jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb b/jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb index 650ef6a0b4..39755718d7 100644 --- a/jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb @@ -223,6 +223,9 @@ uaa: <% end %> # App staging parameters +service_accounts_enabled: <%= p('cc.service_accounts.enabled') %> +service_account_token_endpoint: <%= yaml_escape(p('cc.service_accounts.token_endpoint')) %> + staging: timeout_in_seconds: <%= p("cc.staging_timeout_in_seconds") %> auth: diff --git a/jobs/cloud_controller_ng/spec b/jobs/cloud_controller_ng/spec index ba7e1b0d25..77d60a9254 100644 --- a/jobs/cloud_controller_ng/spec +++ b/jobs/cloud_controller_ng/spec @@ -243,6 +243,15 @@ consumes: optional: true properties: + cc.service_accounts.creation_limit: + description: Foundation-wide maximum successful service account creations per non-admin authenticated principal over a rolling seven-day window. Platform admins are exempt; -1 means unlimited and 0 prevents non-admin creation. Deletion does not refund budget. + default: -1 + cc.service_accounts.enabled: + description: Enable service account provisioning and runtime identity after compatible UAA, BBS, Diego and routing components are deployed. + default: false + cc.service_accounts.token_endpoint: + description: HTTPS UAA certificate-authenticated token endpoint for account discovery. + default: "" ssl.skip_cert_verify: description: "specifies that the job is allowed to skip ssl cert verification" default: false diff --git a/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb b/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb index c7f69f1ca7..8dd0011965 100644 --- a/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb @@ -314,6 +314,10 @@ credential_references: interpolate_service_bindings: <%= p("cc.credential_references.interpolate_service_bindings") %> # App staging parameters +service_accounts_enabled: <%= p('cc.service_accounts.enabled') %> +service_account_creation_limit: <%= p('cc.service_accounts.creation_limit') %> +service_account_token_endpoint: <%= yaml_escape(p('cc.service_accounts.token_endpoint')) %> + staging: legacy_md5_buildpack_paths_enabled: <%= p("cc.legacy_md5_buildpack_paths_enabled") %> timeout_in_seconds: <%= p("cc.staging_timeout_in_seconds") %> diff --git a/jobs/cloud_controller_worker/spec b/jobs/cloud_controller_worker/spec index 855d6743db..3fc23a7e0a 100644 --- a/jobs/cloud_controller_worker/spec +++ b/jobs/cloud_controller_worker/spec @@ -68,6 +68,27 @@ consumes: optional: true properties: + cc.service_accounts.token_validity_in_seconds: + description: Positive managed service account access-token lifetime in seconds. Operators may select shorter or longer values; UAA must also cap issuance at the authenticating certificate expiry. Existing clients receive changes on their next provisioning or enable reconciliation; already issued tokens are unaffected. + default: 300 + cc.service_accounts.allowed_resources_ref: + description: Optional named UAA federation resource policy. Requires UAA named-resource-policy support; leave unset until available. + default: "" + cc.service_accounts.enabled: + description: Enable service account provisioning and runtime identity after compatible UAA, BBS, Diego and routing components are deployed. + default: false + cc.service_accounts.token_endpoint: + description: HTTPS UAA certificate-authenticated token endpoint exposed to bound workloads. + default: "" + cc.service_accounts.management_client_id: + description: Dedicated UAA client with managed account namespace client-management permissions. + default: "" + cc.service_accounts.management_client_secret: + description: Secret of the dedicated UAA account-management client; never exposed to workloads. + default: "" + cc.service_accounts.identity_ca_ref: + description: Required with provisioning. Name of a UAA trust bundle (uaa.mtls.trust_bundles) containing the instance identity CA, referenced by every account client. Rotate the CA by changing the bundle's contents in UAA; clients never change. + default: "" ssl.skip_cert_verify: description: "specifies that the job is allowed to skip ssl cert verification" default: false @@ -599,4 +620,3 @@ properties: when applying manifests. If a service broker fails to complete a service binding request before the specified duration, the manifest job will fail." default: 60 - diff --git a/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb b/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb index 01f66b3467..560bee6a94 100644 --- a/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb @@ -167,6 +167,25 @@ uaa: client_timeout: <%= cc_internal.p("cc.uaa.client_timeout")%> <% end %> +service_accounts_enabled: <%= p('cc.service_accounts.enabled') %> +service_account_token_endpoint: <%= yaml_escape(p('cc.service_accounts.token_endpoint')) %> +<% if p('cc.service_accounts.enabled') %> +<% + identity_ca_ref = p('cc.service_accounts.identity_ca_ref') + raise 'Set cc.service_accounts.identity_ca_ref to a UAA trust bundle name' if identity_ca_ref.to_s.strip.empty? + token_validity = p('cc.service_accounts.token_validity_in_seconds') + raise 'cc.service_accounts.token_validity_in_seconds must be a positive integer' unless token_validity.is_a?(Integer) && token_validity.positive? +%> +service_account_provisioning: + token_validity_in_seconds: <%= token_validity %> + client_id: <%= yaml_escape(p('cc.service_accounts.management_client_id')) %> + client_secret: <%= yaml_escape(p('cc.service_accounts.management_client_secret')) %> + identity_ca_ref: <%= identity_ca_ref.to_json %> +<% unless p('cc.service_accounts.allowed_resources_ref').empty? %> + allowed_resources_ref: <%= p('cc.service_accounts.allowed_resources_ref').to_json %> +<% end %> +<% end %> + # App staging parameters staging: timeout_in_seconds: <%= p("cc.staging_timeout_in_seconds") %> diff --git a/packages/cloud_controller_ng/packaging b/packages/cloud_controller_ng/packaging index 9344859f97..0d5b9b8a14 100644 --- a/packages/cloud_controller_ng/packaging +++ b/packages/cloud_controller_ng/packaging @@ -3,6 +3,9 @@ set -e -x # shellcheck disable=1090 source "${BOSH_PACKAGES_DIR:-/var/vcap/packages}/ruby-4.0/bosh/compile.env" cp -a * ${BOSH_INSTALL_TARGET} +# Archive-created parent directories may inherit a private build umask. +# The application is read by the unprivileged vcap runtime user. +chmod -R a+rX "${BOSH_INSTALL_TARGET}/cloud_controller_ng" cd ${BOSH_INSTALL_TARGET}/cloud_controller_ng mariadb_dir=/var/vcap/packages/mariadb_connector_c diff --git a/spec/cc_deployment_updater/cc_deployment_updater_spec.rb b/spec/cc_deployment_updater/cc_deployment_updater_spec.rb index ad61a5820c..12bccecef1 100644 --- a/spec/cc_deployment_updater/cc_deployment_updater_spec.rb +++ b/spec/cc_deployment_updater/cc_deployment_updater_spec.rb @@ -160,6 +160,20 @@ module Test let(:template) { job.template('config/cloud_controller_ng.yml') } + it 'renders the shared service-account activation and discovery settings' do + manifest_properties['cc']['service_accounts'] = { 'enabled' => true, 'token_endpoint' => 'https://uaa.example.test/oauth/mtls/token' } + result = YAML.safe_load(template.render(manifest_properties, consumes: links)) + expect(result['service_accounts_enabled']).to be(true) + expect(result['service_account_token_endpoint']).to eq('https://uaa.example.test/oauth/mtls/token') + expect(result).not_to have_key('service_account_provisioning') + expect(result).not_to have_key('service_account_runtime_contract_version') + end + + it 'disables service accounts by default' do + result = YAML.safe_load(template.render(manifest_properties, consumes: links)) + expect(result['service_accounts_enabled']).to be(false) + end + it 'creates the cloud_controller_ng.yml config file' do expect do YAML.safe_load(template.render(manifest_properties, consumes: links)) diff --git a/spec/cloud_controller_clock/cloud_controller_clock_spec.rb b/spec/cloud_controller_clock/cloud_controller_clock_spec.rb index 12c9e24361..9c52e580fa 100644 --- a/spec/cloud_controller_clock/cloud_controller_clock_spec.rb +++ b/spec/cloud_controller_clock/cloud_controller_clock_spec.rb @@ -118,6 +118,13 @@ module Test let(:template) { job.template('config/cloud_controller_ng.yml') } + it 'renders service account runtime discovery for clock-driven reconciliation' do + manifest_properties['cc']['service_accounts'] = { 'enabled' => true, 'token_endpoint' => 'https://uaa.example.test/oauth/token/mtls' } + result = YAML.safe_load(template.render(manifest_properties, consumes: links)) + expect(result['service_accounts_enabled']).to be(true) + expect(result['service_account_token_endpoint']).to eq('https://uaa.example.test/oauth/token/mtls') + end + it 'creates the cloud_controller_ng.yml config file' do expect do YAML.safe_load(template.render(manifest_properties, consumes: links)) diff --git a/spec/cloud_controller_ng/cloud_controller_ng_spec.rb b/spec/cloud_controller_ng/cloud_controller_ng_spec.rb index b1d749ef75..9285d54425 100644 --- a/spec/cloud_controller_ng/cloud_controller_ng_spec.rb +++ b/spec/cloud_controller_ng/cloud_controller_ng_spec.rb @@ -142,6 +142,38 @@ module Test describe 'config/cloud_controller_ng.yml' do let(:template) { job.template('config/cloud_controller_ng.yml') } + it 'renders an unlimited service account creation budget by default' do + result = YAML.safe_load(template.render(merged_manifest_properties, consumes: links)) + expect(result['service_account_creation_limit']).to eq(-1) + end + + it 'renders a single activation flag without contract versions' do + merged_manifest_properties['cc']['service_accounts'] = { 'enabled' => true } + result = YAML.safe_load(template.render(merged_manifest_properties, consumes: links)) + expect(result['service_accounts_enabled']).to be(true) + expect(result).not_to have_key('service_account_runtime_contract_version') + expect(result).not_to have_key('service_account_router_contract_version') + properties = YAML.safe_load(File.read(File.join(release_path, 'jobs/cloud_controller_ng/spec')))['properties'] + expect(properties).not_to have_key('cc.service_accounts.router_contract_version') + end + + it 'renders the foundation-wide non-admin service account creation budget' do + merged_manifest_properties['cc']['service_accounts'] = { 'creation_limit' => 25 } + result = YAML.safe_load(template.render(merged_manifest_properties, consumes: links)) + expect(result['service_account_creation_limit']).to eq(25) + end + + it 'renders explicit service account gates and discovery without exposing management credentials' do + merged_manifest_properties['cc']['service_accounts'] = { + 'enabled' => true, + 'token_endpoint' => 'https://uaa.example.test/oauth/token/mtls' + } + result = YAML.safe_load(template.render(merged_manifest_properties, consumes: links)) + expect(result['service_accounts_enabled']).to be(true) + expect(result['service_account_token_endpoint']).to eq('https://uaa.example.test/oauth/token/mtls') + expect(result).not_to have_key('service_account_provisioning') + end + it 'creates the cloud_controller_ng.yml config file' do expect do YAML.safe_load(template.render(merged_manifest_properties, consumes: links)) diff --git a/spec/cloud_controller_worker/cloud_controller_worker_spec.rb b/spec/cloud_controller_worker/cloud_controller_worker_spec.rb index 7927ea28ab..f8fb477081 100644 --- a/spec/cloud_controller_worker/cloud_controller_worker_spec.rb +++ b/spec/cloud_controller_worker/cloud_controller_worker_spec.rb @@ -128,6 +128,71 @@ module Test let(:template) { job.template('config/cloud_controller_ng.yml') } + it 'renders dedicated provisioning credentials and instance trust only when explicitly enabled' do + manifest_properties['cc']['service_accounts'] = { + 'enabled' => true, + 'management_client_id' => 'account-manager', + 'management_client_secret' => 'manager-secret', + 'identity_ca_ref' => 'diego-instance-identity', + 'token_endpoint' => 'https://uaa.example.test/oauth/token/mtls' + } + result = YAML.safe_load(template.render(manifest_properties, consumes: links)) + expect(result['service_account_provisioning']).to eq( + 'client_id' => 'account-manager', 'client_secret' => 'manager-secret', + 'identity_ca_ref' => 'diego-instance-identity', 'token_validity_in_seconds' => 300 + ) + expect(result['service_accounts_enabled']).to be(true) + expect(result['service_account_token_endpoint']).to eq('https://uaa.example.test/oauth/token/mtls') + end + + it 'renders operator token validity longer than the default' do + manifest_properties['cc']['service_accounts'] = { + 'enabled' => true, 'identity_ca_ref' => 'diego-instance-identity', + 'management_client_id' => 'account-manager', 'management_client_secret' => 'manager-secret', + 'token_validity_in_seconds' => 900 + } + result = YAML.safe_load(template.render(manifest_properties, consumes: links)) + expect(result.dig('service_account_provisioning', 'token_validity_in_seconds')).to eq(900) + end + + [0, -1, 1.5, '900'].each do |validity| + it "rejects invalid operator token validity #{validity.inspect}" do + manifest_properties['cc']['service_accounts'] = { + 'enabled' => true, 'identity_ca_ref' => 'diego-instance-identity', 'token_validity_in_seconds' => validity + } + expect { template.render(manifest_properties, consumes: links) }.to raise_error(/positive integer/) + end + end + + it 'refuses to render provisioning without a UAA trust bundle reference' do + manifest_properties['cc']['service_accounts'] = { + 'enabled' => true, + 'management_client_id' => 'account-manager', + 'management_client_secret' => 'manager-secret' + } + expect { template.render(manifest_properties, consumes: links) }.to raise_error(/Set cc.service_accounts.identity_ca_ref/) + end + + it 'renders an optional named federation resource policy for the worker only' do + manifest_properties['cc']['service_accounts'] = { + 'enabled' => true, 'identity_ca_ref' => 'diego-instance-identity', + 'management_client_id' => 'account-manager', 'management_client_secret' => 'manager-secret', + 'allowed_resources_ref' => 'cf-workload-federation' + } + result = YAML.safe_load(template.render(manifest_properties, consumes: links)) + expect(result.dig('service_account_provisioning', 'allowed_resources_ref')).to eq('cf-workload-federation') + end + + it 'no longer declares inline instance identity CA certificates' do + expect(YAML.safe_load(File.read(File.join(release_path, 'jobs/cloud_controller_worker/spec')))['properties']).not_to have_key('cc.service_accounts.identity_ca') + end + + it 'keeps service account runtime and provisioning disabled by default' do + result = YAML.safe_load(template.render(manifest_properties, consumes: links)) + expect(result['service_accounts_enabled']).to be(false) + expect(result).not_to have_key('service_account_provisioning') + end + it 'creates the cloud_controller_ng.yml config file' do expect do YAML.safe_load(template.render(manifest_properties, consumes: links)) diff --git a/src/cloud_controller_ng b/src/cloud_controller_ng index 3a4f0bc491..c2c0ea68c4 160000 --- a/src/cloud_controller_ng +++ b/src/cloud_controller_ng @@ -1 +1 @@ -Subproject commit 3a4f0bc49185f08feea8d8f9f5e821eb262f8968 +Subproject commit c2c0ea68c4eee80a80d93079f5c71775c86bb9a9