From 57507cfb93984e520fdd9545c84ea3b921c2914e Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 9 Jun 2015 11:21:46 -0700 Subject: [PATCH] Cloud storage: implement confirmation of email address via PIN Signed-off-by: Dirk Hohndel --- qt-ui/subsurfacewebservices.cpp | 27 +++++++++++++++++++++------ qt-ui/subsurfacewebservices.h | 2 +- qthelper.cpp | 3 +-- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/qt-ui/subsurfacewebservices.cpp b/qt-ui/subsurfacewebservices.cpp index f0208db53..6aadc2de7 100644 --- a/qt-ui/subsurfacewebservices.cpp +++ b/qt-ui/subsurfacewebservices.cpp @@ -935,15 +935,25 @@ CloudStorageAuthenticate::CloudStorageAuthenticate(QObject *parent) : QObject(pa } -#define CLOUDBACKEND "https://cloud.subsurface-divelog.org/storage" +#define CLOUDURL "https://cloud.subsurface-divelog.org/" +#define CLOUDBACKENDSTORAGE CLOUDURL "storage" +#define CLOUDBACKENDVERIFY CLOUDURL "verify" -QNetworkReply* CloudStorageAuthenticate::authenticate(QString email, QString password) +QNetworkReply* CloudStorageAuthenticate::authenticate(QString email, QString password, QString pin) { - QNetworkRequest *request = new QNetworkRequest(QUrl(CLOUDBACKEND)); + QString payload(email + " " + password); + QUrl requestUrl; + if (pin == "") { + requestUrl = QUrl(CLOUDBACKENDSTORAGE); + } else { + requestUrl = QUrl(CLOUDBACKENDVERIFY); + payload += " " + pin; + } + QNetworkRequest *request = new QNetworkRequest(requestUrl); request->setRawHeader("Accept", "text/xml, text/plain"); request->setRawHeader("User-Agent", userAgent.toUtf8()); request->setHeader(QNetworkRequest::ContentTypeHeader, "text/plain"); - reply = WebServices::manager()->post(*request, qPrintable(QString(email + " " + password))); + reply = WebServices::manager()->post(*request, qPrintable(payload)); connect(reply, SIGNAL(finished()), this, SLOT(uploadFinished())); connect(reply, SIGNAL(sslErrors(QList)), this, SLOT(sslErrors(QList))); connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, @@ -955,8 +965,13 @@ void CloudStorageAuthenticate::uploadFinished() { QString cloudAuthReply(reply->readAll()); qDebug() << "Completed connection with cloud storage backend, response" << cloudAuthReply; - prefs.show_cloud_pin = (cloudAuthReply == "[VERIFY]"); - emit finishedAuthenticate(prefs.show_cloud_pin); + if (cloudAuthReply == "[VERIFIED]") { + prefs.show_cloud_pin = false; + emit finishedAuthenticate(prefs.show_cloud_pin); + } else if (cloudAuthReply == "[VERIFY]") { + prefs.show_cloud_pin = true; + emit finishedAuthenticate(prefs.show_cloud_pin); + } } void CloudStorageAuthenticate::uploadError(QNetworkReply::NetworkError error) diff --git a/qt-ui/subsurfacewebservices.h b/qt-ui/subsurfacewebservices.h index 352c69459..6f8d6279a 100644 --- a/qt-ui/subsurfacewebservices.h +++ b/qt-ui/subsurfacewebservices.h @@ -114,7 +114,7 @@ slots: class CloudStorageAuthenticate : public QObject { Q_OBJECT public: - QNetworkReply* authenticate(QString email, QString password); + QNetworkReply* authenticate(QString email, QString password, QString pin = ""); explicit CloudStorageAuthenticate(QObject *parent); signals: void finishedAuthenticate(bool toggle); diff --git a/qthelper.cpp b/qthelper.cpp index a85be003e..fb688746e 100644 --- a/qthelper.cpp +++ b/qthelper.cpp @@ -1024,8 +1024,7 @@ fraction_t string_to_fraction(const char *str) int getCloudURL(QString &filename) { QString email = QString(prefs.cloud_storage_email); - email.replace("@", "_at_"); - email.replace(QRegularExpression("[^a-zA-Z0-9._+-]"), ""); + email.replace(QRegularExpression("[^a-zA-Z0-9@._+-]"), ""); if (email.isEmpty() || same_string(prefs.cloud_storage_password, "")) return report_error("Please configure Cloud storage email and password in the preferences"); if (email != prefs.cloud_storage_email_encoded) {