Merge pull request #121 from mmussomele/allow-auth-mech

Allow the authentication mechanism to be specified in configuration

Author: repeatedly

lib/fluent/plugin/mongo_auth.rb

@@ -8,23 +8,25 @@ def self.included(klass)
         config_param :password, :string, default: nil, secret: true
         desc "MongoDB authentication database"
         config_param :auth_source, :string, default: nil
+        desc "MongoDB authentication mechanism"
+        config_param :auth_mech, :string, default: nil
       }
     end
   end
 
   module MongoAuth
     def authenticate(client)
-      unless @user.nil? || @password.nil?
-        begin
-          if @auth_source.nil?
-            client = client.with(user: @user, password: @password)
-          else
-            client = client.with(user: @user, password: @password, auth_source: @auth_source)
-          end
-        rescue Mongo::Auth::Unauthorized => e
-          log.fatal e
-          exit!
+      begin
+        if [@user, @password, @auth_source].all?
+          client = client.with(user: @user, password: @password, auth_source: @auth_source)
+        elsif [@user, @password].all?
+          client = client.with(user: @user, password: @password)
+        elsif [@user, @auth_source, @auth_mech].all?
+          client = client.with(user: @user, auth_source: @auth_source, auth_mech: @auth_mech.to_sym)
         end
+      rescue Mongo::Auth::Unauthorized => e
+        log.fatal e
+        exit!
       end
       client
     end

lib/fluent/plugin/out_mongo.rb

@@ -108,6 +108,10 @@ def configure(conf)
 
       super
 
+      if @auth_mech && !Mongo::Auth::SOURCES.has_key?(@auth_mech.to_sym)
+        raise Fluent::ConfigError, Mongo::Auth::InvalidMechanism.new(@auth_mech.to_sym)
+      end
+
       if @connection_string.nil? && @database.nil?
         raise Fluent::ConfigError,  "connection_string or database parameter is required"
       end

test/plugin/test_out_mongo.rb

@@ -92,6 +92,22 @@ def test_configure_without_connection_string_or_database
     end
   end
 
+  def test_configure_auth_mechanism
+    Mongo::Auth::SOURCES.each do |key, value|
+      conf = default_config + %[
+        auth_mech #{key}
+      ]
+      d = create_driver(conf)
+      assert_equal(key.to_s, d.instance.auth_mech)
+    end
+    assert_raise Fluent::ConfigError do
+      conf = default_config + %[
+        auth_mech invalid
+      ]
+      d = create_driver(conf)
+    end
+  end
+
   def test_configure_with_ssl
     conf = default_config + %[
       ssl true