grafana

Commit Graph

Author	SHA1	Message	Date
Marcus Efraimsson	6f8fcae01b	[main] Plugin fixes (#57399 ) * Plugins: Remove support for V1 manifests * Plugins: Make proxy endpoints not leak sensitive HTTP headers * Security: Fix do not forward login cookie in outgoing requests (cherry picked from commit `4539c33fce`) Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>	3 years ago
Kristin Laemmert	05709ce411	chore: remove sqlstore & mockstore dependencies from (most) packages (#57087 ) * chore: add alias for InitTestDB and Session Adds an alias for the sqlstore InitTestDB and Session, and updates tests using these to reduce dependencies on the sqlstore.Store. * next pass of removing sqlstore imports * last little bit * remove mockstore where possible	3 years ago
Misi	9c954d06ab	Auth: Refresh OAuth access_token automatically using the refresh_token (#56076 ) * Verify OAuth token expiration for oauth users in the ctx handler middleware * Use refresh token to get a new access token * Refactor oauth_token.go * Add tests for the middleware changes * Align other tests * Add tests, wip * Add more tests * Add InvalidateOAuthTokens method * Fix ExpiryDate update to default * Invalidate OAuth tokens during logout * Improve logout * Add more comments * Cleanup * Fix import order * Add error to HasOAuthEntry return values * add dev debug logs * Fix tests Co-authored-by: jguer <joao.guerreiro@grafana.com>	3 years ago
Kat Yang	7715672fb3	Chore: use org service methods (#55768 ) * Chore: use org service methods * fix tests * fix errors * adjust func signatures for getbyname * 💩 * Use the same fake service to get the user in AC and in HS * Fix middleware test * Fix more middleware test * Fix api tests Co-authored-by: gamab <gabi.mabs@gmail.com> Co-authored-by: Ida Furjesova <ida.furjesova@grafana.com>	3 years ago
Nicholas Wiersma	faf8eb3afb	JWT: Allow conventional bearer token in Authorization header (#54821 ) * fix: allow JWT to accept standard bearer token * fix: linter issues * fix: linter gosec false positive * fix: refactor logic into JWT handler * fix: move bearer trimming earlier	3 years ago
Emil Tullstedt	0ffbf901d7	ContextHandler: Use stdlib format for middleware (#54219 )	3 years ago
Jo	4a9137ac40	API Keys: Add revocation for SATs (#53896 ) * add apikey is_revoked field * add token store tests * Apply suggestions from code review * remove unused fields	3 years ago
Jo	10e6eac632	Auth: Reduce lookup cookie error to warning and invalidate cookie (#53881 ) * Reduce lookup cookie error to warning. Delete invalid cookie to avoid continuous refresh * debug log branch	3 years ago
idafurjes	fa2e74cd6e	Chore: Remove GetSignedInUserWithCacheCtx from store interface (#53734 ) * Remove delete suer from store interface * Remove get signed in user with cache ctx from store interface * Support options when setting up access control tests * Fix broken tests * Fix lint * Add user fake to middleware * Fix middleware tests, remove usertest being initialised twice Co-authored-by: Karl Persson <kalle.persson@grafana.com>	3 years ago
idafurjes	a14621fff6	Chore: Add user service method SetUsingOrg and GetSignedInUserWithCacheCtx (#53343 ) * Chore: Add user service method SetUsingOrg * Chore: Add user service method GetSignedInUserWithCacheCtx * Use method GetSignedInUserWithCacheCtx from user service * Fix lint after rebase * Fix lint * Fix lint error * roll back some changes * Roll back changes in api and middleware * Add xorm tags to SignedInUser ID fields	3 years ago
idafurjes	6afad51761	Move SignedInUser to user service and RoleType and Roles to org (#53445 ) * Move SignedInUser to user service and RoleType and Roles to org * Use go naming convention for roles * Fix some imports and leftovers * Fix ldap debug test * Fix lint * Fix lint 2 * Fix lint 3 * Fix type and not needed conversion * Clean up messages in api tests * Clean up api tests 2	3 years ago
idafurjes	0c5b71694f	Chore: Add user service method UpdateLastSeenAt (#53309 ) * Chore: Add user service method UpdateLastSeenAt * Fix lint	3 years ago
Serge Zaitsev	191ab3bb01	Chore: Move api key models into apikey service package (#53241 ) * Chore: move api key models into apikey service package * force table name for api key	3 years ago
Serge Zaitsev	64488f6b90	Chore: split APIKey store (#52781 ) * move apikey store into a separate service * add apikey service to wire graph * fix linter * switch api to use apikey service * fix provideservice in tests * add apikey service test double * try different sql syntax * rolling back the dialect * trigger drone * trigger drone	3 years ago
idafurjes	d3d8fdd878	Chore: Move user errors to user service (#52460 ) * Move user not found err to user service * User ErrCaseInsensitive from user pkg * User ErrUserAlreadyExists from user pkg * User ErrLastGrafanaAdmin from user pkg * Remove errors from model	3 years ago
Agnès Toulet	ca80865bf1	Rendering: Fix user information when using render key (#50879 ) * Rendering: Fix user information when using render key * fix when render user ID is 0 * update fix * improve fix * add comment	3 years ago
Jguer	6d0261263c	ServiceAccounts: Add Service Account Token last used at date (#51446 ) * ServiceAccounts Add api key last used at * ServiceAccounts: LastUpdateAt tests	3 years ago
idafurjes	6c43eb0b4d	Split Create User (#50502 ) * Split Create User * Use new create user and User from package user * Add service to wire * Making create user work * Replace user from user pkg * One more * Move Insert to orguser Service/Store * Remove unnecessary conversion * Cleaunp * Fix Get User and add fakes * Fixing get org id for user logic, adding fakes and other adjustments * Add some tests for ourguser service and store * Fix insert org logic * Add comment about deprecation * Fix after merge with main * Move orguser service/store to org service/store * Remove orguser from wire * Unimplement new Create user and use User from pkg user * Fix wire generation * Fix lint * Fix lint - use only User and CrateUserCommand from user pkg * Remove User and CreateUserCommand from models * Fix lint 2	3 years ago
sh0rez	3ca3a59079	pkg/web: remove dependency injection (#49123 ) * pkg/web: store http.Handler internally * pkg/web: remove injection Removes any injection code from pkg/web. It already was no longer functional, as we already only injected into `http.Handler`, meaning we only inject ctx.Req and ctx.Resp. Any other types (Context, ReqContext) were already accessed using the http.Request.Context.Value() method. * : remove type mappings Removes any call to the previously removed TypeMapper, as those were non-functional already. pkg/web: remove Context.Invoke was no longer used outside of pkg/web and also no longer functional	3 years ago
Jguer	6891bbf03c	ServiceAccounts: Add identifiable token prefix to service account tokens (#49011 ) * Add prefixed API key gen. * Retrieve API Key by hash * Handle prefixed API keys for login * Add placeholder key generator * fix spelling * add get by hash sqlstore test * reformat query * quote usage of reserved keyword key * use constant * improve error handling and pre-select key type Co-authored-by: Victor Cinaglia <victor@grafana.com> * nits Co-authored-by: Victor Cinaglia <victor@grafana.com>	3 years ago
sh0rez	3d5d8c785b	pkg/web: restrict handler types (#48495 ) Makes `pkg/web` only accept handles from the following set: ```go handlerStd = func(http.ResponseWriter, http.Request) handlerStdCtx = func(http.ResponseWriter, http.Request, web.Context) handlerStdReqCtx = func(http.ResponseWriter, http.Request, models.ReqContext) handlerReqCtx = func(models.ReqContext) handlerReqCtxRes = func(models.ReqContext) Response handlerCtx = func(web.Context) ``` This is a first step to reducing above set to only `http.Handler`. --- Due to a cyclic import situation between `pkg/models` and `pkg/web`, parts of this PR were put into `pkg/api/response`, even though they definitely do not belong there. This however is _temporary_ until we untangle `models.ReqContext`.	3 years ago
Serge Zaitsev	41012af997	Tracing: Use common traceID context value for opentracing and opentelemetry (#46411 ) * use common traceID context value for opentracing and opentelemetry * support sampled trace IDs as well * inject traceID into NormalResponse on errors * Finally the test passed * fix the test * fix linter * change the function parameter Co-authored-by: Ying WANG <ying.wang@grafana.com>	3 years ago
Eric Leijonmarck	673a2ab49e	fix: bug where disabled didnt disable the use of service account (#47688 )	3 years ago
ying-jeanne	e979690011	Linter: fix linter for golangci-lint version v1.45.0 (#47623 ) * Update golangci-lint to v1.45.2 Version 1.45.0 added support for Go 1.18: https://github.com/golangci/golangci-lint/blob/master/CHANGELOG.md#v1450 Signed-off-by: Marcelo E. Magallon <marcelo.magallon@grafana.com> * Linter: fix some lints issue for golangci-lint version 1.45.2 Co-authored-by: Marcelo E. Magallon <marcelo.magallon@grafana.com> Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>	3 years ago
Serge Zaitsev	2cf88cfec8	Chore: Remove bus from contexthandler (#47458 ) * Chore: remove bus from contexthandler * remove bus from orgredirect	3 years ago
Serge Zaitsev	d153d896c5	Chore: Remove bus from contexthandler (#47374 ) * Chore: Remove bus from contexthandler * fix tests * try different wire binding * maybe remove a few more dispatches * fix tests	3 years ago
Marcus Efraimsson	16db1ad46d	API: Fixes request logging middleware to include userId, orgId, uname (#47183 ) Fixes #47006	3 years ago
Selene	8e52dbb87b	Chore: Remove bus from authproxy (#46936 ) * Make authproxy injectable * Fix import * Provide function was in wrong place * Fixing tests * More imports and rollback a change * Fix lint	3 years ago
idafurjes	923b62ecab	Chore: Remove bus from quota (#45143 ) * Remove bus from quota * workaround * Change ExpectedOrg ot *models.Org	3 years ago
J Guerreiro	94820e1f29	Add/Delete API keys to Service accounts (#44871 ) * ServiceAccounts: move token handlers to specific file * ServiceAccounts: move Add API key to Service account * APIKeys: api keys can still be used even when service accounts are enabled * APIKeys: legacy endpoint can't be used to add SA tokens * ServiceAccount: add tests for creation with nil and non-nil service account ids * ServiceAccounts: fix unnasigned cfg and AC typo * Test: test service account token adding * fix linting error * ServiceAccounts: Handle Token deletion * rename token funcs * rename token funcs and api wrapping * add token deletion tests * review Co-authored-by: eleijonmarck <eric.leijonmarck@gmail.com> * remove bus * Update pkg/api/apikey.go Co-authored-by: eleijonmarck <eric.leijonmarck@gmail.com>	3 years ago
idafurjes	30aa24a183	Chore: Implement OpenTelemtry in Grafana (#42674 ) * Separate Tracer interface to TracerService and Tracer * Fix lint * Fix:Make it possible to start spans for both opentracing and opentelemetry in ds proxy * Add span methods, use span interface for rest of tracing * Fix logs in tracing * Fix tests that are related to tracing * Fix resourcepermissions test * Fix some tests * Fix more tests * Add TracingService to wire cli runner * Remove GlobalTracer from bus * Renaming test function * Remove GlobalTracer from TSDB * Replace GlobalTracer in api * Adjust tests to the InitializeForTests func * Remove GlobalTracer from services * Remove GlobalTracer * Remove bus.NewTest * Remove Tracer interface * Add InitializeForBus * Simplify tests * Clean up tests * Rename TracerService to Tracer * Update pkg/middleware/request_tracing.go Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> * Initialize tracer before passing it to SQLStore initialization in commands * Remove tests for opentracing * Set span attributes correctly, remove unnecessary trace initiliazation form test * Add tracer instance to newSQLStore * Fix changes due to rebase * Add modified tracing middleware test * Fix opentracing implementation tags Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>	3 years ago
idafurjes	8e6d6af744	Rename DispatchCtx to Dispatch (#43563 )	3 years ago
idafurjes	b8852ef6a3	Chore: Remove context.TODO() (#43409 ) * Remove context.TODO() from services * Fix live test * Remove context.TODO	3 years ago
idafurjes	c80e7764d8	Chore: Remove Dispatch and AddHandler (#42603 ) * Remove Dispatch * Remove context.TODO() * Remove AddHandler and Dispatch	4 years ago
Ieva	c426f5673b	Access control: allow using targetOrgId parameter to set organization ID for a request (#41761 ) * read target org ID in context handler * simplify test * add test for request body not being read in ctx handler * linting fix	4 years ago
Ieva	ba7d65edf5	Revert "allow using targetOrgId parameter to set organisation ID for a request (#41561 )" (#41643 ) This reverts commit `08276225c1`.	4 years ago
Ieva	08276225c1	allow using targetOrgId parameter to set organisation ID for a request (#41561 )	4 years ago
ying-jeanne	54de1078c8	remove the global log error/warn etc functions (#41404 ) * remove the global log error/warn etc functions and use request context logger whenever possible	4 years ago
Katarina Yang	c4306f9b3e	Chore: add context to login (#41316 ) * Chore: add context to login attempt file and tests * Chore: add context * Chore: add context to login and login tests * Chore: continue adding context to login * Chore: add context to login query	4 years ago
ying-jeanne	681218275e	remove crit and trace (#40320 )	4 years ago
Jeremy Price	6dbb6408d4	Access Control: Add service accounts (#38994 ) * Add extra fields to OSS types to support enterprise * Create a service account at the same time as the API key * Use service account credentials when accessing API with APIkey * Add GetRole to service, merge RoleDTO and Role structs This patch merges the identical OSS and Enterprise data structures, which improves the code for two reasons: 1. Makes switching between OSS and Enterprise easier 2. Reduces the chance of incompatibilities developing between the same functions in OSS and Enterprise * If API key is not linked to a service account, continue login as usual * Fallback to old auth if no service account linked to key * Add CloneUserToServiceAccount * Adding LinkAPIKeyToServiceAccount * Handle api key link error * Better error messages for OSS accesscontrol * Set an invalid user id as default * Re-arrange field names * ServiceAccountId is integer * Better error messages Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com> Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com> Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> Co-authored-by: Ieva <ieva.vasiljeva@grafana.com> Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>	4 years ago
Kevin Minehart	9c2d70ce0f	Packaging: Dependency updates (#40534 ) * update loki * install openssl from alpine's edge repository * extracttraceid moved to tracing package * remove exit if warning limit is exceeded * disable flaky libraryelements test	4 years ago
Serge Zaitsev	57fcfd578d	Chore: replace macaron with web package (#40136 ) * replace macaron with web package * add web.go	4 years ago
idafurjes	f4f0d74838	Chore: Add context to user (#39649 ) * Add context to user * Add context for enterprise * Add context for UpdateUserLastSeenAtCommand * Remove xorm	4 years ago
Serge Zaitsev	e1e385b318	Chore: Remove untyped data map from macaron context (#39077 )	4 years ago
Serge Zaitsev	c3ab2fdeb7	Macaron: remove custom Request type (#37874 ) * remove macaron.Request, use http.Request instead * remove com dependency from bindings module * fix another c.Req.Request	4 years ago
Arve Knudsen	78596a6756	Migrate to Wire for dependency injection (#32289 ) Fixes #30144 Co-authored-by: dsotirakis <sotirakis.dim@gmail.com> Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> Co-authored-by: Ida Furjesova <ida.furjesova@grafana.com> Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com> Co-authored-by: Will Browne <wbrowne@users.noreply.github.com> Co-authored-by: Leon Sorokin <leeoniya@gmail.com> Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com> Co-authored-by: spinillos <selenepinillos@gmail.com> Co-authored-by: Karl Persson <kalle.persson@grafana.com> Co-authored-by: Leonard Gram <leo@xlson.com>	4 years ago
Serge Zaitsev	827a5b7021	add FromContext API for macaron and reqcontext, add API for standard middleware in macaron (#37057 )	4 years ago
Carl Bergquist	f432fbd793	Instrumentation: add more tracing in the auth context handler. (#34939 ) ref https://github.com/grafana/grafana/issues/29489 Signed-off-by: bergquist <carl.bergquist@gmail.com>	4 years ago
Carl Bergquist	4710566514	bus: add ctx for all signed in user queries (#33970 ) Signed-off-by: bergquist <carl.bergquist@gmail.com>	4 years ago

1 2

58 Commits (b7efd46e2d514a7a3ea4527467bfb2be7f16a17a)