Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow Token API calls be authorized using the reverse-proxy header #15119

Merged
merged 13 commits into from
Nov 19, 2021
Merged

Allow Token API calls be authorized using the reverse-proxy header #15119

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
dc952c0
API calls authorized with HTTP header
pboguslawski Mar 18, 2021
0a51fd5
Fixed API calls authorized with HTTP header
pboguslawski Mar 18, 2021
f011fac
Merge master into master-IB#1107572
pboguslawski Mar 23, 2021
d7f2815
Reverse proxy API auth separated in docs
pboguslawski Apr 30, 2021
dcdc8ee
Reverse proxy API auth separated in docs
pboguslawski Apr 30, 2021
38dd9e4
Reverse proxy API auth separated
pboguslawski Apr 30, 2021
30f3a25
Merge branch 'master' into master-IB#1107572
pboguslawski Apr 30, 2021
1b45775
ReverseProxyAuth removed from swagger
pboguslawski Jun 25, 2021
09bc7ff
Merge remote-tracking branch 'master-IB#1107572' into master-IB#1107572
pboguslawski Jun 25, 2021
4bb60af
ReverseProxyAuth API authorization fixed
pboguslawski Jun 25, 2021
d23ef1b
ReverseProxyAuth API authorization fixed
pboguslawski Jun 25, 2021
ac114d4
Merge main into master-IB#1107572
pboguslawski Jun 25, 2021
988b05b
Merge remote/master-IB#1107572 into master-IB#1107572
pboguslawski Jun 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions routers/api/v1/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,13 @@ func reqExploreSignIn() func(ctx *context.APIContext) {
}
}

func reqBasicAuth() func(ctx *context.APIContext) {
func reqBasicOrRevProxyAuth() func(ctx *context.APIContext) {
return func(ctx *context.APIContext) {
if ctx.IsSigned && setting.Service.EnableReverseProxyAuth && ctx.Data["AuthedMethod"].(string) == new(auth.ReverseProxy).Name() {
wxiaoguang marked this conversation as resolved.
Show resolved Hide resolved
return
}
if !ctx.Context.IsBasicAuth {
ctx.Error(http.StatusUnauthorized, "reqBasicAuth", "basic auth required")
ctx.Error(http.StatusUnauthorized, "reqBasicOrRevProxyAuth", "auth required")
return
}
ctx.CheckForOTP()
Expand Down Expand Up @@ -626,7 +629,7 @@ func Routes() *web.Route {
m.Combo("").Get(user.ListAccessTokens).
Post(bind(api.CreateAccessTokenOption{}), user.CreateAccessToken)
m.Combo("/{id}").Delete(user.DeleteAccessToken)
}, reqBasicAuth())
}, reqBasicOrRevProxyAuth())
})
})

Expand Down