mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 08:24:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

parser: replace duplicate warn_once() with common function

Browse source 
The warn_once() function is duplicated in 6 different places. A common,
reusable version has been added to parser_common.c.

Signed-off-by: Mike Salvatore <mike.salvatore@canonical.com>
This commit is contained in:
Mike Salvatore 2020-08-09 14:51:55 -04:00
parent 4aabc40d1f
commit 52d9529d1b
15 changed files with 57 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
parser/af_unix.cc
View file

@ -22,7 +22,6 @@
#include <iomanip>
#include <string>
#include <iostream>
#include <sstream>
#include "network.h"
@ -158,26 +157,10 @@ int unix_rule::expand_variables(void)
return 0;
}
/* do we want to warn once/profile or just once per compile?? */
static void warn_once(const char *name, const char *msg)
{
static const char *warned_name = NULL;
if (warned_name != name) {
cerr << "Warning from profile " << name << " (";
if (current_filename)
cerr << current_filename;
else
cerr << "stdin";
cerr << "): " << msg << "\n";
warned_name = name;
}
}
static void warn_once(const char *name)
void unix_rule::warn_once(const char *name)
{
if (warnflags & WARN_RULE_NOT_ENFORCED)
warn_once(name, "extended network unix socket rules not enforced");
rule_t::warn_once(name, "extended network unix socket rules not enforced");
}
static void writeu16(std::ostringstream &o, int v)
@ -327,7 +310,7 @@ int unix_rule::gen_policy_re(Profile &prof)
/* only warn if we are building against a kernel
* that requires downgrading */
if (warnflags & WARN_RULE_DOWNGRADED)
warn_once(prof.name, "downgrading extended network unix socket rule to generic network rule\n");
rule_t::warn_once(prof.name, "downgrading extended network unix socket rule to generic network rule\n");
/* TODO: add ability to abort instead of downgrade */
return RULE_OK;
}

3
parser/af_unix.h
View file

@ -58,6 +58,9 @@ public:
virtual int expand_variables(void);
virtual int gen_policy_re(Profile &prof);
virtual void post_process(Profile &prof unused) { };
protected:
virtual void warn_once(const char *name) override;
};
#endif /* __AA_AF_UNIX_H */

16
parser/dbus.cc
View file

@ -22,7 +22,6 @@
#include <iomanip>
#include <string>
#include <iostream>
#include <sstream>
#include "parser.h"
@ -189,20 +188,9 @@ int dbus_rule::expand_variables(void)
return 0;
}
/* do we want to warn once/profile or just once per compile?? */
static void warn_once(const char *name)
void dbus_rule::warn_once(const char *name)
{
static const char *warned_name = NULL;
if ((warnflags & WARN_RULE_NOT_ENFORCED) && warned_name != name) {
cerr << "Warning from profile " << name << " (";
if (current_filename)
cerr << current_filename;
else
cerr << "stdin";
cerr << ") dbus rules not enforced\n";
warned_name = name;
}
rule_t::warn_once(name, "dbus rules not enforced");
}
int dbus_rule::gen_policy_re(Profile &prof)

3
parser/dbus.h
View file

@ -59,7 +59,8 @@ public:
virtual int gen_policy_re(Profile &prof);
virtual void post_process(Profile &prof unused) { };
protected:
virtual void warn_once(const char *name) override;
};
#endif /* __AA_DBUS_H */

16
parser/mount.cc
View file

@ -216,7 +216,6 @@
#include <stdlib.h>
#include <string.h>
#include <linux/limits.h>
#include <iostream>
#include "parser.h"
#include "policydb.h"
@ -565,20 +564,9 @@ static int build_mnt_opts(std::string& buffer, struct value_list *opts)
return TRUE;
}
/* do we want to warn once/profile or just once per compile?? */
static void warn_once(const char *name)
void mnt_rule::warn_once(const char *name)
{
static const char *warned_name = NULL;
if ((warnflags & WARN_RULE_NOT_ENFORCED) && warned_name != name) {
cerr << "Warning from profile " << name << " (";
if (current_filename)
cerr << current_filename;
else
cerr << "stdin";
cerr << ") mount rules not enforced\n";
warned_name = name;
}
rule_t::warn_once(name, "mount rules not enforce");
}
int mnt_rule::gen_policy_re(Profile &prof)

3
parser/mount.h
View file

@ -149,6 +149,9 @@ public:
virtual int expand_variables(void);
virtual int gen_policy_re(Profile &prof);
virtual void post_process(Profile &prof unused);
protected:
virtual void warn_once(const char *name) override;
};
int is_valid_mnt_cond(const char *name, int src);

1
parser/parser.h
View file

@ -327,6 +327,7 @@ extern char *current_filename;
extern FILE *ofile;
extern int read_implies_exec;
extern void pwarn(const char *fmt, ...) __attribute__((__format__(__printf__, 1, 2)));
extern void common_warn_once(const char *name, const char *msg, const char **warned_name);
/* from parser_main (cannot be used in tst builds) */
extern int force_complain;

15
parser/parser_common.c
View file

@ -15,6 +15,7 @@
* along with this program; if not, contact Novell, Inc. or Canonical,
* Ltd.
*/
#include <iostream>
#include <stdlib.h>
#include <stdarg.h>
@ -120,3 +121,17 @@ void pwarn(const char *fmt, ...)
free(newfmt);
}
/* do we want to warn once/profile or just once per compile?? */
void common_warn_once(const char *name, const char *msg, const char **warned_name)
{
if ((warnflags & WARN_RULE_NOT_ENFORCED) && *warned_name != name) {
cerr << "Warning from profile " << name << " (";
if (current_filename)
cerr << current_filename;
else
cerr << "stdin";
cerr << "): " << msg << "\n";
*warned_name = name;
}
}

11
parser/parser_regex.c
View file

@ -461,16 +461,7 @@ char *get_xattr_value(struct cond_entry *entry)
static void warn_once_xattr(const char *name)
{
static const char *warned_name = NULL;
if ((warnflags & WARN_RULE_DOWNGRADED) && warned_name != name) {
cerr << "Warning from profile " << name << " (";
if (current_filename)
cerr << current_filename;
else
cerr << "stdin";
cerr << ") xattr attachment conditional ignored\n";
warned_name = name;
}
common_warn_once(name, "xattr attachment conditional ignored", &warned_name);
}
static int process_profile_name_xmatch(Profile *prof)

16
parser/ptrace.cc
View file

@ -22,7 +22,6 @@
#include <iomanip>
#include <string>
#include <iostream>
#include <sstream>
int parse_ptrace_mode(const char *str_mode, int *mode, int fail)
@ -100,20 +99,9 @@ int ptrace_rule::expand_variables(void)
return expand_entry_variables(&peer_label);
}
/* do we want to warn once/profile or just once per compile?? */
static void warn_once(const char *name)
void ptrace_rule::warn_once(const char *name)
{
static const char *warned_name = NULL;
if ((warnflags & WARN_RULE_NOT_ENFORCED) && warned_name != name) {
cerr << "Warning from profile " << name << " (";
if (current_filename)
cerr << current_filename;
else
cerr << "stdin";
cerr << ") ptrace rules not enforced\n";
warned_name = name;
}
rule_t::warn_once(name, "ptrace rules not enforced");
}
int ptrace_rule::gen_policy_re(Profile &prof)

3
parser/ptrace.h
View file

@ -47,6 +47,9 @@ public:
virtual int expand_variables(void);
virtual int gen_policy_re(Profile &prof);
virtual void post_process(Profile &prof unused) { };
protected:
virtual void warn_once(const char *name) override;
};
#endif /* __AA_PTRACE_H */

8
parser/rule.cc
View file

@ -16,8 +16,16 @@
* Ltd.
*/
#include "rule.h"
#include "parser.h"
#include <iostream>
std::ostream &operator<<(std::ostream &os, rule_t &rule)
{
return rule.dump(os);
};
/* do we want to warn once/profile or just once per compile?? */
void rule_t::warn_once(const char *name, const char *msg)
{
common_warn_once(name, msg, &warned_name);
}

7
parser/rule.h
View file

@ -38,6 +38,13 @@ public:
virtual int expand_variables(void) = 0;
virtual int gen_policy_re(Profile &prof) = 0;
virtual void post_process(Profile &prof) = 0;
protected:
const char *warned_name = NULL;
virtual void warn_once(const char *name, const char *msg);
virtual void warn_once(const char *name) = 0;
};
std::ostream &operator<<(std::ostream &os, rule_t &rule);

16
parser/signal.cc
View file

@ -22,7 +22,6 @@
#include <iomanip>
#include <string>
#include <iostream>
#include <sstream>
#include <map>
@ -236,20 +235,9 @@ int signal_rule::expand_variables(void)
return expand_entry_variables(&peer_label);
}
/* do we want to warn once/profile or just once per compile?? */
static void warn_once(const char *name)
void signal_rule::warn_once(const char *name)
{
static const char *warned_name = NULL;
if ((warnflags & WARN_RULE_NOT_ENFORCED) && warned_name != name) {
cerr << "Warning from profile " << name << " (";
if (current_filename)
cerr << current_filename;
else
cerr << "stdin";
cerr << ") signal rules not enforced\n";
warned_name = name;
}
rule_t::warn_once(name, "signal rules not enforced");
}
int signal_rule::gen_policy_re(Profile &prof)

3
parser/signal.h
View file

@ -53,6 +53,9 @@ public:
virtual int expand_variables(void);
virtual int gen_policy_re(Profile &prof);
virtual void post_process(Profile &prof unused) { };
protected:
virtual void warn_once(const char *name) override;
};
#endif /* __AA_SIGNAL_H */