Merge lp:~ken-vandine/ubuntu-system-settings/rtm-check-hash into lp:ubuntu-system-settings/rtm-14.09

[Ken VanDine]

[system-update] Add support for checksum validation.

This branch uses the download manager checksum support. Rather than checking for the checksum in the system settings application this is relayed to the download manager which will check the file against the given signature. If the signature passes everything continues as expected else, udm will emit an error signal and the download will be considered a failure.

Instructions to test this can be found in the test plan https://wiki.ubuntu.com/Process/Merges/TestPlan/ubuntu-system-settings

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:973
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/44/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-14.09-touch/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/45
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/45/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-14.09-mako/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/23
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17408

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-rtm-14.09-ci/44/rebuild

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

Ken, do you have hints on how to test those changes?

Small stylistic comments
- why do you reorder an include in non alphabetic order?
- the extra new line after includes don't look necessary

review: Needs Information

[lp:~ken-vandine/ubuntu-system-settings/rtm-check-hash]

974. By Ken VanDine on 2015-02-26

reorder includes to be alphabetical and removed a blank line

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:974
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/67/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-14.09-touch/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/68
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/68/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-14.09-mako/47
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/46
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/46/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18398

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-rtm-14.09-ci/67/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

thanks

review: Approve

[Sebastien Bacher (seb128)]

seems like we are not doing more rtm landing, so cleaning the list a bit, that one is rather going to be including with the vivid rebase

Unmerged revisions

974. By Ken VanDine on 2015-02-26

reorder includes to be alphabetical and removed a blank line

973. By Ken VanDine on 2015-01-23

[system-update] Add support for checksum validation.

=== modified file 'plugins/system-update/PageComponent.qml'
--- plugins/system-update/PageComponent.qml	2015-01-30 18:36:21 +0000
+++ plugins/system-update/PageComponent.qml	2015-02-26 19:00:45 +0000
@@ -538,6 +538,7 @@
                                 packageName: modelData.packageName
                                 clickToken: modelData.clickToken
                                 download: modelData.downloadUrl
+                                downloadSha512: modelData.downloadSha512
 
                                 onFinished: {
                                     progress.visible = false;

=== modified file 'plugins/system-update/download_tracker.cpp'
--- plugins/system-update/download_tracker.cpp	2015-01-15 11:08:33 +0000
+++ plugins/system-update/download_tracker.cpp	2015-02-26 19:00:45 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 - Canonical Ltd.
+ * Copyright (C) 2014-2015 - Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License, as
@@ -18,9 +18,7 @@
  * Authored by: Diego Sarmentero <[e-mail]>
  */
 
-#include <QDebug>
 #include <QProcessEnvironment>
-
 #include <ubuntu/download_manager/download_struct.h>
 #include <ubuntu/download_manager/error.h>
 
@@ -31,6 +29,7 @@
     const QString DOWNLOAD_COMMAND = "post-download-command";
     const QString APP_ID = "app_id";
     const QString PKCON_COMMAND = "pkcon";
+    const QString DOWNLOAD_MANAGER_SHA512 = "sha512";
 }
 
 namespace UpdatePlugin {
@@ -88,7 +87,7 @@
         vmap[APP_ID] = m_packageName;
         StringMap map;
         map[X_CLICK_TOKEN] = m_clickToken;
-        DownloadStruct dstruct = DownloadStruct(m_downloadUrl, vmap, map);
+        DownloadStruct dstruct(m_downloadUrl, m_download_sha512, DOWNLOAD_MANAGER_SHA512, vmap, map);
         m_manager->createDownload(dstruct);
     }
 }

=== modified file 'plugins/system-update/download_tracker.h'
--- plugins/system-update/download_tracker.h	2015-01-14 11:23:42 +0000
+++ plugins/system-update/download_tracker.h	2015-02-26 19:00:45 +0000
@@ -42,6 +42,7 @@
     Q_PROPERTY(QString clickToken READ clickToken WRITE setClickToken)
     Q_PROPERTY(QString download READ download WRITE setDownload)
     Q_PROPERTY(QString packageName READ packageName WRITE setPackageName)
+    Q_PROPERTY(QString downloadSha512 READ downloadSha512 WRITE setDownloadSha512)
     Q_PROPERTY(int progress READ progress NOTIFY progressChanged)
 
 public:
@@ -54,10 +55,12 @@
     QString download() { return m_downloadUrl; }
     QString clickToken() { return m_clickToken; }
     QString packageName() { return m_packageName; }
+    QString downloadSha512() { return m_download_sha512; }
+    int progress() { return m_progress; }
     void setDownload(const QString& url);
     void setClickToken(const QString& token);
     void setPackageName(const QString& package);
-    int progress() { return m_progress; }
+    void setDownloadSha512(const QString &sha512) { m_download_sha512 = sha512; }
 
 public Q_SLOTS:
     void bindDownload(Download* download);
@@ -84,6 +87,7 @@
     Download* m_download = nullptr;
     Manager* m_manager = nullptr;
     int m_progress = 0;
+    QString m_download_sha512 = QString::null;
 
     void startService();
     QString getPkconCommand();

