demopass 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db808df5d6e5cd7a3afda85d10590eaada99da80d94fc2b7a01ef49f32861f21
-  data.tar.gz: 3598bd131b0d20e09c5c2dfa584654ba045754b7461f3d069a8bfc9baf74a8fa
+  metadata.gz: 3ac8f48f70d6ffcf528b814bb9165d2d97d5d29e31121ec7a913759f4c114949
+  data.tar.gz: e3ec2d88ae0bdcabea6aba343a38cfd1f586d4158eb41168e3ba4f3ea85b8502
 SHA512:
-  metadata.gz: fe48a975bcde99459f6c2696e0d93f061ca8c91089956b1b7ff3db3cac1c6385042ff6ecc6ce942528654b0bcd6167d305475a8ec447c03d7130ae3a73166718
-  data.tar.gz: 85b8c8cc117e7b2c4737cc70c6b6fa1757ea9c0dc3b3132300680e214bd3d98a3363c4483ecd438b71655768ff663a3c9cc040f544738fa12f3e680d1747062a
+  metadata.gz: e319207646f43ce1110f84cbdb8da9b81be65f17e50ec9c4e58e9fc379f0491c104637188900546792b93af861a5b0e4bf532afdbf400bae0a7b890dc35f57e7
+  data.tar.gz: 6aad313c06b3e9b3b5d845040fb2ff068c96be208a46c5a1757e726653ab0ca3241da06b593d10eaf1ab05df21740904c11b45d27b4da6a5443db48ca1439270

data/.rubocop.yml

@@ -113,3 +113,7 @@ Style/TrailingCommaInArguments:
   EnforcedStyleForMultiline: consistent_comma
 Layout/MultilineMethodCallBraceLayout:
   EnforcedStyle: new_line
+Metrics/MethodLength:
+  Enabled: false
+Metrics/AbcSize:
+  Enabled: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    demopass (0.2.0)
+    demopass (0.2.1)
       rack
 
 GEM

data/lib/demopass/app.rb

@@ -1,14 +1,17 @@
 require "openssl"
+require "forwardable"
+require_relative "logger"
 
 class Demopass::App
+  extend Forwardable
+
   PASSWORD_PATH = "/demopass".freeze
   PASSWORD_KEY = "password".freeze
   TOKEN_KEY = "demopass_token".freeze
 
-  def initialize(downstream, except: nil)
+  def initialize(downstream, except: nil, log_level: nil)
     @downstream = downstream
     @except = except
-    @response = Rack::Response.new
 
     @hmac_key = ENV["DEMOPASS_SECRET"]
     @password = ENV["DEMOPASS_PASSWORD"]
@@ -16,24 +19,40 @@ class Demopass::App
     @digest = OpenSSL::Digest.new("SHA256")
     @valid_hmac = hmac_for(@password)
 
+    @logger = Demopass::Logger.new(log_level: log_level)
+
     validate_arguments
   end
 
   def call(env)
+    @response = Rack::Response.new
+
     request = Rack::Request.new(env)
-    return @downstream.call(env) if path_excluded?(request) || token_valid?(request)
+    debug("Beginning #{request.request_method} to #{request.path}")
+    debug("Downstream is #{@downstream.class.name}")
+
+    if (excluded = path_excluded?(request)) || token_valid?(request)
+      reason = excluded ? "the path was excluded" : "the token was valid"
+      debug("Passing downstream because #{reason}")
+
+      return @downstream.call(env)
+    end
 
     if (password = extract_password(request))
       assign_token_and_redirect(password)
     else
+      info("Password or token missing or invalid; responding with a login form")
       respond_with_form
     end
 
+    debug("Ending call to #{request.path}")
     @response.finish
   end
 
 private
 
+  def_delegators :@logger, :debug, :info
+
   def path_excluded?(request)
     @except && request.path =~ @except
   end
@@ -43,12 +62,21 @@ private
   end
 
   def extract_password(request)
-    return unless request.post? && request.path == PASSWORD_PATH
+    unless request.post?
+      debug("Ignoring passwords; request was not a POST")
+      return
+    end
+
+    unless request.path == PASSWORD_PATH
+      debug("Ignoring passwords; request path #{request.path} was not #{PASSWORD_PATH}")
+      return
+    end
 
     request.POST[PASSWORD_KEY]
   end
 
   def assign_token_and_redirect(password)
+    debug("Setting token from password and redirecting to /")
     @response.set_cookie(TOKEN_KEY, hmac_for(password))
     @response.redirect("/")
   end

data/lib/demopass/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Demopass
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: demopass
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Elliot Crosby-McCullough
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-07 00:00:00.000000000 Z
+date: 2021-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack