Merge branch 'patterns' of github.com:/semarie/httpd into semarie-patterns

5 files changed, 233 insertions, 3 deletions

diff --git a/httpd/patterns.c b/httpd/patterns.c
index 8fbaa28..1dbea15 100644
--- a/httpd/patterns.c
+++ b/httpd/patterns.c
@@ -215,7 +215,7 @@ matchbalance(struct match_state *ms, const char *s, const char *p)
 {
 	if (p >= ms->p_end - 1) {
 		match_error(ms,
-		    "malformed pattern (missing arguments to '%%b')");
+		    "malformed pattern (missing arguments to '%b')");
 		return (NULL);
 	}
 	if (*s != *p)
@@ -308,6 +308,8 @@ match_capture(struct match_state *ms, const char *s, int l)
 {
 	size_t len;
 	l = check_capture(ms, l);
+	if (l == -1)
+		return NULL;
 	len = ms->capture[l].len;
 	if ((size_t) (ms->src_end - s) >= len &&
 	    memcmp(ms->capture[l].init, s, len) == 0)
@@ -370,7 +372,7 @@ match(struct match_state *ms, const char *s, const char *p)
 				p += 2;
 				if (*p != '[') {
 					match_error(ms, "missing '['"
-					    " after '%%f' in pattern");
+					    " after '%f' in pattern");
 					break;
 				}
 				/* points to what is next */
