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

better handling for special chars in db config #11662

Merged
merged 1 commit into from
May 7, 2018
Merged

better handling for special chars in db config #11662

merged 1 commit into from
May 7, 2018

Conversation

DanCech
Copy link
Collaborator

@DanCech DanCech commented Apr 19, 2018

This PR ensures that special characters are properly handled when assembling database connection strings.

For Postgres it wraps all values in single quotes and escapes any single quotes in those values, for MySQL it url-encodes the username, password and database name.

@DanCech DanCech self-assigned this Apr 19, 2018
@DanCech DanCech requested a review from torkelo April 19, 2018 21:37
@torkelo torkelo merged commit b4ad044 into master May 7, 2018
@torkelo torkelo added this to the 5.2 milestone May 7, 2018
ryantxu added a commit to ryantxu/grafana that referenced this pull request May 7, 2018
* grafana/master:
  Update ROADMAP.md
  support additional fields in authproxy (grafana#11661)
  better handling for special chars in db config (grafana#11662)
  Fix/improved csv output (grafana#11740)
  Update ROADMAP.md
  Update ROADMAP.md
  Update ROADMAP.md
  Remove preceding `/` from public JS path (grafana#11804)
  Add panel scrolling docs (grafana#11826)
  escape pipe symbol same way as in templating docs
  added left:unset to counter left:0 in recent react-select release
  Add missing items to Gopkg.lock
  pipe escape try grafana#3
  use ascii code for pipe symbol to not mess up markdown table
  try to fix table
ryantxu added a commit to NatelEnergy/grafana that referenced this pull request May 7, 2018
* grafana/master:
  Update ROADMAP.md
  support additional fields in authproxy (grafana#11661)
  better handling for special chars in db config (grafana#11662)
  Fix/improved csv output (grafana#11740)
  Update ROADMAP.md
  Update ROADMAP.md
  Update ROADMAP.md
  Remove preceding `/` from public JS path (grafana#11804)
  Add panel scrolling docs (grafana#11826)
  escape pipe symbol same way as in templating docs
  added left:unset to counter left:0 in recent react-select release
  Add missing items to Gopkg.lock
  pipe escape try #3
  use ascii code for pipe symbol to not mess up markdown table
  try to fix table
ryantxu added a commit to ryantxu/grafana that referenced this pull request May 7, 2018
* grafana/master: (531 commits)
  Update ROADMAP.md
  support additional fields in authproxy (grafana#11661)
  better handling for special chars in db config (grafana#11662)
  Fix/improved csv output (grafana#11740)
  Update ROADMAP.md
  Update ROADMAP.md
  Update ROADMAP.md
  Remove preceding `/` from public JS path (grafana#11804)
  Add panel scrolling docs (grafana#11826)
  escape pipe symbol same way as in templating docs
  changelog: add notes about closing grafana#11616
  added left:unset to counter left:0 in recent react-select release
  fixed text color in light theme
  changelog: add notes about closing grafana#11800
  test if default variable interpolation is effective when no specific format is specified
  changelog: notes about closing grafana#11690
  changelog: add notes for #grafana#11754, grafana#11758, grafana#11710
  scroll: remove firefox scrollbars
  Add missing items to Gopkg.lock
  pipe escape try grafana#3
  ...
@marefr marefr deleted the dbconfig branch May 7, 2018 17:16
ryantxu added a commit to ryantxu/grafana that referenced this pull request May 8, 2018
* grafana/master: (44 commits)
  Revert "Add baron scrollbar to a node managed by gafana (grafana#11850)"
  fixed svg background (grafana#11848)
  Add baron scrollbar to a node managed by gafana (grafana#11850)
  Fix CSS asset loading for yarn start (HMR) (grafana#11855)
  fix: fixed gometalinter issues with Discord PR
  Update CHANGELOG.md
  docs: update installation instructions targeting v5.1.1 stable
  fix root_url in docs & comments (grafana#11819)
  changelog: 5.1.1 update
  fix: loading of css url (images/fonts)
  Support for local Docker builds
  Update ROADMAP.md
  support additional fields in authproxy (grafana#11661)
  better handling for special chars in db config (grafana#11662)
  Fix/improved csv output (grafana#11740)
  Update ROADMAP.md
  Update ROADMAP.md
  Update ROADMAP.md
  Remove preceding `/` from public JS path (grafana#11804)
  Add panel scrolling docs (grafana#11826)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants