rack-cas 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a65d4abd71dea1c784a406e3ca8a042f5503eb6
-  data.tar.gz: 4d5cdbcdbfbf1a16cb07acc947d15b99ac2a389e
+  metadata.gz: cc8336d0e3209b2a97a12f4edf8c75ab4eba5394
+  data.tar.gz: 75d90457796e73f01d1a68e94c17fc833823306c
 SHA512:
-  metadata.gz: 6882a52abd94f341672e8ac0e5aa2a1aaa1be4e5769f16fba6a2b8ed70a7070b61876351fbcdb6d9c15e74ce63c0118f69ad5e2ef528e68f449bb0235d834d2a
-  data.tar.gz: a9f768448351fdf7d5aee6357d6b94bec8c171dba878ea4201fe09ae73bc9b1a1b3eadf3a0c88366b7cc4542e8317757d4420b3ceed2b7dabb443d065d581693
+  metadata.gz: 9e3411f27cb4033cdc3a9f908680fa456d9b0b36ea61e49abe55411d1e299fb44fa97eef5451aabf5b71bc18e1ea896dd830e4109466f322111e2fe24686ee05
+  data.tar.gz: e4fa2a3b97670d12d5ab8967c8e7413eeff4405d15e062e0b58d908983dcbd71ec0958c0c764b51ea7461111657f33ab974cb62d1333faf9789582ca05ad55c0

data/lib/rack-cas/service_validation_response.rb

@@ -13,7 +13,7 @@ module RackCAS
 
     def user
       if success?
-        xml.xpath('/cas:serviceResponse/cas:authenticationSuccess/cas:user').text
+        xml.at('//serviceResponse/authenticationSuccess/user').text
       else
         case failure_code
         when 'INVALID_REQUEST'
@@ -34,21 +34,12 @@ module RackCAS
       raise AuthenticationFailure, failure_message unless success?
 
       # Jasig style
-      if attr_node = xml.at('/cas:serviceResponse/cas:authenticationSuccess/cas:attributes')
-        attr_node.children.each do |node|
-          if node.is_a? Nokogiri::XML::Element
-            if attrs.has_key?(node.name)
-              attrs[node.name] = [attrs[node.name]] if attrs[node.name].is_a? String
-              attrs[node.name] << node.text
-            else
-              attrs[node.name] = node.text
-            end
-          end
-        end
+      if attr_node = xml.at('//serviceResponse/authenticationSuccess/attributes')
+        attrs = parse_user_info(attr_node)
 
       # RubyCas-Server style
       else
-        xml.at('/cas:serviceResponse/cas:authenticationSuccess').children.each do |node|
+        xml.at('//serviceResponse/authenticationSuccess').children.each do |node|
           if node.is_a? Nokogiri::XML::Element
             if !node.namespace || !node.namespace.prefix == 'cas'
               # TODO: support JSON encoding
@@ -64,11 +55,11 @@ module RackCAS
     protected
 
     def success?
-      @success ||= !!xml.at('/cas:serviceResponse/cas:authenticationSuccess')
+      @success ||= !!xml.at('//serviceResponse/authenticationSuccess')
     end
 
     def authentication_failure
-      @authentication_failure ||= xml.at('/cas:serviceResponse/cas:authenticationFailure')
+      @authentication_failure ||= xml.at('//serviceResponse/authenticationFailure')
     end
 
     def failure_message
@@ -103,7 +94,36 @@ module RackCAS
     def xml
       return @xml unless @xml.nil?
 
-      @xml = Nokogiri::XML(response.body)
+      @xml = Nokogiri::XML(response.body).remove_namespaces!
+    end
+
+    # initially borrowed from omniauth-cas
+    def parse_user_info(node)
+      return nil if node.nil?
+      {}.tap do |hash|
+        node.children.each do |e|
+          unless e.kind_of?(Nokogiri::XML::Text) || e.name == 'proxies'
+            # There are no child elements
+            if e.element_children.count == 0
+              if hash.has_key?(e.name)
+                hash[e.name] = [hash[e.name]] if hash[e.name].is_a? String
+                hash[e.name] << e.content
+              else
+                hash[e.name] = e.content
+              end
+            elsif e.element_children.count
+              # JASIG style extra attributes
+              if e.name == 'attributes'
+                hash.merge!(parse_user_info(e))
+              else
+                hash[e.name] = [] if hash[e.name].nil?
+                hash[e.name] = [hash[e.name]] if hash[e.name].is_a? String
+                hash[e.name].push(parse_user_info(e))
+              end
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/rack-cas/version.rb

@@ -1,3 +1,3 @@
 module RackCAS
-  VERSION = '0.12.1'
+  VERSION = '0.13.0'
 end

data/lib/rack/cas.rb

@@ -38,7 +38,7 @@ class Rack::CAS
     if cas_request.logout?
       log env, 'rack-cas: Intercepting logout request.'
 
-      request.session.send respond_to?(:destroy) ? :destroy : :clear
+      request.session.send (request.session.respond_to?(:destroy) ? :destroy : :clear)
       return redirect_to server.logout_url(request.params).to_s
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-cas
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Adam Crownoble
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -155,9 +155,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Rack-based CAS client
 test_files: []
-has_rdoc: