Merge lp:~zeller-benjamin/qtcreator-plugin-ubuntu/show-apparmor-denials into lp:qtcreator-plugin-ubuntu

[Benjamin Zeller]

Fix Bug lp:1362028 "SDK not able to provide further hint about missing apparmor policy"

Fix Bug lp:1362028 "SDK not able to provide further hint about missing apparmor policy"

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:392
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/547/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-wily-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-wily-armhf-ci/8

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/547/rebuild

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

OK

[Zoltan Balogh (bzoltan)]

review: Approve

=== modified file 'share/qtcreator/ubuntu/scripts/qtc_device_applaunch.py'
--- share/qtcreator/ubuntu/scripts/qtc_device_applaunch.py	2014-12-03 10:21:22 +0000
+++ share/qtcreator/ubuntu/scripts/qtc_device_applaunch.py	2015-06-01 14:33:22 +0000
@@ -47,6 +47,20 @@
 #make glib the default dbus event loop
 dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
 
+#--------------------------- globals ------------------------------
+
+#buffer for the syslog output, always contains the last or parts of the last line 
+syslogBuffer=""
+hook_name = None
+package_name = None
+package_version = None
+package_arch = None
+manifest = None
+app_id = None
+tmp_dir = "/tmp/"
+apparmor_path = None
+skip_apparmor_denials = 3
+
 # Runner to handle scopes
 class ScopeRunner(dbus.service.Object):
     def __init__(self,appid,loop):
@@ -167,6 +181,18 @@
     print("Sdk-Launcher> Received exit signal, stopping application",flush=True)
     runner.stop()
 
+def prepareFileHandle(handle, callback):
+    # make handle non-blocking:
+    fl = fcntl.fcntl(handle, fcntl.F_GETFL)
+    fcntl.fcntl(handle, fcntl.F_SETFL, fl | os.O_NONBLOCK)
+
+    if GObject.pygobject_version < (3,7,2):
+        GObject.io_add_watch(handle,GObject.IO_IN | GObject.IO_HUP,callback)
+    else:
+        GLib.io_add_watch(handle,GLib.PRIORITY_DEFAULT,GObject.IO_IN | GObject.IO_HUP,callback)
+
+    return handle
+
 def create_procpipe(path,callback):
     if(os.path.exists(path)):
         os.unlink(path)
@@ -174,16 +200,7 @@
     os.mkfifo(path)
     pipe = os.open(path,os.O_RDONLY | os.O_NONBLOCK)
 
-    # make pipe non-blocking:
-    fl = fcntl.fcntl(pipe, fcntl.F_GETFL)
-    fcntl.fcntl(pipe, fcntl.F_SETFL, fl | os.O_NONBLOCK)
-
-    if GObject.pygobject_version < (3,7,2):
-        GObject.io_add_watch(pipe,GObject.IO_IN | GObject.IO_HUP,callback)
-    else:
-        GLib.io_add_watch(pipe,GLib.PRIORITY_DEFAULT,GObject.IO_IN | GObject.IO_HUP,callback)
-
-    return pipe
+    return prepareFileHandle(pipe, callback)
 
 def readPipe(pipe):
     output=""
@@ -211,6 +228,53 @@
     print (output ,file=sys.stderr,end="",flush=True)
     return True
 
+def create_filelistener(path, callback):
+    if(not os.path.exists(path)):
+        return None
+
+    handle = os.open(path,os.O_RDONLY | os.O_NONBLOCK)
+    os.lseek(handle,0,os.SEEK_END)
+
+    return prepareFileHandle(handle, callback)
+
+def filter_syslog_line(line):
+    global skip_apparmor_denials
+
+    if app_id in line:
+        if skip_apparmor_denials > 0:
+            skip_apparmor_denials-=1
+            return
+        sys.stderr.write("Sdk-Launcher> There has been a AppArmor denial for your application.\n")
+        sys.stderr.write("Sdk-Launcher> Most likely it is missing a policy in the AppArmor file.\n")
+        
+        # do not change this line, it is interpreted by QtCreator 
+        sys.stderr.write("Syslog> "+line)
+
+def on_syslog_update(fd, condition):
+    global syslogBuffer
+
+    while True:
+        chunk = os.read(fd,256).decode();
+        if (len(chunk) == 0):
+            break
+
+        syslogBuffer += chunk
+        
+    if len(syslogBuffer) <= 0 :
+        return True
+
+    #read the buffer and filter every complete line    
+    try:
+        while(True):
+            idx = syslogBuffer.index("\n")
+            line = syslogBuffer[0:idx+1]
+            syslogBuffer = syslogBuffer[idx+1:]
+            filter_syslog_line(line)
+    except ValueError:
+        pass
+    
+    return True
+
 def is_confined (manifest_obj, hook_name):
     if "apparmor" not in manifest_obj['hooks'][hook_name]:
         raise Exception("Error: Invalid Manifest file")
