handle conflict in postFile

cstyan · cstyan · commit a009ba710ed3 · 2025-07-22T18:48:46.000Z
Signed-off-by: Callum Styan &lt;callumstyan@gmail.com&gt;
diff --git a/coderd/files.go b/coderd/files.go
@@ -118,11 +118,22 @@ func (api *API) postFile(rw http.ResponseWriter, r *http.Request) {
 		Data:      data,
 	})
 	if err != nil {
-		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
-			Message: "Internal error saving file.",
-			Detail:  err.Error(),
-		})
-		return
+		if database.IsUniqueViolation(err, database.UniqueFilesHashCreatedByKey) {
+			// The file was uploaded by some concurrent process since the last time we checked for it, fetch it again.
+			file, err = api.Database.GetFileByHashAndCreator(ctx, database.GetFileByHashAndCreatorParams{
+				Hash:      hash,
+				CreatedBy: apiKey.UserID,
+			})
+		}
+		// At this point the first error was either not the UniqueViolation OR there's still an error even after we
+		// attempt to fetch the file again, so we should return here.
+		if err != nil {
+			httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
+				Message: "Internal error saving file.",
+				Detail:  err.Error(),
+			})
+			return
+		}
 	}
 
 	httpapi.Write(ctx, rw, http.StatusCreated, codersdk.UploadResponse{
