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.

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

Change sensitive configs type to Password. #35

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 3.2.1
- Changes sensitive configs type to Password for better protection from leaks in debug logs. [#35](https://github.com/logstash-plugins/logstash-input-salesforce/pull/35)

## 3.2.0
- Added `use_tooling_api` configuration to connect to the Salesforce Tooling API instead of the regular Rest API. [#26](https://github.com/logstash-plugins/logstash-input-salesforce/pull/26)

Expand Down
12 changes: 6 additions & 6 deletions docs/index.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ This plugin supports the following configuration options plus the <<plugins-{typ
|Setting |Input type|Required
| <<plugins-{type}s-{plugin}-api_version>> |<<string,string>>|No
| <<plugins-{type}s-{plugin}-client_id>> |<<string,string>>|Yes
| <<plugins-{type}s-{plugin}-client_secret>> |<<string,string>>|Yes
| <<plugins-{type}s-{plugin}-password>> |<<string,string>>|Yes
| <<plugins-{type}s-{plugin}-security_token>> |<<string,string>>|Yes
| <<plugins-{type}s-{plugin}-client_secret>> |<<password,password>>|Yes
| <<plugins-{type}s-{plugin}-password>> |<<password,password>>|Yes
| <<plugins-{type}s-{plugin}-security_token>> |<<password,password>>|Yes
| <<plugins-{type}s-{plugin}-sfdc_fields>> |<<array,array>>|No
| <<plugins-{type}s-{plugin}-sfdc_filters>> |<<string,string>>|No
| <<plugins-{type}s-{plugin}-sfdc_instance_url>> |<<string,string>>|No
Expand Down Expand Up @@ -119,7 +119,7 @@ https://help.salesforce.com/apex/HTViewHelpDoc?id=connected_app_create.htm
===== `client_secret`

* This is a required setting.
* Value type is <<string,string>>
* Value type is <<password,password>>
* There is no default value for this setting.

Consumer Secret from your oauth enabled connected app
Expand All @@ -128,7 +128,7 @@ Consumer Secret from your oauth enabled connected app
===== `password`

* This is a required setting.
* Value type is <<string,string>>
* Value type is <<password,password>>
* There is no default value for this setting.

The password used to login to sfdc
Expand All @@ -137,7 +137,7 @@ The password used to login to sfdc
===== `security_token`

* This is a required setting.
* Value type is <<string,string>>
* Value type is <<password,password>>
* There is no default value for this setting.

The security token for this account. For more information about
Expand Down
12 changes: 6 additions & 6 deletions lib/logstash/inputs/salesforce.rb
Original file line number Diff line number Diff line change
Expand Up @@ -72,17 +72,17 @@ class LogStash::Inputs::Salesforce < LogStash::Inputs::Base
# https://help.salesforce.com/apex/HTViewHelpDoc?id=connected_app_create.htm
config :client_id, :validate => :string, :required => true
# Consumer Secret from your oauth enabled connected app
config :client_secret, :validate => :string, :required => true
config :client_secret, :validate => :password, :required => true
# A valid salesforce user name, usually your email address.
# Used for authentication and will be the user all objects
# are created or modified by
config :username, :validate => :string, :required => true
# The password used to login to sfdc
config :password, :validate => :string, :required => true
config :password, :validate => :password, :required => true
# The security token for this account. For more information about
# generting a security token, see:
# https://help.salesforce.com/apex/HTViewHelpDoc?id=user_security_token.htm
config :security_token, :validate => :string, :required => true
config :security_token, :validate => :password, :required => true
# The name of the salesforce object you are creating or updating
config :sfdc_object_name, :validate => :string, :required => true
# These are the field names to return in the Salesforce query
Expand Down Expand Up @@ -141,10 +141,10 @@ def client
def client_options
options = {
:username => @username,
:password => @password,
:security_token => @security_token,
:password => @password.value,
:security_token => @security_token.value,
:client_id => @client_id,
:client_secret => @client_secret
:client_secret => @client_secret.value
}
# configure the endpoint to which restforce connects to for authentication
if @sfdc_instance_url && @use_test_sandbox
Expand Down
2 changes: 1 addition & 1 deletion logstash-input-salesforce.gemspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Gem::Specification.new do |s|
s.name = 'logstash-input-salesforce'
s.version = '3.2.0'
s.version = '3.2.1'
s.licenses = ['Apache License (2.0)']
s.summary = "Creates events based on a Salesforce SOQL query"
s.description = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
Expand Down
42 changes: 21 additions & 21 deletions spec/inputs/salesforce_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
let(:options) do
{
"client_id" => "",
"client_secret" => "",
"client_secret" => ::LogStash::Util::Password.new("secret-key"),
"username" => "",
"password" => "",
"security_token" => "",
"password" => ::LogStash::Util::Password.new("secret-password"),
"security_token" => ::LogStash::Util::Password.new("secret-token"),
"sfdc_object_name" => ""
}
end
Expand All @@ -35,10 +35,10 @@
let(:options) do
{
"client_id" => "",
"client_secret" => "",
"client_secret" => ::LogStash::Util::Password.new("secret-key"),
"username" => "",
"password" => "",
"security_token" => "",
"password" => ::LogStash::Util::Password.new("secret-password"),
"security_token" => ::LogStash::Util::Password.new("secret-token"),
"sfdc_object_name" => "Lead",
"sfdc_fields" => ["Something"]
}
Expand Down Expand Up @@ -67,10 +67,10 @@
let(:options) do
{
"client_id" => "",
"client_secret" => "",
"client_secret" => ::LogStash::Util::Password.new("secret-key"),
"username" => "",
"password" => "",
"security_token" => "",
"password" => ::LogStash::Util::Password.new("secret-password"),
"security_token" => ::LogStash::Util::Password.new("secret-token"),
"sfdc_object_name" => "Lead"
}
end
Expand All @@ -94,10 +94,10 @@
let(:options) do
{
"client_id" => "",
"client_secret" => "",
"client_secret" => ::LogStash::Util::Password.new("secret-key"),
"username" => "",
"password" => "",
"security_token" => "",
"password" => ::LogStash::Util::Password.new("secret-password"),
"security_token" => ::LogStash::Util::Password.new("secret-token"),
"sfdc_object_name" => "Lead",
"sfdc_fields" => ["Id", "IsDeleted", "LastName", "FirstName", "Salutation"],
"sfdc_filters" => "Email LIKE '%@elastic.co'"
Expand Down Expand Up @@ -137,10 +137,10 @@
let(:options) do
{
"client_id" => "",
"client_secret" => "",
"client_secret" => ::LogStash::Util::Password.new("secret-key"),
"username" => "",
"password" => "",
"security_token" => "",
"password" => ::LogStash::Util::Password.new("secret-password"),
"security_token" => ::LogStash::Util::Password.new("secret-token"),
"sfdc_instance_url" => "my-domain.my.salesforce.com",
"sfdc_object_name" => "Lead"
}
Expand All @@ -165,10 +165,10 @@
let(:options) do
{
"client_id" => "",
"client_secret" => "",
"client_secret" => ::LogStash::Util::Password.new("secret-key"),
"username" => "",
"password" => "",
"security_token" => "",
"password" => ::LogStash::Util::Password.new("secret-password"),
"security_token" => ::LogStash::Util::Password.new("secret-token"),
"sfdc_instance_url" => "my-domain.my.salesforce.com",
"sfdc_object_name" => "Lead",
"use_test_sandbox" => true
Expand Down Expand Up @@ -200,10 +200,10 @@
{
"api_version" => "52.0",
"client_id" => "",
"client_secret" => "",
"client_secret" => ::LogStash::Util::Password.new("secret-key"),
"username" => "",
"password" => "",
"security_token" => "",
"password" => ::LogStash::Util::Password.new("secret-password"),
"security_token" => ::LogStash::Util::Password.new("secret-token"),
"use_tooling_api" => true,
"sfdc_object_name" => "ApexTestRunResult"
}
Expand Down