sq_auth 0.0.21 → 0.0.22

data/examples/client_siantra_base.rb

@@ -0,0 +1,19 @@
+require 'sinatra/base'
+require 'sq_auth'
+require 'pry'
+
+class MyApp < Sinatra::Base
+  set :sessions, true
+
+  SqAuth.connect(host: "auth.server.com") do |d|
+    d.project_name = "Auth"
+    d.gateway_ip = "192.168.0.1"
+    d.forced_host = "my-desktop"
+  end
+
+  get [:admin], '/123' do
+    'Hello world!'
+  end
+end
+
+MyApp.run!

data/lib/sq_auth/sq_auth_access.rb

@@ -4,19 +4,23 @@ module SqAuth
     DEFAULT_DRAW_PROC = Proc.new {|uri, callback, role, project, session| SqAuthUtils::default_draw_template(uri, callback, role, project, session)}
     DEFAULT_DATA_PROC = Proc.new { "Forbidden" }
     DEFAULT_OPTIONS = {project: "Project", https: true}
-    attr_accessor :login_path, :callback, :project_name, :gateway_ip
+    attr_accessor :login_path, :callback, :project_name, :gateway_ip, :forced_host, :forced_port
     def initialize options={}
       @options = options
       @data_proc = DEFAULT_DATA_PROC
       @draw_proc = DEFAULT_DRAW_PROC
       @login_path = DEFAULT_ACCESS_PATH
       @gateway_ip = nil
+      @forced_host = nil
+      @forced_port = nil
     end
 
     def connect options = {}
       options = DEFAULT_OPTIONS.merge(options)
       @project_name = options[:project]
       @gateway_ip = options[:gateway_ip]
+      @forced_port = options[:forced_host]
+      @forced_host = options[:forced_port]
       yield self if block_given?
       SqAuthIntegration.alter_environment options
       @session_provider = SqAuthClient.new options
@@ -99,5 +103,12 @@ module SqAuth
       uri.path = "#@login_path"
       uri.to_s
     end
+
+    def set_callback(actual_callback)
+      callback_uri = URI.parse(actual_callback)
+      callback_uri.port = @forced_port.to_i if @forced_port
+      callback_uri.host = @forced_host if @forced_host
+      @callback = callback_uri.to_s
+    end
   end
 end

data/lib/sq_auth/sq_auth_integration/sq_auth_rack.rb

@@ -11,9 +11,14 @@ module SqAuth
             # config.middleware.use Rack::Session::Cookie, :expire_after => 2592000
             config.middleware.use SqAuth::SqAuthIntegration::SqAuthRack::Middleware
           end
-        else
-          use Rack::Session::Cookie, :expire_after => 2592000
-          use SqAuth::SqAuthIntegration::SqAuthRack::Middleware
+        elsif defined?(Sinatra)
+          if options[:klass].respond_to?(:use)
+            sinatra_class = options[:klass]
+          else
+            sinatra_class = Sinatra::Base
+          end
+          sinatra_class.use Rack::Session::Cookie, :expire_after => 2592000
+          sinatra_class.use SqAuth::SqAuthIntegration::SqAuthRack::Middleware
         end
       end
 
@@ -21,7 +26,7 @@ module SqAuth
         attr_accessor :app, :env
         def call(env)
           req = Rack::Request.new(env)
-          SqAuth.access.callback = callback_uri(env)
+          SqAuth.access.set_callback(callback_uri(env))
           SqAuth.access.current_user_ip = env["HTTP_X_FORWARDED_FOR"] || env["REMOTE_ADDR"]
           SqAuth.access.save_session_for_current_user (env["rack.session"]||{})[:sqauthsession]
           form_hash = req.params||{}
@@ -56,7 +61,6 @@ module SqAuth
             end
             host ||= env["SERVER_NAME"]
             port ||= env["SERVER_PORT"]
-            port = 80
             path = env["REQUEST_PATH"].to_s
             if path.empty?
               path = URI::parse(env["PATH_INFO"]).path rescue ""
@@ -82,7 +86,7 @@ module SqAuth
           [status, headers, response]
         end
 
-        def initialize(app)
+        def initialize(app, options = {})
           @app = app
         end
       end

data/lib/sq_auth/sq_auth_integration/sq_auth_rack_protection.rb

@@ -13,7 +13,7 @@ module SqAuth
           const_set("HOST", except)
           alias :old_accepts? :accepts?
           def accepts?(env)
-            form_hash = env["rack.request.form_hash"]||{}
+            form_hash = Rack::Request.new(env).params
             if referrer(env) == HOST && env["REQUEST_METHOD"] == "POST" && form_hash.keys.include?("sqauthsession")
               true
             else

data/lib/sq_auth/version.rb

@@ -1,3 +1,3 @@
 module SqAuth
-  VERSION = "0.0.21"
+  VERSION = "0.0.22"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sq_auth
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000Z
+date: 2012-05-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70197901917880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70197901917880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70197901916460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70197901916460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70197901914660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70197901914660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: SQ sevices authentication gem
 email:
 - leonidkrn@gmail.com
@@ -56,6 +71,7 @@ files:
 - Gemfile
 - Rakefile
 - examples/client.rb
+- examples/client_siantra_base.rb
 - examples/server.rb
 - lib/sq_auth.rb
 - lib/sq_auth/sq_auth_access.rb
@@ -103,15 +119,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sq_auth
-rubygems_version: 1.8.17
+rubygems_version: 1.8.18
 signing_key: 
 specification_version: 3
 summary: SQ sevices authentication gem
-test_files:
-- spec/lib/sq_auth/sq_auth_client_spec.rb
-- spec/lib/sq_auth/sq_auth_request_spec.rb
-- spec/lib/sq_auth/sq_auth_server_interface/basic_server_spec.rb
-- spec/lib/sq_auth/sq_auth_sessions_spec.rb
-- spec/lib/sq_auth/sq_auth_user/basic_user_spec.rb
-- spec/lib/sq_auth_spec.rb
-- spec/spec_helper.rb
+test_files: []