Add RPMERR_ILLEGAL_SYMLINK error code

Give meaningful error message when encountering unsave symlinks.
ffesti · Jun 19, 2024 · 88649f3 · 88649f3
1 parent f3cf6ea
commit 88649f3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/include/rpm/rpmarchive.h b/include/rpm/rpmarchive.h
@@ -28,6 +28,7 @@ enum rpmfilesErrorCodes {
 	RPMERR_EXIST_AS_DIR	= -14,
 	RPMERR_INVALID_SYMLINK	= -15,
 	RPMERR_ENOTDIR		= -16,
+	RPMERR_ILLEGAL_SYMLINK  = -17,
 
 	RPMERR_OPEN_FAILED	= -32768,
 	RPMERR_CHMOD_FAILED	= -32769,

diff --git a/lib/fsm.c b/lib/fsm.c
@@ -408,16 +408,17 @@ static int ensureDir(rpmPlugins plugins, const char *p, int owned, int create,
 	if (fd >= 0) {
 	    dirfd = fd;
 	} else {
+	    rc = RPMERR_OPEN_FAILED;
 	    if (!quiet) {
 		if (errno == EPERM) {
 		    rpmlog(RPMLOG_ERR, _("failed to open dir %s of %s: %s\n"),
 			   bn, p, _("Unsave symlink"));
+		    rc = RPMERR_ILLEGAL_SYMLINK;
 		} else {
 		    rpmlog(RPMLOG_ERR, _("failed to open dir %s of %s: %s\n"),
 			   bn, p, strerror(errno));
 		}
 	    }
-	    rc = RPMERR_OPEN_FAILED;
 	    break;
 	}
 

diff --git a/lib/rpmfi.c b/lib/rpmfi.c
@@ -2433,6 +2433,7 @@ char * rpmfileStrerror(int rc)
     case RPMERR_EXIST_AS_DIR:
 	s = _("File from package already exists as a directory in system");
 	break;
+    case RPMERR_ILLEGAL_SYMLINK: s = _("open failed - Unsave symlink"); break;
     }
 
     if (s != NULL) {

diff --git a/tests/rpmi.at b/tests/rpmi.at
@@ -1631,7 +1631,7 @@ runroot --setenv SOURCE_DATE_EPOCH 1699955855 rpm -U /build/RPMS/noarch/replacet
 [1],
 [],
 [error: failed to open dir opt of /opt/: Unsave symlink
-error: unpacking of archive failed on file /opt/foo;6553448f: cpio: open failed - Operation not permitted
+error: unpacking of archive failed on file /opt/foo;6553448f: cpio: open failed - Unsave symlink
 error: replacetest-1.0-1.noarch: install failed
 ])
 RPMTEST_CLEANUP