/*
* test-save.c: test various aspects of saving
*
- * Copyright (C) 2009-2011 Red Hat Inc.
+ * Copyright (C) 2009-2016 David Lutterkort
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
#include "cutest.h"
#include <stdio.h>
+#include <sys/stat.h>
#include <sys/types.h>
#include <sys/wait.h>
+#include <unistd.h>
const char *abs_top_srcdir;
const char *abs_top_builddir;
if (asprintf(&lensdir, "%s/lenses", abs_top_srcdir) < 0)
CuFail(tc, "asprintf lensdir failed");
+ umask(0022);
run(tc, "test -d %s && chmod -R u+w %s || :", root, root);
run(tc, "rm -rf %s", root);
run(tc, "mkdir -p %s", root);
run(tc, "chmod -R u+w %s", root);
aug = aug_init(root, lensdir, AUG_NO_STDINC);
+ free(lensdir);
CuAssertPtrNotNull(tc, aug);
}
static void teardown(ATTRIBUTE_UNUSED CuTest *tc) {
+ /* testRemovePermission makes <root>/etc nonwritable. That leads
+ to an error from 'make distcheck' make sure that directory is
+ writable by the user after the test */
+ run(tc, "chmod u+w %s/etc", root);
+
aug_close(aug);
aug = NULL;
free(root);
root = NULL;
}
+static void testRemoveNoPermission(CuTest *tc) {
+ if (getuid() == 0) {
+ puts("pending (testRemoveNoPermission): can't test permissions under root account");
+ return;
+ }
+
+ int r;
+ const char *errmsg;
+
+ // Prevent deletion of files
+ run(tc, "chmod 0500 %s/etc", root);
+
+ r = aug_rm(aug, "/files/etc/hosts");
+ CuAssertTrue(tc, r > 0);
+
+ r = aug_save(aug);
+ CuAssertIntEquals(tc, -1, r);
+
+ r = aug_get(aug, "/augeas/files/etc/hosts/error", &errmsg);
+ CuAssertIntEquals(tc, 1, r);
+ CuAssertPtrNotNull(tc, errmsg);
+ CuAssertStrEquals(tc, "unlink_orig", errmsg);
+}
+
static void testSaveNewFile(CuTest *tc) {
int r;
r = aug_set(aug, "/files/etc/yum.repos.d/fedora.repo/fedora/enabled", "0");
CuAssertIntEquals(tc, 0, r);
+ /* What we have set up is fine: two ways to save the same file with the
+ same lens */
+ r = aug_save(aug);
+ CuAssertIntEquals(tc, 0, r);
+
+ /* Now we make it bad: a different lens for the same file */
+ r = aug_set(aug, "/augeas/load/Yum2/lens", "@Subversion");
+ CuAssertIntEquals(tc, 0, r);
+
+ r = aug_set(aug, "/files/etc/yum.repos.d/fedora.repo/fedora/enabled", "1");
+ CuAssertIntEquals(tc, 0, r);
r = aug_save(aug);
CuAssertIntEquals(tc, -1, r);
+
r = aug_error(aug);
CuAssertIntEquals(tc, AUG_EMXFM, r);
}
CuAssertStrNotEqual(tc, mtime1, mtime2);
CuAssertStrNotEqual(tc, "0", mtime2);
+ free(mtime1);
}
/* Check that loading and saving a file given with a relative path
CuAssertIntEquals(tc, 1, r);
}
+/* Check that loading and saving a file with // in the incl pattern works.
+ * RHBZ#1031084
+ */
+static void testDoubleSlashPath(CuTest *tc) {
+ int r;
+
+ r = aug_rm(aug, "/augeas/load/*");
+ CuAssertPositive(tc, r);
+
+ r = aug_set(aug, "/augeas/load/Hosts/lens", "Hosts.lns");
+ CuAssertRetSuccess(tc, r);
+ r = aug_set(aug, "/augeas/load/Hosts/incl", "/etc//hosts");
+ CuAssertRetSuccess(tc, r);
+ r = aug_load(aug);
+ CuAssertRetSuccess(tc, r);
+
+ r = aug_match(aug, "/files/etc/hosts/1/alias[ . = 'new']", NULL);
+ CuAssertIntEquals(tc, 0, r);
+
+ r = aug_set(aug, "/files/etc/hosts/1/alias[last() + 1]", "new");
+ CuAssertRetSuccess(tc, r);
+
+ r = aug_save(aug);
+ CuAssertRetSuccess(tc, r);
+ r = aug_match(aug, "/augeas//error", NULL);
+ CuAssertIntEquals(tc, 0, r);
+
+ /* Force reloading the file */
+ r = aug_rm(aug, "/augeas/files//mtime");
+ CuAssertPositive(tc, r);
+
+ r = aug_load(aug);
+ CuAssertRetSuccess(tc, r);
+
+ r = aug_match(aug, "/files/etc/hosts/1/alias[. = 'new']", NULL);
+ CuAssertIntEquals(tc, 1, r);
+}
+
+/* Check the umask is followed when creating files
+ */
+static void testUmask(CuTest *tc, int tumask, mode_t expected_mode) {
+ int r;
+ struct stat buf;
+ char* fpath = NULL;
+
+ if (asprintf(&fpath, "%s/etc/test", root) < 0) {
+ CuFail(tc, "failed to set root");
+ }
+
+ umask(tumask);
+
+ r = aug_rm(aug, "/augeas/load/*");
+ CuAssertPositive(tc, r);
+
+ r = aug_set(aug, "/augeas/load/Test/lens", "Simplelines.lns");
+ CuAssertRetSuccess(tc, r);
+ r = aug_set(aug, "/augeas/load/Test/incl", "/etc/test");
+ CuAssertRetSuccess(tc, r);
+ r = aug_load(aug);
+ CuAssertRetSuccess(tc, r);
+ r = aug_set(aug, "/files/etc/test/1", "test");
+ CuAssertRetSuccess(tc, r);
+
+ r = aug_save(aug);
+ CuAssertRetSuccess(tc, r);
+ r = aug_match(aug, "/augeas//error", NULL);
+ CuAssertIntEquals(tc, 0, r);
+
+ CuAssertIntEquals(tc, 0, stat(fpath, &buf));
+ CuAssertIntEquals(tc, expected_mode, buf.st_mode & 0777);
+ free(fpath);
+}
+static void testUmask077(CuTest *tc) {
+ testUmask(tc, 0077, 0600);
+}
+static void testUmask027(CuTest *tc) {
+ testUmask(tc, 0027, 0640);
+}
+static void testUmask022(CuTest *tc) {
+ testUmask(tc, 0022, 0644);
+}
+
+/* Test that handling of 'strange' characters in path names works as
+ * expected. In particular, that paths with characters that have special
+ * meaning in path expressions are escaped properly.
+ *
+ * This test isn't all that specific to save, but since these tests set up
+ * a copy of tests/root/ that is modifiable, it was convenient to put this
+ * test here.
+ */
+static void testPathEscaping(CuTest *tc) {
+ /* Path expression with characters escaped */
+ static const char *const weird =
+ "/files/etc/sysconfig/network-scripts/ifcfg-weird\\ \\[\\!\\]\\ \\(used\\ to\\ fail\\)";
+ /* Path without any escaping */
+ static const char *const weird_no_escape =
+ "/files/etc/sysconfig/network-scripts/ifcfg-weird [!] (used to fail)";
+
+ char *fname = NULL, *s = NULL;
+ const char *v;
+ int r;
+
+ /* Construct the file name in the file system and check the file is there */
+ r = asprintf(&fname, "%s%s", root, weird_no_escape + strlen("/files"));
+ CuAssertPositive(tc, r);
+
+ r = access(fname, R_OK);
+ CuAssertIntEquals(tc, 0, r);
+
+ /* Make sure weird is in the tree */
+ r = aug_match(aug, weird, NULL);
+ CuAssertIntEquals(tc, 1, r);
+
+ /* Make sure we can get to the metadata about weird */
+ r = asprintf(&s, "/augeas%s/path", weird);
+ CuAssertPositive(tc, r);
+
+ r = aug_get(aug, s, &v);
+ CuAssertIntEquals(tc, 1, r);
+ CuAssertStrEquals(tc, weird_no_escape, v);
+
+ /* Delete it from the tree and save it; make sure it gets removed
+ from the file system */
+ r = aug_rm(aug, weird);
+ CuAssertPositive(tc, r);
+
+ r = aug_save(aug);
+ CuAssertRetSuccess(tc, r);
+
+ r = access(fname, R_OK);
+ CuAssertIntEquals(tc, -1, r);
+ CuAssertIntEquals(tc, ENOENT, errno);
+
+ free(s);
+ free(fname);
+}
+
+/* Test that we handle failure to save a file because we lack permission on
+ * the target file is handled gracefully.
+ *
+ * As reported in https://github.com/hercules-team/augeas/issues/178, this
+ * used to lead to a SEGV
+ */
+static void testSaveNoPermission(CuTest *tc) {
+ if (getuid() == 0) {
+ puts("pending (testSaveNoPermission): can't test permissions under root account");
+ return;
+ }
+
+ int r;
+ char *path = NULL;
+ const char *v;
+
+ r = asprintf(&path, "%s/etc/hosts", root);
+ CuAssertPositive(tc, r);
+
+ r = aug_set(aug, "/files/etc/hosts/1/alias[1]", "othername");
+ CuAssertRetSuccess(tc, r);
+
+ r = chmod(path, 0);
+ CuAssertRetSuccess(tc, r);
+
+ r = aug_save(aug);
+ CuAssertIntEquals(tc, -1, r);
+
+ r = aug_get(aug, "/augeas/files/etc/hosts/error", &v);
+ CuAssertIntEquals(tc, 1, r);
+ CuAssertStrEquals(tc, "replace_from_missing", v);
+ free(path);
+}
+
int main(void) {
char *output = NULL;
CuSuite* suite = CuSuiteNew();
CuSuiteSetup(suite, setup, teardown);
+ SUITE_ADD_TEST(suite, testSaveNoPermission);
SUITE_ADD_TEST(suite, testSaveNewFile);
+ SUITE_ADD_TEST(suite, testRemoveNoPermission);
SUITE_ADD_TEST(suite, testNonExistentLens);
SUITE_ADD_TEST(suite, testMultipleXfm);
SUITE_ADD_TEST(suite, testMtime);
SUITE_ADD_TEST(suite, testRelPath);
+ SUITE_ADD_TEST(suite, testDoubleSlashPath);
+ SUITE_ADD_TEST(suite, testUmask077);
+ SUITE_ADD_TEST(suite, testUmask027);
+ SUITE_ADD_TEST(suite, testUmask022);
+ SUITE_ADD_TEST(suite, testPathEscaping);
CuSuiteRun(suite);
CuSuiteSummary(suite, &output);
CuSuiteDetails(suite, &output);
printf("%s\n", output);
free(output);
- return suite->failCount;
+ int result = suite->failCount;
+ CuSuiteFree(suite);
+ return result;
}
/*
projects / platform / upstream / augeas.git / blobdiff