shib-rack 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 855ed5c8d4eec25c07f99b235be9b94eba1153c7
-  data.tar.gz: ffe393cfb960a090997ee82895f9a58f57d11c4f
+  metadata.gz: f82a33214cf9c9f29eab19c5db443aff50a083ed
+  data.tar.gz: 6234a4871c79daaeb50f7aec9fbaa2efd0c03b14
 SHA512:
-  metadata.gz: 8004fe06ab2146f4629561447145afb655c579d4654d982f10ee6adb522c413931b910d90403663987c2896da4d4aac2f1fd54d6902d03156f64e33f3b6ff7aa
-  data.tar.gz: f4201a06e3481fdd85e85661fa9e655def304905a9eda10ed412989fe0084a195c8842ac85f1b1696494d75c3c554285fcb7fbbdd61f0b49400c28dc377e0688
+  metadata.gz: 3f1b163facbc8a910823bb7aa88a41677c2733fa420590df2bef0d6bd44d958ece35ebb3acce5d684b1a08e5a33fb35cff3b077669595cbfa47710eeb4cf1ee5
+  data.tar.gz: fdc175e4432e7526587ec60113743f0c87682e056b68e3f253eb4944ffc85d49ef07b075a14e0e1d5be30c747cf2ad6d238b931dd78f6df50be51c129a1427e9

data/lib/shib_rack/attribute_mapping.rb

@@ -16,7 +16,7 @@ module ShibRack
 
       def map_multi_value(**mappings)
         mappings.each do |attr, header|
-          mapper = ->(env) { env[header].split(';') }
+          mapper = ->(env) { parse_multi_value(env[header]) }
           add_attribute_mapping(attr, mapper)
         end
       end
@@ -25,6 +25,10 @@ module ShibRack
         raise "Conflicting mapping for `#{attr}`" if attribute_mappings[attr]
         attribute_mappings[attr] = mapper
       end
+
+      def parse_multi_value(value)
+        value.split(/(?<!\\);/).map { |x| x.gsub('\;', ';') }
+      end
     end
 
     def self.included(base)

data/lib/shib_rack/development_handler.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'cgi'
+require 'uri'
 
 module ShibRack
   # Handler for authenticating to an application in development mode, using
@@ -45,11 +46,23 @@ module ShibRack
       st, = params['identity']
       identity = st && DevelopmentHandler.resolve_identity(st)
 
-      return super(env.merge(identity)) if identity
+      if identity
+        restore_original_query(env)
+        return super(env.merge(identity))
+      end
 
+      env['rack.session']['original_params'] = params
       [302, { 'Location' => "#{env['SCRIPT_NAME']}/development" }, []]
     end
 
+    def restore_original_query(env)
+      original_params = env['rack.session']['original_params']
+      return unless original_params
+
+      env['QUERY_STRING'] = URI.encode_www_form(original_params)
+      env['rack.session']['original_params'] = nil
+    end
+
     def development
       [
         200,

data/lib/shib_rack/handler.rb

@@ -42,7 +42,7 @@ module ShibRack
 
     def constantize(klass_name)
       return nil if klass_name.nil?
-      klass_name.split('::').reduce(Kernel) { |a, e| a.const_get(e) }
+      klass_name.split('::').reduce(Kernel) { |acc, elem| acc.const_get(elem) }
     end
 
     def receiver

data/lib/shib_rack/identities.yml

@@ -3,7 +3,8 @@
 # edited to our format. All data is fictional and any similarity to real
 # identities is purely coincidental.
 identities:
-  - targeted_id: https://idp.ernser.example.edu/idp/shibboleth!https://sp.example.edu/shibboleth!17865674-60c1-4202-aef9-21d4e66338d6
+  - persistent_id: https://idp.ernser.example.edu/idp/shibboleth!https://sp.example.edu/shibboleth!17865674-60c1-4202-aef9-21d4e66338d6
+    targeted_id: https://idp.ernser.example.edu/idp/shibboleth!https://sp.example.edu/shibboleth!17865674-60c1-4202-aef9-21d4e66338d6
     auedupersonsharedtoken:     CZa_1pvgsbWD_IzNsAR7d7jaGcs
     displayname:                Jefferey Kohler
     cn:                         Jefferey Kohler
@@ -15,7 +16,7 @@ identities:
     edupersonaffiliation:       staff;member
     edupersonscopedaffiliation: staff@ernser.example.edu;member@ernser.example.edu
 
-  - targeted_id: https://login.schneidermoen.example.edu/idp/shibboleth!https://sp.example.edu/shibboleth!a4ee2cb2-d764-4e1c-90f2-c6756b83d538
+  - persistent_id: https://login.schneidermoen.example.edu/idp/shibboleth!https://sp.example.edu/shibboleth!a4ee2cb2-d764-4e1c-90f2-c6756b83d538
     auedupersonsharedtoken:     iNrgu8iDNLu2V_WT7OxnwKs1EBs
     displayname:                Winifred Cummings IV
     cn:                         Winifred Cummings
@@ -39,7 +40,19 @@ identities:
     edupersonaffiliation:       student;member
     edupersonscopedaffiliation: student@fritsch.example.edu;member@fritsch.example.edu
 
-  - targeted_id: https://idp.westmarks.example.edu/idp/shibboleth!https://sp.example.edu/shibboleth!d2949a7a-0920-427f-a98e-846c4261c737
+  - auedupersonsharedtoken:     a07fhxNyDIEa4DNYBTD1Bc3rTcz 
+    displayname:                Reginald Moneymaker
+    cn:                         Reginald Moneymaker
+    principalname:              reg@synergy.example.edu
+    mail:                       reginald.moneymaker+label@example.edu
+    o:                          Synergy University
+    homeorganization:           synergy.example.edu
+    homeorganizationtype:       urn:mace:terena.org:schac:homeOrganizationType:au:university
+    edupersonaffiliation:       student;member
+    edupersonscopedaffiliation: student@synergy.example.edu;member@synergy.example.edu
+
+  - persistent_id: https://idp.westmarks.example.edu/idp/shibboleth!https://sp.example.edu/shibboleth!d2949a7a-0920-427f-a98e-846c4261c737
+    targeted_id: https://idp.westmarks.example.edu/idp/shibboleth!https://sp.example.edu/shibboleth!d2949a7a-0920-427f-a98e-846c4261c737
     auedupersonsharedtoken:     GBxa6l23yK5m6-jmPcoBJLWzg5w
     displayname:                Lüra Vån Ernser V
     cn:                         Lüra VånErnser
@@ -52,6 +65,7 @@ identities:
     edupersonscopedaffiliation: staff@westmarks.example.edu;member@westmarks.example.edu
 
   - targeted_id: https://idp.stroa.example.ac.ru/idp/shibboleth!https://sp.example.edu/shibboleth!JnNdHrBp8qYrHYM8dnXrPdV52whAHcc6bpmlsvw=
+    persistent_id: https://idp.stroa.example.ac.ru/idp/shibboleth!https://sp.example.edu/shibboleth!JnNdHrBp8qYrHYM8dnXrPdV52whAHcc6bpmlsvw=
     auedupersonsharedtoken:     weR_sI_2huUSq_2bGOkd1sMNZ9I
     displayname:                Константинова Арина Данииловна
     cn:                         Константинова АринаДанииловна

data/lib/shib_rack/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ShibRack
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shib-rack
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Shaun Mangelsdorf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -240,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Rack middleware for Shibboleth SP authentication