From: Richard Guy Briggs <rgb@redhat.com>
To: Linux-Audit Mailing List <linux-audit@redhat.com>
Cc: Richard Guy Briggs <rgb@redhat.com>, eparis@parisplace.org
Subject: [PATCH ghak28/ghak25 user 1/2] ausearch-parse: add parser for YAASAO
Date: Tue, 19 May 2020 11:31:26 -0400 [thread overview]
Message-ID: <1589902287-19911-2-git-send-email-rgb@redhat.com> (raw)
In-Reply-To: <1589902287-19911-1-git-send-email-rgb@redhat.com>
Add a parser for Yet Another Audit Subject Attributes Order that was
introduced with ghak28 for the AUDIT_EVENT_LISTENER.
Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
---
src/ausearch-parse.c | 166 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 166 insertions(+)
diff --git a/src/ausearch-parse.c b/src/ausearch-parse.c
index a2cdb1fb5c60..147b1fa7acaf 100644
--- a/src/ausearch-parse.c
+++ b/src/ausearch-parse.c
@@ -62,6 +62,7 @@ static int parse_kernel_anom(const lnode *n, search_items *s);
static int parse_simple_message(const lnode *n, search_items *s);
static int parse_tty(const lnode *n, search_items *s);
static int parse_pkt(const lnode *n, search_items *s);
+static int parse_yaasao(lnode *n, search_items *s);
static int audit_avc_init(search_items *s)
@@ -177,6 +178,9 @@ int extract_search_items(llist *l)
case AUDIT_REPLACE...AUDIT_BPF:
// Nothing to parse
break;
+ case AUDIT_EVENT_LISTENER:
+ ret = parse_yaasao(n, s);
+ break;
case AUDIT_TTY:
ret = parse_tty(n, s);
break;
@@ -2568,3 +2572,165 @@ static int parse_pkt(const lnode *n, search_items *s)
return 0;
}
+// parse Yet Another Audit Subject Attributes Order
+// /pid.*uid.*auid.*tty.*ses.*subj.*comm.*exe
+static int parse_yaasao(lnode *n, search_items *s)
+{
+ char *ptr, *str, *term;
+ term = n->message;
+
+ // get pid if not already filled
+ if (event_pid != -1 && s->pid == -1) {
+ str = strstr(term, " pid=");
+ if (str == NULL)
+ return 52;
+ ptr = str + 5;
+ term = strchr(ptr, ' ');
+ if (term == NULL)
+ return 53;
+ *term = 0;
+ errno = 0;
+ s->pid = strtoul(ptr, NULL, 10);
+ if (errno)
+ return 54;
+ *term = ' ';
+ }
+ // get uid if not already filled
+ if ((s->uid == -1 && !s->tuid) && (event_uid != -1 || event_tuid)) {
+ str = strstr(term, "uid=");
+ if (str == NULL)
+ return 55;
+ // This could hit auid instead of uid. If so, fail.
+ if (*(str-1) == 'a') {
+ return 56;
+ }
+ ptr = str + 4;
+ term = strchr(ptr, ' ');
+ if (term == NULL)
+ return 57;
+ *term = 0;
+ errno = 0;
+ s->uid = strtoul(ptr, NULL, 10);
+ if (errno)
+ return 58;
+ *term = ' ';
+ if (s->tuid) free((void *)s->tuid);
+ s->tuid = lookup_uid("uid", s->uid);
+ }
+ // get loginuid if not already filled
+ if ((s->loginuid == -2 && !s->tauid) && (event_loginuid != -2 || event_tauid)) {
+ str = strstr(term, "auid=");
+ if (str == NULL) {
+ return 59;
+ } else
+ ptr = str + 5;
+ term = strchr(ptr, ' ');
+ if (term == NULL)
+ return 60;
+ *term = 0;
+ errno = 0;
+ s->loginuid = strtoul(ptr, NULL, 10);
+ if (errno)
+ return 61;
+ *term = ' ';
+ if (s->tauid) free((void *)s->tauid);
+ s->tauid = lookup_uid("auid", s->loginuid);
+ }
+ // get tty if not already filled
+ if (!s->terminal && event_terminal) {
+ // dont do this search unless needed
+ str = strstr(term, "tty=");
+ if (str) {
+ str += 4;
+ term = strchr(str, ' ');
+ if (term == NULL)
+ return 62;
+ *term = 0;
+ if (s->terminal) // ANOM_NETLINK has one
+ free(s->terminal);
+ s->terminal = strdup(str);
+ *term = ' ';
+ }
+ }
+ // get ses if not already filled
+ if (s->session_id == -2 && event_session_id != -2 ) {
+ str = strstr(term, "ses=");
+ if (str) {
+ ptr = str + 4;
+ term = strchr(ptr, ' ');
+ if (term == NULL)
+ return 63;
+ *term = 0;
+ errno = 0;
+ s->session_id = strtoul(ptr, NULL, 10);
+ if (errno)
+ return 64;
+ *term = ' ';
+ }
+ }
+ // get subject if not already filled
+ if (!s->avc && event_subject) {
+ // scontext
+ str = strstr(term, "subj=");
+ if (str != NULL) {
+ str += 5;
+ term = strchr(str, ' ');
+ if (term == NULL)
+ return 65;
+ *term = 0;
+ if (audit_avc_init(s) == 0) {
+ anode an;
+
+ anode_init(&an);
+ an.scontext = strdup(str);
+ alist_append(s->avc, &an);
+ *term = ' ';
+ } else
+ return 66;
+ } else
+ return 67;
+ }
+ // get command line if not already filled
+ if (!s->comm && event_comm) {
+ // dont do this search unless needed
+ str = strstr(term, "comm=");
+ if (str) {
+ /* Make the syscall one override */
+ if (s->comm)
+ free(s->comm);
+ str += 5;
+ if (*str == '"') {
+ str++;
+ term = strchr(str, '"');
+ if (term == NULL)
+ return 68;
+ *term = 0;
+ s->comm = strdup(str);
+ *term = '"';
+ } else
+ s->comm = unescape(str);
+ } else
+ return 69;
+ }
+ // get exe if not already filled
+ if (!s->exe && event_exe) {
+ // dont do this search unless needed
+ str = strstr(n->message, "exe=");
+ if (str) {
+ str += 4;
+ if (*str == '"') {
+ str++;
+ term = strchr(str, '"');
+ if (term == NULL)
+ return 70;
+ *term = 0;
+ s->exe = strdup(str);
+ *term = '"';
+ } else
+ s->exe = unescape(str);
+ } else
+ return 71;
+ }
+ return 0;
+}
+
--
1.8.3.1
--
Linux-audit mailing list
Linux-audit@redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit
next prev parent reply other threads:[~2020-05-19 15:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-19 15:31 [PATCH ghak28/ghak25 user 0/2] parse EVENT_LISTENER and NETFILTER_CFG Richard Guy Briggs
2020-05-19 15:31 ` Richard Guy Briggs [this message]
2020-05-19 15:31 ` [PATCH ghak28/ghak25 user 2/2] ausearch-parse: mod parser for YAASAO for NETFILTER_CFG Richard Guy Briggs
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1589902287-19911-2-git-send-email-rgb@redhat.com \
--to=rgb@redhat.com \
--cc=eparis@parisplace.org \
--cc=linux-audit@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).