Merge lp:~jpakkane/thumbnailer/validate-appid into lp:thumbnailer

[Jussi Pakkanen]

Validate appid with a regex.

Validate appid with a regex.

We have to be a bit careful with this, because it requires G++ 4.9's regex support and trusty does not have it.

[lp:~jpakkane/thumbnailer/validate-appid]

85. By Jussi Pakkanen on 2014-05-16

Minor cleanup.

86. By Jussi Pakkanen on 2014-05-16

Even better.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:84
http://jenkins.qa.ubuntu.com/job/thumbnailer-ci/60/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-utopic-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-utopic-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-utopic-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-utopic-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/thumbnailer-ci/60/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:86
http://jenkins.qa.ubuntu.com/job/thumbnailer-ci/61/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-utopic-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-utopic-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-utopic-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-utopic-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/thumbnailer-ci/61/rebuild

review: Approve (continuous-integration)

[Michi Henning (michihenning)]

No longer applies.

review: Disapprove

Unmerged revisions

86. By Jussi Pakkanen on 2014-05-16

Even better.

85. By Jussi Pakkanen on 2014-05-16

Minor cleanup.

84. By Jussi Pakkanen on 2014-05-16

Validate app name with a regex.

=== modified file 'debian/control'
--- debian/control	2014-04-01 10:58:16 +0000
+++ debian/control	2014-05-16 13:26:13 +0000
@@ -4,6 +4,7 @@
 Maintainer: Ubuntu Core Developers <[e-mail]>
 Standards-Version: 3.9.4
 Build-Depends: cmake,
+               g++ (>= 4.9),
                debhelper (>= 9),
                gstreamer1.0-plugins-good,
                libexif-dev,

=== modified file 'src/thumbnailcache.cpp'
--- src/thumbnailcache.cpp	2014-02-20 16:39:51 +0000
+++ src/thumbnailcache.cpp	2014-05-16 13:26:13 +0000
@@ -35,6 +35,7 @@
 #include<vector>
 #include<algorithm>
 #include<dirent.h>
+#include<regex>
 
 using namespace std;
 
@@ -106,16 +107,21 @@
     if(numread == 0) {
         throw runtime_error("Could not read from /proc/self/attr/current.");
     }
+    // Output may or may not end in a newline.
+    if(data[numread-1] == '\n') {
+        numread--;
+    }
     data[numread] = '\0';
     string core(data);
-    string::size_type ind = core.find('_');
-    if(ind == string::npos) {
-        throw runtime_error("/proc/self/attr/current malformed, does not have _ in it.");
-    }
-    if(ind == 0) {
-        throw runtime_error("/proc/self/attr/current malformed, starts with '_'.");
-    }
-    return core.substr(0, ind);
+    regex re(R"(([a-z0-9][a-z0-9+.-]+)_[a-zA-Z0-9+.-]+_[0-9][a-zA-Z0-9.+:~-]*)");
+    smatch base_match;
+    // Match only returns true if entire input string matched.
+    if(!regex_match(core, base_match, re)) {
+        string m("Invalid ApplicationID: ");
+        m += core + ".";
+        throw runtime_error(m);
+    }
+    return base_match[1].str();
 }
 
 class ThumbnailCachePrivate {