Merge lp:~alecu/pay-ui/more-cert-info into lp:pay-ui

[Alejandro J. Cura]

Show certificate information for https connections

[lp:~alecu/pay-ui/more-cert-info]

97. By Alejandro J. Cura on 2014-12-03

Remove spurious debug messages

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:97
http://jenkins.qa.ubuntu.com/job/pay-ui-ci/107/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/74
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/107/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

Can you revert the changes to manifest.json? They are useful for testing, but as new strings are being added here, we'll need to notify translators and wait a few days to collect translations, before we should upload a new version to the store, I think. Or, you could change the i18n.tr() calls in this component, to i18n.dtr("webbrowser-app", "...") so that the string is loaded from the webbrowser-app translations, as it should already be translated there, and that package is a .deb, so it is in the langpacks, and we can actually do this (at least until the browser becomes a click package, but hopefully this will all be part of the Ubuntu.Web component or similar in the SDK by that point).

I'm also not particularly fond of the string used there, or the information provided in the popover, but alas, it does match what the browser would show.

Do the new .cpp/.h files come from webbrowser-app as well, or is it just the popover QML that came from there?

review: Needs Information

[Alejandro J. Cura (alecu)]

On Thu, Dec 4, 2014 at 12:46 PM, Rodney Dawes
<email address hidden> wrote:
> Review: Needs Information
>
> Can you revert the changes to manifest.json? They are useful for testing, but as new strings are being added here, we'll need to notify translators and wait a few days to collect translations, before we should upload a new version to the store, I think. Or, you could change the i18n.tr() calls in this component, to i18n.dtr("webbrowser-app", "...") so that the string is loaded from the webbrowser-app translations, as it should already be translated there, and that package is a .deb, so it is in the langpacks, and we can actually do this (at least until the browser becomes a click package, but hopefully this will all be part of the Ubuntu.Web component or similar in the SDK by that point).

As suggested, I'm changing the calls to i18n.dtr(), so I'm keeping the
version change in the manifest.

> I'm also not particularly fond of the string used there, or the information provided in the popover, but alas, it does match what the browser would show.

Yes, the whole popup is taken from the webbrowser-app to keep it as
similar as possible.

> Do the new .cpp/.h files come from webbrowser-app as well, or is it just the popover QML that came from there?

Those files are new, and are there to mimic the constants returned by
the Oxide component, and to keep SecurityCertificatePopover.qml as
close as possible to the original file, so it can be easily replaced
if changed.
Btw, the PrincipalAttr enum in Oxide matches the numeric values of
QSslCertificate::SubjectInfo, so this may need some refactoring if
those values ever change, but it sounds unlikely.

[lp:~alecu/pay-ui/more-cert-info]

98. By Alejandro J. Cura on 2014-12-04

Use the translations from webbrowser-app

[dobey (dobey)]

review: Approve

