escher-rack_middleware 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cd9b0e4b7df1e4c1232946434010fee3c8ae77c
-  data.tar.gz: 58cf8a2a29d3182c9a98ff16133efbfbdf51fefa
+  metadata.gz: f4a7bc5b0a47c5fbe29fbbdf6559e7376e5ff512
+  data.tar.gz: 69aa7a6cb082ce00306d5eb61b378a48aa003203
 SHA512:
-  metadata.gz: 6d5935971da2f18aa7ff03982db5fdde296bdefed042738b16f92106b072ca8711e78ab292ae086015b4708b4f23b08bc3a284b644ca93d527f9b7e3aa4c2b39
-  data.tar.gz: dfb268abc738d99e6770d0672763dec5628716599cf4ce846368da6f7916b951ea1f66575594b58b3a4dfa91dc746c66e5ea982ec4f4b6a0cf58c65d104c848c
+  metadata.gz: 2025d9067746de935c0773cc2975a91b44069ec6d1a2ec1c192e4b4b173c15adb3d4c6bb635ca17f6f742394c2db54a7d224263d7a2ef9d4ff4a0451eb4eec3c
+  data.tar.gz: a129eb14e73cca9846969f9f6307f6eb720b39e90f84fa85acc813f45f5ebdb4d845540714d6a00bc2e5db1165753100605cfa83d2645d677e6d988e1ff9213a

data/lib/escher/rack_middleware/authenticator/helper.rb

@@ -11,21 +11,17 @@ module Escher::RackMiddleware::Authenticator::Helper
   def authorized_with?(escher_authenticator, request_env)
 
     request_env['escher.request.api_key_id'] = escher_authenticator.authenticate(
-        Rack::Request.new(request_env),credentials
-    )
+        Rack::Request.new(request_env), credentials)
 
-    requester_succeed_log_msg = [
-        request_env['escher.request.api_key_id'],
-        request_env['REQUEST_URI']
-    ].join(' => ')
-
-    logger.debug("authentication succeeded!(#{requester_succeed_log_msg})")
+    request_env.delete('escher.error') rescue nil
+    logger.debug(log_message(request_env))
 
     true
 
   rescue Escher::EscherError => ex
 
-    logger.warn("authentication failed!(#{ex.message})")
+    request_env['escher.error'] = ex.message || ex.inspect
+    logger.warn(log_message(request_env))
 
     false
 

data/lib/escher/rack_middleware/logging/helper.rb

@@ -4,4 +4,35 @@ module Escher::RackMiddleware::Logging::Helper
     self.class.logger
   end
 
+  # default log object to be used if further verbosity required
+  def default_log_message(request_env)
+    {}
+  end
+
+  def log_message(request_env)
+
+    message = default_log_message(request_env)
+
+    regexp = /^escher\./
+    request_env.select { |k, v| k.to_s =~ regexp }.each do |k, v|
+      message[k.to_s.gsub(regexp, '')] = v
+    end
+
+    rack_env = Rack::Request.new(request_env)
+
+    message['request.host'] = rack_env.host
+    message['request.method'] = rack_env.request_method
+    message['request.endpoint'] = rack_env.path_info
+    message['requester.address'] = rack_env.ip
+
+    message['request.authentication'] = if request_env['escher.error']
+                                         'failed'
+                                       else
+                                         'succeeded'
+                                       end
+
+    return message.inspect
+
+  end
+
 end

data/lib/escher/rack_middleware/version.rb

@@ -1,2 +1,2 @@
 require 'escher/rack_middleware'
-Escher::RackMiddleware::VERSION = '0.1.4'
+Escher::RackMiddleware::VERSION = '0.2.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: escher-rack_middleware
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler