From abb083302cbd45e62bbb861d870a44d92f7e6155 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 30 Aug 2008 13:44:57 +0000 Subject: [PATCH] Re-diffed dsniff url log escaping patch for no fuzz --- dsniff-2.4-urlsnarf_escape.patch | 12 ++++++------ dsniff.spec | 5 ++++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dsniff-2.4-urlsnarf_escape.patch b/dsniff-2.4-urlsnarf_escape.patch index 6b387a5..4e9dfc0 100644 --- a/dsniff-2.4-urlsnarf_escape.patch +++ b/dsniff-2.4-urlsnarf_escape.patch @@ -2,8 +2,8 @@ Patch by Hilko Bengen 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); + diff --git a/dsniff.spec b/dsniff.spec index 2be9a74..820e2fb 100644 --- a/dsniff.spec +++ b/dsniff.spec @@ -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 2.4-0.4.b1 +- Re-diffed dsniff url log escaping patch for no fuzz + * Wed May 29 2008 Robert Scheck 2.4-0.3.b1 - Rebuild against libnids 1.23