head	1.4;
access;
symbols
	pkgsrc-2013Q2:1.4.0.38
	pkgsrc-2013Q2-base:1.4
	pkgsrc-2012Q4:1.4.0.36
	pkgsrc-2012Q4-base:1.4
	pkgsrc-2011Q4:1.4.0.34
	pkgsrc-2011Q4-base:1.4
	pkgsrc-2011Q2:1.4.0.32
	pkgsrc-2011Q2-base:1.4
	pkgsrc-2009Q4:1.4.0.30
	pkgsrc-2009Q4-base:1.4
	pkgsrc-2008Q4:1.4.0.28
	pkgsrc-2008Q4-base:1.4
	pkgsrc-2008Q3:1.4.0.26
	pkgsrc-2008Q3-base:1.4
	cube-native-xorg:1.4.0.24
	cube-native-xorg-base:1.4
	pkgsrc-2008Q2:1.4.0.22
	pkgsrc-2008Q2-base:1.4
	pkgsrc-2008Q1:1.4.0.20
	pkgsrc-2008Q1-base:1.4
	pkgsrc-2007Q4:1.4.0.18
	pkgsrc-2007Q4-base:1.4
	pkgsrc-2007Q3:1.4.0.16
	pkgsrc-2007Q3-base:1.4
	pkgsrc-2007Q2:1.4.0.14
	pkgsrc-2007Q2-base:1.4
	pkgsrc-2007Q1:1.4.0.12
	pkgsrc-2007Q1-base:1.4
	pkgsrc-2006Q4:1.4.0.10
	pkgsrc-2006Q4-base:1.4
	pkgsrc-2006Q3:1.4.0.8
	pkgsrc-2006Q3-base:1.4
	pkgsrc-2006Q2:1.4.0.6
	pkgsrc-2006Q2-base:1.4
	pkgsrc-2006Q1:1.4.0.4
	pkgsrc-2006Q1-base:1.4
	pkgsrc-2005Q4:1.4.0.2
	pkgsrc-2005Q4-base:1.4
	pkgsrc-2005Q3:1.2.0.2
	pkgsrc-2005Q3-base:1.2;
locks; strict;
comment	@# @;


1.4
date	2005.10.20.20.26.32;	author jlam;	state dead;
branches;
next	1.3;

1.3
date	2005.09.30.13.02.28;	author salo;	state Exp;
branches;
next	1.2;

1.2
date	2005.09.11.19.58.46;	author adrianp;	state Exp;
branches;
next	1.1;

1.1
date	2005.08.29.15.53.24;	author adrianp;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Update mail/sqwebmail to 5.0.6.  Changes from version 5.0.4 include:

	* Use PCRE for pattern-matching

	* When autopurging messages from a folder based on their
	  timestamp, scan 'new' in addition to 'cur', otherwise mail
	  delivered to the folder directly never gets purged, unless
	  the folder is open.

	* Filter out <!-- > constructs, they are parsed by MSIE.

	* Remove attributes with imbalanced quotes, to prevent
	  cross-side scripting vulnerabilities with some browsers.

	* Show each attachment's MIME content type.
@
text
@$NetBSD: patch-al,v 1.3 2005/09/30 13:02:28 salo Exp $

--- sqwebmail/html.c.orig	2003-10-06 01:16:13.000000000 +0100
+++ sqwebmail/html.c	2005-09-05 18:05:59.000000000 +0100
@@@@ -187,9 +187,16 @@@@
 					if (tai)	++tai->tagvaluelen;
 				}
 				if (*p)	p++;
+				else
+				{
+					memset(tagbuf, ' ', strlen(tagbuf));
+				}
 			}
 			else
 			{
+				if (c == 0)
+					memset(tagbuf, ' ', strlen(tagbuf));
+
 				if (tai)
 				{
 					tai->tagvalue=p;
@@@@ -222,6 +229,31 @@@@
 	while ((p=strchr(tagbuf, '<')) != NULL)
 		*p=' ';
 
+	for (p=tagbuf; *p; p++)
+	{
+		char *q;
+
+		if (*p != '&')
+			continue;
+
+		q=p;
+
+		++p;
+
+		while (*p)
+		{
+			if (strchr("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789", *p) == NULL)
+				break;
+			++p;
+		}
+
+		if (*p != ';')
+		{
+			*q=0;
+		}
+		--p;
+	}
+
         tagattrlen=parseattr(0);
         if ( tagattrlen > tagattrsize)
         {
@@@@ -285,7 +317,9 @@@@
 	incomment,		/* <!--, in a comment, have not seen any
 				dashes */
 	incommentseendash,	/* In a comment, seen - */
-	incommentseendashdash	/* In a comment, seen -- */
+	incommentseendashdash,	/* In a comment, seen -- */
+
+	skiptag			/* Ignore <!tag> */
 	} ;
 
 static enum htmlstate cur_state;
@@@@ -385,7 +419,7 @@@@
 		case intag:
 			/* We're in a tag (not a <!-- comment)
 			collect the contents in tagbuf, until > is seen */
-do_intag:
+
 			cur_state=intag;
 			if (p[l] == '>')
 			{
@@@@ -397,9 +431,21 @@@@
 			addtagbuf(p[l]);
 			continue;
 
+		case skiptag:
+			if (p[l] == '>')
+			{
+				start=l+1;
+				cur_state=intext;
+			}
+			continue;
 		case seenltbang:
 			/* We have <!.  If - is not here, this is a SGML tag */
-			if (p[l] != '-')	goto do_intag;
+			if (p[l] != '-')
+			{
+				cur_state=skiptag;
+				continue;
+			}
+
 			addtagbuf(p[l]);
 			cur_state=seenltbangdash;
 			continue;
@@@@ -410,9 +456,12 @@@@
 			otherweise we're in a comment, which we can pass
 			along */
 
-			if (p[l] != '-')	goto do_intag;
-			if (!skipping())
-				(*htmlfiltered_func)("<!--", 4);
+			if (p[l] != '-')
+			{
+				cur_state=skiptag;
+				continue;
+			}
+
 			start=l+1;
 			cur_state=incomment;
 			continue;
@@@@ -433,8 +482,6 @@@@
 				cur_state=incomment;
 				continue;
 			}
-			if (!skipping())
-				(*htmlfiltered_func)(p+start, l+1-start);
 			cur_state=intext;
 			start=l+1;
 			continue;
@@@@ -446,9 +493,6 @@@@
 
 	switch (cur_state)	{
 	case intext:
-	case incomment:
-	case incommentseendash:
-	case incommentseendashdash:
 		if (!skipping())
 			(*htmlfiltered_func)(p+start, l-start);
 	default:
@


1.3
log
@Add rcsid. (hi adrianp!)
@
text
@d1 1
a1 1
$NetBSD$
@


1.2
log
@Fix for security issue: http://secunia.com/advisories/16704/
Bump to nb2
@
text
@d1 2
@


1.1
log
@Bump to nb1 for inclusion of patches to address security issue.
@
text
@a0 2
$NetBSD$

d2 2
a3 2
+++ sqwebmail/html.c
@@@@ -187,9 +187,16 @@@@ char *p;
d20 1
a20 1
@@@@ -222,6 +229,31 @@@@ static void parsetagbuf()
d52 78
@