cookie_crypt 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84e632676b78ea76d8a02e60db8662e89a2d3d7f
-  data.tar.gz: 395894fa59ff78d985228ab89d4a102fd421841f
+  metadata.gz: c7577d9bb79387e429db3b9fc80d12fef8baf8c0
+  data.tar.gz: 55d8bc3a279e9ac333015defdbdf624511dd0f56
 SHA512:
-  metadata.gz: 4fac98960b7f25f2c419e80851834c0f2bfbdf69567058fd22eec5ad2fc7b75a4ee19f51e7da5d6054465837edaf86eeabf88ad928d9834dfcdb9a3ae13ea0e3
-  data.tar.gz: 1e045a35ed0deb4071c665824116b3efc8636e2f8be396ec6f055923d4373a7743b2d9b5c9387263ffc4b3a9178c2890103f4c54bcd3ef685cd5f2d72aba6683
+  metadata.gz: c2fff4e687726ac1882bd082c042668c59c887696e01305d7d3c6b469328c0f7232f0a12c068ae32b566d4d60aa4cc44e72538044281a8958c1dc7b9a8267f2e
+  data.tar.gz: 62d200a43750fae54643231b38bbfbe745a3f6896ba125d789f1a6d83be5e7f3880e61a870fdaa1d833e1a516c2b4c8fb5f14e8ad54954f8851df0bb7183c6e0

data/README.md

@@ -29,7 +29,9 @@ In order to add encrypted cookie two factor authorization to a model, run the co
     bundle exec rails g cookie_crypt MODEL
 
 Where MODEL is your model name (e.g. User or Admin). This generator will add `:cookie_cryptable` to your model
-and create a migration in `db/migrate/`, which will add the required columns to your table.
+and create a migration in `db/migrate/`, which will add the required columns to your table. It will also generate
+cookie crypt views in app/views/devise/cookie_crypt. You can delete these views if you'd rather just use the default
+ones served from the gem.
 
 ### NOTE!
 
@@ -124,7 +126,7 @@ the question-auth.
     * Default is 3
     * The maximum number of tries a user has before they are locked out of cookie crypt and unable to fully login.
 * cookie_deletion_time_frame
-    * Default is '30.days.from.now'
+    * Default is '30.days.from_now'
     * Must be a string that evaluates to a date in the future.
 
 ### Rationalle

data/app/controllers/devise/cookie_crypt_controller.rb

@@ -26,6 +26,7 @@ class Devise::CookieCryptController < DeviseController
     else
       flash[:notice] = "Signed In Successfully, now going through two factor authentication."
       @user = resource
+      @request_path = request.fullpath.split('?').first
       render template: "devise/cookie_crypt/show"
     end
   end
@@ -55,10 +56,10 @@ class Devise::CookieCryptController < DeviseController
       resource.save
 
       authentication_success
-    else
+    else #normal login attempts
       
       if matching_answers?(h)
-        generate_cookie
+        generate_cookie unless params[:do_not_save_cookie]
         update_resource_cycle(h)
         log_agent_to_resource
         authentication_success

data/app/views/devise/cookie_crypt/_extra_fields.html.erb

@@ -9,6 +9,6 @@
   <%=text_field_tag "security_answer_#{session[:cookie_crypt_questions_count]}", nil, size: 50, name: "security[security_answer_#{session[:cookie_crypt_questions_count]}]" %>
   <br></br>
 
-  <%= link_to "Remove this question / answer pair?", "#{request.fullpath}?remove=#{session[:cookie_crypt_questions_count]}", remote: true %>
+  <%= link_to "Remove this question / answer pair?", "#{@request_path}?remove=#{session[:cookie_crypt_questions_count]}", remote: true %>
   <br></br>
 </div>

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

@@ -23,7 +23,7 @@
     
     <% if @user.class.enable_custom_question_counts %>
       <div id="cookie_crypt_additions_binder"></div>
-      <%= link_to "Add more security questions and answers?", "#{request.fullpath}", remote: true %>
+      <%= link_to "Add more security questions and answers?", @request_path, remote: true %>
       <br></br>
     <% end %>
 
@@ -60,7 +60,7 @@
 
     <% if @user.class.enable_custom_question_counts %>
       <div id="cookie_crypt_additions_binder"></div>
-      <%= link_to "Add more security questions and answers?", "#{request.fullpath}", remote: true %>
+      <%= link_to "Add more security questions and answers?", @request_path, remote: true %>
       <br></br>
     <% end %>
 
@@ -68,17 +68,15 @@
     <br></br>
   <% else %>
 
-    <% h = Hash.class_eval(@user.security_hash) %>
-
-    <% @questions.each do |q| %>
+    <% #Begin 1.2 changes %>
 
-      <h2><%="#{q}"%></h2>
+    <div id="cookie_crypt_login_binder">
 
-      <%=text_field_tag h.key(q).gsub('question','answer'), nil, size: 50, name: "security_answers[#{h.key(q).gsub('question','answer')}]" %>
+      <%= render partial: 'private_login_questions' %>
 
-      <br></br>
+    </div>
 
-    <% end %>
+    <% #End 1.2 Changes %>
 
   <% end %>
 

data/app/views/devise/cookie_crypt/show.js.erb

@@ -1,5 +1,11 @@
 <% if params[:remove] %>
   $('#security_binder_<%= params[:remove] %>').remove();
+<% elsif params[:bind_public_form] %>
+  $('#cookie_crypt_login_binder').empty();
+  $('#cookie_crypt_login_binder').append('<%= escape_javascript(render partial: "public_login_questions")%>');
+<% elsif params[:bind_private_form] %>
+  $('#cookie_crypt_login_binder').empty();
+  $('#cookie_crypt_login_binder').append('<%= escape_javascript(render partial: "private_login_questions")%>');
 <% else %>
   <% session[:cookie_crypt_questions_count] ||= @user.class.cookie_crypt_minimum_questions %>
   <% session[:cookie_crypt_questions_count] += 1 %>

data/lib/cookie_crypt/version.rb

@@ -1,3 +1,3 @@
 module CookieCrypt
-  VERSION = "1.1.4"
+  VERSION = "1.2.0"
 end

data/lib/generators/active_record/cookie_crypt_generator.rb

@@ -17,6 +17,7 @@ module ActiveRecord
 
       def copy_cookie_crypt_migration_1_0
         if ActiveRecord::Base.class_eval("#{table_name.camelize.singularize}.inspect['security_question_one: string'].blank?") &&
+          ActiveRecord::Base.class_eval("#{table_name.camelize.singularize}.inspect['security_hash: text'].blank?") &&
           !@ignore_other_migrations
 
           migration_template "migration.rb", "db/migrate/cookie_crypt_add_to_#{table_name}"

data/lib/generators/cookie_crypt/cookie_crypt_generator.rb

@@ -6,7 +6,8 @@ module CookieCryptable
 
       #BEGIN 1.0 generator
       def inject_1_0_cookie_crypt_content
-        if ActiveRecord::Base.class_eval("#{table_name.camelize.singularize}.inspect['security_question_one: string'].blank?")
+        if ActiveRecord::Base.class_eval("#{table_name.camelize.singularize}.inspect['security_question_one: string'].blank?") &&
+          ActiveRecord::Base.class_eval("#{table_name.camelize.singularize}.inspect['security_hash: text'].blank?")
           puts "Beginning 1.0 content injection..."
           paths = [File.join("app", "models", "#{file_path}.rb"),File.join("config", "initializers", "devise.rb")]
           inject_into_file(paths[0], "cookie_cryptable, :", :after => "devise :") if File.exists?(paths[0])
@@ -20,13 +21,15 @@ module CookieCryptable
 
       source_root File.expand_path('../../../../app/views/devise/cookie_crypt', __FILE__)
 
-      def generate_1_0_files
+      def generate_1_0_view_files
         Dir.mkdir("app/views/devise") unless Dir.exists?("app/views/devise")
         unless Dir.exists?("app/views/devise/cookie_crypt")
           puts "Beginning 1.0 views creation..."
           Dir.mkdir("app/views/devise/cookie_crypt") 
           copy_file "max_login_attempts_reached.html.erb", "app/views/devise/cookie_crypt/max_login_attempts_reached.html.erb"
           copy_file "show.html.erb", "app/views/devise/cookie_crypt/show.html.erb"
+
+          $load_all_views = true
         end
       end
       
@@ -55,11 +58,13 @@ module CookieCryptable
 
       source_root File.expand_path('../../../../app/views/devise/cookie_crypt', __FILE__)
 
-      def generate_1_1_files
+      def generate_1_1_view_files
         unless File.exist?("app/views/devise/cookie_crypt/show.js.erb")
           puts "Beginning 1.1 views creation..."
           copy_file "show.js.erb", "app/views/devise/cookie_crypt/show.js.erb"
           copy_file "_extra_fields.html.erb", "app/views/devise/cookie_crypt/_extra_fields.html.erb"
+          copy_file "_private_login_questions.html.erb", "app/views/devise/cookie_crypt/_private_login_questions.html.erb"
+          copy_file "_public_login_questions.html.erb", "app/views/devise/cookie_crypt/_public_login_questions.html.erb"
           File.delete("app/views/devise/cookie_crypt/show.html.erb")
           copy_file "show.html.erb", "app/views/devise/cookie_crypt/show.html.erb"
         end
@@ -90,6 +95,46 @@ module CookieCryptable
         end
       end
 
+      def generate_1_2_view_files
+        $load_all_views ||= false
+        unless File.exist?("app/views/devise/cookie_crypt/_private_login_questions.html.erb")
+          unless $load_all_views
+            copy_new_files = false
+            puts "Enter O  || o  || overwrite to overwrite the view files in app/views/devise/cookie_crypt\n"
+            puts "Enter CO || co || copyover  to write new files to app/views/devise/cookie_crypt (you will need to update show.js.erb and show.html.haml yourself)\n"
+            puts "Enter N  || n  || no        to not generate anything\n"
+            puts "Input:"
+            input = STDIN.gets.chomp
+          end
+
+          if (input =~ /O|o|overwrite/) == 0
+            puts "Beginning 1.2 views creation..."
+            File.delete("app/views/devise/cookie_crypt/show.js.erb")
+            copy_file "show.js.erb", "app/views/devise/cookie_crypt/show.js.erb"
+            File.delete("app/views/devise/cookie_crypt/show.html.erb")
+            copy_file "show.html.erb", "app/views/devise/cookie_crypt/show.html.erb"
+            File.delete("app/views/devise/cookie_crypt/_extra_fields.html.erb")
+            copy_new_files = true
+          elsif (input =~ /CO|co|copyover/) == 0
+            puts "Beginning 1.2 views creation...(please update the view files yourself)"
+            copy_file "show.js.erb", "app/views/devise/cookie_crypt/(copy_into_your)show.js.erb"
+            copy_file "show.html.erb", "app/views/devise/cookie_crypt/(copy_into_your)show.html.erb"
+            copy_file "_extra_fields.html.erb", "app/views/devise/cookie_crypt/(copy_into_your)_extra_fields.html.erb"
+            copy_new_files = true
+          elsif $load_all_views
+            puts "Beginning 1.2 views creation..."
+            copy_new_files = true
+          else
+            puts "Not updating view files.\nIf you dont want to deal with the cookie_crypt views, you can delete app/views/devise/cookie_crypt and the gem will serve the data."
+          end
+
+          if copy_new_files
+            copy_file "_private_login_questions.html.erb", "app/views/devise/cookie_crypt/_private_login_questions.html.erb"
+            copy_file "_public_login_questions.html.erb", "app/views/devise/cookie_crypt/_public_login_questions.html.erb"
+          end
+        end
+      end
+
       hook_for :orm
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cookie_crypt
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Dmitrii Golub
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: cookie_crypt
-rubygems_version: 2.0.6
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Encrypted cookie two factor authentication plugin for devise