Merge lp:~mardy/ubuntu-system-settings-online-accounts/dash-profile-1589444 into lp:ubuntu-system-settings-online-accounts

Proposed by Alberto Mardegan on 2016-06-06
Status: Merged
Approved by: Paweł Stołowski on 2016-06-07
Approved revision: 353
Merged at revision: 360
Proposed branch: lp:~mardy/ubuntu-system-settings-online-accounts/dash-profile-1589444
Merge into: lp:ubuntu-system-settings-online-accounts
Diff against target: 13 lines (+3/-0)
1 file modified
plugins/OnlineAccountsPlugin/application-manager.cpp (+3/-0)
To merge this branch: bzr merge lp:~mardy/ubuntu-system-settings-online-accounts/dash-profile-1589444
Reviewer Review Type Date Requested Status
Paweł Stołowski 2016-06-06 Approve on 2016-06-07
PS Jenkins bot continuous-integration Pending
Review via email: mp+296533@code.launchpad.net

Commit message

Treat the Unity8 dash as an unconfined process

Description of the change

Treat the Unity8 dash as an unconfined process

To post a comment you must log in.
Paweł Stołowski (stolowski) wrote :

This fixes the basic auth problem, but I see something odd with youtube scope only with run with my confined dash changes - the scope thinks it's not authorized and keeps displaying the login button. The button however doesn't trigger OA backend afaict (there is no output from OAU_LOGGING_LEVEL=2 OAU_DAEMON_TIMEOUT=9999 online-accounts-service), tapping it just re-executes the search.

Youtube scope executes the following code on every search to decide if "Log-in to youtube" button should be displayed:

 for (auto const& status : oa_client_->get_service_statuses()) {
            if (status.service_authenticated) {
                config_.authenticated = true;
                config_.access_token = status.access_token;
                config_.client_id = status.client_id;
                config_.client_secret = status.client_secret;
                break;
            }
        }

        if (!config_.authenticated) {
            std::cerr << "YouTube scope is unauthenticated" << std::endl;
        } else {
            std::cerr << "YouTube scope is authenticated" << std::endl;
        }

And I can see "YouTube scope is unauthenticated" all the time even after I succesfully authenticated, that means status.service_authenticated is false for all services.

Paweł Stołowski (stolowski) wrote :

Yeah, works fine with the signon-apparmor-extension, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/OnlineAccountsPlugin/application-manager.cpp'
2--- plugins/OnlineAccountsPlugin/application-manager.cpp 2016-03-31 09:57:19 +0000
3+++ plugins/OnlineAccountsPlugin/application-manager.cpp 2016-06-06 10:30:40 +0000
4@@ -81,6 +81,9 @@
5 {
6 /* We don't restrict unconfined apps. */
7 if (profile == QStringLiteral("unconfined")) return true;
8+ /* We don't restrict the Unity8 dash:
9+ * https://bugs.launchpad.net/bugs/1589444. */
10+ if (profile == QStringLiteral("unity8-dash")) return true;
11
12 /* It's a confined app. We must make sure that the applicationId it
13 * specified matches the apparmor profile.

Subscribers

People subscribed via source and target branches