Kiu/Semaphore
Kiu/Semaphore
1
0
Fork 0
mirror of https://github.com/semaphoreui/semaphore.git synced 2025-01-20 23:39:56 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(auth): check redirect urls

Browse Source
This commit is contained in:
fiftin 2024-03-11 19:39:11 +01:00
parent 3404c40c57
commit 0ee2d5fc16
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
api/login.go
View File

@ -345,6 +345,18 @@ func getOidcProvider(id string, ctx context.Context, redirectPath string) (*oidc
if !strings.HasPrefix(redirectPath, "/") { if !strings.HasPrefix(redirectPath, "/") {
redirectPath = "/" + redirectPath redirectPath = "/" + redirectPath
} }
providerUrl, err := url.Parse(provider.RedirectURL)
if err != nil {
return nil, nil, err
}
if redirectPath == providerUrl.Path {
redirectPath = ""
} else if strings.HasPrefix(redirectPath, providerUrl.Path+"/") {
redirectPath = redirectPath[len(providerUrl.Path):]
}
} }
oauthConfig := oauth2.Config{ oauthConfig := oauth2.Config{
@ -359,7 +371,12 @@ func getOidcProvider(id string, ctx context.Context, redirectPath string) (*oidc
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
oauthConfig.RedirectURL = rurl + redirectPath
oauthConfig.RedirectURL = rurl
if rurl != redirectPath {
oauthConfig.RedirectURL += redirectPath
}
} }
if len(oauthConfig.Scopes) == 0 { if len(oauthConfig.Scopes) == 0 {
oauthConfig.Scopes = []string{"openid", "profile", "email"} oauthConfig.Scopes = []string{"openid", "profile", "email"}
@ -505,7 +522,8 @@ func oidcRedirect(w http.ResponseWriter, r *http.Request) {
} }
ctx := context.Background() ctx := context.Background()
_oidc, oauth, err := getOidcProvider(pid, ctx, r.URL.RawQuery)
_oidc, oauth, err := getOidcProvider(pid, ctx, r.URL.Path)
if err != nil { if err != nil {
log.Error(err.Error()) log.Error(err.Error())
http.Redirect(w, r, "/auth/login", http.StatusTemporaryRedirect) http.Redirect(w, r, "/auth/login", http.StatusTemporaryRedirect)