devise_fido_usf 0.1.7 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 42abbd5255725a51542abfb644b763acb7d88bc0
-  data.tar.gz: d4a778d571a0d53f8b795019b7b0f4d926c74463
+SHA256:
+  metadata.gz: 4b79b1247c83ed16483f2e4469dfcaad10389f18acb37a6c78c36b9c8d4c6305
+  data.tar.gz: a86822ad6910a44dd71b5255a7a268f22a5c2d5e284303b23c87329cd552dab7
 SHA512:
-  metadata.gz: b3731b702a48ab0544f31482d1b00e6ddf3972ff22ff83fed7d098e111d5b3c4098eb2f9681bfcd179493ef4d3fe57c94027f52e88be5cdc5dcb061dc22ee69d
-  data.tar.gz: 538830aa044e285f94d089d89c8b21f7cd077f84c27fe3853409a4d790c17d068870e9f5329c77959b74efbe8baf0444734993d9e159fadc1dc51d9ba0fe5a6f
+  metadata.gz: 36813cba698731cc2edb1d9ecf3486dada54a51868ccc6ff270fbb1d125e41efa73528ee5930ea9ecb8a99254b20b26bab9ffea91834db9a9a13e1335491ef07
+  data.tar.gz: 9fde5fec4806f8e731e81d5d65e39d0c05c4ac435abb62050d05ddd23dc2b9d66788a17c397d1f713fd10b4ffec9e98ebe477afe66f37b9d5daa3c45d4480d45

data/README.md

