rack-ninja_auth 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 174579d995ee1be8f7a9409c88b1131f7bf14e1c
-  data.tar.gz: a31a7e284cb8377f9ed5c4cc08d199abe75d3af5
+  metadata.gz: 26ae06c994d3746b12aa3ab8ee7148f609e67058
+  data.tar.gz: b2816854ca67f13fbf820dd68813e148f9281173
 SHA512:
-  metadata.gz: 312395898d8fa5206fae25b966c9a5d0c027826a6a576136a382f3e70481ee825ff563fe3b5157ba8651e74854a83e939f3519bf2263c389535ebd74e662e201
-  data.tar.gz: 306a92b1ccb214bf54216a68d0760b367cfe01d0320bb76722558370b23a5e9ed658566705a510e3ca0e51570a27af40973eaa8307caf1cc90d6d7b0e4e118f5
+  metadata.gz: c6245f3cdeccab15c5bb9988d88e8f3f40ff7953b141ad046e67e81a81e8dbdd77ea97ad6288d42bffa74f3837e049fe7e1d38ae4c33bce795be3b20de16b06a
+  data.tar.gz: 5b2942e0cf1d97e471dab619283d4fbfe55b0efda9b296c263f2f9b1e73c4d5510a80c0f7e8f01707bea11292978126925b40acc6bf57a09dc5b92da2b9cfab3

data/examples/gmail.rb

@@ -13,7 +13,7 @@ $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
 require 'sinatra'
 require 'rack/ninja_auth'
 
-use Rack::NinjaAuth::Middleware, /@gmail.com$/
+use Rack::NinjaAuth::Middleware, email_matcher: /@gmail.com$/
 # use Rack::NinjaAuth::Middleware, /@gmail\./, './file/to/deliver/if/email/does/not/match.html'
 
 get '/secured' do

data/examples/routes.rb

@@ -0,0 +1,28 @@
+$LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
+# Make sure you run this with the appropriate environment variables set:
+#
+# ```
+# NINJA_GOOGLE_CLIENT_ID=<Your google client id>
+# NINJA_GOOGLE_CLIENT_SECRET=<Your google client secret>
+# ruby gmail.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.
+
+require 'sinatra'
+require 'rack/ninja_auth'
+
+use Rack::NinjaAuth::Middleware, email_matcher: /@gmail.com$/, secured_routes: %r{^/secured}
+
+get '/secured' do
+  "You hit the secured app"
+end
+
+get '/secured/extra' do
+  "More from the secured app"
+end
+
+get '/' do
+  "You can get this always"
+end

data/lib/rack/ninja_auth/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module NinjaAuth
-    VERSION = "0.3.2"
+    VERSION = "0.4.0"
   end
 end

data/lib/rack/ninja_auth.rb

@@ -17,17 +17,18 @@ module Rack
         provider :google_oauth2, ENV["NINJA_GOOGLE_CLIENT_ID"], ENV["NINJA_GOOGLE_CLIENT_SECRET"]
       end
 
-      def initialize(app, email_matcher = //, not_allowed_file = nil)
+      def initialize(app, email_matcher: //, secured_routes: //, not_allowed_file: nil)
         puts "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"]
         @main_app = app
         @email_matcher = email_matcher
+        @secured_route_matcher = secured_routes
         @not_allowed_file = not_allowed_file || ::File.expand_path('../../../views/401.html', __FILE__)
         super()
       end
 
       before do
         @hit_real_app = false
-        if is_authenticated?
+        if is_authenticated? || !is_protected_request?
           res = @main_app.call(request.env)
           @hit_real_app = true
           headers res[1]
@@ -51,7 +52,7 @@ module Rack
       after do
         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']
+          session[:redirect_to] = is_internal_request? ? '/' : env['REQUEST_URI']
           redirect '/auth/google_oauth2'
         end
       end
@@ -61,6 +62,14 @@ module Rack
       def is_authenticated?
         !session[:user].nil?
       end
+
+      def is_protected_request?
+        is_internal_request? || env['PATH_INFO'].match(@secured_route_matcher)
+      end
+
+      def is_internal_request?
+        env['REQUEST_URI'] =~ %r{^/auth/}
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-ninja_auth
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - JP Hastings-Spital
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2015-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -125,6 +125,7 @@ files:
 - README.md
 - Rakefile
 - examples/gmail.rb
+- examples/routes.rb
 - lib/rack/ninja_auth.rb
 - lib/rack/ninja_auth/version.rb
 - rack-ninja_auth.gemspec