rack-ninja_auth 0.5.2 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfc4021fdd66c583d85baee880d13fd5fdace6c4
-  data.tar.gz: 390eeac41894a3e9c7ed2556d8475d059447a6b2
+  metadata.gz: 1768ee1ddc4807f1809a686655382f01aa9b809e
+  data.tar.gz: 11590bc1312c37a39fe49529bc93f01180802c49
 SHA512:
-  metadata.gz: 592533dbf35bc2b2e6df24702f94ca9c8dda05e6df935cac53ad17114b0045e01f14ab841e22d5301d015d22cfb6885b1380534451fc65801224382b660d8754
-  data.tar.gz: d275a906c794f819ac76fca074cac984e87ca2f9bbaf8bec3eec4c70634205823391ccf2f45eb18b7a6a7988949d08038fb698335995560cb9adc46b43b76177
+  metadata.gz: 5f61354e0351ed53d807d0e12113ed864406bba7f20387d5ecf5f92ac7a65b0908bc30c438747d974868699e69ce167a953e2acf67a656f233cbbb5219558d9f
+  data.tar.gz: c8fd786923419675a8ca21dfba15b280ccc0bdecd543345b07878773e81ce67f4027b3f4dec7df3e2c66587580d4ea34e35dc48336288aff48fdedeb44b26c8f

data/README.md

@@ -4,13 +4,13 @@ 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`, `NINJA_GOOGLE_CLIENT_SECRET` and `NINJA_REDIS_URL` environment variables set.
+Add this as middleware to your rack application so that a rack session is already available, then execute with `NINJA_GOOGLE_CLIENT_ID` AND `NINJA_GOOGLE_CLIENT_SECRET` environment variables set.
 
 ```ruby
 require 'sinatra'
 require 'rack/ninja_auth'
 
-use Rack::NinjaAuth::Middleware, /@gmail.com$/
+use Rack::NinjaAuth::Middleware, email_matcher: /@gmail.com$/
 
 get '/' do
   "This is secure without authorisation with a google account with an email ending in @gmail.com"

data/examples/gmail.rb

@@ -13,8 +13,9 @@ $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
 require 'sinatra'
 require 'rack/ninja_auth'
 
+use Rack::Session::Cookie, secret: 'change_me'
 use Rack::NinjaAuth::Middleware, email_matcher: /@gmail.com$/
-# use Rack::NinjaAuth::Middleware, /@gmail\./, './file/to/deliver/if/email/does/not/match.html'
+# use Rack::NinjaAuth::Middleware, email_matcher: /@gmail\./, not_allowed_file: './file/to/deliver/if/email/does/not/match.html'
 
 get '/secured' do
   "You hit the secured app"

data/examples/routes.rb

@@ -4,15 +4,16 @@ $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
 # ```
 # NINJA_GOOGLE_CLIENT_ID=<Your google client id>
 # NINJA_GOOGLE_CLIENT_SECRET=<Your google client secret>
-# ruby gmail.rb
+# ruby routes.rb
 # ```
 #
 # Now you can visit `http://127.0.0.1:4567/secured` and will only access it if you validate with a google
-# account that has an `@gmail.com` email address.
+# account that has an `@gmail.com` email address. `http://127.0.0.1:4567/` be available, even without authenticating.
 
 require 'sinatra'
 require 'rack/ninja_auth'
 
+use Rack::Session::Cookie, secret: 'change_me'
 use Rack::NinjaAuth::Middleware, email_matcher: /@gmail.com$/, secured_routes: %r{^/secured}
 
 get '/secured' do

data/lib/rack/ninja_auth.rb

@@ -1,18 +1,15 @@
 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::Accept
-      use Rack::Session::Redis,
-        path: '/',
-        key: 'rack.ninja_auth',
-        expire_after: 2592000,
-        redis_server: ENV['NINJA_REDIS_URL'] || 'redis://127.0.0.1:6379/0/rack:ninja_auth'
+
+      SESSION_KEY = 'rack-ninja_auth'
+      SALT_BYTES = 16
 
       use OmniAuth::Builder do
         provider :google_oauth2, ENV["NINJA_GOOGLE_CLIENT_ID"], ENV["NINJA_GOOGLE_CLIENT_SECRET"]
@@ -29,7 +26,7 @@ module Rack
 
       before do
         @hit_real_app = false
-        if is_authenticated? || !is_protected_request?
+        if !is_internal_request? && (is_authenticated? || is_unprotected_request?)
           res = @main_app.call(request.env)
           @hit_real_app = true
           headers res[1]
@@ -39,8 +36,8 @@ module Rack
 
       get '/auth/google_oauth2/callback' do
         email = request.env["omniauth.auth"].info.email rescue nil
-        if email && email.match(@email_matcher)
-          session[:user] = email
+        if allowable_email?(email)
+          authenticate!(email: email)
           redirect '/'
         else
           redirect '/auth/failure'
@@ -54,22 +51,32 @@ module Rack
       after do
         if !@hit_real_app && status == 404
           halt(403) unless env['rack-accept.request'].media_type?('text/html')
+          headers['X-Cascade'] = 'stop'
           redirect '/auth/google_oauth2'
         end
       end
 
       private
 
+      def authenticate!(email:)
+        session[SESSION_KEY] = { email: email }
+      end
+
+      def allowable_email?(email)
+        email.respond_to?(:match) && email.match(@email_matcher)
+      end
+
       def is_authenticated?
-        !session[:user].nil?
+        fields = session[SESSION_KEY] || {}
+        allowable_email?(fields[:email])
       end
 
-      def is_protected_request?
-        env['PATH_INFO'].match(@secured_route_matcher)
+      def is_unprotected_request?
+        !env['PATH_INFO'].match(@secured_route_matcher)
       end
 
       def is_internal_request?
-        env['REQUEST_URI'] =~ %r{^/auth/}
+        !!env['REQUEST_URI'].match(%r{^/auth/})
       end
     end
   end

data/lib/rack/ninja_auth/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module NinjaAuth
-    VERSION = "0.5.2"
+    VERSION = "0.6.2"
   end
 end

data/rack-ninja_auth.gemspec

@@ -21,7 +21,6 @@ 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.4"
   spec.add_dependency "rack-accept", "~> 0.4"
 
   spec.add_development_dependency "bundler", "~> 1.10"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-ninja_auth
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.2
 platform: ruby
 authors:
 - JP Hastings-Spital
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -38,20 +38,6 @@ 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.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rack-accept
   requirement: !ruby/object:Gem::Requirement