rack-cerberus 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c0a16529022026e68a25f50bb8bd1755fcd95f15
-  data.tar.gz: bba2b29bfd9675f3842d6bd11b2405e839ae5150
+SHA256:
+  metadata.gz: 04476e934cbfbf2e5b6db0b2b3aa2fd9253054a5ce34c37e6f51f91ed4a86415
+  data.tar.gz: 77f9067621c9f7f234311af391da6b25c187b536eecf366a79877ab47b56cf6e
 SHA512:
-  metadata.gz: 3a3dfd597dad091e6185bbeadce7eb2eca227b42d5a1e41e36903fad39a3e07d425d6f993b4e4dd82c3cdd51ecccc024b5f72fb026b57413312fff7569cb6082
-  data.tar.gz: 8f02554ec221ef12534a814499a6afbeb76f9748d41ec99b4eeee44723e928300e7f2a8c86f3933185ba4fdc95883698b8ada41b423a427645c5920ee052d0b1
+  metadata.gz: da68f032303198d2cec6c7c8d447316212eedaf883536d4ce6a8b94f4e201f96be387ae8e1b8d261b6aab9c1c9ff574f46857f635966b785f39947c80753a10b
+  data.tar.gz: 17e5c4a22d00f599aecd0f8d28a43af0ab9c3b6b5d398f627a64fbdc47f5b8b00449e5c01df1907da39806376d49bc536d13f054539df3f834151e08a9a87e10

data/lib/rack/cerberus.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rack/utils'
 require 'rack/cerberus/version'
 
@@ -7,19 +9,18 @@ module Rack
     
     class NoSessionError < RuntimeError; end
 
-    def self.new(*); ::Rack::MethodOverride.new(super); end
+    DEFAULTS = { 
+      company_name: 'Cerberus', 
+      bg_color: '#93a1a1', 
+      fg_color: '#002b36', 
+      text_color: '#fdf6e3', 
+      session_key: 'cerberus_user',
+      forgot_password_uri: nil
+    }.freeze
     
     def initialize app, options={}, &block
-      @app = app
-      defaults = { 
-        company_name: 'Cerberus', 
-        bg_color: '#93a1a1', 
-        fg_color: '#002b36', 
-        text_color: '#fdf6e3', 
-        session_key: 'cerberus_user',
-        forgot_password_uri: nil
-      }
-      @options = defaults.merge(options)
+      @app = ::Rack::MethodOverride.new(app)
+      @options = DEFAULTS.merge(options)
       @options[:icon] = @options[:icon_url].nil? ? 
         '' : 
         "<img src='#{@options[:icon_url]}' /><br />"
@@ -30,12 +31,8 @@ module Rack
     end
     
     def call env
-      dup._call(env)
-    end
-    
-    def _call env
-      ensure_session env
       req = Rack::Request.new env
+      ensure_session req
       if (logged?(req) and !logging_out?(req)) or authorized?(req)
         ensure_logged! req
         if logging_out? req
@@ -50,8 +47,12 @@ module Rack
 
     private
 
-    def ensure_session env
-      if env['rack.session'].nil?
+    def session req
+      req.env['rack.session']
+    end
+
+    def ensure_session req
+      if session(req).nil?
         raise(NoSessionError, 'Cerberus cannot work without Session') 
       end
     end
@@ -60,16 +61,20 @@ module Rack
       Rack::Utils.escape_html text
     end
 
+    CERBERUS_LOGIN = 'cerberus_login'
+
     def login req
-      req.params['cerberus_login']
+      req.params[CERBERUS_LOGIN]
     end
 
+    CERBERUS_PASS = 'cerberus_pass'
+
     def pass req
-      req.params['cerberus_pass']
+      req.params[CERBERUS_PASS]
     end
 
     def logged? req
-      req.env['rack.session'][@options[:session_key]]!=nil
+      not session(req)[@options[:session_key]].nil?
     end
 
     def provided_fields? req
@@ -82,26 +87,31 @@ module Rack
     end
 
     def ensure_logged! req
-      req.env['rack.session'][@options[:session_key]] ||= login(req)
+      session(req)[@options[:session_key]] ||= login(req)
     end
 
     def ensure_logged_out! req
-      req.env['rack.session'].delete @options[:session_key]
+      session(req).delete @options[:session_key]
     end
 
+    LOGOUT_PATH = '/logout'
+
     def logging_out? req
-      req.path_info=='/logout'
+      req.path_info == LOGOUT_PATH
     end
 
     def logout_response req
       res = Rack::Response.new
