Changeset 4927

Timestamp:

04/22/10 13:57:08 (3 years ago)

Author:

joliver

Message:

Final changes to module loading, including addition of bzip expansion
to module .pp files

Files:

• branches/module-loading/apol/apol_tcl.i (modified) (2 diffs)
• branches/module-loading/apol/open_policy_dialog.tcl (modified) (1 diff)
• branches/module-loading/configure.ac (modified) (1 diff)
• branches/module-loading/libapol/src/policy.c (modified) (1 diff)
• branches/module-loading/libapol/swig/apol.i (modified) (1 diff)
• branches/module-loading/libqpol/include/qpol/util.h (modified) (1 diff)
• branches/module-loading/libqpol/src/Makefile.am (modified) (1 diff)
• branches/module-loading/libqpol/src/module.c (modified) (5 diffs)
• branches/module-loading/libqpol/src/policy.c (modified) (4 diffs)
• branches/module-loading/libqpol/src/policy_parse.y (modified) (1 diff)
• branches/module-loading/libqpol/src/util.c (modified) (1 diff)
• branches/module-loading/libqpol/swig/qpol.i (modified) (2 diffs)

branches/module-loading/apol/apol_tcl.i

@@ -111 +111 @@
-                apol_policy_t *p = apol_policy_create_from_policy_path(ppath, QPOL_POLICY_OPTION_NO_NEVERALLOWS,
-                                                                       apol_tcl_route_apol_to_string, interp);
-) {
-
-                
-            
-    
-            
+ && message == NULL) {  // Assume lower level has generated error message
+   // otherwise take a guess at it
+                               
+                       
+       
+                       
-                }
-        fail:
@@ -448 +448 @@
-extern char *apol_tcl_get_info_string(void);
-extern void apol_tcl_set_info_string(apol_policy_t *p, const char *s);
+
+// vim:ft=c noexpandtab

branches/module-loading/apol/open_policy_dialog.tcl

@@ -378 +378 @@
-
-# Retrieve information about a policy module file, either source or
-2-ple of module name and version
+3-ple of module name, version and type
-# The policy module will be closed afterwards.
-proc Apol_Open_Policy_Dialog::getModuleInfo {f} {

branches/module-loading/configure.ac

@@ -718 +718 @@
-AC_SUBST([CUNIT_LIB_FLAG])
-
+AC_CHECK_LIB(bz2,
+        BZ2_bzReadOpen, ,
+        AC_MSG_ERROR([could not find libbz2 - make sure bzip2-libs is installed]),
+        -lbz2
+)
+
-#AC_MSG_CHECKING([for FUSE])
-#pkg-config --exists fuse

branches/module-loading/libapol/src/policy.c

@@ -106 +106 @@
-        if (apol_policy_path_get_type(path) == APOL_POLICY_PATH_TYPE_MODULAR) {
-                if (!qpol_policy_has_capability(policy->p, QPOL_CAP_MODULES)) {
-
-
-
+
+
-                }
-                const apol_vector_t *modules = apol_policy_path_get_modules(path);

branches/module-loading/libapol/swig/apol.i

@@ -3218 +3218 @@
-        };
-%}
+// vim:ft=c

branches/module-loading/libqpol/include/qpol/util.h

@@ -51 +51 @@
-        extern int qpol_default_policy_find(char **path);
-
+/* bunzip() a file to '*data', returning the total number of uncompressed bytes
+ * in the file.  Returns -1 if file could not be decompressed. */
+        extern ssize_t qpol_bunzip(FILE *f, char **data);
+
-#ifdef  __cplusplus
-}

branches/module-loading/libqpol/src/Makefile.am

@@ -68 +68 @@
-
-$(qpolso_DATA): $(tmp_sepol) $(libqpol_so_OBJS) libqpol.map
-
+ -lbz2
-        $(LN_S) -f $@ @libqpol_soname@
-        $(LN_S) -f $@ libqpol.so

branches/module-loading/libqpol/src/module.c

