Merge lp:~townsend/libertine/detect-sudo into lp:libertine

[Christopher Townsend]

Check to see if libertine-container-manager is ran using sudo and if so, print a message and exit.

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:204
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/183/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/generic-ci-generate-dsc/186
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/145
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/145
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/145
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/145
    None: https://jenkins.canonical.com/libertine/job/libertine-ci-update-mp/1081/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/183/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

As Larry pointed out, running the libertine GUI via sudo has some consequences as well, so I should put in something in libertine to exit if it's invoked via sudo.

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:205
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/184/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/generic-ci-generate-dsc/187
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/146
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/146
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/146
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/146
    None: https://jenkins.canonical.com/libertine/job/libertine-ci-update-mp/1082/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/184/rebuild

review: Approve (continuous-integration)

[Larry Price (larryprice)]

Looks good, blocks me from running as sudo as stated.

review: Approve

=== modified file 'libertine/main.cpp'
--- libertine/main.cpp	2015-05-13 13:42:12 +0000
+++ libertine/main.cpp	2016-04-18 13:56:57 +0000
@@ -19,10 +19,18 @@
 #include "libertine/config.h"
 #include "libertine/libertine.h"
 
+#include <unistd.h>
+#include <QtCore/QDebug>
 
 int
 main(int argc, char* argv[])
 {
+  if (!geteuid())
+  {
+    qWarning() << "Please do not run " LIBERTINE_APPLICATION_NAME " using \'sudo\'.";
+    exit(1);
+  }
+
   Libertine app(argc, argv);
   return app.exec();
 }

=== modified file 'tools/libertine-container-manager'
--- tools/libertine-container-manager	2016-04-14 17:05:21 +0000
+++ tools/libertine-container-manager	2016-04-18 13:56:57 +0000
@@ -531,6 +531,11 @@
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description="Legacy X application support for Unity 8")
+
+    if not os.geteuid():
+        print("Please do not run %s using sudo" % parser.prog)
+        sys.exit(1)
+
     parser.add_argument('-q', '--quiet',
                         action='store_const', dest='verbosity', const=0,
                         help=('do not print status updates on stdout'))