Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions internal/aistudio/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"strings"
"time"

"github.com/Mag1cFall/AIStudio2API/internal/buildpolicy"
"github.com/Mag1cFall/AIStudio2API/internal/camoufoxnative"
)

Expand Down Expand Up @@ -198,6 +199,15 @@ func WriteStorageState(filePath string, state StorageState) error {

// Validate 校验 storage state 的浏览器字段
func (s StorageState) Validate() error {
if buildpolicy.Conservative {
extension, exists, err := s.AuthExtension()
if err != nil {
return err
}
if exists && (extension.OAuth != nil || extension.Bound != nil) {
return fmt.Errorf("Chrome OAuth and device-bound renewal material are disabled in the conservative trial")
}
}
for index, cookie := range s.Cookies {
if strings.TrimSpace(cookie.Name) == "" || strings.TrimSpace(cookie.Domain) == "" {
return fmt.Errorf("storage state Cookie %d 缺少名称或域", index)
Expand All @@ -220,6 +230,25 @@ func (s StorageState) Validate() error {
return nil
}

// ValidateRuntimeState rejects copied states at the live service boundary while
// allowing generic parsers and fixtures to validate their storage shape.
func ValidateRuntimeState(s StorageState) error {
if !buildpolicy.Conservative {
return nil
}
extension, exists, err := s.AuthExtension()
if err != nil {
return err
}
if !exists || extension.Source.Browser != "camoufox" {
return fmt.Errorf("this trial requires state created by sign-in in its runtime browser")
}
if extension.OAuth != nil || extension.Bound != nil {
return fmt.Errorf("Chrome OAuth and device-bound renewal material are disabled in the conservative trial")
}
return nil
}

// CookieHeader 为目标 URL 构造当前有效的 Cookie 请求头
func (s StorageState) CookieHeader(targetURL string, now time.Time) (string, error) {
target, err := url.Parse(targetURL)
Expand Down
30 changes: 30 additions & 0 deletions internal/aistudio/conservative_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
//go:build conservative

package aistudio

import "testing"

func TestConservativeAllowsBrowserLoginStateOnlyWithoutRenewalKeys(t *testing.T) {
state := StorageState{Cookies: []StateCookie{{Name: "fixture", Value: "fixture", Domain: ".google.com", Path: "/"}}}
if err := state.Validate(); err != nil {
t.Fatal(err)
}
if err := ValidateRuntimeState(state); err == nil {
t.Fatal("copied cookies accepted at runtime")
}
state.SetAuthExtension(AuthExtension{Source: AuthSource{Browser: "camoufox", Email: "fixture@example.invalid"}})
if err := state.Validate(); err != nil {
t.Fatal(err)
}
if err := ValidateRuntimeState(state); err != nil {
t.Fatal(err)
}
state.SetAuthExtension(AuthExtension{Source: AuthSource{Browser: "camoufox"}, OAuth: &ChromeOAuthMaterial{RefreshToken: "fixture"}})
if err := state.Validate(); err == nil {
t.Fatal("OAuth material accepted")
}
state.SetAuthExtension(AuthExtension{Source: AuthSource{Browser: "camoufox"}, Bound: &BoundSession{ID: "fixture"}})
if err := state.Validate(); err == nil {
t.Fatal("bound renewal accepted")
}
}
26 changes: 26 additions & 0 deletions internal/api/conservative_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
//go:build conservative

package api

import (
"net/http"
"net/http/httptest"
"strings"
"testing"
)

func TestConservativeRejectsPairing(t *testing.T) {
handler := NewHandler(nil, Config{})
for _, request := range []*http.Request{
httptest.NewRequest(http.MethodPost, "/api/pairing", nil),
httptest.NewRequest(http.MethodGet, "/api/pairing", nil),
httptest.NewRequest(http.MethodPost, "/api/pairing/accounts", strings.NewReader(`{}`)),
httptest.NewRequest(http.MethodPut, "/api/pairing/accounts/account/cookies", strings.NewReader(`{}`)),
} {
recorder := httptest.NewRecorder()
handler.ServeHTTP(recorder, request)
if recorder.Code != http.StatusForbidden {
t.Fatalf("%s %s = %d", request.Method, request.URL.Path, recorder.Code)
}
}
}
17 changes: 17 additions & 0 deletions internal/api/pairing.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"time"

"github.com/Mag1cFall/AIStudio2API/internal/aistudio"
"github.com/Mag1cFall/AIStudio2API/internal/buildpolicy"
)

// pairingTokenLifetime 是远程配对令牌的有效期
Expand Down Expand Up @@ -74,6 +75,10 @@ func (tokens *pairingTokens) valid(token string, now time.Time) bool {

// handleActivePairing 返回仍在有效期内的远程配对令牌,没有时返回 404
func (s *server) handleActivePairing(w http.ResponseWriter, _ *http.Request) {
if buildpolicy.Conservative {
writeAdminError(w, http.StatusForbidden, "conservative_trial", "Remote pairing is disabled")
return
}
token, ok := s.pairing.active(time.Now())
if !ok {
writeAdminError(w, http.StatusNotFound, "pairing_token_missing", "No active pairing token")
Expand All @@ -84,11 +89,19 @@ func (s *server) handleActivePairing(w http.ResponseWriter, _ *http.Request) {

// handleCreatePairing 生成远程配对令牌
func (s *server) handleCreatePairing(w http.ResponseWriter, _ *http.Request) {
if buildpolicy.Conservative {
writeAdminError(w, http.StatusForbidden, "conservative_trial", "Remote pairing is disabled")
return
}
writeJSON(w, http.StatusCreated, s.pairing.issue(time.Now()))
}

// handlePairingAccount 凭配对令牌导入一个账户,不经过管理会话
func (s *server) handlePairingAccount(w http.ResponseWriter, r *http.Request) {
if buildpolicy.Conservative {
writeAdminError(w, http.StatusForbidden, "conservative_trial", "Remote pairing is disabled")
return
}
w.Header().Set("Cache-Control", "no-store")
token, _ := strings.CutPrefix(r.Header.Get("Authorization"), "Bearer ")
if !s.pairing.valid(strings.TrimSpace(token), time.Now()) {
Expand All @@ -112,6 +125,10 @@ func (s *server) handlePairingAccount(w http.ResponseWriter, r *http.Request) {

// handlePairingRenewal 凭配对上传时签发的续签凭据替换该账户的会话 Cookie,不经过管理会话
func (s *server) handlePairingRenewal(w http.ResponseWriter, r *http.Request) {
if buildpolicy.Conservative {
writeAdminError(w, http.StatusForbidden, "conservative_trial", "Remote renewal is disabled")
return
}
w.Header().Set("Cache-Control", "no-store")
token, _ := strings.CutPrefix(r.Header.Get("Authorization"), "Bearer ")
r.Body = http.MaxBytesReader(w, r.Body, 1<<20)
Expand Down
2 changes: 2 additions & 0 deletions internal/api/pairing_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
//go:build !conservative

package api

import (
Expand Down
13 changes: 13 additions & 0 deletions internal/app/admin.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (

"github.com/Mag1cFall/AIStudio2API/internal/aistudio"
"github.com/Mag1cFall/AIStudio2API/internal/api"
"github.com/Mag1cFall/AIStudio2API/internal/buildpolicy"
"github.com/Mag1cFall/AIStudio2API/internal/camoufoxnative"
"github.com/Mag1cFall/AIStudio2API/internal/chromeauth"
"github.com/Mag1cFall/AIStudio2API/internal/config"
Expand Down Expand Up @@ -274,6 +275,9 @@ func restrictedChromeSelection(accounts []chromeauth.Account, ids []string, exis

// CookieBrowsers 列出本机开启远程调试的浏览器,读取其 Cookie 并经 proxy 识别其中各会话登录 AI Studio 的账户,每个账户一项,proxy 为空时用默认出口
func (admin *runtimeAdmin) CookieBrowsers(ctx context.Context, proxy string) ([]api.CookieBrowser, error) {
if buildpolicy.Conservative {
return nil, invalidAccount(fmt.Errorf("browser discovery is disabled; sign in in the runtime browser"))
}
addresses, err := chromeauth.DebugAddresses(ctx)
if err != nil {
return nil, err
Expand Down Expand Up @@ -319,6 +323,9 @@ func (admin *runtimeAdmin) readCookieBrowser(ctx context.Context, browser *api.C

// DiscoverCookieAccounts 解析粘贴的 Cookie,返回其中各会话登录 AI Studio 的账户
func (admin *runtimeAdmin) DiscoverCookieAccounts(ctx context.Context, input api.CookieImportInput) ([]api.CookieBrowser, error) {
if buildpolicy.Conservative {
return nil, invalidAccount(fmt.Errorf("cross-browser cookie import is disabled; sign in in the runtime browser"))
}
state, err := aistudio.ParseCookieText(input.Cookies)
if err != nil {
return nil, &adminOperationError{status: http.StatusBadRequest, code: "invalid_cookies", message: err.Error()}
Expand Down Expand Up @@ -464,6 +471,9 @@ func (admin *runtimeAdmin) ImportChromeAccounts(ctx context.Context, input api.C

// ImportAccountState 导入远程配对上传或 Cookie 导入的认证状态与 Camoufox 指纹,未给标签时以 Cookie 中第 auth_user 个会话登录的账户邮箱为标签
func (admin *runtimeAdmin) ImportAccountState(ctx context.Context, input api.AccountStateInput) (api.AdminAccount, error) {
if buildpolicy.Conservative {
return api.AdminAccount{}, invalidAccount(fmt.Errorf("external state import is disabled; sign in in the runtime browser"))
}
timezone, err := accountTimezone(input.Timezone)
if err != nil {
return api.AdminAccount{}, invalidAccount(err)
Expand Down Expand Up @@ -1170,6 +1180,9 @@ func (admin *runtimeAdmin) UpdateRuntimeConfig(_ context.Context, value api.Runt
if err := cfg.Validate(); err != nil {
return api.RuntimeConfig{}, invalidConfigError(err)
}
if err := config.ValidateRuntimePolicy(cfg); err != nil {
return api.RuntimeConfig{}, invalidConfigError(err)
}
if err := cfg.Save(admin.configPath); err != nil {
return api.RuntimeConfig{}, err
}
Expand Down
9 changes: 8 additions & 1 deletion internal/app/admin_config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"testing"

"github.com/Mag1cFall/AIStudio2API/internal/aistudio"
"github.com/Mag1cFall/AIStudio2API/internal/buildpolicy"
"github.com/Mag1cFall/AIStudio2API/internal/config"
)

Expand All @@ -20,6 +21,7 @@ func TestAdminConfig(t *testing.T) {
cfg.AdminAuthEnabled = true
cfg.AdminUsername = "operator"
cfg.AdminPassword = "test-password"
cfg.ProxyAPIKey = "fixture-key"
if err := cfg.Save(path); err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -68,7 +70,12 @@ func TestAdminConfig(t *testing.T) {
t.Fatalf("empty enabled password error = %v", err)
}
value.AdminAuthEnabled = false
if _, err := admin.UpdateRuntimeConfig(ctx, value); err != nil {
_, err = admin.UpdateRuntimeConfig(ctx, value)
if buildpolicy.Conservative {
if !errors.As(err, &status) || status.HTTPStatus() != http.StatusBadRequest {
t.Fatalf("disabled conservative admin auth error = %v", err)
}
} else if err != nil {
t.Fatal(err)
}
}
3 changes: 3 additions & 0 deletions internal/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,9 @@ func parseFlags(args []string, cfg *config.Config) (commandOptions, error) {
if err := cfg.Validate(); err != nil {
return commandOptions{}, err
}
if err := config.ValidateRuntimePolicy(*cfg); err != nil {
return commandOptions{}, err
}
options := commandOptions{openUI: *openUI}
flags.Visit(func(value *flag.Flag) {
switch value.Name {
Expand Down
7 changes: 6 additions & 1 deletion internal/app/auth_retry.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (

"github.com/Mag1cFall/AIStudio2API/internal/aistudio"
"github.com/Mag1cFall/AIStudio2API/internal/api"
"github.com/Mag1cFall/AIStudio2API/internal/buildpolicy"
"github.com/Mag1cFall/AIStudio2API/internal/camoufoxnative"
"github.com/Mag1cFall/AIStudio2API/internal/chromeauth"
)
Expand Down Expand Up @@ -279,7 +280,7 @@ func (refresher *authRuntimeRefresher) do(ctx context.Context, method string, se
if !aistudio.DefinitiveAuthenticationFailure(err) {
return response, err
}
if attempt == 1 {
if !authenticationRecoveryAllowed(attempt) {
return nil, refresher.markAuthenticationRequired(ctx, err)
}
if err := refresher.Recover(ctx, err, generation); err != nil {
Expand All @@ -288,6 +289,10 @@ func (refresher *authRuntimeRefresher) do(ctx context.Context, method string, se
}
}

func authenticationRecoveryAllowed(attempt int) bool {
return !buildpolicy.Conservative && attempt < 1
}

// Do 在 401 后续签同一账户并重放一次请求
func (transport *authRetryTransport) Do(ctx context.Context, request aistudio.RPCRequest) (*aistudio.RPCResponse, error) {
return transport.refresher.do(ctx, request.Method, func() (*aistudio.RPCResponse, error) {
Expand Down
2 changes: 2 additions & 0 deletions internal/app/auth_retry_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
//go:build !conservative

package app

import (
Expand Down
Loading