skypager 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c43ca74ddfecb4de61127287f5f14c6e2ca18145
-  data.tar.gz: 29eb227714e18fd39294ae82940a8e927cee8496
+  metadata.gz: 45efc54b758d0ce0ce85af412020a929f897e585
+  data.tar.gz: 28cb1676bf497bdd2dad35ce7688fcadec7c6d24
 SHA512:
-  metadata.gz: 96058ca42cfef710a4a0d7939319465f60a138fe328becdbae11b93741c54190c479c642597a0de5f668a800c6cb23a7fe0b822feddeeafd79916ec35e2d81ac
-  data.tar.gz: 7a973e4722f40ea57cd93634720e6d8a78838c2576f962004f7ddd9570d9e23589534d24493c12dbeae91fd3abca22824bf01bf59de1633e16bce538fa45f827
+  metadata.gz: 6d8204f6fa7073aa4471f346b11bda329ce0403dffc5f3b23c0beb956bf3d423a2f287f80374c4093538af8fce40b4d67801bcd6eb314f61734b248b524bff9e
+  data.tar.gz: 8493e3e83b102294562c3c703ad49ec08d2f8c09e80e2d847b4d632d794d0e748927877994e70394d1b67ac4d722165cae6d62e9738bc4fab88ab84ef00ef12e

data/lib/skypager/protector.rb

@@ -2,9 +2,11 @@
 # cookies, and optionally validate their values.
 #
 # It should either show a login page, or the requested path
+require 'logger'
+
 module Skypager
   class Protector
-    attr_accessor :validator, :options, :app
+    attr_accessor :validator, :options, :app, :login_handler
 
     # Skypager::Protector.new(options) do |request|
     #   # validate request here
@@ -18,13 +20,38 @@ module Skypager
       @app = app
       @options = options
       @validator = validator
+      @logger = options.fetch(:logger) { Logger.new(STDOUT) }
+    end
+
+    def log message
+      @logger && @logger.info(message)
+      puts message if !@logger
     end
 
     def call(env)
       request = Rack::Request.new(env)
 
-      if !validate(request)
-        serve_login_path
+      log "Received a request: #{ request.env['REQUEST_METHOD'] } #{ request.path }"
+
+      if request.post?
+        log "== Received a post"
+        log "#{ login_path } #{ request.path } #{ login_handler.respond_to?(:call) }"
+      end
+
+      if request.post? && request.path == login_path && login_handler.respond_to?(:call)
+        log "Handling login"
+
+        result = login_handler.call(request)
+        return serve_login_path if result == false
+
+        redirect_path = request.params['_redirect_to'] || "/"
+
+        return redirect_to(redirect_path, result[:cookies] || {})
+      end
+
+      if !validate(request) && request.path != login_path
+        log "== Validation failed: #{ request.path }"
+        return serve_login_path
       end
 
       path = normalize_path(request.path)
@@ -51,13 +78,42 @@ module Skypager
     end
 
     def serve_not_found_path
-      not_found_path = options.fetch(:not_found_path, "/not-found.html")
       serve_file(not_found_path, 404)
     end
 
+    def redirect_to(path, cookies={})
+      status, headers, body = [302, {"Content-Type" => "text/html", "Location" =>  path}, ["302 You've been redirected"]]
+      response = Rack::Response.new(body,status,headers)
+
+      unless cookies.empty?
+        cookies.each do |k,v|
+          response.set_cookie(k, cookie_options.merge(:value=>v))
+        end
+      end
+
+      response.finish
+    end
+
+    def cookie_options
+      options.fetch(:cookie_options) do
+        {
+          path: "/",
+          expires: 180.minutes.from_now,
+          domain: ".lvh.me"
+        }
+      end
+    end
+
     def serve_login_path
-      login_path = options.fetch(:login_path, "/login.html")
-      [302, {"Content-Type" => "text/html", "Location" =>  login_path}, ["302 You've been redirected"]]
+      redirect_to(login_path)
+    end
+
+    def not_found_path
+       options.fetch(:not_found_path, "/not-found.html")
+    end
+
+    def login_path
+      options.fetch(:login_path, "/login.html")
     end
 
     def normalize_path(path)
@@ -76,14 +132,22 @@ module Skypager
         options[:directory_indexes] ? "/index.html" : ".html"
       end
     end
+
     def validate(request)
       return true if validator.nil? || !validator.respond_to?(:call)
 
+      return true if whitelist && request.path.match(whitelist)
+
       validator.call({
         cookies: request.cookies,
         params: request.params,
         env: request.env
       })
     end
+
+    def whitelist
+      options.fetch(:whitelist) { /^\/(js|css|img|fonts|favico)/ }
+    end
   end
+
 end

data/lib/skypager/version.rb

@@ -1,3 +1,3 @@
 module Skypager
-  VERSION = "2.1.4"
+  VERSION = "2.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skypager
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors:
 - Jonathan Soeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie