rack-ninja_auth 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88a38cc0bfef70c5c01d281dcf65094785c04385
-  data.tar.gz: fc537e1b113fe60f4e1dcf73199ef05680e20c6e
+  metadata.gz: ed94dae3e5a5547917ea634c229707e3b24595c3
+  data.tar.gz: 02b0610f20badd0ab573b099aabaf09ae9498460
 SHA512:
-  metadata.gz: fa21fc1f600c305ebb5979614c88c00811c842fb74bcf7fa6ecf53fdd85c91df13f0e43662143d1e9c12518d5c9ac5e6d2847a89bb59a3db620ee58f5f028e9a
-  data.tar.gz: 3e6034c32ab80eaafc6321e9b4382db4e43aafba419e7a40c76d7784ba81c527be7890881739c37d5ef80f1ac86242c88e32bd446c2417e2b687a0fbb20ff284
+  metadata.gz: 7223fbff5f7dad8363aba145e9578c69fbb4c25b8835cf766211718b2c90cde930be18a0e34748e8ddadc8bee408dcbb61514081833479cff4520bd8c347b2e9
+  data.tar.gz: ff11492d8eeecf6678ec42a7862f5358ade0d35864f1bada8b3c64d41ad84210a0557ccea82f5c95d644a86ab23451672cb45b420eaaed5b2eb385832ac6c880

data/README.md

@@ -4,7 +4,7 @@ Require authentication via google for your application without passing any auth
 
 ## Example
 
-Add this as middleware to your rack application, then execute with `NINJA_GOOGLE_CLIENT_ID` and `NINJA_GOOGLE_CLIENT_SECRET` environment variables set.
+Add this as middleware to your rack application, then execute with `NINJA_GOOGLE_CLIENT_ID`, `NINJA_GOOGLE_CLIENT_SECRET` and `NINJA_REDIS_URL` environment variables set.
 
 ```ruby
 require 'sinatra'

data/lib/rack/ninja_auth/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module NinjaAuth
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/lib/rack/ninja_auth.rb

@@ -1,13 +1,17 @@
 require 'rack/ninja_auth/version'
 require 'sinatra/base'
 require 'omniauth/google_oauth2'
+require 'rack/session/redis'
+require 'rack/accept'
 
 module Rack
   module NinjaAuth
     class Middleware < Sinatra::Base
-      use Rack::Session::Pool,
+      use Rack::Accept
+      use Rack::Session::Redis,
         key: 'rack.ninja_auth',
-        expire_after: 2592000
+        expire_after: 2592000,
+        redis_server: ENV['NINJA_REDIS_URL'] || 'redis://127.0.0.1:6379/0/rack:ninja_auth'
 
       raise "Please set NINJA_GOOGLE_CLIENT_ID and NINJA_GOOGLE_CLIENT_SECRET to use NinjaAuth" unless ENV["NINJA_GOOGLE_CLIENT_ID"] && ENV["NINJA_GOOGLE_CLIENT_SECRET"]
       use OmniAuth::Builder do
@@ -22,8 +26,10 @@ module Rack
       end
 
       before do
+        @hit_real_app = false
         if is_authenticated?
           res = @main_app.call(request.env)
+          @hit_real_app = true
           headers res[1]
           halt res[0], res[2]
         end
@@ -34,17 +40,18 @@ module Rack
           session[:user] = request.env["omniauth.auth"].info.email
           redirect session[:redirect_to]
         else
-          redirect '/unauthorized'
+          redirect '/auth/failure'
         end
       end
 
-      get '/unauthorized' do
+      get '/auth/failure' do
         send_file(@not_allowed_file, status: 401)
       end
 
       after do
-        if status == 404
-          session[:redirect_to] = env['REQUEST_URI'] == '/auth/google_oauth2' ? '/' : env['REQUEST_URI']
+        if !@hit_real_app && status == 404
+          halt(403) unless env['rack-accept.request'].media_type?('text/html')
+          session[:redirect_to] = env['REQUEST_URI'] =~ %r{^/auth/google_oauth2} ? '/' : env['REQUEST_URI']
           redirect '/auth/google_oauth2'
         end
       end
@@ -52,7 +59,7 @@ module Rack
       private
 
       def is_authenticated?
-        !!session[:user]
+        !session[:user].nil?
       end
     end
   end

data/rack-ninja_auth.gemspec

@@ -21,6 +21,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "sinatra", "~> 1.4"
   spec.add_dependency "omniauth-google-oauth2", "~> 0.2"
+  spec.add_dependency "redis-rack", "~> 1.5"
+  spec.add_dependency "rack-accept", "~> 0.4"
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-ninja_auth
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - JP Hastings-Spital
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -38,6 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: redis-rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: rack-accept
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement