mirror of
https://github.com/router-for-me/CLIProxyAPIPlus.git
synced 2026-04-26 05:36:12 +00:00
Fixed: #1799
**test(auth): add tests for auth file deletion logic with manager and fallback scenarios**
This commit is contained in:
@@ -186,17 +186,6 @@ func startCallbackForwarder(port int, provider, targetBase string) (*callbackFor
|
|||||||
return forwarder, nil
|
return forwarder, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func stopCallbackForwarder(port int) {
|
|
||||||
callbackForwardersMu.Lock()
|
|
||||||
forwarder := callbackForwarders[port]
|
|
||||||
if forwarder != nil {
|
|
||||||
delete(callbackForwarders, port)
|
|
||||||
}
|
|
||||||
callbackForwardersMu.Unlock()
|
|
||||||
|
|
||||||
stopForwarderInstance(port, forwarder)
|
|
||||||
}
|
|
||||||
|
|
||||||
func stopCallbackForwarderInstance(port int, forwarder *callbackForwarder) {
|
func stopCallbackForwarderInstance(port int, forwarder *callbackForwarder) {
|
||||||
if forwarder == nil {
|
if forwarder == nil {
|
||||||
return
|
return
|
||||||
@@ -638,28 +627,66 @@ func (h *Handler) DeleteAuthFile(c *gin.Context) {
|
|||||||
c.JSON(400, gin.H{"error": "invalid name"})
|
c.JSON(400, gin.H{"error": "invalid name"})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
full := filepath.Join(h.cfg.AuthDir, filepath.Base(name))
|
|
||||||
if !filepath.IsAbs(full) {
|
targetPath := filepath.Join(h.cfg.AuthDir, filepath.Base(name))
|
||||||
if abs, errAbs := filepath.Abs(full); errAbs == nil {
|
targetID := ""
|
||||||
full = abs
|
if targetAuth := h.findAuthForDelete(name); targetAuth != nil {
|
||||||
|
targetID = strings.TrimSpace(targetAuth.ID)
|
||||||
|
if path := strings.TrimSpace(authAttribute(targetAuth, "path")); path != "" {
|
||||||
|
targetPath = path
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if err := os.Remove(full); err != nil {
|
if !filepath.IsAbs(targetPath) {
|
||||||
if os.IsNotExist(err) {
|
if abs, errAbs := filepath.Abs(targetPath); errAbs == nil {
|
||||||
|
targetPath = abs
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if errRemove := os.Remove(targetPath); errRemove != nil {
|
||||||
|
if os.IsNotExist(errRemove) {
|
||||||
c.JSON(404, gin.H{"error": "file not found"})
|
c.JSON(404, gin.H{"error": "file not found"})
|
||||||
} else {
|
} else {
|
||||||
c.JSON(500, gin.H{"error": fmt.Sprintf("failed to remove file: %v", err)})
|
c.JSON(500, gin.H{"error": fmt.Sprintf("failed to remove file: %v", errRemove)})
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if err := h.deleteTokenRecord(ctx, full); err != nil {
|
if errDeleteRecord := h.deleteTokenRecord(ctx, targetPath); errDeleteRecord != nil {
|
||||||
c.JSON(500, gin.H{"error": err.Error()})
|
c.JSON(500, gin.H{"error": errDeleteRecord.Error()})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
h.disableAuth(ctx, full)
|
if targetID != "" {
|
||||||
|
h.disableAuth(ctx, targetID)
|
||||||
|
} else {
|
||||||
|
h.disableAuth(ctx, targetPath)
|
||||||
|
}
|
||||||
c.JSON(200, gin.H{"status": "ok"})
|
c.JSON(200, gin.H{"status": "ok"})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (h *Handler) findAuthForDelete(name string) *coreauth.Auth {
|
||||||
|
if h == nil || h.authManager == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
name = strings.TrimSpace(name)
|
||||||
|
if name == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if auth, ok := h.authManager.GetByID(name); ok {
|
||||||
|
return auth
|
||||||
|
}
|
||||||
|
auths := h.authManager.List()
|
||||||
|
for _, auth := range auths {
|
||||||
|
if auth == nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(auth.FileName) == name {
|
||||||
|
return auth
|
||||||
|
}
|
||||||
|
if filepath.Base(strings.TrimSpace(authAttribute(auth, "path"))) == name {
|
||||||
|
return auth
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
func (h *Handler) authIDForPath(path string) string {
|
func (h *Handler) authIDForPath(path string) string {
|
||||||
path = strings.TrimSpace(path)
|
path = strings.TrimSpace(path)
|
||||||
if path == "" {
|
if path == "" {
|
||||||
@@ -893,10 +920,19 @@ func (h *Handler) disableAuth(ctx context.Context, id string) {
|
|||||||
if h == nil || h.authManager == nil {
|
if h == nil || h.authManager == nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
authID := h.authIDForPath(id)
|
id = strings.TrimSpace(id)
|
||||||
if authID == "" {
|
if id == "" {
|
||||||
authID = strings.TrimSpace(id)
|
return
|
||||||
}
|
}
|
||||||
|
if auth, ok := h.authManager.GetByID(id); ok {
|
||||||
|
auth.Disabled = true
|
||||||
|
auth.Status = coreauth.StatusDisabled
|
||||||
|
auth.StatusMessage = "removed via management API"
|
||||||
|
auth.UpdatedAt = time.Now()
|
||||||
|
_, _ = h.authManager.Update(ctx, auth)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
authID := h.authIDForPath(id)
|
||||||
if authID == "" {
|
if authID == "" {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
129
internal/api/handlers/management/auth_files_delete_test.go
Normal file
129
internal/api/handlers/management/auth_files_delete_test.go
Normal file
@@ -0,0 +1,129 @@
|
|||||||
|
package management
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"net/url"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/router-for-me/CLIProxyAPI/v6/internal/config"
|
||||||
|
coreauth "github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/auth"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestDeleteAuthFile_UsesAuthPathFromManager(t *testing.T) {
|
||||||
|
t.Setenv("MANAGEMENT_PASSWORD", "")
|
||||||
|
gin.SetMode(gin.TestMode)
|
||||||
|
|
||||||
|
tempDir := t.TempDir()
|
||||||
|
authDir := filepath.Join(tempDir, "auth")
|
||||||
|
externalDir := filepath.Join(tempDir, "external")
|
||||||
|
if errMkdirAuth := os.MkdirAll(authDir, 0o700); errMkdirAuth != nil {
|
||||||
|
t.Fatalf("failed to create auth dir: %v", errMkdirAuth)
|
||||||
|
}
|
||||||
|
if errMkdirExternal := os.MkdirAll(externalDir, 0o700); errMkdirExternal != nil {
|
||||||
|
t.Fatalf("failed to create external dir: %v", errMkdirExternal)
|
||||||
|
}
|
||||||
|
|
||||||
|
fileName := "codex-user@example.com-plus.json"
|
||||||
|
shadowPath := filepath.Join(authDir, fileName)
|
||||||
|
realPath := filepath.Join(externalDir, fileName)
|
||||||
|
if errWriteShadow := os.WriteFile(shadowPath, []byte(`{"type":"codex","email":"shadow@example.com"}`), 0o600); errWriteShadow != nil {
|
||||||
|
t.Fatalf("failed to write shadow file: %v", errWriteShadow)
|
||||||
|
}
|
||||||
|
if errWriteReal := os.WriteFile(realPath, []byte(`{"type":"codex","email":"real@example.com"}`), 0o600); errWriteReal != nil {
|
||||||
|
t.Fatalf("failed to write real file: %v", errWriteReal)
|
||||||
|
}
|
||||||
|
|
||||||
|
manager := coreauth.NewManager(nil, nil, nil)
|
||||||
|
record := &coreauth.Auth{
|
||||||
|
ID: "legacy/" + fileName,
|
||||||
|
FileName: fileName,
|
||||||
|
Provider: "codex",
|
||||||
|
Status: coreauth.StatusError,
|
||||||
|
Unavailable: true,
|
||||||
|
Attributes: map[string]string{
|
||||||
|
"path": realPath,
|
||||||
|
},
|
||||||
|
Metadata: map[string]any{
|
||||||
|
"type": "codex",
|
||||||
|
"email": "real@example.com",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
if _, errRegister := manager.Register(context.Background(), record); errRegister != nil {
|
||||||
|
t.Fatalf("failed to register auth record: %v", errRegister)
|
||||||
|
}
|
||||||
|
|
||||||
|
h := NewHandlerWithoutConfigFilePath(&config.Config{AuthDir: authDir}, manager)
|
||||||
|
h.tokenStore = &memoryAuthStore{}
|
||||||
|
|
||||||
|
deleteRec := httptest.NewRecorder()
|
||||||
|
deleteCtx, _ := gin.CreateTestContext(deleteRec)
|
||||||
|
deleteReq := httptest.NewRequest(http.MethodDelete, "/v0/management/auth-files?name="+url.QueryEscape(fileName), nil)
|
||||||
|
deleteCtx.Request = deleteReq
|
||||||
|
h.DeleteAuthFile(deleteCtx)
|
||||||
|
|
||||||
|
if deleteRec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("expected delete status %d, got %d with body %s", http.StatusOK, deleteRec.Code, deleteRec.Body.String())
|
||||||
|
}
|
||||||
|
if _, errStatReal := os.Stat(realPath); !os.IsNotExist(errStatReal) {
|
||||||
|
t.Fatalf("expected managed auth file to be removed, stat err: %v", errStatReal)
|
||||||
|
}
|
||||||
|
if _, errStatShadow := os.Stat(shadowPath); errStatShadow != nil {
|
||||||
|
t.Fatalf("expected shadow auth file to remain, stat err: %v", errStatShadow)
|
||||||
|
}
|
||||||
|
|
||||||
|
listRec := httptest.NewRecorder()
|
||||||
|
listCtx, _ := gin.CreateTestContext(listRec)
|
||||||
|
listReq := httptest.NewRequest(http.MethodGet, "/v0/management/auth-files", nil)
|
||||||
|
listCtx.Request = listReq
|
||||||
|
h.ListAuthFiles(listCtx)
|
||||||
|
|
||||||
|
if listRec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("expected list status %d, got %d with body %s", http.StatusOK, listRec.Code, listRec.Body.String())
|
||||||
|
}
|
||||||
|
var listPayload map[string]any
|
||||||
|
if errUnmarshal := json.Unmarshal(listRec.Body.Bytes(), &listPayload); errUnmarshal != nil {
|
||||||
|
t.Fatalf("failed to decode list payload: %v", errUnmarshal)
|
||||||
|
}
|
||||||
|
filesRaw, ok := listPayload["files"].([]any)
|
||||||
|
if !ok {
|
||||||
|
t.Fatalf("expected files array, payload: %#v", listPayload)
|
||||||
|
}
|
||||||
|
if len(filesRaw) != 0 {
|
||||||
|
t.Fatalf("expected removed auth to be hidden from list, got %d entries", len(filesRaw))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDeleteAuthFile_FallbackToAuthDirPath(t *testing.T) {
|
||||||
|
t.Setenv("MANAGEMENT_PASSWORD", "")
|
||||||
|
gin.SetMode(gin.TestMode)
|
||||||
|
|
||||||
|
authDir := t.TempDir()
|
||||||
|
fileName := "fallback-user.json"
|
||||||
|
filePath := filepath.Join(authDir, fileName)
|
||||||
|
if errWrite := os.WriteFile(filePath, []byte(`{"type":"codex"}`), 0o600); errWrite != nil {
|
||||||
|
t.Fatalf("failed to write auth file: %v", errWrite)
|
||||||
|
}
|
||||||
|
|
||||||
|
manager := coreauth.NewManager(nil, nil, nil)
|
||||||
|
h := NewHandlerWithoutConfigFilePath(&config.Config{AuthDir: authDir}, manager)
|
||||||
|
h.tokenStore = &memoryAuthStore{}
|
||||||
|
|
||||||
|
deleteRec := httptest.NewRecorder()
|
||||||
|
deleteCtx, _ := gin.CreateTestContext(deleteRec)
|
||||||
|
deleteReq := httptest.NewRequest(http.MethodDelete, "/v0/management/auth-files?name="+url.QueryEscape(fileName), nil)
|
||||||
|
deleteCtx.Request = deleteReq
|
||||||
|
h.DeleteAuthFile(deleteCtx)
|
||||||
|
|
||||||
|
if deleteRec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("expected delete status %d, got %d with body %s", http.StatusOK, deleteRec.Code, deleteRec.Body.String())
|
||||||
|
}
|
||||||
|
if _, errStat := os.Stat(filePath); !os.IsNotExist(errStat) {
|
||||||
|
t.Fatalf("expected auth file to be removed from auth dir, stat err: %v", errStat)
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user