emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps_unpack_binary_pkg: bail out if required metadata plist files aren't

Browse Source 
found after processing 6 entries from the archive.

This to detect non-valid XBPS binary packages.

--HG--
extra : convert_revision : xtraeme%40gmail.com-20091207062422-fnwx9n0miq1nwadt
This commit is contained in:
Juan RP 2009-12-07 07:24:22 +01:00
parent 2d68cec780
commit 026dc6dbd9
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/unpack.c
View File

@ -120,15 +120,18 @@ unpack_archive_fini(struct archive *ar, prop_dictionary_t pkg)
{ {
prop_dictionary_t filesd = NULL, old_filesd = NULL; prop_dictionary_t filesd = NULL, old_filesd = NULL;
struct archive_entry *entry; struct archive_entry *entry;
size_t entry_idx = 0;
const char *pkgname, *version, *rootdir, *entry_str; const char *pkgname, *version, *rootdir, *entry_str;
char *buf, *buf2; char *buf, *buf2;
int rv = 0, flags, lflags; int rv = 0, flags, lflags;
bool essential, preserve, actgt, skip_entry; bool essential, preserve, actgt, skip_entry;
bool props_plist_found, files_plist_found;
assert(ar != NULL); assert(ar != NULL);
assert(pkg != NULL); assert(pkg != NULL);
essential = preserve = actgt = skip_entry = false; essential = preserve = actgt = skip_entry = false;
props_plist_found = files_plist_found = false;
rootdir = xbps_get_rootdir(); rootdir = xbps_get_rootdir();
flags = xbps_get_flags(); flags = xbps_get_flags();
@ -149,6 +152,16 @@ unpack_archive_fini(struct archive *ar, prop_dictionary_t pkg)
prop_dictionary_get_bool(pkg, "preserve", &preserve); prop_dictionary_get_bool(pkg, "preserve", &preserve);
while (archive_read_next_header(ar, &entry) == ARCHIVE_OK) { while (archive_read_next_header(ar, &entry) == ARCHIVE_OK) {
if (entry_idx >= 5) {
/*
* If we have processed 6 entries and the two
* required metadata files weren't found, bail out.
* This is not an XBPS binary package.
*/
if (!props_plist_found && !files_plist_found)
return ENOPKG;
}
entry_str = archive_entry_pathname(entry); entry_str = archive_entry_pathname(entry);
set_extract_flags(&lflags); set_extract_flags(&lflags);
if (((strcmp("./INSTALL", entry_str)) == 0) || if (((strcmp("./INSTALL", entry_str)) == 0) ||
@ -191,6 +204,7 @@ unpack_archive_fini(struct archive *ar, prop_dictionary_t pkg)
} }
/* pass to the next entry if successful */ /* pass to the next entry if successful */
free(buf); free(buf);
entry_idx++;
continue; continue;
/* /*
@ -215,6 +229,8 @@ unpack_archive_fini(struct archive *ar, prop_dictionary_t pkg)
return errno; return errno;
/* Pass to next entry */ /* Pass to next entry */
files_plist_found = true;
entry_idx++;
continue; continue;
} else if (strcmp("./props.plist", entry_str) == 0) { } else if (strcmp("./props.plist", entry_str) == 0) {
@ -224,6 +240,7 @@ unpack_archive_fini(struct archive *ar, prop_dictionary_t pkg)
return errno; return errno;
archive_entry_set_pathname(entry, buf2); archive_entry_set_pathname(entry, buf2);
free(buf2); free(buf2);
props_plist_found = true;
} else { } else {
/* /*
* Handle configuration files. * Handle configuration files.
@ -236,6 +253,7 @@ unpack_archive_fini(struct archive *ar, prop_dictionary_t pkg)
if (skip_entry) { if (skip_entry) {
archive_read_data_skip(ar); archive_read_data_skip(ar);
skip_entry = false; skip_entry = false;
entry_idx++;
continue; continue;
} }
} }
@ -256,9 +274,11 @@ unpack_archive_fini(struct archive *ar, prop_dictionary_t pkg)
archive_entry_pathname(entry)); archive_entry_pathname(entry));
} }
rv = 0; rv = 0;
entry_idx++;
continue; continue;
} }
} }
entry_idx++;
if (flags & XBPS_FLAG_VERBOSE) if (flags & XBPS_FLAG_VERBOSE)
printf(" %s\n", archive_entry_pathname(entry)); printf(" %s\n", archive_entry_pathname(entry));
} }