-      res.redirect(req.script_name=='' ? '/' : req.script_name)
+      res.redirect(req.script_name.empty? ? '/' : req.script_name)
       res.finish
     end
 
+    ERROR_HTML_MSG = '<p class=\'err\'>Wrong login or password</p>'
+    HTML_HEADERS = {'Content-Type' => 'text/html'}
+
     def form_response req
       if provided_fields? req
-        error = "<p class='err'>Wrong login or password</p>"
+        error = ERROR_HTML_MSG
         unless @options[:forgot_password_uri].nil?
           forgot_password = FORGOT_PASSWORD % {
             action: @options[:forgot_password_uri],
@@ -111,9 +121,9 @@ module Rack
       end
       ensure_logged_out! req
       [
-        401, {'Content-Type' => 'text/html'}, 
+        401, HTML_HEADERS, 
         [AUTH_PAGE % @options.merge({
-          error: error, submit_path: h(req.env['REQUEST_URI']),
+          error: error, submit_path: req.fullpath,
           forgot_password: forgot_password,
           request_method: req.request_method,
           login: h(login(req)), 

data/lib/rack/cerberus/version.rb

@@ -1,6 +1,6 @@
 module Rack
   class Cerberus
-    VERSION = '1.1.1'
+    VERSION = '1.1.2'
   end
 end
 

data/test/test_rack_cerberus.rb

@@ -11,10 +11,11 @@ class TestRackCerberus < Minitest::Test
 
   def secret_app
     lambda {|env| 
+      req = Rack::Request.new env
       [
         200, 
         {'Content-Type'=>'text/plain'}, 
-        "#{env['REQUEST_METHOD']} #{env['rack.session'].inspect}"
+        ["#{env['REQUEST_METHOD']} #{req.fullpath} #{env['rack.session'].inspect}"]
       ] 
     }
   end
@@ -22,7 +23,7 @@ class TestRackCerberus < Minitest::Test
   def cerberus_app cerberus_options={}
     Rack::Cerberus.new(secret_app, cerberus_options) do |login,pass| 
       [login,pass]==['mario@nintendo.com','bros']
-    end
+    end.freeze
   end
 
   def mounted_app mount_path='/', cerberus_options={}
@@ -31,7 +32,7 @@ class TestRackCerberus < Minitest::Test
     })
   end
 
-  def app; @app; end
+  def app; Rack::Lint.new(@app); end
 
   def body
     last_response.body
@@ -101,10 +102,11 @@ class TestRackCerberus < Minitest::Test
   end
 
   def test_calls_final_page_with_original_method
-    get '/'
+    get '/foo/bar?var=1'
     assert_match 'name="_method" value="GET"', body
-    post '/', correct_logins.merge({'_method'=>'GET'})
-    assert_match /^GET/, body
+    assert_match 'action="/foo/bar?var=1"', body
+    post '/foo/bar?var=1', correct_logins.merge({'_method'=>'GET'})
+    assert body.start_with?('GET /foo/bar?var=1 ')
   end
   
   def test_stay_authorized_once_logged
@@ -155,22 +157,22 @@ class TestRackCerberus < Minitest::Test
     @app = mounted_app '/', forgot_password_uri: '/forgot-password'
     post '/', wrong_logins
     assert_equal 401, last_response.status
-    assert_match /form action="\/forgot-password" method="post"/, body
-    assert_match /type="hidden" name="cerberus_login" value="fake_login"/, body
+    assert_match(/form action="\/forgot-password" method="post"/, body)
+    assert_match(/type="hidden" name="cerberus_login" value="fake_login"/, body)
   end
 
   def test_forgot_password_uri_when_logins_not_provided
     @app = mounted_app '/', forgot_password_uri: '/forgot-password'
     post '/'
     assert_equal 401, last_response.status
-    refute_match /form action="\/forgot-password" method="post"/, body
-    refute_match /type="hidden" name="cerberus_login" value="fake_login"/, body
+    refute_match(/form action="\/forgot-password" method="post"/, body)
+    refute_match(/type="hidden" name="cerberus_login" value="fake_login"/, body)
   end
 
   def test_no_forgot_password_form_when_no_uri
     post '/', wrong_logins
     assert_equal 401, last_response.status
-    refute_match /form action="\/forgot-password" method="post"/, body
+    refute_match(/form action="\/forgot-password" method="post"/, body)
   end
 
   def test_forgot_password_submitted_info_is_html_escaped

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-cerberus
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Mickael Riga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-04 00:00:00.000000000 Z
+date: 2019-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -104,8 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Rack middleware for form-based authentication