Fixes Authenticator list endpoint

Author: jvanderhoof

app/domain/authentication/authenticator_class.rb

@@ -3,6 +3,85 @@
 # Represents a class that implements an authenticator.
 #
 module Authentication
+  module V2
+
+    # This is a re-implementation of the original (below) to handle the
+    # interface changes of the V2 interface.
+    class AuthenticatorClass
+      class Validation
+
+        def initialize(cls)
+          @cls = cls
+        end
+
+        def valid?
+          valid_name? && valid_parent_name?
+        end
+
+        def validate!
+          %w[
+            Strategy
+            ResolveIdentity
+            DataObjects::Authenticator
+            DataObjects::AuthenticatorContract
+          ].each do |klass|
+            full_class_name = "#{@cls}::#{klass}".classify
+            unless class_exists?(full_class_name)
+              raise Errors::Authentication::AuthenticatorClass::V2::MissingAuthenticatorComponents, parent_name, klass
+            end
+          end
+        end
+
+        private
+
+        def class_exists?(class_name)
+          Module.const_get(class_name).is_a?(Class)
+        rescue NameError
+          false
+        end
+
+        def valid_name?
+          own_name == 'V2'
+        end
+
+        def valid_parent_name?
+          parent_name =~ /^Authn/
+        end
+
+        def own_name
+          name_aware.own_name
+        end
+
+        def parent_name
+          name_aware.parent_name
+        end
+
+        def name_aware
+          @name_aware ||= ::Util::NameAwareModule.new(@cls)
+        end
+      end
+
+      attr_reader :authenticator
+
+      def initialize(cls)
+        Validation.new(cls).validate!
+        @cls = cls
+      end
+
+      def requires_env_arg?
+        !@cls.respond_to?(:requires_env_arg?) || @cls.requires_env_arg?
+      end
+
+      def url_name
+        name_aware.parent_name.underscore.dasherize
+      end
+
+      def name_aware
+        @name_aware ||= ::Util::NameAwareModule.new(@cls)
+      end
+
+    end
+  end
   class AuthenticatorClass
 
     # Represents the rules any authenticator class must conform to

app/domain/authentication/installed_authenticators.rb

@@ -35,8 +35,7 @@ def configured_authenticators
 
       def enabled_authenticators
         # Enabling via environment overrides enabling via CLI
-        authenticators = 
-          Rails.application.config.conjur_config.authenticators
+        authenticators = Rails.application.config.conjur_config.authenticators
         authenticators.empty? ? db_enabled_authenticators : authenticators
       end
 
@@ -45,7 +44,7 @@ def enabled_authenticators_str
       end
 
       private
-      
+
       def db_enabled_authenticators
         # Always include 'authn' when enabling authenticators via CLI so that it
         # doesn't get disabled when another authenticator is enabled
@@ -60,19 +59,31 @@ def loaded_authenticators(authentication_module)
       end
 
       def authenticator_instance(cls, env)
-        pass_env = ::Authentication::AuthenticatorClass.new(cls).requires_env_arg?
-        pass_env ? cls.new(env: env) : cls.new
+        unless cls.to_s.split('::').last == 'V2'
+          pass_env = ::Authentication::AuthenticatorClass.new(cls).requires_env_arg?
+          pass_env ? cls.new(env: env) : cls.new
+        end
       end
 
       def url_for(authenticator)
-        ::Authentication::AuthenticatorClass.new(authenticator).url_name
+        if authenticator.to_s.split('::').last == 'V2'
+          ::Authentication::V2::AuthenticatorClass.new(authenticator).url_name
+        else
+          ::Authentication::AuthenticatorClass.new(authenticator).url_name
+        end
       end
 
       def valid?(cls)
-        ::Authentication::AuthenticatorClass::Validation.new(cls).valid?
+        if cls.to_s.split('::').last == 'V2'
+          ::Authentication::V2::AuthenticatorClass::Validation.new(cls).valid?
+        else
+          ::Authentication::AuthenticatorClass::Validation.new(cls).valid?
+        end
       end
 
       def provides_login?(cls)
+        return false if cls.to_s.split('::').last == 'V2'
+
         validation = ::Authentication::AuthenticatorClass::Validation.new(cls)
         validation.valid? && validation.provides_login?
       end

app/domain/errors.rb

@@ -152,6 +152,13 @@ module AuthenticatorClass
         code: "CONJ00040E"
       )
 
+      module V2
+        MissingAuthenticatorComponents = ::Util::TrackableErrorClass.new(
+          msg: "'{0-authenticator-parent-name}' is not a valid authenticator "\
+            "because it does not include the class '{1-class-name}'",
+          code: "CONJ00155E"
+        )
+      end
     end
 
     module Security