ddr-models 1.11.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47da234ecb43f36fb0eb336d31519cddf290a207
-  data.tar.gz: ff7d195e23915f0e127161c01f24d2044dc879d2
+  metadata.gz: 837cafd9ab6769041a062fd47742966370b1ba62
+  data.tar.gz: 589bac968ddbdf98c3c4b6d4139f655ca1dfe01f
 SHA512:
-  metadata.gz: 3c435826a74310c1e70f2b8edf46569727edd0939a5863519bbe858a44313b1fb01dfdfd8cecb63d86399fc23e16205b80c634f73e4177c50d7ba1034fbdb2b4
-  data.tar.gz: dfce4af10755852dea51a93ebbed93b31aeef6f3b3b5672bfe5171a0cdd88c6b3b836752efaecee5e6b7c2a5419f9c82a9e8b4a37e0c6d0616cea18442fb92f0
+  metadata.gz: 607544332a3376a8230868ba3c72ddbe79b63176992adbc3cbf4cb35f7d3fa59e3772b68278e3f2045705a250df739fc606d3cf28a9ef005b59a21462766248b
+  data.tar.gz: 5b6343f564728cfffe174982f6e94e92f6adace9ca472c9154552fdd29e477fc02717eee7b4a1911a17992b6cb87ab81904c08677646f8c5170d8afdef1dda91

data/app/controllers/users/omniauth_callbacks_controller.rb

@@ -8,8 +8,4 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
     sign_in_and_redirect user
   end
 
-  def after_sign_in_path_for(resource)
-    request.env["omniauth.origin"] || super
-  end
-
 end

data/app/controllers/users/sessions_controller.rb

@@ -1,10 +1,11 @@
 class Users::SessionsController < Devise::SessionsController
 
   def new
+    store_location_for(:user, request.referrer)
     if Ddr::Auth.require_shib_user_authn
-      redirect_to user_omniauth_authorize_path(:shibboleth, origin: request.referrer)
+      flash.discard(:alert)
+      redirect_to user_omniauth_authorize_path(:shibboleth)
     else
-      store_location_for(:user, request.referrer)
       super
     end
   end

data/config/initializers/devise.rb

@@ -238,6 +238,7 @@ Devise.setup do |config|
   # end
 
   config.warden do |manager|
+    manager.failure_app = Ddr::Auth::FailureApp
     # :superuser scope
     manager.serialize_into_session(:superuser) { |superuser| superuser.id }
     manager.serialize_from_session(:superuser) { |id| Devise.mappings[:user].to.find(id) }

data/lib/ddr/auth.rb

@@ -8,6 +8,7 @@ module Ddr
     autoload :GroupService
     autoload :GrouperService
     autoload :RemoteGroupService
+    autoload :FailureApp
 
     # Group authorized to act as superuser
     mattr_accessor :superuser_group

data/lib/ddr/auth/failure_app.rb

@@ -0,0 +1,16 @@
+module Ddr
+  module Auth
+    class FailureApp < Devise::FailureApp
+
+      def respond
+        if scope == :user && Ddr::Auth.require_shib_user_authn
+          store_location!
+          redirect_to user_omniauth_authorize_path(:shibboleth)
+        else
+          super
+        end
+      end
+
+    end
+  end
+end

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "1.11.0"
+    VERSION = "1.11.1"
   end
 end

data/spec/controllers/application_controller_spec.rb

@@ -0,0 +1,22 @@
+RSpec.describe ApplicationController, type: :controller do
+  controller do
+    before_action :authenticate_user!
+    def index; end
+  end
+  describe "authentication failure handling" do
+    describe "when shibboleth user authentication is required" do
+      before { allow(Ddr::Auth).to receive(:require_shib_user_authn) { true } }
+      it "should redirect to the shib authn path" do
+        get :index
+        expect(response).to redirect_to(user_omniauth_authorize_path(:shibboleth))
+      end
+    end
+    describe "when shibboleth user authentication is not required" do
+      before { allow(Ddr::Auth).to receive(:require_shib_user_authn) { false } }
+      it "should redirect to the new user session path" do
+        get :index
+        expect(response).to redirect_to(new_user_session_path)
+      end
+    end
+  end
+end

data/spec/controllers/users/sessions_controller_spec.rb

