tgdrive/teldrive
1
1
Fork 0
mirror of https://github.com/tgdrive/teldrive.git synced 2025-09-06 14:37:49 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: add session date as fingerprint

Browse source
This commit is contained in:
divyam234 2024-06-12 13:05:09 +05:30
parent 54a5fd55e1
commit 4cc1087152
6 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
internal/database/migrations/20240612190605_modify_session.sql Normal file
View file

@ -0,0 +1,6 @@
-- +goose Up
-- +goose StatementBegin
truncate teldrive.sessions;
ALTER TABLE "teldrive"."sessions" DROP COLUMN IF EXISTS "auth_hash";
ALTER TABLE "teldrive"."sessions" ADD COLUMN "auth_hash" bigint;
-- +goose StatementEnd

6
internal/database/migrations/20240613190605_modify_session.sql Normal file
View file

@ -0,0 +1,6 @@
-- +goose Up
-- +goose StatementBegin
truncate teldrive.sessions;
ALTER TABLE "teldrive"."sessions" DROP COLUMN IF EXISTS "auth_hash";
ALTER TABLE "teldrive"."sessions" ADD COLUMN "session_date" integer;
-- +goose StatementEnd

10
pkg/models/session.go
View file

@ -5,9 +5,9 @@ import (
)
type Session struct {
UserId int64 `gorm:"type:bigint;primaryKey"`
Hash string `gorm:"type:text"`
AuthHash string `gorm:"type:text"`
Session string `gorm:"type:text"`
CreatedAt time.Time `gorm:"default:timezone('utc'::text, now())"`
UserId int64 `gorm:"type:bigint;primaryKey"`
Hash string `gorm:"type:text"`
SessionDate int `gorm:"type:text"`
Session string `gorm:"type:text"`
CreatedAt time.Time `gorm:"default:timezone('utc'::text, now())"`
}

2
pkg/services/auth.go
View file

@ -133,7 +133,7 @@ func (as *AuthService) LogIn(c *gin.Context, session *schemas.TgSession) (*schem
//create session
if err := as.db.Create(&models.Session{UserId: session.UserID, Hash: hexToken,
Session: session.Sesssion, AuthHash: GenAuthHash(auth)}).Error; err != nil {
Session: session.Sesssion, SessionDate: auth.DateCreated}).Error; err != nil {
return nil, &types.AppError{Error: err}
}

12
pkg/services/common.go
View file

@ -3,11 +3,8 @@ package services
import (
"bytes"
"context"
"crypto/md5"
"crypto/rand"
"encoding/binary"
"encoding/hex"
"encoding/json"
"fmt"
"io"
"math"
@ -370,12 +367,3 @@ func DeleteTGMessages(ctx context.Context, cnf *config.TGConfig, session string,
})
return err
}
func GenAuthHash(auth *tg.Authorization) string {
auth.Flags = 0
auth.DateActive = 0
auth.Current = false
b, _ := json.Marshal(auth)
hash := md5.Sum(b)
return hex.EncodeToString(hash[:])
}

12
pkg/services/user.go
View file

@ -153,7 +153,7 @@ func (us *UserService) ListSessions(c *gin.Context) ([]schemas.SessionOut, *type
dbSessions := []models.Session{}
if err = us.db.Where("user_id = ?", userId).Find(&dbSessions).Order("created_at DESC").Error; err != nil {
if err = us.db.Where("user_id = ?", userId).Order("created_at DESC").Find(&dbSessions).Error; err != nil {
return nil, &types.AppError{Error: err}
}
@ -166,11 +166,11 @@ func (us *UserService) ListSessions(c *gin.Context) ([]schemas.SessionOut, *type
Current: session.Session == userSession}
if auth != nil {
for _, auth := range auth.Authorizations {
if session.AuthHash == GenAuthHash(&auth) {
s.AppName = strings.Trim(strings.Replace(auth.AppName, "Telegram", "", -1), " ")
s.Location = auth.Country
s.OfficialApp = auth.OfficialApp
for _, a := range auth.Authorizations {
if session.SessionDate == a.DateCreated {
s.AppName = strings.Trim(strings.Replace(a.AppName, "Telegram", "", -1), " ")
s.Location = a.Country
s.OfficialApp = a.OfficialApp
s.Valid = true
break
}