On 10/23/2013 03:37 PM, Steve Beattie wrote:
> On Tue, Oct 22, 2013 at 12:26:36PM -0700, John Johansen wrote:
>> On 10/22/2013 11:04 AM, Steve Beattie wrote:
>>> On Sun, Sep 29, 2013 at 02:50:00AM -0700, John Johansen wrote:
>>>> allow directories to be passed to the parser
>>>>
>>>> Allow directories to be passed directly to the parser and handled instead
>>>> of needing an initscript to find the files in the directory.
>>>>
>>>> Signed-off-by: John Johansen <[email protected]>
>>>
>>> This patch ends up breaking the parser's ability to take a profile
>>> on stdin and process it (the simple.pl sanity tests break because of
>>> it). Is this what we want?
>>>
>> fixed version below, it was missing the profilename && condition in main()
>>
>>
>>
>> - if (stat(profilename, &stat_file) == -1) {
>> + if (profilename && stat(profilename, &stat_file) == -1) {
>> PERROR("File %s not found, skipping...\n", profilename);
>> continue;
>> }
>>
>> - if (stat(profilename, &stat_file) == -1) {
>> + if (profilename && S_ISDIR(stat_file.st_mode)) {
>
> Ah yes, that seems to have made a difference with the tests.
>
> Some comments inline.
>
thanks hopefully I got all fixes and changes, below
---
=== modified file 'parser/parser.h'
--- parser/parser.h 2013-10-01 17:59:04 +0000
+++ parser/parser.h 2013-10-24 22:40:09 +0000
@@ -271,6 +271,7 @@
extern void free_var_string(struct var_string *var);
/* parser_misc.c */
+extern int is_blacklisted(const char *name, const char *path);
extern struct value_list *new_value_list(char *value);
extern struct value_list *dup_value_list(struct value_list *list);
extern void free_value_list(struct value_list *list);
=== modified file 'parser/parser_include.c'
--- parser/parser_include.c 2013-10-01 17:59:04 +0000
+++ parser/parser_include.c 2013-10-24 22:40:09 +0000
@@ -279,7 +279,7 @@
struct include_stack_t *include_stack_head = NULL;
-static void start_include_position(char *filename)
+static void start_include_position(const char *filename)
{
if (current_filename)
free(current_filename);
@@ -323,7 +323,7 @@
free(include);
}
-void reset_include_stack(char *filename)
+void reset_include_stack(const char *filename)
{
while (include_stack_head)
pop_include_stack();
=== modified file 'parser/parser_include.h'
--- parser/parser_include.h 2013-10-01 17:59:04 +0000
+++ parser/parser_include.h 2013-10-24 22:40:09 +0000
@@ -31,6 +31,6 @@
extern void push_include_stack(char *filename);
extern void pop_include_stack(void);
-extern void reset_include_stack(char *filename);
+extern void reset_include_stack(const char *filename);
#endif
=== modified file 'parser/parser_lex.l'
--- parser/parser_lex.l 2013-10-14 21:34:12 +0000
+++ parser/parser_lex.l 2013-10-24 22:40:09 +0000
@@ -107,46 +107,6 @@
#define STATE_TABLE_ENT(X) [(X)] = #X
/* static char *const state_names[]; */
-struct ignored_suffix_t {
- const char * text;
- int len;
- int silent;
-};
-
-struct ignored_suffix_t ignored_suffixes[] = {
- /* Debian packging files, which are in flux during install
- should be silently ignored. */
- { ".dpkg-new", 9, 1 },
- { ".dpkg-old", 9, 1 },
- { ".dpkg-dist", 10, 1 },
- { ".dpkg-bak", 9, 1 },
- /* RPM packaging files have traditionally not been silently
- ignored */
- { ".rpmnew", 7, 0 },
- { ".rpmsave", 8, 0 },
- /* Backup files should be mentioned */
- { "~", 1, 0 },
- { NULL, 0, 0 }
-};
-
-static int is_blacklisted(const char *name, const char *path)
-{
- int name_len;
- struct ignored_suffix_t *suffix;
- name_len = strlen(name);
- /* skip blacklisted suffixes */
- for (suffix = ignored_suffixes; suffix->text; suffix++) {
- char *found;
- if ( (found = strstr((char *) name, suffix->text)) &&
- found - name + suffix->len == name_len ) {
- if (!suffix->silent)
- PERROR("Ignoring: '%s'\n", path);
- return 1;
- }
- }
-
- return 0;
-}
struct cb_struct {
const char *fullpath;
@@ -160,10 +120,6 @@
char *path;
- /* skip dotfiles silently. */
- if (*name == '.')
- return 0;
-
if (asprintf(&path, "%s/%s", d->fullpath, name) < 0)
yyerror("Out of memory");
=== modified file 'parser/parser_main.c'
--- parser/parser_main.c 2013-10-15 23:46:18 +0000
+++ parser/parser_main.c 2013-10-24 22:40:09 +0000
@@ -160,7 +160,7 @@
"-W, --write-cache Save cached profile (force with -T)\n"
" --skip-bad-cache Don't clear cache if out of sync\n"
" --purge-cache Clear cache regardless of its state\n"
- " --create-cache-dire Create the cache dir if missing\n"
+ " --create-cache-dir Create the cache dir if missing\n"
"-L, --cache-loc n Set the location of the profile cache\n"
"-q, --quiet Don't emit warnings\n"
"-v, --verbose Show profile names as they load\n"
@@ -821,7 +821,7 @@
return;
}
-int process_binary(int option, char *profilename)
+int process_binary(int option, const char *profilename)
{
char *buffer = NULL;
int retval = 0, size = 0, asize = 0, rsize;
@@ -882,7 +882,7 @@
return retval;
}
-void reset_parser(char *filename)
+void reset_parser(const char *filename)
{
memset(&mru_tstamp, 0, sizeof(mru_tstamp));
free_aliases();
@@ -927,13 +927,13 @@
mru_tstamp = stat_file.st_ctim;
}
-int process_profile(int option, char *profilename)
+int process_profile(int option, const char *profilename)
{
struct stat stat_bin;
int retval = 0;
char * cachename = NULL;
char * cachetemp = NULL;
- char *basename = NULL;
+ const char *basename = NULL;
FILE *cmd;
/* per-profile states */
@@ -1100,6 +1100,40 @@
return retval;
}
+/* data - name of parent dir */
+static int profile_dir_cb(__unused DIR *dir, const char *name, struct stat *st,
+ void *data)
+{
+ int rc = 0;
+
+ if (!S_ISDIR(st->st_mode) && !is_blacklisted(name, NULL)) {
+ const char *dirname = (const char *)data;
+ char *path;
+ if (asprintf(&path, "%s/%s", dirname, name) < 0)
+ PERROR(_("Out of memory"));
+ rc = process_profile(option, path);
+ free(path);
+ }
+ return rc;
+}
+
+/* data - name of parent dir */
+static int binary_dir_cb(__unused DIR *dir, const char *name, struct stat *st,
+ void *data)
+{
+ int rc = 0;
+
+ if (!S_ISDIR(st->st_mode) && !is_blacklisted(name, NULL)) {
+ const char *dirname = (const char *)data;
+ char *path;
+ if (asprintf(&path, "%s/%s", dirname, name) < 0)
+ PERROR(_("Out of memory"));
+ rc = process_binary(option, path);
+ free(path);
+ }
+ return rc;
+}
+
static int clear_cache_cb(DIR *dir, const char *path, struct stat *st,
__unused void *data)
{
@@ -1264,6 +1298,8 @@
retval = 0;
for (i = optind; retval == 0 && i <= argc; i++) {
+ struct stat stat_file;
+
if (i < argc && !(profilename = strdup(argv[i]))) {
perror("strdup");
return -1;
@@ -1272,7 +1308,21 @@
if (i == argc && optind != argc)
continue;
- if (binary_input) {
+ if (profilename && stat(profilename, &stat_file) == -1) {
+ PERROR("File %s not found, skipping...\n", profilename);
+ continue;
+ }
+
+ if (profilename && S_ISDIR(stat_file.st_mode)) {
+ int (*cb)(DIR *dir, const char *name, struct stat *st,
+ void *data);
+ cb = binary_input ? binary_dir_cb : profile_dir_cb;
+ if (dirat_for_each(NULL, profilename, profilename, cb))
{
+ PDEBUG("Failed loading profiles from %s\n",
+ profilename);
+ exit(1);
+ }
+ } else if (binary_input) {
retval = process_binary(option, profilename);
} else {
retval = process_profile(option, profilename);
=== modified file 'parser/parser_misc.c'
--- parser/parser_misc.c 2013-10-14 21:34:12 +0000
+++ parser/parser_misc.c 2013-10-24 22:40:09 +0000
@@ -54,6 +54,55 @@
#endif
#define NPDEBUG(fmt, args...) /* Do nothing */
+struct ignored_suffix_t {
+ const char * text;
+ int len;
+ int silent;
+};
+
+static struct ignored_suffix_t ignored_suffixes[] = {
+ /* Debian packging files, which are in flux during install
+ should be silently ignored. */
+ { ".dpkg-new", 9, 1 },
+ { ".dpkg-old", 9, 1 },
+ { ".dpkg-dist", 10, 1 },
+ { ".dpkg-bak", 9, 1 },
+ /* RPM packaging files have traditionally not been silently
+ ignored */
+ { ".rpmnew", 7, 0 },
+ { ".rpmsave", 8, 0 },
+ /* patch file backups/conflicts */
+ { ".orig", 5, 0 },
+ { ".rej", 4, 0 },
+ /* Backup files should be mentioned */
+ { "~", 1, 0 },
+ { NULL, 0, 0 }
+};
+
+int is_blacklisted(const char *name, const char *path)
+{
+ int name_len;
+ struct ignored_suffix_t *suffix;
+
+ /* skip dot files and files with no name */
+ if (*name == '.' || !strlen(name))
+ return 1;
+
+ name_len = strlen(name);
+ /* skip blacklisted suffixes */
+ for (suffix = ignored_suffixes; suffix->text; suffix++) {
+ char *found;
+ if ( (found = strstr((char *) name, suffix->text)) &&
+ found - name + suffix->len == name_len ) {
+ if (!suffix->silent)
+ PERROR("Ignoring: '%s'\n", path ? path : name);
+ return 1;
+ }
+ }
+
+ return 0;
+}
+
struct keyword_table {
const char *keyword;
int token;
--
AppArmor mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/apparmor
