gds-sso 9.2.5 → 9.2.6

data/lib/gds-sso/version.rb

@@ -1,5 +1,5 @@
 module GDS
   module SSO
-    VERSION = "9.2.5"
+    VERSION = "9.2.6"
   end
 end

data/lib/gds-sso/warden_config.rb

@@ -17,16 +17,23 @@ end
 
 Warden::Manager.serialize_into_session do |user|
   if user.respond_to?(:uid) and user.uid
-    [user.uid, Time.now.utc]
+    [user.uid, Time.now.utc.iso8601]
   else
     nil
   end
 end
 
-Warden::Manager.serialize_from_session do |tuple|
-  # This will reject old sessions that don't have an auth_set time
-  uid, auth_set = tuple
-  if auth_set and (auth_set + GDS::SSO::Config.auth_valid_for) > Time.now.utc
+Warden::Manager.serialize_from_session do |(uid, auth_timestamp)|
+  # This will reject old sessions that don't have a previous login timestamp
+  if auth_timestamp.is_a?(String)
+    auth_timestamp = begin
+      Time.parse(auth_timestamp)
+    rescue ArgumentError
+      nil
+    end
+  end
+
+  if auth_timestamp and (auth_timestamp + GDS::SSO::Config.auth_valid_for) > Time.now.utc
     GDS::SSO::Config.user_klass.where(:uid => uid, :remotely_signed_out => false).first
   else
     nil

data/spec/fixtures/integration/signonotron2.sql

@@ -8,8 +8,8 @@ DELETE FROM `users`;
 -- Setup fixture data
 INSERT INTO `oauth_applications` (id, name, uid, secret, redirect_uri, created_at, updated_at, home_uri, description)
               VALUES (1,'GDS_SSO integration test','gds-sso-test','secret','http://www.example-client.com/auth/gds/callback','2012-04-19 13:26:54','2012-04-19 13:26:54', 'http://home.com', 'GDS_SSO integration test');
