Merge lp:~alan-griffiths/mir/fix-1377968-backport-to-0.8 into lp:mir/0.8

[Alan Griffiths]

trusted prompt sessions: starting a prompt session with an invalid application pid reports an error (LP: #1377968)

Backport fix-1377968

[Alberto Aguirre (albaguirre)]

Ok.

review: Approve

[Daniel van Vugt (vanvugt)]

Seems to be identical to what's already approved and landed on trunk.

review: Approve

=== modified file 'src/server/scene/prompt_session_manager_impl.cpp'
--- src/server/scene/prompt_session_manager_impl.cpp	2014-09-11 05:51:44 +0000
+++ src/server/scene/prompt_session_manager_impl.cpp	2014-12-04 11:11:19 +0000
@@ -109,6 +109,19 @@
     PromptSessionCreationParameters const& params) const
 {
     auto prompt_session = std::make_shared<PromptSession>();
+    std::shared_ptr<Session> application_session;
+
+    app_container->for_each(
+    [&](std::shared_ptr<Session> const& session)
+    {
+        if (session->process_id() == params.application_pid)
+        {
+            application_session = session;
+        }
+    });
+
+    if (!application_session)
+        BOOST_THROW_EXCEPTION(std::runtime_error("Could not identify application session"));
 
     std::lock_guard<std::mutex> lock(prompt_sessions_mutex);
 
@@ -119,14 +132,7 @@
     session->start_prompt_session();
     prompt_session_listener->starting(prompt_session);
 
-    app_container->for_each(
-    [&](std::shared_ptr<Session> const& session)
-    {
-        if (session->process_id() == params.application_pid)
-        {
-            prompt_session_container->insert_participant(prompt_session.get(), session, PromptSessionContainer::ParticipantType::application);
-        }
-    });
+    prompt_session_container->insert_participant(prompt_session.get(), application_session, PromptSessionContainer::ParticipantType::application);
 
     return prompt_session;
 }

=== modified file 'tests/acceptance-tests/test_prompt_session_client_api.cpp'
--- tests/acceptance-tests/test_prompt_session_client_api.cpp	2014-09-30 06:11:33 +0000
+++ tests/acceptance-tests/test_prompt_session_client_api.cpp	2014-12-04 11:11:19 +0000
@@ -552,3 +552,20 @@
 
     mir_prompt_session_release_sync(prompt_session);
 }
+
+// lp:1377968
+TEST_F(PromptSessionClientAPI, when_application_pid_is_invalid_starting_a_prompt_session_fails)
+{
+    connection = mir_connect_sync(new_prompt_connection().c_str(), __PRETTY_FUNCTION__);
+
+    EXPECT_CALL(*the_mock_prompt_session_listener(), starting(_)).Times(0);
+
+    MirPromptSession* prompt_session = mir_connection_create_prompt_session_sync(
+        connection, ~application_session_pid, null_state_change_callback, this);
+
+    EXPECT_THAT(mir_prompt_session_is_valid(prompt_session), Eq(false));
+    EXPECT_THAT(mir_prompt_session_error_message(prompt_session),
+        HasSubstr("Could not identify application"));
+
+    mir_prompt_session_release_sync(prompt_session);
+}

=== modified file 'tests/integration-tests/frontend/test_session_mediator_report.cpp'
--- tests/integration-tests/frontend/test_session_mediator_report.cpp	2014-09-24 03:38:59 +0000
+++ tests/integration-tests/frontend/test_session_mediator_report.cpp	2014-12-04 11:11:19 +0000
@@ -510,6 +510,8 @@
 
             client.wait_for_connect_done();
 
+            client.prompt_session_parameters.set_application_pid(getpid());
+
             client.display_server.start_prompt_session(
                 0,
                 &client.prompt_session_parameters,