gatekeeper 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/gatekeeper.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gatekeeper}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Dinn"]
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
      "VERSION",
      "gatekeeper.gemspec",
      "lib/gatekeeper.rb",
+     "lib/gatekeeper/helpers/authentication.rb",
      "lib/gatekeeper/helpers/rack.rb",
      "lib/gatekeeper/middleware.rb",
      "lib/gatekeeper/sso.rb",

data/lib/gatekeeper/helpers/authentication.rb

@@ -0,0 +1,17 @@
+module Gatekeeper
+  module Helpers
+    module Authentication
+      def current_user
+        session[:sso] && session[:sso][:user_id]
+      end
+
+      def is_admin?
+        (session[:sso][:is_admin?]=='true')
+      end
+
+      def is_manager_for?(hotink_account_id)
+        (session[:sso]["account_#{hotink_account_id.to_s}_manager".to_sym]=='true')
+      end
+    end
+  end
+end

data/lib/gatekeeper/helpers/rack.rb

@@ -1,42 +1,40 @@
 module Gatekeeper
-  module Client
-    module Helpers
-      module Rack
-        def sso_logged_in?
-          session[:sso] && sso_user_id
-        end
+  module Helpers
+    module Rack
+      def sso_logged_in?
+        session[:sso] && sso_user_id
+      end
 
-        def sso_login_as(user_id, sreg_params)
-          session.delete(:last_oidreq)
-          session.delete('OpenID::Consumer::last_requested_endpoint')
-          session.delete('OpenID::Consumer::DiscoveredServices::OpenID::Consumer::')
+      def sso_login_as(user_id, sreg_params)
+        session.delete(:last_oidreq)
+        session.delete('OpenID::Consumer::last_requested_endpoint')
+        session.delete('OpenID::Consumer::DiscoveredServices::OpenID::Consumer::')
 
-          session[:sso] ||= { }
-          session[:sso][:user_id] = user_id
-          sreg_params.each { |key, value| session[:sso][key.to_sym] = value.to_s }
-        end
+        session[:sso] ||= { }
+        session[:sso][:user_id] = user_id
+        sreg_params.each { |key, value| session[:sso][key.to_sym] = value.to_s }
+      end
 
-        def sso_user_id
-          session[:sso][:user_id]
-        end
+      def sso_user_id
+        session[:sso][:user_id]
+      end
 
-        def sso_user_email
-          session[:sso][:email]
-        end
+      def sso_user_email
+        session[:sso][:email]
+      end
 
-        def absolute_url(suffix = nil)
-          port_part = case request.scheme
-                      when "http"
-                        request.port == 80 ? "" : ":#{request.port}"
-                      when "https"
-                        request.port == 443 ? "" : ":#{request.port}"
-                      end
-          "#{request.scheme}://#{request.host}#{port_part}#{suffix}"
-        end
+      def absolute_url(suffix = nil)
+        port_part = case request.scheme
+                    when "http"
+                      request.port == 80 ? "" : ":#{request.port}"
+                    when "https"
+                      request.port == 443 ? "" : ":#{request.port}"
+                    end
+        "#{request.scheme}://#{request.host}#{port_part}#{suffix}"
+      end
 
-        def excluded_path?
-          options.exclude_paths && options.exclude_paths.include?(request.path_info)
-        end
+      def excluded_path?
+        options.exclude_paths && options.exclude_paths.include?(request.path_info)
       end
     end
   end

data/lib/gatekeeper/middleware.rb

@@ -1,17 +1,15 @@
 module Gatekeeper
-  module Client
-    class Middleware < Sinatra::Base
-      enable :raise_errors
-      disable :show_exceptions
+  class Middleware < Sinatra::Base
+    enable :raise_errors
+    disable :show_exceptions
 
-      set :sso_url, nil
-      set :exclude_paths, nil
+    set :sso_url, nil
+    set :exclude_paths, nil
 
-      def sso_url=(url)
-        options.sso_url = url
-      end
-      
-      register ::Gatekeeper::Client::SSO
+    def sso_url=(url)
+      options.sso_url = url
     end
+    
+    register ::Gatekeeper::SSO
   end
 end

data/lib/gatekeeper/sso.rb

@@ -1,62 +1,60 @@
 module Gatekeeper
-  module Client
-    module SSO
-      def self.registered(app)
-        app.use(Rack::OpenID, OpenID::Store::Filesystem.new("#{Dir.tmpdir}/openid"))
-        app.helpers Gatekeeper::Client::Helpers::Rack
+  module SSO
+    def self.registered(app)
+      app.use(Rack::OpenID, OpenID::Store::Filesystem.new("#{Dir.tmpdir}/openid"))
+      app.helpers Gatekeeper::Helpers::Rack
 
-        app.get '/sso/login' do
-          if contact_id = params['id']
-            response['WWW-Authenticate'] = Rack::OpenID.build_header(
-              :identifier => "#{options.sso_url}/users/#{contact_id}",
-              :trust_root => absolute_url('/sso/login')
-            )
-            throw :halt, [401, 'got openid?']
-          elsif openid = request.env["rack.openid.response"]
-            if openid.status == :success
-              if contact_id = openid.display_identifier.split("/").last
-                sreg_params = openid.message.get_args("http://openid.net/extensions/sreg/1.1")
-                sso_login_as(contact_id, sreg_params)
-                
-                if session['sso_return_to']
-                  begin
-                    return_url = URI.parse(session['sso_return_to'])
-                    
-                    unless return_url.host==request.host
-                      user_token = UserToken.create!(:user_id => sso_user_id)
-                      if return_url.query==nil
-                        return_url.query = "user_token=#{user_token.token}"
-                      else
-                        return_url.query = "user_token=#{user_token.token}&#{return_url.query}"
-                      end
+      app.get '/sso/login' do
+        if contact_id = params['id']
+          response['WWW-Authenticate'] = Rack::OpenID.build_header(
+            :identifier => "#{options.sso_url}/users/#{contact_id}",
+            :trust_root => absolute_url('/sso/login')
+          )
+          throw :halt, [401, 'got openid?']
+        elsif openid = request.env["rack.openid.response"]
+          if openid.status == :success
+            if contact_id = openid.display_identifier.split("/").last
+              sreg_params = openid.message.get_args("http://openid.net/extensions/sreg/1.1")
+              sso_login_as(contact_id, sreg_params)
+              
+              if session['sso_return_to']
+                begin
+                  return_url = URI.parse(session['sso_return_to'])
+                  
+                  unless return_url.host==request.host
+                    user_token = UserToken.create!(:user_id => sso_user_id)
+                    if return_url.query==nil
+                      return_url.query = "user_token=#{user_token.token}"
+                    else
+                      return_url.query = "user_token=#{user_token.token}&#{return_url.query}"
                     end
-                    
-                    redirect return_url.to_s   
-                  rescue
-                    redirect '/'
-                  ensure
-                    session['sso_return_to'] = nil
                   end
-                else
+                  
+                  redirect return_url.to_s   
+                rescue
                   redirect '/'
+                ensure
+                  session['sso_return_to'] = nil
                 end
-              
               else
-                raise "No contact could be found for #{openid.display_identifier}"
+                redirect '/'
               end
+            
             else
-              throw :halt, [503, "Error: #{openid.status}"]
+              raise "No contact could be found for #{openid.display_identifier}"
             end
           else
-            session['sso_return_to'] = params[:return_to] if params[:return_to]
-            redirect "#{options.sso_url}/login?return_to=#{absolute_url('/sso/login')}"
+            throw :halt, [503, "Error: #{openid.status}"]
           end
+        else
+          session['sso_return_to'] = params[:return_to] if params[:return_to]
+          redirect "#{options.sso_url}/login?return_to=#{absolute_url('/sso/login')}"
         end
+      end
 
-        app.get '/sso/logout' do
-          session[:sso] = nil
-          redirect "#{options.sso_url}/logout"
-        end
+      app.get '/sso/logout' do
+        session[:sso] = nil
+        redirect "#{options.sso_url}/logout"
       end
     end
   end

data/spec/gatekeeper_spec.rb

@@ -5,7 +5,7 @@ SSO_URL = "http://ssourl.local/sso"
 class TestApp < Sinatra::Base
   enable :sessions
   
-  use Gatekeeper::Client::Middleware do |sso|
+  use Gatekeeper::Middleware do |sso|
     sso.sso_url = SSO_URL
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gatekeeper
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Chris Dinn
@@ -40,6 +40,7 @@ files:
 - VERSION
 - gatekeeper.gemspec
 - lib/gatekeeper.rb
+- lib/gatekeeper/helpers/authentication.rb
 - lib/gatekeeper/helpers/rack.rb
 - lib/gatekeeper/middleware.rb
 - lib/gatekeeper/sso.rb