Skip to content

fix: Client side TLS with Strict-Transport-Security #9284

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
rbran wants to merge 1 commit into
base: master
Choose a base branch
from
+33 −29
Open

fix: Client side TLS with Strict-Transport-Security #9284

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
4 changes: 4 additions & 0 deletions src/gui/wizard/owncloudconnectionmethoddialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ void OwncloudConnectionMethodDialog::setUrl(const QUrl &url)
ui->label->setText(tr("<html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html>").arg(url.toDisplayString().toHtmlEscaped()));
}

void OwncloudConnectionMethodDialog::setHTTPOnly(const bool retryHTTPonly)
{
ui->btnNoTLS->setEnabled(retryHTTPonly);
}

void OwncloudConnectionMethodDialog::returnNoTLS()
{
Expand Down
1 change: 1 addition & 0 deletions src/gui/wizard/owncloudconnectionmethoddialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ class OwncloudConnectionMethodDialog : public QDialog

// The URL that was tried
void setUrl(const QUrl &);
void setHTTPOnly(const bool);

public slots:
void returnNoTLS();
Expand Down
57 changes: 28 additions & 29 deletions src/gui/wizard/owncloudsetuppage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,35 +349,34 @@ void OwncloudSetupPage::setErrorString(const QString &err, bool retryHTTPonly)
if (err.isEmpty()) {
_ui.errorLabel->setVisible(false);
} else {
if (retryHTTPonly) {
const auto urlString = url();
auto url = QUrl::fromUserInput(urlString);
if (url.scheme() == "https") {
// Ask the user how to proceed when connecting to a https:// URL fails.
// It is possible that the server is secured with client-side TLS certificates,
// but that it has no way of informing the owncloud client that this is the case.

OwncloudConnectionMethodDialog dialog;
dialog.setUrl(url);
// FIXME: Synchronous dialogs are not so nice because of event loop recursion
int retVal = dialog.exec();

switch (retVal) {
case OwncloudConnectionMethodDialog::No_TLS: {
url.setScheme("http");
_ui.leUrl->setFullText(url.toString());
// skip ahead to next page, since the user would expect us to retry automatically
wizard()->next();
} break;
case OwncloudConnectionMethodDialog::Client_Side_TLS:
addCertDial->show();
break;
case OwncloudConnectionMethodDialog::Closed:
case OwncloudConnectionMethodDialog::Back:
default:
// No-op.
break;
}
const auto urlString = url();
auto url = QUrl::fromUserInput(urlString);
if (url.scheme() == "https") {
// Ask the user how to proceed when connecting to a https:// URL fails.
// It is possible that the server is secured with client-side TLS certificates,
// but that it has no way of informing the owncloud client that this is the case.

OwncloudConnectionMethodDialog dialog;
dialog.setUrl(url);
dialog.setHTTPOnly(retryHTTPonly);
// FIXME: Synchronous dialogs are not so nice because of event loop recursion
int retVal = dialog.exec();

switch (retVal) {
case OwncloudConnectionMethodDialog::No_TLS: {
url.setScheme("http");
_ui.leUrl->setFullText(url.toString());
// skip ahead to next page, since the user would expect us to retry automatically
wizard()->next();
} break;
case OwncloudConnectionMethodDialog::Client_Side_TLS:
addCertDial->show();
break;
case OwncloudConnectionMethodDialog::Closed:
case OwncloudConnectionMethodDialog::Back:
default:
// No-op.
break;
}
}

Expand Down