Merge branch 'router-for-me:main' into main

Luis Pater committed 11 months agov6.6.7-0

Commit ba6aa5f2 parents 75ce091 1c52a895 files · +97 −5Browse files

Unified · Split

5 files

internal/api/handlers/management/auth_files.go +14 −2
internal/auth/iflow/cookie_helpers.go +61 −0
internal/auth/iflow/iflow_auth.go +8 −1
internal/cmd/iflow_cookie.go +13 −1
sdk/auth/iflow.go +1 −1

internal/api/handlers/management/auth_files.go+14−2

 		return
 	}
+	// Check for duplicate BXAuth before authentication
+	bxAuth := iflowauth.ExtractBXAuth(cookieValue)
+	if existingFile, err := iflowauth.CheckDuplicateBXAuth(h.cfg.AuthDir, bxAuth); err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"status": "error", "error": "failed to check duplicate"})
+		return
+	} else if existingFile != "" {
+		existingFileName := filepath.Base(existingFile)
+		c.JSON(http.StatusConflict, gin.H{"status": "error", "error": "duplicate BXAuth found", "existing_file": existingFileName})
+		return
+	}
 	authSvc := iflowauth.NewIFlowAuth(h.cfg)
 	tokenData, errAuth := authSvc.AuthenticateWithCookie(ctx, cookieValue)
 	if errAuth != nil {
 	}
 	tokenStorage.Email = email
+	timestamp := time.Now().Unix()
 	record := &coreauth.Auth{
-		ID:       fmt.Sprintf("iflow-%s.json", fileName),
+		ID:       fmt.Sprintf("iflow-%s-%d.json", fileName, timestamp),
 		Provider: "iflow",
-		FileName: fmt.Sprintf("iflow-%s.json", fileName),
+		FileName: fmt.Sprintf("iflow-%s-%d.json", fileName, timestamp),
 		Storage:  tokenStorage,
 		Metadata: map[string]any{
 			"email":        email,

internal/auth/iflow/cookie_helpers.go+61−0

@@ -1,7 +1,10 @@
1	package iflow	1	package iflow
2		2
3	import (	3	import (
		4	"encoding/json"
4	"fmt"	5	"fmt"
		6	"os"
		7	"path/filepath"
5	"strings"	8	"strings"
6	)	9	)
7		10
@@ -36,3 +39,61 @@ func SanitizeIFlowFileName(raw string) string { · 28 unmodified lines
36	}	39	}
37	return strings.TrimSpace(result.String())	40	return strings.TrimSpace(result.String())
38	}	41	}
		42
		43	// ExtractBXAuth extracts the BXAuth value from a cookie string.
		44	func ExtractBXAuth(cookie string) string {
		45	parts := strings.Split(cookie, ";")
		46	for _, part := range parts {
		47	part = strings.TrimSpace(part)
		48	if strings.HasPrefix(part, "BXAuth=") {
		49	return strings.TrimPrefix(part, "BXAuth=")
		50	}
		51	}
		52	return ""
		53	}
		54
		55	// CheckDuplicateBXAuth checks if the given BXAuth value already exists in any iflow auth file.
		56	// Returns the path of the existing file if found, empty string otherwise.
		57	func CheckDuplicateBXAuth(authDir, bxAuth string) (string, error) {
		58	if bxAuth == "" {
		59	return "", nil
		60	}
		61
		62	entries, err := os.ReadDir(authDir)
		63	if err != nil {
		64	if os.IsNotExist(err) {
		65	return "", nil
		66	}
		67	return "", fmt.Errorf("read auth dir failed: %w", err)
		68	}
		69
		70	for _, entry := range entries {
		71	if entry.IsDir() {
		72	continue
		73	}
		74	name := entry.Name()
		75	if !strings.HasPrefix(name, "iflow-") \|\| !strings.HasSuffix(name, ".json") {
		76	continue
		77	}
		78
		79	filePath := filepath.Join(authDir, name)
		80	data, err := os.ReadFile(filePath)
		81	if err != nil {
		82	continue
		83	}
		84
		85	var tokenData struct {
		86	Cookie string `json:"cookie"`
		87	}
		88	if err := json.Unmarshal(data, &tokenData); err != nil {
		89	continue
		90	}
		91
		92	existingBXAuth := ExtractBXAuth(tokenData.Cookie)
		93	if existingBXAuth != "" && existingBXAuth == bxAuth {
		94	return filePath, nil
		95	}
		96	}
		97
		98	return "", nil
		99	}

internal/auth/iflow/iflow_auth.go+8−1

 		return nil
 	}
+	// Only save the BXAuth field from the cookie
+	bxAuth := ExtractBXAuth(data.Cookie)
+	cookieToSave := ""
+	if bxAuth != "" {
+		cookieToSave = "BXAuth=" + bxAuth + ";"
+	}
 	return &IFlowTokenStorage{
 		APIKey:      data.APIKey,
 		Email:       data.Email,
 		Expire:      data.Expire,
-		Cookie:      data.Cookie,
+		Cookie:      cookieToSave,
 		LastRefresh: time.Now().Format(time.RFC3339),
 		Type:        "iflow",
 	}

internal/cmd/iflow_cookie.go+13−1

 	"context"
 	"fmt"
 	"os"
+	"path/filepath"
 	"strings"
+	"time"
 	"github.com/router-for-me/CLIProxyAPI/v6/internal/auth/iflow"
 	"github.com/router-for-me/CLIProxyAPI/v6/internal/config"
 		return
 	}
+	// Check for duplicate BXAuth before authentication
+	bxAuth := iflow.ExtractBXAuth(cookie)
+	if existingFile, err := iflow.CheckDuplicateBXAuth(cfg.AuthDir, bxAuth); err != nil {
+		fmt.Printf("Failed to check duplicate: %v\n", err)
+		return
+	} else if existingFile != "" {
+		fmt.Printf("Duplicate BXAuth found, authentication already exists: %s\n", filepath.Base(existingFile))
+		return
+	}
 	// Authenticate with cookie
 	auth := iflow.NewIFlowAuth(cfg)
 	ctx := context.Background()
 // getAuthFilePath returns the auth file path for the given provider and email
 func getAuthFilePath(cfg *config.Config, provider, email string) string {
 	fileName := iflow.SanitizeIFlowFileName(email)
-	return fmt.Sprintf("%s/%s-%s.json", cfg.AuthDir, provider, fileName)
+	return fmt.Sprintf("%s/%s-%s-%d.json", cfg.AuthDir, provider, fileName, time.Now().Unix())
 }

sdk/auth/iflow.go+1−1

@@ -107,7 +107,7 @@ func (a IFlowAuthenticator) Login(ctx context.Context, cfg config.Config, opts · 106 unmodified lines
107	return nil, fmt.Errorf("iflow authentication failed: missing account identifier")	107	return nil, fmt.Errorf("iflow authentication failed: missing account identifier")
108	}	108	}
109		109
110	fileName := fmt.Sprintf("iflow-%s.json", email)	110	fileName := fmt.Sprintf("iflow-%s-%d.json", email, time.Now().Unix())
111	metadata := map[string]any{	111	metadata := map[string]any{
112	"email": email,	112	"email": email,
113	"api_key": tokenStorage.APIKey,	113	"api_key": tokenStorage.APIKey,