=== added file 'app/components/SecurityCertificatePopover.qml'
--- app/components/SecurityCertificatePopover.qml	1970-01-01 00:00:00 +0000
+++ app/components/SecurityCertificatePopover.qml	2014-12-04 20:37:26 +0000
@@ -0,0 +1,145 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0
+import Ubuntu.Components.Popups 1.0
+import payui 0.1 as Oxide
+
+Popover {
+    id: certificatePopover
+
+    property var securityStatus
+
+    Column {
+        width: parent.width - units.gu(4)
+        anchors.horizontalCenter: parent.horizontalCenter
+        spacing: units.gu(0.5)
+
+        Item {
+            height: units.gu(1.5)
+            width: parent.width
+        }
+
+        Column {
+            width: parent.width
+            visible: securityStatus.securityLevel == Oxide.SecurityStatus.SecurityLevelWarning
+            spacing: units.gu(0.5)
+
+            Row {
+                width: parent.width
+                spacing: units.gu(0.5)
+
+                Icon {
+                    name: "security-alert"
+                    height: units.gu(2)
+                    width: height
+                }
+
+                Label {
+                    width: parent.width
+                    wrapMode: Text.WordWrap
+                    text: i18n.dtr("webbrowser-app", "This site has insecure content")
+                    fontSize: "x-small"
+                }
+            }
+
+            ThinDivider {
+                width: parent.width
+                anchors.leftMargin: 0
+                anchors.rightMargin: 0
+            }
+        }
+
+        Label {
+            width: parent.width
+            wrapMode: Text.WordWrap
+            text: i18n.dtr("webbrowser-app", "You are connected to")
+            fontSize: "x-small"
+        }
+
+        Label {
+            width: parent.width
+            wrapMode: Text.WordWrap
+            text: securityStatus.certificate.subjectDisplayName
+            fontSize: "x-small"
+        }
+
+        ThinDivider {
+            width: parent.width
+            anchors.leftMargin: 0
+            anchors.rightMargin: 0
+            visible: orgName.visible || localityName.visible || stateName.visible || countryName.visible
+        }
+
+        Label {
+            width: parent.width
+            wrapMode: Text.WordWrap
+            visible: orgName.visible
+            text: i18n.dtr("webbrowser-app", "Which is run by")
+            fontSize: "x-small"
+        }
+
+        Label {
+            id: orgName
+            width: parent.width
+            wrapMode: Text.WordWrap
+            visible: text.length > 0
+            text: securityStatus.certificate.getSubjectInfo(Oxide.SslCertificate.PrincipalAttrOrganizationName).join(", ")
+            fontSize: "x-small"
+        }
+
+        Label {
+            id: localityName
+            width: parent.width
+            wrapMode: Text.WordWrap
+            visible: text.length > 0
+            text: securityStatus.certificate.getSubjectInfo(Oxide.SslCertificate.PrincipalAttrLocalityName).join(", ")
+            fontSize: "x-small"
+        }
+
+        Label {
+            id: stateName
+            width: parent.width
+            wrapMode: Text.WordWrap
+            visible: text.length > 0
+            text: securityStatus.certificate.getSubjectInfo(Oxide.SslCertificate.PrincipalAttrStateOrProvinceName).join(", ")
+            fontSize: "x-small"
+        }
+
+        Label {
+            id: countryName
+            width: parent.width
+            wrapMode: Text.WordWrap
+            visible: text.length > 0
+            text: securityStatus.certificate.getSubjectInfo(Oxide.SslCertificate.PrincipalAttrCountryName).join(", ")
+            fontSize: "x-small"
+        }
+
+        Item {
+            height: units.gu(1.5)
+            width: parent.width
+        }
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: PopupUtils.close(certificatePopover)
+    }
+}

=== modified file 'app/payui.qml'
--- app/payui.qml	2014-11-20 20:14:46 +0000
+++ app/payui.qml	2014-12-04 20:37:26 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import QtQuick.LocalStorage 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 import Ubuntu.Components.Popups 0.1
 import Ubuntu.OnlineAccounts 0.1
 import Ubuntu.OnlineAccounts.Client 0.1
@@ -202,6 +202,10 @@
             mainView.hideLoading();
             checkout.showTwoFactor();
         }
+
+        onCertificateFound: {
+            checkout.certificate = cert
+        }
     }
 
     function showLoading() {
@@ -438,4 +442,15 @@
             }
         }
     }
+
+    Rectangle {
+        id: lockIconPlace
+        width: units.gu(7)
+        height: units.gu(7)
+        anchors {
+            right: parent.right
+            top: parent.top
+        }
+        visible: false
+    }
 }

