mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-22 10:07:12 +00:00
Code Issues Releases Wiki Activity

parser: Get rid of the cacheloc global

Browse Source 
Modify setup_cache() to accept the user-supplied cacheloc and return the
validated or created cache directory. The caller must then track that
variable and pass it into any parser/policy_cache.c functions that need
it.

The main reason for this change is that the cache location and the cache
directory will soon be two different paths. The cache location will
typically be the parent of the cache directory.

Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Acked-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
Tyler Hicks 2015-03-25 17:09:26 -05:00
parent 0f12effabf
commit d02bb58b70
3 changed files with 45 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
parser/parser_main.c
View File

@ -80,6 +80,8 @@ int mru_skip_cache = 1;
int debug_cache = 0; int debug_cache = 0;
struct timespec mru_tstamp; struct timespec mru_tstamp;
static char *cacheloc = NULL;
/* Make sure to update BOTH the short and long_options */ /* Make sure to update BOTH the short and long_options */
static const char *short_options = "adf:h::rRVvI:b:BCD:NSm:M:qQn:XKTWkL:O:po:"; static const char *short_options = "adf:h::rRVvI:b:BCD:NSm:M:qQn:XKTWkL:O:po:";
struct option long_options[] = { struct option long_options[] = {
@ -691,7 +693,7 @@ int test_for_dir_mode(const char *basename, const char *linkdir)
return rc; return rc;
} }
int process_profile(int option, const char *profilename) int process_profile(int option, const char *profilename, const char *cachedir)
{ {
int retval = 0; int retval = 0;
autofree const char *cachename = NULL; autofree const char *cachename = NULL;
@ -735,7 +737,7 @@ int process_profile(int option, const char *profilename)
/* setup cachename and tstamp */ /* setup cachename and tstamp */
if (!force_complain && !skip_cache) { if (!force_complain && !skip_cache) {
cachename = cache_filename(cacheloc, basename); cachename = cache_filename(cachedir, basename);
valid_read_cache(cachename); valid_read_cache(cachename);
} }
@ -820,32 +822,37 @@ out:
return retval; return retval;
} }
/* data - name of parent dir */ struct dir_cb_data {
const char *dirname; /* name of the parent dir */
const char *cachedir; /* path to the cache sub directory */
};
/* data - pointer to a dir_cb_data */
static int profile_dir_cb(DIR *dir unused, const char *name, struct stat *st, static int profile_dir_cb(DIR *dir unused, const char *name, struct stat *st,
void *data) void *data)
{ {
int rc = 0; int rc = 0;
if (!S_ISDIR(st->st_mode) && !is_blacklisted(name, NULL)) { if (!S_ISDIR(st->st_mode) && !is_blacklisted(name, NULL)) {
const char *dirname = (const char *)data; struct dir_cb_data *cb_data = (struct dir_cb_data *)data;
autofree char *path = NULL; autofree char *path = NULL;
if (asprintf(&path, "%s/%s", dirname, name) < 0) if (asprintf(&path, "%s/%s", cb_data->dirname, name) < 0)
PERROR(_("Out of memory")); PERROR(_("Out of memory"));
rc = process_profile(option, path); rc = process_profile(option, path, cb_data->cachedir);
} }
return rc; return rc;
} }
/* data - name of parent dir */ /* data - pointer to a dir_cb_data */
static int binary_dir_cb(DIR *dir unused, const char *name, struct stat *st, static int binary_dir_cb(DIR *dir unused, const char *name, struct stat *st,
void *data) void *data)
{ {
int rc = 0; int rc = 0;
if (!S_ISDIR(st->st_mode) && !is_blacklisted(name, NULL)) { if (!S_ISDIR(st->st_mode) && !is_blacklisted(name, NULL)) {
const char *dirname = (const char *)data; struct dir_cb_data *cb_data = (struct dir_cb_data *)data;
autofree char *path = NULL; autofree char *path = NULL;
if (asprintf(&path, "%s/%s", dirname, name) < 0) if (asprintf(&path, "%s/%s", cb_data->dirname, name) < 0)
PERROR(_("Out of memory")); PERROR(_("Out of memory"));
rc = process_binary(option, path); rc = process_binary(option, path);
} }
@ -870,6 +877,7 @@ static void setup_flags(void)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
autofree char *cachedir = NULL;
int retval, last_error; int retval, last_error;
int i; int i;
int optind; int optind;
@ -902,7 +910,7 @@ int main(int argc, char *argv[])
setup_flags(); setup_flags();
setup_cache(); cachedir = setup_cache(cacheloc);
retval = last_error = 0; retval = last_error = 0;
for (i = optind; i <= argc; i++) { for (i = optind; i <= argc; i++) {
@ -927,15 +935,20 @@ int main(int argc, char *argv[])
if (profilename && S_ISDIR(stat_file.st_mode)) { if (profilename && S_ISDIR(stat_file.st_mode)) {
int (*cb)(DIR *dir, const char *name, struct stat *st, int (*cb)(DIR *dir, const char *name, struct stat *st,
void *data); void *data);
struct dir_cb_data cb_data;
cb_data.dirname = profilename;
cb_data.cachedir = cachedir;
cb = binary_input ? binary_dir_cb : profile_dir_cb; cb = binary_input ? binary_dir_cb : profile_dir_cb;
if ((retval = dirat_for_each(NULL, profilename, profilename, cb))) { if ((retval = dirat_for_each(NULL, profilename,
&cb_data, cb))) {
PDEBUG("Failed loading profiles from %s\n", PDEBUG("Failed loading profiles from %s\n",
profilename); profilename);
} }
} else if (binary_input) { } else if (binary_input) {
retval = process_binary(option, profilename); retval = process_binary(option, profilename);
} else { } else {
retval = process_profile(option, profilename); retval = process_profile(option, profilename, cachedir);
} }
if (profilename) free(profilename); if (profilename) free(profilename);

30
parser/policy_cache.c
View File

@ -34,8 +34,6 @@
#include "parser.h" #include "parser.h"
#include "policy_cache.h" #include "policy_cache.h"
char *cacheloc = NULL;
#define le16_to_cpu(x) ((uint16_t)(le16toh (*(uint16_t *) x))) #define le16_to_cpu(x) ((uint16_t)(le16toh (*(uint16_t *) x)))
const char header_string[] = "\004\010\000version\000\002"; const char header_string[] = "\004\010\000version\000\002";
@ -149,11 +147,11 @@ error:
return -1; return -1;
} }
char *cache_filename(const char *cacheloc, const char *basename) char *cache_filename(const char *cachedir, const char *basename)
{ {
char *cachename; char *cachename;
if (asprintf(&cachename, "%s/%s", cacheloc, basename) < 0) { if (asprintf(&cachename, "%s/%s", cachedir, basename) < 0) {
PERROR(_("Memory allocation error.")); PERROR(_("Memory allocation error."));
exit(1); exit(1);
} }
@ -230,21 +228,27 @@ void install_cache(const char *cachetmpname, const char *cachename)
} }
} }
void setup_cache(void) char *setup_cache(const char *cacheloc)
{ {
autofree char *cache_features_path = NULL; autofree char *cache_features_path = NULL;
autofree char *cache_flags = NULL; autofree char *cache_flags = NULL;
char *cachedir;
/* create the cacheloc once and use it everywhere */ if (cacheloc) {
if (!cacheloc) { cachedir = strdup(cacheloc);
if (asprintf(&cacheloc, "%s/cache", basedir) == -1) { if (!cachedir) {
PERROR(_("Memory allocation error."));
exit(1);
}
} else {
if (asprintf(&cachedir, "%s/cache", basedir) == -1) {
PERROR(_("Memory allocation error.")); PERROR(_("Memory allocation error."));
exit(1); exit(1);
} }
} }
if (force_clear_cache) if (force_clear_cache)
exit(clear_cache_files(cacheloc)); exit(clear_cache_files(cachedir));
/* /*
* Deal with cache directory versioning: * Deal with cache directory versioning:
@ -252,7 +256,7 @@ void setup_cache(void)
* - If cache/.features exists, and does not match features_string, * - If cache/.features exists, and does not match features_string,
* force cache reading/writing off. * force cache reading/writing off.
*/ */
if (asprintf(&cache_features_path, "%s/.features", cacheloc) == -1) { if (asprintf(&cache_features_path, "%s/.features", cachedir) == -1) {
PERROR(_("Memory allocation error.")); PERROR(_("Memory allocation error."));
exit(1); exit(1);
} }
@ -261,7 +265,7 @@ void setup_cache(void)
if (cache_flags) { if (cache_flags) {
if (strcmp(features_string, cache_flags) != 0) { if (strcmp(features_string, cache_flags) != 0) {
if (write_cache && cond_clear_cache) { if (write_cache && cond_clear_cache) {
if (create_cache(cacheloc, cache_features_path, if (create_cache(cachedir, cache_features_path,
features_string)) features_string))
skip_read_cache = 1; skip_read_cache = 1;
} else { } else {
@ -272,6 +276,8 @@ void setup_cache(void)
} }
} }
} else if (write_cache) { } else if (write_cache) {
create_cache(cacheloc, cache_features_path, features_string); create_cache(cachedir, cache_features_path, features_string);
} }
return cachedir;
} }

5
parser/policy_cache.h
View File

@ -35,18 +35,17 @@ extern int force_clear_cache; /* force clearing regargless of state */
extern int create_cache_dir; /* create the cache dir if missing? */ extern int create_cache_dir; /* create the cache dir if missing? */
extern int mru_skip_cache; extern int mru_skip_cache;
extern int debug_cache; extern int debug_cache;
extern char *cacheloc;
void set_mru_tstamp(struct timespec t); void set_mru_tstamp(struct timespec t);
void update_mru_tstamp(FILE *file, const char *path); void update_mru_tstamp(FILE *file, const char *path);
bool valid_cached_file_version(const char *cachename); bool valid_cached_file_version(const char *cachename);
int clear_cache_files(const char *path); int clear_cache_files(const char *path);
int create_cache(const char *cachedir, const char *path, const char *features); int create_cache(const char *cachedir, const char *path, const char *features);
char *cache_filename(const char *cacheloc, const char *basename); char *cache_filename(const char *cachedir, const char *basename);
void valid_read_cache(const char *cachename); void valid_read_cache(const char *cachename);
int cache_hit(const char *cachename); int cache_hit(const char *cachename);
int setup_cache_tmp(const char **cachetmpname, const char *cachename); int setup_cache_tmp(const char **cachetmpname, const char *cachename);
void install_cache(const char *cachetmpname, const char *cachename); void install_cache(const char *cachetmpname, const char *cachename);
void setup_cache(void); char *setup_cache(const char *cacheloc);
#endif /* __AA_POLICY_CACHE_H */ #endif /* __AA_POLICY_CACHE_H */