Skip to content

refactor auth interface to return error when verify failure #22119

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

Merged
merged 13 commits into from
Dec 28, 2022
Merged

refactor auth interface to return error when verify failure #22119

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1b83c11
refactor auth interface to return error when verify failure
lunny Dec 13, 2022
0376f23
improvement
lunny Dec 13, 2022
cc0c65b
Merge branch 'main' into lunny/refactor_auth
lunny Dec 13, 2022
97411d4
improvement
lunny Dec 13, 2022
4c98e7b
Fix windows lint
lunny Dec 13, 2022
e99dd1e
Fix signature auth
lunny Dec 14, 2022
69920f5
Merge branch 'main' into lunny/refactor_auth
lunny Dec 14, 2022
087cac4
Fix possible info leak
lunny Dec 15, 2022
9b2ba0b
Merge branch 'main' into lunny/refactor_auth
lunny Dec 15, 2022
bb26b14
Update services/auth/sspi_windows.go
lunny Dec 17, 2022
44e2416
Merge branch 'main' into lunny/refactor_auth
lunny Dec 20, 2022
a66cdf8
Update services/auth/group.go
lunny Dec 28, 2022
25b0080
Merge branch 'main' into lunny/refactor_auth
lunny Dec 28, 2022
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
Prev Previous commit
Next Next commit
improvement
  • Loading branch information
@lunny
lunny committed Dec 13, 2022
commit 0376f236c36c3c20618ea05d710679e6ff269285
2 changes: 1 addition & 1 deletion modules/context/context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ func Auth(authMethod auth.Method) func(*Context) {
ctx.Doer, err = authMethod.Verify(ctx.Req, ctx.Resp, ctx, ctx.Session)
if err != nil {
log.Error("Failed to verify user %v: %v", ctx.Req.RemoteAddr, err)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wait, we don't log API verification failures?
This line is missing in APIAuth…

ctx.Error(401, "Verify")
ctx.Error(http.StatusUnauthorized, "Verify")
return
}
if ctx.Doer != nil {
Expand Down
6 changes: 2 additions & 4 deletions routers/api/packages/container/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,8 @@ func (a *Auth) Name() string {
func (a *Auth) Verify(req *http.Request, w http.ResponseWriter, store auth.DataStore, sess auth.SessionStore) (*user_model.User, error) {
uid, err := packages.ParseAuthorizationToken(req)
if err != nil {
if err.Error() != "no token" {
log.Trace("ParseAuthorizationToken: %v", err)
return nil, err
}
log.Trace("ParseAuthorizationToken: %v", err)
return nil, err
}

if uid == 0 {
Expand Down
9 changes: 7 additions & 2 deletions services/packages/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,14 @@ func CreateAuthorizationToken(u *user_model.User) (string, error) {
}

func ParseAuthorizationToken(req *http.Request) (int64, error) {
parts := strings.SplitN(req.Header.Get("Authorization"), " ", 2)
h := req.Header.Get("Authorization")
if h == "" {
return 0, nil
}

parts := strings.SplitN(h, " ", 2)
if len(parts) != 2 {
return 0, fmt.Errorf("no token")
return 0, fmt.Errorf("split token failed: %s", h)
}

token, err := jwt.ParseWithClaims(parts[1], &packageClaims{}, func(t *jwt.Token) (interface{}, error) {
Expand Down