=== modified file 'plugins/system-update/network/network.cpp'
--- plugins/system-update/network/network.cpp	2014-09-18 13:50:15 +0000
+++ plugins/system-update/network/network.cpp	2015-02-26 19:00:45 +0000
@@ -107,6 +107,7 @@
                     QString version = object.value("version").toString();
                     QString icon_url = object.value("icon_url").toString();
                     QString url = object.value("download_url").toString();
+                    QString download_sha512 = object.value("download_sha512").toString();
                     int size = object.value("binary_filesize").toVariant().toInt();
                     if (m_apps.contains(name)) {
                         m_apps[name]->setRemoteVersion(version);
@@ -114,6 +115,7 @@
                             m_apps[name]->setIconUrl(icon_url);
                             m_apps[name]->setDownloadUrl(url);
                             m_apps[name]->setBinaryFilesize(size);
+                            m_apps[name]->setDownloadSha512(download_sha512);
                             updates = true;
                         }
                     }

=== modified file 'plugins/system-update/update.cpp'
--- plugins/system-update/update.cpp	2015-01-14 11:23:42 +0000
+++ plugins/system-update/update.cpp	2015-02-26 19:00:45 +0000
@@ -32,6 +32,7 @@
     QObject(parent),
     m_binary_filesize(0),
     m_click_url(""),
+    m_clickToken(""),
     m_downloadUrl(""),
     m_download_progress(0),
     m_error(""),

=== modified file 'plugins/system-update/update.h'
--- plugins/system-update/update.h	2014-09-12 19:12:36 +0000
+++ plugins/system-update/update.h	2015-02-26 19:00:45 +0000
@@ -57,6 +57,7 @@
                NOTIFY downloadProgressChanged)
     Q_PROPERTY(QString downloadUrl READ downloadUrl NOTIFY downloadUrlChanged)
     Q_PROPERTY(QString clickToken READ clickToken NOTIFY clickTokenChanged)
+    Q_PROPERTY(QString downloadSha512 READ downloadSha512 NOTIFY downloadSha512Changed)
 
 Q_SIGNALS:
     void systemUpdateChanged();
@@ -75,6 +76,7 @@
     void downloadUrlChanged();
     void clickTokenChanged();
     void packageNameChanged();
+    void downloadSha512Changed();
 
 public:
     explicit Update(QObject *parent = 0);
@@ -97,6 +99,7 @@
     const QString& getClickUrl() const { return m_click_url; }
     QString downloadUrl() { return m_downloadUrl; }
     QString clickToken() { return m_clickToken; }
+    QString downloadSha512() { return m_download_sha512; }
 
     void setSystemUpdate(bool isSystem);
     void initializeApplication(QString packagename, QString title,
@@ -115,6 +118,7 @@
     void setClickUrl(const QString &url) { m_click_url = url; }
     void setDownloadUrl(const QString &url);
     void setClickToken(const QString &token) { m_clickToken = token; Q_EMIT clickTokenChanged(); }
+    void setDownloadSha512(const QString &sha512) { m_download_sha512 = sha512; Q_EMIT downloadSha512Changed(); }
 
 private:
     int m_binary_filesize;
@@ -134,6 +138,7 @@
     bool m_update;
     bool m_update_ready;
     bool m_update_state;
+    QString m_download_sha512;
 
     bool getIgnoreUpdates();
 };

=== added file 'tests/autopilot/ubuntu_system_settings/utils/mock_update_click_server.py'
--- tests/autopilot/ubuntu_system_settings/utils/mock_update_click_server.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_system_settings/utils/mock_update_click_server.py	2015-02-26 19:00:45 +0000
@@ -0,0 +1,60 @@
+import json
+import threading
+from http.server import BaseHTTPRequestHandler, HTTPServer
+
+
+KEEP_ALIVE = True
+
+
+class MyHandler(BaseHTTPRequestHandler):
+
+    def do_HEAD(self):
+        self.send_response(200)
+        self.send_header("X-Click-Token", "X-Click-Token")
+        self.end_headers()
+
+    def response_item_info(self):
+        response = [{
+            "name": "com.ubuntu.calculator",
+            "version": "9.0",
+            "icon_url": ("https://raw.githubusercontent.com/ninja-ide/"
+                         "ninja-ide/master/ninja_ide/img/ninja_icon.png"),
+            "download_url": ("https://public.apps.ubuntu.com/download/com."
+                             "ubuntu/calculator/com.ubuntu.calculator_1"
+                             ".3.329_all.click"),
+            "binary_filesize": 3423,
+            "download_sha512": "343244fsdfdsffs"
+        }]
+        self.send_response(200)
+        self.send_header("Content-type", "application/json")
+        self.end_headers()
+        self.wfile.write(bytes(json.dumps(response), 'UTF-8'))
+
+    def do_POST(self):
+        """Respond to a POST request."""
+        self.do_GET()
+
+    def do_GET(self):
+        """Respond to a GET request."""
+        if self.path.find("iteminfo/") != -1:
+            self.response_item_info()
+        elif self.path.find("shutdown") != -1:
+            global KEEP_ALIVE
+            KEEP_ALIVE = False
+
+
+def run_click_server():
+    server_address = ('', 8000)
+    httpd = HTTPServer(server_address, MyHandler)
+    global KEEP_ALIVE
+    print('start')
+    while KEEP_ALIVE:
+        httpd.handle_request()
+
+
+def run_mocked_settings():
+    t = threading.Thread(target=run_click_server)
+    t.start()
+
+
+run_mocked_settings()