@@ -1,7 +1,6 @@
 # FIDO U2F Authentication for Rails Devise
 
 [![Gem Version](https://badge.fury.io/rb/devise_fido_usf.svg)](https://badge.fury.io/rb/devise_fido_usf)
-[![Dependency Status](https://gemnasium.com/badges/github.com/CyberDeck/devise-fido-u2f.svg)](https://gemnasium.com/github.com/CyberDeck/devise-fido-u2f)
 [![Build Status](https://travis-ci.org/CyberDeck/devise-fido-u2f.svg?branch=master)](https://travis-ci.org/CyberDeck/devise-fido-u2f)
 [![Code Climate](https://codeclimate.com/github/CyberDeck/devise-fido-u2f/badges/gpa.svg)](https://codeclimate.com/github/CyberDeck/devise-fido-u2f)
 [![Coverage Status](https://coveralls.io/repos/github/CyberDeck/devise-fido-u2f/badge.svg)](https://coveralls.io/github/CyberDeck/devise-fido-u2f)
@@ -66,7 +65,7 @@ You can install the `devise_fido_usf` views by running
 rails generate devise_fido_usf:views
 ```
 
-After that, you need to adapt the views to your needs. Take a look at the ![Devise FIDO U2F example app](https://github.com/cyberdeck/devise-fido-u2f-example-app) how it could be integrated into a Rails 5.1 application running Bootstrap v4.
+After that, you need to adapt the views to your needs. Take a look at the [Devise FIDO U2F example app](https://github.com/cyberdeck/devise-fido-u2f-example-app) how it could be integrated into a Rails 5.1 application running Bootstrap v4.
 
 ## Contributing
 This is my first developed and published gem. If you find something unusual or uncommon within my code, please drop me a note how to fix it or make it better. Thank you!

data/app/controllers/devise/fido_usf_registrations_controller.rb

@@ -1,10 +1,12 @@
 class Devise::FidoUsfRegistrationsController < ApplicationController
-  before_action :authenticate_user!
+  before_action :authenticate_resource!
+
+  respond_to :html
 
   def new
     @registration_requests = u2f.registration_requests
     session[:challenges] = @registration_requests.map(&:challenge)
-    key_handles = current_user.fido_usf_devices.map(&:key_handle)
+    key_handles = resource.fido_usf_devices.map(&:key_handle)
     @sign_requests = u2f.authentication_requests(key_handles)
     @app_id = u2f.app_id
     render :new
@@ -12,19 +14,21 @@ class Devise::FidoUsfRegistrationsController < ApplicationController
 
   # Show a list of all registered devices
   def show
-    @devices = current_user.fido_usf_devices.all
+    @devices = resource.fido_usf_devices.all
     render :show
   end
 
   def destroy
-    device = current_user.fido_usf_devices.find(params[:id])
-    @fade_out_id = device.id
+    device = resource.fido_usf_devices.find(params[:id])
+    @fade_out_id = device.id unless params[:on_success_redirect_to]
     device.destroy
-    @devices = current_user.fido_usf_devices.all
+    unless params[:on_success_redirect_to]
+      @devices = resource.fido_usf_devices.all
+    end
     flash[:success] = I18n.t('fido_usf.flashs.device.removed')
     respond_to do |format|
       format.js
-      format.html { redirect_to user_fido_usf_registration_url }
+      format.html { redirect_to fido_usf_registration_url }
     end
   end
 
@@ -34,39 +38,52 @@ class Devise::FidoUsfRegistrationsController < ApplicationController
       reg = u2f.register!(session[:challenges], response)
 
       pubkey = reg.public_key
-      pubkey = Base64.decode64(reg.public_key) unless pubkey.bytesize == 65 && pubkey.byteslice(0) != "\x04" 
-      
+      pubkey = Base64.decode64(reg.public_key) unless pubkey.bytesize == 65 && pubkey.byteslice(0) != "\x04"
+
       @device = FidoUsf::FidoUsfDevice.create!(
-          user: current_user,
-          name: "Token ##{current_user.fido_usf_devices.count+1}",
-          certificate: reg.certificate,
-          key_handle: reg.key_handle,
-          public_key: pubkey,
-          counter: reg.counter,
-          last_authenticated_at: Time.now)
+        user: resource,
+        name: "Token ##{resource.fido_usf_devices.count + 1}",
+        certificate: reg.certificate,
+        key_handle: reg.key_handle,
+        public_key: pubkey,
+        counter: reg.counter,
+        last_authenticated_at: Time.now
+      )
       flash[:success] = I18n.t('fido_usf.flashs.device.registered')
     rescue U2F::Error => e
       @error_message = "Unable to register: #{e.class.name}"
-      flash[:error] = @error_message 
+      flash[:error] = @error_message
     ensure
       session.delete(:challenges)
     end
 
-    respond_to do |format|
-      format.js
-      format.html { redirect_to user_fido_usf_registration_url }
-    end
+    respond_with resource, location: after_sign_in_path_for(resource)
   end
 
   def update
-    device = current_user.fido_usf_devices.find(params[:id])
+    device = resource.fido_usf_devices.find(params[:id])
     device.update!(fido_usf_params)
     respond_to do |format|
       format.js
-      format.html { redirect_to user_fido_usf_registration_url }
+      format.html { redirect_to fido_usf_registration_url }
     end
   end
 
+  if respond_to?(:helper_method)
+    helpers = %w[resource_name]
+    helper_method(*helpers)
+  end
+
+  protected
+
+  def resource_name
+    devise_mapping.name
+  end
+
+  def devise_mapping
+    @devise_mapping ||= request.env['devise.mapping']
+  end
+
   private
 
   def fido_usf_params
@@ -78,4 +95,17 @@ class Devise::FidoUsfRegistrationsController < ApplicationController
     # use base_url as app_id, e.g. 'http://localhost:3000'
     @u2f ||= U2F::U2F.new(request.base_url)
   end
+
+  def resource
+    send("current_#{resource_name}")
+  end
+
+  def authenticate_resource!
+    send("authenticate_#{resource_name}!")
+  end
+
+  def fido_usf_registration_url
+    params[:on_success_redirect_to].presence ||
+      send("#{resource_name}_fido_usf_registration_url")
+  end
 end

data/app/views/devise/fido_usf_authentications/new.html.erb

@@ -1,11 +1,11 @@
 <h2>Authenticate key</h2>
 <p>Please insert one of your registered keys and press the button within 15 seconds</p>
 <p id="waiting">Waiting...</p>
-<p id="error" style="display: none;"></p>
-<%= form_tag user_fido_usf_authentication_path(), method: 'post' do %>
+<p id="error" class="d-none"></p>
+<%= form_tag send("#{resource_name}_fido_usf_authentication_path"), method: 'post' do %>
   <%= hidden_field_tag :response %>
 <% end %>
-<script>
+<%= javascript_tag nonce: true do -%>
   var appId = <%= @app_id.to_json.html_safe %>;
   var signRequests = <%= @sign_requests.to_json.html_safe %>;
   var challenge = <%= @challenge.to_json.html_safe %>;
@@ -19,8 +19,8 @@
     5: 'Authentication timed out. Please reload to try again.'
   };
   var setError = function(code) {
-    $waiting.style.display = 'none';
-    $error.style.display = 'block';
+    $waiting.className += ' d-none';
+    $error.className = $error.className.replace(/\bd-none\b/g, '');
     $error.innerHTML = errorMap[code];
   };
 
@@ -38,4 +38,4 @@
 
     form.submit();
   }, 15);
-</script>
+<% end -%>

data/app/views/devise/fido_usf_registrations/_device.html.erb

@@ -1,5 +1,5 @@
 <tr id="device_<%= device.id %>">
   <td><%= device.name %></td>
   <td><%= l(device.last_authenticated_at, format: :long) %></td>
-  <td><%= link_to 'Delete', user_fido_usf_registration_path(id: device.id), remote: true, :method => :delete, data: {confirm: "Should device #{device.name} be deleted?" } %></td>
+  <td><%= link_to 'Delete', send("#{resource_name}_fido_usf_registration_path", id: device.id), remote: true, method: :delete, data: { confirm: "Should device #{device.name} be deleted?" } %></td>
 </tr>

data/app/views/devise/fido_usf_registrations/new.html.erb

@@ -1,13 +1,13 @@
 <h2>Register key</h2>
 <p>Please insert the key and press the button within 15 seconds</p>
 <p id="waiting">Waiting...</p>
-<p id="error" style="display: none;"></p>
+<p id="error" class="d-none"></p>
 
-<%= form_tag user_fido_usf_registration_path(), method: 'post' do %>
+<%= form_tag send("#{resource_name}_fido_usf_registration_path"), method: 'post' do %>
   <%= hidden_field_tag :response %>
 <% end %>
 
-<script>
+<%= javascript_tag nonce: true do -%>
   var appId = <%= @app_id.to_json.html_safe %>;
   var registerRequests = <%= @registration_requests.to_json.html_safe %>;
   var signRequests = <%= @sign_requests.to_json.html_safe %>;
@@ -21,8 +21,8 @@
     5: 'Authentication timed out. Please reload to try again.'
   };
   var setError = function(code) {
-    $waiting.style.display = 'none';
-    $error.style.display = 'block';
+    $waiting.className += ' d-none';
+    $error.className = $error.className.replace(/\bd-none\b/g, '');
     $error.innerHTML = errorMap[code];
   };
 
@@ -40,4 +40,4 @@
 
     form.submit();
   }, 15);
-</script>
+<% end -%>

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

@@ -2,4 +2,4 @@
 <p>List of registered devices:</p>
 <%= render 'devise/fido_usf_registrations/devices' %>
 <p><%= link_to 'Back', root_path %></p>
-<p><%= link_to 'Add', new_user_fido_usf_registration_path %></p>
+<p><%= link_to 'Add', send("new_#{resource_name}_fido_usf_registration_path") %></p>

data/lib/devise_fido_usf/controllers/helpers.rb

@@ -7,22 +7,24 @@ module DeviseFidoUsf
 
       included do
         before_action :check_request_and_redirect_to_verify_fido_usf,
-                      if: :is_user_signing_in?
+                      if: :user_signing_in?
       end
 
       private
-      def is_devise_sessions_controller?
-        self.class == Devise::SessionsController || self.class.ancestors.include?(Devise::SessionsController)
+
+      def devise_sessions_controller?
+        self.class == Devise::SessionsController ||
+          self.class.ancestors.include?(Devise::SessionsController)
       end
 
-      def is_user_signing_in?
+      def user_signing_in?
         if devise_controller? && signed_in?(resource_name) &&
-          is_devise_sessions_controller? &&
-          self.action_name == "create"
+           devise_sessions_controller? &&
+           action_name == 'create'
           return true
         end
 
-        return false
+        false
       end
 
       def check_request_and_redirect_to_verify_fido_usf

data/lib/devise_fido_usf/models/fido_usf_registerable.rb

@@ -4,7 +4,10 @@ module Devise
       extend ActiveSupport::Concern
 
       included do
-        has_many :fido_usf_devices, class_name: 'FidoUsf::FidoUsfDevice', foreign_key: 'user_id', dependent: :destroy
+        has_many :fido_usf_devices,
+                 as: :user,
+                 class_name: 'FidoUsf::FidoUsfDevice',
+                 dependent: :destroy
       end
     end
   end

data/lib/devise_fido_usf/version.rb

@@ -1,3 +1,3 @@
 module DeviseFidoUsf
-  VERSION = '0.1.7'
+  VERSION = '0.1.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_fido_usf
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.12
 platform: ruby
 authors:
 - H. Gregor Molter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-30 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -242,10 +242,14 @@ files:
 - lib/generators/templates/README
 - lib/generators/templates/migration.rb
 - lib/tasks/devise_fido_usf_tasks.rake
-homepage: https://github.com/CyberDeck/devise-fido-u2f/
+homepage: https://github.com/CyberDeck/devise-fido-u2f
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://github.com/cyberdeck/devise-fido-u2f
+  changelog_uri: https://github.com/cyberdeck/devise-fido-u2f/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/cyberdeck/devise-fido-u2f/
+  bug_tracker_uri: https://github.com/cyberdeck/devise-fido-u2f/issues
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -261,8 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Devise module to allow FIDO U2F authentication.