Merge lp:~mardy/ubuntuone-credentials/lp1376445-migration-vivid into lp:ubuntuone-credentials

[Alberto Mardegan]

Upgrades the ACL of U1 accounts registered in the Online Accounts database.
Add dependencies on sqlite3 and account-plugin-tools for migration script.

Upgrades the ACL of U1 accounts registered in the Online Accounts database. This avoids the bug where older accounts are removed by the u1 code to force their re-creation.

[dobey (dobey)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:177
http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-ci/119/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-vivid-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-vivid-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-vivid-armhf-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-vivid-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntuone-credentials-ci/119/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

review: Needs Fixing

[lp:~mardy/ubuntuone-credentials/lp1376445-migration-vivid]

178. By Alberto Mardegan on 2015-03-12

Do actually install the script

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:178
http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-ci/121/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-vivid-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-vivid-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-vivid-armhf-ci/9/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-vivid-i386-ci/9

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntuone-credentials-ci/121/rebuild

review: Approve (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

review: Approve

[dobey (dobey)]

This still needs the updated script that was included in the RTM MP (and which landed there).

review: Needs Fixing

[lp:~mardy/ubuntuone-credentials/lp1376445-migration-vivid]

179. By Alberto Mardegan on 2015-04-01

Sync with RTM

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:179
http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-ci/122/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-vivid-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-vivid-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-vivid-armhf-ci/10/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-vivid-i386-ci/10

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntuone-credentials-ci/122/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

=== added directory 'acl-updater'
=== added file 'acl-updater/acl-updater'
--- acl-updater/acl-updater	1970-01-01 00:00:00 +0000
+++ acl-updater/acl-updater	2015-04-01 14:26:49 +0000
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+
+export LC_ALL=C
+SIGNON_DB="$HOME/.config/signond/signon.db"
+
+ACCOUNT_ID=`account-console list | grep -i ubuntuone | grep -o '[0-9]\+'`
+if [ -z $ACCOUNT_ID ]; then
+	echo "no U1 account found; exiting"
+	exit 1
+fi
+CREDS_ID=`account-console show $ACCOUNT_ID | grep CredentialsId | grep -o '[0-9]\+'`
+if [ -z $CREDS_ID ]; then
+	echo "no U1 account found; exiting"
+	exit 1
+fi
+
+echo "Upgrading ACL for U1 account (id:$CREDS_ID)"
+
+# ensure the 'unconfined' element exists in the table
+UNCONFINED=`sqlite3 $SIGNON_DB 'select id from TOKENS where token="unconfined"'`
+if [ -z $UNCONFINED ]; then
+	sqlite3 $SIGNON_DB 'insert or ignore into TOKENS(token) values ("unconfined")'
+fi
+
+# add the ACL to protect the U1 account
+sqlite3 $SIGNON_DB "insert or ignore into ACL (identity_id, token_id) values ($CREDS_ID, (select id from TOKENS where token='unconfined'))"
+
+echo "done"

=== modified file 'debian/control'
--- debian/control	2015-03-09 17:11:54 +0000
+++ debian/control	2015-04-01 14:26:49 +0000
@@ -4,6 +4,7 @@
 Build-Depends:
  cmake,
  debhelper (>= 9),
+ dh-migrations,
  libaccounts-qt5-dev,
  liboauth-dev,
  libsignon-qt5-dev,
@@ -71,7 +72,9 @@
  multiarch-support,
  ${misc:Pre-Depends},
 Depends:
+ account-plugin-tools,
  signon-plugin-password,
+ sqlite3,
  ubuntuone-credentials-common (= ${source:Version}),
  ${misc:Depends},
  ${shlibs:Depends},

=== added file 'debian/libubuntuoneauth-2.0-0.migrations'
--- debian/libubuntuoneauth-2.0-0.migrations	1970-01-01 00:00:00 +0000
+++ debian/libubuntuoneauth-2.0-0.migrations	2015-04-01 14:26:49 +0000
@@ -0,0 +1,1 @@
+acl-updater/acl-updater

=== modified file 'debian/rules'
--- debian/rules	2014-07-24 14:12:32 +0000
+++ debian/rules	2015-04-01 14:26:49 +0000
@@ -7,7 +7,7 @@
 
 
 %:
-	dh $@ --buildsystem cmake --fail-missing
+	dh $@ --buildsystem cmake --fail-missing --with migrations
 
 override_dh_auto_configure:
 	dh_auto_configure -- -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH)