unity-mir

Merge lp://qastaging/~nick-dedekind/unity-mir/trusted-sessions into lp://qastaging/unity-mir

trusted-sessions
Merge into trunk

Proposed by Nick Dedekind on 2014-03-13

Status:	Superseded
Proposed branch:	lp://qastaging/~nick-dedekind/unity-mir/trusted-sessions
Merge into:	lp://qastaging/unity-mir
Diff against target:	1943 lines (+922/-141) 30 files modified debian/control (+4/-4) src/modules/Unity/Application/CMakeLists.txt (+5/-2) src/modules/Unity/Application/application.cpp (+84/-11) src/modules/Unity/Application/application.h (+19/-3) src/modules/Unity/Application/application_manager.cpp (+268/-79) src/modules/Unity/Application/application_manager.h (+26/-7) src/modules/Unity/Application/applicationscreenshotprovider.cpp (+2/-1) src/modules/Unity/Application/dbuswindowstack.cpp (+1/-1) src/modules/Unity/Application/mirsurface.cpp (+4/-4) src/modules/Unity/Application/mirsurface.h (+4/-4) src/modules/Unity/Application/mirsurfacemanager.cpp (+26/-13) src/modules/Unity/Application/proc_info.cpp (+18/-0) src/modules/Unity/Application/proc_info.h (+3/-0) src/modules/Unity/Application/promptsession.cpp (+74/-0) src/modules/Unity/Application/promptsession.h (+62/-0) src/modules/Unity/Application/session.cpp (+54/-0) src/modules/Unity/Application/session.h (+53/-0) src/unity-mir/CMakeLists.txt (+2/-0) src/unity-mir/focussetter.cpp (+3/-2) src/unity-mir/promptsessionlistener.cpp (+60/-0) src/unity-mir/promptsessionlistener.h (+45/-0) src/unity-mir/qmirserver.cpp (+1/-0) src/unity-mir/sessionauthorizer.cpp (+0/-1) src/unity-mir/shellserverconfiguration.cpp (+20/-1) src/unity-mir/shellserverconfiguration.h (+4/-0) tests/CMakeLists.txt (+1/-0) tests/application_manager_test.cpp (+12/-6) tests/mock_proc_info.h (+6/-1) tests/mock_prompt_session_manager.h (+57/-0) tests/mock_session.h (+4/-1)
To merge this branch:	bzr merge lp://qastaging/~nick-dedekind/unity-mir/trusted-sessions
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Gerry Boland (community)		2014-03-13	Needs Information on 2014-06-03
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-06-03
Review via email: mp+210775@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2014-06-17.

Commit message

Shell implementation of Mir trust sessions.

Description of the change

Shell implementation of Mir trust sessions.
Requires lp:~nick-dedekind/mir/trusted_sessions to land

A mir trust session consists of any number of mir sessions arranged into a parent hierarchy. The last child of the hierarchy is the session which is considered to be the top focused session at all times if the unity-mir Application is in focus.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-13:

FAILED: Continuous integration, rev:178
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/294/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/157/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/158/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/157/console

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

review: Needs Fixing (continuous-integration)

lp://qastaging/~nick-dedekind/unity-mir/trusted-sessions updated on 2014-04-17

179. By Nick Dedekind on 2014-03-18: Updated for changes to trust sessions
180. By Nick Dedekind on 2014-04-12: merged with trunk
181. By Nick Dedekind on 2014-04-12: Added trust session listener
182. By Nick Dedekind on 2014-04-15: Changes for trust sessions
183. By Nick Dedekind on 2014-04-15: merged with trunk
184. By Nick Dedekind on 2014-04-17: better trust session handling

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-17:

FAILED: Continuous integration, rev:184
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/325/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/188/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/189/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/188/console

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

review: Needs Fixing (continuous-integration)

lp://qastaging/~nick-dedekind/unity-mir/trusted-sessions updated on 2014-05-20

185. By Nick Dedekind on 2014-04-24: changes reqired for trust session
186. By Nick Dedekind on 2014-05-15: merged with mir 0.2 changes
187. By Nick Dedekind on 2014-05-20: more changes for trust session api

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-20:

FAILED: Continuous integration, rev:187
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/345/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/9/console

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

review: Needs Fixing (continuous-integration)

lp://qastaging/~nick-dedekind/unity-mir/trusted-sessions updated on 2014-05-21

188. By Nick Dedekind on 2014-05-20: mir 0.2 rebase
189. By Nick Dedekind on 2014-05-21: merged with devel

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-21:

FAILED: Continuous integration, rev:189
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/347/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/11/console

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

review: Needs Fixing (continuous-integration)

lp://qastaging/~nick-dedekind/unity-mir/trusted-sessions updated on 2014-05-21

190. By Nick Dedekind on 2014-05-21: updated mock_shell for MirTrustSessionAddTrustResult removal

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-21:

FAILED: Continuous integration, rev:190
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/348/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/12/console

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

review: Needs Fixing (continuous-integration)

lp://qastaging/~nick-dedekind/unity-mir/trusted-sessions updated on 2014-05-23

191. By Nick Dedekind on 2014-05-22: mir trust_session_manager changes
192. By Nick Dedekind on 2014-05-23: renaming of trust session manager interface functions

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-23:

FAILED: Continuous integration, rev:192
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/354/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/18/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/18/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/18/console

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

review: Needs Fixing (continuous-integration)

lp://qastaging/~nick-dedekind/unity-mir/trusted-sessions updated on 2014-05-23

193. By Nick Dedekind on 2014-05-23: merge with devel

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-23:

FAILED: Continuous integration, rev:193
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/355/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/19/console

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

review: Needs Fixing (continuous-integration)

lp://qastaging/~nick-dedekind/unity-mir/trusted-sessions updated on 2014-05-23

194. By Nick Dedekind on 2014-05-23: fixed tests

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-23:

FAILED: Continuous integration, rev:194
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/356/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/20/console

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

review: Needs Fixing (continuous-integration)

lp://qastaging/~nick-dedekind/unity-mir/trusted-sessions updated on 2014-05-23

195. By Nick Dedekind on 2014-05-23: update trust helper auth
196. By Nick Dedekind on 2014-05-23: use trust manager for stopping session. Removed frontend::Shell references

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-23:

FAILED: Continuous integration, rev:196
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/358/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/22/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/22/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/22/console

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

review: Needs Fixing (continuous-integration)

lp://qastaging/~nick-dedekind/unity-mir/trusted-sessions updated on 2014-05-27

197. By Nick Dedekind on 2014-05-27: session/surface changes cause screenshot update.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-27:

FAILED: Continuous integration, rev:197
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/364/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/28/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/28/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/28/console

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

review: Needs Fixing (continuous-integration)

lp://qastaging/~nick-dedekind/unity-mir/trusted-sessions updated on 2014-05-29

198. By Nick Dedekind on 2014-05-29: sessions added to list, not pid map
199. By Nick Dedekind on 2014-05-29: updated trust session listener function names

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-29:

FAILED: Continuous integration, rev:199
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/365/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/29/console

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

review: Needs Fixing (continuous-integration)

lp://qastaging/~nick-dedekind/unity-mir/trusted-sessions updated on 2014-06-03

200. By Nick Dedekind on 2014-06-03: updated mir requirements

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-06-03:

FAILED: Continuous integration, rev:200
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/369/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/33/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/33/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/33/console

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

review: Needs Fixing (continuous-integration)

lp://qastaging/~nick-dedekind/unity-mir/trusted-sessions updated on 2014-06-03

201. By Nick Dedekind on 2014-06-03: merged with trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-06-03:

FAILED: Continuous integration, rev:201
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/371/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/35/console

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

review: Needs Fixing (continuous-integration)

lp://qastaging/~nick-dedekind/unity-mir/trusted-sessions updated on 2014-06-03

202. By Nick Dedekind on 2014-06-03: rename trusted_participant_starting/stopping to participant_added/removed

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-06-03:

FAILED: Continuous integration, rev:202
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/372/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/36/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Gerry Boland (gerboland) wrote on 2014-06-03:

Is this actually ready for review? If not, please mark as Work in Progress

review: Needs Information

lp://qastaging/~nick-dedekind/unity-mir/trusted-sessions updated on 2014-07-15

203. By Nick Dedekind on 2014-06-16: s/trust/prompt
204. By Nick Dedekind on 2014-06-17: merged with compatibility branch
205. By Nick Dedekind on 2014-06-17: Fixed some focus issues
206. By Nick Dedekind on 2014-06-19: merged with trunk
207. By Nick Dedekind on 2014-06-19: fixed ApplicationManagerTests.onceAppAddedToApplicationLists_mirSurfaceCreatedEventHandled
208. By Nick Dedekind on 2014-06-20: simplify a bit
209. By Nick Dedekind on 2014-06-20: added prompt session unit tests
210. By Nick Dedekind on 2014-06-20: removed test comments
211. By Nick Dedekind on 2014-06-24: removed unitymir::Session
212. By Nick Dedekind on 2014-06-24: removed unitymir::PromptSession.
213. By Nick Dedekind on 2014-06-24: reverted unnecessary changes
214. By Nick Dedekind on 2014-06-24: use process-cpp for ppid
215. By Nick Dedekind on 2014-06-24: style changes.
216. By Nick Dedekind on 2014-06-24: reverted whitespace changes
217. By Nick Dedekind on 2014-06-24: revert some more unnecessary changes
218. By Nick Dedekind on 2014-06-24: check session pointers
219. By Nick Dedekind on 2014-06-24: remove clear session
220. By Nick Dedekind on 2014-06-24: TYPE const& -> const TYPE&
221. By Nick Dedekind on 2014-06-24: renamed effectiveSession -> foregroundSession / promptSession -> activePromptSession
222. By Nick Dedekind on 2014-06-24: pushPromptSession -> appendPromptSession
223. By Nick Dedekind on 2014-06-24: namespace mir::scene -> ms
224. By Nick Dedekind on 2014-06-24: style updates
225. By Nick Dedekind on 2014-06-24: more review comments
226. By Nick Dedekind on 2014-06-25: test review comments
227. By Nick Dedekind on 2014-06-25: fixed up some screenshot signal duplication
228. By Nick Dedekind on 2014-06-25: removed whitespace
229. By Nick Dedekind on 2014-07-02: merged with trunk
230. By Nick Dedekind on 2014-07-03: fixed build
231. By Nick Dedekind on 2014-07-08: fixed dlog
232. By Nick Dedekind on 2014-07-10: merged with lp:~nick-dedekind/unity-mir/thready-screenshotting
233. By Nick Dedekind on 2014-07-11: remerged with thready branch
234. By Nick Dedekind on 2014-07-15: remove authorise dodgeys for prompt sessions
235. By Nick Dedekind on 2014-07-15: reverted changes to debian/control & debian/changelog
236. By Nick Dedekind on 2014-07-15: bumped to 0.5

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes:

Gerry Boland

Mir development team

Nick Dedekind