Skip to content

Use canonical Public Apps control-plane hostnames #5

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

Merged
nathan-thillairajah merged 2 commits into from
Sep 24, 2026
Merged

Use canonical Public Apps control-plane hostnames #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78037f8
Accept the canonical Public staging Apps ingress
nathan-thillairajah Sep 23, 2026
07f117f
Correct the Public production Apps control-plane hostname
nathan-thillairajah Sep 23, 2026
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
21 changes: 17 additions & 4 deletions src/bl/apps.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ const CONTROL_PLANE_REQUEST_TIMEOUT: Duration = Duration::from_secs(3 * 60);
const CONTROL_PLANE_RESPONSE_MAX_BYTES: usize = 2 * 1024 * 1024;
const TRUSTED_CONTROL_PLANE_HOSTS: &[&str] = &[
"compose-ctrl.test.blockstaging.build",
"compose-ctrl.app.builderlab.xyz",
"compose-ctrl.apps.builderlab.xyz",
"compose-ctrl.apps.builderlabstaging.xyz",
];

pub fn command() -> Command {
Expand Down Expand Up @@ -3890,7 +3891,10 @@ mod tests {

for trusted in [
"https://compose-ctrl.test.blockstaging.build",
"https://compose-ctrl.app.builderlab.xyz",
"https://compose-ctrl.apps.builderlab.xyz",
"https://compose-ctrl.apps.builderlab.xyz:443",
"https://compose-ctrl.apps.builderlabstaging.xyz",
"https://compose-ctrl.apps.builderlabstaging.xyz:443",
"https://compose-ctrl.test.blockstaging.build:443",
] {
assert!(
Expand All @@ -3904,10 +3908,19 @@ mod tests {
"https://attacker.example",
"https://test.blockstaging.build",
"https://app.builderlab.xyz",
"https://compose-ctrl.app.builderlab.xyz",
"https://compose-ctrl.app.builderlabstaging.xyz",
"http://compose-ctrl.apps.builderlab.xyz",
"https://user@compose-ctrl.apps.builderlab.xyz",
"https://compose-ctrl.test.blockstaging.build.attacker.example",
"https://compose-ctrl.test.blockstaging.build:444",
"https://compose-ctrl.app.builderlab.xyz.attacker.example",
"https://compose-ctrl.app.builderlab.xyz:444",
"https://compose-ctrl.apps.builderlab.xyz.attacker.example",
"https://compose-ctrl.apps.builderlab.xyz:444",
"http://compose-ctrl.apps.builderlabstaging.xyz",
"https://compose-ctrl.apps.builderlabstaging.xyz.attacker.example",
"https://compose-ctrl.apps.builderlabstaging.xyz:444",
"https://user@compose-ctrl.apps.builderlabstaging.xyz",
"https://app.builderlabstaging.xyz",
"https://user@compose-ctrl.test.blockstaging.build",
"http://localhost:8080",
"https://localhost:8080",
Expand Down
Loading