From 4e2a14eb0c92e38c533c453f6e375953a7208f0e Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 7 Apr 2021 21:03:15 +0000 Subject: repo: Add ostree_repo_write_regfile_inline When working on ostree-ext and importing from tar, it's quite inefficient and awkward for small files to end up creating a whole `GInputStream` and `GFileInfo` and etc. for small files. Plus the gtk-rs binding API to map from `impl Read` to Gio https://docs.rs/gio/0.9.1/gio/struct.ReadInputStream.html requires that the input stream is `Send` but the Rust `tar` API isn't. This is only 1/3 of the problem; we also need similar APIs to directly create a symlink, and to stream large objects via a push-based API. --- tests/test-core.js | 14 ++++++++++++++ tests/test-repo.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 57 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/test-core.js b/tests/test-core.js index a9ef8919..8f460a5f 100755 --- a/tests/test-core.js +++ b/tests/test-core.js @@ -49,6 +49,20 @@ let [,dirTree] = repo.write_mtree(mtree, null); let [,commit] = repo.write_commit(null, 'Some subject', 'Some body', null, dirTree, null); print("commit => " + commit); +// Test direct write APIs +let inline_content = "default 0.0.0.0\nloopback 127.0.0.0\nlink-local 169.254.0.0\n"; +let regfile_mode = 33188; // 0o100000 | 0o644 (but in decimal so old gjs works) +let inline_checksum = repo.write_regfile_inline(null, 0, 0, regfile_mode, null, inline_content, null); +assertEquals(inline_checksum, "8aaa9dc13a0c5839fe4a277756798c609c53fac6fa2290314ecfef9041065873"); +let written = false; +try { + repo.write_regfile_inline("8baa9dc13a0c5839fe4a277756798c609c53fac6fa2290314ecfef9041065873", 0, 0, regfile_mode, null, inline_content, null); + written = true; +} catch (e) { +} +if (written) + throw new Error("Wrote invalid checksum"); + repo.commit_transaction(null, null); let [,root,checksum] = repo.read_commit(commit, null); diff --git a/tests/test-repo.c b/tests/test-repo.c index 9857228e..ad81a7d6 100644 --- a/tests/test-repo.c +++ b/tests/test-repo.c @@ -197,6 +197,47 @@ test_repo_get_min_free_space (Fixture *fixture, } } +static void +test_write_regfile_api (Fixture *fixture, + gconstpointer test_data) +{ + g_autoptr (GKeyFile) config = NULL; + g_autoptr(GError) error = NULL; + + g_autoptr(OstreeRepo) repo = ostree_repo_create_at (fixture->tmpdir.fd, ".", + OSTREE_REPO_MODE_ARCHIVE, + NULL, + NULL, &error); + g_assert_no_error (error); + + g_auto(GVariantBuilder) xattrs_builder; + g_variant_builder_init (&xattrs_builder, (GVariantType*)"a(ayay)"); + g_variant_builder_add (&xattrs_builder, "(^ay^ay)", "security.selinux", "system_u:object_r:etc_t:s0"); + g_autoptr(GVariant) xattrs = g_variant_ref_sink (g_variant_builder_end (&xattrs_builder)); + + // Current contents of /etc/networks in Fedora + static const char contents[] = "default 0.0.0.0\nloopback 127.0.0.0\nlink-local 169.254.0.0\n"; + // First with no xattrs + g_autofree char *checksum = ostree_repo_write_regfile_inline (repo, NULL, 0, 0, S_IFREG | 0644, NULL, (const guint8*)contents, sizeof (contents)-1, NULL, &error); + g_assert_no_error (error); + g_assert_cmpstr (checksum, ==, "8aaa9dc13a0c5839fe4a277756798c609c53fac6fa2290314ecfef9041065873"); + g_clear_pointer (&checksum, g_free); + + // Invalid checksum + checksum = ostree_repo_write_regfile_inline (repo, "3272139f889f6a7007b3d64adc74be9e2979bf6bbe663d1512e5bd43f4de24a1", + 0, 0, S_IFREG | 0644, NULL, (const guint8*)contents, sizeof (contents)-1, NULL, &error); + g_assert (checksum == NULL); + g_assert (error != NULL); + g_clear_error (&error); + + // Now with xattrs + g_clear_pointer (&checksum, g_free); + checksum = ostree_repo_write_regfile_inline (repo, NULL, 0, 0, S_IFREG | 0644, xattrs, (const guint8*)contents, sizeof (contents)-1, NULL, &error); + g_assert_no_error (error); + g_assert_cmpstr (checksum, ==, "4f600d252338f93279c51c964915cb2c26f0d09082164c54890d1a3c78cdeb1e"); + g_clear_pointer (&checksum, g_free); +} + int main (int argc, char **argv) @@ -212,7 +253,8 @@ main (int argc, test_repo_equal, teardown); g_test_add ("/repo/get_min_free_space", Fixture, NULL, setup, test_repo_get_min_free_space, teardown); - + g_test_add ("/repo/write_regfile_api", Fixture, NULL, setup, + test_write_regfile_api, teardown); return g_test_run (); } -- cgit v1.2.1