add better error reporting for invalid import file types

[zpackage] / lib / zpm.c

diff --git a/lib/zpm.c b/lib/zpm.c
index 96c355415e23ccf293993fc8a7ab0a013b7ee1e7..d97bebee27ebef848efc8eea40e1070fba9646c6 100644 (file)
--- a/lib/zpm.c
+++ b/lib/zpm.c
@@ -1,3 +1,5 @@
+#define _POSIX_C_SOURCE 200809L
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -11,6 +13,7 @@
 #include "zpm.h"
 
 #include "sha256.h"
+
 #if 0
 struct zpm {
        sqlite3 *db;
@@ -342,11 +345,37 @@ int zpm_close(struct zpm *pkg) {
        return 1;
 }
 
+/* set package struct variables, database, environment, then command line */
+int zpm_readopts(struct zpm *pkg, int ac, char **av) {
+       char *ev;
+
+       if (!pkg) {
+               return -1;
+       }
+
+       ev = getenv("ZPMPACKAGE");
+       if (ev) {
+               pkg->pkgname = dupstr(ev);
+       }
+       ev = getenv("ZPMPKGREL");
+       if (ev) {
+               pkg->release = strtol(ev, 0, 0);
+       }
+       ev = getenv("ZPMPKGVER");
+       if (ev) {
+               pkg->version = dupstr(ev);
+       }
+
+       /* now, parse the options, return optind so the caller can adjust if needed */
+
+       return 1;
+}
+
 int zpm_extract(struct zpm *pkg, char *hash, char *path, int mode) {
        int rc;
 
        int blobsize;
-       int64_t size;
+       //int64_t size;
        void *xzdata;
        int type;
        FILE *out;
@@ -397,7 +426,7 @@ int zpm_extract(struct zpm *pkg, char *hash, char *path, int mode) {
                sqlite3_close(db);
                return 0;
        }
-       size = sqlite3_column_int64(ifile, 0);
+       //size = sqlite3_column_int64(ifile, 0);
        xzdata = (void *)sqlite3_column_blob(ifile, 1);
        blobsize = sqlite3_column_bytes(ifile, 1);
 
@@ -420,6 +449,51 @@ int zpm_extract(struct zpm *pkg, char *hash, char *path, int mode) {
        
 }
 
+/* flags 0, close mmap, flags 1, return mmap fd */
+int zpm_hash(char *path, char *hash, uint32_t flags) {
+       int fd;
+       void *content;
+       struct stat sbuf;
+       hash_state md;
+       int j;
+       unsigned char tmp[32];
+
+       /* mmap the file */
+       fd = open(path, O_RDONLY);
+       if (fd == -1) {
+               fprintf(stderr, "%s can't open %s: %s\n", __FUNCTION__, path,strerror(errno));
+               return 0;
+       }
+       if (fstat(fd, &sbuf) == -1) {
+               fprintf(stderr, "%s can't fstat %s: %s\n", __FUNCTION__, path,strerror(errno));
+               return 0;
+       }
+       /* not a regular file? */
+       if (!S_ISREG(sbuf.st_mode)) {
+               /* TODO this is ok, just stored differently */
+               fprintf(stderr, "%s non-regular files unsupported %s\n", __FUNCTION__, path);
+               return 0;
+       }
+
+       content = mmap(0, sbuf.st_size, PROT_READ,MAP_PRIVATE, fd, 0);
+       close(fd);
+       if (!content) {
+               fprintf(stderr, "%s can't mmap %s: %s\n", __FUNCTION__, path,strerror(errno));
+               return 0;
+       }
+
+       /* get hash */
+       sha256_init(&md);
+       sha256_process(&md, content, sbuf.st_size);
+       sha256_done(&md, tmp);
+       for (j=0;j<32;j++) {
+               sprintf(hash+j*2, "%02x", (unsigned)tmp[j]);
+       }
+       hash[64] = 0;
+       munmap(content, sbuf.st_size);
+       return 1;
+}
+
 #if 1
 int zpm_import(struct zpm *pkg, char *path, uint32_t flags, char *hash) {
        int fd;
@@ -448,22 +522,36 @@ int zpm_import(struct zpm *pkg, char *path, uint32_t flags, char *hash) {
        /* mmap the file */
        fd = open(path, O_RDONLY);
        if (fd == -1) {
+               pkg->error = errno;
                fprintf(stderr, "%s can't open %s: %s\n", __FUNCTION__, path,strerror(errno));
                return 0;
        }
        if (fstat(fd, &sbuf) == -1) {
+               pkg->error = errno;
                fprintf(stderr, "%s can't fstat %s: %s\n", __FUNCTION__, path,strerror(errno));
                return 0;
        }
        /* not a regular file? */
        if (!S_ISREG(sbuf.st_mode)) {
+               char *ftype;
+               switch (sbuf.st_mode & S_IFMT) {
+                       case S_IFSOCK: ftype = "socket"; break;
+                       case S_IFLNK : ftype = "symlink"; break;
+                       case S_IFBLK : ftype = "block device"; break;
+                       case S_IFDIR : ftype = "directory"; break;
+                       case S_IFCHR : ftype = "character device"; break;
+                       case S_IFIFO : ftype = "fifo"; break;
+                       default: ftype = "unknown file type"; break;
+               }
                /* TODO this is ok, just stored differently */
-               fprintf(stderr, "%s non-regular files unsupported %s\n", __FUNCTION__, path);
+               fprintf(stderr, "%s can't import %s file: %s\n", __FUNCTION__, ftype, path);
+               pkg->error = EINVAL;
                return 0;
        }
 
        content = mmap(0, sbuf.st_size, PROT_READ,MAP_PRIVATE, fd, 0);
        if (!content) {
+               pkg->error = errno;
                fprintf(stderr, "%s can't mmap %s: %s\n", __FUNCTION__, path,strerror(errno));
                return 0;
        }
@@ -476,7 +564,7 @@ int zpm_import(struct zpm *pkg, char *path, uint32_t flags, char *hash) {
                sprintf(hash+j*2, "%02x", (unsigned)tmp[j]);
        }
        hash[64] = 0;
-       fprintf(stderr, "file %s: %s\n", path, hash);
+       //fprintf(stderr, "file %s: %s\n", path, hash);
 
        /* prepare and bind */
        /* TODO check null */
@@ -530,7 +618,7 @@ int zpm_import(struct zpm *pkg, char *path, uint32_t flags, char *hash) {
                        fprintf(stderr, "compresslzma failed\n");
                        return 0;
                }
-               fprintf(stderr, "compressed to %zu\n", outlen);
+               //fprintf(stderr, "compressed to %zu\n", outlen);
                /* don't need the original file now */
                munmap(content, sbuf.st_size);
                close(fd);
@@ -541,10 +629,10 @@ int zpm_import(struct zpm *pkg, char *path, uint32_t flags, char *hash) {
 
                /* insert */
                if (haverow) {
-                       fprintf(stderr, "adding file data\n");
+                       //fprintf(stderr, "adding file data\n");
                        rc = sqlite3_prepare(db, "update files set size = ?, content = ? where hash = ?", -1, &ifile,0);
                } else {
-                       fprintf(stderr, "creating new data row\n");
+                       //fprintf(stderr, "creating new data row\n");
                        rc = sqlite3_prepare(db, "insert into files (size, content, hash) values (?,?,?)", -1, &ifile,0);
                }
                if (rc != SQLITE_OK) {