Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › b965cce
add minimalistic integrity checking
Baptiste Daroussin committed 14 years ago
commit b965cceead8f860ff9761e3f9673b0069174e259
parent e0f234f
3 files changed +80 -1
modified libpkg/pkg_jobs.c
@@ -96,9 +96,22 @@ pkg_jobs_install(struct pkg_jobs *j)
			return (EPKG_FATAL);

	}
- 
	/* Install */

	cachedir = pkg_config("PKG_CACHEDIR");

	p = NULL;
+ 
	/* integrity checking */
+ 
	while (pkg_jobs(j, &p) == EPKG_OK) {
+ 
		snprintf(path, sizeof(path), "%s/%s", cachedir,
+ 
				pkg_get(p, PKG_REPOPATH));
+ 
		if (pkg_open(&p, path, NULL) != EPKG_OK) {
+ 
			return (EPKG_FATAL);
+ 
		}
+ 
		pkgdb_integrity_append(j->db, p);
+ 
	}
+
+ 
	if (pkgdb_integrity_check(j->db) != EPKG_OK)
+ 
		return (EPKG_FATAL);
+
+ 
	/* Install */

	while (pkg_jobs(j, &p) == EPKG_OK) {

		snprintf(path, sizeof(path), "%s/%s", cachedir,

				 pkg_get(p, PKG_REPOPATH));
modified libpkg/pkg_private.h
@@ -179,6 +179,9 @@ int pkg_delete_dirs(struct pkgdb *db, struct pkg *pkg, int force);


int pkgdb_is_dir_used(struct pkgdb *db, const char *dir, int64_t *res);
+ 
int pkgdb_integrity_append(struct pkgdb *db, struct pkg *p);
+ 
int pkgdb_integrity_check(struct pkgdb *db);
+ 


int pkg_setrowid(struct pkg *, int64_t rowid);



/* pkgdb commands */
modified libpkg/pkgdb.c
@@ -2069,3 +2069,66 @@ pkgdb_rquery(struct pkgdb *db, const char *pattern, match_t match, pkgdb_field f


	return (pkgdb_it_new(db, stmt, PKG_REMOTE));

}
+
+ 
int
+ 
pkgdb_integrity_append(struct pkgdb *db, struct pkg *p)
+ 
{
+ 
	sqlite3_stmt *stmt = NULL;
+ 
	struct pkg_file *file = NULL;
+ 
	const char sql[] = "INSERT INTO integritycheck (name, origin, version, path)"
+ 
		"values (?1, ?2, ?3, ?4);";
+
+ 
	assert( db != NULL && p != NULL);
+
+ 
	sql_exec(db->sqlite, "CREATE IF NOT EXISTS temporary table integritycheck ( "
+ 
			"name TEXT, "
+ 
			"origin TEXT, "
+ 
			"version TEXT, "
+ 
			"path TEXT );"
+ 
		);
+
+ 
	if (sqlite3_prepare_v2(db->sqlite, sql, -1, &stmt, NULL) != SQLITE_OK) {
+ 
		ERROR_SQLITE(db->sqlite);
+ 
		return (EPKG_FATAL);
+ 
	}
+ 
	while (pkg_files(p, &file) == EPKG_OK) {
+ 
		sqlite3_bind_text(stmt, 1, pkg_get(p, PKG_NAME), -1, SQLITE_STATIC);
+ 
		sqlite3_bind_text(stmt, 2, pkg_get(p, PKG_ORIGIN), -1, SQLITE_STATIC);
+ 
		sqlite3_bind_text(stmt, 3, pkg_get(p, PKG_VERSION), -1, SQLITE_STATIC);
+ 
		sqlite3_bind_text(stmt, 4, pkg_file_path(file), -1, SQLITE_STATIC);
+
+ 
		if (sqlite3_step(stmt) != SQLITE_DONE) {
+ 
			ERROR_SQLITE(db->sqlite);
+ 
			sqlite3_finalize(stmt);
+ 
			return (EPKG_FATAL);
+ 
		}
+ 
		sqlite3_reset(stmt);
+ 
	}
+ 
	sqlite3_finalize(stmt);
+ 
	return (EPKG_OK);
+ 
}
+
+ 
int
+ 
pkgdb_integrity_check(struct pkgdb *db)
+ 
{
+ 
	int ret = EPKG_OK;
+ 
	sqlite3_stmt *stmt;
+ 
	assert (db != NULL);
+
+ 
	if (sqlite3_prepare_v2(db->sqlite,
+ 
		"SELECT path, COUNT(path) AS NumOccurrences "
+ 
		"FROM integritycheck GROUP BY path  HAVING ( COUNT(path) > 1  );",
+ 
		-1, &stmt, NULL) != SQLITE_OK) {
+ 
		ERROR_SQLITE(db->sqlite);
+ 
		return (EPKG_FATAL);
+ 
	}
+
+ 
	while (sqlite3_step(stmt) != SQLITE_DONE) {
+ 
		pkg_emit_error("Conflict detected for file %s", sqlite3_column_text(stmt, 1));
+ 
		ret = EPKG_FATAL;
+ 
	}
+
+ 
	sqlite3_finalize(stmt);
+
+ 
	return (ret);
+ 
}