73 Commits (7d8cb6869a2d3cb2bf3dd54dac2b59e60babc975)

Author	SHA1	Message	Date
Carl Bergquist	15a6508d4a	trace user login and datasource name instead of id (#29183) ... id's are not very helpful when debugging a system. Signed-off-by: bergquist <carl.bergquist@gmail.com>	5 years ago
Arve Knudsen	e503188b6f	Data source proxy: Convert 401 from data source to 400 (#28962) ... * Data source proxy: Convert 401 from data source to 400 Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	5 years ago
Arve Knudsen	3d3a7cbba8	Chore: Fix staticcheck issues (#28860) ... * Chore: Fix issues reported by staticcheck Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Undo changes Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Chore: Fix issues reported by staticcheck Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix test Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix test Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	5 years ago
Bill Oley	b3a868169b	OAuth: Support Forward OAuth Identity for backend data source plugins (#27055) ... Adds support for the Forward OAuth Identity feature in backend data source plugins. Earlier this feature has only been supported for non-backend data source plugins. Fixes #26023 Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>	5 years ago
Bill Oley	19caa100dc	OAuth: Fix token refresh failure when custom SSL settings are configured for OAuth provider (#27523) ... OAuth token refresh fails when custom SSL settings are configured for oauth provider. These changes makes sure that custom SSL settings are applied for HTTP client before refreshing token. Fixes #27514	5 years ago
Sean Lafferty	900eb8070e	Proxy: Fix updating refresh token in OAuth pass-thru (#26885) ... * Handle updating refresh token in oauth pass-thru Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>	5 years ago
Arve Knudsen	d4e4cb4c71	Chore: Enable Go linter gocritic (#26224) ... * Chore: Enable gocritic linter Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	5 years ago
Arve Knudsen	d352c213b3	API: Recognize MSSQL data source URLs (#25629) ... * API: Recognize MSSQL URLs Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Move MSSQL URL validation into mssql package Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	5 years ago
Robbert Gurdeep Singh	034abaa73a	Security: Use Header.Set and Header.Del for X-Grafana-User header (#25495) ... This ensures that the X-Grafana-User header can be trusted. If the configuration enabled the setting of this header, the server can now trust that X-Grafana-User is set/unset by Grafana. Before this, an anonymous user could simply set the X-Grafana-User header themselves (using the developer tool for example)	5 years ago
Arve Knudsen	164242f5fd	Data sources: Don't fail if URL doesn't specify protocol (#24497)	5 years ago
Daniel Lee	52154b465b	dsproxy: adds support for url params for plugin routes (#23503) ... * dsproxy: adds support for url params for plugin routes * docs: fixes after review * pluginproxy: rename Params to URLParams * Update pkg/plugins/app_plugin.go Co-Authored-By: Arve Knudsen <arve.knudsen@gmail.com> * Apply suggestions from code review Co-Authored-By: Diana Payton <52059945+oddlittlebird@users.noreply.github.com> Co-Authored-By: Arve Knudsen <arve.knudsen@gmail.com> * pluginproxy: rename struct Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>	5 years ago
Arve Knudsen	7d88018531	DataSourceProxy: Handle URL parsing error (#23731) ... * pluginproxy: Handle URL parsing error * pkg/api: Validate data source URLs * pkg/api: Return 400 for URL validation error	5 years ago
John McBride	b017e437d8	Fix typo in oauth error (#23270) ... fixes: #23269	5 years ago
Carl Bergquist	3fdd2648b1	Chore: Avoid aliasing importing models in api package (#22492)	5 years ago
Marcus Efraimsson	e6cec8dbdc	Backend plugins: Prepare and clean request headers before resource calls (#22321) ... Moves common request proxy utilities to proxyutil package with support for removing X-Forwarded-Host, X-Forwarded-Port, X-Forwarded-Proto headers, setting X-Forwarded-For header and cleaning Cookie header. Using the proxyutil package to prepare and clean request headers before resource calls. Closes #21512	5 years ago
Carl Bergquist	ff9556229a	Data proxy: Log proxy errors using Grafana logger (#22174) ... Now any errors logged by http.ReverseProxy are forwarded to Grafana's logger and includes more contextual information like level (error), user id, org id, username, proxy path, referer and IP address. Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>	5 years ago
Anthony Woods	f56f54b1a3	Auth: Rotate auth tokens at the end of requests (#21347) ... By rotating the auth tokens at the end of the request we ensure that there is minimum delay between a new token being generated and the client receiving it. Adds auth token slow load test which uses random latency for all tsdb queries.. Cleans up datasource proxy response handling. DefaultHandler in middleware tests should write a response, the responseWriter BeforeFuncs wont get executed unless a response is written. Fixes #18644 Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>	5 years ago
Marcus Efraimsson	dfa2f3d2fb	Chore: Log actual error when oauth pass thru fails (#20419) ... Logs the actual error when failing to retreive access token when OAuth pass true is enabled for a datasource. Ref: #20407	6 years ago
Weeco	8cd93f0b88	Datasource: Add custom headers on alerting queries (#19508) ... * Add custom headers on alerting queries Reference issue #15381 Signed-off-by: Martin Schneppenheim <martin.schneppenheim@rewe-digital.com> * Fix datasource transport tests * Migrate decrypting header test to models pkg * Check correct header * Add HTTP transport test Fixes #15381	6 years ago
Arve Knudsen	0a2d5e16dd	pkg/api: Check errors (#19657) ... * pkg/api: Check errors * pkg/api: Remove unused function HashEmail	6 years ago
Maxim Ivanov	151fe240fc	OAuth: Fix for wrong user token updated on OAuth refresh in DS proxy (#17541)	6 years ago
zhulongcheng	2fff8f77dc	move log package to /infra (#17023) ... ref #14679 Signed-off-by: zhulongcheng <zhulongcheng.me@gmail.com>	6 years ago
Marcus Efraimsson	e210725d3d	DataProxy: Restore Set-Cookie header after proxy request (#16838) ... If Grafana rotates the user's auth token during a request to the data source proxy it will set the Set-Cookie header with new auth token in response before proxying the request to the datasource. Before this fix the Set-Cookie response header was cleared after the proxied request was finished to make sure that proxied datasources cannot affect cookies in users browsers. This had the consequence of accidentally also clearing the new auth token set in Set-Cookie header. With this fix the original Set-Cookie value in response header is now restored after the proxied datasource request is finished. The existing logic of clearing Set-Cookie response header from proxied request have been left intact. Fixes #16757	6 years ago
Andrej Ocenas	66f6e16916	Security: Store datasource passwords encrypted in secureJsonData (#16175) ... * Store passwords in secureJsonData * Revert unnecessary refactors * Fix for nil jsonSecureData value * Remove copied encryption code from migration * Fix wrong field reference * Remove migration and provisioning changes * Use password getters in datasource proxy * Refactor password handling in datasource configs * Add provisioning warnings * Update documentation * Remove migration command, moved to separate PR * Remove unused code * Set the upgrade version * Remove unused code * Remove double reference	6 years ago
Sean Lafferty	b696492891	Rename dispatched commands to make them easy to grok	6 years ago
Andrej Ocenas	697a87b7b2	Add check so that header is not sent for anonymous users	6 years ago
Andrej Ocenas	bbdc1c0e64	Add custom header with grafana user and a config switch for it	6 years ago
Sean Lafferty	8d8119aa98	Change import path for social since it has moved	6 years ago
Sean Lafferty	7e62394d01	Add function in ds_proxy to handle oauthPassThru headers	6 years ago
Sean Lafferty	3b15e110a5	Get most recent oauth token from db, rather than lookup by auth_module	6 years ago
Marcus Efraimsson	a1cd550df4	revert ds_proxy timeout and implement dataproxy timeout correctly	6 years ago
Sean Lafferty	5a59cdf0ef	Add oauth pass-thru option for datasources	6 years ago
Mario Trangoni	8261613b51	pkg/util/{ip.go,url.go}: Fix some golint issues ... See, $ gometalinter --vendor --deadline 10m --disable-all --enable=golint ./... ip.go:8:6⚠️ func SplitIpPort should be SplitIPPort (golint) url.go:14:6⚠️ func NewUrlQueryReader should be NewURLQueryReader (golint) url.go:9:6⚠️ type UrlQueryReader should be URLQueryReader (golint) url.go:37:6⚠️ func JoinUrlFragments should be JoinURLFragments (golint)	6 years ago
Benjamin Reed	9108fd1b9d	add global datasource proxy timeout setting ... closes grafana#5699	6 years ago
Julien Pivotto	62417ca69f	Remove Origin and Referer headers while proxying requests ... Fix #13949 Fix #13328 Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	7 years ago
Erik Sundell	56e8e50497	Stackdriver: Use ds_auth_provider in stackdriver. This will make sure the token is renewed when it has exporired	7 years ago
Erik Sundell	6a610558c4	Stackdriver: Start breaking out apply route to its own file	7 years ago
Erik Sundell	23339e4322	Stackdriver: Use new access token API	7 years ago
Daniel Lee	e7648c4070	dsproxy: implements support for plugin routes with jwt file ... Google Cloud service accounts use a JWT token to get an oauth access token. This adds support for that.	7 years ago
Erik Sundell	a4ef4792bc	Stackdriver: Add scope for google resource manager	7 years ago
Erik Sundell	350bcf4f56	Fixed broken if statement	7 years ago
Erik Sundell	7197a4c17f	Adds jwt token signing google auth	7 years ago
Erik Sundell	ef3beb1f0e	Adds poc code for retrieving google auth accesstoken	7 years ago
Daniel Lee	c75e071213	dsproxy: interpolate route url ... Allows for dynamic urls for plugin routes. There are a few plugins where the route url should be configurable and this change allows using jsonData fields in the url field for a route in the plugin.json file for a plugin.	7 years ago
Marcus Efraimsson	13921902b5	Set User-Agent header in all proxied datasource requests ... Header value will be Grafana/%version%, i.e. Grafana/5.3.0	7 years ago
Torkel Ödegaard	2459b177f9	change: Set User-Agent to Grafana/%Version% Proxied-DS-Request %DS-Type% in all proxied ds requests	7 years ago
mrsiano	cc1e3a0e3c	Pass configured/auth headers to a Datasource. ... In some setups (ex openshift), the Datasource will require Grafana to pass oauth token as header when sending queries. Also, this PR allow to send any header which is something Grafana currently does not support.	7 years ago
Daniel Lee	10d30f0b73	dsproxy: move http client variable back ... After refactoring to be able to mock the client in a test, the client wasn't a global variable anymore. This change moves the client back to being a package- level variable.	7 years ago
Daniel Lee	719ebdc24d	dsproxy: allow multiple access tokens per datasource ... Changes the cache key for tokens to cache on datasource id + route path + http method instead of just datasource id.	7 years ago
Julian Kornberger	0a415c50d0	Make golint happier	7 years ago