rucaptcha 2.5.0 → 2.5.5

data/lib/rucaptcha.rb

@@ -1,19 +1,20 @@
-require 'rails'
-require 'action_controller'
-require 'active_support/all'
-require 'rucaptcha/rucaptcha'
-require 'rucaptcha/version'
-require 'rucaptcha/configuration'
-require 'rucaptcha/controller_helpers'
-require 'rucaptcha/view_helpers'
-require 'rucaptcha/cache'
-require 'rucaptcha/engine'
-require 'rucaptcha/errors/configuration'
+require "rails"
+require "action_controller"
+require "active_support/all"
+require "rucaptcha/rucaptcha"
+require "rucaptcha/version"
+require "rucaptcha/configuration"
+require "rucaptcha/controller_helpers"
+require "rucaptcha/view_helpers"
+require "rucaptcha/cache"
+require "rucaptcha/engine"
+require "rucaptcha/errors/configuration"
 
 module RuCaptcha
   class << self
     def config
       return @config if defined?(@config)
+
       @config = Configuration.new
       @config.style         = :colorful
       @config.length        = 5
@@ -22,11 +23,11 @@ module RuCaptcha
       @config.expires_in    = 2.minutes
       @config.skip_cache_store_check = false
 
-      if Rails.application
-        @config.cache_store = Rails.application.config.cache_store
-      else
-        @config.cache_store = :mem_cache_store
-      end
+      @config.cache_store = if Rails.application
+                              Rails.application.config.cache_store
+                            else
+                              :mem_cache_store
+                            end
       @config.cache_store
       @config
     end
@@ -35,24 +36,22 @@ module RuCaptcha
       config.instance_exec(&block)
     end
 
-    def generate()
+    def generate
       style = config.style == :colorful ? 1 : 0
       length = config.length
 
-      unless length.in?(3..7)
-        raise Rucaptcha::Errors::Configuration, 'length config error, value must in 3..7'
-      end
+      raise RuCaptcha::Errors::Configuration, "length config error, value must in 3..7" unless length.in?(3..7)
 
       strikethrough = config.strikethrough ? 1 : 0
       outline = config.outline ? 1 : 0
-      self.create(style, length, strikethrough, outline)
+      create(style, length, strikethrough, outline)
     end
 
     def check_cache_store!
       cache_store = RuCaptcha.config.cache_store
       store_name = cache_store.is_a?(Array) ? cache_store.first : cache_store
-      if [:memory_store, :null_store, :file_store].include?(store_name)
-        RuCaptcha.config.cache_store = [:file_store, Rails.root.join('tmp/cache/rucaptcha/session')]
+      if %i[memory_store null_store file_store].include?(store_name)
+        RuCaptcha.config.cache_store = [:file_store, Rails.root.join("tmp/cache/rucaptcha/session")]
 
         puts "
 
@@ -72,7 +71,7 @@ module RuCaptcha
 end
 
 ActiveSupport.on_load(:action_controller) do
-  ActionController::Base.send :include, RuCaptcha::ControllerHelpers
+  ActionController::Base.include RuCaptcha::ControllerHelpers
 end
 
 ActiveSupport.on_load(:action_view) do

data/lib/rucaptcha/cache.rb

@@ -1,9 +1,10 @@
-require 'fileutils'
+require "fileutils"
 
 module RuCaptcha
   class << self
     def cache
       return @cache if defined? @cache
+
       @cache = ActiveSupport::Cache.lookup_store(RuCaptcha.config.cache_store)
       @cache
     end

data/lib/rucaptcha/controller_helpers.rb

@@ -10,12 +10,16 @@ module RuCaptcha
     def rucaptcha_sesion_key_key
       session_id = session.respond_to?(:id) ? session.id : session[:session_id]
       warning_when_session_invalid if session_id.blank?
-      ['rucaptcha-session', session_id].join(':')
+
+      # With https://github.com/rack/rack/commit/7fecaee81f59926b6e1913511c90650e76673b38
+      # to protected session_id into secret
+      session_id_digest = Digest::SHA256.hexdigest(session_id.inspect)
+      ["rucaptcha-session", session_id_digest].join(":")
     end
 
     # Generate a new Captcha
     def generate_rucaptcha