@@ -44 +44 @@
-        int error = 0;
-        char *tmp = NULL;
+        char *data = NULL;
+        ssize_t size;
-
-        if (module)
@@ -72 +74 @@
-                goto err;
-        }
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        if (sepol_module_package_create(&smp)) {
@@ -89 +102 @@
-        free(tmp);
-        tmp = NULL;
-
+
+
+
+
+
+
+
+
+
-        if (sepol_module_package_read(smp, spf, 0)) {
-                error = EIO;
@@ -107 +128 @@
-        sepol_module_package_free(smp);
-        fclose(infile);
+        if (data != NULL)
+                free (data);
-        sepol_policy_file_free(spf);
-
@@ -117 +140 @@
-        if (infile)
-                fclose(infile);
-
+
+
+
+
-        errno = error;
-        return STATUS_ERR;

branches/module-loading/libqpol/src/policy.c

@@ -338 +338 @@
-}
-
+int qpol_is_data_mod_pkg(char * data)
+{
+        size_t sz;
+        __u32 ubuf;
+
+        memcpy(&ubuf, data, sizeof(__u32));
+
+        ubuf = le32_to_cpu(ubuf);
+        if (ubuf == SEPOL_MODULE_PACKAGE_MAGIC)
+                return 1;
+
+        return 0;
+}
+
-int qpol_is_file_mod_pkg(FILE * fp)
-{
@@ -921 +935 @@
-        }
-
+    errno = 0;
-        if (!(*policy = calloc(1, sizeof(qpol_policy_t)))) {
-                error = errno;
@@ -966 +981 @@
-        sepol_policy_file_set_handle(pfile, (*policy)->sh);
-
+    errno=0;
-        if (qpol_is_file_binpol(infile)) {
-                (*policy)->type = retv = QPOL_POLICY_KERNEL_BINARY;
@@ -980 +996 @@
-                        goto err;
-                }
-is_file_mod_pkg(infile)
+module_create_from_file(path, &mod) == STATUS_SUCCESS
-                (*policy)->type = retv = QPOL_POLICY_MODULE_BINARY;
-
-
-
-
-
+
-                if (qpol_policy_append_module(*policy, mod)) {
-                        error = errno;

branches/module-loading/libqpol/src/policy_parse.y

@@ -216 +216 @@
-                        | sensitivities sensitivity_def
-                        ;
+/* Need to call define_mls here, as we are working with files */
+/* only, not command line options */
-sensitivity_def         : SENSITIVITY identifier alias_def ';'
-
+mls() | define_
-                        | SENSITIVITY identifier ';'
-
+mls() | define_
-                        ;
-alias_def               : ALIAS names

branches/module-loading/libqpol/src/util.c

@@ -172 +172 @@
-        return search_policy_binary_file(path);
-}
+
+#include <stdlib.h>
+#include <bzlib.h>
+#include <string.h>
+#include <sys/sendfile.h>
+
+#define BZ2_MAGICSTR "BZh"
+#define BZ2_MAGICLEN (sizeof(BZ2_MAGICSTR)-1)
+
+/* qpol_bunzip() uncompresses a file to '*data', returning the total number of
+ * uncompressed bytes in the file.
+ * Returns -1 if file could not be decompressed.
+ * Originally from libsemanage/src/direct_api.c, with slight mods */
+ssize_t qpol_bunzip(FILE *f, char **data)
+{
+        BZFILE* b;
+        size_t  nBuf;
+        char    buf[1<<18];
+        size_t  size = sizeof(buf);
+        int     bzerror;
+        size_t  total=0;
+        int             small=0;        // Set to 1 to use less memory decompressing (about 2x slower)
+
+        bzerror = fread(buf, 1, BZ2_MAGICLEN, f);
+        rewind(f);
+        if ((bzerror != BZ2_MAGICLEN) || memcmp(buf, BZ2_MAGICSTR, BZ2_MAGICLEN))
+                return -1;
+        
+        b = BZ2_bzReadOpen ( &bzerror, f, 0, small, NULL, 0 );
+        if ( bzerror != BZ_OK ) {
+                BZ2_bzReadClose ( &bzerror, b );
+                return -1;
+        }
+        
+        char *uncompress = realloc(NULL, size);
+        
+        while ( bzerror == BZ_OK) {
+                nBuf = BZ2_bzRead ( &bzerror, b, buf, sizeof(buf));
+                if (( bzerror == BZ_OK ) || ( bzerror == BZ_STREAM_END )) {
+                        if (total + nBuf > size) {
+                                size *= 2;
+                                uncompress = realloc(uncompress, size);
+                        }
+                        memcpy(&uncompress[total], buf, nBuf);
+                        total += nBuf;
+                }
+        }
+        if ( bzerror != BZ_STREAM_END ) {
+                BZ2_bzReadClose ( &bzerror, b );
+                free(uncompress);
+                return -1;
+        }
+        BZ2_bzReadClose ( &bzerror, b );
+
+        *data = uncompress;
+        return  total;
+}
+

branches/module-loading/libqpol/swig/qpol.i

@@ -232 +232 @@
-                qpol_module_t *m;
-                BEGIN_EXCEPTION
+                errno=0;
-                if (qpol_module_create_from_file(path, &m)) {
-                        SWIG_exception(SWIG_IOError, "Error opening module");
@@ -2877 +2878 @@
-        };
-%}
+// vim:ft=c noexpandtab