omniauth-dice 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7133e04ea14b309df8e8c0d57bc11e424fa537f7
-  data.tar.gz: dbc33b1b548e1e0ab3d2b34a704d0b1c13cc2bba
+  metadata.gz: 552059b078d15950580a1ab3d239785e072489bd
+  data.tar.gz: a219cf089244eb8e2fd89adcf162f67cca54c88a
 SHA512:
-  metadata.gz: ac8a4ad5542cee1c7ad5e4563d1b7aa3c1e550b622bbebcd3362dc7dd0750e3b20634fac2097997035c36ed40b9c5aca508be1611972c54dae4789873d94ba67
-  data.tar.gz: eedb52806258e18ffc7f648fe19b75dd8f5ac1c65b64a2d55a3e9083fd72622aee1d1fcc0627c02697eb1ef0fb249884fdb0acb9884a6d09cc2c62f08d93c36e
+  metadata.gz: 4b274db299621bedf763313c1199551ba53a8629979282c329662e71c2e02a19b6716581b4254dd03c91632360a9ca32123de266bf2f801377d603536495c67a
+  data.tar.gz: cd0e5841cd236925e43e4076cac60a407edeb2a7bdb6051e67a49569e4b20569a788c22f93a09a71e5838a3e381e86c1e437de2c7f5788fcc8352575c906e41e

checksums.yaml.gz.sig

@@ -1 +1,4 @@
-�f��l(�C�`�]_7n�@f2t����5��!,�׷
���s���#p���d�y([��Z�ԑ��K��_����V�@yB]L����zS�(�?����2w��]�C�	���.#V�%����MWy���X������
�#���Mn������Fՙ?�F2��S�5��ҘO�������EI��#�i�A�E�M�ɉ��9땨(��E�����R���h�B�˻��G��3��NR~O�\�T���d�n
+G���Vs�Y��t	
+����׿�1T.���1pq|�\z[����o�YU�BA�
+��ڬ�o>����M�\�r>���6�g��j���4�$����
+��"������JM12�K�&���Dx��Z�@&���u��rS�*�Z]��,3h��I;y�6��P�@y{DzeZu���l�#�����pF9�����Z)�"�O�;�D1��A�3��5�@Qu���{,�a���ʍ�݊��.]֫� �	p}w9F�Ȭb��&

data.tar.gz.sig

@@ -1,6 +1 @@
-N*Q*�z��NHUl��W,؉d��;u��$n�"ڪks�55ҟn�����u0#�&!��.�v�w(Ⱥ2�x��ɹ�ؘ�N���e%� �ŮW�
�xR�q��� �;�q���Ֆ��c�Y
��z.��Ym�k
-]}�&_�����j|p�F��V��h
-5�X����y���U�
-��*f�v[
-Ũ��d�v�+
-С�98�u:d%�n��N��i�&���*(��0�)�&Kf�ň1uX4zϰn
+�)�C��O���ɼ�M��F���ۊ{+���ht��

data/README.md

@@ -63,6 +63,8 @@ Full configuration options are as follows:
 
 * `cas_server` [String] Required base URL for CAS server
 * `authentication_path` [String] URL path for endpoint, e.g. '/users'
+* `custom_callback_url` [String] Use a fully custom URL for callback endpoint  
+  This option overrides the `use_callback_url` option setting!
 * `use_callback_url` [Boolean] Use full URL vs path for callback endpoint  
   This is especially useful if your app runs as a sub-URI example.org/app_name
 * `return_field` [String] Optional path to append after DN string

data/lib/omniauth/dice/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Dice
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

data/lib/omniauth/strategies/dice.rb

@@ -37,6 +37,7 @@ module OmniAuth
 
       option :dnc_options, {}
       option :cas_server, nil
+      option :custom_callback_url, nil
       option :use_callback_url, false
       option :authentication_path, nil
       option :return_field, 'info'
@@ -83,7 +84,7 @@ module OmniAuth
         log :debug, "Formatted issuer_dn: #{issuer_dn}"
         set_session_dn(issuer_dn, 'issuer') if issuer_dn
 
-        redirect options.use_callback_url==true ? callback_url : callback_path
+        redirect_for_callback
       end
 
       def callback_phase
@@ -128,6 +129,18 @@ module OmniAuth
         info
       end
 
+      def redirect_for_callback
+        if options.custom_callback_url
+          redirect options.custom_callback_url
+        else
+          if options.use_callback_url == true
+            redirect callback_url
+          else
+            redirect callback_path
+          end
+        end
+      end
+
       private
 
       # Change Hashie indifferent access keys back to symbols

data/spec/omniauth/strategies/dice_integrations_spec.rb

@@ -103,6 +103,29 @@ describe OmniAuth::Strategies::Dice, type: :strategy do
     end
   end
 
+  describe "custom_callback_url" do
+    it "should use the custom_callback_url provided instead of default callback_path|url when specified" do
+      callback_url_opts = {
+        cas_server: 'http://example.org',
+        authentication_path: '/dn',
+        custom_callback_url: 'http://example.org/sub-uri/auth/dice/callback'
+      }
+      self.app = Rack::Builder.app do
+        use Rack::Session::Cookie, :secret => '1337geeks'
+        use RackSessionAccess::Middleware
+        use OmniAuth::Strategies::Dice, callback_url_opts
+        run lambda{|env| [404, {'env' => env}, ["HELLO!"]]}
+      end
+      header 'Ssl-Client-Cert', user_cert
+      get '/auth/dice'
+      expect(last_request.env['HTTP_SSL_CLIENT_CERT']).to eq(user_cert)
+      expect(last_request.url).to eq('http://example.org/auth/dice')
+      expect(last_request.env['rack.session']['omniauth.params']['user_dn']).to eq(user_dn.to_s)
+      expect(last_request.env['rack.session']['omniauth.params']['issuer_dn']).to eq(issuer_dn)
+      expect(last_response.location).to eq('http://example.org/sub-uri/auth/dice/callback')
+    end
+  end
+
   describe '#request_phase' do
     it 'should fail without a client DN' do
       expect { get '/auth/dice' }.to raise_error(OmniAuth::Error, 'You need a valid DN to authenticate.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-dice
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Steven Haddox
@@ -30,7 +30,7 @@ cert_chain:
   42qdwEXvvkODZAD6KAIXPdmbMfBgPbcd+B/4eUA0PyKo+4dgL1NuqX4MPWToevIZ
   O8EKLF2X7NmC6FY1bOsSj/J8r1SOkx0rxgF+geRvY1P+hfNjDfxTsjU=
   -----END CERTIFICATE-----
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2015-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print

metadata.gz.sig

@@ -1,3 +1,3 @@
-�8P��2� �|���Bߴ�<}�N�^Y�\x���җ��L����*�ٞ@8�24`�a��@�yE9��*�Uũ��}�TI�
-���f�T�
-�w���}{�
+p�-���6���"�L~�:0��^
+�r���� ��~1����m��[g�⡊�{X�qc�OV�`�"���y#�9)�W>�A�$g����ӡ�����Q�ߜ��	sM���^���_î���h.ПhT��+h0�c�d�R_r��Eٵ��PCl4m�E�r�c���{���Ϊ�t�CV��
+O�Js͂��ޖ����B�V�C�L\9�����V��'��'��M����B�.��(��l2�ta�!�`S_�Q���e��