Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 18cd76a
Add an audit command.
jlaffaye committed 14 years ago
commit 18cd76aa092136fb1768ce2b7274a07fa83fbde6
parent f58d125
5 files changed +184 -2
modified libpkg/pkg.h
@@ -34,7 +34,7 @@ typedef enum {
	 */

	LICENSE_AND='&',

	/**
- 
	 * The licen logic un single (default in the ports)
+ 
	 * The license logic un single (default in the ports)

	 */

	LICENSE_SINGLE=1

} lic_t;
modified pkg/Makefile
@@ -1,5 +1,6 @@
PROG=		pkg

SRCS=		add.c \
+ 
		audit.c \

		autoremove.c \

		backup.c \

		clean.c \
added pkg/audit.c
@@ -0,0 +1,172 @@
+ 
#include <sys/param.h>
+ 
#include <sys/queue.h>
+
+ 
#define _WITH_GETLINE
+
+ 
#include <err.h>
+ 
#include <stdbool.h>
+ 
#include <stdio.h>
+ 
#include <string.h>
+ 
#include <unistd.h>
+
+ 
#include <pkg.h>
+
+ 
#include "audit.h"
+
+ 
#define AUDIT_URL "http://portaudit.FreeBSD.org/auditfile.tbz"
+
+ 
struct audit_entry {
+ 
	char *pattern;
+ 
	char *url;
+ 
	char *desc;
+ 
	SLIST_ENTRY(audit_entry) next;
+ 
};
+
+ 
SLIST_HEAD(audit_head, audit_entry);
+
+ 
void
+ 
usage_audit(void)
+ 
{
+ 
	fprintf(stderr, "usage: pkg audit [-F]\n");
+ 
}
+
+ 
static int
+ 
fetch_and_extract(const char *audit_file)
+ 
{
+ 
	const char *tmp = "/tmp/auditfile.tbz";
+ 
	if (pkg_fetch_file(AUDIT_URL, tmp) != EPKG_OK) {
+ 
		warnx("Can't fetch audit file");
+ 
		return (1);
+ 
	}
+ 
	/* TODO: extract!!! */
+ 
	return (1);
+
+ 
	audit_file = NULL;
+ 
	unlink(tmp);
+
+ 
	return (0);
+ 
}
+
+ 
static int
+ 
parse_db(const char *path, struct audit_head *h)
+ 
{
+ 
	struct audit_entry *e;
+ 
	FILE *fp;
+ 
	size_t linecap = 0;
+ 
	ssize_t linelen;
+ 
	char *line = NULL;
+ 
	const char *column;
+ 
	uint8_t column_id;
+
+ 
	if ((fp = fopen(path, "r")) == NULL)
+ 
	{
+ 
		warn("fopen(%s)", path);
+ 
		return 1;
+ 
	}
+
+ 
	while ((linelen = getline(&line, &linecap, fp)) > 0) {
+ 
		column_id = 0;
+
+ 
		if ((e = calloc(1, sizeof(struct audit_entry))) == NULL)
+ 
			err(1, "calloc(audit_entry)");
+
+ 
		while ((column = strsep(&line, "|")) != NULL)
+ 
		{
+ 
			switch (column_id) {
+ 
				case 0:
+ 
					e->pattern = strdup(column);
+ 
					break;
+ 
				case 1:
+ 
					e->url = strdup(column);
+ 
					break;
+ 
				case 2:
+ 
					e->desc = strdup(column);
+ 
					break;
+ 
				default:
+ 
					warn("extra column in audit file");
+ 
			}
+ 
			column_id++;
+ 
		}
+
+ 
		SLIST_INSERT_HEAD(h, e, next);
+ 
	}
+
+ 
	return 0;
+ 
}
+
+ 
static void
+ 
free_audit_list(struct audit_head *h)
+ 
{
+ 
	struct audit_entry *e;
+
+ 
	while (!SLIST_EMPTY(h)) {
+ 
		e = SLIST_FIRST(h);
+ 
		SLIST_REMOVE_HEAD(h, next);
+ 
		free(e->pattern);
+ 
		free(e->url);
+ 
		free(e->desc);
+ 
	}
+ 
}
+
+ 
int
+ 
exec_audit(int argc, char **argv)
+ 
{
+ 
	struct pkgdb *db = NULL;
+ 
	const char *db_dir;
+ 
	char audit_file[MAXPATHLEN + 1];
+ 
	bool fetch = false;
+ 
	int ch;
+ 
	struct pkgdb_it *it = NULL;
+ 
	struct audit_head h = SLIST_HEAD_INITIALIZER();
+ 
#if 0
+ 
	struct pkg *pkg = NULL;
+ 
	struct pkg *p = NULL;
+ 
#endif
+
+ 
	db_dir = pkg_config("PKG_DBDIR");
+ 
	if (db_dir == NULL) {
+ 
		warnx("PKG_DBIR is missing");
+ 
		return (1);
+ 
	}
+ 
	snprintf(audit_file, sizeof(audit_file), "%s/auditfile", db_dir);
+
+
+ 
	while ((ch = getopt(argc, argv, "F")) != -1) {
+ 
		switch (ch) {
+ 
			case 'F':
+ 
				fetch = true;
+ 
				break;
+ 
		}
+ 
	}
+ 
	argc -= optind;
+ 
	argv += optind;
+
+ 
	if (fetch == true && fetch_and_extract(audit_file) != 0)
+ 
		return (1);
+
+ 
	if (pkgdb_open(&db, PKGDB_DEFAULT) != EPKG_OK)
+ 
		return (1);
+
+ 
	if ((it = pkgdb_query(db, NULL, MATCH_ALL)) == NULL)
+ 
	{
+ 
		warnx("Can not query local database");
+ 
		goto cleanup;
+ 
	}
+
+ 
	if (parse_db(audit_file, &h) != 0) {
+ 
		warnx("Can not parse and load audit db");
+ 
		goto cleanup;
+ 
	}
+
+ 
	/* TODO: do it! seriously!! */
+
+
+ 
cleanup:
+ 
	if (db != NULL)
+ 
		pkgdb_close(db);
+ 
	if (it != NULL)
+ 
		pkgdb_it_free(it);
+ 
	free_audit_list(&h);
+
+ 
	return (0);
+ 
}
added pkg/audit.h
@@ -0,0 +1,7 @@
+ 
#ifndef _AUDIT_H
+ 
#define _AUDIT_H
+
+ 
int exec_audit(int, char **);
+ 
void usage_audit(void);
+ 
#endif
+
modified pkg/main.c
@@ -13,6 +13,7 @@
#include <pkg.h>



#include "add.h"
+ 
#include "audit.h"

#include "autoremove.h"

#include "backup.h"

#include "clean.h"
@@ -43,7 +44,8 @@ static struct commands {
	int (*exec)(int argc, char **argv);

	void (* const usage)(void);

} cmd[] = {
- 
	{ "add", "registers a package and installs it on the system", exec_add, usage_add},
+ 
	{ "add", "Registers a package and installs it on the system", exec_add, usage_add},
+ 
	{ "audit", "Reports vulnerable packages", exec_audit, usage_audit},

	{ "autoremove", "Removes orphan packages", exec_autoremove, usage_autoremove},

	{ "backup", "Backup and restore the local package database", exec_backup, usage_backup},

	{ "clean", "Cleans old packages from the cache", exec_clean, usage_clean},