@@ -286,15 +350,6 @@
     conf_obj['qmlDebug'] = options.qmlDebug
     print("Sdk-Launcher> QML Debug Settings:"+options.qmlDebug,flush=True)
 
-hook_name = None
-package_name = None
-package_version = None
-package_arch = None
-manifest = None
-app_id = None
-tmp_dir = "/tmp/"
-apparmor_path = None
-
 #get the manifest information from the click package
 try:
     manifest_json = subprocess.check_output(["click","info",options.clickPck])
@@ -439,6 +494,9 @@
     stderrPipeName = tmp_dir+app_id+".stderr"
     procStdErr = create_procpipe(stderrPipeName,on_proc_stderr)
 
+    syslogFileName = "/var/log/syslog"
+    syslogHandle = create_filelistener("/var/log/syslog",on_syslog_update)
+
     if "unix_signal_add" in dir(GLib):
         GLib.unix_signal_add(GLib.PRIORITY_HIGH, signal.SIGTERM, on_sigterm, runner)
         GLib.unix_signal_add(GLib.PRIORITY_HIGH, signal.SIGINT, on_sigterm, runner)
@@ -482,6 +540,9 @@
     os.close(procStdErr)
     os.unlink(stderrPipeName)
 
+if (syslogHandle):
+    os.close(syslogHandle)
+
 if (options.noUninstall):
     print("Sdk-Launcher> Skipping uninstall step (--no-uninstall)")
 else:

=== modified file 'src/ubuntu/ubunturemoterunner.cpp'
--- src/ubuntu/ubunturemoterunner.cpp	2014-09-25 09:21:23 +0000
+++ src/ubuntu/ubunturemoterunner.cpp	2015-06-01 14:33:22 +0000
@@ -5,6 +5,8 @@
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
 #include <ssh/sshconnection.h>
+#include <projectexplorer/taskhub.h>
+#include <projectexplorer/projectexplorerconstants.h>
 
 #include <QProcess>
 #include <QPointer>
@@ -268,12 +270,21 @@
     QTC_ASSERT(!d->m_proc.isNull(),return);
 
     QByteArray output = d->m_proc->readAllStandardError();
-    if (d->m_launcherPid <= 0 || d->m_appPid <= 0) {
-        d->m_launcherOutput.append( QString::fromUtf8(output) );
+    d->m_launcherOutput.append( QString::fromUtf8(output) );
+
+    while(true) {
+        int idx = d->m_launcherOutput.indexOf(QStringLiteral("\n"));
+        if (idx < 0)
+            break;
+
+        QString line = d->m_launcherOutput.mid(0,idx).trimmed();
+        d->m_launcherOutput = d->m_launcherOutput.mid(idx+1);
+
+        if (debug) { qDebug()<<"Processing Line: "<<line; }
 
         if (d->m_launcherPid <= 0) {
             QRegularExpression exp (QStringLiteral("Launcher PID: ([0-9]+)"));
-            QRegularExpressionMatch match = exp.match(d->m_launcherOutput);
+            QRegularExpressionMatch match = exp.match(line);
             if(match.hasMatch()) {
                 bool ok = false;
                 d->m_launcherPid = match.captured(1).toInt(&ok);
@@ -292,7 +303,7 @@
 
         if (d->m_appPid <= 0) {
             QRegularExpression exp (QStringLiteral("Application started: ([0-9]+)"));
-            QRegularExpressionMatch match = exp.match(d->m_launcherOutput);
+            QRegularExpressionMatch match = exp.match(line);
             if(match.hasMatch()) {
                 bool ok = false;
                 d->m_appPid = match.captured(1).toInt(&ok);
@@ -305,7 +316,19 @@
                 }
             }
         }
+
+        if (line.startsWith(QStringLiteral("Syslog>")) && line.contains(QStringLiteral("apparmor=\"DENIED\""))) {
+            if (debug) { qDebug()<<"Found a AppArmor denial"; }
+            //remove the prompt
+            line = line.mid(7);
+
+            if (debug) { qDebug()<<"Reporting a AppArmor denial "; }
+            ProjectExplorer::TaskHub::addTask(ProjectExplorer::Task::Error,
+                                              tr("There has been a AppArmor denial for the application. It usually means it is missing a policy in the AppArmor file:\n%1").arg(line),
+                                              ProjectExplorer::Constants::TASK_CATEGORY_DEPLOYMENT);
+        }
     }
+
     emit launcherStderr(output);
 }