devise_userbin 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c04e4b8c1e1975622215e92d66d36465d27557e2
-  data.tar.gz: 40416f06a0627fe5056b020c80d41c34eede76b5
+  metadata.gz: 7d51caed08ebe567de0412fb638d349a83008481
+  data.tar.gz: 13cef542ac371d9e65dafc5d27017e9010bf0455
 SHA512:
-  metadata.gz: 7aa9ee588470e15e19fdd4e23efdf6fcbc8eb323293cb507267a23afb044866dfb2c1934ad93e208ca24f1918e0990792a930480d39719c389797749d8428f01
-  data.tar.gz: 446bcad60762fd4338bf3bfa6c3dd4cbda2d05412cdddc4f77722a27332caa5fc0fd42f40e53434fff7f84c6e00f9f030dad0d01f622e550170dd916ce40b082
+  metadata.gz: 758e64f1d08563a3b0fac3200f6a9961ab1cde7bc7d4524b9433e32d5fed4d2b694e41e40dbfe8b30d6bf819a419e005fdb2b369207d93a40757a1897205a510
+  data.tar.gz: 74013028367c4bf340f526d7b7f88533a480d8c96082e9fdefacb8d251d457bb917483660fcb57eb05a136d3ba9f647ed5e0e5fb52131e8d2f0159b5051fdeb9

data/app/controllers/devise/devise_userbin_controller.rb

@@ -1,35 +1,36 @@
 class Devise::DeviseUserbinController < DeviseController
   include Devise::Controllers::Helpers
 
+  before_filter :return_not_found, except: :new
+
   before_filter do
-    # This controller should only be reachable when two-factor is in progress
-    unless env['userbin'].two_factor_in_progress?
-      redirect_to after_sign_in_path_for(resource_name)
-    end
+    env['userbin.skip_authorization'] = true
   end
 
-  def show
+  def new
+    challenge = env['userbin'].challenges.create
+    redirect_to edit_user_two_factor_authentication_path(challenge.id) # todo:
+  end
+
+  def edit
+    @challenge = env['userbin'].challenges.find(params[:id])
+
+    # Prevent "undefined method `errors' for nil:NilClass"
     self.resource = resource_class.new
   end
 
   def update
-    render :show and return if params[:code].nil?
+    challenge_id = params.require(:challenge_id)
+    code = params.require(:code)
 
-    Devise.mappings.keys.flatten.any? do |scope|
-      begin
-        env['userbin'].two_factor_verify(params[:code])
+    begin
+      env['userbin'].challenges.verify(challenge_id, response: code)
 
-        set_flash_message :notice, :success
+      Devise.mappings.keys.flatten.any? do |scope|
         redirect_to after_sign_in_path_for(scope)
-      rescue Userbin::UserUnauthorizedError => error
-        set_flash_message :alert, :failed
-        self.resource = resource_class.new
-        respond_with_navigational(resource_name) { render :show }
-      rescue Userbin::ForbiddenError => error
-        sign_out_with_message(:no_retries_remaining, :alert)
-      rescue Userbin::Error => error
-        sign_out_with_message(:error, :alert)
       end
+    rescue Userbin::Error => error
+      sign_out_with_message(:no_retries_remaining, :alert)
     end
   end
 
@@ -41,4 +42,12 @@ class Devise::DeviseUserbinController < DeviseController
     redirect_to after_sign_out_path_for(resource_name)
   end
 
+  private
+
+  def return_not_found
+    unless env['userbin'].mfa_in_progress?
+      redirect_to after_sign_in_path_for(resource_name)
+    end
+  end
+
 end

data/app/views/devise/two_factor_authentication/{show.html.erb → edit.html.erb}

@@ -5,9 +5,9 @@
 <%= form_tag([resource_name, :two_factor_authentication], :method => :put) do %>
   <%= devise_error_messages! %>
   <p><%= label_tag :code, t("devise.two_factor_authentication.show.code_label") %><br />
-  <%= text_field_tag :code %></p>
+  <%= text_field_tag :code %>
+  <%= hidden_field_tag(:challenge_id, @challenge.id) %>
   <p><%= submit_tag t("devise.two_factor_authentication.show.submit_button") %></p>
 <% end -%>
 
-<p><%= t "devise.two_factor_authentication.show.recovery_message" %><br />
-<%= link_to t("devise.two_factor_authentication.show.recovery_action"), [resource_name, :two_factor_recovery] %></p>
+<p><%= t "devise.two_factor_authentication.show.recovery_message" %>

data/lib/devise_userbin/controllers/helpers.rb

@@ -4,72 +4,26 @@ module DeviseUserbin
       extend ActiveSupport::Concern
 
       included do
-        before_filter :authorize_resource
-        before_filter :handle_two_factor_authentication
-      end
-
-      private
-
-      def authorize_resource
-        Devise.mappings.keys.flatten.any? do |scope|
-          if signed_in?(scope)
-            begin
-              env['userbin'].authorize
-            rescue Userbin::RequestError
-              # ignore that the API is unreachable
-            rescue Userbin::Error
-              warden.logout(scope)
-              throw :warden, :scope => scope, :message => :signed_out
-            end
+        rescue_from Userbin::UserUnauthorizedError do |error|
+          Devise.mappings.keys.flatten.any? do |scope|
+            warden.logout(scope)
+            throw :warden, :scope => scope, :message => :signed_out
           end
         end
-      end
 
-      def handle_two_factor_authentication
-        if !devise_controller?
+        rescue_from Userbin::ChallengeRequiredError do |error|
           Devise.mappings.keys.flatten.any? do |scope|
