public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CSP: Set nonce attribute on Webpack injected bundles (#33298)

Browse Source 
* CSP: Set __webpack_nonce__

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Arve Knudsen
2021-04-26 11:38:24 +02:00
committed by GitHub
parent 34910521a6
commit 7f53dfad88
4 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/defaults.ini
+8 -8
View File
@@ -69,7 +69,7 @@ socket = /tmp/grafana.sock
# CDN Url # CDN Url
cdn_url = cdn_url =
# Sets the maximum time in minutes before timing out read of an incoming request and closing idle connections. # Sets the maximum time in minutes before timing out read of an incoming request and closing idle connections.
# `0` means there is no timeout for reading the request. # `0` means there is no timeout for reading the request.
read_timeout = 0 read_timeout = 0
@@ -507,13 +507,13 @@ enable_login_token = false
[auth.jwt] [auth.jwt]
enabled = false enabled = false
header_name = header_name =
email_claim = email_claim =
username_claim = username_claim =
jwk_set_url = jwk_set_url =
jwk_set_file = jwk_set_file =
cache_ttl = 60m cache_ttl = 60m
expected_claims = {} expected_claims = {}
key_file = key_file =
#################################### Auth LDAP ########################### #################################### Auth LDAP ###########################
[auth.ldap] [auth.ldap]
@@ -528,11 +528,11 @@ active_sync_enabled = true
#################################### AWS ########################### #################################### AWS ###########################
[aws] [aws]
# Enter a comma-separated list of allowed AWS authentication providers. # Enter a comma-separated list of allowed AWS authentication providers.
# Options are: default (AWS SDK Default), keys (Access && secret key), credentials (Credentials field), ec2_iam_role (EC2 IAM Role) # Options are: default (AWS SDK Default), keys (Access && secret key), credentials (Credentials field), ec2_iam_role (EC2 IAM Role)
allowed_auth_providers = default,keys,credentials allowed_auth_providers = default,keys,credentials
# Allow AWS users to assume a role using temporary security credentials. # Allow AWS users to assume a role using temporary security credentials.
# If true, assume role will be enabled for all AWS authentication providers that are specified in aws_auth_providers # If true, assume role will be enabled for all AWS authentication providers that are specified in aws_auth_providers
assume_role_enabled = true assume_role_enabled = true
conf/sample.ini
+2 -2
View File
@@ -518,11 +518,11 @@
#################################### AWS ########################### #################################### AWS ###########################
[aws] [aws]
# Enter a comma-separated list of allowed AWS authentication providers. # Enter a comma-separated list of allowed AWS authentication providers.
# Options are: default (AWS SDK Default), keys (Access && secret key), credentials (Credentials field), ec2_iam_role (EC2 IAM Role) # Options are: default (AWS SDK Default), keys (Access && secret key), credentials (Credentials field), ec2_iam_role (EC2 IAM Role)
; allowed_auth_providers = default,keys,credentials ; allowed_auth_providers = default,keys,credentials
# Allow AWS users to assume a role using temporary security credentials. # Allow AWS users to assume a role using temporary security credentials.
# If true, assume role will be enabled for all AWS authentication providers that are specified in aws_auth_providers # If true, assume role will be enabled for all AWS authentication providers that are specified in aws_auth_providers
; assume_role_enabled = true ; assume_role_enabled = true
public/app/index.ts
+5
View File
@@ -1,4 +1,5 @@
declare let __webpack_public_path__: string; declare let __webpack_public_path__: string;
declare let __webpack_nonce__: string;
/** /**
* Check if we are hosting files on cdn and set webpack public path * Check if we are hosting files on cdn and set webpack public path
@@ -11,5 +12,9 @@ if ((window as any).public_cdn_path) {
(window as any).__grafana_public_path__ = (window as any).__grafana_public_path__ =
__webpack_public_path__.substring(0, __webpack_public_path__.lastIndexOf('build/')) || __webpack_public_path__; __webpack_public_path__.substring(0, __webpack_public_path__.lastIndexOf('build/')) || __webpack_public_path__;
if ((window as any).nonce) {
__webpack_nonce__ = (window as any).nonce;
}
import app from './app'; import app from './app';
app.init(); app.init();
public/views/index-template.html
+3
View File
@@ -263,6 +263,9 @@
[[if .ContentDeliveryURL]] [[if .ContentDeliveryURL]]
window.public_cdn_path = '[[.ContentDeliveryURL]]public/build/'; window.public_cdn_path = '[[.ContentDeliveryURL]]public/build/';
[[end]] [[end]]
[[if .Nonce]]
window.nonce = '[[.Nonce]]';
[[end]]
</script> </script>
[[if .GoogleTagManagerId]] [[if .GoogleTagManagerId]]