+#define _POSIX_C_SOURCE 200809L
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include "zpm.h"
+#include "elf.h"
#include "sha256.h"
+
#if 0
struct zpm {
sqlite3 *db;
#define SQLERROR(x) fprintf(stderr, "%s %d: %s\n", __func__, __LINE__, (x))
#endif
-static char *dupstr(char *s) {
- size_t n;
- char *d;
-
- n = strlen(s);
- d = malloc(n+1);
- if (d) {
- d = strcpy(d, s);
- }
- return d;
-}
-
#if 0
int zpm_newpkg(struct zpm *z, char *base, char *version, int release) {
char *sql = "insert or ignore into packages (package,version,release) values (?,?,?)";
return 1;
}
+/* wrapper for sqlite3_exec */
+int zpm_exec(struct zpm *z, const char *sql, int(*callback)(void *, int, char **, char**), void *arg, char **errmsg) {
+ return sqlite3_exec(z->db, sql, callback, arg, errmsg);
+}
+
int zpm_rollback(struct zpm *z) {
char *errstr = 0;
sqlite3_exec(z->db, "rollback;", NULL, NULL, &errstr);
#include "newdb.c"
int zpm_db_initialize(struct zpm *pkg) {
- fprintf(stderr, "initializing zpm database\n");
- switch (sqlite3_exec(pkg->db, createdb, (int (*)(void *,int,char **,char **))0, NULL, NULL)) {
+ //fprintf(stderr, "initializing zpm database\n");
+ char *error;
+ switch (sqlite3_exec(pkg->db, createdb, (int (*)(void *,int,char **,char **))0, NULL, &error)) {
case SQLITE_OK: break;
default:
SQLERROR(sqlite3_errmsg(pkg->db));
+ fprintf(stderr, "error: %s\n", error);
+ sqlite3_free(error);
return 0;
break;
}
return 1;
}
-/* NULL? Create? */
-int zpm_open(struct zpm *pkg, char *path) {
- int rc;
+
+/* assumes pkg->db is set */
+static int setupdb(struct zpm *zpm) {
char *errstr = 0;
- sqlite3 *db = 0;
int appid, dbver;
- pkg->db = 0;
- pkg->path = 0;
- pkg->version = 0;
- pkg->release = 0;
- pkg->pkgname = 0;
- pkg->installed = 0;
+ zpm->error = 0;
+
+ appid = zpm_db_pragma(zpm, 1);
+ dbver = zpm_db_pragma(zpm, 2);
+
+ if (appid != 0x5a504442) {
+ fprintf(stderr, "unknown database type\n");
+ zpm->error = 1;
+ return 0;
+ }
+
+ if (dbver > 1) {
+ fprintf(stderr, "version %d zpm db detected, this program only works with version 1 databases\n", dbver);
+ zpm->error = 1;
+ return 0;
+ }
+
+ sqlite3_exec(zpm->db, "pragma foreign_keys = ON;", NULL, NULL, &errstr);
+
+ if (errstr) {
+ free(zpm->errmsg);
+ zpm->errmsg = strdup(errstr);
+ fprintf(stderr, "sqlite foreign key error: %s\n", errstr);
+ sqlite3_free(errstr);
+ zpm->error = 1;
+ return 0;
+ }
+
+ /* TODO add vercmp */
+
+ return 1;
+}
+
+struct zpm *zpm_clearmem(struct zpm *zpm) {
+ if (!zpm) {
+ zpm = malloc(sizeof *zpm);
+ }
+
+ if (zpm) {
+ *zpm = (struct zpm){0};
+ }
+
+ return zpm;
+}
+
+static void zpm_set_db_errmsg(struct zpm *zpm, const char *msg) {
+ if (zpm) {
+ if (zpm->dberrmsg) {
+ free(zpm->dberrmsg);
+ }
+ if (msg) {
+ zpm->dberrmsg = strdup(msg);
+ if (!zpm->dberrmsg) {
+ zpm->error = 1;
+ }
+ }
+ }
+}
+
+int zpm_init(struct zpm *pkg, char *path) {
+ int rc;
+ sqlite3 *db = 0;
+ int appid;
- rc = sqlite3_open(path, &db);
+ if (!pkg) {
+ return 0;
+ }
+
+ zpm_clearmem(pkg);
+
+ rc = sqlite3_open_v2(path, &db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL);
if (rc) {
- SQLERROR(sqlite3_errmsg(db));
- sqlite3_close(db);
+ pkg->error = 1;
+ pkg->dbresult = rc;
+ zpm_set_db_errmsg(pkg, sqlite3_errstr(rc));
+ if (db) {
+ sqlite3_close(db);
+ }
+ fprintf(stderr, "error (%d): %s: %s\n", rc,
+ pkg->dberrmsg, path);
+
return 0;
}
pkg->db = db;
- pkg->path = dupstr(path);
+ pkg->path = strdup(path);
appid = zpm_db_pragma(pkg, 1);
- dbver = zpm_db_pragma(pkg, 2);
- fprintf(stderr, "db appid = %x, dbver = %d\n", appid, dbver);
switch (appid) {
case 0: if (!zpm_db_initialize(pkg)) {
sqlite3_close(db);
return 1;
};
break;
- case 0x5a504442: break;
+ case 0x5a504442:
+ /* already initialized */
+ break;
default:
fprintf(stderr, "unknown database type\n");
sqlite3_close(db);
return 0;
break;
}
- if (dbver > 1) {
- fprintf(stderr, "version %d zpm db detected, this program only works with version 1 databases\n", dbver);
- sqlite3_close(db);
- return 0;
- }
- sqlite3_exec(pkg->db, "pragma foreign_keys = ON;", NULL, NULL, &errstr);
- if (errstr) {
- fprintf(stderr, "sqlite foreign key error: %s\n", errstr);
- sqlite3_free(errstr);
+ if (!setupdb(pkg)) {
sqlite3_close(db);
+ pkg->db = 0;
return 0;
}
+ zpm_addvercmp(pkg);
+
+ return 1;
+}
+int zpm_open(struct zpm *zpm, char *path) {
+ int rc;
+ sqlite3 *db = 0;
- /* TODO if this is a new database, create structures */
+ zpm_clearmem(zpm);
+
+ rc = sqlite3_open_v2(path, &db, SQLITE_OPEN_READWRITE, NULL);
+ if (rc) {
+ SQLERROR(sqlite3_errmsg(db));
+ sqlite3_close(db);
+ zpm->error = 1;
+ fprintf(stderr, "path = %s\n", path);
+ return 0;
+ }
+ zpm->db = db;
+ zpm->path = strdup(path);
+
+ if (!setupdb(zpm)) {
+ sqlite3_close(db);
+ zpm->db = 0;
+ zpm->error = 1;
+ return 0;
+ }
+ zpm_addvercmp(zpm);
- /* get a package. what if more than one? what if none? */
return 1;
}
return 1;
}
+static int zpm_sqlite_vercmp(void *not_used, int lena, const void *a,
+ int lenb, const void *b) {
+ /* not sure what the ints are, possibly string lengths */
+ if (not_used != 0) fprintf(stderr, "sqlite vercmp not_used = %p\n",
+ not_used);
+ if (lena == 0 && lenb > 0) return 1;
+ return zpm_vercmp(a, b);
+}
+
+int zpm_addvercmp(struct zpm *pkg) {
+ return sqlite3_create_collation(
+ pkg->db, "vercmp", SQLITE_UTF8, NULL,
+ zpm_sqlite_vercmp
+ );
+}
+
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;
/* didn't find a row */
sqlite3_finalize(ifile);
sqlite3_close(db);
- fprintf(stderr, "no such hash\n");
+ fprintf(stderr, "no such hash: %s\n", hash);
return 0;
}
/* either way we're done with this now */
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);
- out = fopen(path, "w");
+ if (strcmp(path, "-")) {
+ out = fopen(path, "w");
+ } else {
+ out = stdout;
+ }
if (!out) {
fprintf(stderr, "can't open output file %s\n", path);
sqlite3_finalize(ifile);
sqlite3_close(db);
- return 5;
+ return 0;
}
//fwrite(xzdata, blobsize, 1, stdout);
- fprintf(stderr, "uncompressing %d bytes at %p, expect %lld\n", blobsize, xzdata, (long long int)size);
+ //fprintf(stderr, "uncompressing %d bytes at %p, expect %lld\n", blobsize, xzdata, (long long int)size);
uncompresslzma(xzdata, blobsize, out);
fclose(out);
+ chmod(path, mode);
sqlite3_finalize(ifile);
- return 0;
-
+ return 1;
}
-#if 1
-int zpm_import(struct zpm *pkg, char *path, uint32_t flags, char *hash) {
+static int run_for_hash(sqlite3 *db, char *sql, char *hash) {
+ int rc;
+ sqlite3_stmt *ifile;
+
+ rc = sqlite3_prepare_v2(db, sql, -1, &ifile, 0);
+ if (rc != SQLITE_OK) {
+ SQLERROR(sqlite3_errmsg(db));
+ return 0;
+ }
+
+ /* hash, filename */
+
+ sqlite3_bind_text(ifile, 1, hash, 64, SQLITE_STATIC);
+ do {
+ rc = sqlite3_step(ifile);
+ } while (rc == SQLITE_ROW);
+
+ sqlite3_finalize(ifile);
+
+ return rc == SQLITE_DONE;
+}
+
+#define SQLERP(db, msg) fprintf(stderr, "%s: %s\n", msg, sqlite3_errmsg(db))
+
+static int set_elf_info(sqlite3 *db, char *hash, char *content, size_t length) {
+ if (length >= sizeof (Elf64_Ehdr) && libelf_iself(content)) {
+ char *strtab;
+ Elf64_Dyn *dyn;
+ int i;
+ Elf64_Phdr *phdr;
+ Elf64_Ehdr *hdr;
+ sqlite3_stmt *ifile;
+ int rc;
+
+ /* clear existing for this hash */
+ if (!run_for_hash(db, "delete from elfinfo where file = ?", hash)) {
+ SQLERP(db, "error clearing elf info");
+ return 0;
+ }
+
+ if (!run_for_hash(db, "delete from elflibraries where file = ?", hash)) {
+ SQLERP(db, "error clearing elf library");
+ return 0;
+ }
+
+ if (!run_for_hash(db, "delete from elfneeded where file = ?", hash)) {
+ SQLERP(db, "error clearing elf needed");
+ return 0;
+ }
+
+ hdr = libelf_header(content);
+ /* if lib, set soname */
+ if (libelf_type(content) == ET_DYN) {
+ char *soname = libelf_soname(content);
+ if (soname) {
+
+ sqlite3_prepare_v2(db, "insert into elflibraries (file,soname) values (?,?)",-1, &ifile, 0);
+ sqlite3_bind_text(ifile,1,hash,64,SQLITE_STATIC);
+ sqlite3_bind_text(ifile,2,soname,-1,SQLITE_STATIC);
+ rc = sqlite3_step(ifile);
+ if (rc != SQLITE_DONE) {
+ SQLERROR(sqlite3_errmsg(db));
+ sqlite3_finalize(ifile);
+ fprintf(stderr, "error setting library soname\n");
+ return 0;
+ }
+ sqlite3_finalize(ifile);
+ } else {
+ fprintf(stderr, "can't find soname\n");
+ }
+ }
+
+ /* if exe, set neededs */
+ if (libelf_type(content) == ET_EXEC) {
+ Elf64_Shdr *dsect = 0;
+ char *elf;
+
+ elf = (char *)content;
+ /* find program header table */
+ for (i = 0; i < hdr->e_phnum; i++) {
+ phdr = (Elf64_Phdr *)(elf + hdr->e_phoff + i * hdr->e_phentsize);
+ if (phdr->p_type == PT_DYNAMIC) {
+ dsect = (Elf64_Shdr *)(elf + phdr->p_offset);
+ }
+ }
+ if (!dsect) {
+ /* no dynamic section found */
+ return 1;
+ }
+
+#if 0
+ dyn = (Elf64_Dyn *)(elf + dsect->sh_offset);
+ if (!dyn) {
+ exit(9);
+ }
+#endif
+ dyn = (Elf64_Dyn *)dsect;
+
+ dsect = libelf_section(elf, SHT_DYNAMIC);
+ Elf64_Shdr *strsect;
+
+ strsect = libelf_section_n(elf, dsect->sh_link);
+ strtab = elf + strsect->sh_offset;
+
+ sqlite3_prepare_v2(db, "insert into elfneeded (file,needed) values (?,?)",-1, &ifile, 0);
+ sqlite3_bind_text(ifile,1,hash,64,SQLITE_STATIC);
+ while (dyn->d_tag != DT_NULL) {
+ if (dyn->d_tag == DT_NEEDED) {
+ char *need;
+ int rc;
+
+ need = strtab + dyn->d_un.d_val;
+ if (strlen(need) == 0) continue;
+ sqlite3_bind_text(ifile,2,need,strlen(need),SQLITE_STATIC);
+#if 0
+ fprintf(stderr, "%s needs %s\n", hash, need);
+#endif
+ rc = sqlite3_step(ifile);
+ if (rc != SQLITE_DONE) {
+ SQLERP(db, "error setting needed library");
+ sqlite3_finalize(ifile);
+ return 0;
+ }
+ sqlite3_reset(ifile);
+ }
+ dyn++;
+ }
+ sqlite3_finalize(ifile);
+ }
+ }
+ return 1;
+}
+
+int zpm_import(struct zpm *zpm, char *path, uint32_t flags, char *hash) {
int fd;
- void *content;
+ void *content = 0;
struct stat sbuf;
unsigned char tmp[32];
- hash_state md;
- sqlite3_stmt *ifile;
+ struct sha256_state md;
+ sqlite3_stmt *ifile = 0;
int haverow = 0,havedata = 0;
int j,rc,type;
char hashbuf[65];
size_t outlen = 0;
void *outbuf;
- if (!pkg || !pkg->db || !path) {
+ if (!zpm || !zpm->db || !path) {
return 0;
}
hash = hashbuf;
}
+ if (flags) {
+ fprintf(stderr, "zpm_import unused flags = %d\n", flags);
+ }
/* mmap the file */
fd = open(path, O_RDONLY);
if (fd == -1) {
+ zpm->error = errno;
fprintf(stderr, "%s can't open %s: %s\n", __FUNCTION__, path,strerror(errno));
return 0;
}
if (fstat(fd, &sbuf) == -1) {
+ zpm->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);
+ zpm->error = EINVAL;
return 0;
}
content = mmap(0, sbuf.st_size, PROT_READ,MAP_PRIVATE, fd, 0);
+ close(fd);
if (!content) {
+ zpm->error = errno;
fprintf(stderr, "%s can't mmap %s: %s\n", __FUNCTION__, path,strerror(errno));
return 0;
}
sprintf(hash+j*2, "%02x", (unsigned)tmp[j]);
}
hash[64] = 0;
- fprintf(stderr, "file %s: %s\n", path, hash);
- /* prepare and bind */
/* TODO check null */
- sqlite3 *db = pkg->db;
+ sqlite3 *db = zpm->db;
+
+ /* prepare and bind */
rc = sqlite3_prepare_v2(db, "select size, content is not null from files where hash = ?", -1, &ifile,0);
if (rc != SQLITE_OK) {
SQLERROR(sqlite3_errmsg(db));
+ munmap(content, sbuf.st_size);
return 0;
}
if (rc != SQLITE_ROW) {
/* didn't find a row */
SQLERROR(sqlite3_errmsg(db));
- zpm_rollback(pkg);
+ munmap(content, sbuf.st_size);
return 0;
}
haverow = 1;
-// fprintf(stderr, "have row for hash\n");
type = sqlite3_column_type(ifile, 0);
if (type == SQLITE_NULL) {
/* TODO assert, this shouldn't be possible? */
fprintf(stderr, "no file size\n");
sqlite3_finalize(ifile);
+ munmap(content, sbuf.st_size);
return 0;
}
type = sqlite3_column_type(ifile, 1);
/* TODO assert, this shouldn't be possible? */
fprintf(stderr, "no file data\n");
sqlite3_finalize(ifile);
+ munmap(content, sbuf.st_size);
return 0;
/* which is fine, just need to update the row then */
}
outbuf = compresslzma(content, sbuf.st_size, &outlen);
if (!outbuf) {
fprintf(stderr, "compresslzma failed\n");
+ munmap(content, sbuf.st_size);
return 0;
}
- fprintf(stderr, "compressed to %zu\n", outlen);
- /* don't need the original file now */
- munmap(content, sbuf.st_size);
- close(fd);
-
- /* start a transaction */
- // do that outside of here
- //zpm_begin(pkg);
/* insert */
if (haverow) {
- fprintf(stderr, "adding file data\n");
- rc = sqlite3_prepare(db, "update files set size = ?, content = ? where hash = ?", -1, &ifile,0);
+ rc = sqlite3_prepare_v2(db, "update files set size = ?, content = ? where hash = ?", -1, &ifile,0);
} else {
- fprintf(stderr, "creating new data row\n");
- rc = sqlite3_prepare(db, "insert into files (size, content, hash) values (?,?,?)", -1, &ifile,0);
+ rc = sqlite3_prepare_v2(db, "insert into files (size, content, hash) values (?,?,?)", -1, &ifile,0);
}
+
if (rc != SQLITE_OK) {
SQLERROR(sqlite3_errmsg(db));
fprintf(stderr, "cant prepare data\n");
- zpm_rollback(pkg);
+ munmap(content, sbuf.st_size);
return 0;
}
- sqlite3_bind_int64(ifile, 1, (sqlite3_int64)sbuf.st_size);
+ rc = sqlite3_bind_int64(ifile, 1, (sqlite3_int64)sbuf.st_size);
if (rc != SQLITE_OK) {
SQLERROR(sqlite3_errmsg(db));
+ sqlite3_finalize(ifile);
fprintf(stderr, "cant bind size\n");
- zpm_rollback(pkg);
+ munmap(content, sbuf.st_size);
return 0;
}
- sqlite3_bind_blob64(ifile, 2, outbuf, (sqlite3_int64)outlen, SQLITE_STATIC);
+
+ rc = sqlite3_bind_blob64(ifile, 2, outbuf,
+ (sqlite3_int64)outlen, SQLITE_STATIC);
if (rc != SQLITE_OK) {
SQLERROR(sqlite3_errmsg(db));
+ sqlite3_finalize(ifile);
fprintf(stderr, "cant bind content\n");
- zpm_rollback(pkg);
+ munmap(content, sbuf.st_size);
return 0;
}
- sqlite3_bind_text(ifile, 3, hash, 64, SQLITE_STATIC);
+
+ rc = sqlite3_bind_text(ifile, 3, hash, 64, SQLITE_STATIC);
if (rc != SQLITE_OK) {
SQLERROR(sqlite3_errmsg(db));
fprintf(stderr, "cant bind hash\n");
- zpm_rollback(pkg);
+ sqlite3_finalize(ifile);
+ munmap(content, sbuf.st_size);
return 0;
}
+
rc = sqlite3_step(ifile);
if (rc != SQLITE_DONE) {
SQLERROR(sqlite3_errmsg(db));
sqlite3_finalize(ifile);
- zpm_rollback(pkg);
+ munmap(content, sbuf.st_size);
return 0;
}
sqlite3_finalize(ifile);
- /* commit */
- //zpm_commit(pkg);
-
- } else {
/* don't need the original file now */
- munmap(content, sbuf.st_size);
- close(fd);
}
-
- /* if package and not nopackage flag, add to package */
- if (pkg->pkgname && (!ZPM_NOPACKAGE)) {
- /* TODO */
+ if (!set_elf_info(zpm->db, hash, content, sbuf.st_size)) {
+ fprintf(stderr, "setting elf info failed\n");
+ munmap(content, sbuf.st_size);
+ return 0;
}
+ munmap(content, sbuf.st_size);
+
/* return */
return 1;
}
-#endif
-
-#if 0
-int main(int ac, char **av){
- sqlite3 *db = 0;
- int rc;
-
- int blobsize;
- int64_t size;
- void *xzdata;
- int type;
- FILE *out;
- sqlite3_stmt *ifile;
-
- char *hash;
- char *filename;
-
- if (ac < 3) {
- fprintf(stderr, "usage: db hash file\n");
- return 1;
- }
-
- rc = sqlite3_open(av[1], &db);
- if (rc) {
- SQLERROR(sqlite3_errmsg(db));
- sqlite3_close(db);
- return 1;
- }
-
-}
-#endif
-
-#if 0
-Packages are sqlite databases
-
-get application id and userver
-
-Primitive operations:
-
-add path to repo
-associate path with package
-associate blob with path?
-add blob to repo
-* extract blob to a path
-compare blob to filesystem path
-create package with info
-
-Extra primitives:
-
-record elf information about blob
-compress blob
-uncompress blob
-sign a package? What are we verifying?
-#endif