-INSERT INTO `users` (id, email, encrypted_password, created_at, updated_at, confirmed_at, name, uid, role)
-              VALUES (1,'test@example-client.com','$2a$04$MdMkVFwTq5GLJJkHS8GLIe6dK1.C4ozzba5ZS5Ks2b/NenVsMGGRW','2012-04-19 13:26:54','2012-04-19 13:26:54','2012-04-19 13:26:54','Test User','integration-uid', "normal");
+INSERT INTO `users` (id, email, encrypted_password, password_salt, created_at, updated_at, confirmed_at, name, uid, role)
+              VALUES (1,'test@example-client.com','bb8e19edbaa1e7721abe0faa5c1663a7685950093b8c7eceb0f2e3889bdea4c5f17ca97820b2c663edf46ea532d1a9baa04b680fc537b4de8a3f376dd28e3ffd','MpLsZ8q1UaAojTa6bTC6','2012-04-19 13:26:54','2012-04-19 13:26:54','2012-04-19 13:26:54','Test User','integration-uid', "normal");
 INSERT INTO `permissions` (id, user_id, application_id, permissions) VALUES (1,1,1,"---
 - signin
 ");

data/spec/internal/log/test.log

@@ -1,376 +1,376 @@
 Connecting to database specified by database.yml
-   (3.0ms)  select sqlite_version(*)
-   (163.8ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255) NOT NULL, "uid" varchar(255) NOT NULL, "email" varchar(255) NOT NULL, "remotely_signed_out" boolean, "permissions" text, "organisation_slug" varchar(255)) 
-   (27.1ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
-   (11.3ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (1.6ms)  select sqlite_version(*)
+   (11.3ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255) NOT NULL, "uid" varchar(255) NOT NULL, "email" varchar(255) NOT NULL, "remotely_signed_out" boolean, "permissions" text, "organisation_slug" varchar(255)) 
+   (8.8ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (8.0ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
    (0.1ms)  begin transaction
-  SQL (46.8ms)  INSERT INTO "users" ("email", "name", "organisation_slug", "permissions", "remotely_signed_out", "uid") VALUES (?, ?, ?, ?, ?, ?)  [["email", "old@domain.com"], ["name", "Moshua Jarshall"], ["organisation_slug", nil], ["permissions", "---\n- signin\n"], ["remotely_signed_out", nil], ["uid", "a1s2d34520"]]
-   (11.7ms)  commit transaction
+  SQL (26.9ms)  INSERT INTO "users" ("email", "name", "organisation_slug", "permissions", "remotely_signed_out", "uid") VALUES (?, ?, ?, ?, ?, ?)  [["email", "old@domain.com"], ["name", "Moshua Jarshall"], ["organisation_slug", nil], ["permissions", "---\n- signin\n"], ["remotely_signed_out", nil], ["uid", "a1s2d31105"]]
+   (11.3ms)  commit transaction
    (0.1ms)  begin transaction
-  SQL (0.2ms)  INSERT INTO "users" ("email", "name", "organisation_slug", "permissions", "remotely_signed_out", "uid") VALUES (?, ?, ?, ?, ?, ?)  [["email", "ssopushuser@legit.com"], ["name", "SSO Push user"], ["organisation_slug", nil], ["permissions", "---\n- signin\n- user_update_permission\n"], ["remotely_signed_out", nil], ["uid", "a1s2d39675"]]
-   (11.1ms)  commit transaction
+  SQL (0.2ms)  INSERT INTO "users" ("email", "name", "organisation_slug", "permissions", "remotely_signed_out", "uid") VALUES (?, ?, ?, ?, ?, ?)  [["email", "ssopushuser@legit.com"], ["name", "SSO Push user"], ["organisation_slug", nil], ["permissions", "---\n- signin\n- user_update_permission\n"], ["remotely_signed_out", nil], ["uid", "a1s2d32139"]]
+   (13.4ms)  commit transaction
 WARNING: Can't mass-assign protected attributes: uid, name, permissions
-Processing by Api::UserController#update as HTML
-  Parameters: {"uid"=>"a1s2d34520"}
-  Rendered /home/jenkins/workspace/govuk_gds_sso/app/views/authorisations/unauthorised.html.erb within layouts/unauthorised (0.3ms)
-Completed 403 Forbidden in 54.5ms (Views: 53.7ms | ActiveRecord: 0.0ms)
+Processing by Api::UserController#reauth as HTML
+  Parameters: {"uid"=>"a1s2d31105"}
+  Rendered /home/jenkins/workspace/govuk_gds_sso/app/views/authorisations/unauthorised.html.erb within layouts/unauthorised (0.2ms)
+Completed 403 Forbidden in 35.5ms (Views: 34.8ms | ActiveRecord: 0.0ms)
    (0.1ms)  begin transaction
-  SQL (0.2ms)  INSERT INTO "users" ("email", "name", "organisation_slug", "permissions", "remotely_signed_out", "uid") VALUES (?, ?, ?, ?, ?, ?)  [["email", "old@domain.com"], ["name", "Moshua Jarshall"], ["organisation_slug", nil], ["permissions", "---\n- signin\n"], ["remotely_signed_out", nil], ["uid", "a1s2d31715"]]
-   (10.6ms)  commit transaction
-   (0.0ms)  begin transaction
-  SQL (0.1ms)  INSERT INTO "users" ("email", "name", "organisation_slug", "permissions", "remotely_signed_out", "uid") VALUES (?, ?, ?, ?, ?, ?)  [["email", "ssopushuser@legit.com"], ["name", "SSO Push user"], ["organisation_slug", nil], ["permissions", "---\n- signin\n- user_update_permission\n"], ["remotely_signed_out", nil], ["uid", "a1s2d33143"]]
-   (18.6ms)  commit transaction
-Processing by Api::UserController#update as HTML
-  Parameters: {"uid"=>"a1s2d31715"}
-  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'a1s2d31715' LIMIT 1
-   (0.0ms)  begin transaction
-   (0.2ms)  UPDATE "users" SET "email" = 'user@domain.com', "name" = 'Joshua Marshall', "permissions" = '---
-- signin
-- new permission
-', "organisation_slug" = 'justice-league' WHERE "users"."id" = 3
-   (7.3ms)  commit transaction
-Completed 200 OK in 15.1ms (ActiveRecord: 7.8ms)
-  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 3]]
+  SQL (0.2ms)  INSERT INTO "users" ("email", "name", "organisation_slug", "permissions", "remotely_signed_out", "uid") VALUES (?, ?, ?, ?, ?, ?)  [["email", "old@domain.com"], ["name", "Moshua Jarshall"], ["organisation_slug", nil], ["permissions", "---\n- signin\n"], ["remotely_signed_out", nil], ["uid", "a1s2d31032"]]
+   (11.2ms)  commit transaction
    (0.1ms)  begin transaction
-  SQL (0.2ms)  INSERT INTO "users" ("email", "name", "organisation_slug", "permissions", "remotely_signed_out", "uid") VALUES (?, ?, ?, ?, ?, ?)  [["email", "old@domain.com"], ["name", "Moshua Jarshall"], ["organisation_slug", nil], ["permissions", "---\n- signin\n"], ["remotely_signed_out", nil], ["uid", "a1s2d31854"]]
-   (8.6ms)  commit transaction
-   (0.1ms)  begin transaction
-  SQL (0.2ms)  INSERT INTO "users" ("email", "name", "organisation_slug", "permissions", "remotely_signed_out", "uid") VALUES (?, ?, ?, ?, ?, ?)  [["email", "ssopushuser@legit.com"], ["name", "SSO Push user"], ["organisation_slug", nil], ["permissions", "---\n- signin\n- user_update_permission\n"], ["remotely_signed_out", nil], ["uid", "a1s2d33744"]]
-   (10.7ms)  commit transaction
+  SQL (0.1ms)  INSERT INTO "users" ("email", "name", "organisation_slug", "permissions", "remotely_signed_out", "uid") VALUES (?, ?, ?, ?, ?, ?)  [["email", "ssopushuser@legit.com"], ["name", "SSO Push user"], ["organisation_slug", nil], ["permissions", "---\n- signin\n- user_update_permission\n"], ["remotely_signed_out", nil], ["uid", "a1s2d33736"]]
+   (11.1ms)  commit transaction
 Processing by Api::UserController#reauth as HTML
   Parameters: {"uid"=>"nonexistent-user"}
-  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'nonexistent-user' LIMIT 1
-Completed 200 OK in 1.4ms (ActiveRecord: 0.2ms)
-   (0.0ms)  begin transaction
-  SQL (0.2ms)  INSERT INTO "users" ("email", "name", "organisation_slug", "permissions", "remotely_signed_out", "uid") VALUES (?, ?, ?, ?, ?, ?)  [["email", "old@domain.com"], ["name", "Moshua Jarshall"], ["organisation_slug", nil], ["permissions", "---\n- signin\n"], ["remotely_signed_out", nil], ["uid", "a1s2d33613"]]
-   (14.0ms)  commit transaction
+  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'nonexistent-user' LIMIT 1
+Completed 200 OK in 26.6ms (ActiveRecord: 0.2ms)
    (0.1ms)  begin transaction
-  SQL (0.1ms)  INSERT INTO "users" ("email", "name", "organisation_slug", "permissions", "remotely_signed_out", "uid") VALUES (?, ?, ?, ?, ?, ?)  [["email", "ssopushuser@legit.com"], ["name", "SSO Push user"], ["organisation_slug", nil], ["permissions", "---\n- signin\n- user_update_permission\n"], ["remotely_signed_out", nil], ["uid", "a1s2d34570"]]
-   (7.8ms)  commit transaction
-WARNING: Can't mass-assign protected attributes: uid, name, permissions
-Processing by Api::UserController#reauth as HTML
-  Parameters: {"uid"=>"a1s2d33613"}
-Completed 403 Forbidden in 1.5ms (Views: 1.0ms | ActiveRecord: 0.0ms)
+  SQL (0.2ms)  INSERT INTO "users" ("email", "name", "organisation_slug", "permissions", "remotely_signed_out", "uid") VALUES (?, ?, ?, ?, ?, ?)  [["email", "old@domain.com"], ["name", "Moshua Jarshall"], ["organisation_slug", nil], ["permissions", "---\n- signin\n"], ["remotely_signed_out", nil], ["uid", "a1s2d3267"]]
+   (14.1ms)  commit transaction
    (0.1ms)  begin transaction
-  SQL (0.2ms)  INSERT INTO "users" ("email", "name", "organisation_slug", "permissions", "remotely_signed_out", "uid") VALUES (?, ?, ?, ?, ?, ?)  [["email", "old@domain.com"], ["name", "Moshua Jarshall"], ["organisation_slug", nil], ["permissions", "---\n- signin\n"], ["remotely_signed_out", nil], ["uid", "a1s2d34795"]]
-   (16.8ms)  commit transaction
-   (0.1ms)  begin transaction
-  SQL (0.2ms)  INSERT INTO "users" ("email", "name", "organisation_slug", "permissions", "remotely_signed_out", "uid") VALUES (?, ?, ?, ?, ?, ?)  [["email", "ssopushuser@legit.com"], ["name", "SSO Push user"], ["organisation_slug", nil], ["permissions", "---\n- signin\n- user_update_permission\n"], ["remotely_signed_out", nil], ["uid", "a1s2d31240"]]
-   (9.4ms)  commit transaction
+  SQL (0.1ms)  INSERT INTO "users" ("email", "name", "organisation_slug", "permissions", "remotely_signed_out", "uid") VALUES (?, ?, ?, ?, ?, ?)  [["email", "ssopushuser@legit.com"], ["name", "SSO Push user"], ["organisation_slug", nil], ["permissions", "---\n- signin\n- user_update_permission\n"], ["remotely_signed_out", nil], ["uid", "a1s2d34802"]]
+   (9.9ms)  commit transaction
 Processing by Api::UserController#reauth as HTML
-  Parameters: {"uid"=>"a1s2d34795"}
-  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'a1s2d34795' LIMIT 1
+  Parameters: {"uid"=>"a1s2d3267"}
+  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'a1s2d3267' LIMIT 1
+   (0.0ms)  begin transaction
+   (0.1ms)  UPDATE "users" SET "remotely_signed_out" = 't', "permissions" = '---
+- signin
+' WHERE "users"."id" = 5
+   (6.8ms)  commit transaction
+Completed 200 OK in 10.6ms (ActiveRecord: 7.2ms)
+  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 5]]
+   (0.0ms)  begin transaction
+  SQL (0.2ms)  INSERT INTO "users" ("email", "name", "organisation_slug", "permissions", "remotely_signed_out", "uid") VALUES (?, ?, ?, ?, ?, ?)  [["email", "old@domain.com"], ["name", "Moshua Jarshall"], ["organisation_slug", nil], ["permissions", "---\n- signin\n"], ["remotely_signed_out", nil], ["uid", "a1s2d31538"]]
+   (10.3ms)  commit transaction
+   (0.1ms)  begin transaction
+  SQL (0.1ms)  INSERT INTO "users" ("email", "name", "organisation_slug", "permissions", "remotely_signed_out", "uid") VALUES (?, ?, ?, ?, ?, ?)  [["email", "ssopushuser@legit.com"], ["name", "SSO Push user"], ["organisation_slug", nil], ["permissions", "---\n- signin\n- user_update_permission\n"], ["remotely_signed_out", nil], ["uid", "a1s2d38526"]]
+   (8.7ms)  commit transaction
+Processing by Api::UserController#update as HTML
+  Parameters: {"uid"=>"a1s2d31538"}
+  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'a1s2d31538' LIMIT 1
    (0.0ms)  begin transaction
