Skip to content

Trim whitespace from certain DSN fields #189

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

Merged
merged 1 commit into from
Nov 14, 2019
Merged

Trim whitespace from certain DSN fields #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 2 deletions driver/connect.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -949,8 +949,7 @@ static BOOL decode_cloud_id(esodbc_dbc_st *dbc, esodbc_dsn_attrs_st *attrs)
if (Curl_base64_decode(buff, &dec, &len) != CURLE_OK) {
ERRH(dbc, "failed to decode B64 part of Cloud ID: [%zu] `" LWPDL "`.",
attrs->cloud_id.cnt, LWSTR(&attrs->cloud_id));
SET_HDIAG(dbc, SQL_STATE_HY000, "Invalid Base64 encoding in Cloud ID "
"parameter", 0);
SET_HDIAG(dbc, SQL_STATE_HY000, "Invalid Cloud ID parameter", 0);
return FALSE;
}
DBGH(dbc, "Cloud ID decoded to: [%zu] `" LCPDL "`.", len, len, dec);
Expand Down
9 changes: 6 additions & 3 deletions dsneditor/EsOdbcDsnEditor/DSNEditorForm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,10 +258,13 @@ private bool RebuildAndValidateDsn()
// Basic Panel
Builder["dsn"] = textName.Text;
Builder["description"] = textDescription.Text;
Builder["uid"] = textUsername.Text;
// https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-put-user.html#security-api-put-user-path-params :
// "Leading or trailing whitespace is not allowed." -> it is more likely that a user will insert a
// (trailing) white space by mistake than intentionally trying to set it.
Builder["uid"] = textUsername.Text.Trim();
Builder["pwd"] = textPassword.Text;
Builder["cloudid"] = "{" + textCloudID.Text.StripBraces() + "}";
Builder["server"] = textHostname.Text;
Builder["cloudid"] = "{" + textCloudID.Text.StripBraces().Trim() + "}";
Builder["server"] = textHostname.Text.Trim();
Builder["port"] = numericUpDownPort.Text;

// Security Panel
Expand Down