6:41 a.m.
Also use a cleanup attribue to ease the close of the magic_t handle.
This is mostly code motion, hopefully with no actual behaviour changes.
---
src/filearch.c | 100 +++++++++++++++++++++++++++++++++++++++------------------
1 file changed, 68 insertions(+), 32 deletions(-)
diff --git a/src/filearch.c b/src/filearch.c
index 8708a4b..219eaae 100644
--- a/src/filearch.c
+++ b/src/filearch.c
@@ -42,6 +42,22 @@
#if defined(HAVE_LIBMAGIC)
+# ifdef HAVE_ATTRIBUTE_CLEANUP
+# define CLEANUP_MAGIC_T_FREE __attribute__((cleanup(cleanup_magic_t_free)))
+
+static void
+cleanup_magic_t_free (void *ptr)
+{
+ magic_t m = *(magic_t *) ptr;
+
+ if (m)
+ magic_close (m);
+}
+
+# else
+# define CLEANUP_MAGIC_T_FREE
+# endif
+
COMPILE_REGEXP (re_file_elf,
"ELF.*(?:executable|shared object|relocatable), (.+?),", 0)
COMPILE_REGEXP (re_elf_ppc64, "64.*PowerPC", 0)
@@ -92,6 +108,55 @@ is_regular_file (const char *filename)
return lstat (filename, &statbuf) == 0 && S_ISREG (statbuf.st_mode);
}
+static char *
+magic_for_file (guestfs_h *g, const char *filename, bool *loading_ok,
+ bool *matched)
+{
+ int flags;
+ CLEANUP_MAGIC_T_FREE magic_t m = NULL;
+ const char *line;
+ char *elf_arch;
+
+ flags = g->verbose ? MAGIC_DEBUG : 0;
+ flags |= MAGIC_ERROR | MAGIC_RAW;
+
+ if (loading_ok)
+ *loading_ok = false;
+ if (matched)
+ *matched = false;
+
+ m = magic_open (flags);
+ if (m == NULL) {
+ perrorf (g, "magic_open");
+ return NULL;
+ }
+
+ if (magic_load (m, NULL) == -1) {
+ perrorf (g, "magic_load: default magic database file");
+ return NULL;
+ }
+
+ line = magic_file (m, filename);
+ if (line == NULL) {
+ perrorf (g, "magic_file: %s", filename);
+ return NULL;
+ }
+
+ if (loading_ok)
+ *loading_ok = true;
+
+ elf_arch = match1 (g, line, re_file_elf);
+ if (elf_arch == NULL) {
+ error (g, "no re_file_elf match in '%s'", line);
+ return NULL;
+ }
+
+ if (matched)
+ *matched = true;
+
+ return canonical_elf_arch (g, elf_arch);
+}
+
/* Download and uncompress the cpio file to find binaries within. */
static const char *initrd_binaries[] = {
"bin/ls",
@@ -170,40 +235,11 @@ cpio_arch (guestfs_h *g, const char *file, const char *path)
safe_asprintf (g, "%s/%s", dir, initrd_binaries[i]);
if (is_regular_file (bin)) {
- int flags;
- magic_t m;
- const char *line;
- CLEANUP_FREE char *elf_arch = NULL;
-
- flags = g->verbose ? MAGIC_DEBUG : 0;
- flags |= MAGIC_ERROR | MAGIC_RAW;
-
- m = magic_open (flags);
- if (m == NULL) {
- perrorf (g, "magic_open");
- goto out;
- }
-
- if (magic_load (m, NULL) == -1) {
- perrorf (g, "magic_load: default magic database file");
- magic_close (m);
- goto out;
- }
-
- line = magic_file (m, bin);
- if (line == NULL) {
- perrorf (g, "magic_file: %s", bin);
- magic_close (m);
- goto out;
- }
+ bool loading_ok, matched;
- elf_arch = match1 (g, line, re_file_elf);
- if (elf_arch != NULL) {
- ret = canonical_elf_arch (g, elf_arch);
- magic_close (m);
+ ret = magic_for_file (g, bin, &loading_ok, &matched);
+ if (!loading_ok || matched)
goto out;
- }
- magic_close (m);
}
}
error (g, "file_architecture: could not determine architecture of cpio
archive");
--
2.1.0
6:42 a.m.
New subject: [PATCH 2/2] filearch: support gzip/xz-compressed files
Extract them to find out the architecture of the data they hold.
Useful to detect the architecture of e.g. compressed Linux modules.
---
src/filearch.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 64 insertions(+)
diff --git a/src/filearch.c b/src/filearch.c
index 219eaae..df65c98 100644
--- a/src/filearch.c
+++ b/src/filearch.c
@@ -250,6 +250,66 @@ cpio_arch (guestfs_h *g, const char *file, const char *path)
return ret;
}
+static char *
+compressed_file_arch (guestfs_h *g, const char *path, const char *method)
+{
+ CLEANUP_FREE char *tmpdir = guestfs_get_tmpdir (g), *dir = NULL;
+ CLEANUP_FREE char *tempfile = NULL, *tempfile_extracted = NULL;
+ CLEANUP_CMD_CLOSE struct command *cmd = guestfs_int_new_command (g);
+ char *ret = NULL;
+ int64_t size;
+ int r;
+ bool matched;
+
+ if (asprintf (&dir, "%s/libguestfsXXXXXX", tmpdir) == -1) {
+ perrorf (g, "asprintf");
+ return NULL;
+ }
+
+ /* Security: Refuse to download file if it is huge. */
+ size = guestfs_filesize (g, path);
+ if (size == -1 || size > 10000000) {
+ error (g, _("size of %s unreasonable (%" PRIi64 " bytes)"),
+ path, size);
+ goto out;
+ }
+
+ if (mkdtemp (dir) == NULL) {
+ perrorf (g, "mkdtemp");
+ goto out;
+ }
+
+ tempfile = safe_asprintf (g, "%s/file", dir);
+ if (guestfs_download (g, path, tempfile) == -1)
+ goto out;
+
+ tempfile_extracted = safe_asprintf (g, "%s/file_extracted", dir);
+
+ /* Construct a command to extract named binaries from the initrd file. */
+ guestfs_int_cmd_add_string_unquoted (cmd, method);
+ guestfs_int_cmd_add_string_unquoted (cmd, " ");
+ guestfs_int_cmd_add_string_quoted (cmd, tempfile);
+ guestfs_int_cmd_add_string_unquoted (cmd, " > ");
+ guestfs_int_cmd_add_string_quoted (cmd, tempfile_extracted);
+
+ r = guestfs_int_cmd_run (cmd);
+ if (r == -1)
+ goto out;
+ if (!WIFEXITED (r) || WEXITSTATUS (r) != 0) {
+ guestfs_int_external_command_failed (g, r, method, path);
+ goto out;
+ }
+
+ ret = magic_for_file (g, tempfile_extracted, NULL, &matched);
+ if (!matched)
+ error (g, "file_architecture: could not determine architecture of compressed
file");
+
+ out:
+ guestfs_int_recursive_remove_dir (g, dir);
+
+ return ret;
+}
+
char *
guestfs_impl_file_architecture (guestfs_h *g, const char *path)
{
@@ -272,6 +332,10 @@ guestfs_impl_file_architecture (guestfs_h *g, const char *path)
ret = safe_strdup (g, "x86_64");
else if (strstr (file, "cpio archive"))
ret = cpio_arch (g, file, path);
+ else if (strstr (file, "gzip compressed data"))
+ ret = compressed_file_arch (g, path, "zcat");
+ else if (strstr (file, "XZ compressed data"))
+ ret = compressed_file_arch (g, path, "xzcat");
else
error (g, "file_architecture: unknown architecture: %s", path);
--
2.1.0
12:01 p.m.
New subject: [PATCH 2/2] filearch: support gzip/xz-compressed files
On Mon, Apr 13, 2015 at 01:42:00PM +0200, Pino Toscano wrote:
Extract them to find out the architecture of the data they hold.
Useful to detect the architecture of e.g. compressed Linux modules.
---
src/filearch.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 64 insertions(+)
diff --git a/src/filearch.c b/src/filearch.c
index 219eaae..df65c98 100644
--- a/src/filearch.c
+++ b/src/filearch.c
@@ -250,6 +250,66 @@ cpio_arch (guestfs_h *g, const char *file, const char *path)
return ret;
}
+static char *
+compressed_file_arch (guestfs_h *g, const char *path, const char *method)
+{
+ CLEANUP_FREE char *tmpdir = guestfs_get_tmpdir (g), *dir = NULL;
+ CLEANUP_FREE char *tempfile = NULL, *tempfile_extracted = NULL;
+ CLEANUP_CMD_CLOSE struct command *cmd = guestfs_int_new_command (g);
+ char *ret = NULL;
+ int64_t size;
+ int r;
+ bool matched;
+
+ if (asprintf (&dir, "%s/libguestfsXXXXXX", tmpdir) == -1) {
+ perrorf (g, "asprintf");
+ return NULL;
+ }
+
+ /* Security: Refuse to download file if it is huge. */
+ size = guestfs_filesize (g, path);
+ if (size == -1 || size > 10000000) {
+ error (g, _("size of %s unreasonable (%" PRIi64 " bytes)"),
+ path, size);
+ goto out;
+ }
+
+ if (mkdtemp (dir) == NULL) {
+ perrorf (g, "mkdtemp");
+ goto out;
+ }
+
+ tempfile = safe_asprintf (g, "%s/file", dir);
+ if (guestfs_download (g, path, tempfile) == -1)
+ goto out;
+
+ tempfile_extracted = safe_asprintf (g, "%s/file_extracted", dir);
+
+ /* Construct a command to extract named binaries from the initrd file. */
+ guestfs_int_cmd_add_string_unquoted (cmd, method);
+ guestfs_int_cmd_add_string_unquoted (cmd, " ");
+ guestfs_int_cmd_add_string_quoted (cmd, tempfile);
+ guestfs_int_cmd_add_string_unquoted (cmd, " > ");
+ guestfs_int_cmd_add_string_quoted (cmd, tempfile_extracted);
+
+ r = guestfs_int_cmd_run (cmd);
+ if (r == -1)
+ goto out;
+ if (!WIFEXITED (r) || WEXITSTATUS (r) != 0) {
+ guestfs_int_external_command_failed (g, r, method, path);
+ goto out;
+ }
+
+ ret = magic_for_file (g, tempfile_extracted, NULL, &matched);
+ if (!matched)
+ error (g, "file_architecture: could not determine architecture of compressed
file");
+
+ out:
+ guestfs_int_recursive_remove_dir (g, dir);
+
+ return ret;
+}
+
char *
guestfs_impl_file_architecture (guestfs_h *g, const char *path)
{
@@ -272,6 +332,10 @@ guestfs_impl_file_architecture (guestfs_h *g, const char *path)
ret = safe_strdup (g, "x86_64");
else if (strstr (file, "cpio archive"))
ret = cpio_arch (g, file, path);
+ else if (strstr (file, "gzip compressed data"))
+ ret = compressed_file_arch (g, path, "zcat");
+ else if (strstr (file, "XZ compressed data"))
+ ret = compressed_file_arch (g, path, "xzcat");
else
error (g, "file_architecture: unknown architecture: %s", path);
ACK .. but ..
This really needs a test. Can you just add gzip- and xz-compressed
arch files into tests/data/ and associated tests in
generator/actions.ml.
Rich.
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine. Supports Linux and Windows.
http://people.redhat.com/~rjones/virt-df/
4:21 a.m.
New subject: [PATCH] filearch: support gzip/xz-compressed files
Extract them to find out the architecture of the data they hold.
Useful to detect the architecture of e.g. compressed Linux modules.
Provide in the test.iso two samples (compressing existing test data) of
binaries compressed with gzip and xz.
---
.gitignore | 2 ++
generator/actions.ml | 4 ++++
src/filearch.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++
tests/data/Makefile.am | 12 ++++++++++
4 files changed, 82 insertions(+)
diff --git a/.gitignore b/.gitignore
index 9c329a0..abfaaf3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -515,12 +515,14 @@ Makefile.in
/tests/data/100krandom
/tests/data/10klines
/tests/data/abssymlink
+/tests/data/bin-x86_64-dynamic.gz
/tests/data/blank-disk-*
/tests/data/blank-disk-*
/tests/data/hello.b64
/tests/data/initrd
/tests/data/initrd-x86_64.img
/tests/data/initrd-x86_64.img.gz
+/tests/data/lib-i586.so.xz
/tests/data/test-grep.txt.gz
/tests/data/test.iso
/tests/disks/test-qemu-drive-libvirt.xml
diff --git a/generator/actions.ml b/generator/actions.ml
index 11ea436..1a89869 100644
--- a/generator/actions.ml
+++ b/generator/actions.ml
@@ -813,6 +813,10 @@ to specify the QEMU interface emulation to use at run time." };
[["file_architecture"; "/initrd-x86_64.img"]],
"x86_64"), [];
InitISOFS, Always, TestResultString (
[["file_architecture"; "/initrd-x86_64.img.gz"]],
"x86_64"), [];
+ InitISOFS, Always, TestResultString (
+ [["file_architecture"; "/bin-x86_64-dynamic.gz"]],
"x86_64"), [];
+ InitISOFS, Always, TestResultString (
+ [["file_architecture"; "/lib-i586.so.xz"]],
"i386"), [];
];
shortdesc = "detect the architecture of a binary file";
longdesc = "\
diff --git a/src/filearch.c b/src/filearch.c
index 219eaae..df65c98 100644
--- a/src/filearch.c
+++ b/src/filearch.c
@@ -250,6 +250,66 @@ cpio_arch (guestfs_h *g, const char *file, const char *path)
return ret;
}
+static char *
+compressed_file_arch (guestfs_h *g, const char *path, const char *method)
+{
+ CLEANUP_FREE char *tmpdir = guestfs_get_tmpdir (g), *dir = NULL;
+ CLEANUP_FREE char *tempfile = NULL, *tempfile_extracted = NULL;
+ CLEANUP_CMD_CLOSE struct command *cmd = guestfs_int_new_command (g);
+ char *ret = NULL;
+ int64_t size;
+ int r;
+ bool matched;
+
+ if (asprintf (&dir, "%s/libguestfsXXXXXX", tmpdir) == -1) {
+ perrorf (g, "asprintf");
+ return NULL;
+ }
+
+ /* Security: Refuse to download file if it is huge. */
+ size = guestfs_filesize (g, path);
+ if (size == -1 || size > 10000000) {
+ error (g, _("size of %s unreasonable (%" PRIi64 " bytes)"),
+ path, size);
+ goto out;
+ }
+
+ if (mkdtemp (dir) == NULL) {
+ perrorf (g, "mkdtemp");
+ goto out;
+ }
+
+ tempfile = safe_asprintf (g, "%s/file", dir);
+ if (guestfs_download (g, path, tempfile) == -1)
+ goto out;
+
+ tempfile_extracted = safe_asprintf (g, "%s/file_extracted", dir);
+
+ /* Construct a command to extract named binaries from the initrd file. */
+ guestfs_int_cmd_add_string_unquoted (cmd, method);
+ guestfs_int_cmd_add_string_unquoted (cmd, " ");
+ guestfs_int_cmd_add_string_quoted (cmd, tempfile);
+ guestfs_int_cmd_add_string_unquoted (cmd, " > ");
+ guestfs_int_cmd_add_string_quoted (cmd, tempfile_extracted);
+
+ r = guestfs_int_cmd_run (cmd);
+ if (r == -1)
+ goto out;
+ if (!WIFEXITED (r) || WEXITSTATUS (r) != 0) {
+ guestfs_int_external_command_failed (g, r, method, path);
+ goto out;
+ }
+
+ ret = magic_for_file (g, tempfile_extracted, NULL, &matched);
+ if (!matched)
+ error (g, "file_architecture: could not determine architecture of compressed
file");
+
+ out:
+ guestfs_int_recursive_remove_dir (g, dir);
+
+ return ret;
+}
+
char *
guestfs_impl_file_architecture (guestfs_h *g, const char *path)
{
@@ -272,6 +332,10 @@ guestfs_impl_file_architecture (guestfs_h *g, const char *path)
ret = safe_strdup (g, "x86_64");
else if (strstr (file, "cpio archive"))
ret = cpio_arch (g, file, path);
+ else if (strstr (file, "gzip compressed data"))
+ ret = compressed_file_arch (g, path, "zcat");
+ else if (strstr (file, "XZ compressed data"))
+ ret = compressed_file_arch (g, path, "xzcat");
else
error (g, "file_architecture: unknown architecture: %s", path);
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index dd7c01a..b0bf58a 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -76,6 +76,7 @@ images_files_build = \
100kallspaces \
100krandom \
10klines \
+ bin-x86_64-dynamic.gz \
blank-disk-1s.raw \
blank-disk-1s.qcow2 \
blank-disk-1K.raw \
@@ -87,6 +88,7 @@ images_files_build = \
initrd \
initrd-x86_64.img \
initrd-x86_64.img.gz \
+ lib-i586.so.xz \
test-grep.txt.gz
check_DATA = $(images_files_build) test.iso
@@ -193,3 +195,13 @@ test-grep.txt.gz: test-grep.txt
rm -f $@ $@-t
gzip --best -c $< > $@-t
mv $@-t $@
+
+bin-x86_64-dynamic.gz: bin-x86_64-dynamic
+ rm -f $@ $@-t
+ gzip --best -c $< > $@-t
+ mv $@-t $@
+
+lib-i586.so.xz: lib-i586.so
+ rm -f $@ $@-t
+ xz -c $< > $@-t
+ mv $@-t $@
--
2.1.0
4:52 a.m.
New subject: [PATCH] filearch: support gzip/xz-compressed files
ACK
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-top is 'top' for virtual machines. Tiny program with many
powerful monitoring features, net stats, disk stats, logging, etc.
http://people.redhat.com/~rjones/virt-top
11:58 a.m.
On Mon, Apr 13, 2015 at 01:41:59PM +0200, Pino Toscano wrote:
Also use a cleanup attribue to ease the close of the magic_t handle.
This is mostly code motion, hopefully with no actual behaviour changes.
---
src/filearch.c | 100 +++++++++++++++++++++++++++++++++++++++------------------
1 file changed, 68 insertions(+), 32 deletions(-)
diff --git a/src/filearch.c b/src/filearch.c
index 8708a4b..219eaae 100644
--- a/src/filearch.c
+++ b/src/filearch.c
@@ -42,6 +42,22 @@
#if defined(HAVE_LIBMAGIC)
+# ifdef HAVE_ATTRIBUTE_CLEANUP
+# define CLEANUP_MAGIC_T_FREE __attribute__((cleanup(cleanup_magic_t_free)))
+
+static void
+cleanup_magic_t_free (void *ptr)
+{
+ magic_t m = *(magic_t *) ptr;
+
+ if (m)
+ magic_close (m);
+}
+
+# else
+# define CLEANUP_MAGIC_T_FREE
+# endif
+
COMPILE_REGEXP (re_file_elf,
"ELF.*(?:executable|shared object|relocatable), (.+?),", 0)
COMPILE_REGEXP (re_elf_ppc64, "64.*PowerPC", 0)
@@ -92,6 +108,55 @@ is_regular_file (const char *filename)
return lstat (filename, &statbuf) == 0 && S_ISREG (statbuf.st_mode);
}
+static char *
+magic_for_file (guestfs_h *g, const char *filename, bool *loading_ok,
+ bool *matched)
+{
+ int flags;
+ CLEANUP_MAGIC_T_FREE magic_t m = NULL;
+ const char *line;
+ char *elf_arch;
+
+ flags = g->verbose ? MAGIC_DEBUG : 0;
+ flags |= MAGIC_ERROR | MAGIC_RAW;
+
+ if (loading_ok)
+ *loading_ok = false;
+ if (matched)
+ *matched = false;
+
+ m = magic_open (flags);
+ if (m == NULL) {
+ perrorf (g, "magic_open");
+ return NULL;
+ }
+
+ if (magic_load (m, NULL) == -1) {
+ perrorf (g, "magic_load: default magic database file");
+ return NULL;
+ }
+
+ line = magic_file (m, filename);
+ if (line == NULL) {
+ perrorf (g, "magic_file: %s", filename);
+ return NULL;
+ }
+
+ if (loading_ok)
+ *loading_ok = true;
+
+ elf_arch = match1 (g, line, re_file_elf);
+ if (elf_arch == NULL) {
+ error (g, "no re_file_elf match in '%s'", line);
+ return NULL;
+ }
+
+ if (matched)
+ *matched = true;
+
+ return canonical_elf_arch (g, elf_arch);
+}
+
/* Download and uncompress the cpio file to find binaries within. */
static const char *initrd_binaries[] = {
"bin/ls",
@@ -170,40 +235,11 @@ cpio_arch (guestfs_h *g, const char *file, const char *path)
safe_asprintf (g, "%s/%s", dir, initrd_binaries[i]);
if (is_regular_file (bin)) {
- int flags;
- magic_t m;
- const char *line;
- CLEANUP_FREE char *elf_arch = NULL;
-
- flags = g->verbose ? MAGIC_DEBUG : 0;
- flags |= MAGIC_ERROR | MAGIC_RAW;
-
- m = magic_open (flags);
- if (m == NULL) {
- perrorf (g, "magic_open");
- goto out;
- }
-
- if (magic_load (m, NULL) == -1) {
- perrorf (g, "magic_load: default magic database file");
- magic_close (m);
- goto out;
- }
-
- line = magic_file (m, bin);
- if (line == NULL) {
- perrorf (g, "magic_file: %s", bin);
- magic_close (m);
- goto out;
- }
+ bool loading_ok, matched;
- elf_arch = match1 (g, line, re_file_elf);
- if (elf_arch != NULL) {
- ret = canonical_elf_arch (g, elf_arch);
- magic_close (m);
+ ret = magic_for_file (g, bin, &loading_ok, &matched);
+ if (!loading_ok || matched)
goto out;
- }
- magic_close (m);
}
}
error (g, "file_architecture: could not determine architecture of cpio
archive");
--
2.1.0
Yup looks like just code motion to me, so ACK.
Rich.
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-builder quickly builds VMs from scratch
http://libguestfs.org/virt-builder.1.html
3443
days inactive
3444
days old
5 comments
2 participants
participants (2)
-
Pino Toscano -
Richard W.M. Jones