commit 2ba2dbc57d7083d82b06a793f72f8d19f0e8ccb1
parent fab728ad65dbd94dc32c4dbdf07de79267a7ead8
Author: n0tr1v <n0tr1v@protonmail.com>
Date: Thu, 10 Nov 2022 16:12:36 -0800
improve functions name
Diffstat:
8 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/pkg/database/tableInvitations.go b/pkg/database/tableInvitations.go
@@ -29,7 +29,7 @@ func (i *Invitation) DoSave() {
func CreateInvitation(userID int64) (out Invitation, err error) {
out = Invitation{
- Token: utils.GenerateToken(),
+ Token: utils.GenerateToken32(),
OwnerUserID: userID,
InviteeUserID: 1,
}
diff --git a/pkg/database/tableSessions.go b/pkg/database/tableSessions.go
@@ -32,7 +32,7 @@ func CreateSession(userID int64, realIP, userAgent string) (Session, error) {
logrus.Error(err)
}
session := Session{
- Token: utils.GenerateToken(),
+ Token: utils.GenerateToken32(),
UserID: userID,
ClientIP: realIP,
UserAgent: userAgent,
diff --git a/pkg/database/tableUploads.go b/pkg/database/tableUploads.go
@@ -27,7 +27,7 @@ func CreateUpload(fileName string, content []byte, userID int64) (*Upload, error
}
func CreateUploadWithSize(fileName string, content []byte, userID, size int64) (*Upload, error) {
- newFileName := utils.MD5([]byte(utils.GenerateToken()))
+ newFileName := utils.MD5([]byte(utils.GenerateToken32()))
if err := ioutil.WriteFile(filepath.Join("uploads", newFileName), content, 0644); err != nil {
return nil, err
}
diff --git a/pkg/database/tableUsers.go b/pkg/database/tableUsers.go
@@ -465,7 +465,7 @@ func CreateFirstUser(username, password, repassword string) (User, UserErrors) {
}
func CreateZeroUser() (User, UserErrors) {
- password := utils.GenerateToken1()
+ password := utils.GenerateToken10()
return createUser("0", password, password, config.NullUserPublicKey, false, true, false, false, true, 12000, "")
}
@@ -513,7 +513,7 @@ func createUser(username, password, repassword, gpgPublicKey string, isAdmin, ve
newUser.RegistrationDuration = registrationDuration
newUser.SignupMetadata = signupInfoEnc
if !verified {
- token := utils.GenerateToken()
+ token := utils.GenerateToken32()
newUser.Token = &token
}
if err := DB.Create(&newUser).Error; err != nil {
diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
@@ -202,21 +202,21 @@ func ShortDisplayID(size int64) string {
return hex.EncodeToString(b)[0:size]
}
-// GenerateToken generate a random 32 bytes hex token
-func GenerateToken() string {
- return generateToken(32)
+// GenerateToken32 generate a random 32 bytes hex token
+func GenerateToken32() string {
+ return GenerateTokenN(32)
}
-// GenerateToken1 ...
-func GenerateToken1() string {
- return generateToken(10)
+// GenerateToken10 ...
+func GenerateToken10() string {
+ return GenerateTokenN(10)
}
-func GenerateToken2() string {
- return generateToken(3)
+func GenerateToken3() string {
+ return GenerateTokenN(3)
}
-func generateToken(n int) string {
+func GenerateTokenN(n int) string {
b := make([]byte, n)
_, _ = rand.Read(b)
return hex.EncodeToString(b)
diff --git a/pkg/web/handlers/api/v1/slashInterceptor.go b/pkg/web/handlers/api/v1/slashInterceptor.go
@@ -1080,7 +1080,7 @@ type tutorialSteps struct {
func handleTutorialCmd(c *Command) (handled bool) {
if c.message == "/tuto" && false {
- name := "tuto_" + utils.GenerateToken1()
+ name := "tuto_" + utils.GenerateToken10()
room, _ := database.CreateRoom(name, "", c.authUser.ID, false)
c.err = ErrRedirect
c.zeroProcMsg("Tutorial here -> #" + room.Name)
diff --git a/pkg/web/handlers/handlers.go b/pkg/web/handlers/handlers.go
@@ -297,7 +297,7 @@ func loginHandler(c echo.Context) error {
redir := c.QueryParam("redirect")
if user.GpgTwoFactorEnabled {
- token := utils.GenerateToken()
+ token := utils.GenerateToken32()
partialAuthCache.Set(token, user.ID, cache1.DefaultExpiration)
c.SetCookie(createPartialSessionCookie(token, 10*utils.OneMinuteSecs))
redirectURL := "/sessions/gpg-two-factor"
@@ -307,7 +307,7 @@ func loginHandler(c echo.Context) error {
return c.Redirect(http.StatusFound, redirectURL)
} else if string(user.TwoFactorSecret) != "" {
- token := utils.GenerateToken()
+ token := utils.GenerateToken32()
partialAuthCache.Set(token, user.ID, cache1.DefaultExpiration)
c.SetCookie(createPartialSessionCookie(token, 10*utils.OneMinuteSecs))
redirectURL := "/sessions/two-factor"
@@ -435,7 +435,7 @@ func SessionsGpgTwoFactorHandler(c echo.Context) error {
c.SetCookie(createPartialSessionCookie("", -1))
if string(user.TwoFactorSecret) != "" {
- token := utils.GenerateToken()
+ token := utils.GenerateToken32()
partialAuthCache.Set(token, user.ID, cache1.DefaultExpiration)
c.SetCookie(createPartialSessionCookie(token, 10*utils.OneMinuteSecs))
redirectURL := "/sessions/two-factor"
@@ -816,7 +816,7 @@ func signupHandler(c echo.Context) error {
} else {
// No cookie found, we create one and display the waiting page.
waitTime := utils.Random(5, 15)
- signupToken = utils.GenerateToken1()
+ signupToken = utils.GenerateToken10()
payload := map[string]string{"token": signupToken, "count": "1", "now": utils.FormatInt64(time.Now().UnixMilli()), "unix": utils.FormatInt64(time.Now().Unix() + waitTime - 1)}
by, _ := json.Marshal(payload)
encryptedVal, _ := utils.EncryptAES(by, []byte(config.Global.MasterKey()))
@@ -978,7 +978,7 @@ func ForgotPasswordHandler(c echo.Context) error {
var user database.User
if err := database.DB.First(&user, "email = ? and verified = 1", data.Email).Error; err == nil {
- token := utils.GenerateToken()
+ token := utils.GenerateToken32()
user.Token = &token
if err := user.Save(); err != nil {
logrus.Error(err)
@@ -2250,7 +2250,7 @@ func chatHandler(c echo.Context, redRoom bool) error {
}
if authUser == nil {
- password := utils.GenerateToken()
+ password := utils.GenerateToken32()
newUser, errs := database.CreateGuestUser(data.GuestUsername, password)
if errs.HasError() {
data.ErrGuestUsername = errs.Username
@@ -3244,7 +3244,7 @@ func SettingsAgeHandler(c echo.Context) error {
}
func generateAgeEncryptedTokenMessage(userID int64, pkey string) (string, error) {
- token := utils.GenerateToken()
+ token := utils.GenerateToken32()
ageTokenCache.Set(userID, token, 10*time.Minute)
recipient, err := age.ParseX25519Recipient(pkey)
@@ -3268,7 +3268,7 @@ func generateAgeEncryptedTokenMessage(userID int64, pkey string) (string, error)
}
func generatePgpEncryptedTokenMessage(userID int64, pkey string) (string, error) {
- token := utils.GenerateToken()
+ token := utils.GenerateToken32()
pgpTokenCache.Set(userID, token, 10*time.Minute)
msg := "The required code is below the line.\n----------------------------------------------------------------------------------\n" + token + "\n"
return utils.GeneratePgpEncryptedMessage(pkey, msg)
@@ -3961,7 +3961,7 @@ func ByteRoadChallengeHandler(c echo.Context) error {
data.ErrCaptcha = err.Error()
return c.Render(http.StatusOK, "vip.byte-road-challenge", data)
}
- token := utils.GenerateToken()
+ token := utils.GenerateToken32()
setCookie(token)
byteRoadSignUpSessionCache.Set(token, true, 10*time.Minute)
data.CaptchaSolved = true
@@ -4005,7 +4005,7 @@ func ByteRoadChallengeHandler(c echo.Context) error {
return c.Render(http.StatusOK, "vip.byte-road-challenge", data)
}
- token := utils.GenerateToken()
+ token := utils.GenerateToken32()
setCookie(token)
payload.Usernames[data.Username] = struct{}{}
@@ -4017,7 +4017,7 @@ func ByteRoadChallengeHandler(c echo.Context) error {
return c.Render(http.StatusOK, "vip.byte-road-challenge", data)
}
- token := utils.GenerateToken()
+ token := utils.GenerateToken32()
setCookie(token)
payload := ByteRoadPayload{Count: 1, Usernames: map[string]struct{}{data.Username: {}}}
@@ -4110,7 +4110,7 @@ func FileDropHandler(c echo.Context) error {
return c.HTML(http.StatusOK, formHTML+data.Error)
}
- newFileName := utils.MD5([]byte(utils.GenerateToken()))
+ newFileName := utils.MD5([]byte(utils.GenerateToken32()))
_ = ioutil.WriteFile(filepath.Join("filedrop", newFileName), fileBytes, 0644)
filedrop.FileName = newFileName
diff --git a/pkg/web/middlewares/middlewares.go b/pkg/web/middlewares/middlewares.go
@@ -298,7 +298,7 @@ func HellbannedCookieMiddleware(next echo.HandlerFunc) echo.HandlerFunc {
if _, err := c.Cookie(hutils.HBCookieName); err != nil {
cookie := &http.Cookie{
Name: hutils.HBCookieName,
- Value: utils.GenerateToken2(),
+ Value: utils.GenerateToken3(),
Domain: config.Global.CookieDomain(),
Secure: config.Global.CookieSecure(),
Path: "/",
