rack_password 1.2 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de7ac6366b9749434c0c03af752b1b3b9f42bdbb
-  data.tar.gz: dc71748a2cb9a571bf40ffb2e548a77e80a95441
+  metadata.gz: e025b498a531e95f3e5a27a59f1334971bf474a7
+  data.tar.gz: 6d69977ae762c9a4ddb868dcad2844b8a9f3afc2
 SHA512:
-  metadata.gz: 7b0749d1dddac2c3a8ceea7d5c1451f6395f48d19701e7b26d4f4f89f0e0fed9abe6a071737c51ac301cca495847f213f31c41188143d258dbad9df3eadebff2
-  data.tar.gz: 4d80d59cf0f1b7e05a6c676201822ca7182adf09f58c1486a3f780e6b6559def98ba632dbc8333c8f6b58e848ad2af7d8e3d6cc5dc4b2615cce3d99248685fee
+  metadata.gz: c4cd59a1f36bba510f1c33bbfe9df41b80f50a286d9147b6aa4eff978b7402911f22cd3c73a3df58be5675a795a38bb2063ce166ea4f846ac6c8590eab535d8a
+  data.tar.gz: 6c1dff256b76ce8414a9b93f850d71e3d4bcbd264ef998deeaacbcf71e7c4057290e8ef4683944fa9e1641a7fac3f9d000088f2730e834a69bfe53f9fa037211

data/README.md

@@ -22,6 +22,14 @@ config.middleware.use RackPassword::Block, auth_codes: ['janusz']
 
 From now on, your staging app should prompt for `janusz` password before you access it.
 
+You can also provide custom validator:
+
+```
+config.middleware.use RackPassword::Block, auth_codes: ['janusz'], custom_rule: proc { |request| request.env['HTTP_USER_AGENT'].include?('facebook') }
+```
+## Common problems
+- If you use server ip address instead of domain name to visit your webpage using chrome, rack_password will not accept any password, including the correct one. As a workaround, please use wildcard DNS service, such as [xip.io](http://xip.io/) or set `cookie_domain` option to match server IP address.
+
 ## Contributing
 
 1. Fork it ( https://github.com/netguru/rack_password/fork )

data/lib/rack_password.rb

@@ -48,7 +48,7 @@ module RackPassword
     end
 
     def valid?
-      valid_path? || valid_code?(@request.cookies[@options[:key].to_s]) || valid_ip?
+      valid_path? || valid_code?(@request.cookies[@options[:key].to_s]) || valid_ip? || valid_custom_rule?
     end
 
     def valid_ip?
@@ -64,6 +64,11 @@ module RackPassword
       return false if @options[:auth_codes].nil?
       @options[:auth_codes].include? code
     end
+
+    def valid_custom_rule?
+      return false if @options[:custom_rule].nil?
+      !!@options[:custom_rule].call(@request)
+    end
   end
 
 end

data/lib/rack_password/version.rb

@@ -1,3 +1,3 @@
 module RackPassword
-  VERSION = "1.2"
+  VERSION = "1.3"
 end

data/spec/lib/rack_password/block_validator_spec.rb

@@ -58,4 +58,47 @@ describe RackPassword::BlockValidator do
       expect(bv.valid_code?("incorrect_secret")).to be(false)
     end
   end
+
+  describe "proc control" do
+    context "with proc allowing to pass" do
+      let(:options) { Hash[auth_codes: ["secret"], key: :staging_auth, custom_rule: proc { true } ] }
+      let(:request) { double "Request", path: "/", ip: "127.0.0.1", cookies: { } }
+
+      it "is true when proc evaluates to true" do
+        bv = RackPassword::BlockValidator.new(options, request)
+        expect(bv.valid_custom_rule?).to be(true)
+      end
+
+      it "is true when proc returns true" do
+        bv = RackPassword::BlockValidator.new({custom_rule: proc { true }}, request)
+        expect(bv.valid_custom_rule?).to be(true)
+      end
+
+      it "is true when other rules return false" do
+        bv = RackPassword::BlockValidator.new(options, request)
+        expect(bv.valid_path?).to be(false)
+        expect(bv.valid_code?('')).to be(false)
+        expect(bv.valid_ip?).to be(false)
+
+        expect(bv.valid_custom_rule?).to be(true)
+        expect(bv.valid?).to be(true)
+      end
+    end
+
+    context "with proc set to deny-all" do
+      let(:options) { Hash[auth_codes: ["secret"], key: :staging_auth, custom_rule: proc { false } ] }
+      let(:request) { double "Request", path: "/", ip: "127.0.0.1", cookies: { } }
+
+      it "is true when proc evaluates to true" do
+        bv = RackPassword::BlockValidator.new(options, request)
+        expect(bv.valid_custom_rule?).to be(false)
+        expect(bv.valid?).to be(false)
+      end
+
+      it "is false when proc returns false" do
+        bv = RackPassword::BlockValidator.new({custom_rule: proc { false }}, request)
+        expect(bv.valid_custom_rule?).to be(false)
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack_password
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '1.3'
 platform: ruby
 authors:
 - Marcin Stecki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-19 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler