Attachment #1396 for bug #1402

View | Details | Raw Unified | Return to bug 1402 | Differences between

and this patch

Lines 286-291 auth_log(Authctxt *authctxt, int authent Link Here

(-)openssh-4.7p1/auth.c.audit (+10 lines)
286	get_canonical_hostname(options.use_dns), "ssh", &loginmsg);	286	get_canonical_hostname(options.use_dns), "ssh", &loginmsg);
287	# endif	287	# endif
288	#endif	288	#endif
		289	#if HAVE_LINUX_AUDIT
		290	if (authenticated == 0 && !authctxt->postponed) {
		291	linux_audit_record_event(-1, authctxt->user, NULL,
		292	get_remote_ipaddr(), "sshd", 0);
		293	}
		294	#endif
289	#ifdef SSH_AUDIT_EVENTS	295	#ifdef SSH_AUDIT_EVENTS
290	if (authenticated == 0 && !authctxt->postponed)	296	if (authenticated == 0 && !authctxt->postponed)
291	audit_event(audit_classify_auth(method));	297	audit_event(audit_classify_auth(method));
Lines 492-497 getpwnamallow(const char *user) Link Here
492	record_failed_login(user,	498	record_failed_login(user,
493	get_canonical_hostname(options.use_dns), "ssh");	499	get_canonical_hostname(options.use_dns), "ssh");
494	#endif	500	#endif
		501	#ifdef HAVE_LINUX_AUDIT
		502	linux_audit_record_event(-1, user, NULL, get_remote_ipaddr(),
		503	"sshd", 0);
		504	#endif
495	#ifdef SSH_AUDIT_EVENTS	505	#ifdef SSH_AUDIT_EVENTS
496	audit_event(SSH_INVALID_USER);	506	audit_event(SSH_INVALID_USER);
497	#endif /* SSH_AUDIT_EVENTS */	507	#endif /* SSH_AUDIT_EVENTS */

Lines 176-181 Link Here

(-)openssh-4.7p1/loginrec.c.audit (+92 lines)
176	#include "auth.h"	176	#include "auth.h"
177	#include "buffer.h"	177	#include "buffer.h"
178		178
		179	#ifdef HAVE_LINUX_AUDIT
		180	# include <libaudit.h>
		181	#endif
		182
