Skip to content

fix: ensure rm-filename header always includes file extension (#62) #65

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
VladimirSenflokBrasty wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: ensure rm-filename header always includes file extension (#62) #65

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
17 changes: 16 additions & 1 deletion api/sync15/blobstorage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ package sync15
import (
"fmt"
"io"
"strings"

"github.com/juruen/rmapi/archive"
"github.com/juruen/rmapi/config"
"github.com/juruen/rmapi/log"
"github.com/juruen/rmapi/model"
Expand All @@ -21,11 +23,24 @@ func NewBlobStorage(http *transport.HttpClientCtx) *BlobStorage {
}
}

// reMarkable Cloud (since ~2026-05-18) rejects rm-filename header values
// without a file extension (HTTP 400 "unexpected 'rm-filename' http header").
// Several callers pass bare DocumentIDs (UUIDs) or literal "roothash"
// through to the transport layer; at this layer all such cases represent
// doc-level docSchema reads/writes, so default to the .docSchema suffix.
func ensureExtension(filename string) string {
if !strings.Contains(filename, ".") {
return filename + "." + string(archive.DocSchemaExt)
}
return filename
}

func (b *BlobStorage) GetReader(hash, filename string) (io.ReadCloser, error) {
return b.http.GetStream(transport.UserBearer, config.BlobUrl+hash, filename)
return b.http.GetStream(transport.UserBearer, config.BlobUrl+hash, ensureExtension(filename))
}

func (b *BlobStorage) UploadBlob(hash, filename string, reader io.Reader) error {
filename = ensureExtension(filename)
log.Trace.Println("uploading blob ", filename)

headers := map[string]string{}
Expand Down