rack-cas 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0d93b9b6cfd9a88b23291eb5c3babac6313c7bcd
-  data.tar.gz: 397e001a435e2944c8c49e3390237d485abd8897
+SHA256:
+  metadata.gz: af1e3b165fc96ee826408cdb92a8b75efde25142bfe3a723b637427bedd14a8b
+  data.tar.gz: a81f1d05e4eadedf53aa97bdae224345c0e969370a4b6f399e465b43229793d9
 SHA512:
-  metadata.gz: be21fd7776d5e5b81ba56e776db5585381d301904c80737d85faeeb23adf0f7689665e9fdcb2e9acbaf6bdac928c02a7ac2e41d67c785dfde5884d62c00615df
-  data.tar.gz: a5362ad32fd9e7ac13c701f4d6865b5f74ad5726b2f7cd7008776703cee29e8da2614af3cceed1913b1445cee3b9787edaaca539b4b1d1aa30995c6a9d859172
+  metadata.gz: 763c339ba9e541aa94401135f471b475434816fee5287fb84a1a8adefcd0ed098bcfdfcad64737891c9075aa99cddc173ee75bbc81c6bae464a33f74181a87e3
+  data.tar.gz: 689db6c253c92114a9609ccfa870da73816fc3d684e744a63521d15ee52f814298c8137f7b49bf178ed385c45104ff00aec02f406c96bd9a9a4e2ec1c1cf58eb

data/README.md

@@ -18,7 +18,7 @@ One of the included session stores must be used.
 
 Requirements
 ============
-* Ruby >= 1.9.2
+* Ruby >= 2.0
 * A working [CAS server](http://casino.rbcas.com)
 * An app that [returns a `401 Unauthorized`](#integration) status when authentication is required
 
@@ -109,7 +109,7 @@ See the [example Sinatra app](https://gist.github.com/adamcrown/a7e7577594690335
 
 ### Single Sign Out ###
 
-You will need to store sessions in session store supported by Rack CAS. 
+You will need to store sessions in session store supported by Rack CAS.
 
 #### Active Record ####
 Add a migration that looks roughly like
@@ -168,6 +168,15 @@ a `Rack::Request` object as a parameter.
 use Rack::CAS, server_url: '...', exclude_request_validator: Proc.new { |req| req.env['HTTP_CONTENT_TYPE'] == 'application/json' }
 ```
 
+Service URL
+--------------------
+
+Sometimes you need to force the `service=` attribute on login requests, and not just use the request url in an automatic way.
+
+```ruby
+use Rack::CAS, service: 'http://anotherexample.com'
+```
+
 Ignore 401 Intercept
 --------------------
 

data/lib/rack-cas/configuration.rb

@@ -1,7 +1,8 @@
 module RackCAS
   class Configuration
     SETTINGS = [:fake, :fake_attributes, :server_url, :session_store, :exclude_path, :exclude_paths, :extra_attributes_filter,
-                :verify_ssl_cert, :renew, :use_saml_validation, :ignore_intercept_validator, :exclude_request_validator, :protocol,:redis_options]
+                :verify_ssl_cert, :renew, :use_saml_validation, :ignore_intercept_validator, :exclude_request_validator, :protocol,
+                :redis_options, :login_url, :service]
 
 
     SETTINGS.each do |setting|

data/lib/rack-cas/server.rb

@@ -13,7 +13,8 @@ module RackCAS
       base_params = {service: service_url}
       base_params[:renew] = true if RackCAS.config.renew?
 
-      @url.dup.append_path('login').add_params(base_params.merge(params))
+      url = RackCAS.config.login_url? ? RackCAS::URL.parse(RackCAS.config.login_url) : @url.dup.append_path('login')
+      url.add_params(base_params.merge(params))
     end
 
     def logout_url(params = {})

data/lib/rack-cas/version.rb

@@ -1,3 +1,3 @@
 module RackCAS
-  VERSION = '0.16.0'
+  VERSION = '0.16.1'
 end

data/lib/rack/cas.rb

@@ -21,16 +21,18 @@ class Rack::CAS
     if cas_request.ticket_validation?
       log env, 'rack-cas: Intercepting ticket validation request.'
 
+      service_url = RackCAS.config.service? ? RackCAS.config.service : cas_request.service_url
+
       begin
         user, extra_attrs = get_user(request.url, cas_request.ticket)
       rescue RackCAS::ServiceValidationResponse::TicketInvalidError, RackCAS::SAMLValidationResponse::TicketInvalidError
         log env, 'rack-cas: Invalid ticket. Redirecting to CAS login.'
 
-        return redirect_to server.login_url(cas_request.service_url).to_s
+        return redirect_to server.login_url(service_url).to_s
       end
 
       store_session request, user, cas_request.ticket, extra_attrs
-      return redirect_to cas_request.service_url
+      return redirect_to service_url
     end
 
     if cas_request.logout?
@@ -52,7 +54,17 @@ class Rack::CAS
     if response[0] == 401 && !ignore_intercept?(request) # access denied
       log env, 'rack-cas: Intercepting 401 access denied response. Redirecting to CAS login.'
 
-      redirect_to server.login_url(request.url).to_s
+      url = if RackCAS.config.service?
+              configured_service_url = RackCAS::URL.parse(RackCAS.config.service)
+              request_url            = RackCAS::URL.parse(request.url)
+              request_url.host       = configured_service_url.host
+              request_url.scheme     = configured_service_url.scheme
+              request_url.to_s
+            else
+              cas_request.service_url
+            end
+
+      redirect_to server.login_url(url).to_s
     else
       response
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-cas
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Adam Crownoble
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-18 00:00:00.000000000 Z
+date: 2019-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -151,15 +151,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Rack-based CAS client