Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mark secret parameters of forward plugins as secret #1209

Merged
merged 2 commits into from
Sep 7, 2016
Merged

Mark secret parameters of forward plugins as secret #1209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af15e22
add :secret option to show the list of optiosn for config_param
tagomoris Sep 6, 2016
2e3d3bf
add :secret option to protect secret values
tagomoris Sep 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/fluent/config/configure_proxy.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ def parameter_configuration(name, type = nil, **kwargs, &block)

option_value_type!(name, opts, :desc, String)
option_value_type!(name, opts, :alias, Symbol)
option_value_type!(name, opts, :secret, Object) # TrueClass or FalseClass...
option_value_type!(name, opts, :deprecated, String)
option_value_type!(name, opts, :obsoleted, String)
if type == :enum
Expand Down
6 changes: 3 additions & 3 deletions lib/fluent/plugin/in_forward.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def initialize
desc 'The hostname'
config_param :self_hostname, :string
desc 'Shared key for authentication'
config_param :shared_key, :string
config_param :shared_key, :string, secret: true
desc 'If true, use user based authentication'
config_param :user_auth, :bool, default: false
desc 'Allow anonymous source. <client> sections required if disabled.'
Expand All @@ -69,7 +69,7 @@ def initialize
desc 'The username for authentication'
config_param :username, :string
desc 'The password for authentication'
config_param :password, :string
config_param :password, :string, secret: true
end

### Client ip/network authentication & per_host shared key
Expand All @@ -79,7 +79,7 @@ def initialize
desc 'Network address specification'
config_param :network, :string, default: nil
desc 'Shared key per client'
config_param :shared_key, :string, default: nil
config_param :shared_key, :string, default: nil, secret: true
desc 'Array of username.'
config_param :users, :array, default: []
end
Expand Down