populate-me 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85deae1b12e76c47c378e2f3843d5e840d06b95cc5359edd130fd64ffa9b88d0
-  data.tar.gz: 7078d10da19910b9962bfd3656c3543dd5389be624d11896e8248246f4170eeb
+  metadata.gz: a92596c5ed11fb3d67f18b48fdc1011ecf423f26390c2f71c3587c3c2cae93cf
+  data.tar.gz: 70e4e6572ed7e98ace3444ee6c6c18ff937b0ed72aa35b80a5c5d2ad99865d91
 SHA512:
-  metadata.gz: 44c9c3cabe40c90112e0cc4af8e4e1b9f3105f9c7baff24e568cda0e3fb697c84ad00f62e2812fa323ac18475fe3d9d85b711409b1a07f8ba3077b0d9e8973b2
-  data.tar.gz: 3a9f806d103a25e7444cda57035bcd5fbfd6fbfa4492458b340c4a56324a4bca990f5e65c3f489728a0d07aa28e62f8c855c9a9cb602b7abc71ba12622d565e4
+  metadata.gz: cd01c21a0a760cb1691453ca86f22a75cbabd423134bd25c699fbd0ea96ef6a1845a88d130c61f62fcec9a2f77fb527759152307fb0fb762f0778a2f657bbe3d
+  data.tar.gz: fc764eb27f6c4dd76bde7b952432dc0a647872a061f564f3ac9104511b7baecd0a67866b9777726e329619cd6e1b3663e107f3e774d908e794cfe100592c44b4

data/lib/populate_me/admin.rb

@@ -123,11 +123,17 @@ class PopulateMe::Admin < Sinatra::Base
       # Method = overridable = testable
       ENV['CERBERUS_PASS']
     end
+
     def cerberus_available?
       # Method = overridable = testable
       Rack.const_defined?(:Cerberus)
     end
 
+    def cerberus_auth user, pass, req
+      pass == cerberus_pass
+    end
+
+
     private
 
     def setup_default_middleware builder
@@ -151,8 +157,8 @@ class PopulateMe::Admin < Sinatra::Base
       return unless settings.cerberus_active
       cerberus_settings = settings.cerberus==true ? {} : settings.cerberus
       cerberus_settings[:session_key] = 'populate_me_user'
-      builder.use Rack::Cerberus, cerberus_settings do |user,pass,req|
-        pass==cerberus_pass
+      builder.use Rack::Cerberus, cerberus_settings do |user, pass, req|
+        cerberus_auth user, pass, req
       end
     end
 

data/lib/populate_me/version.rb

@@ -1,4 +1,4 @@
 module PopulateMe
-  VERSION = '0.15.0'
+  VERSION = '0.16.0'
 end
 

data/test/test_admin.rb

@@ -22,6 +22,12 @@ class AdminWithCerberusPass < Admin
   end
 end
 
+class AdminWithCustomCerberusAuth < AdminWithCerberusPass
+  def self.cerberus_auth user, pass, req
+    [user, pass] == ['mario', '1234']
+  end
+end
+
 class AdminCerberusNotAvailable < AdminWithCerberusPass
   def self.cerberus_available?
     false
@@ -106,19 +112,54 @@ describe PopulateMe::Admin do
       assert_equal 'text/css', last_response.content_type
     end
 
-    describe 'when cerberus is active' do
+    describe 'When cerberus is active' do
       let(:app) { AdminWithCerberusPass.new }
       it 'Uses Cerberus for authentication' do
         get '/'
         assert_equal 401, last_response.status
       end
+      it 'Authenticates with right login details' do
+        get '/', {
+          cerberus_login: 'admin',
+          cerberus_pass: '123',
+          _method: 'get'
+        }
+        assert_equal 200, last_response.status
+      end
+      it 'Fails authentication when login details are wrong' do
+        get '/', {
+          cerberus_login: 'admin',
+          cerberus_pass: 'xxx',
+          _method: 'get'
+        }
+        assert_equal 401, last_response.status
+      end
     end
-    describe 'when cerberus is inactive' do
+    describe 'When cerberus is inactive' do
       it 'Does not use Cerberus' do
         get '/'
         assert_predicate last_response, :ok?
       end
     end
+    describe 'When cerberus_auth is overridden' do
+      let(:app) { AdminWithCustomCerberusAuth.new }
+      it 'Authenticates with right login details' do
+        get '/', {
+          cerberus_login: 'mario',
+          cerberus_pass: '1234',
+          _method: 'get'
+        }
+        assert_equal 200, last_response.status
+      end
+      it 'Fails authentication when login details are wrong' do
+        get '/', {
+          cerberus_login: 'admin',
+          cerberus_pass: '123',
+          _method: 'get'
+        }
+        assert_equal 401, last_response.status
+      end
+    end
 
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: populate-me
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Mickael Riga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2021-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: web-utils