Re-diffed dsniff url log escaping patch for no fuzz

This commit is contained in:
Robert Scheck 2008-08-30 13:44:57 +00:00
parent 55bf1c65c1
commit abb083302c
2 changed files with 10 additions and 7 deletions

View File

@ -2,8 +2,8 @@ Patch by Hilko Bengen <bengen@debian.org> for dsniff >= 2.4b1, which adds
escaping for user, vhost, uri, referrer and agent strings in the log. For
further information, please have a look to Debian bug ID #372536.
--- dsniff-2.4b1/urlsnarf.c 2006-11-27 17:09:54.000000000 +0100
+++ dsniff-2.4b1/urlsnarf.c.escape 2006-11-27 17:08:41.000000000 +0100
--- dsniff-2.4b1/urlsnarf.c 2008-08-30 15:34:21.000000000 +0200
+++ dsniff-2.4b1/urlsnarf.c.escape 2008-08-30 15:38:46.000000000 +0200
@@ -84,6 +84,43 @@
return (tstr);
}
@ -60,19 +60,18 @@ further information, please have a look to Debian bug ID #372536.
- referer = "-";
- if (agent == NULL)
- agent = "-";
-
+ user = escape_log_entry(user);
+ vhost = escape_log_entry(vhost);
+ uri = escape_log_entry(uri);
+ referer = escape_log_entry(referer);
+ agent = escape_log_entry(agent);
+
printf("%s - %s [%s] \"%s http://%s%s\" - - \"%s\" \"%s\"\n",
libnet_addr2name4(addr->saddr, Opt_dns),
- user, timestamp(), req, vhost, uri, referer, agent);
+ (user?user:"-"),
+ timestamp(), req,
+ (vhost?vhost:libnet_addr2name4(addr->daddr, Opt_dns)),
+ timestamp(), req,
+ (vhost?vhost:libnet_addr2name4(addr->daddr, Opt_dns)),
+ uri,
+ (referer?referer:"-"),
+ (agent?agent:"-"));
@ -84,3 +83,4 @@ further information, please have a look to Debian bug ID #372536.
+ free(agent);
}
fflush(stdout);

View File

@ -1,7 +1,7 @@
Summary: Tools for network auditing and penetration testing
Name: dsniff
Version: 2.4
Release: 0.3.b1%{?dist}
Release: 0.4.b1%{?dist}
License: BSD
Group: Applications/Internet
URL: http://www.monkey.org/~dugsong/%{name}/
@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/*.8*
%changelog
* Sat Aug 30 2008 Robert Scheck <robert@fedoraproject.org> 2.4-0.4.b1
- Re-diffed dsniff url log escaping patch for no fuzz
* Wed May 29 2008 Robert Scheck <robert@fedoraproject.org> 2.4-0.3.b1
- Rebuild against libnids 1.23