Merge lp:~gerboland/unity-mir/clean-up-authorisation into lp:unity-mir

[Gerry Boland]

Clean up session authorization code, emit message on denial

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

29 + LOG("ApplicationManager::authorizedSessionName REJECTED connection from app with pid %lld", pid);

Should be authorizedSession.

=====

73 + Q_EMIT requestAuthorizationForSession(pid, authorized); // needs to block until authorizedName returned

Doesn't return authorizedName anymore, does it?

review: Needs Fixing

[lp:~gerboland/unity-mir/clean-up-authorisation]

35. By Gerry Boland on 2013-08-15

Update comments to reflect method name change

36. By Gerry Boland on 2013-08-15

Update comment to reflect parameter name and type change

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

review: Approve

=== modified file 'src/modules/Unity/ApplicationManager/application_manager.cpp'
--- src/modules/Unity/ApplicationManager/application_manager.cpp	2013-08-09 13:16:13 +0000
+++ src/modules/Unity/ApplicationManager/application_manager.cpp	2013-08-15 15:15:37 +0000
@@ -72,7 +72,7 @@
             = std::dynamic_pointer_cast<SessionAuthorizer>(m_mirServer->the_session_authorizer());
 
     QObject::connect(sessionAuthorizer.get(), &SessionAuthorizer::requestAuthorizationForSession,
-                     this, &ApplicationManager::authorizedSessionName, Qt::BlockingQueuedConnection);
+                     this, &ApplicationManager::authorizedSession, Qt::BlockingQueuedConnection);
 
     // we use random numbers, so seed the generator
     qsrand(QTime::currentTime().msec());
@@ -235,16 +235,17 @@
 
 /************************************* Mir-side methods *************************************/
 
-void ApplicationManager::authorizedSessionName(const quint64 pid, QString& authorizedName)
+void ApplicationManager::authorizedSession(const quint64 pid, bool &authorized)
 {
-    DLOG("ApplicationManager::authorizedSessionName (this=%p, pid=%lld)", this, pid);
+    DLOG("ApplicationManager::authorizedSession (this=%p, pid=%lld)", this, pid);
     Application* application = m_mainStageApplications->getApplicationWithPid(pid);
     if (application) {
         QString name = application->appId() + QString::number(qrand());
         application->setSessionName(name);
-        authorizedName = name;
+        authorized = true;
     } else {
-        authorizedName = QString(); // i.e. do not authorize //TODO(greyback) dislike
+        LOG("ApplicationManager::authorizedSession REJECTED connection from app with pid %lld", pid);
+        authorized = false;
     }
 }
 
 
=== modified file 'src/modules/Unity/ApplicationManager/application_manager.h'
--- src/modules/Unity/ApplicationManager/application_manager.h	2013-08-09 13:16:13 +0000
+++ src/modules/Unity/ApplicationManager/application_manager.h	2013-08-15 15:15:37 +0000
@@ -85,14 +85,14 @@
     Q_INVOKABLE Application* startProcess(QString desktopFile, ExecFlags flags = NoFlag, QStringList arguments = QStringList());
     Q_INVOKABLE void stopProcess(Application* application);
 
-    void authorizedSessionName(const quint64 pid, QString &authorizedName);
-
 Q_SIGNALS:
     void mainStageApplicationsChanged();
     void mainStageFocusedApplicationChanged();
     void focusRequested(FavoriteApplication favoriteApplication);
 
 public Q_SLOTS:
+    void authorizedSession(const quint64 pid, bool &authorized);
+
     void sessionStarting(std::shared_ptr<mir::shell::ApplicationSession> const& session);
     void sessionStopping(std::shared_ptr<mir::shell::ApplicationSession> const& session);
     void sessionFocused(std::shared_ptr<mir::shell::ApplicationSession> const& session);
 
=== modified file 'src/unity-mir/sessionauthorizer.cpp'
--- src/unity-mir/sessionauthorizer.cpp	2013-08-09 13:16:13 +0000
+++ src/unity-mir/sessionauthorizer.cpp	2013-08-15 15:15:37 +0000
@@ -30,14 +30,10 @@
 bool SessionAuthorizer::connection_is_allowed(pid_t pid)
 {
     DLOG("SessionAuthorizer::connection_is_allowed (this=%p, pid=%d", this, pid);
-
-    QString authorizedName;
-    Q_EMIT requestAuthorizationForSession(pid, authorizedName); // needs to block until authorizedName returned
-
-    if (!authorizedName.isNull()) {
-        return true;
-    }
-    return false;
+    bool authorized = true;
+
+    Q_EMIT requestAuthorizationForSession(pid, authorized); // needs to block until authorized value returned
+    return authorized;
 }
 
 bool SessionAuthorizer::configure_display_is_allowed(pid_t pid)
 
=== modified file 'src/unity-mir/sessionauthorizer.h'
--- src/unity-mir/sessionauthorizer.h	2013-08-09 13:16:13 +0000
+++ src/unity-mir/sessionauthorizer.h	2013-08-15 15:15:37 +0000
@@ -39,8 +39,8 @@
     virtual bool configure_display_is_allowed(pid_t pid) override;
 
 Q_SIGNALS:
-    // needs to be blocked queued signal which returns value for authorizedName
-    void requestAuthorizationForSession(const quint64& pid, QString& authorizedName);
+    // needs to be blocked queued signal which returns value for authorized
+    void requestAuthorizationForSession(const quint64 &pid, bool &authorized);
 };
 
 #endif // SESSIONAUTHORIZER_H