Skip to content

fix(image): 修复图片上传 — token 解析与 OSS 文件 Content-Type #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kay120 wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −10
Open

fix(image): 修复图片上传 — token 解析与 OSS 文件 Content-Type #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions cmd/save/save.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,10 @@ func saveImage(cmd *cobra.Command, c *client.Client, imagePath, title string, ta
if err != nil {
return fmt.Errorf("getting upload token: %w", err)
}
if len(tokenResp.Data.Tokens) == 0 {
token := tokenResp.Data
if token.AccessID == "" || token.Policy == "" {
return fmt.Errorf("no upload token returned")
}
token := tokenResp.Data.Tokens[0]

// Step 2: upload to OSS
if !isJSON {
Expand Down
24 changes: 16 additions & 8 deletions internal/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ import (
"io"
"mime/multipart"
"net/http"
"net/textproto"
"net/url"
"os"
"path/filepath"
"strings"
"time"

"github.com/iswalle/getnote-cli/internal/config"
Expand Down Expand Up @@ -666,15 +668,12 @@ type ImageUploadToken struct {
OSSContentType string `json:"oss_content_type"`
}

// ImageUploadTokenData is the data field of the upload token response.
type ImageUploadTokenData struct {
Tokens []ImageUploadToken `json:"tokens"`
}

// ImageUploadTokenResponse is the response from the upload token endpoint.
// The API returns the token object directly under `data` (it is not wrapped
// in a `tokens` array), so Data is a single ImageUploadToken.
type ImageUploadTokenResponse struct {
Success bool `json:"success"`
Data ImageUploadTokenData `json:"data"`
Success bool `json:"success"`
Data ImageUploadToken `json:"data"`
}

// ImageGetUploadToken retrieves OSS upload credentials for the given mime type.
Expand Down Expand Up @@ -725,7 +724,16 @@ func (c *Client) ImageUploadToOSS(token ImageUploadToken, imagePath string) erro
return err
}

fw, err := w.CreateFormFile("file", filepath.Base(imagePath))
// The OSS upload policy enforces a Content-Type condition (e.g. image/png),
// so the file part must carry that exact MIME type. multipart.CreateFormFile
// hardcodes "application/octet-stream", which fails the policy check, so set
// the part header explicitly.
quoteEscaper := strings.NewReplacer("\\", "\\\\", `"`, "\\\"")
partHeader := make(textproto.MIMEHeader)
partHeader.Set("Content-Disposition",
fmt.Sprintf(`form-data; name="file"; filename="%s"`, quoteEscaper.Replace(filepath.Base(imagePath))))
partHeader.Set("Content-Type", token.OSSContentType)
fw, err := w.CreatePart(partHeader)
if err != nil {
return err
}
Expand Down