179	#ifdef HAVE_UTIL_H	183	#ifdef HAVE_UTIL_H
180	# include <util.h>	184	# include <util.h>
181	#endif	185	#endif
Lines 202-207 int utmp_write_entry(struct logininfo *l Link Here
202	int utmpx_write_entry(struct logininfo *li);	206	int utmpx_write_entry(struct logininfo *li);
203	int wtmp_write_entry(struct logininfo *li);	207	int wtmp_write_entry(struct logininfo *li);
204	int wtmpx_write_entry(struct logininfo *li);	208	int wtmpx_write_entry(struct logininfo *li);
		209	#ifdef HAVE_LINUX_AUDIT
		210	int linux_audit_write_entry(struct logininfo *li);
		211	#endif
205	int lastlog_write_entry(struct logininfo *li);	212	int lastlog_write_entry(struct logininfo *li);
206	int syslogin_write_entry(struct logininfo *li);	213	int syslogin_write_entry(struct logininfo *li);
207		214
Lines 440-445 login_write(struct logininfo *li) Link Here
440		447
441	/* set the timestamp */	448	/* set the timestamp */
442	login_set_current_time(li);	449	login_set_current_time(li);
		450	#ifdef HAVE_LINUX_AUDIT
		451	if (linux_audit_write_entry(li) == 0)
		452	fatal("linux_audit_write_entry failed: %s", strerror(errno));
		453	#endif
443	#ifdef USE_LOGIN	454	#ifdef USE_LOGIN
444	syslogin_write_entry(li);	455	syslogin_write_entry(li);
445	#endif	456	#endif
Lines 1394-1399 wtmpx_get_entry(struct logininfo *li) Link Here
1394	}	1405	}
1395	#endif /* USE_WTMPX */	1406	#endif /* USE_WTMPX */
1396		1407
		1408	#ifdef HAVE_LINUX_AUDIT
		1409	static void
		1410	_audit_hexscape(const char what, char where, unsigned int size)
		1411	{
		1412	const char *ptr = what;
		1413	const char *hex = "0123456789ABCDEF";
		1414
		1415	while (*ptr) {
		1416	if (ptr == '"' \|\| ptr < 0x21 \|\| *ptr > 0x7E) {
		1417	unsigned int i;
		1418	ptr = what;
		1419	for (i = 0; *ptr && i+2 < size; i += 2) {
		1420	where[i] = hex[((unsigned)ptr & 0xF0)>>4]; / Upper nibble */
		1421	where[i+1] = hex[(unsigned)ptr & 0x0F]; / Lower nibble */
		1422	ptr++;
		1423	}
		1424	where[i] = '\0';
		1425	return;
		1426	}
		1427	ptr++;
		1428	}
		1429	where[0] = '"';
		1430	if ((unsigned)(ptr - what) < size - 3)
		1431	{
		1432	size = ptr - what + 3;
		1433	}
		1434	strncpy(where + 1, what, size - 3);
		1435	where[size-2] = '"';
		1436	where[size-1] = '\0';
		1437	}
		1438
		1439	#define AUDIT_LOG_SIZE 128
		1440	#define AUDIT_ACCT_SIZE (AUDIT_LOG_SIZE - 8)
		1441
		1442	int
		1443	linux_audit_record_event(int uid, const char *username,
		1444	const char hostname, const char ip, const char *ttyn, int success)
		1445	{
		1446	char buf[AUDIT_LOG_SIZE];
		1447	int audit_fd, rc;
		1448
		1449	audit_fd = audit_open();
		1450	if (audit_fd < 0) {
		1451	if (errno == EINVAL \|\| errno == EPROTONOSUPPORT \|\|
		1452	errno == EAFNOSUPPORT)
		1453	return 1; /* No audit support in kernel */
		1454	else
		1455	return 0; /* Must prevent login */
		1456	}
		1457	if (username == NULL)
		1458	snprintf(buf, sizeof(buf), "uid=%d", uid);
		1459	else {
		1460	char encoded[AUDIT_ACCT_SIZE];
		1461	_audit_hexscape(username, encoded, sizeof(encoded));
		1462	snprintf(buf, sizeof(buf), "acct=%s", encoded);
		1463	}
		1464	rc = audit_log_user_message(audit_fd, AUDIT_USER_LOGIN,
		1465	buf, hostname, ip, ttyn, success);
		1466	close(audit_fd);
		1467	if (rc >= 0)
		1468	return 1;
		1469	else
		1470	return 0;
		1471	}
1472
1473	int
1474	linux_audit_write_entry(struct logininfo *li)
1475	{
1476	switch(li->type) {
1477	case LTYPE_LOGIN:
1478	return (linux_audit_record_event(li->uid, NULL, li->hostname,
1479	NULL, li->line, 1));
1480	case LTYPE_LOGOUT:
1481	return (1); /* We only care about logins */
1482	default:
1483	logit("%s: invalid type field", __func__);
1484	return (0);
1485	}
1486	}
1487	#endif /* HAVE_LINUX_AUDIT */
1488
1397	/**	1489	/**
1398	** Low-level libutil login() functions	1490	** Low-level libutil login() functions
1399	**/	1491	**/

Lines 1334-1339 Link Here

(-)openssh-4.7p1/config.h.in.audit (+3 lines)
1334	/* Define if you want SELinux support. */	1334	/* Define if you want SELinux support. */
1335	#undef WITH_SELINUX	1335	#undef WITH_SELINUX
1336		1336
		1337	/* Define if you want Linux audit support. */
		1338	#undef HAVE_LINUX_AUDIT
		1339
1337	/* Define to 1 if your processor stores words with the most significant byte	1340	/* Define to 1 if your processor stores words with the most significant byte
1338	first (like Motorola and SPARC, unlike Intel and VAX). */	1341	first (like Motorola and SPARC, unlike Intel and VAX). */
1339	#undef WORDS_BIGENDIAN	1342	#undef WORDS_BIGENDIAN

