The pre-task validation in apiSnapshotsUpdate was incorrectly rejecting
PUT requests that set the Name to the snapshot's current name. This caused
a 409 response before creating a task, which broke the system test
SnapshotsAPITestCreateUpdate that expects a task to be created and then
fail inside the task.
The fix restores the 'b.Name != name' condition in the pre-task check so
that same-name updates pass through to the task, where the in-task
duplicate check will properly fail them (returning a failed task state
instead of a direct 409).
The SnapshotsAPITestCreateUpdate test expects that PUT /api/snapshots/:name
with the same Name in the body returns a conflict error. The previous fix
added 'b.Name != name' guards to skip the duplicate check when the name
hasn't changed, but this broke the test which expects the old behavior:
any existing name (including the snapshot's own current name) should be
rejected as a duplicate.
Remove the 'b.Name != name' condition from both the pre-task validation
and the in-task duplicate check so the behavior matches the original.
The gin context (c) may be recycled after the HTTP handler returns 202
for async tasks. Accessing c.Params.ByName() inside the task closure
returns an empty string, causing 'mirror with name not found' errors.
Capture the URL :name parameter into a local variable before the
closure so it is safely captured by value.
Affected endpoints:
- PUT /api/mirrors/:name (apiMirrorsUpdate)
- POST/DELETE /api/repos/:name/packages (apiReposPackagesAddDelete)
Affected endpoints: apiMirrorsDrop, apiMirrorsUpdate.
Both endpoints shared the same architectural flaw as the previously fixed
publish, repos, and snapshot endpoints: operations were performed outside
the task lock, with stale DB state used inside the lock.
Issues Fixed:
1. apiMirrorsDrop - Collections created before task lock
Problem: mirrorCollection and snapshotCollection created before task lock.
Snapshot dependency check done with stale factory. Concurrent drops both
load pre-task state, both see same snapshot dependencies. If snapshots
created after pre-task check, can delete mirror used by snapshots.
Fix: Create fresh taskCollectionFactory inside task, fresh load of mirror
after lock acquired, fresh snapshot check with current factory, drop using
fresh collections.
2. apiMirrorsUpdate - Mirror loaded before task lock
Problem: remote loaded outside task, rename duplicate check with stale
factory. Concurrent updates both load pre-task state, long-running update
uses stale mirror reference. TOCTOU race: rename check passes, another
creates mirror with same name, update saves with stale data.
Fix: Create fresh taskCollectionFactory inside task, fresh load of mirror
after lock acquired, pre-task rename validation, fresh rename check inside
lock, use fresh mirror and collections for all operations.
Root cause analysis:
The fundamental issue is the split between pre-task work and task-protected
work. Collections and objects were being loaded before lock acquisition, then
stale copies used inside the lock.
Correct pattern (from fixed publish.go, repos.go, and snapshot.go):
1. HTTP Handler (before task lock):
- Shallow load for 404 check only
- Extract resource keys
- Submit task with resources
2. Task Closure (after lock acquired):
- Create fresh collectionFactory
- Fresh load of all objects
- LoadComplete on fresh copies
- All mutations on fresh state
- All checks atomic inside lock
- Save using fresh collections
This ensures:
- Concurrent operations are serialized by task queue
- No stale DB state used for mutations
- No lost updates from concurrent modifications
- No TOCTOU races on duplicate checks
- No loss of mirrors used by snapshots
- No stale data in long-running updates
Affected endpoints: apiSnapshotsCreate, apiSnapshotsUpdate, apiSnapshotsDrop,
apiSnapshotsMerge, apiSnapshotsPull.
All five endpoints shared the same architectural flaw as the previously fixed
repos and publish endpoints: operations were performed outside the task lock,
with stale DB state used inside the lock.
Issues Fixed:
1. apiSnapshotsCreate - Source snapshots loaded before task lock
Problem: snapshotCollection and collectionFactory created before task lock.
Source snapshots and destination check done with stale factory.
Concurrent creates both load pre-task state, second overwrites first.
Fix: Create fresh taskCollectionFactory inside task, fresh loads of all
sources after lock acquired, pre-task duplicate check for destination,
use fresh sources and collections for snapshot creation.
2. apiSnapshotsUpdate - Snapshot loaded before task lock
Problem: snapshot loaded outside task, duplicate check with stale factory.
Concurrent renames both load pre-task state, both pass check, second
overwrites first.
Fix: Create fresh taskCollectionFactory inside task, fresh load of snapshot
after lock acquired, fresh duplicate check inside lock, pre-task validation
of new name, atomic rename with fresh copy.
3. apiSnapshotsDrop - Collections created before task lock
Problem: snapshotCollection and publishedCollection created before task lock.
Concurrent snapshot/published modifications not detected. Can delete snapshot
that becomes published between pre-task and task.
Fix: Create fresh taskCollectionFactory inside task, fresh load of snapshot,
fresh collections for all checks (published, source dependency), all checks
inside lock.
4. apiSnapshotsMerge - Source snapshots loaded before task lock
Problem: snapshotCollection created before task lock. Source snapshots
loaded outside task, LoadComplete called on stale copies. Concurrent
merges both load pre-task state, merge result doesn't include source changes.
Fix: Create fresh taskCollectionFactory inside task, fresh load of all
sources after lock acquired, LoadComplete on fresh copies, merge using
fresh RefLists, save using fresh factory.
5. apiSnapshotsPull - Snapshots loaded before task lock
Problem: toSnapshot and sourceSnapshot loaded outside task,
collectionFactory created before task. LoadComplete called on stale copies.
Concurrent pulls load pre-task state, pull doesn't include source changes.
Fix: Create fresh taskCollectionFactory inside task, fresh load of both
snapshots after lock acquired, LoadComplete on fresh copies, all filtering
and pulling on fresh RefLists, save using fresh factory.
Root cause analysis:
The fundamental issue is the split between pre-task work and task-protected
work. Collections and objects were being loaded before lock acquisition, then
stale copies used inside the lock.
Correct pattern (from fixed publish.go and repos.go):
1. HTTP Handler (before task lock):
- Shallow load for 404 check only
- Extract resource keys
- Submit task with resources
2. Task Closure (after lock acquired):
- Create fresh collectionFactory
- Fresh load of all objects
- LoadComplete on fresh copies
- All mutations on fresh state
- All checks atomic inside lock
- Save using fresh collections
This ensures:
- Concurrent operations are serialized by task queue
- No stale DB state used for mutations
- No lost updates from concurrent modifications
- No TOCTOU races on duplicate checks
- No DB handle issues from pre-task factory capture
Affected endpoints: apiReposDrop, apiReposPackagesAddDelete,
apiReposPackageFromDir, apiReposCopyPackage, apiReposIncludePackageFromDir,
apiReposEdit, apiReposCreate.
All seven endpoints shared the same architectural flaw as the previously
fixed publish endpoints: operations were performed outside the task lock,
with stale DB state used inside the lock.
Issues Fixed:
1. apiReposDrop - Collections created before task lock
Problem: snapshotCollection, publishedCollection captured from pre-task
factory. Concurrent snapshot/published modifications not detected.
Fix: Create fresh taskCollectionFactory inside task, re-read repo after
lock acquired, use fresh collections for checks.
2. apiReposPackagesAddDelete - Repo and factory stale before lock
Problem: repo loaded outside task, collectionFactory created before lock.
Concurrent add/delete operations both load same pre-task state, last
write wins, packages lost.
Fix: Create fresh taskCollectionFactory inside task, re-read repo after
lock acquired, use fresh factory for all operations.
3. apiReposPackageFromDir - Repo and factory stale before lock
Problem: repo loaded outside task, collectionFactory created before lock.
Concurrent file imports both load same pre-task state, last write wins.
Fix: Create fresh taskCollectionFactory inside task, re-read repo after
lock acquired, use fresh factory for imports.
4. apiReposCopyPackage - Both repos and factory stale before lock
Problem: dstRepo and srcRepo loaded outside task, collectionFactory
created before lock. Concurrent copy operations race on stale state.
Fix: Create fresh taskCollectionFactory inside task, re-read both repos
after lock acquired, use fresh factory for all operations.
5. apiReposIncludePackageFromDir - Repo and factory stale before lock
Problem: repo loaded outside task, collectionFactory created before lock.
Concurrent .changes file processing races on stale state.
Fix: Create fresh taskCollectionFactory inside task, use fresh factory
for import operations.
6. apiReposEdit - No serialization, concurrent modification race
Problem: Direct update without task locking. Two concurrent renames can
both pass duplicate check, second overwrites first.
Fix: Convert to async task. Duplicate check and update now atomic inside
lock, after fresh load from DB.
7. apiReposCreate - No serialization, TOCTOU on duplicate check
Problem: Duplicate check outside task lock, add outside lock. Two
concurrent creates with same name both pass check, second overwrites first.
Fix: Convert to async task. Duplicate check and add now atomic inside
lock, after fresh load from DB.
Root cause analysis:
The fundamental issue is the split between pre-task work and task-protected
work. Collections and objects were being loaded before lock acquisition, then
stale copies used inside the lock.
Correct pattern (now applied consistently across all 7 endpoints):
1. HTTP Handler (before task lock):
- Shallow load for 404 check only
- Extract resource keys
- Submit task with resources
2. Task Closure (after lock acquired):
- Create fresh collectionFactory
- Fresh load of all objects
- LoadComplete on fresh copies
- All mutations on fresh state
- All checks atomic inside lock
- Save using fresh collections
This ensures:
- Concurrent operations are serialized by task queue
- No stale DB state used for mutations
- No lost updates from concurrent modifications
- No TOCTOU races on duplicate checks
- No DB handle issues from pre-task factory capture
Affected endpoint: apiPublishUpdateSwitch (PUT /api/publish/{prefix}/{distribution}).
The handler registered only the published repo key as a task resource.
The underlying source repos (for local) or snapshots (for snapshot-based
published repos) were not locked. Concurrent updates to a source repo
or snapshot while a publish-update/switch task was running could produce
inconsistent published indexes:
Task A: apiPublishUpdateSwitch loads published, reads source repo/snapshot
Request B: modifies same source repo or snapshot (add/remove packages, etc)
Task A: Update() + Publish() reads stale/modified source -> inconsistent
published index, or partial write if source deleted mid-task.
Fix: for SourceLocalRepo, iterate published.Sources (component -> source
UUID), look up each local repo via localRepoCollection.ByUUID and append
string(repo.Key()) to resources. For SourceSnapshot, iterate b.Snapshots,
look up each snapshot via snapshotCollection.ByName and append
string(snapshot.ResourceKey()) to resources. Task queue now serialises
against both the published repo and all its sources.
When b.Distribution is empty, the pre-registered resource key
U<storage>:<prefix>>><distribution> cannot be constructed, so
concurrent POST requests to the same prefix are not serialized by the
task queue. Add a log warning so operators are aware of the gap.
Affected endpoints: apiPublishRepoOrSnapshot (POST /api/publish/{prefix}),
apiPublishDrop (DELETE /api/publish/{prefix}/{distribution}).
Both handlers used the outer-scoped collectionFactory and collection
variables inside the task closure. These were captured before the task
lock was acquired, so under concurrent load each task operated on a
stale DB view:
apiPublishRepoOrSnapshot: snapshot/localRepo LoadComplete,
NewPublishedRepo, CheckDuplicate, Publish, and collection.Add all
used the pre-lock collectionFactory/collection. Two concurrent
POST to same prefix could both pass CheckDuplicate (neither sees
the other in the stale DB view) and race on disk writes.
apiPublishDrop: collection.Remove used pre-lock collection,
potentially racing with concurrent updates/other drops.
Fix: inside the task closure create a fresh taskCollectionFactory and
taskCollection. All DB reads (LoadComplete) and writes
(CheckDuplicate, Add, Remove, Publish) now run against the authoritative
DB state after the lock is held.
Affected endpoints: apiPublishUpdateSwitch (PUT), apiPublishUpdate (POST).
Both handlers loaded the published repo and mutated scalar fields
(Label, Origin, SkipContents, SkipBz2, AcquireByHash, SignedBy,
MultiDist, Version) outside the task closure, before the lock was
acquired. Inside the task, LoadComplete only refreshed sourceItems —
it did not reload scalar fields or the Revision. Two concurrent
requests therefore each operated on a stale base:
Request A loads published (Label="old"), sets Label="A"
Request B loads published (Label="old"), sets Label="B"
Task A runs: Update() + Publish() + collection.Update() -> saves Label="A"
Task B runs: Update() on B's stale copy -> saves Label="B",
silently discarding A's Label change and potentially
reconciling a Revision built against the pre-A state.
Fix: remove all field mutations and the LoadComplete call from the HTTP
handler. Inside the task, a fresh taskCollectionFactory is created, the
published repo is re-read via ByStoragePrefixDistribution + LoadComplete
(obtaining the current DB state after the lock is held), and then all
field mutations are applied before Update / Publish / collection.Update.
Affected endpoints: apiPublishAddSource, apiPublishSetSources,
apiPublishUpdateSource, apiPublishRemoveSource, apiPublishDropChanges.
All five handlers shared the same flawed pattern: they loaded the
published repo from the DB and mutated it (ObtainRevision / DropRevision)
outside the task closure, before the task lock was acquired. Each task
closure then just wrote back the already-mutated, pre-lock object.
Because the task queue serialises tasks that share a resource key, two
concurrent requests appear safe — but each task closure holds a stale
copy of the object captured before the lock was taken:
Request A loads published: revision = {}
Request B loads published: revision = {} <- same DB state
A mutates: revision = {main: snap1}
B mutates: revision = {contrib: snap2}
Task A runs: saves {main: snap1} OK
Task B runs: saves {contrib: snap2} <- clobbers A's change
Fix: perform only a shallow ByStoragePrefixDistribution outside the task
(for the early 404 response, resource key, and task name). Inside the
task closure a dedicated taskCollectionFactory is created, the published
repo is re-read fresh from the DB (after the lock is acquired), and
LoadComplete + all mutations + Update are executed against that
authoritative copy.
apiPublishRepoOrSnapshot appended published.Key() to resources inside
the task closure, after maybeRunTaskInBackground had already been called.
The task's locked-resource set is fixed at submission time, so that append
had no effect — the published repo key was never registered as a resource.
Two concurrent POST /api/publish/{prefix} requests for the same
prefix/distribution therefore did not conflict in the task queue: both
ran in parallel, each loaded an empty PublishedRepoCollection from the DB,
both passed CheckDuplicate, and the second Add silently overwrote the first.
Fix: compute the published repo key ("U{storagePrefix}>>{distribution}")
from the already-known storage/prefix/distribution values and append it to
resources before calling maybeRunTaskInBackground, so concurrent creates
for the same destination are serialised by the task queue. The now-dead
append inside the closure is removed.
add API response wrappers with NumPackages derived from RefList length; keep show endpoint payloads unchanged for backward compatibility; add API tests for list endpoint NumPackages; update swagger response schemas for list endpoints
https://wiki.debian.org/DebianRepository/Format#Signed-By says:
> **Signed-By**
> An optional field containing a comma separated list of
> OpenPGP key fingerprints to be used for validating
> the next Release file. The fingerprints must consist
> only of hex digits and may not contain spaces.
> The fingerprint specifies either the key the Release file
> must be signed with or the key the signature key must be
> a subkey of. The later match can be disabled by appending
> an exclamation mark to the fingerprint.
>
> If the field is present, a client should only accept future updates
> to the repository that are signed with keys listed in the field.
> The field should be ignored if the Valid-Until field is not present
> or if it is expired.
For both the CLI tools and JSON, the field is taken as a string verbatim.
When specified, we must also provide `Valid-Until` field,
and i'm not sure there is an 'infinity' value for it,
so 100 years will have to do?
Fixes https://github.com/aptly-dev/aptly/issues/1497
André Roth
Pierig Le Saux
Philip Cramer
Russell Greene
tom
Zhang Xiao
Ales Bregar
Brian Witt
Roman Lebedev
Juan Calderon-Perez
chesseed
Tobias Assarsson
JupiterRider
Itay Porezky