Skip to content
Merged
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
7 changes: 7 additions & 0 deletions src/main/kotlin/eu/darken/octi/server/Server.kt
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,13 @@ class Server @Inject constructor(
allowHeader("Upload-Offset")
exposeHeader(HttpHeaders.ETag)
exposeHeader(HttpHeaders.LastModified)
// ModuleRoute sets X-Modified-At with the payload's server-side
// modification timestamp. Browsers can only read non-safelisted
// response headers cross-origin when they're listed here.
// octi-web's multi-connector merge uses it to order data when the
// same peer device is reachable via two connectors — newest
// X-Modified-At per (deviceId, moduleId) wins.
exposeHeader("X-Modified-At")
exposeHeader(HttpHeaders.ContentRange)
exposeHeader(HttpHeaders.AcceptRanges)
exposeHeader(HttpHeaders.RetryAfter)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ class CorsFlowTest : TestRunner() {
"upload-expires",
"upload-state",
"x-blob-id",
"x-modified-at",
)
withClue("Access-Control-Expose-Headers='$exposed' missing: ${expected.filterNot { it in exposed }}") {
expected.forEach { (it in exposed) shouldBe true }
Expand Down