Lines 127-131 char line_stripname(char dst, const ch Link Here

(-)openssh-4.7p1/loginrec.h.audit (+4 lines)
127	char line_abbrevname(char dst, const char *src, int dstsize);	127	char line_abbrevname(char dst, const char *src, int dstsize);
128		128
129	void record_failed_login(const char , const char , const char *);	129	void record_failed_login(const char , const char , const char *);
		130	#ifdef HAVE_LINUX_AUDIT
		131	int linux_audit_record_event(int uid, const char *username,
		132	const char hostname, const char ip, const char *ttyn, int success);
		133	#endif /* HAVE_LINUX_AUDIT */
130		134
131	#endif /* _HAVE_LOGINREC_H_ */	135	#endif /* _HAVE_LOGINREC_H_ */




	fi ]
)

# Check whether user wants Linux audit support
LINUX_AUDIT_MSG="no"
AC_ARG_WITH(linux-audit,
	[  --with-linux-audit   Enable Linux audit support],
	[ if test "x$withval" != "xno" ; then
		AC_DEFINE(HAVE_LINUX_AUDIT,1,[Define if you want Linux audit support.])
		LINUX_AUDIT_MSG="yes"
		AC_CHECK_HEADERS(libaudit.h)
		SSHDLIBS="$SSHDLIBS -laudit"
	fi ]
)

# Check whether user wants Kerberos 5 support
KRB5_MSG="no"
AC_ARG_WITH(kerberos5,

echo "                   OSF SIA support: $SIA_MSG"
echo "                 KerberosV support: $KRB5_MSG"
echo "                   SELinux support: $SELINUX_MSG"
echo "               Linux audit support: $LINUX_AUDIT_MSG"
echo "                 Smartcard support: $SCARD_MSG"
echo "                     S/KEY support: $SKEY_MSG"
echo "              TCP Wrappers support: $TCPW_MSG"

Return to bug 1402

Lines 3218-3223 AC_ARG_WITH(selinux, Link Here

(-)openssh-4.7p1/configure.ac.audit (+13 lines)
3218	fi ]	3218	fi ]
3219	)	3219	)
3220		3220
		3221	# Check whether user wants Linux audit support
		3222	LINUX_AUDIT_MSG="no"
		3223	AC_ARG_WITH(linux-audit,
		3224	[ --with-linux-audit Enable Linux audit support],
		3225	[ if test "x$withval" != "xno" ; then
		3226	AC_DEFINE(HAVE_LINUX_AUDIT,1,[Define if you want Linux audit support.])
		3227	LINUX_AUDIT_MSG="yes"
		3228	AC_CHECK_HEADERS(libaudit.h)
		3229	SSHDLIBS="$SSHDLIBS -laudit"
		3230	fi ]
		3231	)
		3232
3221	# Check whether user wants Kerberos 5 support	3233	# Check whether user wants Kerberos 5 support
3222	KRB5_MSG="no"	3234	KRB5_MSG="no"
3223	AC_ARG_WITH(kerberos5,	3235	AC_ARG_WITH(kerberos5,
Lines 4039-4044 echo " PAM support Link Here
4039	echo " OSF SIA support: $SIA_MSG"	4051	echo " OSF SIA support: $SIA_MSG"
4040	echo " KerberosV support: $KRB5_MSG"	4052	echo " KerberosV support: $KRB5_MSG"
4041	echo " SELinux support: $SELINUX_MSG"	4053	echo " SELinux support: $SELINUX_MSG"
		4054	echo " Linux audit support: $LINUX_AUDIT_MSG"
4042	echo " Smartcard support: $SCARD_MSG"	4055	echo " Smartcard support: $SCARD_MSG"
4043	echo " S/KEY support: $SKEY_MSG"	4056	echo " S/KEY support: $SKEY_MSG"
4044	echo " TCP Wrappers support: $TCPW_MSG"	4057	echo " TCP Wrappers support: $TCPW_MSG"