Skip to content

Fix: SSL toggles reset to off when requesting a new certificate on host creation #5701

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
adman234 wants to merge 1 commit into
base: develop
Choose a base branch
from
+46 −6
Open

Fix: SSL toggles reset to off when requesting a new certificate on host creation #5701

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
16 changes: 14 additions & 2 deletions backend/internal/dead-host.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,13 @@ const internalDeadHost = {

// At this point the domains should have been checked
data.owner_user_id = access.token.getUserId(1);
const thisData = internalHost.cleanSslHstsData(data);

// Don't clean the ssl_forced/http2_support/hsts_* fields yet if a
// certificate is about to be requested. certificate_id has already
// been stripped above, so cleanSslHstsData would see "no cert" and
// zero out the SSL toggles the user just submitted, even though a
// certificate is created moments later in this same request.
const thisData = createCertificate ? data : internalHost.cleanSslHstsData(data);

// Fix for db field not having a default value
// for this optional field.
Expand All @@ -69,10 +75,16 @@ const internalDeadHost = {
if (createCertificate) {
const cert = await internalCertificate.createQuickCertificate(access, data);

// update host with cert id
// Update host with cert id and re-apply the originally submitted
// SSL toggles, now that a real certificate exists for them to
// validate against.
await internalDeadHost.update(access, {
id: row.id,
certificate_id: cert.id,
ssl_forced: thisData.ssl_forced,
http2_support: thisData.http2_support,
hsts_enabled: thisData.hsts_enabled,
hsts_subdomains: thisData.hsts_subdomains,
});
}

Expand Down
18 changes: 16 additions & 2 deletions backend/internal/proxy-host.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,15 @@ const internalProxyHost = {
.then(() => {
// At this point the domains should have been checked
thisData.owner_user_id = access.token.getUserId(1);
thisData = internalHost.cleanSslHstsData(thisData);

// Don't clean the ssl_forced/http2_support/hsts_* fields yet if a
// certificate is about to be requested. certificate_id has already
// been stripped above, so cleanSslHstsData would see "no cert" and
// zero out the SSL toggles the user just submitted, even though a
// certificate is created moments later in this same request.
if (!createCertificate) {
thisData = internalHost.cleanSslHstsData(thisData);
}

// Fix for db field not having a default value
// for this optional field.
Expand All @@ -64,10 +72,16 @@ const internalProxyHost = {
return internalCertificate
.createQuickCertificate(access, thisData)
.then((cert) => {
// update host with cert id
// Update host with cert id and re-apply the originally submitted
// SSL toggles, now that a real certificate exists for them to
// validate against.
return internalProxyHost.update(access, {
id: row.id,
certificate_id: cert.id,
ssl_forced: thisData.ssl_forced,
http2_support: thisData.http2_support,
hsts_enabled: thisData.hsts_enabled,
hsts_subdomains: thisData.hsts_subdomains,
});
})
.then(() => {
Expand Down
18 changes: 16 additions & 2 deletions backend/internal/redirection-host.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,15 @@ const internalRedirectionHost = {
.then(() => {
// At this point the domains should have been checked
thisData.owner_user_id = access.token.getUserId(1);
thisData = internalHost.cleanSslHstsData(thisData);

// Don't clean the ssl_forced/http2_support/hsts_* fields yet if a
// certificate is about to be requested. certificate_id has already
// been stripped above, so cleanSslHstsData would see "no cert" and
// zero out the SSL toggles the user just submitted, even though a
// certificate is created moments later in this same request.
if (!createCertificate) {
thisData = internalHost.cleanSslHstsData(thisData);
}

// Fix for db field not having a default value
// for this optional field.
Expand All @@ -64,10 +72,16 @@ const internalRedirectionHost = {
return internalCertificate
.createQuickCertificate(access, thisData)
.then((cert) => {
// update host with cert id
// Update host with cert id and re-apply the originally submitted
// SSL toggles, now that a real certificate exists for them to
// validate against.
return internalRedirectionHost.update(access, {
id: row.id,
certificate_id: cert.id,
ssl_forced: thisData.ssl_forced,
http2_support: thisData.http2_support,
hsts_enabled: thisData.hsts_enabled,
hsts_subdomains: thisData.hsts_subdomains,
});
})
.then(() => {
Expand Down