zomo/discord-retokenizer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tokens tied to useragent

Browse Source
This commit is contained in:
ashley zomo
2022-12-27 22:21:54 -06:00
parent 14047df959
commit 71fd5f0d32
6 changed files with 175 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

147
storage/login.go
View File

@@ -6,10 +6,41 @@ import (
"time"
"git.zomo.dev/zomo/discord-retokenizer/util"
"github.com/go-redis/redis/v9"
"github.com/mileusna/useragent"
"golang.org/x/crypto/bcrypt"
)
type UserAgentSimple struct {
Name string `json:"name"`
Version string `json:"version"`
OS string `json:"os"`
OSVersion string `json:"os_version"`
Mobile bool `json:"mobile"`
Tablet bool `json:"tablet"`
Desktop bool `json:"desktop"`
}
func (ua UserAgentSimple) Compare(ua2 UserAgentSimple) bool {
return ua.Name == ua2.Name &&
ua.OS == ua2.OS &&
ua.Mobile == ua2.Mobile &&
ua.Tablet == ua2.Tablet &&
ua.Desktop == ua2.Desktop
}
func ParseUA(userAgentString string) UserAgentSimple {
ua := useragent.Parse(userAgentString)
return UserAgentSimple{
Name: ua.Name,
Version: ua.Version,
OS: ua.OS,
OSVersion: ua.OSVersion,
Mobile: ua.Mobile,
Tablet: ua.Tablet,
Desktop: ua.Desktop,
}
}
func UpdateUsername(username string) {
if username != "" {
client.Set(ctx, "username", username, 0)
@@ -26,7 +57,7 @@ func UpdatePassword(password string) {
}
}
func CheckLogin(username string, password string, ip string) (bool, string) {
func CheckLoginPassword(username string, password string, ip string, userAgent UserAgentSimple) (bool, string) {
if username == "" || password == "" {
return false, ""
}
@@ -50,21 +81,40 @@ func CheckLogin(username string, password string, ip string) (bool, string) {
return false, ""
}
return true, createLoginToken(ip)
//return existing token if it exists
tokens := getLoginTokens()
fmt.Printf("There are %d tokens", len(tokens))
for _, token := range tokens {
// fmt.Printf("Checking token %s\n", token.ID)
// fmt.Printf("IP:\n Given: %s\n Token: %s\n", ip, token.IP)
// fmt.Printf("UA:\n Given: %+v\n Token: %+v\n", userAgent, token.UserAgent)
// fmt.Printf("Compare UA: %t\n", token.UserAgent.Compare(userAgent))
if token.IP == ip && userAgent.Compare(token.UserAgent) {
return true, token.Token
}
}
return true, createLoginToken(ip, userAgent)
}
type LoginToken struct {
ID string `json:"id"`
TokenHash string `json:"token"`
IP string `json:"ip"`
End string `json:"end"`
ID string `json:"id"`
Token string `json:"token"`
IP string `json:"ip"`
End string `json:"end"`
UserAgent UserAgentSimple `json:"user_agent"`
CreatedAt string `json:"created_at"`
LastLogin string `json:"last_login"`
}
type LoginTokenSimple struct {
ID string `json:"id"`
IP string `json:"ip"`
End string `json:"end"`
ID string `json:"id"`
IP string `json:"ip"`
End string `json:"end"`
UserAgent UserAgentSimple `json:"user_agent"`
CreatedAt string `json:"created_at"`
LastLogin string `json:"last_login"`
}
func (t LoginToken) Simplify() LoginTokenSimple {
@@ -72,6 +122,9 @@ func (t LoginToken) Simplify() LoginTokenSimple {
ID: t.ID,
IP: t.IP,
End: t.End,
UserAgent: t.UserAgent,
CreatedAt: t.CreatedAt,
LastLogin: t.LastLogin,
}
}
@@ -83,27 +136,25 @@ func (t *LoginToken) UnmarshalBinary(data []byte) error {
return json.Unmarshal(data, t)
}
func createLoginToken(ip string) string {
func createLoginToken(ip string, ua UserAgentSimple) string {
token := util.GenerateToken()
tokenHash, err := bcrypt.GenerateFromPassword([]byte(token), bcrypt.DefaultCost)
if err != nil {
panic(err)
}
tokenData := LoginToken{
ID: util.GenerateID(),
TokenHash: string(tokenHash),
Token: token,
IP: ip,
End: util.GetEnd(token),
UserAgent: ua,
CreatedAt: time.Now().Format(time.RFC3339),
LastLogin: time.Now().Format(time.RFC3339),
}
member := redis.Z{
Score: float64(time.Now().Unix() + 4 * 60 * 60),
Member: tokenData,
err := client.RPush(ctx, "loginTokens", tokenData.ID).Err()
if err != nil {
panic(err)
}
err = client.ZAdd(ctx, "loginTokens", member).Err()
err = client.Set(ctx, "loginToken:"+tokenData.ID, tokenData, 0).Err()
if err != nil {
panic(err)
}
@@ -112,27 +163,30 @@ func createLoginToken(ip string) string {
}
func getLoginTokens() []LoginToken {
expired, err := client.ZRangeByScore(ctx, "loginTokens", &redis.ZRangeBy{
Min: "-inf",
Max: fmt.Sprintf("%d", time.Now().Unix()),
}).Result()
var ids []string
err := client.LRange(ctx, "loginTokens", 0, -1).ScanSlice(&ids)
if err != nil {
panic(err)
}
for _, e := range expired {
client.ZRem(ctx, "loginTokens", e)
var tokens []LoginToken
for _, id := range ids {
var token LoginToken
err = client.Get(ctx, "loginToken:"+id).Scan(&token)
if err != nil {
panic(err)
}
tokens = append(tokens, token)
}
return tokens
}
var current []LoginToken
err = client.ZRange(ctx, "loginTokens", 0, -1).ScanSlice(&current)
func updateLastLoginToken(token LoginToken) {
token.CreatedAt = time.Now().Format(time.RFC3339)
err := client.Set(ctx, "loginToken:"+token.ID, token, 0).Err()
if err != nil {
panic(err)
}
return current
}
func GetLoginTokensSimple() []LoginTokenSimple {
@@ -146,15 +200,34 @@ func GetLoginTokensSimple() []LoginTokenSimple {
}
func ClearLoginTokens() {
client.Del(ctx, "loginTokens")
var ids []string
err := client.LRange(ctx, "loginTokens", 0, -1).ScanSlice(&ids)
if err != nil {
panic(err)
}
err = client.Del(ctx, "loginTokens").Err()
if err != nil {
panic(err)
}
for _, id := range ids {
err = client.Del(ctx, "loginToken:"+id).Err()
if err != nil {
panic(err)
}
}
}
func CheckLoginToken(token string, ip string) bool {
func CheckLoginToken(token string, ip string, userAgent UserAgentSimple) bool {
current := getLoginTokens()
for _, c := range current {
err := bcrypt.CompareHashAndPassword([]byte(c.TokenHash), []byte(token))
if err == nil && ip == c.IP {
if token == c.Token && ip == c.IP && userAgent.Compare(c.UserAgent) {
fmt.Printf("Checking token %s\n", c.ID)
fmt.Printf("IP:\n Given: %s\n Token: %s\n", ip, c.IP)
fmt.Printf("UA:\n Given: %+v\n Token: %+v\n", userAgent, c.UserAgent)
updateLastLoginToken(c)
return true
}
}