Delegate checking auth args to the authenticator

Each authenticator has different parameters, so argument validation must be delegated to the authenticator classes.
ruby · Oct 14, 2023 · cf5dca1 · cf5dca1
1 parent f044f30
commit cf5dca1
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 19 deletions.
diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb
@@ -633,10 +633,7 @@ def tcp_socket(address, port)
 
     def do_start(helo_domain, user, secret, authtype)
       raise IOError, 'SMTP session already started' if @started
-      if user or secret
-        check_auth_method(authtype || DEFAULT_AUTH_TYPE)
-        check_auth_args user, secret
-      end
+      check_auth_args authtype, user, secret
       s = Timeout.timeout(@open_timeout, Net::OpenTimeout) do
         tcp_socket(@address, @port)
       end
@@ -832,27 +829,18 @@ def open_message_stream(from_addr, *to_addrs, &block)   # :yield: stream
     DEFAULT_AUTH_TYPE = :plain
 
     def authenticate(user, secret, authtype = DEFAULT_AUTH_TYPE)
-      check_auth_method authtype
-      check_auth_args user, secret
+      check_auth_args authtype, user, secret
       authenticator = Authenticator.auth_class(authtype).new(self)
       authenticator.auth(user, secret)
     end
 
     private
 
-    def check_auth_method(type)
-      unless Authenticator.auth_class(type)
-        raise ArgumentError, "wrong authentication type #{type}"
-      end
-    end
-
-    def check_auth_args(user, secret, authtype = DEFAULT_AUTH_TYPE)
-      unless user
-        raise ArgumentError, 'SMTP-AUTH requested but missing user name'
-      end
-      unless secret
-        raise ArgumentError, 'SMTP-AUTH requested but missing secret phrase'
-      end
+    def check_auth_args(type, *args, **kwargs)
+      return unless type || args.any? || kwargs.any?
+      Authenticator.check_auth_type_args(
+        type || DEFAULT_AUTH_TYPE, *args, **kwargs
+      )
     end
 
     #

diff --git a/lib/net/smtp/authenticator.rb b/lib/net/smtp/authenticator.rb
@@ -13,6 +13,25 @@ def self.auth_class(type)
         Authenticator.auth_classes[type.intern]
       end
 
+      def self.check_auth_type_args(authtype, user, secret, type: nil, **auth)
+        return unless user || secret || auth.any? || authtype || type
+        klass = auth_class(type || authtype || DEFAULT_AUTH_TYPE) or
+          raise ArgumentError, "wrong authentication type #{type}"
+        klass.check_args(user, secret, **auth)
+      end
+
+      def self.check_args(user_arg = nil, secret_arg = nil,
+                          authcid: nil, username: nil, user: nil,
+                          secret: nil, password: nil,
+                          **)
+        unless authcid || username || user || user_arg
+          raise ArgumentError, 'SMTP-AUTH requested but missing user name'
+        end
+        unless password || secret || secret_arg
+          raise ArgumentError, 'SMTP-AUTH requested but missing secret phrase'
+        end
+      end
+
       attr_reader :smtp
 
       def initialize(smtp)