Merge lp:~mardy/signon-ui/http-warning into lp:signon-ui

[Alberto Mardegan]

Show a worning message when authenticating with plain HTTP

Show a worning message when authenticating with plain HTTP

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:107
http://jenkins.qa.ubuntu.com/job/signon-ui-ci/25/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-ui-saucy-amd64-ci/5

Click here to trigger a rebuild:
http://s-jenkins:8080/job/signon-ui-ci/25/rebuild

review: Approve (continuous-integration)

[lp:~mardy/signon-ui/http-warning]

108. By Alberto Mardegan on 2013-06-17

Use 16px icon

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:108
http://jenkins.qa.ubuntu.com/job/signon-ui-ci/26/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-ui-saucy-amd64-ci/6

Click here to trigger a rebuild:
http://s-jenkins:8080/job/signon-ui-ci/26/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Please fix the conflicts

review: Needs Fixing

[lp:~mardy/signon-ui/http-warning]

109. By Alberto Mardegan on 2013-06-18

Fix changelog conflicts

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:109
http://jenkins.qa.ubuntu.com/job/signon-ui-ci/27/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-ui-saucy-amd64-ci/7

Click here to trigger a rebuild:
http://s-jenkins:8080/job/signon-ui-ci/27/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Thanks

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2013-06-10 11:04:32 +0000
+++ .bzrignore	2013-06-18 07:09:27 +0000
@@ -1,9 +1,11 @@
 *.a
+*.log
 *.o
 *.moc
 *.pyc
 *.so
 *.so.*
+*.substvars
 *.tar.*
 *~
 .*.swp
@@ -11,7 +13,8 @@
 .obj
 builddir
 core
-debian/
+/debian/files
+/debian/signon-ui
 Makefile
 Makefile.*
 moc_*

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-12 04:31:58 +0000
+++ debian/changelog	2013-06-18 07:09:27 +0000
@@ -1,3 +1,10 @@
+signon-ui (0.15daily13.06.12-0ubuntu2) UNRELEASED; urgency=low
+
+  * Show a warning message when authenticating with plain
+    HTTP. (LP: #1180297).
+
+ -- Alberto Mardegan <[e-mail]>  Tue, 18 Jun 2013 00:06:32 -0700
+
 signon-ui (0.15daily13.06.12-0ubuntu1) saucy; urgency=low
 
   [ Alberto Mardegan ]

=== modified file 'debian/rules'
--- debian/rules	2013-05-02 19:17:06 +0000
+++ debian/rules	2013-06-18 07:09:27 +0000
@@ -7,7 +7,8 @@
 
 override_dh_auto_configure:
 	dh_auto_configure -- "CONFIG+=force-foreign-qwindow" \
-		"CONFIG+=use-webkit2"
+		"CONFIG+=use-webkit2" \
+		"HTTP_WARNING_HELP=help:web-credentials/http-warning"
 
 override_dh_install:
 	rm -f debian/*/usr/bin/signon-ui-unittest

=== modified file 'src/browser-request.cpp'
--- src/browser-request.cpp	2013-06-06 13:01:21 +0000
+++ src/browser-request.cpp	2013-06-18 07:09:27 +0000
@@ -24,14 +24,17 @@
 #include "cookie-jar-manager.h"
 #include "debug.h"
 #include "dialog.h"
+#include "http-warning.h"
 #include "i18n.h"
 
 #include <QDBusArgument>
 #include <QDesktopServices>
+#include <QIcon>
 #include <QLabel>
 #include <QNetworkCookie>
 #include <QNetworkReply>
 #include <QNetworkRequest>
+#include <QPixmap>
 #include <QPointer>
 #include <QProgressBar>
 #include <QPushButton>
@@ -39,6 +42,7 @@
 #include <QSettings>
 #include <QSslError>
 #include <QStackedLayout>
+#include <QStatusBar>
 #include <QTimer>
 #include <QVBoxLayout>
 #include <QWebElement>
@@ -276,6 +280,7 @@
     QStackedLayout *m_webViewLayout;
     WebView *m_webView;
     AnimationLabel *m_animationLabel;
+    HttpWarning *m_httpWarning;
     QUrl finalUrl;
     QUrl responseUrl;
     QString m_host;
@@ -299,6 +304,7 @@
     m_webViewLayout(0),
     m_webView(0),
     m_animationLabel(0),
+    m_httpWarning(0),
     m_settings(0),
     m_loginCount(0),
     m_ignoreSslErrors(false)
@@ -343,6 +349,7 @@
     }
 
     setupViewForUrl(url);
+    m_httpWarning->setVisible(url.scheme() == "http");
 }
 
 void BrowserRequestPrivate::onLoadProgress()
@@ -428,13 +435,13 @@
 void BrowserRequestPrivate::startProgress()
 {
     m_animationLabel->start();
-    m_webViewLayout->setCurrentWidget(m_animationLabel);
+    m_webViewLayout->setCurrentIndex(1);
 }
 
 void BrowserRequestPrivate::stopProgress()
 {
     m_animationLabel->stop();
-    m_webViewLayout->setCurrentWidget(m_webView);
+    m_webViewLayout->setCurrentIndex(0);
 }
 
 QWidget *BrowserRequestPrivate::buildWebViewPage(const QVariantMap &params)
@@ -489,7 +496,17 @@
                      this, SLOT(onLoadProgress()));
     QObject::connect(m_webView, SIGNAL(loadFinished(bool)),
                      this, SLOT(onLoadFinished(bool)));
-    m_webViewLayout->addWidget(m_webView);
+    QWidget *webViewContainer = new QWidget;
+    QVBoxLayout *vLayout = new QVBoxLayout;
+    vLayout->setSpacing(0);
+    webViewContainer->setLayout(vLayout);
+    vLayout->addWidget(m_webView);
+
+    m_httpWarning = new HttpWarning;
+    m_httpWarning->setVisible(false);
+    vLayout->addWidget(m_httpWarning);
+
+    m_webViewLayout->addWidget(webViewContainer);
 
     m_animationLabel = new AnimationLabel(":/spinner-26.gif", 0);
     QObject::connect(m_webView, SIGNAL(loadStarted()),

=== added file 'src/http-warning.cpp'
--- src/http-warning.cpp	1970-01-01 00:00:00 +0000
+++ src/http-warning.cpp	2013-06-18 07:09:27 +0000
@@ -0,0 +1,74 @@
+/*
+ * This file is part of signon-ui
+ *
+ * Copyright (C) 2013 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, 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 warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
+ */
+
+#include "http-warning.h"
+
+#include "debug.h"
+#include "i18n.h"
+
+#include <QFile>
+#include <QLabel>
+#include <QPixmap>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+
+using namespace SignOnUi;
+
+HttpWarning::HttpWarning(QWidget *parent):
+    QWidget(parent)
+{
+    QVBoxLayout *vLayout = new QVBoxLayout;
+    vLayout->setContentsMargins(0, 0, 0, 0);
+    setLayout(vLayout);
+
+    QFrame *separator = new QFrame;
+    separator->setFrameShape(QFrame::HLine);
+    separator->setFrameShadow(QFrame::Raised);
+    separator->setContentsMargins(0, 0, 0, 0);
+    vLayout->addWidget(separator);
+
+    QWidget *labels = new QWidget;
+    vLayout->addWidget(labels);
+
+    QHBoxLayout *labelsLayout = new QHBoxLayout;
+    labelsLayout->setContentsMargins(0, 0, 0, 0);
+    labels->setLayout(labelsLayout);
+
+    QLabel *label = new QLabel;
+    label->setPixmap(QPixmap(":security-low.png"));
+    labelsLayout->addWidget(label);
+
+    label = new QLabel;
+    label->setTextFormat(Qt::RichText);
+    QString text = _("This site uses an insecure connection.");
+#ifdef HTTP_WARNING_HELP
+    text.append(QString(" <a href=\"" HTTP_WARNING_HELP "\">%1</a>").
+                arg(_("What does this mean?")));
+#endif
+    label->setText(text);
+    label->setOpenExternalLinks(true);
+    labelsLayout->addWidget(label);
+
+    labelsLayout->addStretch();
+}
+
+HttpWarning::~HttpWarning()
+{
+}

=== added file 'src/http-warning.h'
--- src/http-warning.h	1970-01-01 00:00:00 +0000
+++ src/http-warning.h	2013-06-18 07:09:27 +0000
@@ -0,0 +1,40 @@
+/*
+ * This file is part of signon-ui
+ *
+ * Copyright (C) 2013 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, 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 warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
+ */
+
+#ifndef SIGNON_UI_HTTP_WARNING_H
+#define SIGNON_UI_HTTP_WARNING_H
+
+#include <QString>
+#include <QWidget>
+
+namespace SignOnUi {
+
+class HttpWarning: public QWidget
+{
+    Q_OBJECT
+
+public:
+    HttpWarning(QWidget *parent = 0);
+    ~HttpWarning();
+};
+
+} // namespace
+
+#endif // SIGNON_UI_HTTP_WARNING_H

=== added file 'src/http-warning.qrc'
--- src/http-warning.qrc	1970-01-01 00:00:00 +0000
+++ src/http-warning.qrc	2013-06-18 07:09:27 +0000
@@ -0,0 +1,5 @@
+<RCC>
+  <qresource prefix="/" >
+    <file>security-low.png</file>
+  </qresource>
+</RCC>

=== added file 'src/security-low.png'
Binary files src/security-low.png	1970-01-01 00:00:00 +0000 and src/security-low.png	2013-06-18 07:09:27 +0000 differ
=== modified file 'src/signon-ui.pro'
--- src/signon-ui.pro	2013-06-10 11:04:32 +0000
+++ src/signon-ui.pro	2013-06-18 07:09:27 +0000
@@ -47,6 +47,7 @@
     dialog-request.h \
     dialog.h \
     errors.h \
+    http-warning.h \
     i18n.h \
     inactivity-timer.h \
     indicator-service.h \
@@ -63,6 +64,7 @@
     debug.cpp \
     dialog-request.cpp \
     dialog.cpp \
+    http-warning.cpp \
     i18n.cpp \
     inactivity-timer.cpp \
     indicator-service.cpp \
@@ -94,7 +96,9 @@
     REMOTE_PROCESS_PATH=\\\"$${INSTALL_PREFIX}/libexec/signon-ui\\\" \
     I18N_DOMAIN=\\\"$${I18N_DOMAIN}\\\"
 
-RESOURCES += animationlabel.qrc
+RESOURCES += \
+    animationlabel.qrc \
+    http-warning.qrc
 
 SIGNONUI_DBUS_ADAPTORS += \
     com.canonical.indicators.webcredentials.xml
@@ -119,3 +123,8 @@
     com.canonical.indicators.webcredentials.service \
     com.nokia.singlesignonui.service
 INSTALLS += service
+
+# Help file for HTTP authentication warning
+!isEmpty(HTTP_WARNING_HELP) {
+    DEFINES += HTTP_WARNING_HELP=\\\"$${HTTP_WARNING_HELP}\\\"
+}

=== modified file 'tests/unit/tst_signon_ui.pro'
--- tests/unit/tst_signon_ui.pro	2013-04-22 06:53:35 +0000
+++ tests/unit/tst_signon_ui.pro	2013-06-18 07:09:27 +0000
@@ -45,6 +45,7 @@
     $$TOP_SRC_DIR/src/debug.cpp \
     $$TOP_SRC_DIR/src/dialog-request.cpp \
     $$TOP_SRC_DIR/src/dialog.cpp \
+    $$TOP_SRC_DIR/src/http-warning.cpp \
     $$TOP_SRC_DIR/src/i18n.cpp \
     $$TOP_SRC_DIR/src/indicator-service.cpp \
     $$TOP_SRC_DIR/src/network-access-manager.cpp \
@@ -61,6 +62,7 @@
     $$TOP_SRC_DIR/src/cookie-jar-manager.h \
     $$TOP_SRC_DIR/src/dialog-request.h \
     $$TOP_SRC_DIR/src/dialog.h \
+    $$TOP_SRC_DIR/src/http-warning.h \
     $$TOP_SRC_DIR/src/indicator-service.h \
     $$TOP_SRC_DIR/src/network-access-manager.h \
     $$TOP_SRC_DIR/src/reauthenticator.h \