Pullup ticket 886 - requested by Lubomir Sedlacik

security fix for libwww

Revisions pulled up:
- pkgsrc/www/libwww/Makefile		1.62
- pkgsrc/www/libwww/distinfo		1.21
- pkgsrc/www/libwww/patches/patch-ap	1.1

   Module Name:    pkgsrc
   Committed By:   salo
   Date:           Thu Nov  3 15:51:59 UTC 2005

   Modified Files:
           pkgsrc/www/libwww: Makefile distinfo
   Added Files:
           pkgsrc/www/libwww/patches: patch-ap

   Log Message:
   Security fix for SA17119:

   "A vulnerability was found in W3C Libwww, which potentially can be
   exploited by malicious people to cause a DoS (Denial of Service).

   The vulnerability is caused due to a boundary error in the
   "HTBoundary_put_block()" function when processing multipart MIME data.
   This may be exploited to cause an illegal memory access past the end of
   the input buffer via specially crafted multipart MIME data.

   Successful exploitation can potentially cause an application that uses
   Libwww to crash."

   http://secunia.com/advisories/17119/
   https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=159597

   Bump PKGREVISION.
   Patch from RedHat.

3 files changed, 528 insertions, 3 deletions

diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index 16f4d35568a..6debd2ad539 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.61 2005/05/31 20:51:59 salo Exp $
+# $NetBSD: Makefile,v 1.61.4.1 2005/11/05 17:25:26 snj Exp $
 
 DISTNAME=		w3c-libwww-5.4.0
 PKGNAME=		libwww-5.4.0
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		www devel
 MASTER_SITES=		http://www.w3.org/Library/Distribution/ \
 			ftp://ftp.uni-hannover.de/pub/mirror/info-systems/WWW/libwww/
diff --git a/www/libwww/distinfo b/www/libwww/distinfo
index e1f3bda718f..11756d34e12 100644
--- a/www/libwww/distinfo
+++ b/www/libwww/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2005/05/31 20:51:46 salo Exp $
+$NetBSD: distinfo,v 1.20.4.1 2005/11/05 17:25:26 snj Exp $
 
 SHA1 (w3c-libwww-5.4.0.tgz) = 2394cb4e0dc4e2313a9a0ddbf508e4b726e9af63
 RMD160 (w3c-libwww-5.4.0.tgz) = 12e55ecb2435f9048d627e56f8ae60d4c246648b
@@ -19,3 +19,4 @@ SHA1 (patch-al) = dae1e731f7a9ff36ef1f60f2a4a6cc97e359ae63
 SHA1 (patch-am) = 8252ce567efc056daa10af39eeca314f9a915f90
 SHA1 (patch-an) = e7195c25ce08e13e0c8b64b05b737e9a5f5157a8
 SHA1 (patch-ao) = fa5c98f6c4e873f816e5a5bc48481d1462c946dc
+SHA1 (patch-ap) = 506ee8ddd2e627aa6ba84b933ca39a6934b95689
diff --git a/www/libwww/patches/patch-ap b/www/libwww/patches/patch-ap
new file mode 100644
index 00000000000..0510cbe53fd
--- /dev/null
+++ b/www/libwww/patches/patch-ap
@@ -0,0 +1,524 @@
+$NetBSD: patch-ap,v 1.1.2.2 2005/11/05 17:25:26 snj Exp $
+
+--- Library/src/HTBound.c.orig	1999-02-22 23:10:10.000000000 +0100
++++ Library/src/HTBound.c	2005-11-03 16:43:25.000000000 +0100
+@@ -11,9 +11,12 @@
+ **
+ ** Authors
+ **	HF	Henrik Frystyk <frystyk@w3.org>
++**      SV      Sam Varshavchik <mrsam@courier-mta.com>
+ **
+ ** History:
+ **	Nov 95	Written from scratch
++**   SV Jun 05  Rewrote HTBoundary_put_block.  Fixed many bugs+segfaults.
++**   SV Jul 05  Fix double-counting of processed bytes.
+ **
+ */
+ 
+@@ -23,104 +26,395 @@
+ #include "WWWCore.h"
+ #include "HTMerge.h"
+ #include "HTReqMan.h"
++#include "HTNetMan.h"
++#include "HTChannl.h"
+ #include "HTBound.h"					 /* Implemented here */
+ 
+-#define PUTBLOCK(b, l)	(*me->target->isa->put_block)(me->target, b, l)
++#define PUTBLOCK(b, l)	(me->target ? (*me->target->isa->put_block)(me->target, b, l):HT_OK)
++
+ #define PUTDEBUG(b, l)	(*me->debug->isa->put_block)(me->debug, b, l)
+ #define FREE_TARGET	(*me->target->isa->_free)(me->target)
+ 
+ struct _HTStream {
+     const HTStreamClass *	isa;
++    HTNet *                      net;
+     HTStream *			target;
+     HTStream *			orig_target;
+     HTFormat			format;
+     HTStream *			debug;		  /* For preamble and epilog */
+     HTRequest *			request;
+-    BOOL			body;		  /* Body or preamble|epilog */
+-    HTEOLState			state;
+-    int				dash;			 /* Number of dashes */
+     char *			boundary;
+-    char *			bpos;
++
++    BOOL                        keptcrlf;
++    int                         (*state)(HTStream *, const char *, int);
++
++    char                        *boundary_ptr;
++
+ };
+ 
++PRIVATE int HTBoundary_flush (HTStream * me);
++
+ /* ------------------------------------------------------------------------- */
+ 
++PRIVATE int start_of_line (HTStream * me, const char * b, int l);
++PRIVATE int seen_dash (HTStream * me, const char * b, int l);
++PRIVATE int seen_doubledash (HTStream * me, const char * b, int l);
++PRIVATE int seen_delimiter_nonterminal(HTStream * me, const char * b, int l);
++PRIVATE int seen_delimiter_nonterminal_CR(HTStream * me, const char * b, int l);
++PRIVATE int seen_delimiter_dash(HTStream * me, const char * b, int l);
++PRIVATE int seen_delimiter_terminal(HTStream * me, const char * b, int l);
++PRIVATE int seen_delimiter_terminal_CR(HTStream * me, const char * b, int l);
++PRIVATE int not_delimiter(HTStream * me, const char * b, int l, int extra);
++PRIVATE int seen_nothing(HTStream * me, const char * b, int l);
++PRIVATE int seen_cr(HTStream * me, const char * b, int l);
++PRIVATE void process_boundary(HTStream *me, int isterminal);
++
++#define UNUSED(l) (l=l)    /* Shut up about unused variables */
++
+ PRIVATE int HTBoundary_put_block (HTStream * me, const char * b, int l)
+ {
+-    const char *start = b;
+-    const char *end = b;
+-    while (l-- > 0) {
+-	if (me->state == EOL_FCR) {
+-	    me->state = (*b == LF) ? EOL_FLF : EOL_BEGIN;
+-	} else if (me->state == EOL_FLF) {
+-	    if (me->dash == 2) {
+-		while (l>0 && *me->bpos && *me->bpos==*b) l--, me->bpos++, b++;
+-		if (!*me->bpos) {
+-		    HTTRACE(STREAM_TRACE, "Boundary.... `%s\' found\n" _ me->boundary);
+-		    me->bpos = me->boundary;
+-		    me->body = YES;
+-		    me->state = EOL_DOT;
+-		} else if (l>0) {
+-		    me->dash = 0;
+-		    me->bpos = me->boundary;
+-		    me->state = EOL_BEGIN;
+-		}
+-	    }
+-	    if (*b == '-') {
+-		me->dash++;
+-	    } else if (*b != CR && *b != LF) {
+-		me->dash = 0;
+-		me->state = EOL_BEGIN;
+-	    }
+-	} else if (me->state == EOL_SLF) {	    /* Look for closing '--' */
+-	    if (me->dash == 4) {
+-		if (end > start) {
+-		    int status = PUTBLOCK(start, end-start);
+-		    if (status != HT_OK) return status;
+-		}
+-		HTTRACE(STREAM_TRACE, "Boundary.... Ending\n");
+-		start = b;
+-		me->dash = 0;
+-		me->state = EOL_BEGIN;
+-	    }
+-	    if (*b == '-') {
+-		me->dash++;
+-	    } else if (*b != CR && *b != LF) {
+-		me->dash = 0;
+-		me->state = EOL_BEGIN;
+-	    }
+-	    me->body = NO;
+-	} else if (me->state == EOL_DOT) {
+-	    int status;
+-	    if (me->body) {
+-		if (me->target) FREE_TARGET;
+-		me->target = HTStreamStack(WWW_MIME,me->format,
+-					   HTMerge(me->orig_target, 2),
+-					   me->request, YES);
+-		if (end > start) {
+-		    if ((status = PUTBLOCK(start, end-start)) != HT_OK)
+-			return status;
++	/*
++	** The HTBoundary object gets attached downstream of HTMime.
++	** The HTBoundary object creates another HTMime object downstream of
++	** the HTBoundary object.
++	**
++	** When we push data downstream to the second HTBoundary object, it
++	** updates the bytes read count in the HTNet object.
++	**
++	** When we return to the parent HTMime object, itupdates the
++	** bytes read count in the HTNet object again.  Oops.
++	**
++	** Same thing happens with the consumed byte count.  We can prevent
++	** the consumed byte counts from being updated by temporary setting
++	** the input channel stream pointer to NULL, but for the byte counts
++	** we have to save them and restore them before existing.
++	**
++	** This bug was discovered by chance when a multipart/partial response
++	** was partially received, and as a result of double-counting the
++	** real response got cut off (because HTMime thought that more bytes
++	** were processed than actually were, thus it processed only the
++	** partial count of the remaining bytes in the response).  When the
++	** multipart/partial response was received all at once this bug did
++	** not get triggered.
++	*/
++
++	HTHost *host=HTNet_host(me->net);
++	HTChannel *c=HTHost_channel(host);
++	HTInputStream *i=HTChannel_input(c);
++
++	long saveBytesRead=HTNet_bytesRead(me->net);
++	long saveHeaderBytesRead=HTNet_headerBytesRead(me->net);
++
++	if (i)
++		HTChannel_setInput(c, NULL);
++
++	HTTRACE(STREAM_TRACE, "Boundary: processing %d bytes\n" _ l);
++	/* Main loop consumes all input */
++
++	while (l)
++	{
++		int n= (*me->state)(me, b, l);
++
++		if (n == 0)
++			return HT_ERROR;
++		b += n;
++		l -= n;
++	}
++
++	if (i)
++		HTChannel_setInput(c, i);
++	HTNet_setBytesRead(me->net, saveBytesRead);
++	HTNet_setHeaderBytesRead(me->net, saveHeaderBytesRead);
++
++	return HT_OK;
++}
++
++/*
++** Start of line, keptcrlf=YES if we've kept the preceding CRLF from downstream
++** and we'll pass it along if we decide that this is not a boundary delimiter.
++*/
++
++PRIVATE int start_of_line (HTStream * me, const char * b, int l)
++{
++	if (*b != '-')
++		return not_delimiter(me, b, l, 0);
++
++	HTTRACE(STREAM_TRACE, "Boundary: start of line: input '-'\n");
++
++	me->state= seen_dash;
++
++	return 1;
++}
++
++/*
++** Line: -
++*/
++
++PRIVATE int seen_dash (HTStream * me, const char * b, int l)
++{
++	if (*b != '-')
++		return not_delimiter(me, b, l, 1);
++
++	HTTRACE(STREAM_TRACE, "Boundary: start of line: input '--'\n");
++
++	me->state= seen_doubledash;
++	me->boundary_ptr=me->boundary;
++	return 1;
++}
++
++/*
++** Line: --
++*/
++
++PRIVATE int seen_doubledash (HTStream * me, const char * b, int l)
++{
++	me->state=seen_doubledash;
++
++	if (*me->boundary_ptr)
++	{
++		if (*b != *me->boundary_ptr)
++		{
++			return not_delimiter(me, b, l,
++					     me->boundary_ptr - me->boundary
++					     + 2);
+ 		}
+-	    } else {
+-		if (me->debug)
+-		    if ((status = PUTDEBUG(start, end-start)) != HT_OK)
+-			return status;
++		++me->boundary_ptr;
++		return 1;
+ 	    }
+-	    start = b;
+-	    if (*b == '-') me->dash++;
+-	    me->state = EOL_SLF;
+-	} else if (*b == CR) {
+-	    me->state = EOL_FCR;
+-	    end = b;
+-	} else if (*b == LF) {
+-	    if (me->state != EOL_FCR) end = b;
+-	    me->state = EOL_FLF;
++
++	/*
++	** Line: --delimiter
++	*/
++
++	if (*b == '-')
++	{
++		HTTRACE(STREAM_TRACE,
++			"Boundary: start of line: input '--%s-'\n"
++			_ me->boundary);
++
++		me->state=seen_delimiter_dash;
++		return 1;
+ 	}
+-	b++;
++
++	HTTRACE(STREAM_TRACE,
++		"Boundary: Found: '--%s'\n" _ me->boundary);
++	
++	return seen_delimiter_nonterminal(me, b, l);
++}
++
++/*
++** Line: --delimiter
++**
++** Waiting for CRLF.
++*/
++
++
++PRIVATE int seen_delimiter_nonterminal(HTStream * me, const char * b, int l)
++{
++	UNUSED(l);
++
++	me->state=seen_delimiter_nonterminal;
++	if (*b == CR)
++		me->state=seen_delimiter_nonterminal_CR;
++
++	return 1;
++}
++
++/*
++** Line: --delimiter<CR>
++*/
++
++PRIVATE int seen_delimiter_nonterminal_CR(HTStream * me, const char * b, int l)
++{
++	HTTRACE(STREAM_TRACE,
++		"Boundary: Found: '--%s<CR>'\n" _ me->boundary);
++	
++	if (*b != LF)
++		return seen_delimiter_nonterminal(me, b, l);
++
++	HTTRACE(STREAM_TRACE,
++		"Boundary: Found: '--%s<CR><LF>'\n" _ me->boundary);
++	
++	process_boundary(me, NO);
++	return 1;
++}
++
++/*
++** Line: --delimiter-
++*/
++
++PRIVATE int seen_delimiter_dash(HTStream * me, const char * b, int l)
++{
++	if (*b != '-')
++		return seen_delimiter_nonterminal(me, b, l);
++
++	HTTRACE(STREAM_TRACE,
++		"Boundary: start of line: input '--%s--'\n"
++		_ me->boundary);
++	
++	me->state=seen_delimiter_terminal;
++	return 1;
++}
++
++/*
++** Line: --delimiter--
++*/
++
++PRIVATE int seen_delimiter_terminal(HTStream * me, const char * b, int l)
++{
++	UNUSED(l);
++
++	me->state=seen_delimiter_terminal;
++
++	if (*b == CR)
++		me->state=seen_delimiter_terminal_CR;
++	return 1;
++}
++/*
++** Line: --delimiter--<CR>
++*/
++
++PRIVATE int seen_delimiter_terminal_CR(HTStream * me, const char * b, int l)
++{
++	HTTRACE(STREAM_TRACE,
++		"Boundary: Found '--%s--<CR>'\n"
++		_ me->boundary);
++	
++	if (*b != LF)
++		return seen_delimiter_terminal(me, b, l);
++	HTTRACE(STREAM_TRACE,
++		"Boundary: Found '--%s--<CR><LF>'\n"
++		_ me->boundary);
++	
++	process_boundary(me, YES);
++	return 1;
++}
++
++/*
++** Beginning of the line does not contain a delimiter.
++**
++**
++** extra: Count of characters in a partially matched delimiter.  Since it's
++** not a delimiter this is content that needs to go downstream.
++*/
++
++PRIVATE int not_delimiter(HTStream * me, const char * b, int l, int extra)
++{
++	HTTRACE(STREAM_TRACE, "Boundary: not a delimiter line\n");
++	
++	if (me->keptcrlf)
++	{
++		HTTRACE(STREAM_TRACE, "Boundary: Sending previous line's <CR><LF>\n");
++		/*
++		** Did not process CRLF from previous line, because prev CRLF
++		** is considered a part of the delimiter.  See MIME RFC.
++		*/
++
++		me->keptcrlf=NO;
++		if (PUTBLOCK("\r\n", 2) != HT_OK)
++			return 0;
++	}
++
++	/*
++	** Potentially matched some of: --DELIMITER
++	*/
++
++	if (extra)
++	{
++		HTTRACE(STREAM_TRACE, "Boundary: Sending partially-matched %d characters\n" _ extra);
++
++		if (PUTBLOCK("--", extra > 2 ? 2:extra) != HT_OK)
++			return 0;
++
++		if (extra > 2)
++			if (PUTBLOCK(me->boundary, extra-2) != HT_OK)
++				return 0;
++	}
++	return seen_nothing(me, b, l);
++}
++
++/*
++** We're not looking for a delimiter.  Look for the next line of input
++** in the data that could potentially be a delimiter.
++*/
++
++PRIVATE int seen_nothing(HTStream * me, const char * b, int l)
++{
++	int i;
++
++	me->state=seen_nothing;
++
++	for (i=0; i<l; i++)
++	{
++		if (b[i] != CR)
++			continue;
++
++		/*
++		** If we have at least four more characters in unconsumed
++		** input, and they're not \r\n--, we can safely skip over
++		** them.
++		*/
++
++		if (l-i > 4 &&
++		    strncmp(b+i, "\r\n--", 4))
++			continue;
++		break;
++	}
++
++	if (i == 0)
++	{
++		/* Could only be a CR here. */
++
++		me->state=seen_cr;
++		return 1;
++	}
++
++	HTTRACE(STREAM_TRACE, "Boundary: Processed %d (out of %d) bytes\n"
++		_ i _ l);
++
++	if (PUTBLOCK(b, i) != HT_OK)
++		return 0;
++
++	return i;
++}
++
++/*
++** State: seen a CR
++*/
++
++PRIVATE int seen_cr(HTStream * me, const char * b, int l)
++{
++	HTTRACE(STREAM_TRACE, "Boundary: Processed <CR>\n");
++
++	if (*b != LF)
++	{
++		HTTRACE(STREAM_TRACE, "Boundary: ... <LF> didn't follow\n");
++		if (PUTBLOCK("\r", 1) != HT_OK)
++			return 0;
++		return seen_nothing(me, b, l);
+     }
+-    return (start<b && me->body) ? PUTBLOCK(start, b-start) : HT_OK;
++
++	HTTRACE(STREAM_TRACE, "Boundary: Processed <CR><LF>\n");
++	me->state=start_of_line;
++	me->keptcrlf=YES;
++	return 1;
++}
++
++PRIVATE void process_boundary(HTStream *me, int isterminal)
++{
++	HTBoundary_flush(me);
++	if (me->target) FREE_TARGET;
++	me->target=NULL;
++	me->state=start_of_line;
++	me->keptcrlf=NO;
++
++	if (!isterminal)
++		me->target = HTStreamStack(WWW_MIME,me->format,
++					   HTMerge(me->orig_target, 2),
++					   me->request, YES);
+ }
+ 
++
+ PRIVATE int HTBoundary_put_string (HTStream * me, const char * s)
+ {
+     return HTBoundary_put_block(me, s, (int) strlen(s));
+@@ -133,6 +427,8 @@
+ 
+ PRIVATE int HTBoundary_flush (HTStream * me)
+ {
++	if (me->target == NULL)
++		return HT_OK;
+     return (*me->target->isa->flush)(me->target);
+ }
+ 
+@@ -182,18 +478,26 @@
+ 	HTResponse_formatParam(response) :
+ 	HTAnchor_formatParam(anchor);
+     char * boundary = HTAssocList_findObject(type_param, "boundary");
++
++    UNUSED(param);
++    UNUSED(input_format);
++
+     if (boundary) {
+ 	HTStream * me;
+ 	if ((me = (HTStream  *) HT_CALLOC(1, sizeof(HTStream))) == NULL)
+ 	    HT_OUTOFMEM("HTBoundary");
+ 	me->isa = &HTBoundaryClass;
++	me->net = HTRequest_net(request);
+ 	me->request = request;
+ 	me->format = output_format;
+ 	me->orig_target = output_stream;
+ 	me->debug = HTRequest_debugStream(request);
+-	me->state = EOL_FLF;
++
++	me->state = start_of_line;
++	me->keptcrlf=NO;
++
+ 	StrAllocCopy(me->boundary, boundary);		       /* Local copy */
+-	me->bpos = me->boundary;
++
+ 	HTTRACE(STREAM_TRACE, "Boundary.... Stream created with boundary '%s\'\n" _ me->boundary);
+ 	return me;
+     } else {