@pippit-dev/cli 1.0.17 → 1.0.20

package/internal/common/client_test.go

@@ -0,0 +1,213 @@
+package common
+
+import (
+	"context"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"os"
+	"path/filepath"
+	"strings"
+	"sync/atomic"
+	"testing"
+	"time"
+)
+
+type observedHeaders struct {
+	authorization string
+}
+
+func TestHTTPClientScopesCredentialsToBaseOrigin(t *testing.T) {
+	apiHeaders := make(chan observedHeaders, 1)
+	api := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		apiHeaders <- captureRoutingHeaders(r)
+		_, _ = w.Write([]byte(`{}`))
+	}))
+	defer api.Close()
+
+	thirdPartyHeaders := make(chan observedHeaders, 1)
+	thirdParty := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		thirdPartyHeaders <- captureRoutingHeaders(r)
+		_, _ = w.Write([]byte(`{}`))
+	}))
+	defer thirdParty.Close()
+
+	client := NewHTTPClient(
+		api.URL,
+		time.Second,
+		NewAccessKeyAuthorizer("secret-ak"),
+	)
+	if err := client.SendRequest(context.Background(), "/api/test", nil, nil); err != nil {
+		t.Fatalf("same-origin SendRequest() error = %v", err)
+	}
+	gotAPI := <-apiHeaders
+	if gotAPI.authorization != "Bearer secret-ak" {
+		t.Fatalf("same-origin Authorization = %q", gotAPI.authorization)
+	}
+
+	thirdPartyURL := thirdParty.URL + "/asset.mp4"
+	err := client.SendRequestWithHeaders(context.Background(), thirdPartyURL, nil, map[string]string{
+		"Authorization": "Bearer caller-supplied",
+	}, nil)
+	if err != nil {
+		t.Fatalf("third-party SendRequest() error = %v", err)
+	}
+	gotThirdParty := <-thirdPartyHeaders
+	if gotThirdParty != (observedHeaders{}) {
+		t.Fatalf("third-party sensitive headers leaked: %#v", gotThirdParty)
+	}
+}
+
+func TestHTTPClientTreatsSameOriginAbsoluteURLAsAPI(t *testing.T) {
+	headers := make(chan observedHeaders, 1)
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		headers <- captureRoutingHeaders(r)
+		_, _ = w.Write([]byte(`{}`))
+	}))
+	defer server.Close()
+
+	client := NewHTTPClient(
+		server.URL+"/base-path",
+		time.Second,
+		NewAccessKeyAuthorizer("same-origin-ak"),
+	)
+	if err := client.SendRequest(context.Background(), server.URL+"/api/absolute", nil, nil); err != nil {
+		t.Fatalf("SendRequest() error = %v", err)
+	}
+	got := <-headers
+	if got.authorization != "Bearer same-origin-ak" {
+		t.Fatalf("same-origin absolute headers = %#v", got)
+	}
+}
+
+func TestHTTPClientRejectsAPICrossOriginRedirectBeforeSendingBody(t *testing.T) {
+	var thirdPartyRequests atomic.Int32
+	thirdParty := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		thirdPartyRequests.Add(1)
+		_, _ = w.Write([]byte(`{}`))
+	}))
+	defer thirdParty.Close()
+
+	api := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		http.Redirect(w, r, thirdParty.URL+"/redirected-asset", http.StatusTemporaryRedirect)
+	}))
+	defer api.Close()
+
+	client := NewHTTPClient(
+		api.URL,
+		time.Second,
+		NewAccessKeyAuthorizer("redirect-ak"),
+	)
+	err := client.SendRequest(context.Background(), "/api/redirect", map[string]string{"canvas": "private"}, nil)
+	if err == nil || !strings.Contains(err.Error(), "拒绝 Pippit API 跨域重定向") {
+		t.Fatalf("SendRequest() error = %v, want cross-origin redirect rejection", err)
+	}
+	if got := thirdPartyRequests.Load(); got != 0 {
+		t.Fatalf("third party received %d API redirect requests, want 0", got)
+	}
+}
+
+func TestHTTPClientDoesNotRestoreAuthorizationAfterCrossOriginRedirect(t *testing.T) {
+	finalHeaders := make(chan observedHeaders, 1)
+	var apiURL string
+	thirdParty := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if got := captureRoutingHeaders(r); got != (observedHeaders{}) {
+			t.Errorf("cross-origin hop leaked protected headers: %#v", got)
+		}
+		http.Redirect(w, r, apiURL+"/final", http.StatusFound)
+	}))
+	defer thirdParty.Close()
+
+	api := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		finalHeaders <- captureRoutingHeaders(r)
+		_, _ = w.Write([]byte(`{}`))
+	}))
+	defer api.Close()
+	apiURL = api.URL
+
+	client := NewHTTPClient(
+		api.URL,
+		time.Second,
+		NewAccessKeyAuthorizer("redirect-bounce-ak"),
+	)
+	if err := client.SendRequest(context.Background(), thirdParty.URL+"/bounce", nil, nil); err != nil {
+		t.Fatalf("SendRequest() error = %v", err)
+	}
+	if got := <-finalHeaders; got != (observedHeaders{}) {
+		t.Fatalf("trusted return hop restored protected headers: %#v", got)
+	}
+}
+
+func TestHTTPClientPreventsCallerAuthorizationOverride(t *testing.T) {
+	headers := make(chan observedHeaders, 1)
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		headers <- captureRoutingHeaders(r)
+		_, _ = w.Write([]byte(`{}`))
+	}))
+	defer server.Close()
+
+	client := NewHTTPClient(
+		server.URL,
+		time.Second,
+		NewAccessKeyAuthorizer("production-ak"),
+	)
+	err := client.SendRequestWithHeaders(context.Background(), "/api/test", nil, map[string]string{
+		"Authorization": "Bearer caller-override",
+	}, nil)
+	if err != nil {
+		t.Fatalf("SendRequest() error = %v", err)
+	}
+	got := <-headers
+	if got.authorization != "Bearer production-ak" {
+		t.Fatalf("protected headers = %#v", got)
+	}
+}
+
+func TestHTTPClientMultipartRequestInjectsOnlyAuthorization(t *testing.T) {
+	headers := make(chan observedHeaders, 1)
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		headers <- captureRoutingHeaders(r)
+		_, _ = w.Write([]byte(`{}`))
+	}))
+	defer server.Close()
+
+	filePath := filepath.Join(t.TempDir(), "sample.txt")
+	if err := os.WriteFile(filePath, []byte("sample"), 0o600); err != nil {
+		t.Fatal(err)
+	}
+	client := NewHTTPClient(
+		server.URL,
+		time.Second,
+		NewAccessKeyAuthorizer("upload-ak"),
+	)
+	err := client.SendMultipartRequest(context.Background(), "/api/upload", nil, MultipartFile{
+		FieldName: "file",
+		Path:      filePath,
+	}, nil)
+	if err != nil {
+		t.Fatalf("SendMultipartRequest() error = %v", err)
+	}
+	got := <-headers
+	if got.authorization != "Bearer upload-ak" {
+		t.Fatalf("multipart headers = %#v", got)
+	}
+}
+
+func TestSameOriginUsesEffectiveDefaultPorts(t *testing.T) {
+	httpsDefault, _ := url.Parse("https://xyq.jianying.com/api")
+	httpsExplicit, _ := url.Parse("https://XYQ.JIANYING.COM:443/asset")
+	if !sameOrigin(httpsDefault, httpsExplicit) {
+		t.Fatal("sameOrigin() = false for equivalent HTTPS origins")
+	}
+
+	differentPort, _ := url.Parse("https://xyq.jianying.com:8443/api")
+	if sameOrigin(httpsDefault, differentPort) {
+		t.Fatal("sameOrigin() = true for different ports")
+	}
+}
+
+func captureRoutingHeaders(r *http.Request) observedHeaders {
+	return observedHeaders{
+		authorization: r.Header.Get("Authorization"),
+	}
+}

package/internal/common/get_credit_balance.go

@@ -0,0 +1,61 @@
+package common
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/Pippit-dev/pippit-cli/internal/config"
+)
+
+// GetCreditBalanceResult is the JSON output printed by `pippit-tool-cli get-credit-balance`.
+type GetCreditBalanceResult struct {
+	TotalRemainAmount int64  `json:"total_remain_amount,string"`
+	LogID             string `json:"-"`
+}
+
+type getCreditBalanceResponse struct {
+	Ret    string                        `json:"ret"`
+	Errmsg string                        `json:"errmsg"`
+	LogID  string                        `json:"log_id"`
+	Data   *getCreditBalanceResponseData `json:"data"`
+}
+
+type getCreditBalanceResponseData struct {
+	TotalRemainAmount *int64 `json:"total_remain_amount,string"`
+}
+
+// GetCreditBalance queries the effective credit balance of the access-key owner.
+func GetCreditBalance(ctx context.Context, runner *Runner) (*GetCreditBalanceResult, error) {
+	if runner == nil || runner.Client == nil {
+		return nil, fmt.Errorf("get_credit_balance 运行器客户端缺失")
+	}
+
+	var resp getCreditBalanceResponse
+	if err := runner.Client.SendRequest(ctx, getCreditBalancePath(runner), struct{}{}, &resp); err != nil {
+		return nil, fmt.Errorf("获取积分余额请求失败: %w", err)
+	}
+	if resp.Ret != "0" {
+		if resp.Errmsg == "" {
+			resp.Errmsg = "未知错误"
+		}
+		return nil, NewLogIDError(fmt.Sprintf("获取积分余额请求返回失败: ret=%s errmsg=%s", resp.Ret, resp.Errmsg), resp.LogID)
+	}
+	if resp.Data == nil {
+		return nil, NewLogIDError("get_credit_balance 响应缺少 data", resp.LogID)
+	}
+	if resp.Data.TotalRemainAmount == nil {
+		return nil, NewLogIDError("get_credit_balance 响应缺少 data.total_remain_amount", resp.LogID)
+	}
+
+	return &GetCreditBalanceResult{
+		TotalRemainAmount: *resp.Data.TotalRemainAmount,
+		LogID:             resp.LogID,
+	}, nil
+}
+
+func getCreditBalancePath(runner *Runner) string {
+	if runner != nil && runner.Config != nil && runner.Config.Paths != nil && runner.Config.Paths.GetCreditBalance != "" {
+		return runner.Config.Paths.GetCreditBalance
+	}
+	return config.GetCreditBalancePath
+}

package/internal/common/get_credit_balance_test.go

@@ -0,0 +1,75 @@
+package common
+
+import (
+	"context"
+	"fmt"
+	"strings"
+	"testing"
+
+	"github.com/bytedance/sonic"
+)
+
+type creditBalanceFakeClient struct {
+	response string
+	path     string
+	body     any
+}
+
+func (c *creditBalanceFakeClient) SendRequest(_ context.Context, path string, body any, out any) error {
+	c.path = path
+	c.body = body
+	return sonic.Unmarshal([]byte(c.response), out)
+}
+
+func (c *creditBalanceFakeClient) SendRequestWithHeaders(ctx context.Context, path string, body any, _ map[string]string, out any) error {
+	return c.SendRequest(ctx, path, body, out)
+}
+
+func (c *creditBalanceFakeClient) SendMultipartRequest(context.Context, string, map[string]string, MultipartFile, any) error {
+	return fmt.Errorf("unexpected multipart request")
+}
+
+func TestGetCreditBalanceReturnsAmount(t *testing.T) {
+	client := &creditBalanceFakeClient{
+		response: `{"ret":"0","log_id":"log_balance","data":{"total_remain_amount":"4321"}}`,
+	}
+
+	result, err := GetCreditBalance(context.Background(), &Runner{Client: client})
+	if err != nil {
+		t.Fatalf("GetCreditBalance() error = %v", err)
+	}
+	if result.TotalRemainAmount != 4321 {
+		t.Fatalf("TotalRemainAmount = %d, want 4321", result.TotalRemainAmount)
+	}
+	if result.LogID != "log_balance" {
+		t.Fatalf("LogID = %q, want log_balance", result.LogID)
+	}
+	if client.path != "/api/biz/v1/skill/get_credit_balance" {
+		t.Fatalf("path = %q, want get_credit_balance path", client.path)
+	}
+	if _, ok := client.body.(struct{}); !ok {
+		t.Fatalf("body = %#v, want an empty POST body", client.body)
+	}
+}
+
+func TestGetCreditBalanceRequiresOptionalAmount(t *testing.T) {
+	client := &creditBalanceFakeClient{
+		response: `{"ret":"0","log_id":"log_missing","data":{}}`,
+	}
+
+	_, err := GetCreditBalance(context.Background(), &Runner{Client: client})
+	if err == nil || !strings.Contains(err.Error(), "data.total_remain_amount") || !strings.Contains(err.Error(), "log_id=log_missing") {
+		t.Fatalf("GetCreditBalance() error = %v, want missing amount and log_id", err)
+	}
+}
+
+func TestGetCreditBalanceBusinessErrorIncludesLogID(t *testing.T) {
+	client := &creditBalanceFakeClient{
+		response: `{"ret":"16008","errmsg":"查询失败","log_id":"log_123"}`,
+	}
+
+	_, err := GetCreditBalance(context.Background(), &Runner{Client: client})
+	if err == nil || !strings.Contains(err.Error(), "ret=16008 errmsg=查询失败") || !strings.Contains(err.Error(), "log_id=log_123") {
+		t.Fatalf("GetCreditBalance() error = %v, want business error and log_id", err)
+	}
+}

