Skip to content

Commit 85862c6

Browse files
author
darby.han
committed
Add missing sasl.login.callback.handler.class" config (#180)
1 parent 6d45a94 commit 85862c6

File tree

5 files changed

+21
-0
lines changed

5 files changed

+21
-0
lines changed

docs/input-kafka.asciidoc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ See the https://kafka.apache.org/{kafka_client_doc}/documentation for more detai
133133
| <<plugins-{type}s-{plugin}-sasl_client_callback_handler_class>> |<<string,string>>|No
134134
| <<plugins-{type}s-{plugin}-sasl_oauthbearer_token_endpoint_url>> |<<string,string>>|No
135135
| <<plugins-{type}s-{plugin}-sasl_oauthbearer_scope_claim_name>> |<<string,string>>|No
136+
| <<plugins-{type}s-{plugin}-sasl_login_callback_handler_class>> |<<string,string>>|No
136137
| <<plugins-{type}s-{plugin}-sasl_login_connect_timeout_ms>> |<<number,number>>|No
137138
| <<plugins-{type}s-{plugin}-sasl_login_read_timeout_ms>> |<<number,number>>|No
138139
| <<plugins-{type}s-{plugin}-sasl_login_retry_backoff_ms>> |<<number,number>>|No
@@ -583,6 +584,13 @@ The URL for the OAuth 2.0 issuer token endpoint.
583584

584585
(optional) The override name of the scope claim.
585586

587+
[id="plugins-{type}s-{plugin}-sasl_login_callback_handler_class"]
588+
===== `sasl_login_callback_handler_class`
589+
* Value type is <<string,string>>
590+
* There is no default value for this setting.
591+
592+
The SASL login callback handler class the specified SASL mechanism should use.
593+
586594
[id="plugins-{type}s-{plugin}-sasl_login_connect_timeout_ms"]
587595
===== `sasl_login_connect_timeout_ms`
588596
* Value type is <<number,number>>

docs/output-kafka.asciidoc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ See the https://kafka.apache.org/{kafka_client_doc}/documentation for more detai
104104
| <<plugins-{type}s-{plugin}-sasl_client_callback_handler_class>> |<<string,string>>|No
105105
| <<plugins-{type}s-{plugin}-sasl_oauthbearer_token_endpoint_url>> |<<string,string>>|No
106106
| <<plugins-{type}s-{plugin}-sasl_oauthbearer_scope_claim_name>> |<<string,string>>|No
107+
| <<plugins-{type}s-{plugin}-sasl_login_callback_handler_class>> |<<string,string>>|No
107108
| <<plugins-{type}s-{plugin}-sasl_login_connect_timeout_ms>> |<<number,number>>|No
108109
| <<plugins-{type}s-{plugin}-sasl_login_read_timeout_ms>> |<<number,number>>|No
109110
| <<plugins-{type}s-{plugin}-sasl_login_retry_backoff_ms>> |<<number,number>>|No
@@ -419,6 +420,13 @@ The URL for the OAuth 2.0 issuer token endpoint.
419420

420421
(optional) The override name of the scope claim.
421422

423+
[id="plugins-{type}s-{plugin}-sasl_login_callback_handler_class"]
424+
===== `sasl_login_callback_handler_class`
425+
* Value type is <<string,string>>
426+
* There is no default value for this setting.
427+
428+
The SASL login callback handler class the specified SASL mechanism should use.
429+
422430
[id="plugins-{type}s-{plugin}-sasl_login_connect_timeout_ms"]
423431
===== `sasl_login_connect_timeout_ms`
424432
* Value type is <<number,number>>

lib/logstash/inputs/kafka.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,8 @@ class LogStash::Inputs::Kafka < LogStash::Inputs::Base
214214
config :sasl_oauthbearer_token_endpoint_url, :validate => :string
215215
# (optional) The override name of the scope claim.
216216
config :sasl_oauthbearer_scope_claim_name, :validate => :string, :default => 'scope'
217+
# SASL login callback handler class
218+
config :sasl_login_callback_handler_class, :validate => :string
217219
# (optional) The duration, in milliseconds, for HTTPS connect timeout
218220
config :sasl_login_connect_timeout_ms, :validate => :number, :default => 10000
219221
# (optional) The duration, in milliseconds, for HTTPS read timeout.

lib/logstash/outputs/kafka.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,8 @@ class LogStash::Outputs::Kafka < LogStash::Outputs::Base
153153
config :sasl_oauthbearer_token_endpoint_url, :validate => :string
154154
# (optional) The override name of the scope claim.
155155
config :sasl_oauthbearer_scope_claim_name, :validate => :string, :default => 'scope'
156+
# SASL login callback handler class
157+
config :sasl_login_callback_handler_class, :validate => :string
156158
# (optional) The duration, in milliseconds, for HTTPS connect timeout
157159
config :sasl_login_connect_timeout_ms, :validate => :number, :default => 10000
158160
# (optional) The duration, in milliseconds, for HTTPS read timeout.

lib/logstash/plugin_mixins/kafka/common.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ def set_sasl_config(props)
4444
props.put("sasl.client.callback.handler.class", sasl_client_callback_handler_class) unless sasl_client_callback_handler_class.nil?
4545
props.put("sasl.oauthbearer.token.endpoint.url", sasl_oauthbearer_token_endpoint_url) unless sasl_oauthbearer_token_endpoint_url.nil?
4646
props.put("sasl.oauthbearer.scope.claim.name", sasl_oauthbearer_scope_claim_name) unless sasl_oauthbearer_scope_claim_name.nil?
47+
props.put("sasl.login.callback.handler.class", sasl_login_callback_handler_class) unless sasl_login_callback_handler_class.nil?
4748
props.put("sasl.login.connect.timeout.ms", sasl_login_connect_timeout_ms.to_s) unless sasl_login_connect_timeout_ms.nil?
4849
props.put("sasl.login.read.timeout.ms", sasl_login_read_timeout_ms.to_s) unless sasl_login_read_timeout_ms.nil?
4950
props.put("sasl.login.retry.backoff.ms", sasl_login_retry_backoff_ms.to_s) unless sasl_login_retry_backoff_ms.nil?

0 commit comments

Comments
 (0)