-      res = RuCaptcha.generate()
+      res = RuCaptcha.generate
       session_val = {
         code: res[0],
         time: Time.now.to_i
@@ -39,7 +43,7 @@ module RuCaptcha
     #   verify_rucaptcha?(nil, keep_session: true)
     #   verify_rucaptcha?(nil, captcha: params[:user][:captcha])
     #
-    def verify_rucaptcha?(resource = nil, opts = {})
+    def verify_rucaptcha?(_resource = nil, opts = {})
       opts ||= {}
 
       store_info = RuCaptcha.cache.read(rucaptcha_sesion_key_key)
@@ -47,24 +51,16 @@ module RuCaptcha
       RuCaptcha.cache.delete(rucaptcha_sesion_key_key) unless opts[:keep_session]
 
       # Make sure session exist
-      if store_info.blank?
-        return add_rucaptcha_validation_error
-      end
+      return add_rucaptcha_validation_error if store_info.blank?
 
       # Make sure not expire
-      if (Time.now.to_i - store_info[:time]) > RuCaptcha.config.expires_in
-        return add_rucaptcha_validation_error
-      end
+      return add_rucaptcha_validation_error if (Time.now.to_i - store_info[:time]) > RuCaptcha.config.expires_in
 
       # Make sure parama have captcha
-      captcha = (opts[:captcha] || params[:_rucaptcha] || '').downcase.strip
-      if captcha.blank?
-        return add_rucaptcha_validation_error
-      end
+      captcha = (opts[:captcha] || params[:_rucaptcha] || "").downcase.strip
+      return add_rucaptcha_validation_error if captcha.blank?
 
-      if captcha != store_info[:code]
-        return add_rucaptcha_validation_error
-      end
+      return add_rucaptcha_validation_error if captcha != store_info[:code]
 
       true
     end
@@ -73,12 +69,14 @@ module RuCaptcha
 
     def add_rucaptcha_validation_error
       if defined?(resource) && resource && resource.respond_to?(:errors)
-        resource.errors.add(:base, t('rucaptcha.invalid'))
+        resource.errors.add(:base, t("rucaptcha.invalid"))
       end
       false
     end
 
     def warning_when_session_invalid
+      return unless Rails.env.development?
+
       Rails.logger.warn "
         WARNING! The session.id is blank, RuCaptcha can't work properly, please keep session available.
         More details about this: https://github.com/huacnlee/rucaptcha/pull/66

data/lib/rucaptcha/engine.rb

@@ -2,11 +2,11 @@ module RuCaptcha
   class Engine < ::Rails::Engine
     isolate_namespace RuCaptcha
 
-    initializer 'rucaptcha.init' do |app|
+    initializer "rucaptcha.init" do |app|
       # https://github.com/rails/rails/blob/3-2-stable/actionpack/lib/action_dispatch/routing/route_set.rb#L268
       # `app.routes.prepend` start from Rails 3.2 - 5.0
       app.routes.prepend do
-        mount RuCaptcha::Engine => '/rucaptcha'
+        mount RuCaptcha::Engine => "/rucaptcha"
       end
 
       RuCaptcha.check_cache_store! unless RuCaptcha.config.skip_cache_store_check

data/lib/rucaptcha/errors/configuration.rb

@@ -1,4 +1,4 @@
-module Rucaptcha
+module RuCaptcha
   module Errors
     class Configuration < StandardError; end
   end

data/lib/rucaptcha/version.rb

@@ -1,3 +1,3 @@
 module RuCaptcha
-  VERSION = '2.5.0'
+  VERSION = "2.5.5"
 end

data/lib/rucaptcha/view_helpers.rb

@@ -1,18 +1,18 @@
 module RuCaptcha
   module ViewHelpers
     def rucaptcha_input_tag(opts = {})
-      opts[:name]           = '_rucaptcha'
-      opts[:type]           = 'text'
-      opts[:autocorrect]    = 'off'
-      opts[:autocapitalize] = 'off'
-      opts[:pattern]        = '[a-zA-Z]*'
-      opts[:autocomplete]   = 'off'
-      opts[:maxlength] ||= 5
+      opts[:name]           = "_rucaptcha"
+      opts[:type]           = "text"
+      opts[:autocorrect]    = "off"
+      opts[:autocapitalize] = "off"
+      opts[:pattern]        = "[a-zA-Z]*"
+      opts[:autocomplete]   = "off"
+      opts[:maxlength]      = RuCaptcha.config.length
       tag(:input, opts)
     end
 
     def rucaptcha_image_tag(opts = {})
-      opts[:class] = opts[:class] || 'rucaptcha-image'
+      opts[:class] = opts[:class] || "rucaptcha-image"
       opts[:src] = ru_captcha.root_path
       opts[:onclick] = "this.src = '#{ru_captcha.root_path}?t=' + Date.now();"
       tag(:img, opts)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rucaptcha
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.5
 platform: ruby
 authors:
 - Jason Lee
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-07 00:00:00.000000000 Z
+date: 2021-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -38,7 +38,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-description: 
+description:
 email: huacnlee@gmail.com
 executables: []
 extensions:
@@ -69,7 +69,7 @@ homepage: https://github.com/huacnlee/rucaptcha
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -84,8 +84,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: This is a Captcha gem for Rails Applications. It drawing captcha image with
   C code so it no dependencies.