omniauth-dice 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 136390a70c4e465698843d744e9328e4a4b63131
-  data.tar.gz: f9822f9f4742f6a7c6c918fbf3a89b4ff9512c7c
+  metadata.gz: 9f393f95195efb18da624ef331288b3f4876c997
+  data.tar.gz: 0b45003f60b7d5b42132bfaafeb692ccf7f36a5b
 SHA512:
-  metadata.gz: 6d2dd8b1326fc262540a5491854bf5536947964872a111a75db27f3b297979b2880f20150bf8e888b1ed89d7cb21ac5809a0bbc25d003439b76799f4369d5ad7
-  data.tar.gz: 6cc4801fe4420043826cfc27169b1e524460971cb826132e75a11ce6b734f036da268b9e80a25d6431b5fe49cf66596f7865c91a33011a5f99c3f0707a972d4c
+  metadata.gz: 332406fca56a0c52f8885a5741c3957d12c53820ffcaab8aaace6528f143f2884befe841c27c05e48ee9b456d87f72ef1f5515493857404942209392e531d557
+  data.tar.gz: 99604306f8bec41d99577182d0ebedfa93625b5d0ce27d602b4baeb46f654f498861b945b1711fe7ce74aadb30afdc4521c5f797c94471cd1dc6e7e06b47c362

data/README.md

@@ -32,6 +32,7 @@ Setup your OmniAuth::Dice builder like so:
   authentication_path: '/dn',
   format_header:       'application/xml', # default is 'application/json'
   format:              'xml', # default is 'json'
+  primary_visa:        'EQUESTRIA', # Optional
   dnc_options: { transformation: 'downcase' }, # see `dnc` gem for all options
   ssl_config:  {
     ca_file:     'spec/certs/CA.pem',
@@ -43,25 +44,23 @@ Setup your OmniAuth::Dice builder like so:
 
 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'
-return_field [String] Optional path to append after DN string
-ssl_config [Hash] Configuration hash for `Faraday` SSL options
-format_header [String] 'application/json', 'application/xml', etc
+* `cas_server` [String] Required base URL for CAS server
+* `authentication_path` [String] URL path for endpoint, e.g. '/users'
+* `return_field` [String] Optional path to append after DN string
+* `ssl_config` [Hash] Configuration hash for `Faraday` SSL options
+* `format_header` [String] 'application/json', 'application/xml', etc  
   Defaults to 'application/json'
-format [String] 'json', 'xml', etc.
+* `format` [String] 'json', 'xml', etc.  
   Defaults to 'json'
-client_cert_header [String] ENV string to access user's X509 cert
+* `client_cert_header` [String] ENV string to access user's X509 cert  
   Defaults to 'HTTP_SSL_CLIENT_CERT'
-subject_dn_header [String] ENV string to access user's subject_dn
+* `subject_dn_header` [String] ENV string to access user's subject_dn  
   Defaults to 'HTTP_SSLC_LIENT_S_DN'
-issuer_dn_header [String] ENV string to access user's issuer_dn
+* `issuer_dn_header` [String] ENV string to access user's issuer_dn  
   Defaults to 'HTTP_SSL_CLIENT_I_DN'
-name_format [Symbol] Format for auth_hash['info']['name']
-  Defaults to attempting DN common name -> full name -> first & last name
+* `name_format` [Symbol] Format for auth_hash['info']['name']  
+  Defaults to attempting DN common name -> full name -> first & last name  
   Valid options are: :cn, :full_name, :first_last_name to override
-```
 
 ### SSL Client Certificate Notes
 

data/lib/omniauth/dice/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Dice
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

data/lib/omniauth/strategies/dice.rb

@@ -36,8 +36,8 @@ module OmniAuth
       attr_accessor :dn, :raw_dn, :data
       args [:cas_server, :authentication_path]
 
-      def initialize(*args, &block)
-        validate_required_params(args)
+      def initialize(app, *args, &block)
+        required_params_defined?(args)
 
         super
       end
@@ -338,34 +338,32 @@ module OmniAuth
         [:cas_server, :authentication_path]
       end
 
-      # Verify that arguments required to properly run are present or fail hard
-      # NOTE: CANNOT call "log" method from initialize block hooks
-      def validate_required_params(args)
-        required_params.each do |param|
-          param_present = nil
-          args.each do |arg|
-            param_present = true if param_in_arg?(param, arg) == true
-          end
-
-          if param_present.nil?
-            error_msg = "omniauth-dice error: #{param} is required"
-            fail RequiredCustomParamError, error_msg
+      # Determine if required arguments are present or fail hard
+      # NOTE: CANNOT call "log" method from within init block methods
+      def required_params_defined?(args)
+        required_hash = {}
+        required_params.each do |key|
+          required_hash[key] = false
+        end
+        args.each do |arg|
+          if arg.class == Hash
+            arg.each do |sub_arg, value|
+              required_hash[sub_arg] = true if required_hash[sub_arg] == false
+            end
+          else
+            required_hash[arg.to_sym] = true if required_hash[sub_arg] == false
           end
         end
+        required_hash.reject!{ |arg, val| arg if val == true }
+        fail_on_invalid_params(required_hash.keys) unless required_hash.empty?
       end
 
-      # Determine if a specified param symbol exists in the passed argument
-      # NOTE: CANNOT call "log" method from initialize block hooks
-      def param_in_arg?(param, arg)
-        if arg.class == Hash
-          if arg.key?(param.to_sym)
-            true
-          else
-            false
-          end
-        else
-          false
+      def fail_on_invalid_params(missing_params)
+        error_msg = ""
+        missing_params.each do |param|
+          error_msg += "omniauth-dice error: #{param} is required\r\n"
         end
+        fail RequiredCustomParamError, error_msg
       end
 
       def set_session_dn(dn_string, type='subject')

data/omniauth-dice.gemspec

@@ -38,11 +38,11 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'cert_munger', '~> 0.1'
   spec.add_dependency 'dnc', '~> 0.1'
-  spec.add_dependency 'excon'
-  spec.add_dependency 'faraday'
-  spec.add_dependency 'faraday_middleware'
+  spec.add_dependency 'excon', '~> 0.43'
+  spec.add_dependency 'faraday', '~> 0.9'
+  spec.add_dependency 'faraday_middleware', '~> 0.9'
   spec.add_dependency 'logging', '~> 1.8'
-  spec.add_dependency 'multi_xml'
+  spec.add_dependency 'multi_xml', '~> 0.5'
   spec.add_dependency 'omniauth', '~> 1.0'
 
   spec.cert_chain  = ['certs/stevenhaddox.pem']

data/spec/omniauth/strategies/dice_integrations_spec.rb

@@ -62,6 +62,8 @@ describe OmniAuth::Strategies::Dice, type: :strategy do
     self.app = Rack::Builder.app do
       use Rack::Session::Cookie, :secret => '1337geeks'
       use RackSessionAccess::Middleware
+      ap '-'*80
+      ap dice_options
       use OmniAuth::Strategies::Dice, dice_options
       run lambda{|env| [404, {'env' => env}, ["HELLO!"]]}
     end

data/spec/omniauth/strategies/dice_spec.rb

@@ -25,11 +25,11 @@ describe OmniAuth::Strategies::Dice do
     let(:subject_without_authentication_path) { OmniAuth::Strategies::Dice.new(app, cas_server: 'https://dice.dev') }
 
     it 'should require a cas server url' do
-      expect{ subject }.to raise_error(RequiredCustomParamError, "omniauth-dice error: cas_server is required")
+      expect{ subject }.to raise_error(RequiredCustomParamError)
     end
 
     it 'should require an authentication path' do
-      expect{ subject_without_authentication_path }.to raise_error(RequiredCustomParamError, "omniauth-dice error: authentication_path is required")
+      expect{ subject_without_authentication_path }.to raise_error(RequiredCustomParamError)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-dice
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Steven Haddox
@@ -30,7 +30,7 @@ cert_chain:
   42qdwEXvvkODZAD6KAIXPdmbMfBgPbcd+B/4eUA0PyKo+4dgL1NuqX4MPWToevIZ
   O8EKLF2X7NmC6FY1bOsSj/J8r1SOkx0rxgF+geRvY1P+hfNjDfxTsjU=
   -----END CERTIFICATE-----
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -274,44 +274,44 @@ dependencies:
   name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.43'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.43'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: logging
   requirement: !ruby/object:Gem::Requirement
@@ -330,16 +330,16 @@ dependencies:
   name: multi_xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
@@ -407,7 +407,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: DN Interoperable Conversion Expert Strategy