瀏覽代碼

Rename the setting and add description

Tomas Dabasinskas 7 年之前
父節點
當前提交
3aa24b3afa
共有 3 個文件被更改,包括 6 次插入3 次删除
  1. 1 1
      conf/defaults.ini
  2. 4 1
      conf/sample.ini
  3. 1 1
      pkg/social/social.go

+ 1 - 1
conf/defaults.ini

@@ -335,7 +335,7 @@ tls_skip_verify_insecure = false
 tls_client_cert =
 tls_client_key =
 tls_client_ca =
-broken_auth_header_provider = false
+send_client_credentials_via_post = false
 
 #################################### Basic Auth ##########################
 [auth.basic]

+ 4 - 1
conf/sample.ini

@@ -283,7 +283,10 @@ log_queries =
 ;tls_client_cert =
 ;tls_client_key =
 ;tls_client_ca =
-;broken_auth_header_provider = false
+
+; Set to true to enable sending client_id and client_secret via POST body instead of Basic authentication HTTP header
+; This might be required if the OAuth provider is not RFC6749 compliant, only supporting credentials passed via POST payload
+;send_client_credentials_via_post = false
 
 #################################### Grafana.com Auth ####################
 [auth.grafana_com]

+ 1 - 1
pkg/social/social.go

@@ -79,7 +79,7 @@ func NewOAuthService() {
 			TlsClientKey:             sec.Key("tls_client_key").String(),
 			TlsClientCa:              sec.Key("tls_client_ca").String(),
 			TlsSkipVerify:            sec.Key("tls_skip_verify_insecure").MustBool(),
-			BrokenAuthHeaderProvider: sec.Key("broken_auth_header_provider").MustBool(),
+			BrokenAuthHeaderProvider: sec.Key("send_client_credentials_via_post").MustBool(),
 		}
 
 		if !info.Enabled {