domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Use ErrInvalidArgument in packages (#22268)

Browse source 
Related to
https://github.com/go-gitea/gitea/pull/22262#discussion_r1059010774

Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lauris BH <lauris@nix.lv>
This commit is contained in:
KN4CK3R 2022-12-31 12:49:37 +01:00 • committed by GitHub
parent dce8887494
commit 3fef47b41c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
37 changed files with 144 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

4
models/asymkey/ssh_key_principals.go
View file

@ -4,7 +4,6 @@
package asymkey
import (
"errors"
"fmt"
"strings"
@ -12,6 +11,7 @@ import (
"code.gitea.io/gitea/models/perm"
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
)
// __________ .__ .__ .__
@ -70,7 +70,7 @@ func CheckPrincipalKeyString(user *user_model.User, content string) (_ string, e
content = strings.TrimSpace(content)
if strings.ContainsAny(content, "\r\n") {
return "", errors.New("only a single line with a single principal please")
return "", util.NewInvalidArgumentErrorf("only a single line with a single principal please")
}
// check all the allowed principals, email, username or anything