-   (0.2ms)  UPDATE "users" SET "remotely_signed_out" = 't', "permissions" = '---
+   (0.1ms)  UPDATE "users" SET "email" = 'user@domain.com', "name" = 'Joshua Marshall', "permissions" = '---
 - signin
-' WHERE "users"."id" = 9
-   (9.4ms)  commit transaction
-Completed 200 OK in 12.3ms (ActiveRecord: 9.8ms)
-  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 9]]
-Started GET "/restricted" for 127.0.0.1 at 2014-03-26 15:49:28 +0000
-Processing by ExampleController#restricted as HTML
-Authenticating with gds_sso strategy
-Completed   in 37.2ms
-Started GET "/auth/gds" for 127.0.0.1 at 2014-03-26 15:49:28 +0000
-Started GET "/auth/gds/callback?code=7ceeca3a4b6c42fe16fcecfc452d3ac26214dfaea976b760b88d5c2046fc35c6&state=bfe446dbd3e6b89689e67f2a7de455ec34c954af5006c353" for 127.0.0.1 at 2014-03-26 15:49:29 +0000
-Processing by AuthenticationsController#callback as HTML
-  Parameters: {"code"=>"7ceeca3a4b6c42fe16fcecfc452d3ac26214dfaea976b760b88d5c2046fc35c6", "state"=>"bfe446dbd3e6b89689e67f2a7de455ec34c954af5006c353"}
-Authenticating with gds_sso strategy
+- new permission
+', "organisation_slug" = 'justice-league' WHERE "users"."id" = 7
+   (9.2ms)  commit transaction
+Completed 200 OK in 12.5ms (ActiveRecord: 9.5ms)
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 7]]
+   (0.1ms)  begin transaction
+  SQL (0.2ms)  INSERT INTO "users" ("email", "name", "organisation_slug", "permissions", "remotely_signed_out", "uid") VALUES (?, ?, ?, ?, ?, ?)  [["email", "old@domain.com"], ["name", "Moshua Jarshall"], ["organisation_slug", nil], ["permissions", "---\n- signin\n"], ["remotely_signed_out", nil], ["uid", "a1s2d31443"]]
+   (11.6ms)  commit transaction
+   (0.1ms)  begin transaction
+  SQL (0.1ms)  INSERT INTO "users" ("email", "name", "organisation_slug", "permissions", "remotely_signed_out", "uid") VALUES (?, ?, ?, ?, ?, ?)  [["email", "ssopushuser@legit.com"], ["name", "SSO Push user"], ["organisation_slug", nil], ["permissions", "---\n- signin\n- user_update_permission\n"], ["remotely_signed_out", nil], ["uid", "a1s2d34469"]]
+   (7.1ms)  commit transaction
+WARNING: Can't mass-assign protected attributes: uid, name, permissions
+Processing by Api::UserController#update as HTML
+  Parameters: {"uid"=>"a1s2d31443"}
+Completed 403 Forbidden in 1.3ms (Views: 0.8ms | ActiveRecord: 0.0ms)
+Started GET "/restricted" for 127.0.0.1 at 2014-05-06 15:54:15 +0000
+Processing by ExampleController#restricted as JSON
+Authenticating with gds_bearer_token strategy
+Completed   in 137.2ms
+Started GET "/restricted" for 127.0.0.1 at 2014-05-06 15:54:15 +0000
+Processing by ExampleController#restricted as JSON
+Authenticating with gds_bearer_token strategy
   User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' LIMIT 1
   User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."email" = 'test@example-client.com' LIMIT 1
-   (0.1ms)  begin transaction
+   (0.0ms)  begin transaction
   SQL (0.2ms)  INSERT INTO "users" ("email", "name", "organisation_slug", "permissions", "remotely_signed_out", "uid") VALUES (?, ?, ?, ?, ?, ?)  [["email", "test@example-client.com"], ["name", "Test User"], ["organisation_slug", nil], ["permissions", "---\n- signin\n"], ["remotely_signed_out", nil], ["uid", "integration-uid"]]
