From 98e6416d3c9e6b7ce856a9ec083780bef35cb314 Mon Sep 17 00:00:00 2001 From: Wei Quan Date: Mon, 26 Oct 2026 13:13:46 +0100 Subject: [PATCH 1/2] Remove plain HTTP port 9022 and non-TLS code paths Removes the non-TLS (port 9022) endpoint and all associated code: - Delete GET /internal/v2/droplets/ endpoint (DownloadDropletsController) - Simplify DropletUrlGenerator to always emit mTLS/v4 URLs; drop external_port and mtls params - Switch LocalUrlGenerator from http_basic_auth_uri (port 9022) to https_no_auth_uri (tls_port) - Remove http_basic_auth_uri, http_no_auth_uri, build_http_uri from UrlGeneratorHelpers - Remove http_droplet_upload_url and http_buildpack_cache_upload_url from UploadUrlGenerator - Simplify StagingJobPresenter to always build the HTTPS/tls_port status URL; drop scheme param - Remove blobstore_external_port and mtls from blobstore URL generator connection options - Make external_port optional in worker/clock/deployment_updater schemas (api_schema retains it as required for the Puma process) - Update docs/internal/README.md: remove port 9022 listener row, fix SSH access routing, remove deprecated /internal/v2/droplets/ section --- .../internal/download_droplets_controller.rb | 14 +-- .../runtime/stagings_controller.rb | 4 +- app/presenters/api/staging_job_presenter.rb | 25 ++---- docs/internal/README.md | 26 ++---- .../blobstore/url_generator.rb | 4 +- .../url_generator/local_url_generator.rb | 8 +- .../url_generator/upload_url_generator.rb | 4 - .../url_generator/url_generator_helpers.rb | 18 ---- .../config_schemas/clock_schema.rb | 2 +- .../deployment_updater_schema.rb | 2 +- .../config_schemas/worker_schema.rb | 2 +- lib/cloud_controller/dependency_locator.rb | 8 +- .../diego/droplet_url_generator.rb | 26 +----- ...erify_old_lrps_can_download_assets_spec.rb | 13 --- .../download_droplets_controller_spec.rb | 86 ------------------- .../runtime/stagings_controller_spec.rb | 2 +- .../url_generator/local_url_generator_spec.rb | 34 ++++---- .../dependency_locator_spec.rb | 11 +-- .../diego/droplet_url_generator_spec.rb | 19 +--- .../api/staging_job_presenter_spec.rb | 28 +----- 20 files changed, 53 insertions(+), 283 deletions(-) diff --git a/app/controllers/internal/download_droplets_controller.rb b/app/controllers/internal/download_droplets_controller.rb index adaa75875ad..af89a7f0560 100644 --- a/app/controllers/internal/download_droplets_controller.rb +++ b/app/controllers/internal/download_droplets_controller.rb @@ -3,7 +3,7 @@ module VCAP::CloudController class DownloadDropletsController < RestController::BaseController def self.dependencies - %i[droplet_blobstore blobstore_url_generator missing_blob_handler blob_sender droplet_url_generator] + %i[droplet_blobstore blobstore_url_generator missing_blob_handler blob_sender] end include CloudController::Errors @@ -13,17 +13,6 @@ def self.dependencies attr_reader :blobstore - get '/internal/v2/droplets/:guid/:droplet_checksum/download', :download_droplet_http - - def download_droplet_http(guid, droplet_checksum) - if @droplet_url_generator.mtls - url = @droplet_url_generator.perma_droplet_download_url(guid, droplet_checksum) - redirect url - else - download_droplet(guid, droplet_checksum) - end - end - get '/internal/v4/droplets/:guid/:droplet_checksum/download', :download_droplet_mtls def download_droplet_mtls(guid, droplet_checksum) @@ -38,7 +27,6 @@ def inject_dependencies(dependencies) @blobstore_url_generator = dependencies.fetch(:blobstore_url_generator) @missing_blob_handler = dependencies.fetch(:missing_blob_handler) @blob_sender = dependencies.fetch(:blob_sender) - @droplet_url_generator = dependencies.fetch(:droplet_url_generator) end def check_app_exists(app, guid) diff --git a/app/controllers/runtime/stagings_controller.rb b/app/controllers/runtime/stagings_controller.rb index efd8fc05d9c..3d63cd219bb 100644 --- a/app/controllers/runtime/stagings_controller.rb +++ b/app/controllers/runtime/stagings_controller.rb @@ -25,7 +25,7 @@ def self.dependencies get '/internal/v4/staging_jobs/:guid', :find_job_mtls def find_job_mtls(guid) job = Delayed::Job[guid:] - StagingJobPresenter.new(job, 'https').to_json + StagingJobPresenter.new(job).to_json end get '/staging/packages/:guid', :download_package @@ -85,7 +85,7 @@ def download_v3_droplet(guid) post '/internal/v4/droplets/:guid/upload', :upload_package_droplet_mtls def upload_package_droplet_mtls(guid) job = upload_droplet(guid) - [HTTP::OK, StagingJobPresenter.new(job, 'https').to_json] + [HTTP::OK, StagingJobPresenter.new(job).to_json] end post '/internal/v4/buildpack_cache/:stack_name/:guid/upload', :upload_v3_app_buildpack_cache diff --git a/app/presenters/api/staging_job_presenter.rb b/app/presenters/api/staging_job_presenter.rb index 549bfdd3cbd..243b6b577c6 100644 --- a/app/presenters/api/staging_job_presenter.rb +++ b/app/presenters/api/staging_job_presenter.rb @@ -1,28 +1,13 @@ require_relative 'job_presenter' class StagingJobPresenter < JobPresenter - def initialize(job, scheme) - @scheme = scheme - super(job) - end - def status_url config = VCAP::CloudController::Config.config - if @scheme == 'https' - URI::HTTPS.build( - host: config.get(:internal_service_hostname), - port: config.get(:tls_port), - path: "/internal/v4/staging_jobs/#{@object.guid}" - ).to_s - else - uri = URI::HTTP.build( - host: config.get(:internal_service_hostname), - port: config.get(:external_port), - path: "/staging/jobs/#{@object.guid}" - ) - uri.userinfo = [config.get(:staging, :auth, :user), CGI.escape(config.get(:staging, :auth, :password))] - uri.to_s - end + URI::HTTPS.build( + host: config.get(:internal_service_hostname), + port: config.get(:tls_port), + path: "/internal/v4/staging_jobs/#{@object.guid}" + ).to_s end end diff --git a/docs/internal/README.md b/docs/internal/README.md index bb80d14e9f9..6282b66e262 100644 --- a/docs/internal/README.md +++ b/docs/internal/README.md @@ -14,16 +14,15 @@ In capi-release, nginx (`jobs/cloud_controller_ng/templates/nginx.conf.erb`) fro |----------|--------------------|------|--------| | mTLS internal | `cc.tls_port` (9023) | mTLS (`ssl_verify_client on`) | `/internal/v4/`, `/internal/v5/`, staging completion + upload regexes | | Public TLS | `cc.public_tls.port` (9024) | in-app (OAuth) | All public API routes; `/internal/v...` is 403'd here | -| Public non-TLS | `cc.external_port` (9022) | in-app (OAuth) | Same route set as the public TLS listener | | Metrics mTLS | `cc.prom_metrics_server_tls_port` (9025) | mTLS (separate cert) | `/internal/v4/metrics` only | | Status | `9021` (hardcoded) | none (loopback) | `/internal/v4/status` health check only | -The two public listeners (9024 and 9022) serve identical routes, differing only in TLS. Gorouter registers both for the `api` route but **prefers `tls_port` (9024)** ([route_registrar spec](https://github.com/cloudfoundry/routing-release/blob/develop/jobs/route_registrar/spec)), so external traffic lands on 9024; 9022 exists for on-VM plain-HTTP callers (e.g. BBR probes) and can be disabled via `temporary_disable_non_tls_endpoints`. +The public TLS listener (9024) serves all public API routes. Gorouter registers it for the `api` route. Auth mechanisms below: - **mTLS** — Served on the mTLS internal listener (or the metrics listener for `/internal/v4/metrics`). An `/internal/*` path does not by itself imply mTLS — `ssh_access` is OAuth on the public listener, and `log_access` is mTLS **plus** an in-app OAuth check. -- **OAuth** — CC validates the UAA token's scope in-app; served on the public listeners. +- **OAuth** — CC validates the UAA token's scope in-app; served on the public TLS listener. ## Endpoints @@ -41,9 +40,9 @@ Auth mechanisms below: **Intended Consumer:** SSH Proxy -**Auth Mechanism:** mTLS and OAuth. The endpoint is served on the mutual-TLS listener (`cc.tls_port`, default `9023`), where the SSH Proxy authenticates with a client certificate. For backwards compatibility it also remains available over OAuth on the public listeners (`cc.external_port`, default `9022`, and `cc.public_tls.port`, default `9024`). +**Auth Mechanism:** mTLS and OAuth. The SSH Proxy authenticates with a client certificate on the mTLS listener (`cc.tls_port`, default `9023`). The path `/internal/apps/...` does not match the public listener's `/internal/v` forbid rule, so it is also reachable on the public TLS listener (`cc.public_tls.port`, default `9024`) via OAuth. -**Routing:** Public listeners (`cc.public_tls.port` 9024; also `cc.external_port` 9022). The path `/internal/apps/...` does not match the public listener's `/internal/v` forbid rule, so it is proxied to CC and authenticated in-app. +**Routing:** mTLS internal listener (`cc.tls_port`, 9023) and public TLS listener (`cc.public_tls.port`, 9024). ### GET /internal/v4/droplets/:guid/:droplet_checksum/download **Description:** Permalink for downloading a droplet. @@ -153,26 +152,13 @@ Auth mechanisms below: **Routing:** mTLS internal listener (`cc.tls_port`, 9023) -## Deprecated endpoints - -These endpoints are deprecated and have no known live consumer. They are removal candidates. - -### GET /internal/v2/droplets/:guid/:droplet_checksum/download -**Description:** (Deprecated) Non-mTLS (HTTP) permalink for downloading a droplet. Use `GET /internal/v4/droplets/:guid/:droplet_checksum/download` instead. **No live consumer, and effectively unreachable through nginx** — CC only generates this URL when `tls_port` is blank (never in a standard deploy, so it always emits the v4/mTLS URL instead). Even if generated, the path is `/internal/v2/droplets/...` on `external_port` (plain HTTP), which every nginx listener rejects: the public listeners 403 any `/internal/v` path, and the mTLS listener has no matching `location` (404). - -**Intended Consumer:** Diego running task or process (historical) - -**Auth Mechanism:** None enforced at the nginx layer — this is the plain-HTTP (non-mTLS) branch of the droplet URL generator (built with `external_port`). Contrast the v4 permalink, which is the HTTPS/mTLS path. - -**Routing:** No nginx listener serves this path (public listeners 403 `/internal/v`; mTLS listener has no matching location). Reachable only by bypassing nginx and hitting the CC app socket directly. - ## Endpoints for local dev These endpoints are only used when CC is configured with `blobstore_type: local` or `local-temp-storage`, i.e. local development setups. They are **not routed in BOSH deployments**: capi-release does not emit a `location /staging/` nginx routing block, so `/staging/*` paths return 404 from the nginx catch-all. In any standard BOSH deployment, `storage-cli` is used and Diego fetches blobs via signed URLs directly from the blobstore, never calling these endpoints. ### Auth: Staging basic auth -Enforced in-app by a Sinatra `before '/staging/*'` filter on the public listeners. The credentials are configured via `staging.auth.user` / `staging.auth.password` in the CC config (populated from `cc.staging_upload_user` / `cc.staging_upload_password` BOSH properties in local dev). In BOSH deployments, capi-release no longer renders these properties and the endpoints are not nginx-routed. +Enforced in-app by a Sinatra `before '/staging/*'` filter on the public TLS listener. The credentials are configured via `staging.auth.user` / `staging.auth.password` in the CC config (populated from `cc.staging_upload_user` / `cc.staging_upload_password` BOSH properties in local dev). In BOSH deployments, capi-release no longer renders these properties and the endpoints are not nginx-routed. ### GET /v2/buildpacks/:guid/download **Description:** Download a buildpack file. This is a `/v2` public-namespace path, its `download` action is exempt from user OAuth and gated by staging basic auth instead. @@ -181,7 +167,7 @@ Enforced in-app by a Sinatra `before '/staging/*'` filter on the public listener **Auth Mechanism:** Staging basic auth -**Routing:** Public listeners (`cc.public_tls.port` 9024; also `cc.external_port` 9022) via `location /v2/` (when `cc.temporary_enable_v2` is true). Not called in BOSH deployments. +**Routing:** Public TLS listener (`cc.public_tls.port`, 9024) via `location /v2/` (when `cc.temporary_enable_v2` is true). Not called in BOSH deployments. ### GET /staging/packages/:guid **Description:** Download a package from the local blobstore. diff --git a/lib/cloud_controller/blobstore/url_generator.rb b/lib/cloud_controller/blobstore/url_generator.rb index 22277003db4..b0862d03009 100644 --- a/lib/cloud_controller/blobstore/url_generator.rb +++ b/lib/cloud_controller/blobstore/url_generator.rb @@ -55,9 +55,7 @@ def droplet_download_url(droplet) def_delegators :@upload_url_generator, :droplet_upload_url, :package_droplet_upload_url, - :buildpack_cache_upload_url, - :http_droplet_upload_url, - :http_buildpack_cache_upload_url + :buildpack_cache_upload_url end end end diff --git a/lib/cloud_controller/blobstore/url_generator/local_url_generator.rb b/lib/cloud_controller/blobstore/url_generator/local_url_generator.rb index 23dbbefe360..6aff4e141d4 100644 --- a/lib/cloud_controller/blobstore/url_generator/local_url_generator.rb +++ b/lib/cloud_controller/blobstore/url_generator/local_url_generator.rb @@ -17,19 +17,19 @@ def initialize(blobstore_options, package_blobstore, buildpack_cache_blobstore, def package_download_url(package) return nil unless @package_blobstore.exists?(package.guid) - http_basic_auth_uri("/staging/packages/#{package.guid}") + https_no_auth_uri("/staging/packages/#{package.guid}") end def buildpack_cache_download_url(app_guid, stack) return nil unless @buildpack_cache_blobstore.exists?("#{app_guid}/#{stack}") - http_basic_auth_uri("/staging/v3/buildpack_cache/#{stack}/#{app_guid}/download") + https_no_auth_uri("/staging/v3/buildpack_cache/#{stack}/#{app_guid}/download") end def admin_buildpack_download_url(buildpack) return nil unless @admin_buildpack_blobstore.exists?(buildpack.key) - http_basic_auth_uri("/v2/buildpacks/#{buildpack.guid}/download") + https_no_auth_uri("/v2/buildpacks/#{buildpack.guid}/download") end def droplet_download_url(droplet) @@ -43,7 +43,7 @@ def droplet_download_url(droplet) return nil end - http_basic_auth_uri("/staging/v3/droplets/#{droplet.guid}/download") + https_no_auth_uri("/staging/v3/droplets/#{droplet.guid}/download") end private diff --git a/lib/cloud_controller/blobstore/url_generator/upload_url_generator.rb b/lib/cloud_controller/blobstore/url_generator/upload_url_generator.rb index 26e8fb8d217..61cc0dd3f56 100644 --- a/lib/cloud_controller/blobstore/url_generator/upload_url_generator.rb +++ b/lib/cloud_controller/blobstore/url_generator/upload_url_generator.rb @@ -16,10 +16,6 @@ def droplet_upload_url(droplet_guid) def buildpack_cache_upload_url(app_guid, stack) https_no_auth_uri("/internal/v4/buildpack_cache/#{stack}/#{app_guid}/upload") end - - def http_droplet_upload_url(droplet_guid) - http_basic_auth_uri("/staging/v3/droplets/#{droplet_guid}/upload") - end end end end diff --git a/lib/cloud_controller/blobstore/url_generator/url_generator_helpers.rb b/lib/cloud_controller/blobstore/url_generator/url_generator_helpers.rb index 3d6e34f5232..9a26183b790 100644 --- a/lib/cloud_controller/blobstore/url_generator/url_generator_helpers.rb +++ b/lib/cloud_controller/blobstore/url_generator/url_generator_helpers.rb @@ -1,30 +1,12 @@ module CloudController module Blobstore module UrlGeneratorHelpers - def http_basic_auth_uri(path) - uri = build_http_uri(path) - uri.userinfo = [@blobstore_options[:user], @blobstore_options[:password]] - uri.to_s - end - - def http_no_auth_uri(path) - build_http_uri(path).to_s - end - def https_no_auth_uri(path) build_https_uri(path).to_s end private - def build_http_uri(path) - URI::HTTP.build( - host: @blobstore_options[:blobstore_host], - port: @blobstore_options[:blobstore_external_port], - path: path - ) - end - def build_https_uri(path) URI::HTTPS.build( host: @blobstore_options[:blobstore_host], diff --git a/lib/cloud_controller/config_schemas/clock_schema.rb b/lib/cloud_controller/config_schemas/clock_schema.rb index 79c8de01bee..f93c8be28b7 100644 --- a/lib/cloud_controller/config_schemas/clock_schema.rb +++ b/lib/cloud_controller/config_schemas/clock_schema.rb @@ -6,7 +6,7 @@ class ClockSchema < VCAP::Config # rubocop:disable Metrics/BlockLength define_schema do { - external_port: Integer, + optional(:external_port) => Integer, external_domain: String, tls_port: Integer, external_protocol: String, diff --git a/lib/cloud_controller/config_schemas/deployment_updater_schema.rb b/lib/cloud_controller/config_schemas/deployment_updater_schema.rb index 11814cea8f0..64c29cd6284 100644 --- a/lib/cloud_controller/config_schemas/deployment_updater_schema.rb +++ b/lib/cloud_controller/config_schemas/deployment_updater_schema.rb @@ -40,7 +40,7 @@ class DeploymentUpdaterSchema < VCAP::Config index: Integer, # Component index (cc-0, cc-1, etc) name: String, # Component name (api_z1, api_z2) - external_port: Integer, + optional(:external_port) => Integer, tls_port: Integer, internal_service_hostname: String, external_domain: String, diff --git a/lib/cloud_controller/config_schemas/worker_schema.rb b/lib/cloud_controller/config_schemas/worker_schema.rb index c60807a5f75..5f7c038a466 100644 --- a/lib/cloud_controller/config_schemas/worker_schema.rb +++ b/lib/cloud_controller/config_schemas/worker_schema.rb @@ -6,7 +6,7 @@ class WorkerSchema < VCAP::Config # rubocop:disable Metrics/BlockLength define_schema do { - external_port: Integer, + optional(:external_port) => Integer, external_domain: String, system_hostnames: [String], system_domain: String, diff --git a/lib/cloud_controller/dependency_locator.rb b/lib/cloud_controller/dependency_locator.rb index 1f1ebf5aaaf..6d6a9a46d1f 100644 --- a/lib/cloud_controller/dependency_locator.rb +++ b/lib/cloud_controller/dependency_locator.rb @@ -207,11 +207,9 @@ def buildpack_blobstore def blobstore_url_generator connection_options = { blobstore_host: config.get(:internal_service_hostname), - blobstore_external_port: config.get(:external_port), blobstore_tls_port: config.get(:tls_port), user: config.get(:staging, :auth, :user), - password: config.get(:staging, :auth, :password), - mtls: !!config.get(:tls_port) + password: config.get(:staging, :auth, :password) } Blobstore::UrlGenerator.new( @@ -226,9 +224,7 @@ def blobstore_url_generator def droplet_url_generator VCAP::CloudController::Diego::DropletUrlGenerator.new( internal_service_hostname: config.get(:internal_service_hostname), - external_port: config.get(:external_port), - tls_port: config.get(:tls_port), - mtls: !!config.get(:tls_port) + tls_port: config.get(:tls_port) ) end diff --git a/lib/cloud_controller/diego/droplet_url_generator.rb b/lib/cloud_controller/diego/droplet_url_generator.rb index bf1e995bdbb..97e74c4a750 100644 --- a/lib/cloud_controller/diego/droplet_url_generator.rb +++ b/lib/cloud_controller/diego/droplet_url_generator.rb @@ -1,40 +1,20 @@ module VCAP::CloudController module Diego class DropletUrlGenerator - def initialize(internal_service_hostname:, external_port:, tls_port:, mtls:) + def initialize(internal_service_hostname:, tls_port:) @internal_service_hostname = internal_service_hostname - @external_port = external_port @tls_port = tls_port - @mtls = mtls end - attr_reader :internal_service_hostname, :external_port, :tls_port, :mtls + attr_reader :internal_service_hostname, :tls_port def perma_droplet_download_url(app_guid, droplet_checksum) return nil unless droplet_checksum - if mtls - build_https_url(app_guid, droplet_checksum) - else - build_http_url(app_guid, droplet_checksum) - end - end - - private - - def build_https_url(guid, droplet_checksum) URI::HTTPS.build( host: internal_service_hostname, port: tls_port, - path: "/internal/v4/droplets/#{guid}/#{droplet_checksum}/download" - ).to_s - end - - def build_http_url(guid, droplet_checksum) - URI::HTTP.build( - host: internal_service_hostname, - port: external_port, - path: "/internal/v2/droplets/#{guid}/#{droplet_checksum}/download" + path: "/internal/v4/droplets/#{app_guid}/#{droplet_checksum}/download" ).to_s end end diff --git a/spec/request/knowledge_bombs/verify_old_lrps_can_download_assets_spec.rb b/spec/request/knowledge_bombs/verify_old_lrps_can_download_assets_spec.rb index 3f9e33e874a..517b1cb010e 100644 --- a/spec/request/knowledge_bombs/verify_old_lrps_can_download_assets_spec.rb +++ b/spec/request/knowledge_bombs/verify_old_lrps_can_download_assets_spec.rb @@ -47,16 +47,3 @@ end end end - -RSpec.describe 'DropletsController download endpoint with checksum exists:' do - describe 'GET /internal/v2/droplets/:guid/:droplet_hash/download' do - let(:droplet) { create(:droplet_model) } - - context 'when an lrp tries to download a droplet' do - it 'does not return a 404 because the endpoint is still present, and redirects to the droplet-url' do - get "/internal/v2/droplets/#{droplet.guid}/#{droplet.sha256_checksum}/download", nil, {} - expect(last_response.status).to eq(302) - end - end - end -end diff --git a/spec/unit/controllers/internal/download_droplets_controller_spec.rb b/spec/unit/controllers/internal/download_droplets_controller_spec.rb index 792ddfd3b0b..d8abe12554b 100644 --- a/spec/unit/controllers/internal/download_droplets_controller_spec.rb +++ b/spec/unit/controllers/internal/download_droplets_controller_spec.rb @@ -4,92 +4,6 @@ module VCAP::CloudController RSpec.describe DownloadDropletsController do - describe 'GET /internal/v2/droplets/:guid/:droplet_hash/download' do - let(:workspace) { Dir.mktmpdir } - let(:original_staging_config) do - { - packages: { - blobstore_type: 'local', - local_blobstore_path: Dir.mktmpdir('packages', workspace), - app_package_directory_key: 'cc-packages' - }, - droplets: { - droplet_directory_key: 'cc-droplets', - blobstore_type: 'local', - local_blobstore_path: Dir.mktmpdir('droplets', workspace) - } - } - end - let(:staging_config) { original_staging_config } - let(:blobstore) do - CloudController::DependencyLocator.instance.droplet_blobstore - end - - let(:v3_app) { create(:app_model, droplet:) } - let(:process) { create(:process_model, app: v3_app) } - let(:droplet) { create(:droplet_model, state: 'STAGED') } - - before do - TestConfig.override(**staging_config) - end - - after { FileUtils.rm_rf(workspace) } - - def get_and_redirect(url) - get url - expect(last_response.status).to eq(302) - get last_response.headers['Location'] - end - - def upload_droplet - droplet_file = Tempfile.new(v3_app.guid) - droplet_file.write('droplet contents') - droplet_file.close - - Jobs::V3::DropletUpload.new(droplet_file.path, droplet.guid, skip_state_transition: false).perform - end - - describe 'blobstore_url_generator' do - let(:hostname) { Config.config.get(:internal_service_hostname) } - let(:tls_port) { Config.config.get(:tls_port) } - let(:expected_redirect) { "https://#{hostname}:#{tls_port}/internal/v4/droplets/#{process.guid}/#{process.droplet_checksum}/download" } - - it 'redirects to the url provided by the blobstore_url_generator' do - upload_droplet - get "/internal/v2/droplets/#{process.guid}/#{process.droplet_checksum}/download" - - expect(last_response).to be_redirect - expect(last_response.headers['Location']).to eq(expected_redirect) - end - end - - context 'with a valid app but no droplet in the blobstore' do - before do - droplet.update(droplet_hash: 'not-in-blobstore') - end - - it 'raises an error' do - get_and_redirect "/internal/v2/droplets/#{process.guid}/#{process.droplet_checksum}/download" - expect(last_response.status).to eq(400) - expect(decoded_response['description']).to eq("Staging error: droplet not found for #{process.guid}") - end - end - - context 'with an invalid droplet_hash' do - it 'returns an error' do - get_and_redirect "/internal/v2/droplets/#{process.guid}/bogus/download" - expect(last_response.status).to eq(404) - end - end - - context 'with an invalid app' do - it 'returns an error' do - get_and_redirect '/internal/v2/droplets/bad/bogus/download' - expect(last_response.status).to eq(404) - end - end - end - describe 'GET /internal/v4/droplets/:guid/:droplet_hash/download' do let(:workspace) { Dir.mktmpdir } let(:original_staging_config) do diff --git a/spec/unit/controllers/runtime/stagings_controller_spec.rb b/spec/unit/controllers/runtime/stagings_controller_spec.rb index 42ba60c1d42..892c6a227a5 100644 --- a/spec/unit/controllers/runtime/stagings_controller_spec.rb +++ b/spec/unit/controllers/runtime/stagings_controller_spec.rb @@ -254,7 +254,7 @@ module VCAP::CloudController get "/internal/v4/staging_jobs/#{job_guid}" expect(last_response.status).to eq(200) - expect(decoded_response(symbol_keys: true)).to eq(StagingJobPresenter.new(job, 'https').to_hash) + expect(decoded_response(symbol_keys: true)).to eq(StagingJobPresenter.new(job).to_hash) expect(decoded_response['metadata']['guid']).to eq(job_guid) end end diff --git a/spec/unit/lib/cloud_controller/blobstore/url_generator/local_url_generator_spec.rb b/spec/unit/lib/cloud_controller/blobstore/url_generator/local_url_generator_spec.rb index bd605a13219..5e467fe88da 100644 --- a/spec/unit/lib/cloud_controller/blobstore/url_generator/local_url_generator_spec.rb +++ b/spec/unit/lib/cloud_controller/blobstore/url_generator/local_url_generator_spec.rb @@ -5,12 +5,10 @@ module CloudController module Blobstore RSpec.describe LocalUrlGenerator do let(:blobstore_host) { 'api.example.com' } - let(:external_port) { 9292 } let(:tls_port) { 9293 } let(:connection_options) do { blobstore_host: blobstore_host, - blobstore_external_port: external_port, blobstore_tls_port: tls_port, user: username, password: password @@ -36,12 +34,12 @@ module Blobstore describe 'admin buildpacks' do let(:buildpack) { create(:buildpack) } - it 'gives a local URI to the blobstore host/port' do + it 'gives an HTTPS URI to the blobstore host/port' do uri = URI.parse(url_generator.admin_buildpack_download_url(buildpack)) + expect(uri.scheme).to eql 'https' expect(uri.host).to eql blobstore_host - expect(uri.port).to eql external_port - expect(uri.user).to eql 'username' - expect(uri.password).to eql 'password' + expect(uri.port).to eql tls_port + expect(uri.user).to be_nil expect(uri.path).to eql "/v2/buildpacks/#{buildpack.guid}/download" end @@ -58,12 +56,12 @@ module Blobstore let(:app_model) { double(:app_model, guid: Sham.guid) } let(:stack) { Sham.name } - it 'gives a local URI to the blobstore host/port' do + it 'gives an HTTPS URI to the blobstore host/port' do uri = URI.parse(url_generator.buildpack_cache_download_url(app_model.guid, stack)) + expect(uri.scheme).to eql 'https' expect(uri.host).to eql blobstore_host - expect(uri.port).to eql external_port - expect(uri.user).to eql 'username' - expect(uri.password).to eql 'password' + expect(uri.port).to eql tls_port + expect(uri.user).to be_nil expect(uri.path).to eql "/staging/v3/buildpack_cache/#{stack}/#{app_model.guid}/download" end @@ -79,12 +77,12 @@ module Blobstore describe 'droplet downloads' do let(:droplet) { create(:droplet_model) } - it 'returns a url to cloud controller' do + it 'returns an HTTPS url to cloud controller' do uri = URI.parse(url_generator.droplet_download_url(droplet)) + expect(uri.scheme).to eql 'https' expect(uri.host).to eql blobstore_host - expect(uri.port).to eql external_port - expect(uri.user).to eql 'username' - expect(uri.password).to eql 'password' + expect(uri.port).to eql tls_port + expect(uri.user).to be_nil expect(uri.path).to eql "/staging/v3/droplets/#{droplet.guid}/download" end @@ -105,12 +103,12 @@ module Blobstore describe 'package' do let(:package) { create(:package_model) } - it 'gives a local URI to the blobstore host/port' do + it 'gives an HTTPS URI to the blobstore host/port' do uri = URI.parse(url_generator.package_download_url(package)) + expect(uri.scheme).to eql 'https' expect(uri.host).to eql blobstore_host - expect(uri.port).to eql external_port - expect(uri.user).to eql 'username' - expect(uri.password).to eql 'password' + expect(uri.port).to eql tls_port + expect(uri.user).to be_nil expect(uri.path).to eql "/staging/packages/#{package.guid}" end diff --git a/spec/unit/lib/cloud_controller/dependency_locator_spec.rb b/spec/unit/lib/cloud_controller/dependency_locator_spec.rb index 1dae32ec4db..657acf2563e 100644 --- a/spec/unit/lib/cloud_controller/dependency_locator_spec.rb +++ b/spec/unit/lib/cloud_controller/dependency_locator_spec.rb @@ -131,11 +131,9 @@ it 'creates blobstore_url_generator with the internal_service_hostname, port, and blobstores' do connection_options = { blobstore_host: 'internal.service.hostname', - blobstore_external_port: 8181, blobstore_tls_port: 8283, user: 'username', - password: 'password', - mtls: true + password: 'password' } expect(CloudController::Blobstore::UrlGenerator).to receive(:new). with(hash_including(connection_options), @@ -159,14 +157,11 @@ TestConfig.override(**my_config) end - it 'creates droplet_url_generator with the internal_service_hostname, ports, and diego flag' do + it 'creates droplet_url_generator with the internal_service_hostname and tls_port' do expect(VCAP::CloudController::Diego::DropletUrlGenerator).to receive(:new).with( internal_service_hostname: 'internal.service.hostname', - external_port: nil, - tls_port: 8283, - mtls: true + tls_port: 8283 ) - TestConfig.config.delete(:external_port) locator.droplet_url_generator end end diff --git a/spec/unit/lib/cloud_controller/diego/droplet_url_generator_spec.rb b/spec/unit/lib/cloud_controller/diego/droplet_url_generator_spec.rb index b9764de77e9..dad799b61a0 100644 --- a/spec/unit/lib/cloud_controller/diego/droplet_url_generator_spec.rb +++ b/spec/unit/lib/cloud_controller/diego/droplet_url_generator_spec.rb @@ -5,16 +5,12 @@ module VCAP::CloudController module Diego RSpec.describe DropletUrlGenerator do let(:hostname) { 'api.internal.cf' } - let(:external_port) { 8181 } let(:tls_port) { 8182 } - let(:mtls) { false } subject(:generator) do DropletUrlGenerator.new( internal_service_hostname: hostname, - external_port: external_port, - tls_port: tls_port, - mtls: mtls + tls_port: tls_port ) end @@ -22,8 +18,8 @@ module Diego let(:app_guid) { 'random-guid' } let(:droplet_checksum) { '12345' } - it 'gives out a url to the cloud controller' do - download_url = "http://api.internal.cf:8181/internal/v2/droplets/#{app_guid}/#{droplet_checksum}/download" + it 'gives out an mTLS url to the cloud controller' do + download_url = "https://api.internal.cf:8182/internal/v4/droplets/#{app_guid}/#{droplet_checksum}/download" expect(generator.perma_droplet_download_url(app_guid, droplet_checksum)).to eql(download_url) end @@ -32,15 +28,6 @@ module Diego expect(generator.perma_droplet_download_url(app_guid, nil)).to be_nil end end - - context 'when mTLS is enabled' do - let(:mtls) { true } - - it 'gives out a url to the cloud controller using mTLS' do - download_url = "https://api.internal.cf:8182/internal/v4/droplets/#{app_guid}/#{droplet_checksum}/download" - expect(generator.perma_droplet_download_url(app_guid, droplet_checksum)).to eql(download_url) - end - end end end end diff --git a/spec/unit/presenters/api/staging_job_presenter_spec.rb b/spec/unit/presenters/api/staging_job_presenter_spec.rb index c0d2ab05cca..97378a85785 100644 --- a/spec/unit/presenters/api/staging_job_presenter_spec.rb +++ b/spec/unit/presenters/api/staging_job_presenter_spec.rb @@ -9,14 +9,12 @@ job end - let(:user) { TestConfig.config[:staging][:auth][:user] } - let(:password) { TestConfig.config[:staging][:auth][:password] } let(:expected_polling_url) do - "http://#{user}:#{CGI.escape(password)}@#{TestConfig.config[:internal_service_hostname]}:#{TestConfig.config[:external_port]}/staging/jobs/#{job.guid}" + "https://#{TestConfig.config[:internal_service_hostname]}:#{TestConfig.config[:tls_port]}/internal/v4/staging_jobs/#{job.guid}" end - it 'creates a valid JSON with the http internal URL' do - expect(StagingJobPresenter.new(job, 'http').to_hash).to eq( + it 'creates a valid JSON with the https internal URL' do + expect(StagingJobPresenter.new(job).to_hash).to eq( metadata: { guid: job.guid, created_at: job.created_at.iso8601, @@ -28,25 +26,5 @@ } ) end - - context 'when it talks over mtls' do - let(:expected_polling_url) do - "https://#{TestConfig.config[:internal_service_hostname]}:#{TestConfig.config[:tls_port]}/internal/v4/staging_jobs/#{job.guid}" - end - - it 'creates a valid JSON with the https internal URL' do - expect(StagingJobPresenter.new(job, 'https').to_hash).to eq( - metadata: { - guid: job.guid, - created_at: job.created_at.iso8601, - url: expected_polling_url - }, - entity: { - guid: job.guid, - status: 'queued' - } - ) - end - end end end From 925958dece59cd090563d59f8c546ce5f83cad83 Mon Sep 17 00:00:00 2001 From: Wei Quan Date: Mon, 26 Oct 2026 14:52:46 +0100 Subject: [PATCH 2/2] Fix local blobstore staging URLs to use HTTPS with basic auth LocalUrlGenerator was switched to https_no_auth_uri (no credentials), but the staging endpoints it targets (/staging/*, /v2/buildpacks/*/download) still enforce basic auth in-app. Diego passes these URLs directly to DownloadAction/CachedDependency without adding credentials, so unauthenticated URLs would 401 on every local-blobstore staging fetch. Add https_basic_auth_uri to UrlGeneratorHelpers and use it in LocalUrlGenerator so the URLs carry credentials over HTTPS, matching the old HTTP behaviour but on tls_port instead of the removed port 9022. --- .../blobstore/url_generator/local_url_generator.rb | 8 ++++---- .../blobstore/url_generator/url_generator_helpers.rb | 6 ++++++ .../url_generator/local_url_generator_spec.rb | 12 ++++++++---- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/lib/cloud_controller/blobstore/url_generator/local_url_generator.rb b/lib/cloud_controller/blobstore/url_generator/local_url_generator.rb index 6aff4e141d4..a7233e322d7 100644 --- a/lib/cloud_controller/blobstore/url_generator/local_url_generator.rb +++ b/lib/cloud_controller/blobstore/url_generator/local_url_generator.rb @@ -17,19 +17,19 @@ def initialize(blobstore_options, package_blobstore, buildpack_cache_blobstore, def package_download_url(package) return nil unless @package_blobstore.exists?(package.guid) - https_no_auth_uri("/staging/packages/#{package.guid}") + https_basic_auth_uri("/staging/packages/#{package.guid}") end def buildpack_cache_download_url(app_guid, stack) return nil unless @buildpack_cache_blobstore.exists?("#{app_guid}/#{stack}") - https_no_auth_uri("/staging/v3/buildpack_cache/#{stack}/#{app_guid}/download") + https_basic_auth_uri("/staging/v3/buildpack_cache/#{stack}/#{app_guid}/download") end def admin_buildpack_download_url(buildpack) return nil unless @admin_buildpack_blobstore.exists?(buildpack.key) - https_no_auth_uri("/v2/buildpacks/#{buildpack.guid}/download") + https_basic_auth_uri("/v2/buildpacks/#{buildpack.guid}/download") end def droplet_download_url(droplet) @@ -43,7 +43,7 @@ def droplet_download_url(droplet) return nil end - https_no_auth_uri("/staging/v3/droplets/#{droplet.guid}/download") + https_basic_auth_uri("/staging/v3/droplets/#{droplet.guid}/download") end private diff --git a/lib/cloud_controller/blobstore/url_generator/url_generator_helpers.rb b/lib/cloud_controller/blobstore/url_generator/url_generator_helpers.rb index 9a26183b790..d51de21104f 100644 --- a/lib/cloud_controller/blobstore/url_generator/url_generator_helpers.rb +++ b/lib/cloud_controller/blobstore/url_generator/url_generator_helpers.rb @@ -1,6 +1,12 @@ module CloudController module Blobstore module UrlGeneratorHelpers + def https_basic_auth_uri(path) + uri = build_https_uri(path) + uri.userinfo = [@blobstore_options[:user], @blobstore_options[:password]] + uri.to_s + end + def https_no_auth_uri(path) build_https_uri(path).to_s end diff --git a/spec/unit/lib/cloud_controller/blobstore/url_generator/local_url_generator_spec.rb b/spec/unit/lib/cloud_controller/blobstore/url_generator/local_url_generator_spec.rb index 5e467fe88da..0f83e1651ed 100644 --- a/spec/unit/lib/cloud_controller/blobstore/url_generator/local_url_generator_spec.rb +++ b/spec/unit/lib/cloud_controller/blobstore/url_generator/local_url_generator_spec.rb @@ -39,7 +39,8 @@ module Blobstore expect(uri.scheme).to eql 'https' expect(uri.host).to eql blobstore_host expect(uri.port).to eql tls_port - expect(uri.user).to be_nil + expect(uri.user).to eql 'username' + expect(uri.password).to eql 'password' expect(uri.path).to eql "/v2/buildpacks/#{buildpack.guid}/download" end @@ -61,7 +62,8 @@ module Blobstore expect(uri.scheme).to eql 'https' expect(uri.host).to eql blobstore_host expect(uri.port).to eql tls_port - expect(uri.user).to be_nil + expect(uri.user).to eql 'username' + expect(uri.password).to eql 'password' expect(uri.path).to eql "/staging/v3/buildpack_cache/#{stack}/#{app_model.guid}/download" end @@ -82,7 +84,8 @@ module Blobstore expect(uri.scheme).to eql 'https' expect(uri.host).to eql blobstore_host expect(uri.port).to eql tls_port - expect(uri.user).to be_nil + expect(uri.user).to eql 'username' + expect(uri.password).to eql 'password' expect(uri.path).to eql "/staging/v3/droplets/#{droplet.guid}/download" end @@ -108,7 +111,8 @@ module Blobstore expect(uri.scheme).to eql 'https' expect(uri.host).to eql blobstore_host expect(uri.port).to eql tls_port - expect(uri.user).to be_nil + expect(uri.user).to eql 'username' + expect(uri.password).to eql 'password' expect(uri.path).to eql "/staging/packages/#{package.guid}" end