IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-26 02:40:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

AuthN: Make clientTokenRotation work when Grafana is accessible on a sub url (#69385)

Browse Source 
Fix clientTokenRotation for auth-proxy
This commit is contained in:
Misi 2023-06-01 17:06:00 +02:00 committed by GitHub
parent 56c27a1f0d
commit 28bb960e42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devenv/docker/blocks/auth/nginx_proxy_mac/docker-compose.yaml
View File

@ -1,11 +1,13 @@
# This will proxy all requests for http://localhost:10080/grafana/ to
# This will proxy all requests for http://localhost:8090/grafana/ to
# http://localhost:3000 (Grafana running locally)
#
# Please note that you'll need to change the root_url in the Grafana configuration:
# root_url = %(protocol)s://%(domain)s:10080/grafana/
# root_url = %(protocol)s://%(domain)s:8090/grafana/
nginxproxy:
build: docker/blocks/auth/nginx_proxy_mac
volumes:
- "./docker/blocks/auth/nginx_proxy_mac/nginx_login_only.conf:/etc/nginx/nginx.conf"
ports:
- "10080:10080"
- "8090:8090"

2
devenv/docker/blocks/auth/nginx_proxy_mac/nginx.conf
View File

@ -10,7 +10,7 @@ http {
proxy_set_header X-Forwarded-Host $server_name;
server {
listen 10080;
listen 8090;
location /grafana/ {
################################################################

4
devenv/docker/blocks/auth/nginx_proxy_mac/nginx_login_only.conf
View File

@ -10,7 +10,7 @@ http {
proxy_set_header X-Forwarded-Host $server_name;
server {
listen 10080;
listen 8090;
location /grafana/ {
################################################################
@ -28,6 +28,8 @@ http {
# header_property = username
################################################################
proxy_set_header Host $host:$server_port;
location /grafana/login {
auth_basic "Restricted Content";
auth_basic_user_file /etc/nginx/htpasswd;

1
pkg/services/authn/clients/grafana.go
View File

@ -39,6 +39,7 @@ func (c *Grafana) AuthenticateProxy(ctx context.Context, r *authn.Request, usern
SyncTeams: true,
FetchSyncedUser: true,
SyncOrgRoles: true,
SyncPermissions: true,
AllowSignUp: c.cfg.AuthProxyAutoSignUp,
},
}

2
public/app/core/services/context_srv.ts
View File

@ -245,7 +245,7 @@ export class ContextSrv {
private rotateToken() {
// We directly use fetch here to bypass the request queue from backendSvc
return fetch('/api/user/auth-tokens/rotate', { method: 'POST' })
return fetch(config.appSubUrl + '/api/user/auth-tokens/rotate', { method: 'POST' })
.then((res) => {
if (res.status === 200) {
this.scheduleTokenRotationJob();