Revert "Moved Ruby Password setting to Java implementation (#18183)" (#18199)

This reverts commit 6aa265d.

Author: donoghuc

logstash-core/lib/logstash/environment.rb

@@ -75,7 +75,7 @@ def self.as_java_range(r)
             Setting::StringSetting.new("api.environment", "production"),
             Setting::StringSetting.new("api.auth.type", "none", true, %w(none basic)),
             Setting::StringSetting.new("api.auth.basic.username", nil, false).nullable,
-          Setting::PasswordSetting.new("api.auth.basic.password", nil, false).nullable,
+          Setting::Password.new("api.auth.basic.password", nil, false).nullable,
             Setting::StringSetting.new("api.auth.basic.password_policy.mode", "WARN", true, %w[WARN ERROR]),
            Setting::NumericSetting.new("api.auth.basic.password_policy.length.minimum", 8),
             Setting::StringSetting.new("api.auth.basic.password_policy.include.upper", "REQUIRED", true, %w[REQUIRED OPTIONAL]),
@@ -84,7 +84,7 @@ def self.as_java_range(r)
             Setting::StringSetting.new("api.auth.basic.password_policy.include.symbol", "OPTIONAL", true, %w[REQUIRED OPTIONAL]),
            Setting::BooleanSetting.new("api.ssl.enabled", false),
   Setting::ExistingFilePath.new("api.ssl.keystore.path", nil, false).nullable,
-          Setting::PasswordSetting.new("api.ssl.keystore.password", nil, false).nullable,
+          Setting::Password.new("api.ssl.keystore.password", nil, false).nullable,
        Setting::StringArray.new("api.ssl.supported_protocols", nil, true, %w[TLSv1 TLSv1.1 TLSv1.2 TLSv1.3]),
             Setting::StringSetting.new("queue.type", "memory", true, ["persisted", "memory"]),
            Setting::BooleanSetting.new("queue.drain", false),

logstash-core/lib/logstash/settings.rb

@@ -437,9 +437,27 @@ def validate(value)
 
     java_import org.logstash.settings.NullableStringSetting
 
-    java_import org.logstash.settings.PasswordSetting
+    class Password < Coercible
+      def initialize(name, default = nil, strict = true)
+        super(name, LogStash::Util::Password, default, strict)
+      end
+
+      def coerce(value)
+        return value if value.kind_of?(LogStash::Util::Password)
+
+        if value && !value.kind_of?(::String)
+          raise(ArgumentError, "Setting `#{name}` could not coerce non-string value to password")
+        end
+
+        LogStash::Util::Password.new(value)
+      end
+
+      def validate(value)
+        super(value)
+      end
+    end
 
-    class ValidatedPassword < Setting::PasswordSetting
+    class ValidatedPassword < Setting::Password
       def initialize(name, value, password_policies)
         @password_policies = password_policies
         super(name, value, true)

logstash-core/spec/logstash/settings/password_spec.rb

@@ -18,7 +18,7 @@
 require "spec_helper"
 require "logstash/settings"
 
-describe LogStash::Setting::PasswordSetting do
+describe LogStash::Setting::Password do
   let(:setting_name) { "secure" }
   subject(:password_setting) { described_class.new(setting_name, nil, true) }
 
@@ -55,7 +55,7 @@
     context 'with an invalid non-string value' do
       let(:setting_value) { 867_5309 }
       it 'rejects the invalid value' do
-        expect { password_setting.set(setting_value) }.to raise_error(IllegalArgumentException, "Setting `#{setting_name}` could not coerce non-string value to password")
+        expect { password_setting.set(setting_value) }.to raise_error(ArgumentError, "Setting `#{setting_name}` could not coerce non-string value to password")
         expect(password_setting).to_not be_set
       end
     end