Merge lp:~mardy/ubuntu-system-settings-online-accounts/unconfined-req-1582824 into lp:ubuntu-system-settings-online-accounts

Proposed by Alberto Mardegan on 2016-05-19
Status: Merged
Approved by: David Barth on 2016-06-13
Approved revision: 353
Merged at revision: 353
Proposed branch: lp:~mardy/ubuntu-system-settings-online-accounts/unconfined-req-1582824
Merge into: lp:ubuntu-system-settings-online-accounts
Diff against target: 17 lines (+7/-0)
1 file modified
online-accounts-ui/qml/ProviderRequest.qml (+7/-0)
To merge this branch: bzr merge lp:~mardy/ubuntu-system-settings-online-accounts/unconfined-req-1582824
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Pending
Online Accounts 2016-05-19 Pending
Review via email: mp+295196@code.launchpad.net

Commit Message

Immediately accept degenerate requests from unconfined processes

Description of the Change

Immediately accept degenerate requests from unconfined processes

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'online-accounts-ui/qml/ProviderRequest.qml'
2--- online-accounts-ui/qml/ProviderRequest.qml 2016-03-04 09:47:29 +0000
3+++ online-accounts-ui/qml/ProviderRequest.qml 2016-05-19 11:08:13 +0000
4@@ -43,6 +43,13 @@
5 denied()
6 return
7 }
8+ if (!application.id && accessModel.count == 1 &&
9+ applicationInfo.profile == "unconfined") {
10+ /* Degenerate case: unconfined app making requests with no valid
11+ * app ID */
12+ allowed(accountsModel.get(0, "accountId"))
13+ return
14+ }
15 loader.active = true
16 pageStack.push(mainPage)
17 }

Subscribers

People subscribed via source and target branches