* [PATCH 01/07][RFC] RACF audit plugin - configuration files [not found] <1190983565.4113.2.camel@klausk.br.ibm.com> @ 2007-09-28 13:28 ` Klaus Heinrich Kiwi [not found] ` <1190983925.4113.8.camel@klausk.br.ibm.com> 1 sibling, 0 replies; 8+ messages in thread From: Klaus Heinrich Kiwi @ 2007-09-28 13:28 UTC (permalink / raw) To: Linux-audit This patch adds the configuration files for the racf plugin. There is a need for two separate configuration files: one for the audit dispatcher and another for the plugin itself. The plugin configuration includes server and authentication information, thus it should not be readable by anyone but root. The (large) default queue size is to allow event bursts avoiding events drop. The plugin comes disabled by default. Signed-off-by: Klaus Heinrich Kiwi <klausk@br.ibm.com> diff -purN audit-1.6.2/audisp/plugins/racf/audisp-racf.conf audit-1.6.2_racf/audisp/plugins/racf/audisp-racf.conf --- audit-1.6.2/audisp/plugins/racf/audisp-racf.conf 1969-12-31 21:00:00.000000000 -0300 +++ audit-1.6.2_racf/audisp/plugins/racf/audisp-racf.conf 2007-09-28 09:18:08.000000000 -0300 @@ -0,0 +1,13 @@ +# This is the audit dispatcher configuration +# for the RACF audit plugin +# Note that this specific plugin has a configuration +# file of its own. The complete path for this +# file must be entered as the argument for the +# plugin in the 'args' field below + +active = no +direction = out +path = /sbin/audisp-racf +type = always +args = /etc/audisp/racf.conf +format = string diff -purN audit-1.6.2/audisp/plugins/racf/racf.conf audit-1.6.2_racf/audisp/plugins/racf/racf.conf --- audit-1.6.2/audisp/plugins/racf/racf.conf 1969-12-31 21:00:00.000000000 -0300 +++ audit-1.6.2_racf/audisp/plugins/racf/racf.conf 2007-09-28 09:18:08.000000000 -0300 @@ -0,0 +1,13 @@ +# This is the configuration file for the audit-plugin-racf +# server, user and password are required, everything else is +# optional +# Also note that user is in the format +# 'racfid=${USER},cn=ictx' +# where ${USER} is the RACF user with R_auditx authority + +server = racf.server +port = 389 +user = racfid=RACFUSER,cn=ictx +password = password +timeout = 15 +q_depth = 256 ^ permalink raw reply [flat|nested] 8+ messages in thread
[parent not found: <1190983925.4113.8.camel@klausk.br.ibm.com>]
* [PATCH 02/07][RFC] RACF audit plugin - configuration interface [not found] ` <1190983925.4113.8.camel@klausk.br.ibm.com> @ 2007-09-28 13:28 ` Klaus Heinrich Kiwi [not found] ` <1190984128.4113.12.camel@klausk.br.ibm.com> 1 sibling, 0 replies; 8+ messages in thread From: Klaus Heinrich Kiwi @ 2007-09-28 13:28 UTC (permalink / raw) To: Linux-audit This patch brings the configuration interface for the racf-plugin. This is taken directly from Steve's audit dispatcher code, only adapted for this specific plugin. Signed-off-by: Klaus Heinrich Kiwi <klausk@br.ibm.com> diff -purN audit-1.6.2/audisp/plugins/racf/racf-config.h audit-1.6.2_racf/audisp/plugins/racf/racf-config.h --- audit-1.6.2/audisp/plugins/racf/racf-config.h 1969-12-31 21:00:00.000000000 -0300 +++ audit-1.6.2_racf/audisp/plugins/racf/racf-config.h 2007-09-28 09:18:08.000000000 -0300 @@ -0,0 +1,48 @@ +/*************************************************************************** + * Copyright (C) 2007 International Business Machines Corp. * + * All Rights Reserved. * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * * + * Authors: * + * Klaus Heinrich Kiwi <klausk@br.ibm.com> * + * based on code by Steve Grubb <sgrubb@redhat.com> * + ***************************************************************************/ + +#ifndef _RACF_CONFIG_H +#define _RACF_CONFIG_H + + +/*************************************************************************** + * RACF Plugin configuration * + ***************************************************************************/ +typedef struct racf_conf +{ + char *name; + char *server; + unsigned int port; + char *user; + char *password; + long timeout; + unsigned int q_depth; + unsigned int counter; +} racf_conf_t; + +void clear_config(racf_conf_t *); +int load_config(racf_conf_t *, char *); +void free_config(racf_conf_t *); + +#endif /* _RACF_CONFIG_H */ diff -purN audit-1.6.2/audisp/plugins/racf/racf-config.c audit-1.6.2_racf/audisp/plugins/racf/racf-config.c --- audit-1.6.2/audisp/plugins/racf/racf-config.c 1969-12-31 21:00:00.000000000 -0300 +++ audit-1.6.2_racf/audisp/plugins/racf/racf-config.c 2007-09-28 09:18:08.000000000 -0300 @@ -0,0 +1,437 @@ +/*************************************************************************** + * Copyright (C) 2007 International Business Machines Corp. * + * All Rights Reserved. * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * * + * Authors: * + * Klaus Heinrich Kiwi <klausk@br.ibm.com> * + * based on code by Steve Grubb <sgrubb@redhat.com> * + ***************************************************************************/ + +#include "racf-config.h" + +#include <string.h> +#include <stdio.h> +#include <fcntl.h> +#include <sys/stat.h> +#include <errno.h> +#include <ctype.h> +#include <unistd.h> +#include <stdlib.h> +#include "racf-log.h" + +/* Local prototypes */ +struct nv_pair +{ + const char *name; + const char *value; + const char *option; +}; + +struct kw_pair +{ + const char *name; + int (*parser) (struct nv_pair *, int, racf_conf_t *); + int max_options; +}; + +struct nv_list +{ + const char *name; + int option; +}; + +static char *get_line(FILE *, char *); +static int nv_split(char *, struct nv_pair *); +static const struct kw_pair *kw_lookup(const char *); +static int server_parser(struct nv_pair *, int, racf_conf_t *); +static int port_parser(struct nv_pair *, int, racf_conf_t *); +static int timeout_parser(struct nv_pair *, int, racf_conf_t *); +static int user_parser(struct nv_pair *, int, racf_conf_t *); +static int password_parser(struct nv_pair *, int, racf_conf_t *); +static int q_depth_parser(struct nv_pair *, int, racf_conf_t *); +static int sanity_check(racf_conf_t *, const char *); + +static const struct kw_pair keywords[] = { + {"server", server_parser, 0}, + {"port", port_parser, 0}, + {"timeout", timeout_parser, 0}, + {"user", user_parser, 0}, + {"password", password_parser, 0}, + {"q_depth", q_depth_parser, 0}, + {NULL, NULL, 0} +}; + + + +/* + * Set everything to its default value +*/ +void clear_config(racf_conf_t * c) +{ + c->server = NULL; + c->port = 0; + c->user = NULL; + c->password = NULL; + c->timeout = 15; + c->q_depth = 256; + /* not re-setting counter */ +} + +int load_config(racf_conf_t * c, char *file) +{ + int fd, rc, mode, lineno = 1; + struct stat st; + FILE *f; + char buf[128]; + + clear_config(c); + + /* open the file */ + mode = O_RDONLY; + rc = open(file, mode); + if (rc < 0) { + if (errno != ENOENT) { + log_err("Error opening %s (%s)", file, + strerror(errno)); + return 1; + } + log_warn("Config file %s doesn't exist, skipping", file); + return 1; + } + fd = rc; + + /* check the file's permissions: owned by root, not world anything, + * not symlink. + */ + if (fstat(fd, &st) < 0) { + log_err("Error fstat'ing config file (%s)", + strerror(errno)); + close(fd); + return 1; + } + if (st.st_uid != 0) { + log_err("Error - %s isn't owned by root", file); + close(fd); + return 1; + } + if ((st.st_mode & (S_IRUSR | S_IWUSR | S_IRGRP)) != + (S_IRUSR | S_IWUSR | S_IRGRP)) { + log_err("%s permissions should be 0640", file); + return 1; + } + if (!S_ISREG(st.st_mode)) { + log_err("Error - %s is not a regular file", file); + close(fd); + return 1; + } + + /* it's ok, read line by line */ + f = fdopen(fd, "r"); + if (f == NULL) { + log_err("Error - fdopen failed (%s)", strerror(errno)); + close(fd); + return 1; + } + + while (get_line(f, buf)) { + /* convert line into name-value pair */ + const struct kw_pair *kw; + struct nv_pair nv; + + rc = nv_split(buf, &nv); + switch (rc) { + case 0: /* fine */ + break; + case 1: /* not the right number of tokens. */ + log_err("Wrong number of arguments for line %d in %s", lineno, file); + break; + case 2: /* no '=' sign */ + log_err("Missing equal sign for line %d in %s", + lineno, file); + break; + default: /* something else went wrong... */ + log_err("Unknown error for line %d in %s", + lineno, file); + break; + } + if (nv.name == NULL) { + lineno++; + continue; + } + if (nv.value == NULL) { + fclose(f); + return 1; + } + + /* identify keyword or error */ + kw = kw_lookup(nv.name); + if (kw->name == NULL) { + log_err("Unknown keyword \"%s\" in line %d of %s", + nv.name, lineno, file); + fclose(f); + return 1; + } + + /* Check number of options */ + if (kw->max_options == 0 && nv.option != NULL) { + log_err("Keyword \"%s\" has invalid option " + "\"%s\" in line %d of %s", + nv.name, nv.option, lineno, file); + fclose(f); + return 1; + } + + /* dispatch to keyword's local parser */ + rc = kw->parser(&nv, lineno, c); + if (rc != 0) { + fclose(f); + return 1; /* local parser puts message out */ + } + + lineno++; + } + + fclose(f); + c->name = strdup(basename(file)); + if (lineno > 1) + return sanity_check(c, file); + return 0; +} + +static char *get_line(FILE * f, char *buf) +{ + if (fgets_unlocked(buf, 128, f)) { + /* remove newline */ + char *ptr = strchr(buf, 0x0a); + + if (ptr) + *ptr = 0; + return buf; + } + return NULL; +} + +static int nv_split(char *buf, struct nv_pair *nv) +{ + /* Get the name part */ + char *ptr; + + nv->name = NULL; + nv->value = NULL; + nv->option = NULL; + ptr = strtok(buf, " "); + if (ptr == NULL) + return 0; /* If there's nothing, go to next line */ + if (ptr[0] == '#') + return 0; /* If there's a comment, go to next line */ + nv->name = ptr; + + /* Check for a '=' */ + ptr = strtok(NULL, " "); + if (ptr == NULL) + return 1; + if (strcmp(ptr, "=") != 0) + return 2; + + /* get the value */ + ptr = strtok(NULL, " "); + if (ptr == NULL) + return 1; + nv->value = ptr; + + /* See if there's an option */ + ptr = strtok(NULL, " "); + if (ptr) { + nv->option = ptr; + + /* Make sure there's nothing else */ + ptr = strtok(NULL, " "); + if (ptr) + return 1; + } + + /* Everything is OK */ + return 0; +} + +static const struct kw_pair *kw_lookup(const char *val) +{ + int i = 0; + + while (keywords[i].name != NULL) { + if (strcasecmp(keywords[i].name, val) == 0) + break; + i++; + } + return &keywords[i]; +} + + +static int server_parser(struct nv_pair *nv, int line, racf_conf_t * c) +{ + + if (nv->value == NULL) + c->server = NULL; + else + c->server = strdup(nv->value); + + return 0; +} + +static int port_parser(struct nv_pair *nv, int line, racf_conf_t * c) +{ + const char *ptr = nv->value; + unsigned long i; + + /* check that all chars are numbers */ + for (i = 0; ptr[i]; i++) { + if (!isdigit(ptr[i])) { + log_err("Value %s should only be numbers - line %d", nv->value, line); + return 1; + } + } + + /* convert to unsigned long */ + errno = 0; + i = strtoul(nv->value, NULL, 10); + if (errno) { + log_err("Error converting string to a number (%s) - line %d", strerror(errno), line); + return 1; + } + + c->port = i; + return 0; + +} + +static int timeout_parser(struct nv_pair *nv, int line, racf_conf_t * c) +{ + const char *ptr = nv->value; + unsigned long i; + + /* check that all chars are numbers */ + for (i = 0; ptr[i]; i++) { + if (!isdigit(ptr[i])) { + log_err("Value %s should only be numbers - line %d", nv->value, line); + return 1; + } + } + + /* convert to unsigned long */ + errno = 0; + i = strtoul(nv->value, NULL, 10); + if (errno) { + log_err("Error converting string to a number (%s) - line %d", strerror(errno), line); + return 1; + } + + c->timeout = i; + return 0; + +} + + +static int user_parser(struct nv_pair *nv, int line, racf_conf_t * c) +{ + + if (nv->value == NULL) + c->user = NULL; + else + c->user = strdup(nv->value); + + return 0; +} + +static int password_parser(struct nv_pair *nv, int line, racf_conf_t * c) +{ + + if (nv->value == NULL) + c->password = NULL; + else + c->password = strdup(nv->value); + + return 0; +} + +static int q_depth_parser(struct nv_pair *nv, int line, racf_conf_t * c) +{ + const char *ptr = nv->value; + unsigned long i; + + /* check that all chars are numbers */ + for (i = 0; ptr[i]; i++) { + if (!isdigit(ptr[i])) { + log_err("Value %s should only be numbers - line %d", nv->value, line); + return 1; + } + } + + /* convert to unsigned long */ + errno = 0; + i = strtoul(nv->value, NULL, 10); + if (errno) { + log_err("Error converting string to a number (%s) - line %d", strerror(errno), line); + return 1; + } + + if (i < 1 || i > 99999) { + log_err("q_depth must be between 1 and 99999"); + return 1; + } + + c->q_depth = i; + return 0; + +} + + +/* + * Check configuration.At this point, all fields have been read. + * Returns 0 if no problems and 1 if problems detected. + */ +static int sanity_check(racf_conf_t * c, const char *file) +{ + /* Error checking */ + if (!c->server) { + log_err("Error - no server hostname given"); + return 1; + } + + if (!c->user) { + log_err("Error - no bind user given"); + return 1; + } + + if (!c->password) { + log_err("Error - no password given"); + return 1; + } + return 0; +} + +void free_config(racf_conf_t * c) +{ + + if (c == NULL) + return; + + free((void *) c->server); + free((void *) c->user); + free((void *) c->password); + free((void *) c->name); +} ^ permalink raw reply [flat|nested] 8+ messages in thread
[parent not found: <1190984128.4113.12.camel@klausk.br.ibm.com>]
* [PATCH 03/07][RFC] RACF audit plugin - LDAP interface [not found] ` <1190984128.4113.12.camel@klausk.br.ibm.com> @ 2007-09-28 13:28 ` Klaus Heinrich Kiwi [not found] ` <1190984843.4113.25.camel@klausk.br.ibm.com> 1 sibling, 0 replies; 8+ messages in thread From: Klaus Heinrich Kiwi @ 2007-09-28 13:28 UTC (permalink / raw) To: Linux-audit This patch brings the LDAP interface for the racf plugin. Functions here aim to initialize (read as: take necessary arguments), connect and submit the LDAP extended operation to the RACF server. There's also code to get the RACF server response, filling an internally-defined struct that is then checked for errors. The connection itself can be reestablished if the plugin thinks it timed out, after trying to submit the event directly. In case of event bursts, this prevents the plugin of trying a connection upon every event arrival, avoiding at the same time a synchronous keepalive operation. Signed-off-by: Klaus Heinrich Kiwi <klausk@br.ibm.com> diff -purN audit-1.6.2/audisp/plugins/racf/racf-ldap.h audit-1.6.2_racf/audisp/plugins/racf/racf-ldap.h --- audit-1.6.2/audisp/plugins/racf/racf-ldap.h 1969-12-31 21:00:00.000000000 -0300 +++ audit-1.6.2_racf/audisp/plugins/racf/racf-ldap.h 2007-09-28 09:18:08.000000000 -0300 @@ -0,0 +1,310 @@ +/*************************************************************************** + * Copyright (C) 2007 International Business Machines Corp. * + * All Rights Reserved. * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * * + * Authors: * + * Klaus Heinrich Kiwi <klausk@br.ibm.com> * + ***************************************************************************/ + +#ifndef _RACF_LDAP_H +#define _RACF_LDAP_H + +#include <lber.h> +#include <ldap.h> + + +/*************************************************************************** + * LDAP Extended Op OID for ICTX Audit * + ***************************************************************************/ +/* ICTX EIM component AUDIT Request OID */ +#define ICTX_OIDAUDITREQUEST "1.3.18.0.2.12.68" + +/* The AUDIT Response OID */ +#define ICTX_OIDAUDITRESPONSE "1.3.18.0.2.12.69" + +/* This implementation version + Request and response must match this */ +#define ICTX_REQUESTVER 0x1 + +/* Needed for BER-encoding */ +#define ASN1_IA5STRING_TAG 0x16 + +/*************************************************************************** + * the ASN.1 struct for the remote audit request and response: * + * * + * RequestValue ::= SEQUENCE { * + * RequestVersion INTEGER, * + * ItemList SEQUENCE OF * + * Item SEQUENCE { * + * ItemVersion INTEGER, * + * ItemTag INTEGER, * + * LinkValue OCTET STRING SIZE(8), * + * Violation BOOLEAN, * + * Event INTEGER, * + * Qualifier INTEGER, * + * Class IA5String, * + * Resource IA5String, * + * LogString IA5String, * + * DatafieldList SEQUENCE OF * + * DataField SEQUENCE { * + * TYPE INTEGER, * + * VALUE IA5STRING * + * } * + * } * + * } * + * * + * Response ::= SEQUENCE { * + * Version INTEGER, * + * ResponseCode INTEGER, * + * ItemList SEQUENCE OF * + * Item SEQUENCE { * + * ItemVersion INTEGER, * + * ItemTag INTEGER, * + * MajorCode INTEGER, * + * MinorCode1 INTEGER, * + * MinorCode2 INTEGER, * + * MinorCode3 INTEGER * + * } * + * } * + ***************************************************************************/ + +/*************************************************************************** + * RACF Remote Audit Minor return codes meaning + +Major Code Meaning +---------- --------------------------------------------------------- +0-14 - MinorCode1 is the SAF return code + - MinorCode2 is the RACF return code + - MinorCode3 is the RACF reason code + +16-20 - MinorCode1 identifies the extended operation request + parameter number (see audit request ASN.1 definition): + 0 - Item + 1 - ItemVersion + 2 - ItemTag + 3 - LinkValue + 4 - Violation + 5 - Event + 6 - Qualifier + 7 - Class + 8 - Resource + 9 - LogString + 10 - DataFieldList + 11 - DataField * + 12 - TYPE * + 13 - VALUE * + - MinorCode2 indicates one of the Following: + 32 - incorrect length + 36 - incorrect value + 40 - encoding error + - MinorCode3 has no defined meaning + +24-100 - MinorCode1 has no defined meaning + - MinorCode2 has no defined meaning + - MinorCode3 has no defined meaning + +* There can be multiple DataField, TYPEs and VALUEs in a request. If any of them is bad + you get the same 11, 12 or 13 MinorCode1. There is no further breakdown of which one + is bad. + + ***************************************************************************/ + +/*************************************************************************** + * Audit Request 'event' field meaning * + ***************************************************************************/ +#define RACF_EVENT_AUTHENTICATION 0x1 +#define RACF_EVENT_AUTHORIZATION 0x2 +#define RACF_EVENT_AUTHORIZATION_MAPPING 0x3 +#define RACF_EVENT_KEY_MGMT 0x4 +#define RACF_EVENT_POLICY_MGMT 0x5 +#define RACF_EVENT_ADMIN_CONFIG 0x6 +#define RACF_EVENT_ADMIN_ACTION 0x7 + +/*************************************************************************** + * Audit Request 'qualifier' field meaning * + ***************************************************************************/ +#define RACF_QUALIF_SUCCESS 0x0 +#define RACF_QUALIF_INFO 0x1 +#define RACF_QUALIF_WARN 0x2 +#define RACF_QUALIF_FAIL 0x3 + +/*************************************************************************** + * Relocate types for Audit Request * + ***************************************************************************/ +/* SAF identifier for bind user */ +#define RACF_RELOC_SAF_BIND_USER 100 + +/* Reguestor's bind user identifier */ +#define RACF_RELOC_REQ_BIND_USER 101 + +/* Originating security domain */ +#define RACF_RELOC_ORIG_SECURITY 102 + +/* Originating registry / realm */ +#define RACF_RELOC_ORIG_REALM 103 + +/* Originating user name */ +#define RACF_RELOC_ORIG_USER 104 + +/* Mapped security domain */ +#define RACF_RELOC_MAPPED_SECURITY 105 + +/* Mapped registry / realm */ +#define RACF_RELOC_MAPPED_REALM 106 + +/* Mapped user name */ +#define RACF_RELOC_MAPPED_USER 107 + +/* Operation performed */ +#define RACF_RELOC_OPERATION 108 + +/* Mechanism / object name */ +#define RACF_RELOC_OBJECT 109 + +/* Method / function used */ +#define RACF_RELOC_FUNCTION 110 + +/* Key / certificate name */ +#define RACF_RELOC_CERTIFICATE 111 + +/* Caller subject initiating security event */ +#define RACF_RELOC_INITIATING_EVENT 112 + +/* Date and time security event occurred */ +#define RACF_RELOC_TIMESTAMP 113 + +/* Application specific data. (i.e. Other) */ +#define RACF_RELOC_OTHER 114 + +/*************************************************************************** + * RACF Remote Audit Major return codes * + ***************************************************************************/ +#define RACF_MAJOR_SUCCESS 0 + +/* Event was logged, with warnings */ +#define RACF_MAJOR_WARNINGMODE 2 + +/* No logging required + No audit controls are set to require it */ +#define RACF_MAJOR_NOTREQ 3 + +/* Class not active/ractlisted, + covering profile not found or + RACF is not installed */ +#define RACF_MAJOR_UNDETERMINED 4 + +/* The user does not have authority the R_auditx service. + The userid associated with the LDAP server must have + at least READ access to the FACILITY class profile IRR.RAUDITX. */ +#define RACF_MAJOR_UNAUTHORIZED 8 + + +/* The R_auditx service returned an unexpected error. + Compare the returned minor codes with the SAF RACF codes + documented in Security Server Callable Services */ +#define RACF_MAJOR_RACROUTE 12 + +/* A value specified in the extended operation request is + incorrect or unsupported. Check the returned minor codes + to narrow the reason */ +#define RACF_MAJOR_VAL_ERR 16 + +/* A DER decoding error was encountered in an item. + Processing Terminated. Partial results may be returned */ +#define RACF_MAJOR_ENC_ERR 20 + +/* The requestor does not have sufficient authority for the + requested function. The userid associated with the LDAP bind + user must have at least READ access to the FACILITY class + profile IRR.LDAP.REMOTE.AUDIT. */ +#define RACF_MAJOR_UNSUF_AUTH 24 + +/* No items are found within the ItemList sequence of the extended + operation request, so no response items are returned */ +#define RACF_MAJOR_EMPTY 28 + +/* Invalid RequestVersion */ +#define RACF_MAJOR_INVALID_VER 61 + +/* An internal error was encountered within the ICTX component */ +#define RACF_MAJOR_INTERNAL_ERR 100 + +/*************************************************************************** + * Some standard sizes for remote audit request items * + ***************************************************************************/ +#define RACF_LINK_VALUE_SIZE 8 +#define RACF_CLASS_SIZE 8 +#define RACF_RESOURCE_SIZE 240 +#define RACF_LOGSTRING_SIZE 200 + + +/*************************************************************************** + * Some standard Error defines * + ***************************************************************************/ +#define ICTX_SUCCESS 0x00 + +/* maybe a temporary failure? */ +#define ICTX_E_TRYAGAIN 0x01 + +/* permanent failure - abort event submission */ +#define ICTX_E_ABORT 0x02 + +/* Fatal failure - abort program */ +#define ICTX_E_FATAL 0x03 + +/* generic error */ +#define ICTX_E_ERROR 0x10 + +/*************************************************************************** + * structure representing an RACF session * + ***************************************************************************/ +typedef struct opaque +{ + char *server; + unsigned int port; + char *user; + char *password; + unsigned int timeout; + LDAP *ld; + int connected; +} RACF; + +/*************************************************************************** + * LDAP XOP operations * + ***************************************************************************/ +/* + * Initializes RACF connection, binds to RACF Server + * Args are: + * server, bind user, bind password, server port, timeout + * Caller must call racf_destroy() to free memory allocation + */ +int racf_init(RACF *, char *, int, char *, char *, int); + +/* + * Uninitializes RACF connection + */ +void racf_destroy(RACF *); + +/* + * sync submit request - possibly reconnect to server + * if the connection if found to be dead + */ +int submit_request_s(RACF *, BerElement *); + + +#endif /* _RACF_LDAP_H */ diff -purN audit-1.6.2/audisp/plugins/racf/racf-ldap.c audit-1.6.2_racf/audisp/plugins/racf/racf-ldap.c --- audit-1.6.2/audisp/plugins/racf/racf-ldap.c 1969-12-31 21:00:00.000000000 -0300 +++ audit-1.6.2_racf/audisp/plugins/racf/racf-ldap.c 2007-09-28 09:19:02.000000000 -0300 @@ -0,0 +1,606 @@ +/*************************************************************************** + * Copyright (C) 2007 International Business Machines Corp. * + * All Rights Reserved. * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * * + * Authors: * + * Klaus Heinrich Kiwi <klausk@br.ibm.com> * + ***************************************************************************/ + +#include "racf-ldap.h" + +#include <errno.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include "racf-log.h" + +/*************************************************************************** + * Audit response struct * + ***************************************************************************/ +typedef struct audit_resp_item +{ + ber_int_t version; /* Version of Response data itself */ + ber_int_t itemTag; /* Copy of itemTag from Operation */ + ber_int_t majorCode; /* Majorcode. Main return code of this Outcome */ + ber_int_t minorCode1; /* minorCode1. SAFRc or other Rc */ + ber_int_t minorCode2; /* minorCode2. RacfRc or other Rc */ + ber_int_t minorCode3; /* minorCode3. racfRsn or other Rc */ +} audit_resp_item_t; + +typedef struct audit_response +{ + ber_int_t respVersion; /* Overall version */ + ber_int_t respMajor; /* Overall major code */ + unsigned int numItems; /* Number of response items */ + audit_resp_item_t **itemList; /* response ItemList */ +} audit_response_t; + + +/*************************************************************************** + * RACF Major return code handling * + ***************************************************************************/ +struct racf_error +{ + int code; + char *str; +}; + +static struct racf_error racf_errlist[] = { + {RACF_MAJOR_SUCCESS, "Success"}, + {RACF_MAJOR_WARNINGMODE, "Event was logged, with warnings"}, + {RACF_MAJOR_NOTREQ, "No logging required"}, + {RACF_MAJOR_UNDETERMINED, "Undetermined result"}, + {RACF_MAJOR_UNAUTHORIZED, "The user does not have authority the R_auditx service"}, + {RACF_MAJOR_RACROUTE, "The R_auditx service returned an unexpected error"}, + {RACF_MAJOR_VAL_ERR, "Value error in request"}, + {RACF_MAJOR_ENC_ERR, "DER decoding error in request"}, + {RACF_MAJOR_UNSUF_AUTH, "The user has unsuficient authority for the requested function"}, + {RACF_MAJOR_EMPTY, "Empty request received - No items found within the ItemList"}, + {RACF_MAJOR_INVALID_VER, "Invalid RequestVersion"}, + {RACF_MAJOR_INTERNAL_ERR, "An internal error was encountered within the ICTX component"}, + {-1, NULL} +}; + +/*************************************************************************** + * Internal functions prototypes * + ***************************************************************************/ +static int _racf_init(RACF *); +static void _racf_destroy(RACF *); +static int racf_connect(RACF *); +static void racf_disconnect(RACF *); +static int submit_xop_s(RACF *, struct berval *); +static int decode_response(audit_response_t *, struct berval *); + +/*************************************************************************** + * Exported functions * + ***************************************************************************/ +int submit_request_s(RACF *racf, BerElement *ber) +{ + int rc, retry = 3; + struct berval bv; + + rc = ber_flatten2(ber, &bv, 0); /* 0 = Use ber's buffer */ + if (rc == -1) { + log_err("Error flattening BER element"); + return ICTX_E_ABORT; + } + +retry: + rc = submit_xop_s(racf, &bv); + switch (rc) { + case ICTX_SUCCESS: + break; + case ICTX_E_TRYAGAIN: + /* + * Usually means that the server connection timed-out + * So we flush the LDAP connection by unsetting the + * 'connected' flag and trying again. + */ + if (retry > 0) { + log_debug("Connection seems down - retrying"); + retry--; + _racf_destroy(racf); + rc = _racf_init(racf); + if (rc != ICTX_SUCCESS) + log_err("Error - failed to re-initialize LDAP session"); + else + goto retry; /* go to submit_xop_s once more */ + } + log_err("Can't stablish connection - dropping event"); + break; + case ICTX_E_ABORT: + log_err("Error submitting request - dropping event"); + break; + default: + log_err("Event resulted failure, code: 0x%x", rc); + } + + return rc; +} + +int racf_init(RACF *racf, char *server, int port, + char *user, char *password, int timeout) +{ + racf->server = strdup(server); + racf->port = port; + racf->user = strdup(user); + racf->password = strdup(password); + racf->timeout = timeout; + racf->connected = 0; + + if (!racf->server || !racf->user || !racf->password) { + log_err("Error allocating memory for RACF session members"); + return ICTX_E_FATAL; + } + + return _racf_init(racf); +} + +void racf_destroy(RACF *racf) +{ + _racf_destroy(racf); + + free(racf->server); + free(racf->user); + free(racf->password); +} + +char *racf_err2string(int err) +{ + int i; + + for (i = 0; racf_errlist[i].str != NULL; i++) { + if (err == racf_errlist[i].code) + return racf_errlist[i].str; + } + return "Unknown error"; +} + +/*************************************************************************** + * Internal Functions * + ***************************************************************************/ +static int _racf_init(RACF *racf) +{ + int version, rc; + char *uri = NULL; + +#ifdef LDAP_DEPRECATED + + log_debug("Initializing RACF LDAP connection at ldap://%s:%d", + racf->server, racf->port); + racf->ld = ldap_init(racf->server + racf->port ? racf->port : LDAP_PORT); + if (racf->ld == NULL) { + log_err("Error initializing LDAP session: %s", + strerror(errno)); + rc = ICTX_E_FATAL; + goto end; + } +#else + /* build ldap URI */ + if (racf->port == 0 || racf->port == LDAP_PORT) + rc = asprintf(&uri, "ldap://%s", racf->server); + else + rc = asprintf(&uri, "ldap://%s:%d", racf->server, + racf->port); + + if (rc == -1) { + log_err("Out of memory building LDAP server URI"); + rc = ICTX_E_FATAL; + uri = NULL; + goto end; + } + + log_debug("Initializing RACF LDAP connection at %s", uri); + /* Get a handle to an LDAP connection */ + rc = ldap_initialize(&racf->ld, uri); + if (rc != LDAP_SUCCESS) { + log_err("Error initializing LDAP session: %s", + ldap_err2string(rc)); + rc = ICTX_E_FATAL; + goto free_uri; + } +#endif + + /* + * Ensure the LDAP protocol version supported by the client + * to 3. (Extended operations are part of version 3). + */ + rc = ldap_get_option(racf->ld, LDAP_OPT_PROTOCOL_VERSION, + &version); + if (rc != LDAP_OPT_SUCCESS) { + log_err("Error getting LDAP session options"); + rc = ICTX_E_FATAL; + goto unbind; + } + + if (version < LDAP_VERSION3) { + log_debug("Setting LDAP session version to %d", + LDAP_VERSION3); + version = LDAP_VERSION3; + rc = ldap_set_option(racf->ld, LDAP_OPT_PROTOCOL_VERSION, + &version); + if (rc != LDAP_OPT_SUCCESS) { + log_err("Error setting LDAP session version"); + rc = ICTX_E_FATAL; + goto unbind; + } + } + + goto free_uri; + +unbind: + ldap_unbind_ext_s(racf->ld, NULL, NULL); + racf->ld = NULL; + +free_uri: + free(uri); + +end: + return rc; +} + +static void _racf_destroy(RACF *racf) +{ + racf_disconnect(racf); + racf->ld = NULL; +} + +static int racf_connect(RACF *racf) +{ + struct berval cred; + int rc; + + log_debug("Attempting BIND. User '%s', password '<not shown>'", + racf->user); + + cred.bv_val = (char *) racf->password; + cred.bv_len = strlen(racf->password); + + rc = ldap_sasl_bind_s(racf->ld, racf->user, + LDAP_SASL_SIMPLE, &cred, + NULL, NULL, NULL); + + + switch (rc) { + case LDAP_SUCCESS: + log_debug("LDAP BIND succeeded"); + racf->connected = 1; + rc = ICTX_SUCCESS; + break; + case LDAP_SERVER_DOWN: + case LDAP_BUSY: + case LDAP_UNAVAILABLE: + case LDAP_TIMEOUT: + case LDAP_CONNECT_ERROR: + log_warn("RACF connection failed: %s", + ldap_err2string(rc)); + rc = ICTX_E_TRYAGAIN; + break; + default: + log_err("Error - RACF initialization failed: %s", + ldap_err2string(rc)); + rc = ICTX_E_FATAL; + } + + return rc; +} + + +static void racf_disconnect(RACF *racf) +{ + if (racf->ld) { + log_debug("Unbinding LDAP session"); + +#ifdef LDAP_DEPRECATED + ldap_unbind(racf->ld); +#else + ldap_unbind_ext_s(racf->ld, NULL, NULL); +#endif + } + racf->connected = 0; + +} + +/* + * Sync-submit extended operation given in *bv + * return ICTX_SUCCESS if submission (and response) + * succeeded. + * Log errors using log_err() functions + */ +int submit_xop_s(RACF *racf, struct berval *bv) +{ + LDAPMessage *result; + audit_response_t response; + int rc, errcode, msgId; + unsigned int i; + char *errmsg, *oid; + struct berval *bv_response; + struct timeval t; + + if (racf->connected == 0) { + rc = racf_connect(racf); + if (rc != ICTX_SUCCESS) + return rc; + } + + /* call LDAP - won't block */ + rc = ldap_extended_operation(racf->ld, ICTX_OIDAUDITREQUEST, + bv, NULL, NULL, &msgId); + if (rc == LDAP_SERVER_DOWN) { + racf->connected = 0; + return ICTX_E_TRYAGAIN; + } else if (rc != LDAP_SUCCESS) { + log_err("LDAP extended operation submission failure: %s", + ldap_err2string(rc)); + return ICTX_E_ABORT; + } else + log_debug("Sent LDAP extended operation request, msgId=0x%x", + msgId); + + + /* call blocking ldap_result with specified timeout */ + t.tv_sec = racf->timeout; + t.tv_usec = 0; + rc = ldap_result(racf->ld, msgId, 1, &t, &result); + + if (rc == -1) { + /* error in ldap operation */ + ldap_get_option(racf->ld, LDAP_OPT_ERROR_NUMBER, &errcode); + switch (errcode) { + case LDAP_SERVER_DOWN: + /* Connection may have timed out, let's retry */ + racf->connected = 0; + rc = ICTX_E_TRYAGAIN; + break; + default: + log_err("ldap_result unexpected failure: %s (0x%x)", + ldap_err2string(rc), rc); + rc = ICTX_E_ABORT; + } + goto end; + } else if (rc == 0) { + /* timeout reached */ + log_warn("LDAP extended operation timed out"); + rc = ICTX_E_ABORT; + goto end; + } else if (rc != LDAP_RES_EXTENDED) { + /* not an extended operation response! */ + log_err("LDAP extended operation resulted in unexpected answer: 0x%x", rc); + rc = ICTX_E_ABORT; + goto free_result; + } + + log_debug("Got LDAP Extended result"); + /* + * we have an extended operation result + * first parse_result will check for errcode, later + * parse_extended_result will give us the oid and the BER value + */ + rc = ldap_parse_result(racf->ld, result, &errcode, NULL, + &errmsg, NULL, NULL, 0); + if (rc != LDAP_SUCCESS) { + log_err("LDAP parse result internal failure (code 0x%x)", + rc); + rc = ICTX_E_ABORT; + goto free_result; + } + + if (errcode != LDAP_SUCCESS) { + log_err("LDAP extended operation failed: %s", errmsg); + rc = ICTX_E_ABORT; + goto free_errmsg; + } + + rc = ldap_parse_extended_result(racf->ld, result, &oid, + &bv_response, 0); + if (rc != LDAP_SUCCESS) { + log_err("Failed to parse ldap extended result (code 0x%x)", + rc); + rc = ICTX_E_ABORT; + goto free_errmsg; + } + + if (oid && strcmp(oid, ICTX_OIDAUDITRESPONSE) != 0) { + /* oid == null shouldn't be a problem to log_err */ + log_err("LDAP extended operation returned an invalid oid: %s", oid); + rc = ICTX_E_ABORT; + goto free_bv; + } + + rc = decode_response(&response, bv_response); + if (rc != ICTX_SUCCESS) { + log_err("Error decoding extended operation response"); + goto free_bv; + } + + if (response.respMajor == RACF_MAJOR_SUCCESS) { + /* submission was successful, no further processing needed */ + log_debug("Successfully submited Remote audit Request"); + rc = ICTX_SUCCESS; + goto free_response; + } else if (response.respMajor == RACF_MAJOR_EMPTY) { + /* something is going on. Set error and stop processing */ + log_warn("Warning - LDAP extended operation returned empty result"); + rc = ICTX_E_ABORT; + goto free_response; + } else if (response.respMajor == RACF_MAJOR_WARNINGMODE || + response.respMajor == RACF_MAJOR_NOTREQ) + rc = ICTX_SUCCESS; /* don't fail, but continue processing */ + else + rc = ICTX_E_ABORT; /* set return code and continue processing */ + + /* If it's not success nor empty, let's check for errors in the response */ + for (i = 0; i < response.numItems; i++) { + switch ((response.itemList[i])->majorCode) { + /* 0 <= Major Code <= 14 */ + case RACF_MAJOR_SUCCESS: + break; + case RACF_MAJOR_WARNINGMODE: + case RACF_MAJOR_NOTREQ: + log_debug("Warning - LDAP extended operation returned '%s' for item %d", + racf_err2string((response.itemList[i])->majorCode), + (response.itemList[i])->itemTag); + log_debug("SAF code: 0x%x, RACF code: 0x%x, RACF reason: 0x%x", + (response.itemList[i])->minorCode1, + (response.itemList[i])->minorCode2, + (response.itemList[i])->minorCode3); + break; + case RACF_MAJOR_UNDETERMINED: + case RACF_MAJOR_UNAUTHORIZED: + case RACF_MAJOR_RACROUTE: + log_err("Error - LDAP extended operation returned '%s' for item %d", + racf_err2string((response.itemList[i])->majorCode), + (response.itemList[i])->itemTag); + log_err("SAF code: 0x%x, RACF code: 0x%x, RACF reason: 0x%x", + (response.itemList[i])->minorCode1, + (response.itemList[i])->minorCode2, + (response.itemList[i])->minorCode3); + break; + /* 16 <= Major Code <= 20 */ + case RACF_MAJOR_VAL_ERR: + case RACF_MAJOR_ENC_ERR: + log_err("Error - LDAP extended operation returned '%s' for item %d", + racf_err2string((response.itemList[i])->majorCode), + (response.itemList[i])->itemTag); + log_err("Item field: %d, reson %d", + (response.itemList[i])-> + minorCode1, + (response.itemList[i])->minorCode2); + break; + /* 24 <= Major code <= 100 */ + case RACF_MAJOR_UNSUF_AUTH: + case RACF_MAJOR_EMPTY: + case RACF_MAJOR_INVALID_VER: + case RACF_MAJOR_INTERNAL_ERR: + log_err("Error - LDAP extended operation returned '%s' for item %d", + racf_err2string((response.itemList[i])->majorCode), + (response.itemList[i])->itemTag); + break; + default: + log_err("Error - LDAP extended operation returned an unknown Major code for item %d", + (response.itemList[i])->majorCode); + } + } + +free_response: + for (; response.numItems > 0; response.numItems--) + free(response.itemList[response.numItems - 1]); + free(response.itemList); + +free_bv: + if (bv_response) + ber_bvfree(bv_response); + if (oid) + ldap_memfree(oid); + +free_errmsg: + ldap_memfree(errmsg); + +free_result: + ldap_msgfree(result); + +end: + return rc; +} + +static int decode_response(audit_response_t * r, struct berval *bv) +{ + BerElement *ber; + ber_len_t len; + int rc; + + if (!bv) { + log_err("LDAP extended operation returned NULL message"); + return ICTX_E_ABORT; + } else if ((ber = ber_init(bv)) == NULL) { + log_err("Error initializing BER response data"); + return ICTX_E_ABORT; + } + + log_debug("---Got an encoded request response:"); + debug_bv(bv); + + r->respVersion = 0; + r->respMajor = 0; + r->numItems = 0; + r->itemList = NULL; + + rc = ber_scanf(ber, "{ii", &r->respVersion, &r->respMajor); + if (r->respVersion != ICTX_REQUESTVER) { + log_err("Invalid version returned by RACF server"); + log_err("Should be %d, got %d", ICTX_REQUESTVER, + r->respVersion); + rc = ICTX_E_ABORT; + goto free_ber; + } + + if (r->respMajor == RACF_MAJOR_SUCCESS || + r->respMajor == RACF_MAJOR_EMPTY) { + rc = ICTX_SUCCESS; + /* No further processing required */ + goto free_ber; + } + + /* Inspect ber response otherwise */ + while (ber_peek_tag(ber, &len) == LBER_SEQUENCE) { + r->numItems++; + r->itemList = (audit_resp_item_t **) realloc(r->itemList, + r->numItems * + sizeof + (audit_resp_item_t + *)); + if (errno == ENOMEM) { + if (r->itemList) + free(r->itemList); + rc = ICTX_E_FATAL; + goto free_ber; + } + + audit_resp_item_t *item = (audit_resp_item_t *) + malloc(sizeof(audit_resp_item_t)); + + if (!item) { + rc = ICTX_E_FATAL; + goto free_ber; + } + + rc |= ber_scanf(ber, "{{iiiiii}}", + &item->version, + &item->itemTag, + &item->majorCode, + &item->minorCode1, &item->minorCode2, + &item->minorCode3); + r->itemList[r->numItems - 1] = item; + } + rc |= ber_scanf(ber, "}"); + + if (rc == -1) { + for (; r->numItems > 0; r->numItems--) + free(r->itemList[r->numItems - 1]); + free(r->itemList); + rc = ICTX_E_ABORT; + } + else + rc = ICTX_SUCCESS; + +free_ber: + ber_free(ber, 1); + + return rc; +} ^ permalink raw reply [flat|nested] 8+ messages in thread
[parent not found: <1190984843.4113.25.camel@klausk.br.ibm.com>]
* [PATCH 04/07][RFC] RACF audit plugin - logging interface [not found] ` <1190984843.4113.25.camel@klausk.br.ibm.com> @ 2007-09-28 13:28 ` Klaus Heinrich Kiwi [not found] ` <1190985127.4113.32.camel@klausk.br.ibm.com> 1 sibling, 0 replies; 8+ messages in thread From: Klaus Heinrich Kiwi @ 2007-09-28 13:28 UTC (permalink / raw) To: Linux-audit This patch implements a simple logging interface for the racf plugin. There's also some debugging code that's completely disabled if 'DEBUG' symbol isn't defined. Messages are logged to the syslog with info, warn and err priorities. Signed-off-by: Klaus Heinrich Kiwi <klausk@br.ibm.com> diff -purN audit-1.6.2/audisp/plugins/racf/racf-log.h audit-1.6.2_racf/audisp/plugins/racf/racf-log.h --- audit-1.6.2/audisp/plugins/racf/racf-log.h 1969-12-31 21:00:00.000000000 -0300 +++ audit-1.6.2_racf/audisp/plugins/racf/racf-log.h 2007-09-28 09:18:08.000000000 -0300 @@ -0,0 +1,58 @@ +/*************************************************************************** + * Copyright (C) 2007 International Business Machines Corp. * + * All Rights Reserved. * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * * + * Authors: * + * Klaus Heinrich Kiwi <klausk@br.ibm.com> * + ***************************************************************************/ + +#ifndef _RACF_LOG_H +#define _RACF_LOG_H + +#include "racf-ldap.h" + +#include <syslog.h> +#include <sys/types.h> +#include <unistd.h> +#include <lber.h> + +extern pid_t mypid; + +void log_err(const char *, ...); +void log_warn(const char *, ...); +void log_info(const char *, ...); +void _log_debug(const char *, ...); +void _debug_bv(struct berval *); +void _debug_ber(BerElement *); + +#ifdef DEBUG + +#define log_debug(fmt, ...) _log_debug(fmt, ## __VA_ARGS__) +#define debug_bv(bv) _debug_bv(bv) +#define debug_ber(ber) _debug_ber(ber) + +#else + +#define log_debug(fmt, ...) +#define debug_bv(bv) +#define debug_ber(ber) + +#endif /* DEBUG */ + + +#endif /* _RACF_LOG_H */ diff -purN audit-1.6.2/audisp/plugins/racf/racf-log.c audit-1.6.2_racf/audisp/plugins/racf/racf-log.c --- audit-1.6.2/audisp/plugins/racf/racf-log.c 1969-12-31 21:00:00.000000000 -0300 +++ audit-1.6.2_racf/audisp/plugins/racf/racf-log.c 2007-09-28 09:18:08.000000000 -0300 @@ -0,0 +1,109 @@ +/*************************************************************************** + * Copyright (C) 2007 International Business Machines Corp. * + * All Rights Reserved. * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * * + * Authors: * + * Klaus Heinrich Kiwi <klausk@br.ibm.com> * + ***************************************************************************/ +#include "racf-log.h" + +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#include "auparse.h" + + +static void vlog_prio(int prio, const char *fmt, va_list ap) +{ + char *str; + + if (asprintf(&str, "pid=%d: %s", mypid, fmt) != -1) { + vsyslog(LOG_DAEMON | prio, str, ap); + free(str); + } +} + +void log_err(const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + vlog_prio(LOG_ERR, fmt, ap); + va_end(ap); +} + +void log_warn(const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + vlog_prio(LOG_WARNING, fmt, ap); + va_end(ap); +} + +void log_info(const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + vlog_prio(LOG_INFO, fmt, ap); + va_end(ap); +} + +void _log_debug(const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + vlog_prio(LOG_INFO, fmt, ap); + va_end(ap); +} + +void _debug_ber(BerElement * ber) +{ + struct berval bv; + + if (ber_flatten2(ber, &bv, 0) != -1) { + debug_bv(&bv); + } +} + +void _debug_bv(struct berval *bv) +{ + char *out; + char octet[4]; + ber_len_t i; + + log_debug("---BER value HEX dump (size %u bytes)", + (unsigned int) bv->bv_len); + + if (bv->bv_len > 0) { + out = (char *) calloc((3 * (bv->bv_len)) + 1, sizeof(char)); + if (!out) return; + + for (i = 1; i <= bv->bv_len; i++) { + snprintf(octet, 4, "%02x ", + (unsigned char) bv->bv_val[i - 1]); + strcat(out, octet); + } + log_debug(out); + free(out); + } +} + + ^ permalink raw reply [flat|nested] 8+ messages in thread
[parent not found: <1190985127.4113.32.camel@klausk.br.ibm.com>]
* [PATCH 05/07][RFC] RACF audit plugin - queue interface [not found] ` <1190985127.4113.32.camel@klausk.br.ibm.com> @ 2007-09-28 13:28 ` Klaus Heinrich Kiwi [not found] ` <1190985276.4113.35.camel@klausk.br.ibm.com> 1 sibling, 0 replies; 8+ messages in thread From: Klaus Heinrich Kiwi @ 2007-09-28 13:28 UTC (permalink / raw) To: Linux-audit This patch implements a queue for already-encoded BER elements for the racf plugin. This is entirely based on audit dispatcher code by Steve Grubb. Signed-off-by: Klaus Heinrich Kiwi <klausk@br.ibm.com> diff -purN audit-1.6.2/audisp/plugins/racf/racf-queue.h audit-1.6.2_racf/audisp/plugins/racf/racf-queue.h --- audit-1.6.2/audisp/plugins/racf/racf-queue.h 1969-12-31 21:00:00.000000000 -0300 +++ audit-1.6.2_racf/audisp/plugins/racf/racf-queue.h 2007-09-28 09:18:08.000000000 -0300 @@ -0,0 +1,38 @@ +/*************************************************************************** + * Copyright (C) 2007 International Business Machines Corp. * + * All Rights Reserved. * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * * + * Authors: * + * Klaus Heinrich Kiwi <klausk@br.ibm.com> * + * based on code by Steve Grubb <sgrubb@redhat.com> * + ***************************************************************************/ + +#ifndef _RACF_QUEUE_H +#define _RACF_QUEUE_H + +#include <lber.h> + +int init_queue(unsigned int size); +void enqueue(BerElement *); +BerElement *dequeue(void); +void nudge_queue(void); +void increase_queue_depth(unsigned int size); +void destroy_queue(void); + +#endif /* _RACF_QUEUE_H */ + diff -purN audit-1.6.2/audisp/plugins/racf/racf-queue.c audit-1.6.2_racf/audisp/plugins/racf/racf-queue.c --- audit-1.6.2/audisp/plugins/racf/racf-queue.c 1969-12-31 21:00:00.000000000 -0300 +++ audit-1.6.2_racf/audisp/plugins/racf/racf-queue.c 2007-09-28 09:18:08.000000000 -0300 @@ -0,0 +1,144 @@ +/*************************************************************************** + * Copyright (C) 2007 International Business Machines Corp. * + * All Rights Reserved. * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * * + * Authors: * + * Klaus Heinrich Kiwi <klausk@br.ibm.com> * + * based on code by Steve Grubb <sgrubb@redhat.com> * + ***************************************************************************/ + +#include "racf-queue.h" + +#include <stdlib.h> +#include <pthread.h> +#include <syslog.h> +#include "racf-log.h" + +static volatile BerElement **q; +static pthread_mutex_t queue_lock; +static pthread_cond_t queue_nonempty; +static unsigned int q_next, q_last, q_depth; + + +int init_queue(unsigned int size) +{ + unsigned int i; + + q_next = 0; + q_last = 0; + q_depth = size; + q = malloc(q_depth * sizeof(BerElement *)); + if (q == NULL) + return -1; + + for (i=0; i<q_depth; i++) + q[i] = NULL; + + /* Setup IPC mechanisms */ + pthread_mutex_init(&queue_lock, NULL); + pthread_cond_init(&queue_nonempty, NULL); + + return 0; +} + +void enqueue(BerElement *ber) +{ + unsigned int n, retry_cnt = 0; + +retry: + /* We allow 3 retries and then its over */ + if (retry_cnt > 3) { + log_err("queue is full - dropping event"); + return; + } + pthread_mutex_lock(&queue_lock); + + /* OK, have lock add event */ + n = q_next%q_depth; + if (q[n] == NULL) { + q[n] = ber; + q_next = (n+1) % q_depth; + pthread_cond_signal(&queue_nonempty); + pthread_mutex_unlock(&queue_lock); + } else { + pthread_mutex_unlock(&queue_lock); + pthread_yield(); /* Let dequeue thread run to clear queue */ + retry_cnt++; + goto retry; + } +} + +BerElement *dequeue(void) +{ + BerElement *ber; + unsigned int n; + + /* Wait until its got something in it */ + pthread_mutex_lock(&queue_lock); + n = q_last%q_depth; + if (q[n] == NULL) { + pthread_cond_wait(&queue_nonempty, &queue_lock); + n = q_last%q_depth; + } + + /* OK, grab the next event */ + if (q[n] != NULL) { + ber = (BerElement *) q[n]; + q[n] = NULL; + q_last = (n+1) % q_depth; + } else + ber = NULL; + + pthread_mutex_unlock(&queue_lock); + + /* Process the event */ + return ber; +} + +void nudge_queue(void) +{ + pthread_cond_signal(&queue_nonempty); +} + +void increase_queue_depth(unsigned int size) +{ + pthread_mutex_lock(&queue_lock); + if (size > q_depth) { + unsigned int i; + void *tmp_q; + + tmp_q = realloc(q, size * sizeof(BerElement *)); + q = tmp_q; + for (i=q_depth; i<size; i++) + q[i] = NULL; + q_depth = size; + } + pthread_mutex_unlock(&queue_lock); +} + +void destroy_queue(void) +{ + unsigned int i; + + for (i=0; i<q_depth; i++) { + ber_free(q[i], 1); + } + + free(q); +} + ^ permalink raw reply [flat|nested] 8+ messages in thread
[parent not found: <1190985276.4113.35.camel@klausk.br.ibm.com>]
* [PATCH 06/07][RFC] RACF audit plugin - plugin main code [not found] ` <1190985276.4113.35.camel@klausk.br.ibm.com> @ 2007-09-28 13:28 ` Klaus Heinrich Kiwi [not found] ` <1190985692.4113.42.camel@klausk.br.ibm.com> 1 sibling, 0 replies; 8+ messages in thread From: Klaus Heinrich Kiwi @ 2007-09-28 13:28 UTC (permalink / raw) To: Linux-audit This patch implements the main body for the racf plugin. It uses the auparse_feed() interface to add a callback interface that's called whenever a complete event is read from stdin. The push_event() callback does the BER encoding and enqueues the encoded event. The 'submission_thread' then dequeues it and synchronously submits it to the RACF server (using the ldap interface). SIGHUP is supposed to trigger a configuration file re-read and flush queues and network connections, but seems like there's still a bit of a problem when the submission thread is blocked on dequeueing events and a SIGHUP is caught. Signed-off-by: Klaus Heinrich Kiwi <klausk@br.ibm.com> diff -purN audit-1.6.2/audisp/plugins/racf/racf-plugin.c audit-1.6.2_racf/audisp/plugins/racf/racf-plugin.c --- audit-1.6.2/audisp/plugins/racf/racf-plugin.c 1969-12-31 21:00:00.000000000 -0300 +++ audit-1.6.2_racf/audisp/plugins/racf/racf-plugin.c 2007-09-28 09:18:08.000000000 -0300 @@ -0,0 +1,483 @@ +/*************************************************************************** +* Copyright (C) 2007 International Business Machines Corp. * +* All Rights Reserved. * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program; if not, write to the * +* Free Software Foundation, Inc., * +* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * +* * +* Authors: * +* Klaus Heinrich Kiwi <klausk@br.ibm.com> * +***************************************************************************/ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <signal.h> +#include <limits.h> +#include <string.h> +#include <time.h> +#include <errno.h> +#include <string.h> +#include <pthread.h> +#include <lber.h> +#include <netinet/in.h> +#include "auparse.h" +#include "racf-log.h" +#include "racf-ldap.h" +#include "racf-config.h" +#include "racf-queue.h" + +/* + * Global vars + */ +volatile int stop = 0; +volatile int hup = 0; +volatile RACF racf_inst; +static racf_conf_t conf; +static const char *def_config_file = "/etc/audisp/racf.conf"; +static pthread_t submission_thread; +pid_t mypid = 0; + +/* + * SIGTERM handler + */ +static void term_handler(int sig) +{ + log_info("Got SIGTERM - Exiting"); + stop = 1; + nudge_queue(); +} + +/* + * SIGHUP handler - re-read config, reconnect to RACF + */ +static void hup_handler(int sig) +{ + log_info("Got SIGHUP - flushing configuration"); + hup = 1; + nudge_queue(); +} + +/* + * SIGALRM handler - help force exit when terminating daemon + */ +static void alarm_handler(int sig) +{ + log_err("Aborting submission thread"); + pthread_cancel(submission_thread); + abort(); +} + +/* + * The submission thread + * It's job is to dequeue the events from the queue + * and sync submit them to RACF + */ +static void *submission_thread_main(void *arg) +{ + int rc; + + rc = racf_init(&racf_inst, conf.server, + conf.port, conf.user, + conf.password, + conf.timeout); + + if (rc != ICTX_SUCCESS) { + log_err("Error - RACF instance initialization failed"); + stop = 1; + return 0; + } + + while (stop == 0) { + /* block until we have an event */ + BerElement *ber = dequeue(); + + if (ber == NULL) { + if (hup) { + break; + } + continue; + } + debug_ber(ber); + rc = submit_request_s(&racf_inst, ber); + if (rc == ICTX_E_FATAL) { + log_err("Error - Fatal error in event submission"); + stop = 1; + } else if (rc != ICTX_SUCCESS) { + log_err("Event submission failure - event dropped"); + } + else { + log_debug("Event submission success"); + } + ber_free(ber, 1); /* also free BER buffer */ + } + log_debug("Stopping event submission thread"); + racf_destroy(&racf_inst); + + return 0; +} + + +/* + * auparse library callback that's called when an event is ready + */ +void +push_event(auparse_state_t * au, auparse_cb_event_t cb_event_type, + void *user_data) +{ + int rc; + BerElement *ber; + int qualifier; + char timestamp[26]; + char linkValue[RACF_LINK_VALUE_SIZE]; + char logString[RACF_LOGSTRING_SIZE]; + unsigned long linkValue_tmp; + + if (cb_event_type != AUPARSE_CB_EVENT_READY) + return; + + const au_event_t *e = auparse_get_timestamp(au); + if (e == NULL) + return; + /* + * we have an event. Each record will result in a different 'Item' + * (refer ASN.1 definition in racf-ldap.h) + */ + + /* + * Create a new BER element to encode the request + */ + ber = ber_alloc_t(LBER_USE_DER); + if (ber == NULL) { + log_err("Error allocating memory for BER element"); + goto fatal; + } + + /* + * Collect some information to fill in every item + */ + const char *node = auparse_get_node(au); + const char *success = auparse_find_field(au, "success"); + /* roll back event to get 'res' */ + auparse_first_record(au); + const char *res = auparse_find_field(au, "res"); + + /* check if this event is a success or failure one */ + if (success) { + if (strncmp(success, "0", 1) == 0 || + strncmp(success, "no", 2) == 0) + qualifier = RACF_QUALIF_FAIL; + else + qualifier = RACF_QUALIF_SUCCESS; + } else if (res) { + if (strncmp(res, "0", 1) == 0 + || strncmp(res, "failed", 6) == 0) + qualifier = RACF_QUALIF_FAIL; + else + qualifier = RACF_QUALIF_SUCCESS; + } else + qualifier = RACF_QUALIF_INFO; + + /* get timestamp text */ + ctime_r(&e->sec, timestamp); + timestamp[24] = '\0'; /* strip \n' */ + + /* prepare linkValue which will be used for every item */ + linkValue_tmp = htonl(e->serial); /* padronize to use network + * byte order + */ + memset(&linkValue, 0, RACF_LINK_VALUE_SIZE); + memcpy(&linkValue, &linkValue_tmp, sizeof(unsigned long)); + + /* + * Prepare the logString with some meaningful text + */ + sprintf(logString, "Linux (%s):", node); + + /* + * Start writing to BER element. + * There's only one field (version) out of the item sequence. + * Also open item sequence + */ + rc = ber_printf(ber, "{i{", ICTX_REQUESTVER); + if (rc < 0) + goto skip_event; + + /* + * Roll back to first record and iterate through all records + */ + auparse_first_record(au); + do { + const char *type = auparse_find_field(au, "type"); + if (type == NULL) + goto skip_event; + + log_debug("got record: %s", auparse_get_record_text(au)); + + /* + * First field is item Version, same as global version + */ + rc = ber_printf(ber, "{i", ICTX_REQUESTVER); + + /* + * Second field is the itemTag + * use our internal event counter, increasing it + */ + rc |= ber_printf(ber, "i", conf.counter++); + + /* + * Third field is the linkValue + * using ber_put_ostring since it is not null-terminated + */ + rc |= ber_put_ostring(ber, linkValue, + RACF_LINK_VALUE_SIZE, + LBER_OCTETSTRING); + /* + * Fourth field is the violation + * Don't have anything better yet to put here + */ + rc |= ber_printf(ber, "b", 0); + + /* + * Fifth field is the event. + * FIXME: this might be the place to switch on the + * audit record type and map to a more meaningful + * RACF event here + */ + rc |= ber_printf(ber, "i", RACF_EVENT_AUTHORIZATION); + + /* + * Sixth field is the qualifier. We map 'success' or + * 'res' to this field + */ + rc |= ber_printf(ber, "i", qualifier); + + /* + * Seventh field is the Class + * always use '@LINUX' for this version + * max size RACF_CLASS_SIZE + */ + rc |= ber_printf(ber, "t", ASN1_IA5STRING_TAG); + rc |= ber_printf(ber, "s", "@LINUX"); + + /* + * Eighth field is the resource + * use the record type (name) as the resource + * max size RACF_RESOURCE_SIZE + */ + rc |= ber_printf(ber, "t", ASN1_IA5STRING_TAG); + rc |= ber_printf(ber, "s", type); + + /* + * Nineth field is the LogString + * we try to put something meaningful here + * we also start the relocations sequence + */ + strcat(logString, type); /* concatenate the event type */ + rc |= ber_printf(ber, "t", ASN1_IA5STRING_TAG); + rc |= ber_printf(ber, "s{", logString); + + /* + * Now we start adding the relocations. + * Let's add the timestamp as the first one + * so it's out of the field loop + */ + rc |= ber_printf(ber, "{i", RACF_RELOC_TIMESTAMP); + rc |= ber_printf(ber, "t", ASN1_IA5STRING_TAG); + rc |= ber_printf(ber, "s}", timestamp); + + /* + * Check that encoding is going OK until now + */ + if (rc < 0) + goto skip_event; + + /* + * Now go to first field, + * and iterate through all fields + */ + auparse_first_field(au); + do { + /* + * we set a maximum of 1024 chars for + * relocation data (field=value pairs) + * Hopefuly this wont overflow too often + */ + char data[1024]; + const char *name = auparse_get_field_name(au); + const char *value = auparse_get_field_str(au); + if (name == NULL || value == NULL) + goto skip_event; + + /* + * First reloc field is the Relocation type + * We use 'OTHER' here since we don't have + * anything better + */ + rc |= ber_printf(ber, "{i", RACF_RELOC_OTHER); + + /* + * Second field is the relocation data + * We use a 'name=value' pair here + * Use up to 1023 chars (one char left for '\0') + */ + snprintf(data, 1023, "%s=%s", name, value); + rc |= ber_printf(ber, "t", ASN1_IA5STRING_TAG); + rc |= ber_printf(ber, "s}", data); + + /* + * Check encoding status + */ + if (rc < 0) + goto skip_event; + } while (auparse_next_field(au) > 0); + + /* + * After adding all relocations we are done with + * this item - finalize relocs and item + */ + rc |= ber_printf(ber, "}}"); + + /* + * Check if we are doing well with encoding + */ + if (rc < 0) + goto skip_event; + + } while (auparse_next_record(au) > 0); + + /* + * We have all items in - finalize item sequence & request + */ + rc |= ber_printf(ber, "}}"); + + /* + * Check if everything went alright with encoding + */ + if (rc < 0) + goto skip_event; + + /* + * finally, enqueue request and let the other + * thread process it + */ + log_debug("Encoding done, enqueuing event"); + enqueue(ber); + + return; + +skip_event: + log_warn("Warning - error encoding request, skipping event"); + ber_free(ber, 1); /* free it since we're not enqueuing it */ + return; + +fatal: + log_err("Fatal error while encoding request - aborting"); + stop = 1; +} + +int main(int argc, char *argv[]) +{ + int rc; + char *cpath; + char buf[1024]; + struct sigaction sa; + auparse_state_t *au; + + mypid = getpid(); + + log_info("starting"); + + /* + * sighandlers + */ + sa.sa_flags = 0; + sigemptyset(&sa.sa_mask); + sa.sa_handler = term_handler; + sigaction(SIGTERM, &sa, NULL); + sa.sa_handler = hup_handler; + sigaction(SIGHUP, &sa, NULL); + sa.sa_handler = alarm_handler; + sigaction(SIGALRM, &sa, NULL); + + /* + * the main program accepts a single (optional) argument: + * it's configuration file (this is NOT the plugin configuration + * usually located at /etc/audisp/plugin.d) + * We use the default (def_config_file) if no arguments are given + */ + if (argc == 1) { + cpath = def_config_file; + log_warn("No configuration file specified - using default (%s)", cpath); + } else if (argc == 2) { + cpath = argv[1]; + log_info("Configuration file: %s", cpath); + } else { + log_err("Error - invalid number of parameters"); + return 1; + } + + /* initialize record counter */ + conf.counter = 1; + + do { + hup = 0; /* don't flush unless hup==1 */ + + /* initialization is done in 5 steps: */ + rc = load_config(&conf, cpath); /* 1 */ + if (rc != 0) { + log_err("Error - Can't load configuration"); + return -1; + } + + /* initialize auparse */ + au = auparse_init(AUSOURCE_FEED, 0); /* 2 */ + + /* initialize the submission queue */ /* 3 */ + if (init_queue(conf.q_depth) != 0) { + log_err("Error - Can't initialize event queue"); + return -1; + } + + /* Initialize submission thread */ + pthread_create(&submission_thread, NULL, + submission_thread_main, NULL); /* 4 */ + + /* add our event consumer callback */ + auparse_add_callback(au, push_event, NULL, NULL); /* 5 */ + + /* loop reading stdin */ + while (fgets(buf, 1024, stdin) && hup == 0 && stop == 0) { + /* let our callback know of the new data */ + auparse_feed(au, buf, strlen(buf)); + } + /* flush everything, in order */ + auparse_flush_feed(au); /* 5 */ + nudge_queue(); + alarm(5); /* 5 seconds to clear the queue */ + pthread_join(submission_thread, NULL); /* 4 */ + destroy_queue(); /* 3 */ + auparse_destroy(au); /* 2 */ + free_config(&conf); /* 1 */ + } + while (hup && stop == 0); + + + return 0; +} ^ permalink raw reply [flat|nested] 8+ messages in thread
[parent not found: <1190985692.4113.42.camel@klausk.br.ibm.com>]
* [PATCH 07/07][RFC] RACF audit plugin - build and packaging integration [not found] ` <1190985692.4113.42.camel@klausk.br.ibm.com> @ 2007-09-28 13:28 ` Klaus Heinrich Kiwi 2007-09-28 20:43 ` Klaus Heinrich Kiwi 0 siblings, 1 reply; 8+ messages in thread From: Klaus Heinrich Kiwi @ 2007-09-28 13:28 UTC (permalink / raw) To: Linux-audit This patch adds the racf plugin to the audit package build system, with some additions to the spec file as well (the audit plugins package is still disabled). Signed-off-by: Klaus Heinrich Kiwi <klausk@br.ibm.com> diff -purN audit-1.6.2/audisp/plugins/Makefile.am audit-1.6.2_racf/audisp/plugins/Makefile.am --- audit-1.6.2/audisp/plugins/Makefile.am 2007-09-12 14:25:13.000000000 -0300 +++ audit-1.6.2_racf/audisp/plugins/Makefile.am 2007-09-28 09:18:08.000000000 -0300 @@ -22,5 +22,5 @@ CONFIG_CLEAN_FILES = Makefile.in *.loT *.rej *.orig -SUBDIRS = builtins ids remote +SUBDIRS = builtins ids remote racf diff -purN audit-1.6.2/audisp/plugins/racf/Makefile.am audit-1.6.2_racf/audisp/plugins/racf/Makefile.am --- audit-1.6.2/audisp/plugins/racf/Makefile.am 1969-12-31 21:00:00.000000000 -0300 +++ audit-1.6.2_racf/audisp/plugins/racf/Makefile.am 2007-09-28 09:18:08.000000000 -0300 @@ -0,0 +1,46 @@ +# Makefile.am-- +# Copyright (C) 2007 International Business Machines Corp. +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# Authors: +# Klaus Heinrich Kiwi <klausk@br.ibm.com> +# + +INCLUDES = -I.. -I${top_srcdir}/lib +CONFIG_CLEAN_FILES = Makefile.in *.rej *.orig +AUTOMAKE_OPTIONS = no-dependencies +EXTRA_DIST = racf.conf audisp-racf.conf +LIBS = -L${top_srcdir}/auparse -lauparse +LDADD = -lpthread -lldap -llber +disp_confdir = $(sysconfdir)/audisp +plugin_confdir=$(disp_confdir)/plugins.d +racf_plugin_conf = racf.conf +racf_disp_conf = audisp-racf.conf +sbin_PROGRAMS = audisp-racf + +noinst_HEADERS = racf-log.h racf-ldap.h racf-config.h racf-queue.h +audisp_racf_SOURCES = racf-plugin.c racf-log.c racf-ldap.c racf-config.c racf-queue.c +audisp_racf_CFLAGS = -W -Wall -Wundef -D_GNU_SOURCE + +install-data-hook: + mkdir -p -m 0750 ${DESTDIR}${plugin_confdir} + $(INSTALL_DATA) -D -m 640 ${srcdir}/$(racf_plugin_conf) ${DESTDIR}${disp_confdir} + $(INSTALL_DATA) -D -m 640 ${srcdir}/$(racf_disp_conf) ${DESTDIR}${plugin_confdir} + +uninstall-hook: + rm ${DESTDIR}${plugin_confdir}/$(racf_disp_conf) + rm ${DESTDIR}${disp_confdir}/$(racf_plugin_conf) diff -purN audit-1.6.2/audit.spec audit-1.6.2_racf/audit.spec --- audit-1.6.2/audit.spec 2007-09-25 08:46:49.000000000 -0300 +++ audit-1.6.2_racf/audit.spec 2007-09-28 09:19:40.000000000 -0300 @@ -124,7 +124,10 @@ touch -r ./audit.spec $RPM_BUILD_ROOT/et # Remove the plugin stuff for now rm -f $RPM_BUILD_ROOT/etc/audisp/plugins.d/au-ids.conf rm -f $RPM_BUILD_ROOT/etc/audisp/plugins.d/remote.conf +rm -f $RPM_BUILD_ROOT/etc/audisp/plugins.d/audisp-racf.conf +rm -f $RPM_BUILD_ROOT/etc/audisp/racf.conf rm -f $RPM_BUILD_ROOT/sbin/audisp-ids +rm -f $RPM_BUILD_ROOT/sbin/audisp-racf %clean rm -rf $RPM_BUILD_ROOT @@ -214,7 +217,10 @@ fi ##%defattr(-,root,root,-) ##%attr(640,root,root) /etc/audisp/plugins.d/au-ids.conf ##%attr(640,root,root) /etc/audisp/plugins.d/remote.conf +##%attr(640,root,root) /etc/audisp/plugins.d/audit-plugin-racf.conf +##%attr(640,root,root) /etc/audisp/racf.conf ##%attr(750,root,root) /sbin/audisp-ids +##%attr(750,root,root) /sbin/audit-plugin-racf %files -n system-config-audit -f system-config-audit.lang %defattr(-,root,root,-) diff -purN audit-1.6.2/configure.ac audit-1.6.2_racf/configure.ac --- audit-1.6.2/configure.ac 2007-09-12 14:26:41.000000000 -0300 +++ audit-1.6.2_racf/configure.ac 2007-09-28 09:18:08.000000000 -0300 @@ -109,7 +109,7 @@ if test x$use_apparmor != xno ; then AC_DEFINE(WITH_APPARMOR,1,[Define if you want to enable AppArmor events.])fi AC_CONFIG_SUBDIRS([system-config-audit]) -AC_OUTPUT(Makefile lib/Makefile auparse/Makefile auparse/test/Makefile src/Makefile src/mt/Makefile swig/Makefile docs/Makefile init.d/Makefile audisp/Makefile audisp/plugins/Makefile audisp/plugins/builtins/Makefile audisp/plugins/ids/Makefile audisp/plugins/remote/Makefile bindings/Makefile bindings/python/Makefile) +AC_OUTPUT(Makefile lib/Makefile auparse/Makefile auparse/test/Makefile src/Makefile src/mt/Makefile swig/Makefile docs/Makefile init.d/Makefile audisp/Makefile audisp/plugins/Makefile audisp/plugins/builtins/Makefile audisp/plugins/ids/Makefile audisp/plugins/remote/Makefile audisp/plugins/racf/Makefile bindings/Makefile bindings/python/Makefile) echo . echo " ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 07/07][RFC] RACF audit plugin - build and packaging integration 2007-09-28 13:28 ` [PATCH 07/07][RFC] RACF audit plugin - build and packaging integration Klaus Heinrich Kiwi @ 2007-09-28 20:43 ` Klaus Heinrich Kiwi 0 siblings, 0 replies; 8+ messages in thread From: Klaus Heinrich Kiwi @ 2007-09-28 20:43 UTC (permalink / raw) To: linux-audit Klaus Heinrich Kiwi wrote: > This patch adds the racf plugin to the audit package build system, with > some additions to the spec file as well (the audit plugins package is > still disabled). > > Signed-off-by: Klaus Heinrich Kiwi <klausk@br.ibm.com> Noted that there are some minor things out of place for this patch. Below is the same patch, fixed. Signed-off-by: Klaus Heinrich Kiwi <klausk@br.ibm.com> diff -purN audit-1.6.2/audisp/plugins/Makefile.am audit-1.6.2_racf2/audisp/plugins/Makefile.am --- audit-1.6.2/audisp/plugins/Makefile.am 2007-09-12 14:25:13.000000000 -0300 +++ audit-1.6.2_racf2/audisp/plugins/Makefile.am 2007-09-28 09:37:07.000000000 -0300 @@ -22,5 +22,5 @@ CONFIG_CLEAN_FILES = Makefile.in *.loT *.rej *.orig -SUBDIRS = builtins ids remote +SUBDIRS = builtins ids remote racf diff -purN audit-1.6.2/audisp/plugins/racf/Makefile.am audit-1.6.2_racf2/audisp/plugins/racf/Makefile.am --- audit-1.6.2/audisp/plugins/racf/Makefile.am 1969-12-31 21:00:00.000000000 -0300 +++ audit-1.6.2_racf2/audisp/plugins/racf/Makefile.am 2007-09-28 16:53:46.000000000 -0300 @@ -0,0 +1,46 @@ +# Makefile.am-- +# Copyright (C) 2007 International Business Machines Corp. +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# Authors: +# Klaus Heinrich Kiwi <klausk@br.ibm.com> +# + +INCLUDES = -I.. -I${top_srcdir}/lib -I${top_srcdir}/auparse +CONFIG_CLEAN_FILES = Makefile.in *.rej *.orig +AUTOMAKE_OPTIONS = no-dependencies +EXTRA_DIST = racf.conf audisp-racf.conf +LIBS = -L${top_srcdir}/auparse -lauparse +LDADD = -lpthread -lldap -llber +disp_confdir = $(sysconfdir)/audisp +plugin_confdir=$(disp_confdir)/plugins.d +racf_plugin_conf = racf.conf +racf_disp_conf = audisp-racf.conf +sbin_PROGRAMS = audisp-racf + +noinst_HEADERS = racf-log.h racf-ldap.h racf-config.h racf-queue.h +audisp_racf_SOURCES = racf-plugin.c racf-log.c racf-ldap.c racf-config.c racf-queue.c +audisp_racf_CFLAGS = -W -Wall -Wundef -D_GNU_SOURCE + +install-data-hook: + mkdir -p -m 0750 ${DESTDIR}${plugin_confdir} + $(INSTALL_DATA) -D -m 640 ${srcdir}/$(racf_plugin_conf) ${DESTDIR}${disp_confdir} + $(INSTALL_DATA) -D -m 640 ${srcdir}/$(racf_disp_conf) ${DESTDIR}${plugin_confdir} + +uninstall-hook: + rm ${DESTDIR}${plugin_confdir}/$(racf_disp_conf) + rm ${DESTDIR}${disp_confdir}/$(racf_plugin_conf) diff -purN audit-1.6.2/audit.spec audit-1.6.2_racf2/audit.spec --- audit-1.6.2/audit.spec 2007-09-25 08:46:49.000000000 -0300 +++ audit-1.6.2_racf2/audit.spec 2007-09-28 17:25:42.000000000 -0300 @@ -9,7 +9,7 @@ Group: System Environment/Daemons URL: http://people.redhat.com/sgrubb/audit/ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: gettext-devel intltool libtool swig python-devel +BuildRequires: gettext-devel intltool libtool swig python-devel openldap-devel BuildRequires: kernel-headers >= 2.6.18 BuildRequires: automake >= 1.9 BuildRequires: autoconf >= 2.59 @@ -59,6 +59,7 @@ and libauparse can be used by python. ##Group: System Environment/Daemons ##Requires: %{name} = %{version}-%{release} ##Requires: %{name}-libs = %{version}-%{release} +##Requires: openldap ##%description -n audispd-plugins ##The audispd-plugins package provides plugins for the real-time @@ -124,7 +125,10 @@ touch -r ./audit.spec $RPM_BUILD_ROOT/et # Remove the plugin stuff for now rm -f $RPM_BUILD_ROOT/etc/audisp/plugins.d/au-ids.conf rm -f $RPM_BUILD_ROOT/etc/audisp/plugins.d/remote.conf +rm -f $RPM_BUILD_ROOT/etc/audisp/plugins.d/audisp-racf.conf +rm -f $RPM_BUILD_ROOT/etc/audisp/racf.conf rm -f $RPM_BUILD_ROOT/sbin/audisp-ids +rm -f $RPM_BUILD_ROOT/sbin/audisp-racf %clean rm -rf $RPM_BUILD_ROOT @@ -214,7 +218,10 @@ fi ##%defattr(-,root,root,-) ##%attr(640,root,root) /etc/audisp/plugins.d/au-ids.conf ##%attr(640,root,root) /etc/audisp/plugins.d/remote.conf +##%config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/audisp-racf.conf +##%config(noreplace) %attr(640,root,root) /etc/audisp/racf.conf ##%attr(750,root,root) /sbin/audisp-ids +##%attr(750,root,root) /sbin/audisp-racf %files -n system-config-audit -f system-config-audit.lang %defattr(-,root,root,-) diff -purN audit-1.6.2/configure.ac audit-1.6.2_racf2/configure.ac --- audit-1.6.2/configure.ac 2007-09-12 14:26:41.000000000 -0300 +++ audit-1.6.2_racf2/configure.ac 2007-09-28 09:37:07.000000000 -0300 @@ -109,7 +109,7 @@ if test x$use_apparmor != xno ; then AC_DEFINE(WITH_APPARMOR,1,[Define if you want to enable AppArmor events.])fi AC_CONFIG_SUBDIRS([system-config-audit]) -AC_OUTPUT(Makefile lib/Makefile auparse/Makefile auparse/test/Makefile src/Makefile src/mt/Makefile swig/Makefile docs/Makefile init.d/Makefile audisp/Makefile audisp/plugins/Makefile audisp/plugins/builtins/Makefile audisp/plugins/ids/Makefile audisp/plugins/remote/Makefile bindings/Makefile bindings/python/Makefile) +AC_OUTPUT(Makefile lib/Makefile auparse/Makefile auparse/test/Makefile src/Makefile src/mt/Makefile swig/Makefile docs/Makefile init.d/Makefile audisp/Makefile audisp/plugins/Makefile audisp/plugins/builtins/Makefile audisp/plugins/ids/Makefile audisp/plugins/remote/Makefile audisp/plugins/racf/Makefile bindings/Makefile bindings/python/Makefile) echo . echo " -- .:klaus h kiwi <klausk@br.ibm.com>:. ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2007-09-28 20:44 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1190983565.4113.2.camel@klausk.br.ibm.com>
2007-09-28 13:28 ` [PATCH 01/07][RFC] RACF audit plugin - configuration files Klaus Heinrich Kiwi
[not found] ` <1190983925.4113.8.camel@klausk.br.ibm.com>
2007-09-28 13:28 ` [PATCH 02/07][RFC] RACF audit plugin - configuration interface Klaus Heinrich Kiwi
[not found] ` <1190984128.4113.12.camel@klausk.br.ibm.com>
2007-09-28 13:28 ` [PATCH 03/07][RFC] RACF audit plugin - LDAP interface Klaus Heinrich Kiwi
[not found] ` <1190984843.4113.25.camel@klausk.br.ibm.com>
2007-09-28 13:28 ` [PATCH 04/07][RFC] RACF audit plugin - logging interface Klaus Heinrich Kiwi
[not found] ` <1190985127.4113.32.camel@klausk.br.ibm.com>
2007-09-28 13:28 ` [PATCH 05/07][RFC] RACF audit plugin - queue interface Klaus Heinrich Kiwi
[not found] ` <1190985276.4113.35.camel@klausk.br.ibm.com>
2007-09-28 13:28 ` [PATCH 06/07][RFC] RACF audit plugin - plugin main code Klaus Heinrich Kiwi
[not found] ` <1190985692.4113.42.camel@klausk.br.ibm.com>
2007-09-28 13:28 ` [PATCH 07/07][RFC] RACF audit plugin - build and packaging integration Klaus Heinrich Kiwi
2007-09-28 20:43 ` Klaus Heinrich Kiwi
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox