Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
3414be18
Commit
3414be18
authored
May 28, 2018
by
Nick Triller
Committed by
Nick Triller
Oct 29, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement oauth_auto_login setting
Redirect in backend
parent
6d0d07a5
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
0 deletions
+24
-0
pkg/api/login.go
+22
-0
pkg/setting/setting.go
+2
-0
No files found.
pkg/api/login.go
View file @
3414be18
...
...
@@ -39,6 +39,10 @@ func (hs *HTTPServer) LoginView(c *m.ReqContext) {
viewData
.
Settings
[
"loginError"
]
=
loginError
}
if
tryOAuthAutoLogin
(
c
)
{
return
}
if
!
tryLoginUsingRememberCookie
(
c
)
{
c
.
HTML
(
200
,
ViewIndex
,
viewData
)
return
...
...
@@ -53,6 +57,24 @@ func (hs *HTTPServer) LoginView(c *m.ReqContext) {
c
.
Redirect
(
setting
.
AppSubUrl
+
"/"
)
}
func
tryOAuthAutoLogin
(
c
*
m
.
ReqContext
)
bool
{
if
!
setting
.
OAuthAutoLogin
{
return
false
}
oauthInfos
:=
setting
.
OAuthService
.
OAuthInfos
if
len
(
oauthInfos
)
!=
1
{
log
.
Warn
(
"Skipping OAuth auto login because multiple OAuth providers are configured."
)
return
false
}
for
key
:=
range
setting
.
OAuthService
.
OAuthInfos
{
redirectUrl
:=
setting
.
AppSubUrl
+
"/login/"
+
key
log
.
Info
(
"OAuth auto login enabled. Redirecting to "
+
redirectUrl
)
c
.
Redirect
(
redirectUrl
,
307
)
return
true
}
return
false
}
func
tryLoginUsingRememberCookie
(
c
*
m
.
ReqContext
)
bool
{
// Check auto-login.
uname
:=
c
.
GetCookie
(
setting
.
CookieUserName
)
...
...
pkg/setting/setting.go
View file @
3414be18
...
...
@@ -108,6 +108,7 @@ var (
ExternalUserMngLinkUrl
string
ExternalUserMngLinkName
string
ExternalUserMngInfo
string
OAuthAutoLogin
bool
ViewersCanEdit
bool
// Http auth
...
...
@@ -622,6 +623,7 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
auth
:=
iniFile
.
Section
(
"auth"
)
DisableLoginForm
=
auth
.
Key
(
"disable_login_form"
)
.
MustBool
(
false
)
DisableSignoutMenu
=
auth
.
Key
(
"disable_signout_menu"
)
.
MustBool
(
false
)
OAuthAutoLogin
=
auth
.
Key
(
"oauth_auto_login"
)
.
MustBool
(
false
)
SignoutRedirectUrl
=
auth
.
Key
(
"signout_redirect_url"
)
.
String
()
// anonymous access
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment