Skip to content
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

Jump to bottom

fix: set SSL properly for created dynamic backends #1016

Merged
merged 6 commits into from
Oct 21, 2024
Merged

fix: set SSL properly for created dynamic backends #1016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ca9a3a2
fix: set SSL properly for created dynamic backends
guybedford Oct 21, 2024
ebc1b2f
add test
guybedford Oct 21, 2024
0555353
fixup test
guybedford Oct 21, 2024
90769f0
fixup
guybedford Oct 21, 2024
c89cc95
fixup
guybedford Oct 21, 2024
bda7192
fixup
guybedford Oct 21, 2024
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
6 changes: 5 additions & 1 deletion integration-tests/js-compute/fixtures/app/src/dynamic-backend.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,11 @@ routes.set('/backend/timeout', async () => {
);
routes.set('/implicit-dynamic-backend/dynamic-backends-enabled', async () => {
allowDynamicBackends(true);
await assertResolves(() => fetch('https://http-me.glitch.me/headers'));
await assertResolves(async () => {
await fetch('https://http-me.glitch.me/headers');
const backend = Backend.fromName('http-me.glitch.me');
strictEqual(backend.isSSL, true);
});
await assertResolves(() => fetch('https://www.fastly.com'));
enforceExplicitBackends();
await assertRejects(() => fetch('https://www.fastly.com'));
Expand Down
5 changes: 4 additions & 1 deletion runtime/fastly/builtins/backend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1694,7 +1694,9 @@ JSObject *Backend::create(JSContext *cx, JS::HandleObject request) {
if (!name_js_str) {
return nullptr;
}
JS::RootedValue name(cx, JS::StringValue(name_js_str));
std::string name_str((char *)slice.data, slice.len);
JS::SetReservedSlot(request, static_cast<uint32_t>(Request::Slots::Backend), name);

// Check if we already constructed an implicit dynamic backend for this host.
bool found;
Expand All @@ -1707,6 +1709,7 @@ JSObject *Backend::create(JSContext *cx, JS::HandleObject request) {
return nullptr;
}
JS::RootedObject backend(cx, &already_built_backend.toObject());

return backend;
}

Expand All @@ -1722,7 +1725,6 @@ JSObject *Backend::create(JSContext *cx, JS::HandleObject request) {

host_api::BackendConfig backend_config = default_backend_config.clone();

JS::RootedValue name(cx, JS::StringValue(name_js_str));
auto host_backend = set_backend(cx, backend, name);
if (!host_backend) {
return nullptr;
Expand All @@ -1744,6 +1746,7 @@ JSObject *Backend::create(JSContext *cx, JS::HandleObject request) {

auto use_ssl = origin.rfind("https://", 0) == 0;
if (use_ssl) {
backend_config.use_ssl = true;
if (!set_sni_hostname(cx, backend_config, name)) {
return nullptr;
}
Expand Down
Loading