@@ -4,21 +4,32 @@ RSpec.describe Users::SessionsController, type: :controller do
 
   describe "#new" do
     before { request.env["HTTP_REFERER"] = "/foo/bar" }
+    it "should store the location of the previous page" do
+      expect(subject).to receive(:store_location_for).with(:user, "/foo/bar")    
+      get :new
+    end
     describe "when shibboleth user authentication is required" do
       before { allow(Ddr::Auth).to receive(:require_shib_user_authn) { true } }
-      it "should redirect to the shib authn path, setting the origin to the previous page" do
+      it "should redirect to the shib authn path" do
+        get :new
+        expect(response).to redirect_to(user_omniauth_authorize_path(:shibboleth))
+      end
+      it "should discard the flash alert" do
+        expect_any_instance_of(ActionDispatch::Flash::FlashHash).to receive(:discard).with(:alert)
         get :new
-        expect(response).to redirect_to(user_omniauth_authorize_path(:shibboleth, origin: "/foo/bar"))
       end
     end
 
     describe "when shibboleth user authentication is NOT required" do
       before { allow(Ddr::Auth).to receive(:require_shib_user_authn) { false } }
       it "should store the location of the previous page and render the 'new' template" do
-        expect(subject).to receive(:store_location_for).with(:user, "/foo/bar")
         get :new
         expect(response).to render_template(:new)
       end
+      it "should NOT discard the flash alert" do
+        expect_any_instance_of(ActionDispatch::Flash::FlashHash).not_to receive(:discard).with(:alert)
+        get :new
+      end
     end
   end
 

data/spec/dummy/log/development.log

@@ -10291,3 +10291,309 @@ Migrating to AddUserKeyToEvents (20150130134416)
    (1.0ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141216040225')
    (1.4ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141218020612')
    (1.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150110023410')
+Using the default predicate_mappings.yml that comes with active-fedora.  If you want to override this, pass the path to predicate_mappings.yml to ActiveFedora - ie. ActiveFedora.init(:predicate_mappings_config_path => '/path/to/predicate_mappings.yml') - or set Rails.root and put predicate_mappings.yml into #{Rails.root}/config.
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_events_on_type' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_events_on_type' AND type='index'
+
+   (0.2ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_events_on_pid' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_events_on_pid' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_events_on_outcome' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_events_on_outcome' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_events_on_event_date_time' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_events_on_event_date_time' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_users_on_username' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_users_on_username' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_users_on_reset_password_token' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_users_on_reset_password_token' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_users_on_email' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_users_on_email' AND type='index'
+
+   (1.3ms)  CREATE TABLE "events" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "event_date_time" datetime, "user_id" integer, "type" varchar(255), "pid" varchar(255), "software" varchar(255), "comment" text, "created_at" datetime, "updated_at" datetime, "summary" varchar(255), "outcome" varchar(255), "detail" text, "exception" varchar(255), "user_key" varchar(255)) 
+   (0.1ms)  select sqlite_version(*)
+   (1.1ms)  CREATE  INDEX "index_events_on_event_date_time" ON "events" ("event_date_time")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_events_on_event_date_time' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_events_on_event_date_time' AND type='index'
+
+   (1.1ms)  CREATE  INDEX "index_events_on_outcome" ON "events" ("outcome")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_events_on_outcome' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_events_on_outcome' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_events_on_event_date_time' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_events_on_event_date_time' AND type='index'
+
+   (1.1ms)  CREATE  INDEX "index_events_on_pid" ON "events" ("pid")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_events_on_pid' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_events_on_pid' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_events_on_outcome' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_events_on_outcome' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_events_on_event_date_time' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_events_on_event_date_time' AND type='index'
+
+   (1.0ms)  CREATE  INDEX "index_events_on_type" ON "events" ("type")
+   (1.6ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar(255) DEFAULT '' NOT NULL, "encrypted_password" varchar(255) DEFAULT '' NOT NULL, "reset_password_token" varchar(255), "reset_password_sent_at" datetime, "remember_created_at" datetime, "sign_in_count" integer DEFAULT 0, "current_sign_in_at" datetime, "last_sign_in_at" datetime, "current_sign_in_ip" varchar(255), "last_sign_in_ip" varchar(255), "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL, "username" varchar(255) DEFAULT '' NOT NULL, "first_name" varchar(255), "middle_name" varchar(255), "nickname" varchar(255), "last_name" varchar(255), "display_name" varchar(255)) 
+   (1.1ms)  CREATE  INDEX "index_users_on_email" ON "users" ("email")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_users_on_email' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_users_on_email' AND type='index'
+
+   (1.1ms)  CREATE UNIQUE INDEX "index_users_on_reset_password_token" ON "users" ("reset_password_token")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_users_on_reset_password_token' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_users_on_reset_password_token' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_users_on_email' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_users_on_email' AND type='index'
+
+   (1.3ms)  CREATE UNIQUE INDEX "index_users_on_username" ON "users" ("username")
+   (1.1ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (1.0ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (1.5ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150130134416')
+   (1.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141021233359')
+   (1.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141021234156')
+   (1.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141103192146')
+   (1.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141104181418')
+   (1.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141107124012')
+   (1.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141216040225')
+   (1.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141218020612')
+   (1.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150110023410')
+Using the default predicate_mappings.yml that comes with active-fedora.  If you want to override this, pass the path to predicate_mappings.yml to ActiveFedora - ie. ActiveFedora.init(:predicate_mappings_config_path => '/path/to/predicate_mappings.yml') - or set Rails.root and put predicate_mappings.yml into #{Rails.root}/config.
+  ActiveRecord::SchemaMigration Load (0.4ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_events_on_type' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_events_on_type' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_events_on_pid' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_events_on_pid' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_events_on_outcome' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_events_on_outcome' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_events_on_event_date_time' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_events_on_event_date_time' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_users_on_username' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_users_on_username' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_users_on_reset_password_token' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_users_on_reset_password_token' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_users_on_email' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_users_on_email' AND type='index'
+
+   (1.2ms)  CREATE TABLE "events" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "event_date_time" datetime, "user_id" integer, "type" varchar(255), "pid" varchar(255), "software" varchar(255), "comment" text, "created_at" datetime, "updated_at" datetime, "summary" varchar(255), "outcome" varchar(255), "detail" text, "exception" varchar(255), "user_key" varchar(255)) 
+   (0.1ms)  select sqlite_version(*)
+   (1.2ms)  CREATE  INDEX "index_events_on_event_date_time" ON "events" ("event_date_time")
+   (0.2ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_events_on_event_date_time' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_events_on_event_date_time' AND type='index'
+
+   (1.2ms)  CREATE  INDEX "index_events_on_outcome" ON "events" ("outcome")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_events_on_outcome' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_events_on_outcome' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_events_on_event_date_time' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_events_on_event_date_time' AND type='index'
+
+   (1.1ms)  CREATE  INDEX "index_events_on_pid" ON "events" ("pid")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_events_on_pid' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_events_on_pid' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_events_on_outcome' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_events_on_outcome' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_events_on_event_date_time' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_events_on_event_date_time' AND type='index'
+
+   (1.2ms)  CREATE  INDEX "index_events_on_type" ON "events" ("type")
+   (1.2ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar(255) DEFAULT '' NOT NULL, "encrypted_password" varchar(255) DEFAULT '' NOT NULL, "reset_password_token" varchar(255), "reset_password_sent_at" datetime, "remember_created_at" datetime, "sign_in_count" integer DEFAULT 0, "current_sign_in_at" datetime, "last_sign_in_at" datetime, "current_sign_in_ip" varchar(255), "last_sign_in_ip" varchar(255), "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL, "username" varchar(255) DEFAULT '' NOT NULL, "first_name" varchar(255), "middle_name" varchar(255), "nickname" varchar(255), "last_name" varchar(255), "display_name" varchar(255)) 
+   (1.2ms)  CREATE  INDEX "index_users_on_email" ON "users" ("email")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_users_on_email' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_users_on_email' AND type='index'
+
+   (1.2ms)  CREATE UNIQUE INDEX "index_users_on_reset_password_token" ON "users" ("reset_password_token")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_users_on_reset_password_token' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_users_on_reset_password_token' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_users_on_email' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_users_on_email' AND type='index'
+
+   (1.3ms)  CREATE UNIQUE INDEX "index_users_on_username" ON "users" ("username")
+   (1.1ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (1.2ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (1.4ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150130134416')
+   (1.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141021233359')
+   (1.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141021234156')
+   (1.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141103192146')
+   (1.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141104181418')
+   (1.0ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141107124012')
+   (1.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141216040225')
+   (1.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20141218020612')
+   (1.0ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150110023410')