-            if signed_in?(scope) && env['userbin'].authorized?
-
-              # Log out if leaving the two-factor page
-              if env['userbin'].two_factor_in_progress? &&
-                 controller_name != 'two_factor_authentication' &&
-                 controller_name != 'two_factor_recovery'
-                warden.logout(scope)
-                throw :warden, :scope => scope
-              end
-
-              begin
-                factor = env['userbin'].two_factor_authenticate!
-
-                # Show form and message specific to the current factor
-                case factor
-                when :authenticator, :yubikey
-                  handle_required_two_factor_authentication(scope)
-                end
-              rescue Userbin::Error
-                warden.logout(scope)
-                throw :warden, :scope => scope, :message => :signed_out
-              end
+            if request.format.present? and request.format.html?
+              session["#{scope}_return_to"] = request.path if request.get?
+              # todo: doesn't seem to work
+              redirect_to send("new_#{scope}_two_factor_authentication_path")
+            else
+              render nothing: true, status: :unauthorized
             end
           end
         end
       end
 
-      def handle_required_two_factor_authentication(scope)
-        if request.format.present? and request.format.html?
-          session["#{scope}_return_to"] = request.path if request.get?
-          redirect_to two_factor_authentication_path_for(scope)
-        else
-          render nothing: true, status: :unauthorized
-        end
-      end
-
-      def two_factor_authentication_path_for(resource_or_scope = nil)
-        scope = Devise::Mapping.find_scope!(resource_or_scope)
-        change_path = "#{scope}_two_factor_authentication_path"
-        send(change_path)
-      end
-
     end
   end
 end

data/lib/devise_userbin/hooks.rb

@@ -2,18 +2,22 @@ Warden::Manager.on_request do |warden|
   warden.request.env['userbin'] = Userbin::Client.new(warden.request)
 end
 
-Warden::Manager.after_authentication do |record, warden, opts|
+Warden::Manager.before_logout do |record, warden, opts|
   if record.respond_to?(:userbin_id)
-    warden.request.env['userbin'].login(
-      record._userbin_id, email: record.email)
+    warden.request.env['userbin'].logout
   end
 end
 
-Warden::Manager.before_logout do |record, warden, opts|
+Warden::Manager.after_set_user :except => :fetch do |record, warden, opts|
+  if record.respond_to?(:userbin_id)
+    env = warden.request.env
+    env['userbin'].login(record._userbin_id, email: record.email)
+  end
+end
+
+Warden::Manager.after_set_user do |record, warden, opts|
   if record.respond_to?(:userbin_id)
-    begin
-      userbin = warden.request.env['userbin']
-      userbin.logout
-    rescue Userbin::Error; end
+    env = warden.request.env
+    env['userbin'].authorize! unless env['userbin.skip_authorization']
   end
 end

data/lib/devise_userbin/routes.rb

@@ -3,9 +3,7 @@ module ActionDispatch::Routing
     protected
 
     def devise_userbin(mapping, controllers)
-      resource :two_factor_authentication, :only => [:show, :update], :path => mapping.path_names[:two_factor_authentication], :controller => controllers[:two_factor_authentication]
-
-      resource :two_factor_recovery, :only => [:show, :update], :path => mapping.path_names[:two_factor_recovery], :controller => controllers[:two_factor_recovery]
+      resources :two_factor_authentication, :only => [:new, :show, :update, :edit], :path => mapping.path_names[:two_factor_authentication], :controller => controllers[:two_factor_authentication]
 
       resource :security_settings, :only => [:show], :path => mapping.path_names[:security_settings], :controller => controllers[:security_settings]
     end

data/lib/devise_userbin/version.rb

@@ -1,3 +1,3 @@
 module DeviseUserbin
-  VERSION = "0.3.0".freeze
+  VERSION = "0.5.0".freeze
 end

data/lib/generators/devise_userbin/views_generator.rb

@@ -12,7 +12,6 @@ module DeviseUserbin
       source_root File.expand_path("../../../../app/views/devise", __FILE__)
       def copy_views
         view_directory :two_factor_authentication
-        view_directory :two_factor_recovery
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_userbin
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Johan Brissmyr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-02 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -90,9 +90,7 @@ files:
 - app/controllers/devise/devise_userbin_controller.rb
 - app/controllers/devise/security_settings_controller.rb
 - app/controllers/devise/two_factor_authentication_controller.rb
-- app/controllers/devise/two_factor_recovery_controller.rb
-- app/views/devise/two_factor_authentication/show.html.erb
-- app/views/devise/two_factor_recovery/show.html.erb
+- app/views/devise/two_factor_authentication/edit.html.erb
 - lib/devise_userbin.rb
 - lib/devise_userbin/controllers/helpers.rb
 - lib/devise_userbin/controllers/view_helpers.rb

data/app/controllers/devise/two_factor_recovery_controller.rb

@@ -1,3 +0,0 @@
-module Devise
-  class TwoFactorRecoveryController < DeviseUserbinController; end
-end

data/app/views/devise/two_factor_recovery/show.html.erb

@@ -1,10 +0,0 @@
-<h2><%= t "devise.two_factor_recovery.show.header" %></h2>
-
-<%= form_tag([resource_name, :two_factor_recovery], :method => :put) do %>
-  <%= devise_error_messages! %>
-  <p><%= label_tag :code, t("devise.two_factor_recovery.show.code_label")%><br />
-  <%= text_field_tag :code %></p>
-  <p><%= submit_tag t("devise.two_factor_recovery.show.submit_button") %></p>
-<% end -%>
-
-<p><%= t "devise.two_factor_recovery.show.message" %></p>