=== modified file 'app/ui/CheckoutPage.qml'
--- app/ui/CheckoutPage.qml	2014-11-20 20:14:46 +0000
+++ app/ui/CheckoutPage.qml	2014-12-04 20:37:26 +0000
@@ -15,8 +15,11 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components.Popups 0.1
+import payui 0.1 as Oxide
+import "../components"
 
 Page {
     id: pageCheckout
@@ -35,6 +38,8 @@
     property alias model: selector.model
     property alias password: passwordField.text
     property alias otp: twoFactorField.text
+    property alias certificate: otherSecurityStatus.certificate
+    property alias securityStatus: otherSecurityStatus
 
     property bool hasPayments: false
     property bool hasPreferredPayment: true
@@ -73,6 +78,31 @@
         }
     }
 
+    QtObject {
+        id: otherSecurityStatus
+        property int securityLevel: certificate == null ? Oxide.SecurityStatus.SecurityLevelNone : Oxide.SecurityStatus.SecurityLevelSecure
+        property var certificate: null
+    }
+
+    head.actions:[
+        Action {
+            id: lockAction
+            iconName: pageCheckout.securityStatus.securityLevel == Oxide.SecurityStatus.SecurityLevelSecure ? "lock" : "security-alert"
+            onTriggered: {
+                PopupUtils.open(popoverComponent, lockIconPlace, {"securityStatus": pageCheckout.securityStatus})
+            }
+        }
+    ]
+
+    Component {
+        id: popoverComponent
+
+        SecurityCertificatePopover {
+            id: certPopover
+            securityStatus: null
+        }
+    }
+
     Flickable {
         id: checkoutFlickable
         anchors {

=== modified file 'app/ui/UbuntuPurchaseWebkit.qml'
--- app/ui/UbuntuPurchaseWebkit.qml	2014-10-07 21:45:43 +0000
+++ app/ui/UbuntuPurchaseWebkit.qml	2014-12-04 20:37:26 +0000
@@ -15,9 +15,10 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 import Ubuntu.Components.Popups 0.1
 import Ubuntu.Web 0.2
+import "../components"
 
 
 Page {
@@ -31,6 +32,7 @@
 
     property int keyboardSize: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
     property alias url: webView.url
+    property var securityStatus: webView.securityStatus
 
     function parseQuery(url) {
         var argsParsed = {};
@@ -53,6 +55,25 @@
         return argsParsed;
     }
 
+    head.actions:[
+        Action {
+            id: lockAction
+            iconName: pageWebkit.securityStatus.securityLevel ? "lock" : "security-alert"
+            onTriggered: {
+                PopupUtils.open(popoverComponent, lockIconPlace, {"securityStatus": pageWebkit.securityStatus})
+            }
+        }
+    ]
+
+    Component {
+        id: popoverComponent
+
+        SecurityCertificatePopover {
+            id: certPopover
+            securityStatus: null
+        }
+    }
+
     WebView {
         id: webView
         objectName: "webView"

=== modified file 'backend/CMakeLists.txt'
--- backend/CMakeLists.txt	2014-06-25 20:58:29 +0000
+++ backend/CMakeLists.txt	2014-12-04 20:37:26 +0000
@@ -17,6 +17,8 @@
     modules/payui/network.cpp
     modules/payui/pay_info.cpp
     modules/payui/credentials_service.cpp
+    modules/payui/certificateadapter.cpp
+    modules/payui/oxideconstants.cpp
 )
 set(PAYUI_BACKEND payuibackend)
 

=== modified file 'backend/modules/payui/backend.cpp'
--- backend/modules/payui/backend.cpp	2014-06-23 18:20:45 +0000
+++ backend/modules/payui/backend.cpp	2014-12-04 20:37:26 +0000
@@ -2,6 +2,8 @@
 #include <QtQml/QQmlContext>
 #include "backend.h"
 #include "purchase.h"
+#include "certificateadapter.h"
+#include "oxideconstants.h"
 #include "pay_info.h"
 
 void BackendPlugin::registerTypes(const char *uri)
@@ -10,6 +12,9 @@
 
     qmlRegisterType<UbuntuPurchase::Purchase>(uri, 0, 1, "Purchase");
     qmlRegisterType<UbuntuPurchase::PayInfo>(uri, 0, 1, "PayInfo");
+    qmlRegisterType<CertificateAdapter>(uri, 0, 1, "CertificateAdapter");
+    qmlRegisterType<SecurityStatus>(uri, 0, 1, "SecurityStatus");
+    qmlRegisterType<SslCertificate>(uri, 0, 1, "SslCertificate");
 }
 
 void BackendPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

=== added file 'backend/modules/payui/certificateadapter.cpp'
--- backend/modules/payui/certificateadapter.cpp	1970-01-01 00:00:00 +0000
+++ backend/modules/payui/certificateadapter.cpp	2014-12-04 20:37:26 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <QStringList>
+#include "certificateadapter.h"
+
+CertificateAdapter::CertificateAdapter()
+{
+}
+
+CertificateAdapter::CertificateAdapter(const CertificateAdapter &other)
+{
+    m_cert = other.m_cert;
+}
+
+CertificateAdapter::~CertificateAdapter()
+{
+}
+
+CertificateAdapter::CertificateAdapter(QSslCertificate cert, QObject *parent) :
+    QObject(parent), m_cert(cert)
+{
+}
+
+QString CertificateAdapter::subjectDisplayName() {
+    return m_cert.subjectInfo(QSslCertificate::CommonName).join(", ");
+}
+
+QStringList CertificateAdapter::getSubjectInfo(int subject) {
+    return m_cert.subjectInfo((QSslCertificate::SubjectInfo)subject);
+}

=== added file 'backend/modules/payui/certificateadapter.h'
--- backend/modules/payui/certificateadapter.h	1970-01-01 00:00:00 +0000
+++ backend/modules/payui/certificateadapter.h	2014-12-04 20:37:26 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef CERTIFICATEADAPTER_H
+#define CERTIFICATEADAPTER_H
+
+#include <QObject>
+#include <QSslCertificate>
+#include <QMetaType>
+
+/*
+ * Adapt a QSSlCertificate to the interface that oxide uses for certs.
+ */
+class CertificateAdapter : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString subjectDisplayName READ subjectDisplayName)
+public:
+    CertificateAdapter(QSslCertificate cert, QObject *parent = 0);
+    CertificateAdapter(const CertificateAdapter& other);
+    CertificateAdapter();
+    ~CertificateAdapter();
+
+signals:
+
+public slots:
+    QStringList getSubjectInfo(int subject);
+
+protected:
+    QString subjectDisplayName();
+    QSslCertificate m_cert;
+};
+
+Q_DECLARE_METATYPE(CertificateAdapter);
+
+#endif // CERTIFICATEADAPTER_H