-   (77.6ms)  commit transaction
-   (0.1ms)  begin transaction
-   (0.2ms)  UPDATE "users" SET "remotely_signed_out" = 'f', "permissions" = '---
+   (15.8ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  UPDATE "users" SET "remotely_signed_out" = 'f', "permissions" = '---
 - signin
 ' WHERE "users"."id" = 11
-   (9.4ms)  commit transaction
-Redirected to http://www.example-client.com/restricted
-Completed 302 Found in 93.3ms (ActiveRecord: 87.7ms)
-Started GET "/restricted" for 127.0.0.1 at 2014-03-26 15:49:30 +0000
-Processing by ExampleController#restricted as HTML
-  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' AND "users"."remotely_signed_out" = 'f' LIMIT 1
-Completed 200 OK in 4.6ms (Views: 3.6ms | ActiveRecord: 0.1ms)
-Started GET "/restricted" for 127.0.0.1 at 2014-03-26 15:49:30 +0000
-Processing by ExampleController#restricted as HTML
+   (9.5ms)  commit transaction
+Completed 200 OK in 380.2ms (Views: 2.9ms | ActiveRecord: 25.9ms)
+Started GET "/this_requires_signin_permission" for 127.0.0.1 at 2014-05-06 15:54:15 +0000
+Processing by ExampleController#this_requires_signin_permission as JSON
+Authenticating with gds_bearer_token strategy
+  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' LIMIT 1
+   (0.0ms)  begin transaction
+   (0.1ms)  UPDATE "users" SET "permissions" = '---
+- signin
+' WHERE "users"."id" = 11
+   (11.9ms)  commit transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  UPDATE "users" SET "permissions" = '---
+- signin
+' WHERE "users"."id" = 11
+   (9.2ms)  commit transaction
+Completed 200 OK in 58.5ms (Views: 0.4ms | ActiveRecord: 21.7ms)
+Started GET "/this_requires_signin_permission" for 127.0.0.1 at 2014-05-06 15:54:16 +0000
+Processing by ExampleController#this_requires_signin_permission as HTML
 Authenticating with gds_sso strategy
 Completed   in 0.3ms
-Started GET "/auth/gds" for 127.0.0.1 at 2014-03-26 15:49:30 +0000
-Started GET "/auth/gds/callback?code=7793ee842db1c2cf2fc69b9e9075f93cfc89ed41df30f69cb1738a0369aee2d8&state=d75ad1182a561641f543b92edde40155a951ddd37fb35d4d" for 127.0.0.1 at 2014-03-26 15:49:30 +0000
+Started GET "/auth/gds" for 127.0.0.1 at 2014-05-06 15:54:16 +0000
+Started GET "/auth/gds/callback?code=b7a8fe5651e40ea7f0f3a11a9833e6fb0d89e92e2e56ba13b58bb5493536e400&state=408da5383e84b5a141a9ec95269ac77041e7e0087e82e652" for 127.0.0.1 at 2014-05-06 15:54:16 +0000
 Processing by AuthenticationsController#callback as HTML
-  Parameters: {"code"=>"7793ee842db1c2cf2fc69b9e9075f93cfc89ed41df30f69cb1738a0369aee2d8", "state"=>"d75ad1182a561641f543b92edde40155a951ddd37fb35d4d"}
+  Parameters: {"code"=>"b7a8fe5651e40ea7f0f3a11a9833e6fb0d89e92e2e56ba13b58bb5493536e400", "state"=>"408da5383e84b5a141a9ec95269ac77041e7e0087e82e652"}
 Authenticating with gds_sso strategy
   User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' LIMIT 1
-   (0.1ms)  begin transaction
+   (0.0ms)  begin transaction
    (0.1ms)  UPDATE "users" SET "permissions" = '---
 - signin
 ' WHERE "users"."id" = 11
-   (11.7ms)  commit transaction
-   (0.1ms)  begin transaction
-   (0.2ms)  UPDATE "users" SET "permissions" = '---
+   (10.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  UPDATE "users" SET "permissions" = '---
 - signin
 ' WHERE "users"."id" = 11
-   (20.3ms)  commit transaction
-Redirected to http://www.example-client.com/restricted
-Completed 302 Found in 38.1ms (ActiveRecord: 32.7ms)
-Started GET "/restricted" for 127.0.0.1 at 2014-03-26 15:49:30 +0000
-Processing by ExampleController#restricted as HTML
-  User Load (0.3ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' AND "users"."remotely_signed_out" = 'f' LIMIT 1
-Completed 200 OK in 2.4ms (Views: 0.7ms | ActiveRecord: 0.3ms)
-Started GET "/restricted" for 127.0.0.1 at 2014-03-26 15:49:30 +0000
-Processing by ExampleController#restricted as HTML
+   (6.8ms)  commit transaction
+Redirected to http://www.example-client.com/this_requires_signin_permission
+Completed 302 Found in 21.8ms (ActiveRecord: 17.4ms)
+Started GET "/this_requires_signin_permission" for 127.0.0.1 at 2014-05-06 15:54:16 +0000
+Processing by ExampleController#this_requires_signin_permission as HTML
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' AND "users"."remotely_signed_out" = 'f' LIMIT 1
+Completed 200 OK in 2.0ms (Views: 0.3ms | ActiveRecord: 0.1ms)
+Started GET "/this_requires_signin_permission" for 127.0.0.1 at 2014-05-06 15:54:16 +0000
+Processing by ExampleController#this_requires_signin_permission as HTML
 Authenticating with gds_sso strategy
-Completed   in 0.3ms
-Started GET "/auth/gds" for 127.0.0.1 at 2014-03-26 15:49:30 +0000
-Started GET "/auth/gds/callback?code=bcaa28582753e45e6bd4c95cc289cc3d7b05fd941c2b5e1348297a4e2ba9d2f7&state=0f93f14eafcb7dd180923f498fa4195d543590bdc0b2b88d" for 127.0.0.1 at 2014-03-26 15:49:30 +0000
+Completed   in 0.1ms
+Started GET "/auth/gds" for 127.0.0.1 at 2014-05-06 15:54:16 +0000
+Started GET "/auth/gds/callback?code=2f9f66f75458e23525cf3636eae1d60fde7b97ad5f2b30b82e08ad01cd41ba26&state=3da43637553f8b5c012db5e905ede569da7a8b5bb1b01494" for 127.0.0.1 at 2014-05-06 15:54:17 +0000
 Processing by AuthenticationsController#callback as HTML
-  Parameters: {"code"=>"bcaa28582753e45e6bd4c95cc289cc3d7b05fd941c2b5e1348297a4e2ba9d2f7", "state"=>"0f93f14eafcb7dd180923f498fa4195d543590bdc0b2b88d"}
+  Parameters: {"code"=>"2f9f66f75458e23525cf3636eae1d60fde7b97ad5f2b30b82e08ad01cd41ba26", "state"=>"3da43637553f8b5c012db5e905ede569da7a8b5bb1b01494"}
 Authenticating with gds_sso strategy
-  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' LIMIT 1
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' LIMIT 1
    (0.0ms)  begin transaction
-   (0.2ms)  UPDATE "users" SET "permissions" = '---
+   (0.1ms)  UPDATE "users" SET "permissions" = '---
 - signin
 ' WHERE "users"."id" = 11
-   (12.0ms)  commit transaction
-   (0.1ms)  begin transaction
-   (0.3ms)  UPDATE "users" SET "permissions" = '---
+   (20.6ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  UPDATE "users" SET "permissions" = '---
 - signin
 ' WHERE "users"."id" = 11
-   (8.9ms)  commit transaction
-Redirected to http://www.example-client.com/restricted
-Completed 302 Found in 26.7ms (ActiveRecord: 21.5ms)
-Started GET "/restricted" for 127.0.0.1 at 2014-03-26 15:49:30 +0000
-Processing by ExampleController#restricted as HTML
-  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' AND "users"."remotely_signed_out" = 'f' LIMIT 1
-Completed 200 OK in 1.3ms (Views: 0.4ms | ActiveRecord: 0.2ms)
-Started GET "/" for 127.0.0.1 at 2014-03-26 15:49:31 +0000
-Processing by ExampleController#index as HTML
-Completed 200 OK in 1.3ms (Views: 0.5ms | ActiveRecord: 0.0ms)
-Started GET "/this_requires_signin_permission" for 127.0.0.1 at 2014-03-26 15:49:31 +0000
+   (14.8ms)  commit transaction
+Redirected to http://www.example-client.com/this_requires_signin_permission
+Completed 302 Found in 39.3ms (ActiveRecord: 35.8ms)
+Started GET "/this_requires_signin_permission" for 127.0.0.1 at 2014-05-06 15:54:17 +0000
 Processing by ExampleController#this_requires_signin_permission as HTML
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' AND "users"."remotely_signed_out" = 'f' LIMIT 1
+Completed 200 OK in 4.5ms (Views: 0.7ms | ActiveRecord: 0.1ms)
+Started GET "/restricted" for 127.0.0.1 at 2014-05-06 15:54:17 +0000
+Processing by ExampleController#restricted as HTML
 Authenticating with gds_sso strategy
-Completed   in 1.2ms
-Started GET "/auth/gds" for 127.0.0.1 at 2014-03-26 15:49:31 +0000
-Started GET "/auth/gds/callback?code=1799f136508532555f8d1c56e2a2d45928533008960830eaeb1418f884c4460c&state=7d79d1c1ff1ba9c5f4a4d3216ee88c9624bbc2ed3ee58f99" for 127.0.0.1 at 2014-03-26 15:49:31 +0000
+Completed   in 0.3ms
+Started GET "/auth/gds" for 127.0.0.1 at 2014-05-06 15:54:17 +0000
+Started GET "/auth/gds/callback?code=584f8b50aa15b27e1d58fc86b01c30140a607c9b44ccdd94e74d1f2653eca90a&state=dbc29cfccbf57751b07bb8261abfbe54e96cca1348d3385c" for 127.0.0.1 at 2014-05-06 15:54:17 +0000
 Processing by AuthenticationsController#callback as HTML
-  Parameters: {"code"=>"1799f136508532555f8d1c56e2a2d45928533008960830eaeb1418f884c4460c", "state"=>"7d79d1c1ff1ba9c5f4a4d3216ee88c9624bbc2ed3ee58f99"}
+  Parameters: {"code"=>"584f8b50aa15b27e1d58fc86b01c30140a607c9b44ccdd94e74d1f2653eca90a", "state"=>"dbc29cfccbf57751b07bb8261abfbe54e96cca1348d3385c"}
 Authenticating with gds_sso strategy
-  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' LIMIT 1
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' LIMIT 1
    (0.1ms)  begin transaction
-   (0.2ms)  UPDATE "users" SET "permissions" = '---
+   (0.1ms)  UPDATE "users" SET "permissions" = '---
 - signin
 ' WHERE "users"."id" = 11
-   (9.1ms)  commit transaction
+   (17.8ms)  commit transaction
    (0.0ms)  begin transaction
    (0.1ms)  UPDATE "users" SET "permissions" = '---
 - signin
 ' WHERE "users"."id" = 11
-   (8.5ms)  commit transaction
-Redirected to http://www.example-client.com/this_requires_signin_permission
-Completed 302 Found in 23.1ms (ActiveRecord: 18.2ms)
-Started GET "/this_requires_signin_permission" for 127.0.0.1 at 2014-03-26 15:49:31 +0000
-Processing by ExampleController#this_requires_signin_permission as HTML
+   (11.0ms)  commit transaction
+Redirected to http://www.example-client.com/restricted
+Completed 302 Found in 33.2ms (ActiveRecord: 29.2ms)
+Started GET "/restricted" for 127.0.0.1 at 2014-05-06 15:54:17 +0000
+Processing by ExampleController#restricted as HTML
   User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' AND "users"."remotely_signed_out" = 'f' LIMIT 1
-Completed 200 OK in 1.5ms (Views: 0.4ms | ActiveRecord: 0.1ms)
-Started GET "/this_requires_signin_permission" for 127.0.0.1 at 2014-03-26 15:49:31 +0000
-Processing by ExampleController#this_requires_signin_permission as HTML
+Completed 200 OK in 1.2ms (Views: 0.4ms | ActiveRecord: 0.1ms)
+Started GET "/restricted" for 127.0.0.1 at 2014-05-06 15:54:17 +0000
+Processing by ExampleController#restricted as HTML
 Authenticating with gds_sso strategy
 Completed   in 0.2ms
-Started GET "/auth/gds" for 127.0.0.1 at 2014-03-26 15:49:31 +0000
-Started GET "/auth/gds/callback?code=9439ea15b64638a170b933f3e25dfe10d79e234095c595217815719ddec7fb2b&state=c203315adddea73db9bb5697759c76f388494be845969b92" for 127.0.0.1 at 2014-03-26 15:49:31 +0000
+Started GET "/auth/gds" for 127.0.0.1 at 2014-05-06 15:54:17 +0000
+Started GET "/auth/gds/callback?code=84b329588260d4179f0358fbc48d7792beac80124b14be27bf9db95a42dae017&state=518680c61baa4fe72c53ebe49dff88537ff16c68a93368be" for 127.0.0.1 at 2014-05-06 15:54:17 +0000
 Processing by AuthenticationsController#callback as HTML
-  Parameters: {"code"=>"9439ea15b64638a170b933f3e25dfe10d79e234095c595217815719ddec7fb2b", "state"=>"c203315adddea73db9bb5697759c76f388494be845969b92"}
+  Parameters: {"code"=>"84b329588260d4179f0358fbc48d7792beac80124b14be27bf9db95a42dae017", "state"=>"518680c61baa4fe72c53ebe49dff88537ff16c68a93368be"}
 Authenticating with gds_sso strategy
   User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' LIMIT 1
-   (0.1ms)  begin transaction
-   (0.3ms)  UPDATE "users" SET "permissions" = '---
+   (0.0ms)  begin transaction
+   (0.1ms)  UPDATE "users" SET "permissions" = '---
 - signin
 ' WHERE "users"."id" = 11
-   (11.2ms)  commit transaction
+   (10.2ms)  commit transaction
    (0.0ms)  begin transaction
    (0.1ms)  UPDATE "users" SET "permissions" = '---
 - signin
 ' WHERE "users"."id" = 11
-   (19.7ms)  commit transaction
-Redirected to http://www.example-client.com/this_requires_signin_permission
-Completed 302 Found in 61.6ms (ActiveRecord: 31.6ms)
-Started GET "/this_requires_signin_permission" for 127.0.0.1 at 2014-03-26 15:49:31 +0000
-Processing by ExampleController#this_requires_signin_permission as HTML
-  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' AND "users"."remotely_signed_out" = 'f' LIMIT 1
-Completed 200 OK in 1.7ms (Views: 0.3ms | ActiveRecord: 0.2ms)
-Started GET "/restricted" for 127.0.0.1 at 2014-03-26 15:49:32 +0000
+   (7.4ms)  commit transaction
+Redirected to http://www.example-client.com/restricted
+Completed 302 Found in 22.3ms (ActiveRecord: 18.1ms)
+Started GET "/restricted" for 127.0.0.1 at 2014-05-06 15:54:18 +0000
+Processing by ExampleController#restricted as HTML
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' AND "users"."remotely_signed_out" = 'f' LIMIT 1
+Completed 200 OK in 1.2ms (Views: 0.3ms | ActiveRecord: 0.1ms)
+Started GET "/restricted" for 127.0.0.1 at 2014-05-06 15:54:18 +0000
 Processing by ExampleController#restricted as HTML
 Authenticating with gds_sso strategy
-Completed   in 0.4ms
-Started GET "/auth/gds" for 127.0.0.1 at 2014-03-26 15:49:32 +0000
-Started GET "/auth/gds/callback?code=7f74a4ba35e169225049e1ac23160e3e01cd44abda76dba3b4df6aab94e8807a&state=c71813eb78652f4862363c8aecd4313403c9d62daefe2c64" for 127.0.0.1 at 2014-03-26 15:49:32 +0000
+Completed   in 0.2ms
+Started GET "/auth/gds" for 127.0.0.1 at 2014-05-06 15:54:18 +0000
+Started GET "/auth/gds/callback?code=944cb01ba71cf42e00a77c1bbc9133b760bf28220aadf30184612d50ce84cbaf&state=f4661d0f0e69ee6cf821e758b6b61defada574f54c6412db" for 127.0.0.1 at 2014-05-06 15:54:18 +0000
 Processing by AuthenticationsController#callback as HTML
-  Parameters: {"code"=>"7f74a4ba35e169225049e1ac23160e3e01cd44abda76dba3b4df6aab94e8807a", "state"=>"c71813eb78652f4862363c8aecd4313403c9d62daefe2c64"}
+  Parameters: {"code"=>"944cb01ba71cf42e00a77c1bbc9133b760bf28220aadf30184612d50ce84cbaf", "state"=>"f4661d0f0e69ee6cf821e758b6b61defada574f54c6412db"}
 Authenticating with gds_sso strategy
-  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' LIMIT 1
-   (0.1ms)  begin transaction
-   (0.2ms)  UPDATE "users" SET "permissions" = '---
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' LIMIT 1
+   (0.0ms)  begin transaction
+   (0.1ms)  UPDATE "users" SET "permissions" = '---
 - signin
 ' WHERE "users"."id" = 11
-   (11.8ms)  commit transaction
+   (20.9ms)  commit transaction
    (0.1ms)  begin transaction
-   (0.3ms)  UPDATE "users" SET "permissions" = '---
+   (0.1ms)  UPDATE "users" SET "permissions" = '---
 - signin
 ' WHERE "users"."id" = 11
-   (10.5ms)  commit transaction
+   (8.4ms)  commit transaction
 Redirected to http://www.example-client.com/restricted
-Completed 302 Found in 29.4ms (ActiveRecord: 23.1ms)
-Started GET "/restricted" for 127.0.0.1 at 2014-03-26 15:49:32 +0000
+Completed 302 Found in 33.8ms (ActiveRecord: 29.9ms)
+Started GET "/restricted" for 127.0.0.1 at 2014-05-06 15:54:18 +0000
 Processing by ExampleController#restricted as HTML
   User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' AND "users"."remotely_signed_out" = 'f' LIMIT 1
-Completed 200 OK in 1.4ms (Views: 0.5ms | ActiveRecord: 0.1ms)
-  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."email" = 'test@example-client.com' LIMIT 1
-   (0.0ms)  begin transaction
-   (0.2ms)  UPDATE "users" SET "remotely_signed_out" = 't', "permissions" = '---
-- signin
-' WHERE "users"."id" = 11
-   (10.4ms)  commit transaction
-Started GET "/restricted" for 127.0.0.1 at 2014-03-26 15:49:32 +0000
+Completed 200 OK in 1.2ms (Views: 0.2ms | ActiveRecord: 0.1ms)
+Started GET "/" for 127.0.0.1 at 2014-05-06 15:54:18 +0000
+Processing by ExampleController#index as HTML
+Completed 200 OK in 0.7ms (Views: 0.4ms | ActiveRecord: 0.0ms)
+Started GET "/restricted" for 127.0.0.1 at 2014-05-06 15:54:18 +0000
 Processing by ExampleController#restricted as HTML
-  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' AND "users"."remotely_signed_out" = 'f' LIMIT 1
 Authenticating with gds_sso strategy
-Completed   in 1.0ms
-Started GET "/auth/gds" for 127.0.0.1 at 2014-03-26 15:49:32 +0000
-Started GET "/auth/gds/callback?code=702c7a7b23556649ee690d0726c3e51c25e64f60d2656882fda21e2062c10259&state=a12432a6476203c4893388cd75de1f738cffccaf0a2d4e35" for 127.0.0.1 at 2014-03-26 15:49:32 +0000
+Completed   in 0.2ms
+Started GET "/auth/gds" for 127.0.0.1 at 2014-05-06 15:54:18 +0000
+Started GET "/auth/gds/callback?code=4e983f1c26ad9c7316f5b2b44b26df80faa05df243ecce739db24f6ec6e0fad8&state=fd6b5ea1fea4fcfc3de0825201272b36fbeef8b61c702c05" for 127.0.0.1 at 2014-05-06 15:54:18 +0000
 Processing by AuthenticationsController#callback as HTML
-  Parameters: {"code"=>"702c7a7b23556649ee690d0726c3e51c25e64f60d2656882fda21e2062c10259", "state"=>"a12432a6476203c4893388cd75de1f738cffccaf0a2d4e35"}
+  Parameters: {"code"=>"4e983f1c26ad9c7316f5b2b44b26df80faa05df243ecce739db24f6ec6e0fad8", "state"=>"fd6b5ea1fea4fcfc3de0825201272b36fbeef8b61c702c05"}
 Authenticating with gds_sso strategy
-  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' LIMIT 1
-   (0.0ms)  begin transaction
-   (0.2ms)  UPDATE "users" SET "permissions" = '---
-- signin
-' WHERE "users"."id" = 11
-   (15.6ms)  commit transaction
+  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' LIMIT 1
    (0.1ms)  begin transaction
-   (0.2ms)  UPDATE "users" SET "remotely_signed_out" = 'f', "permissions" = '---
+   (0.1ms)  UPDATE "users" SET "permissions" = '---
 - signin
 ' WHERE "users"."id" = 11
-   (22.1ms)  commit transaction
+   (9.7ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  UPDATE "users" SET "permissions" = '---
+- signin
+' WHERE "users"."id" = 11
+   (9.3ms)  commit transaction
 Redirected to http://www.example-client.com/restricted
-Completed 302 Found in 43.1ms (ActiveRecord: 38.4ms)
-Started GET "/restricted" for 127.0.0.1 at 2014-03-26 15:49:32 +0000
+Completed 302 Found in 23.8ms (ActiveRecord: 19.5ms)
+Started GET "/restricted" for 127.0.0.1 at 2014-05-06 15:54:18 +0000
 Processing by ExampleController#restricted as HTML
-  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' AND "users"."remotely_signed_out" = 'f' LIMIT 1
-Completed 200 OK in 1.3ms (Views: 0.3ms | ActiveRecord: 0.2ms)
-Started GET "/restricted" for 127.0.0.1 at 2014-03-26 15:49:33 +0000
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' AND "users"."remotely_signed_out" = 'f' LIMIT 1
+Completed 200 OK in 1.2ms (Views: 0.3ms | ActiveRecord: 0.1ms)
+Started GET "/restricted" for 127.0.0.1 at 2014-05-07 11:49:19 +0000
+Processing by ExampleController#restricted as HTML
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' AND "users"."remotely_signed_out" = 'f' LIMIT 1
+Completed 200 OK in 0.9ms (Views: 0.2ms | ActiveRecord: 0.1ms)
+Started GET "/restricted" for 127.0.0.1 at 2014-05-06 15:54:19 +0000
 Processing by ExampleController#restricted as HTML
 Authenticating with gds_sso strategy
 Completed   in 0.3ms
-Started GET "/auth/gds" for 127.0.0.1 at 2014-03-26 15:49:33 +0000
-Started GET "/auth/gds/callback?code=7a28d23e2fe130e5255c098f6745d465bda47922781e012f2d4a9d894fdb01cd&state=30e43fb7014a3493898340c8c37f99fafed8ffe248690fa2" for 127.0.0.1 at 2014-03-26 15:49:33 +0000
+Started GET "/auth/gds" for 127.0.0.1 at 2014-05-06 15:54:19 +0000
+Started GET "/auth/gds/callback?code=967dc585f16766b4455295d015da62575c2c32934ac5cbd90ed912ffa046c0f4&state=98e481aea30d972a9cd7da88bd6824d7b03a19627a5b68e4" for 127.0.0.1 at 2014-05-06 15:54:19 +0000
 Processing by AuthenticationsController#callback as HTML
-  Parameters: {"code"=>"7a28d23e2fe130e5255c098f6745d465bda47922781e012f2d4a9d894fdb01cd", "state"=>"30e43fb7014a3493898340c8c37f99fafed8ffe248690fa2"}
+  Parameters: {"code"=>"967dc585f16766b4455295d015da62575c2c32934ac5cbd90ed912ffa046c0f4", "state"=>"98e481aea30d972a9cd7da88bd6824d7b03a19627a5b68e4"}
 Authenticating with gds_sso strategy
   User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' LIMIT 1
-   (0.1ms)  begin transaction
-   (0.2ms)  UPDATE "users" SET "permissions" = '---
+   (0.0ms)  begin transaction
+   (0.1ms)  UPDATE "users" SET "permissions" = '---
 - signin
 ' WHERE "users"."id" = 11
-   (14.5ms)  commit transaction
-   (0.1ms)  begin transaction
-   (0.2ms)  UPDATE "users" SET "permissions" = '---
+   (12.3ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  UPDATE "users" SET "permissions" = '---
 - signin
 ' WHERE "users"."id" = 11
-   (11.5ms)  commit transaction
+   (17.2ms)  commit transaction
 Redirected to http://www.example-client.com/restricted
-Completed 302 Found in 33.1ms (ActiveRecord: 26.7ms)
-Started GET "/restricted" for 127.0.0.1 at 2014-03-26 15:49:33 +0000
+Completed 302 Found in 34.5ms (ActiveRecord: 30.1ms)
+Started GET "/restricted" for 127.0.0.1 at 2014-05-06 15:54:19 +0000
 Processing by ExampleController#restricted as HTML
-  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' AND "users"."remotely_signed_out" = 'f' LIMIT 1
-Completed 200 OK in 1.3ms (Views: 0.4ms | ActiveRecord: 0.1ms)
-Started GET "/restricted" for 127.0.0.1 at 2014-03-27 11:54:33 +0000
+  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' AND "users"."remotely_signed_out" = 'f' LIMIT 1
+Completed 200 OK in 1.5ms (Views: 0.4ms | ActiveRecord: 0.2ms)
+Started GET "/restricted" for 127.0.0.1 at 2014-05-07 11:59:19 +0000
 Processing by ExampleController#restricted as HTML
 Authenticating with gds_sso strategy
-Completed   in 0.2ms
-Started GET "/auth/gds" for 127.0.0.1 at 2014-03-27 11:54:33 +0000
-Started GET "/auth/gds/callback?code=649273a9b40bf516a1e3aac804dd70e27351c1e425e9d1662e8dd782a80caf26&state=153f4b58a081c01d21717381f839c22ca59a67a4a16e0da6" for 127.0.0.1 at 2014-03-27 11:54:33 +0000
+Completed   in 0.3ms
+Started GET "/auth/gds" for 127.0.0.1 at 2014-05-07 11:59:19 +0000
+Started GET "/auth/gds/callback?code=92e8356c4b88dd847c4439415e1f0428cbec8e741982f69c87e504c01f98d445&state=766810bacdbf4a323274685105bf6796e68f16a622d8be41" for 127.0.0.1 at 2014-05-07 11:59:19 +0000
 Processing by AuthenticationsController#callback as HTML
-  Parameters: {"code"=>"649273a9b40bf516a1e3aac804dd70e27351c1e425e9d1662e8dd782a80caf26", "state"=>"153f4b58a081c01d21717381f839c22ca59a67a4a16e0da6"}
+  Parameters: {"code"=>"92e8356c4b88dd847c4439415e1f0428cbec8e741982f69c87e504c01f98d445", "state"=>"766810bacdbf4a323274685105bf6796e68f16a622d8be41"}
 Authenticating with gds_sso strategy
   User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' LIMIT 1
-   (0.1ms)  begin transaction
-   (0.2ms)  UPDATE "users" SET "permissions" = '---
+   (0.0ms)  begin transaction
+   (0.1ms)  UPDATE "users" SET "permissions" = '---
 - signin
 ' WHERE "users"."id" = 11
-   (10.5ms)  commit transaction
-   (0.1ms)  begin transaction
-   (0.2ms)  UPDATE "users" SET "permissions" = '---
+   (11.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  UPDATE "users" SET "permissions" = '---
 - signin
 ' WHERE "users"."id" = 11
-   (9.3ms)  commit transaction
+   (10.9ms)  commit transaction
 Redirected to http://www.example-client.com/restricted
-Completed 302 Found in 25.2ms (ActiveRecord: 20.5ms)
-Started GET "/restricted" for 127.0.0.1 at 2014-03-27 11:54:33 +0000
+Completed 302 Found in 26.1ms (ActiveRecord: 22.5ms)
+Started GET "/restricted" for 127.0.0.1 at 2014-05-07 11:59:19 +0000
 Processing by ExampleController#restricted as HTML
-  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' AND "users"."remotely_signed_out" = 'f' LIMIT 1
-Completed 200 OK in 1.6ms (Views: 0.4ms | ActiveRecord: 0.2ms)
-Started GET "/restricted" for 127.0.0.1 at 2014-03-26 15:49:33 +0000
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' AND "users"."remotely_signed_out" = 'f' LIMIT 1
+Completed 200 OK in 1.2ms (Views: 0.3ms | ActiveRecord: 0.1ms)
+Started GET "/restricted" for 127.0.0.1 at 2014-05-06 15:54:19 +0000
 Processing by ExampleController#restricted as HTML
 Authenticating with gds_sso strategy
-Completed   in 0.4ms
-Started GET "/auth/gds" for 127.0.0.1 at 2014-03-26 15:49:33 +0000
-Started GET "/auth/gds/callback?code=abfdfe30f0b14ee000d529da3dff3a54f6642f676e2676302a9c23287c93839e&state=15c0e0ca8f17e6b83aa5cbbf66063a31dd84e7ca5ba5c72a" for 127.0.0.1 at 2014-03-26 15:49:34 +0000
+Completed   in 0.3ms
+Started GET "/auth/gds" for 127.0.0.1 at 2014-05-06 15:54:19 +0000
+Started GET "/auth/gds/callback?code=5ecea67f4e940da2c33a0c8a6df846604bc6b448649c2c5154a3208fdb9f8a95&state=5cfcb5f00cfb66545f931a397ffe037e89e8a4e3dd99d830" for 127.0.0.1 at 2014-05-06 15:54:19 +0000
 Processing by AuthenticationsController#callback as HTML
-  Parameters: {"code"=>"abfdfe30f0b14ee000d529da3dff3a54f6642f676e2676302a9c23287c93839e", "state"=>"15c0e0ca8f17e6b83aa5cbbf66063a31dd84e7ca5ba5c72a"}
+  Parameters: {"code"=>"5ecea67f4e940da2c33a0c8a6df846604bc6b448649c2c5154a3208fdb9f8a95", "state"=>"5cfcb5f00cfb66545f931a397ffe037e89e8a4e3dd99d830"}
 Authenticating with gds_sso strategy
   User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' LIMIT 1
-   (0.1ms)  begin transaction
-   (0.2ms)  UPDATE "users" SET "permissions" = '---
+   (0.0ms)  begin transaction
+   (0.1ms)  UPDATE "users" SET "permissions" = '---
 - signin
 ' WHERE "users"."id" = 11
-   (11.5ms)  commit transaction
+   (9.5ms)  commit transaction
    (0.0ms)  begin transaction
    (0.1ms)  UPDATE "users" SET "permissions" = '---
 - signin
 ' WHERE "users"."id" = 11
-   (10.4ms)  commit transaction
+   (7.3ms)  commit transaction
 Redirected to http://www.example-client.com/restricted
-Completed 302 Found in 27.5ms (ActiveRecord: 22.5ms)
-Started GET "/restricted" for 127.0.0.1 at 2014-03-26 15:49:34 +0000
-Processing by ExampleController#restricted as HTML
-  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' AND "users"."remotely_signed_out" = 'f' LIMIT 1
-Completed 200 OK in 1.3ms (Views: 0.4ms | ActiveRecord: 0.1ms)
-Started GET "/restricted" for 127.0.0.1 at 2014-03-27 11:44:34 +0000
+Completed 302 Found in 21.8ms (ActiveRecord: 17.4ms)
+Started GET "/restricted" for 127.0.0.1 at 2014-05-06 15:54:19 +0000
 Processing by ExampleController#restricted as HTML
-  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' AND "users"."remotely_signed_out" = 'f' LIMIT 1
-Completed 200 OK in 1.0ms (Views: 0.2ms | ActiveRecord: 0.2ms)
-Started GET "/restricted" for 127.0.0.1 at 2014-03-26 15:49:34 +0000
-Processing by ExampleController#restricted as JSON
-Authenticating with gds_bearer_token strategy
-  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' LIMIT 1
-   (0.1ms)  begin transaction
-   (0.2ms)  UPDATE "users" SET "permissions" = '---
-- signin
-' WHERE "users"."id" = 11
-   (10.0ms)  commit transaction
+  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' AND "users"."remotely_signed_out" = 'f' LIMIT 1
+Completed 200 OK in 1.4ms (Views: 0.3ms | ActiveRecord: 0.2ms)
+  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."email" = 'test@example-client.com' LIMIT 1
    (0.0ms)  begin transaction
-   (0.1ms)  UPDATE "users" SET "permissions" = '---
+   (0.1ms)  UPDATE "users" SET "remotely_signed_out" = 't', "permissions" = '---
 - signin
 ' WHERE "users"."id" = 11
-   (6.1ms)  commit transaction
-Completed 200 OK in 64.0ms (Views: 0.5ms | ActiveRecord: 16.6ms)
-Started GET "/restricted" for 127.0.0.1 at 2014-03-26 15:49:34 +0000
-Processing by ExampleController#restricted as JSON
-Authenticating with gds_bearer_token strategy
-Completed   in 8.0ms
-Started GET "/this_requires_signin_permission" for 127.0.0.1 at 2014-03-26 15:49:34 +0000
-Processing by ExampleController#this_requires_signin_permission as JSON
-Authenticating with gds_bearer_token strategy
-  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' LIMIT 1
-   (0.1ms)  begin transaction
-   (0.2ms)  UPDATE "users" SET "permissions" = '---
-- signin
-' WHERE "users"."id" = 11
-   (12.2ms)  commit transaction
+   (8.6ms)  commit transaction
+Started GET "/restricted" for 127.0.0.1 at 2014-05-06 15:54:20 +0000
+Processing by ExampleController#restricted as HTML
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' AND "users"."remotely_signed_out" = 'f' LIMIT 1
+Authenticating with gds_sso strategy
+Completed   in 0.8ms
+Started GET "/auth/gds" for 127.0.0.1 at 2014-05-06 15:54:20 +0000
+Started GET "/auth/gds/callback?code=08fad3db2e47e948e6b9413a1030ebbea2f3e9ed88cd13a87bd90e32e5a8e40e&state=91c0097352e7b98c329a72a26b7f289609bd44f7b42a7a15" for 127.0.0.1 at 2014-05-06 15:54:20 +0000
+Processing by AuthenticationsController#callback as HTML
+  Parameters: {"code"=>"08fad3db2e47e948e6b9413a1030ebbea2f3e9ed88cd13a87bd90e32e5a8e40e", "state"=>"91c0097352e7b98c329a72a26b7f289609bd44f7b42a7a15"}
+Authenticating with gds_sso strategy
+  User Load (0.1ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' LIMIT 1
    (0.0ms)  begin transaction
    (0.1ms)  UPDATE "users" SET "permissions" = '---
 - signin
 ' WHERE "users"."id" = 11
-   (7.3ms)  commit transaction
-Completed 200 OK in 65.2ms (Views: 0.5ms | ActiveRecord: 20.1ms)
+   (8.9ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  UPDATE "users" SET "remotely_signed_out" = 'f', "permissions" = '---
+- signin
+' WHERE "users"."id" = 11
+   (12.6ms)  commit transaction
+Redirected to http://www.example-client.com/restricted
+Completed 302 Found in 25.9ms (ActiveRecord: 22.0ms)
+Started GET "/restricted" for 127.0.0.1 at 2014-05-06 15:54:20 +0000
+Processing by ExampleController#restricted as HTML
+  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."uid" = 'integration-uid' AND "users"."remotely_signed_out" = 'f' LIMIT 1
+Completed 200 OK in 1.2ms (Views: 0.3ms | ActiveRecord: 0.2ms)

data/spec/unit/session_serialisation_spec.rb

@@ -18,12 +18,12 @@ describe Warden::SessionSerializer do
   end
 
   describe "serializing a user" do
-
-    it "should return the uid and a timestamp" do
+    it "should return the uid and an ISO 8601 string timestamp" do
       Timecop.freeze
       result = @serializer.serialize(@user)
 
-      expect(result).to eq([1234, Time.now.utc])
+      expect(result).to eq([1234, Time.now.utc.iso8601])
+      expect(result.last).to be_a(String)
     end
 
     it "should return nil if the user has no uid" do
@@ -35,7 +35,7 @@ describe Warden::SessionSerializer do
   end
 
   describe "deserialize a user" do
-    it "should return the user if the timestamp is current" do
+    it "should return the user if the timestamp is current and a Time" do
       expect(User).to receive(:where).with(:uid => 1234, :remotely_signed_out => false).and_return(double(:first => :a_user))
 
       result = @serializer.deserialize [1234, Time.now.utc - GDS::SSO::Config.auth_valid_for + 3600]
@@ -43,6 +43,14 @@ describe Warden::SessionSerializer do
       expect(result).to equal(:a_user)
     end
 
+    it "should return the user if the timestamp is current and is an ISO 8601 string" do
+      expect(User).to receive(:where).with(:uid => 1234, :remotely_signed_out => false).and_return(double(:first => :a_user))
+
+      result = @serializer.deserialize [1234, (Time.now.utc - GDS::SSO::Config.auth_valid_for + 3600).iso8601]
+
+      expect(result).to equal(:a_user)
+    end
+
     it "should return nil if the timestamp is out of date" do
       expect(User).not_to receive(:where)
 
@@ -58,5 +66,13 @@ describe Warden::SessionSerializer do
 
       expect(result).to be_nil
     end
+
+    it "should return nil for a user with a badly formatted timestamp" do
+      expect(User).not_to receive(:where)
+
+      result = @serializer.deserialize [1234, 'this is not a timestamp']
+
+      expect(result).to be_nil
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gds-sso
 version: !ruby/object:Gem::Version
-  version: 9.2.5
+  version: 9.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -315,7 +315,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1016089070449543199
+      hash: 1214135640714652604
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -324,7 +324,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1016089070449543199
+      hash: 1214135640714652604
 requirements: []
 rubyforge_project: gds-sso
 rubygems_version: 1.8.23