From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 4 May 2021 02:21:29 +0000 (+0100)
Subject: bundles download: swap locking order
X-Git-Tag: otter-0.6.0~393
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=40052cdec7f1f6b9657f21436ab6504b5be0ef25;p=otter.git

bundles download: swap locking order

We're going to want to keep ig a bit longer

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/daemon/main.rs b/daemon/main.rs
index 8c77888d..225941f8 100644
--- a/daemon/main.rs
+++ b/daemon/main.rs
@@ -242,9 +242,9 @@ fn bundle<'r>(instance: Parse<InstanceName>,
   let id = id.0;
   let gref = Instance::lookup_by_name_unauth(instance)
     .map_err(|_| BadAssetUrlToken)?;
+  let ig = gref.lock().map_err(|_| BadAssetUrlToken)?;
   let auth = {
-    let gref = gref.by_ref(Authorisation::authorise_any());
-    let ig = gref.lock().map_err(|_| BadAssetUrlToken)?;
+    let ig = ig.by_ref(Authorisation::authorise_any());
     ig.asset_url_key.check("bundle", &(instance, id), &token)?
   }.map(|(_,id)| id);
   let f = id.open_by_name(instance, auth).map_err(IE::from)?;