Merge lp:~robertcarr/unity-mir/disable-authorizer-env into lp:unity-mir

[Robert Carr]

Add env variable to disable session authorizer for autopilot tests.

Add env variable to disable session authorizer for autopilot tests.

[Gerry Boland (gerboland)]

This should not be necessary. Apps can be launched not through shell in 2 ways:
1. using upstart-app-launch
2. by calling a binary, and appending a "--desktop_file_hint=/path/to/desktopfile.desktop" to the command line

review: Disapprove

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:97
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/86/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/86
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/86/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-i386-ci/86

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-mir-ci/86/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

Sitting in queue, and not needed any more. Rejecting

Unmerged revisions

97. By Robert Carr on 2013-10-01

Add session authorizer env variable

=== modified file 'src/unity-mir/shellserverconfiguration.cpp'
--- src/unity-mir/shellserverconfiguration.cpp	2013-08-21 23:10:11 +0000
+++ src/unity-mir/shellserverconfiguration.cpp	2013-10-01 21:11:33 +0000
@@ -27,6 +27,9 @@
 // mir
 #include "mir/shell/organising_surface_factory.h"
 
+// TODO: Remove after session authorization hack can be removed ~ racarr
+#include <stdlib.h>
+
 namespace msh = mir::shell;
 namespace ms = mir::surfaces;
 
@@ -84,11 +87,20 @@
 std::shared_ptr<mir::frontend::SessionAuthorizer>
 ShellServerConfiguration::the_session_authorizer()
 {
-    return session_authorizer(
-    [this]()
-    {
-        return std::make_shared<SessionAuthorizer>(the_session_manager());
-    });
+    auto disable_authorizer = getenv("UNITY_MIR_DISABLE_SESSION_AUTHORIZER");
+    
+    if (!disable_authorizer)
+    {
+        return session_authorizer(
+        [this]()
+        {
+            return std::make_shared<SessionAuthorizer>(the_session_manager());
+        });
+    }
+    else
+    {
+        return DefaultServerConfiguration::the_session_authorizer();
+    }
 }
 
 // FIXME: Needed to detect the shell's surface - there must be a better way