Test application for smack_have_access() and fixes to

the implementation.

diff --git a/src/smack.c b/src/smack.c
index f355d0c..f80a19d 100644 (file)
--- a/src/smack.c
+++ b/src/smack.c
@@ -273,9 +273,14 @@ int smack_have_access(int fd, const char *subject,
                      const char *object, const char *access_type)
 {
        char buf[LOAD_SIZE];
+       char access_type_k[ACC_LEN + 1];
+       unsigned access_code;
        int ret;
 
-       ret = snprintf(buf, LOAD_SIZE, KERNEL_FORMAT, subject, object, access_type);
+       access_code = str_to_ac(access_type);
+       ac_to_kernel_str(access_code, access_type_k);
+
+       ret = snprintf(buf, LOAD_SIZE, KERNEL_FORMAT, subject, object, access_type_k);
        if (ret < 0)
                return -1;
 
@@ -292,7 +297,7 @@ int smack_have_access(int fd, const char *subject,
        if (ret < 0)
                return -1;
 
-       return buf[0] == '1';
+       return buf[0] == 1;
 }
 
 char *smack_get_socket_label(int fd)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index d33b05f..864ece7 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,9 @@
 AM_CPPFLAGS = -I../src
 
-bin_PROGRAMS = printload
+bin_PROGRAMS = printload access
 
 printload_SOURCES = printload.c
 printload_LDADD = -L$(top_builddir)/src/.libs -lsmack
+
+access_SOURCES = access.c
+access_LDADD = -L$(top_builddir)/src/.libs -lsmack

diff --git a/tests/access.c b/tests/access.c
new file mode 100644 (file)
index 0000000..a819d38
--- /dev/null
+++ b/tests/access.c
@@ -0,0 +1,73 @@
+
+/*
+ * This file is part of libsmack
+ *
+ * Copyright (C) 2011 Intel Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ * Authors:
+ * Jarkko Sakkinen <jarkko.sakkinen@intel.com>
+ */
+
+#include <smack.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#define LABEL_LEN 23
+#define ACC_LEN 5
+#define BUF_SIZE 512
+#define DELIM " \t\n"
+
+int main(int argc, char **argv)
+{
+       char buf[BUF_SIZE];
+       char *ptr;
+       int fd;
+       char *subject;
+       char *object;
+       char *access_type;
+       int ret;
+
+       while (fgets(buf, BUF_SIZE, stdin) != NULL) {
+
+               subject = strtok_r(buf, DELIM, &ptr);
+               object = strtok_r(NULL, DELIM, &ptr);
+               access_type = strtok_r(NULL, DELIM, &ptr);
+
+               if (subject == NULL || object == NULL || access_type == NULL ||
+                   strtok_r(NULL, DELIM, &ptr) != NULL) {
+                       fprintf(stderr, "Invalid rule\n");
+                       close(fd);
+                       exit(EXIT_FAILURE);
+               }
+
+               fd = open("/smack/access", O_RDWR);
+               if (fd < 0) {
+                       perror("open");
+                       exit(EXIT_FAILURE);
+               }
+               ret = smack_have_access(fd, subject, object, access_type);
+               printf("%d\n", ret);
+               close(fd);
+       }
+
+       return EXIT_SUCCESS;
+}
+