From: claudio <claudio@openbsd.org>
Date: Thu, 20 Jul 2023 05:18:31 +0000 (+0000)
Subject: Do not set O_EXCL on open() when a published file is on the withdraw list.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=58874dc77103f96d6d5feccf576d4e9bcfdb48e9;p=openbsd

Do not set O_EXCL on open() when a published file is on the withdraw list.

If during the process of applying RRDP deltas a object is published then
withdrawn and later published again the current code fails. This is because
published elements use O_EXCL in open() but in the case above the previous
file is still around since withdraws are delayed.

Problem noticed by job@
OK tb@
---

diff --git a/usr.sbin/rpki-client/repo.c b/usr.sbin/rpki-client/repo.c
index 1a1bb49a0ee..28aa13ef996 100644
--- a/usr.sbin/rpki-client/repo.c
+++ b/usr.sbin/rpki-client/repo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: repo.c,v 1.50 2023/06/29 14:33:35 tb Exp $ */
+/*	$OpenBSD: repo.c,v 1.51 2023/07/20 05:18:31 claudio Exp $ */
 /*
  * Copyright (c) 2021 Claudio Jeker <claudio@openbsd.org>
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -873,7 +873,7 @@ rrdp_handle_file(unsigned int id, enum publish_type pt, char *uri,
 	struct filepath *fp;
 	ssize_t s;
 	char *fn = NULL;
-	int fd = -1, try = 0;
+	int fd = -1, try = 0, deleted = 0;
 	int flags;
 
 	rr = rrdp_find(id);
@@ -909,8 +909,10 @@ rrdp_handle_file(unsigned int id, enum publish_type pt, char *uri,
 		filepath_add(&rr->deleted, uri, 0);
 	} else {
 		fp = filepath_find(&rr->deleted, uri);
-		if (fp != NULL)
+		if (fp != NULL) {
 			filepath_put(&rr->deleted, fp);
+			deleted = 1;
+		}
 
 		/* add new file to rrdp dir */
 		if ((fn = rrdp_filename(rr, uri, 0)) == NULL)
@@ -920,7 +922,7 @@ rrdp_handle_file(unsigned int id, enum publish_type pt, char *uri,
 			goto fail;
 
 		flags = O_WRONLY|O_CREAT|O_TRUNC;
-		if (pt == PUB_ADD)
+		if (pt == PUB_ADD && !deleted)
 			flags |= O_EXCL;
 		fd = open(fn, flags, 0644);
 		if (fd == -1) {