@@ -667,7 +669,7 @@ str_match(const char *string, const char *pattern, struct str_match *m,
 
 	ret = str_find_aux(&ms, pattern, string, sm, nsm, 0);
 	if (ret == 0 || ms.error != NULL) {
-		/* Return 0 on error and store the error string */
+		/* Return -1 on error and store the error string */
 		*errstr = ms.error;
 		return (-1);
 	}
diff --git a/regress/patterns/Makefile b/regress/patterns/Makefile
new file mode 100644
index 0000000..024f96e
--- /dev/null
+++ b/regress/patterns/Makefile
@@ -0,0 +1,20 @@
+#	$OpenBSD$
+
+HTTPDSRC =	${.CURDIR}/../../httpd
+
+.PATH:	${HTTPDSRC}
+
+REGRESS_TARGETS=	test-patterns
+
+CLEANFILES +=		patterns-tester
+
+patterns-tester: patterns-tester.c patterns.c patterns.h
+	${CC} -o $@ ${CFLAGS} ${.CURDIR}/patterns-tester.c ${HTTPDSRC}/patterns.c -I${HTTPDSRC}
+
+test-patterns: patterns-tester test-patterns.out test-patterns.in
+	cat ${.CURDIR}/test-patterns.in | grep -v '^#' |			\
+	while IFS='	' read string pattern comments ; do 			\
+		./patterns-tester "$${string}" "$${pattern}" 2>&1 || true;	\
+	done | diff -I 'OpenBSD' -u ${.CURDIR}/test-patterns.out -
+
+.include <bsd.regress.mk>
diff --git a/regress/patterns/patterns-tester.c b/regress/patterns/patterns-tester.c
new file mode 100644
index 0000000..9134c0c
--- /dev/null
+++ b/regress/patterns/patterns-tester.c
@@ -0,0 +1,98 @@
+/* $OpenBSD$ */
+/*
+ * Copyright (c) 2015 Sebastien Marie
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <err.h>
+#include <string.h>
+
+#include "patterns.h"
+
+extern char *	malloc_options;
+
+static void read_string(char *, size_t);
+static void read_string_stop(void);
+
+static void
+read_string(char *buf, size_t len)
+{
+	size_t i;
+
+	/* init */
+	bzero(buf, len);
+
+	/* read */
+	if (fgets(buf, len, stdin) == NULL)
+		err(1, "fgets");
+
+	/* strip '\n' */
+	i = strnlen(buf, len);
+	if (i != 0)
+		buf[i-1] = '\0';
+}
+
+static void
+read_string_stop()
+{
+	if (getchar() != EOF)
+		errx(1, "read_string_stop: too many input");
+}
+
+int
+main(int argc, char *argv[])
+{
+	char string[1024];
+	char pattern[1024];
+	struct str_match m;
+	const char *errstr = NULL;
+	int ret;
+	size_t i;
+
+	/* configure malloc */
+	malloc_options = "S";
+
+	/* read testcase */
+	if (argc != 3) {
+		/* from stdin (useful for afl) */
+		read_string(string, sizeof(string));
+		read_string(pattern, sizeof(pattern));
+		read_string_stop();
+	} else {
+		/* from arguments */
+		strlcpy(string, argv[1], sizeof(string));
+		strlcpy(pattern, argv[2], sizeof(pattern));
+	}
+
+	/* print testcase */
+	printf("string='%s'\n", string);
+	printf("pattern='%s'\n", pattern);
+
+	/* test it ! */
+	ret = str_match(string, pattern, &m, &errstr);
+	if (errstr != NULL)
+		errx(1, "str_match: %s", errstr);
+
+	/* print result */
+	printf("ret=%d num=%d\n", ret, m.sm_nmatch);
+	for (i=0; i<m.sm_nmatch; i++) {
+		printf("%ld: %s\n", i, m.sm_match[i]);
+	}
+
+	str_match_free(&m);
+
+	return (EXIT_SUCCESS);
+}
diff --git a/regress/patterns/test-patterns.in b/regress/patterns/test-patterns.in
new file mode 100644
index 0000000..46aa506
--- /dev/null
+++ b/regress/patterns/test-patterns.in
@@ -0,0 +1,23 @@
+# $OpenBSD$
+# string	pattern				comments
+/page/51	^/(%a+)/(%d+)$
+/Apage/51	/[^%d][%w%u][^%c]+()[%d]+	
+/^page/51	/^(.a.e)/(.)
+/page/page-51	/(.*)/%1-(%d+)
+/page/[51]	/page/(%b[])
+:-]		]+
+:-)		[)]+
+/page/51	$^
+1234567890	([2-5]-)
+****		^**$				equiv '[*]*'
+xxxx		^x*$				same as before
+/page/51	no-%d-match			no match
+/page/page-51	/(.*)/%9-(%d+)			invalid capture index
+:-)		)+				invalid pattern capture
+/page/51	/page/51(			unfinished capture
+/page/51	/page/51%			malformed pattern (ends with '%')
+/page/51	/page/[51			malformed pattern (missing ']')
+/page/(51)	/page/%b(			malformed pattern (missing arguments to '%b')
+/page/51	()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()	too many captures
+/page/51	/page/%f			missing '[' after '%f' in pattern
+/page/51	/page%f/51			missing '[' after '%f' in pattern
diff --git a/regress/patterns/test-patterns.out b/regress/patterns/test-patterns.out
new file mode 100644
index 0000000..1999cc1
--- /dev/null
+++ b/regress/patterns/test-patterns.out
@@ -0,0 +1,87 @@
+# $OpenBSD$
+string='/page/51'
+pattern='^/(%a+)/(%d+)$'
+ret=0 num=3
+0: /page/51
+1: page
+2: 51
+string='/Apage/51'
+pattern='/[^%d][%w%u][^%c]+()[%d]+'
+ret=0 num=2
+0: /Apage/51
+1: 
+string='/^page/51'
+pattern='/^(.a.e)/(.)'
+ret=0 num=3
+0: /^page/51
+1: page
+2: 5
+string='/page/page-51'
+pattern='/(.*)/%1-(%d+)'
+ret=0 num=3
+0: /page/page-51
+1: page
+2: 51
+string='/page/[51]'
+pattern='/page/(%b[])'
+ret=0 num=2
+0: /page/[51]
+1: [51]
+string=':-]'
+pattern=']+'
+ret=0 num=2
+0: :-]
+1: ]
+string=':-)'
+pattern='[)]+'
+ret=0 num=2
+0: :-)
+1: )
+string='/page/51'
+pattern='$^'
+ret=-1 num=0
+string='1234567890'
+pattern='([2-5]-)'
+ret=0 num=2
+0: 1234567890
+1: 
+string='****'
+pattern='^**$'
+ret=0 num=2
+0: ****
+1: ****
+string='xxxx'
+pattern='^x*$'
+ret=0 num=2
+0: xxxx
+1: xxxx
+string='/page/51'
+pattern='no-%d-match'
+ret=-1 num=0
+patterns-tester: str_match: invalid capture index
+string='/page/page-51'
+pattern='/(.*)/%9-(%d+)'
+patterns-tester: str_match: invalid pattern capture
+string=':-)'
+pattern=')+'
+patterns-tester: str_match: unfinished capture
+string='/page/51'
+pattern='/page/51('
+patterns-tester: str_match: malformed pattern (ends with '%%')
+string='/page/51'
+pattern='/page/51%'
+patterns-tester: str_match: malformed pattern (missing ']')
+string='/page/51'
+pattern='/page/[51'
+patterns-tester: str_match: malformed pattern (missing arguments to '%b')
+string='/page/(51)'
+pattern='/page/%b('
+patterns-tester: str_match: too many captures
+string='/page/51'
+pattern='()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()()'
+patterns-tester: str_match: missing '[' after '%f' in pattern
+string='/page/51'
+pattern='/page/%f'
+patterns-tester: str_match: missing '[' after '%f' in pattern
+string='/page/51'
+pattern='/page%f/51'