util: Change file check fns to use a mode mask

Instead of using a custom way to chck file type, use the system
provided macros and a mode mask to decide when we want to check.

Additionally a mask also allows us to selectively check permissions.

Related:
https://bugzilla.redhat.com/1089098
Resolves:
https://fedorahosted.org/sssd/ticket/2321

Signed-off-by: Simo Sorce <simo@redhat.com>
Reviewed-by: Pavel Reichl <preichl@redhat.com>

2 files changed, 12 insertions, 11 deletions

diff --git a/src/tests/check_and_open-tests.c b/src/tests/check_and_open-tests.c
index 6ff40d0fa..8837acc29 100644
--- a/src/tests/check_and_open-tests.c
+++ b/src/tests/check_and_open-tests.c
@@ -79,7 +79,8 @@ START_TEST(test_wrong_filename)
 {
     int ret;
 
-    ret = check_and_open_readonly("/bla/bla/bla", &fd, uid, gid, mode, CHECK_REG);
+    ret = check_and_open_readonly("/bla/bla/bla", &fd,
+                                  uid, gid, S_IFREG|mode, 0);
     fail_unless(ret == ENOENT,
                 "check_and_open_readonly succeeded on non-existing file");
     fail_unless(fd == -1, "check_and_open_readonly file descriptor not -1");
@@ -104,7 +105,7 @@ START_TEST(test_symlink)
     ret = symlink(filename, newpath);
     fail_unless(ret == 0, "symlink failed [%d][%s]", ret, strerror(errno));
 
-    ret = check_file(newpath, uid, gid, mode, CHECK_REG, NULL, false);
+    ret = check_file(newpath, uid, gid, S_IFREG|mode, 0, NULL, false);
     unlink(newpath);
 
     fail_unless(ret == EINVAL,
@@ -130,7 +131,7 @@ START_TEST(test_follow_symlink)
     ret = symlink(filename, newpath);
     fail_unless(ret == 0, "symlink failed [%d][%s]", ret, strerror(errno));
 
-    ret = check_file(newpath, uid, gid, mode, CHECK_REG, NULL, true);
+    ret = check_file(newpath, uid, gid, S_IFREG|mode, 0, NULL, true);
     unlink(newpath);
 
     fail_unless(ret == EOK,
@@ -142,7 +143,7 @@ START_TEST(test_not_regular_file)
 {
     int ret;
 
-    ret = check_and_open_readonly("/dev/null", &fd, uid, gid, mode, CHECK_REG);
+    ret = check_and_open_readonly("/dev/null", &fd, uid, gid, S_IFREG|mode, 0);
     fail_unless(ret == EINVAL,
                 "check_and_open_readonly succeeded on non-regular file");
     fail_unless(fd == -1, "check_and_open_readonly file descriptor not -1");
@@ -153,7 +154,7 @@ START_TEST(test_wrong_uid)
 {
     int ret;
 
-    ret = check_and_open_readonly(filename, &fd, uid+1, gid, mode, CHECK_REG);
+    ret = check_and_open_readonly(filename, &fd, uid+1, gid, S_IFREG|mode, 0);
     fail_unless(ret == EINVAL,
                 "check_and_open_readonly succeeded with wrong uid");
     fail_unless(fd == -1, "check_and_open_readonly file descriptor not -1");
@@ -164,7 +165,7 @@ START_TEST(test_wrong_gid)
 {
     int ret;
 
-    ret = check_and_open_readonly(filename, &fd, uid, gid+1, mode, CHECK_REG);
+    ret = check_and_open_readonly(filename, &fd, uid, gid+1, S_IFREG|mode, 0);
     fail_unless(ret == EINVAL,
                 "check_and_open_readonly succeeded with wrong gid");
     fail_unless(fd == -1, "check_and_open_readonly file descriptor not -1");
@@ -175,8 +176,8 @@ START_TEST(test_wrong_permission)
 {
     int ret;
 
-    ret = check_and_open_readonly(filename, &fd, uid, gid, (mode|S_IWOTH),
-                                  CHECK_REG);
+    ret = check_and_open_readonly(filename, &fd,
+                                  uid, gid, S_IFREG|mode|S_IWOTH, 0);
     fail_unless(ret == EINVAL,
                 "check_and_open_readonly succeeded with wrong mode");
     fail_unless(fd == -1, "check_and_open_readonly file descriptor not -1");
@@ -187,7 +188,7 @@ START_TEST(test_ok)
 {
     int ret;
 
-    ret = check_and_open_readonly(filename, &fd, uid, gid, mode, CHECK_REG);
+    ret = check_and_open_readonly(filename, &fd, uid, gid, S_IFREG|mode, 0);
     fail_unless(ret == EOK,
                 "check_and_open_readonly failed");
     fail_unless(fd >= 0,
@@ -201,7 +202,7 @@ START_TEST(test_write)
     ssize_t size;
     errno_t my_errno;
 
-    ret = check_and_open_readonly(filename, &fd, uid, gid, mode, CHECK_REG);
+    ret = check_and_open_readonly(filename, &fd, uid, gid, S_IFREG|mode, 0);
     fail_unless(ret == EOK,
                 "check_and_open_readonly failed");
     fail_unless(fd >= 0,
diff --git a/src/tests/files-tests.c b/src/tests/files-tests.c
index 2a0e7ce41..8b649e77f 100644
--- a/src/tests/files-tests.c
+++ b/src/tests/files-tests.c
@@ -192,7 +192,7 @@ START_TEST(test_simple_copy)
     fail_unless(ret == 0, "destination directory not there\n");
 
     tmp = talloc_asprintf(test_ctx, "%s/bar", dst_path);
-    ret = check_and_open_readonly(tmp, &fd, uid, gid, 0700, CHECK_REG);
+    ret = check_and_open_readonly(tmp, &fd, uid, gid, S_IFREG|S_IRWXU, 0);
     fail_unless(ret == EOK, "Cannot open %s\n");
     close(fd);
     talloc_free(tmp);