From 62faa6c97452cb3f478503fa621de4ec04ba45dd Mon Sep 17 00:00:00 2001 From: Joren Date: Sat, 6 Jul 2024 21:01:44 +0200 Subject: [PATCH 1/4] Fix admin roles not applying --- main.go | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/main.go b/main.go index b496cf4..aa3e118 100644 --- a/main.go +++ b/main.go @@ -21,16 +21,16 @@ var ( ) type Config struct { - Discord Discord `toml:"discord"` - Database Database `toml:"database"` - AdminRoles []string `toml:"admin_roles"` + Discord Discord `toml:"discord"` + Database Database `toml:"database"` } type Discord struct { - Token string `toml:"token"` - AppID string `toml:"appid"` - GuildID string `toml:"guildid"` - CategoryID string `toml:"category_id"` + Token string `toml:"token"` + AppID string `toml:"appid"` + GuildID string `toml:"guildid"` + CategoryID string `toml:"category_id"` + AdminRoles []string `toml:"admin_roles"` } type Database struct { @@ -240,8 +240,11 @@ var ( return } - for _, roleID := range config.AdminRoles { - client.ChannelPermissionSet(channel.ID, roleID, discordgo.PermissionOverwriteTypeRole, discordgo.PermissionViewChannel, 0) + for _, roleID := range config.Discord.AdminRoles { + err := client.ChannelPermissionSet(channel.ID, roleID, discordgo.PermissionOverwriteTypeRole, discordgo.PermissionViewChannel|discordgo.PermissionSendMessages, 0) + if err != nil { + log.Printf("Error setting permissions for role %s: %v", roleID, err) + } } err = client.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{ -- 2.45.2 From 8b001e499a1a38ab02ef30b1d3612154258128ba Mon Sep 17 00:00:00 2001 From: Joren Date: Sat, 6 Jul 2024 21:02:01 +0200 Subject: [PATCH 2/4] Fix admin roles not applying --- config.toml.example | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.toml.example b/config.toml.example index 1b04778..1942f94 100644 --- a/config.toml.example +++ b/config.toml.example @@ -3,6 +3,7 @@ token = "" appid = "" guildid = "" category_id = "" +admin_roles = [""] [database] host = "" @@ -11,4 +12,4 @@ name = "" username = "" password = "" -admin_roles = [""] + -- 2.45.2 From 00db797d65d73b82ce678b7b258e1e6af78f9c60 Mon Sep 17 00:00:00 2001 From: Joren Date: Sat, 6 Jul 2024 21:08:44 +0200 Subject: [PATCH 3/4] Fix issues --- main.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/main.go b/main.go index aa3e118..c91e893 100644 --- a/main.go +++ b/main.go @@ -241,10 +241,13 @@ var ( } for _, roleID := range config.Discord.AdminRoles { - err := client.ChannelPermissionSet(channel.ID, roleID, discordgo.PermissionOverwriteTypeRole, discordgo.PermissionViewChannel|discordgo.PermissionSendMessages, 0) - if err != nil { - log.Printf("Error setting permissions for role %s: %v", roleID, err) + if roleID != "" { + err := client.ChannelPermissionSet(channel.ID, roleID, discordgo.PermissionOverwriteTypeRole, discordgo.PermissionViewChannel|discordgo.PermissionSendMessages, 0) + if err != nil { + log.Printf("Error setting permissions for role %s: %v", roleID, err) + } } + } err = client.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{ -- 2.45.2 From fa254c60f7a07c417c7092057e93eb67b058c8ad Mon Sep 17 00:00:00 2001 From: Joren Date: Sat, 6 Jul 2024 21:54:33 +0200 Subject: [PATCH 4/4] Impl HWID reset logic --- main.go | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 165 insertions(+), 5 deletions(-) diff --git a/main.go b/main.go index c91e893..3f4ef56 100644 --- a/main.go +++ b/main.go @@ -1,19 +1,36 @@ package main import ( + "bytes" "database/sql" + "encoding/json" "fmt" "log" + "mime/multipart" + "net/http" "os" "os/signal" + "strconv" "strings" "syscall" + "time" "github.com/BurntSushi/toml" "github.com/bwmarrin/discordgo" - _ "github.com/lib/pq" + "github.com/lib/pq" ) +type UserResponse struct { + ID string `json:"id"` + Username string `json:"username"` + Subscription bool `json:"subscription"` + Group string `json:"group"` + Expiration string `json:"expiration"` + Versions []string `json:"versions"` + PFP string `json:"pfp"` + Message int `json:"message"` +} + var ( config Config client *discordgo.Session @@ -223,6 +240,22 @@ var ( return } + _, baseUrl := getTableNameAndBaseURL(selectedOption) + userUID, _ := fetchUserID(userName, baseUrl) + if userUID == 0 { + err := client.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Content: fmt.Sprintf("Account not found for %s", softwareType), + Flags: discordgo.MessageFlagsEphemeral, + }, + }) + if err != nil { + log.Println("Error sending interaction response:", err) + } + return + } + channel, err := client.GuildChannelCreateComplex(guildID, discordgo.GuildChannelCreateData{ Name: fmt.Sprintf("reset-%s-%s", softwareType, userName), Type: discordgo.ChannelTypeGuildText, @@ -270,12 +303,12 @@ var ( discordgo.Button{ Label: "Accept", Style: discordgo.PrimaryButton, - CustomID: fmt.Sprintf("accept_%s_%s", userID, softwareType), + CustomID: fmt.Sprintf("accept_%s_%s_%d", userID, softwareType, userUID), }, discordgo.Button{ Label: "Decline", Style: discordgo.DangerButton, - CustomID: fmt.Sprintf("decline_%s_%s", userID, softwareType), + CustomID: fmt.Sprintf("decline_%s_%s_%d", userID, softwareType, userUID), }, }, }, @@ -289,12 +322,13 @@ var ( "accept": func(client *discordgo.Session, i *discordgo.InteractionCreate) { data := i.MessageComponentData().CustomID parts := strings.Split(data, "_") - if len(parts) != 3 { + if len(parts) != 4 { log.Println("Invalid accept button custom ID") return } userID := parts[1] softwareType := parts[2] + userUID, _ := strconv.Atoi(parts[3]) member, err := client.GuildMember(i.GuildID, userID) if err != nil { @@ -304,6 +338,13 @@ var ( userName := getUsernameFromMember(member) reset(userName, softwareType) + tableName, _ := getTableNameAndBaseURL(strings.ToLower(softwareType)) + + _, err = resetAndVerify(tableName, int(userUID)) + if err != nil { + log.Println("Error resetting hwid:", err) + } + log.Printf("Reset the HWID of user %s with UID %d for %s", userName, userUID, softwareType) err = client.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{ Type: discordgo.InteractionResponseChannelMessageWithSource, @@ -336,7 +377,7 @@ var ( "decline": func(client *discordgo.Session, i *discordgo.InteractionCreate) { data := i.MessageComponentData().CustomID parts := strings.Split(data, "_") - if len(parts) != 3 { + if len(parts) != 4 { log.Println("Invalid decline button custom ID") return } @@ -391,6 +432,125 @@ func canCreateTicket(userName, softwareType string) bool { return true } +func getTableNameAndBaseURL(choice string) (string, string) { + var tableName, baseURL string + + switch choice { + case "vanity": + tableName = "AuthUserData" + baseURL = "http://vanitycheats.xyz/UserAuthentication.php" + case "mesa": + tableName = "AuthUserData-Mesachanger.com" + baseURL = "http://mesachanger.com/UserAuthentication.php" + default: + fmt.Println("Invalid choice. Please choose 'vanity' or 'mesa'.") + } + + return tableName, baseURL +} + +func fetchUserID(username string, baseURL string) (int, error) { + requestBody := &bytes.Buffer{} + multiPartWriter := multipart.NewWriter(requestBody) + err := multiPartWriter.WriteField("username", username) + if err != nil { + return 0, fmt.Errorf("error adding username field: %w", err) + } + multiPartWriter.Close() + request, err := http.NewRequest("POST", baseURL, requestBody) + if err != nil { + return 0, fmt.Errorf("error creating request: %w", err) + } + request.Header.Set("Content-Type", multiPartWriter.FormDataContentType()) + client := &http.Client{ + Timeout: 10 * time.Second, + } + resp, err := client.Do(request) + if err != nil { + return 0, fmt.Errorf("error sending request: %w", err) + } + defer resp.Body.Close() + var userResp UserResponse + err = json.NewDecoder(resp.Body).Decode(&userResp) + if err != nil { + return 0, fmt.Errorf("error decoding JSON: %w", err) + } + uid, err := strconv.Atoi(userResp.ID) + if err != nil { + return 0, fmt.Errorf("error converting user ID: %w", err) + } + return uid, nil +} + +func resetHWID(tableName string, uids []int) { + query := fmt.Sprintf(`UPDATE public.%q + SET "StorageIdentifier" = NULL, "BootIdentifier" = NULL + WHERE "UID" = ANY($1)`, tableName) + + _, err := db.Exec(query, pq.Array(uids)) + if err != nil { + log.Printf("Error resetting HWID: %v", err) + return + } +} + +func getIdentifiers(tableName string, uid int) { + query := fmt.Sprintf(`SELECT "StorageIdentifier", "BootIdentifier" + FROM public.%q + WHERE "UID" = $1`, tableName) + + var storageIdentifier, bootIdentifier sql.NullString + err := db.QueryRow(query, uid).Scan(&storageIdentifier, &bootIdentifier) + if err != nil { + if err == sql.ErrNoRows { + fmt.Println("HWID not set") + return + } + fmt.Println("Error querying the database:", err) + return + } + + if !storageIdentifier.Valid { + storageIdentifier = sql.NullString{String: "NULL", Valid: false} + } + + if !bootIdentifier.Valid { + bootIdentifier = sql.NullString{String: "NULL", Valid: false} + } + + fmt.Printf("UID: %d, S: %s, B: %s\n", uid, storageIdentifier.String, bootIdentifier.String) +} + +func resetAndVerify(tableName string, uid int) (bool, error) { + var beforeHash string + err := db.QueryRow( + fmt.Sprintf(`SELECT MD5(CONCAT("StorageIdentifier", "BootIdentifier")) FROM public.%q WHERE "UID" = $1`, tableName), + uid, + ).Scan(&beforeHash) + if err != nil { + if err == sql.ErrNoRows { + return false, fmt.Errorf("no rows found for UID %d", uid) + } + return false, fmt.Errorf("error querying database: %v", err) + } + + resetHWID(tableName, []int{uid}) + + var afterHash string + err = db.QueryRow( + fmt.Sprintf(`SELECT MD5(CONCAT("StorageIdentifier", "BootIdentifier")) FROM public.%q WHERE "UID" = $1`, tableName), + uid, + ).Scan(&afterHash) + if err != nil { + if err == sql.ErrNoRows { + return false, fmt.Errorf("no rows found for UID %d after reset", uid) + } + return false, fmt.Errorf("error querying database after reset: %v", err) + } + + return beforeHash != afterHash, nil +} + func main() { if client == nil { log.Println("Bot client is not initialized") -- 2.45.2