package/internal/common/runner.go

@@ -1,13 +1,28 @@
 package common
 
 import (
+	"context"
+
+	"github.com/Pippit-dev/pippit-cli/internal/auth"
 	"github.com/Pippit-dev/pippit-cli/internal/config"
 )
 
+// AuthManager is the credential boundary shared by native CLI commands. It
+// resolves explicit CI credentials first and browser-managed credentials
+// second, without exposing either value to command output.
+type AuthManager interface {
+	ResolveAccessKey(context.Context) (string, error)
+	Login(context.Context, auth.LoginOptions) (*auth.Credential, error)
+	Status(context.Context) (*auth.Status, error)
+	Logout(context.Context, bool) error
+	CredentialScope(context.Context) (string, error)
+}
+
 // Runner carries runtime dependencies for command execution.
 type Runner struct {
 	Config *config.Config
 	Client Client
+	Auth   AuthManager
 }
 
 func NewRunner(cfg *config.Config, client Client) *Runner {

package/internal/config/config.go

@@ -10,10 +10,9 @@ const (
 	DefaultBaseURL              = "https://xyq.jianying.com"
 	DefaultHTTPTimeout          = 30 * time.Minute
 	DefaultAuthTTL              = 30 * time.Second
-	DefaultOAuthClientKey       = "mock-cli"
-	DefaultOAuthBaseURL         = "https://passport.bytedance.com"
 	DefaultAuthStoreServiceName = "pippit-cli"
 	SubmitRunPath               = "/api/biz/v1/skill/submit_run"
+	GetCreditBalancePath        = "/api/biz/v1/skill/get_credit_balance"
 	GetThreadPath               = "/api/biz/v1/skill/get_thread"
 	UploadFilePath              = "/api/biz/v1/skill/upload_file"
 	ListThreadFilePath          = "/api/biz/v1/skill/list_thread_file"
@@ -27,22 +26,15 @@ type Config struct {
 	HTTPTimeout time.Duration
 	AuthTTL     time.Duration
 	AccessKey   string
-	OAuth       *OAuth
 	Paths       *Paths
 }
 
-type OAuth struct {
-	ClientKey        string
-	BaseURL          string
-	StoreServiceName string
-	Scopes           []string
-}
-
 type Paths struct {
-	SubmitRun      string
-	GetThread      string
-	UploadFile     string
-	ListThreadFile string
+	SubmitRun        string
+	GetCreditBalance string
+	GetThread        string
+	UploadFile       string
+	ListThreadFile   string
 }
 
 // Load resolves the built-in runtime config.
@@ -52,21 +44,12 @@ func Load() *Config {
 		HTTPTimeout: DefaultHTTPTimeout,
 		AuthTTL:     DefaultAuthTTL,
 		AccessKey:   strings.TrimSpace(os.Getenv(EnvXYQAccessKey)),
-		OAuth:       resolveOAuth(),
 		Paths: &Paths{
-			SubmitRun:      SubmitRunPath,
-			GetThread:      GetThreadPath,
-			UploadFile:     UploadFilePath,
-			ListThreadFile: ListThreadFilePath,
+			SubmitRun:        SubmitRunPath,
+			GetCreditBalance: GetCreditBalancePath,
+			GetThread:        GetThreadPath,
+			UploadFile:       UploadFilePath,
+			ListThreadFile:   ListThreadFilePath,
 		},
 	}
 }
-
-func resolveOAuth() *OAuth {
-	return &OAuth{
-		ClientKey:        DefaultOAuthClientKey,
-		BaseURL:          DefaultOAuthBaseURL,
-		StoreServiceName: DefaultAuthStoreServiceName,
-		Scopes:           []string{"user_info", "aigc_generate"},
-	}
-}

package/internal/config/config_test.go

@@ -17,27 +17,12 @@ func TestLoadUsesDefaultConfig(t *testing.T) {
 	if cfg.AccessKey != "" {
 		t.Fatalf("AccessKey = %q, want empty", cfg.AccessKey)
 	}
-	if cfg.OAuth.ClientKey != DefaultOAuthClientKey {
-		t.Fatalf("OAuth.ClientKey = %q, want %q", cfg.OAuth.ClientKey, DefaultOAuthClientKey)
-	}
-	if cfg.OAuth.StoreServiceName != DefaultAuthStoreServiceName {
-		t.Fatalf("OAuth.StoreServiceName = %q, want %q", cfg.OAuth.StoreServiceName, DefaultAuthStoreServiceName)
-	}
-	if cfg.OAuth.BaseURL != DefaultOAuthBaseURL {
-		t.Fatalf("OAuth.BaseURL = %q, want %q", cfg.OAuth.BaseURL, DefaultOAuthBaseURL)
-	}
-	wantScopes := []string{"user_info", "aigc_generate"}
-	if len(cfg.OAuth.Scopes) != len(wantScopes) {
-		t.Fatalf("OAuth.Scopes = %#v, want %#v", cfg.OAuth.Scopes, wantScopes)
-	}
-	for i := range wantScopes {
-		if cfg.OAuth.Scopes[i] != wantScopes[i] {
-			t.Fatalf("OAuth.Scopes = %#v, want %#v", cfg.OAuth.Scopes, wantScopes)
-		}
-	}
 	if cfg.Paths.SubmitRun != SubmitRunPath {
 		t.Fatalf("SubmitRun path = %q, want %q", cfg.Paths.SubmitRun, SubmitRunPath)
 	}
+	if cfg.Paths.GetCreditBalance != GetCreditBalancePath {
+		t.Fatalf("GetCreditBalance path = %q, want %q", cfg.Paths.GetCreditBalance, GetCreditBalancePath)
+	}
 }
 
 func TestLoadReadsAccessKey(t *testing.T) {

package/package.json

@@ -1,13 +1,16 @@
 {
   "name": "@pippit-dev/cli",
-  "version": "1.0.17",
+  "version": "1.0.20",
   "description": "Pippit CLI",
   "bin": {
     "pippit-tool-cli": "scripts/run.js"
   },
   "scripts": {
     "postinstall": "node scripts/install.js",
-    "test": "node scripts/version-check.test.js && node scripts/skills.test.js && node scripts/install-wizard.test.js && go test ./... && go vet ./..."
+    "prepack": "node scripts/prepare-canvas-runtime.js",
+    "prepare:canvas-runtime": "node scripts/prepare-canvas-runtime.js",
+    "test": "node scripts/version-check.test.js && node scripts/skills.test.js && node scripts/install-wizard.test.js && node scripts/canvas-command.test.js && node scripts/prepare-canvas-runtime.test.js && go test ./... && go vet ./...",
+    "verify:canvas-runtime": "node scripts/prepare-canvas-runtime.js --check-only"
   },
   "os": [
     "darwin",
@@ -32,11 +35,15 @@
     "skills",
     "scripts/install.js",
     "scripts/install-wizard.js",
+    "scripts/canvas-command.js",
     "scripts/platform.js",
     "scripts/run.js",
     "scripts/skills.js",
     "scripts/telemetry.js",
     "scripts/version-check.js",
+    "dist/xyq-canvas-command-runtime.cjs",
+    "dist/xyq-canvas-command-runtime.cjs.LEGAL.txt",
+    "dist/xyq-canvas-command-runtime.cjs.sha256",
     "checksums.txt",
     "README.md",
     "LICENSE"