shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2024-12-22 17:35:55 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2242 from stb-tester/tarball-import-xattrs

Browse Source 
ostree commit --tree=tar: Import xattrs from tarballs
This commit is contained in:
OpenShift Merge Robot 2020-11-17 22:38:32 +01:00 committed by GitHub
commit 874f2ca625
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 122 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/libostree/ostree-repo-libarchive.c
View File

@ -458,12 +458,43 @@ aic_get_xattrs (OstreeRepoArchiveImportContext *ctx,
g_autoptr(GVariant) xattrs = NULL;
const char *cb_path = abspath;
gboolean no_xattrs = ctx->modifier &&
ctx->modifier->flags & OSTREE_REPO_COMMIT_MODIFIER_FLAGS_SKIP_XATTRS;
if (!no_xattrs && archive_entry_xattr_count (ctx->entry) > 0)
{
const char *name;
const void *value;
size_t size;
g_autoptr(GVariantBuilder) builder =
ot_util_variant_builder_from_variant (xattrs,
G_VARIANT_TYPE ("a(ayay)"));
archive_entry_xattr_reset (ctx->entry);
while (archive_entry_xattr_next (
ctx->entry, &name, &value, &size) == ARCHIVE_OK)
{
g_variant_builder_add (builder, "(@ay@ay)",
g_variant_new_bytestring (name),
g_variant_new_fixed_array (G_VARIANT_TYPE("y"),
value, size, 1));
}
xattrs = g_variant_builder_end (builder);
g_variant_ref_sink (xattrs);
}
if (ctx->opts->callback_with_entry_pathname)
cb_path = archive_entry_pathname (ctx->entry);
if (ctx->modifier && ctx->modifier->xattr_callback)
xattrs = ctx->modifier->xattr_callback (ctx->repo, cb_path, file_info,
ctx->modifier->xattr_user_data);
{
if (xattrs)
g_variant_unref (xattrs);
xattrs = ctx->modifier->xattr_callback (ctx->repo, cb_path, file_info,
ctx->modifier->xattr_user_data);
}
if (ctx->modifier && ctx->modifier->sepolicy)
{

89
tests/test-libarchive-import.c
View File

@ -95,6 +95,9 @@ test_data_init (TestData *td)
archive_entry_set_uid (ae, uid);
archive_entry_set_gid (ae, gid);
archive_entry_set_size (ae, 4);
archive_entry_xattr_add_entry (ae, "user.a_key", "my value", 8);
archive_entry_xattr_add_entry (ae, "user.key2", "", 0);
archive_entry_xattr_add_entry (ae, "user.b_key", "contains\0nuls", 14);
g_assert_cmpint (0, ==, archive_write_header (a, ae));
g_assert_cmpint (4, ==, archive_write_data (a, "bar\n", 4));
archive_entry_free (ae);
@ -453,6 +456,90 @@ test_libarchive_xattr_callback (gconstpointer data)
g_assert_no_error (error);
}
static void
test_libarchive_xattr_import (gconstpointer data)
{
TestData *td = (void*)data;
GError *error = NULL;
g_autoptr(OtAutoArchiveRead) a = archive_read_new ();
OstreeRepoImportArchiveOptions opts = { 0 };
char buf[15] = { 0 };
if (skip_if_no_xattr (td))
goto out;
if (td->skip_all != NULL)
{
g_test_skip (td->skip_all->message);
goto out;
}
test_archive_setup (td->fd, a);
opts.ignore_unsupported_content = TRUE;
if (!import_write_and_ref (td->repo, &opts, a, "baz", NULL, &error))
goto out;
/* check contents */
if (!spawn_cmdline ("ostree --repo=repo checkout baz import-checkout", NULL))
goto out;
spawn_cmdline ("ostree --repo=repo ls -R -X baz", NULL);
spawn_cmdline ("attr -l import-checkout/anotherfile", NULL);
ssize_t x = getxattr ("import-checkout/anotherfile", "user.a_key", buf, sizeof buf - 1);
g_assert_cmpint (x, ==, 8);
g_assert_cmpstr (buf, ==, "my value");
x = getxattr ("import-checkout/anotherfile", "user.key2", buf, sizeof buf - 1);
g_assert_cmpint (x, ==, 0);
x = getxattr ("import-checkout/anotherfile", "user.b_key", buf, sizeof buf - 1);
g_assert_cmpint (x, ==, 14);
g_assert (memcmp(buf, "contains\0nuls", 14) == 0);
out:
g_assert_no_error (error);
}
static void
test_libarchive_xattr_import_skip_xattr (gconstpointer data)
{
TestData *td = (void*)data;
GError *error = NULL;
g_autoptr(OtAutoArchiveRead) a = archive_read_new ();
OstreeRepoImportArchiveOptions opts = { 0 };
if (skip_if_no_xattr (td))
goto out;
if (td->skip_all != NULL)
{
g_test_skip (td->skip_all->message);
goto out;
}
test_archive_setup (td->fd, a);
opts.ignore_unsupported_content = TRUE;
g_autoptr(OstreeRepoCommitModifier) modifier = ostree_repo_commit_modifier_new (
OSTREE_REPO_COMMIT_MODIFIER_FLAGS_SKIP_XATTRS, NULL, NULL, NULL);
if (!import_write_and_ref (td->repo, &opts, a, "baz", modifier, &error))
goto out;
/* check contents */
if (!spawn_cmdline ("ostree --repo=repo checkout baz import-checkout", NULL))
goto out;
ssize_t n_attrs = listxattr ("import-checkout/anotherfile", NULL, 0);
g_assert_cmpint (n_attrs, ==, 0);
out:
g_assert_no_error (error);
}
static GVariant*
path_cb (OstreeRepo *repo,
const char *path,
@ -610,6 +697,8 @@ int main (int argc, char **argv)
g_test_add_data_func ("/libarchive/error-device-file", &td, test_libarchive_error_device_file);
g_test_add_data_func ("/libarchive/ignore-device-file", &td, test_libarchive_ignore_device_file);
g_test_add_data_func ("/libarchive/ostree-convention", &td, test_libarchive_ostree_convention);
g_test_add_data_func ("/libarchive/xattr-import", &td, test_libarchive_xattr_import);
g_test_add_data_func ("/libarchive/xattr-import-skip-xattr", &td, test_libarchive_xattr_import_skip_xattr);
g_test_add_data_func ("/libarchive/xattr-callback", &td, test_libarchive_xattr_callback);
g_test_add_data_func ("/libarchive/no-use-entry-pathname", &td, test_libarchive_no_use_entry_pathname);
g_test_add_data_func ("/libarchive/use-entry-pathname", &td, test_libarchive_use_entry_pathname);