=== modified file 'backend/modules/payui/network.cpp'
--- backend/modules/payui/network.cpp	2014-11-18 14:54:05 +0000
+++ backend/modules/payui/network.cpp	2014-12-04 20:37:26 +0000
@@ -31,6 +31,8 @@
 #include <QDBusReply>
 #include <QDBusConnection>
 
+#include "certificateadapter.h"
+
 #define URL_PACKAGE_INFO "https://search.apps.ubuntu.com/api/v1/package/"
 #define ACCOUNT_CREDS_URL "https://login.ubuntu.com/api/v2/tokens/oauth"
 
@@ -180,10 +182,14 @@
                     }
                 }
             }
+            qDebug() << "Emit signal paymentTypesObtained";
             Q_EMIT paymentTypesObtained(listPays);
             if (m_preferred == nullptr) {
                 Q_EMIT noPreferredPaymentMethod();
             }
+            qDebug() << "Emit signal certificateFound";
+            CertificateAdapter* cert = new CertificateAdapter(reply->sslConfiguration().peerCertificate());
+            Q_EMIT certificateFound(cert);
         } else if (state->operation.contains(BUY_ITEM) && document.isObject()) {
             qDebug() << "Reply state:" << BUY_ITEM;
             QJsonObject object = document.object();

=== modified file 'backend/modules/payui/network.h'
--- backend/modules/payui/network.h	2014-11-04 19:39:34 +0000
+++ backend/modules/payui/network.h	2014-12-04 20:37:26 +0000
@@ -29,6 +29,7 @@
 #include <token.h>
 #include "credentials_service.h"
 
+#include "certificateadapter.h"
 #include "pay_info.h"
 
 using namespace UbuntuOne;
@@ -94,6 +95,7 @@
     void loginError(const QString& message);
     void twoFactorAuthRequired();
     void itemNotPurchased();
+    void certificateFound(QObject* cert);
 
 private Q_SLOTS:
     void onReply(QNetworkReply*);

=== added file 'backend/modules/payui/oxideconstants.cpp'
--- backend/modules/payui/oxideconstants.cpp	1970-01-01 00:00:00 +0000
+++ backend/modules/payui/oxideconstants.cpp	2014-12-04 20:37:26 +0000
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "oxideconstants.h"

=== added file 'backend/modules/payui/oxideconstants.h'
--- backend/modules/payui/oxideconstants.h	1970-01-01 00:00:00 +0000
+++ backend/modules/payui/oxideconstants.h	2014-12-04 20:37:26 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef OXIDECONSTANTS_H
+#define OXIDECONSTANTS_H
+
+#include <QObject>
+
+class SecurityStatus : public QObject
+{
+    Q_OBJECT
+    Q_ENUMS(SecurityLevel)
+public:
+    enum SecurityLevel {
+      SecurityLevelNone,
+      SecurityLevelSecure,
+      SecurityLevelSecureEV,
+      SecurityLevelWarning,
+      SecurityLevelError
+    };
+};
+
+class SslCertificate : public QObject
+{
+    Q_OBJECT
+    Q_ENUMS(PrincipalAttr)
+public:
+    enum PrincipalAttr {
+      PrincipalAttrOrganizationName,
+      PrincipalAttrCommonName,
+      PrincipalAttrLocalityName,
+      PrincipalAttrOrganizationUnitName,
+      PrincipalAttrCountryName,
+      PrincipalAttrStateOrProvinceName
+    };
+};
+
+#endif // OXIDECONSTANTS_H

=== modified file 'backend/modules/payui/purchase.cpp'
--- backend/modules/payui/purchase.cpp	2014-10-01 22:02:57 +0000
+++ backend/modules/payui/purchase.cpp	2014-12-04 20:37:26 +0000
@@ -40,6 +40,8 @@
             this, &Purchase::twoFactorAuthRequired);
     connect(&m_network, &Network::itemNotPurchased,
                      this, &Purchase::itemNotPurchased);
+    connect(&m_network, &Network::certificateFound,
+                     this, &Purchase::certificateFound);
 
     QCoreApplication* instance = QCoreApplication::instance();
     Logger::setupLogging();

=== modified file 'backend/modules/payui/purchase.h'
--- backend/modules/payui/purchase.h	2014-10-01 22:02:57 +0000
+++ backend/modules/payui/purchase.h	2014-12-04 20:37:26 +0000
@@ -6,6 +6,7 @@
 #include <QString>
 
 #include "network.h"
+#include "certificateadapter.h"
 
 namespace UbuntuPurchase {
 
@@ -45,6 +46,7 @@
     void loginError(const QString& message);
     void twoFactorAuthRequired();
     void itemNotPurchased();
+    void certificateFound(QObject* cert);
 
 private:
     Network m_network;

=== modified file 'manifest.json'
--- manifest.json	2014-10-16 18:49:09 +0000
+++ manifest.json	2014-12-04 20:37:26 +0000
@@ -11,6 +11,6 @@
             "pay-ui": "payui_payui.desktop"
         }
     },
-    "version": "0.4.2",
+    "version": "0.4.3",
     "maintainer": "Ubuntu Appstore Developers <[e-mail]>"
-}
+}
\ No newline at end of file