Attachment #179602 for bug #216785

Lines 15-20 Link Here

(-)Makefile (+2 lines)
15		15
16	LICENSE= GPLv2	16	LICENSE= GPLv2
17		17
		18	LIB_DEPENDS= libidn.so:dns/libidn
		19
18	CONFLICTS= lynx-2.8.[8-9]d*	20	CONFLICTS= lynx-2.8.[8-9]d*
19		21
20	USES= cpe ncurses shebangfix tar:bzip2	22	USES= cpe ncurses shebangfix tar:bzip2




for the unstable lynx2.8.9. Removed the at_sign, and made sure that
the user id is correctly stripped of all non valid inputs.

--- WWW/Library/Implementation/HTTCP.c.orig	2013-12-18 01:56:13 UTC
+++ WWW/Library/Implementation/HTTCP.c
@@ -1792,7 +1792,6 @@ int HTDoConnect(const char *url,
     int status = 0;
     char *line = NULL;
     char *p1 = NULL;

     char *host = NULL;
 
 #ifdef INET6
@@ -1814,14 +1813,8 @@ int HTDoConnect(const char *url,
      * Get node name and optional port number.
      */
     p1 = HTParse(url, "", PARSE_HOST);

     FREE(p1);
 
     HTSprintf0(&line, "%s%s", WWW_FIND_MESSAGE, host);
--- WWW/Library/Implementation/HTUtils.h.orig	2014-02-05 00:50:18 UTC
+++ WWW/Library/Implementation/HTUtils.h
@@ -801,6 +801,8 @@ extern "C" {
 /*
  * Strip any username from the given string so we retain only the host.
  */
-static void strip_userid(char *host)
+void strip_userid(char *host, int parse_only)
 {
     char *p1 = host;
     char *p2 = StrChr(host, '@');
@@ -439,7 +439,8 @@
 
 	    CTRACE((tfp, "parsed:%s\n", fake));
 	    HTSprintf0(&msg, gettext("Address contains a username: %s"), host);
-	    HTAlert(msg);
+           if (msg !=0 && !parse_only)
+	        HTAlert(msg);
 	    FREE(msg);
 	}
 	while ((*p1++ = *p2++) != '\0') {
@@ -1081,7 +1082,7 @@
 	char *host = NULL;
 
 	if ((host = HTParse(anAnchor->address, "", PARSE_HOST)) != NULL) {
-	    strip_userid(host);
+	    strip_userid(host, TRUE);
 	    HTBprintf(&command, "Host: %s%c%c", host, CR, LF);
 	    FREE(host);
 	}
--- WWW/Library/Implementation/HTUtils.h_orig	2016-12-01 15:21:38.919699987 +0000
+++ WWW/Library/Implementation/HTUtils.h	2016-12-01 15:22:57.870511104 +0000
@@ -801,6 +801,8 @@
 
     extern FILE *TraceFP(void);
 
+    extern void strip_userid(char *host, int warn);

 #ifdef USE_SSL
     extern SSL *HTGetSSLHandle(void);
     extern void HTSSLInitPRNG(void);
--- src/LYUtils.c.orig	2014-03-09 21:43:10 UTC
+++ src/LYUtils.c
@@ -4693,6 +4693,7 @@ BOOLEAN LYExpandHostForURL(char **Alloca
      * Do a DNS test on the potential host field as presently trimmed.  - FM
      */
     StrAllocCopy(host, Str);




--- makefile.in.orig	2014-03-09 21:43:10 UTC
+++ makefile.in
@@ -413,7 +413,9 @@ install-help : $(CFG2HTML) help_files.se
 	else \
 		cp $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.tmp ; \
 	fi'

 	@ECHO_CC@sed	-e '/^HELPFILE:http/s!^!#!' \
 		-e '/^#HELPFILE:file/s!#!!' \
 		$(SYSCONFDIR)/lynx.tmp | \
@@ -421,9 +423,11 @@ install-help : $(CFG2HTML) help_files.se
 	$(SHELL) $(scripts_dir)/cfg_path.sh lynx_doc  $(helpdir) | \
 	sed	-e '/^HELPFILE:file/s!$$!$(COMPRESS_EXT)!' \
 		-e '/^HELPFILE:file/s!$(COMPRESS_EXT)$(COMPRESS_EXT)$$!$(COMPRESS_EXT)!' \

 
 LYHelp.h : help_files.sed $(srcdir)/LYHelp.hin
 	@echo Creating $@
@@ -445,17 +449,17 @@ cfg_defs.h : $(scripts_dir)/cfg_defs.sh 
 	$(SHELL) -c 'SHELL=$(SHELL) $(SHELL) $(scripts_dir)/cfg_defs.sh $(srcdir)'
 
 install-cfg : $(SYSCONFDIR)

Return to bug 216785

Lines 6-14 Link Here

(-)files/patch-CVE-2016-9179 (-40 / +10 lines)
6	for the unstable lynx2.8.9. Removed the at_sign, and made sure that	6	for the unstable lynx2.8.9. Removed the at_sign, and made sure that
7	the user id is correctly stripped of all non valid inputs.	7	the user id is correctly stripped of all non valid inputs.
8		8
9	--- WWW/Library/Implementation/HTTCP.c_orig 2016-12-01 15:07:39.487753520 +0000	9	--- WWW/Library/Implementation/HTTCP.c.orig 2013-12-18 01:56:13 UTC
10	+++ WWW/Library/Implementation/HTTCP.c 2016-12-01 15:10:20.291328282 +0000	10	+++ WWW/Library/Implementation/HTTCP.c
11	@@ -1792,7 +1792,6 @@	11	@@ -1792,7 +1792,6 @@ int HTDoConnect(const char *url,
12	int status = 0;	12	int status = 0;
13	char *line = NULL;	13	char *line = NULL;
14	char *p1 = NULL;	14	char *p1 = NULL;
Lines 16-22 Link Here
16	char *host = NULL;	16	char *host = NULL;
17		17
18	#ifdef INET6	18	#ifdef INET6
19	@@ -1814,14 +1813,8 @@	19	@@ -1814,14 +1813,8 @@ int HTDoConnect(const char *url,
20	* Get node name and optional port number.	20	* Get node name and optional port number.
21	*/	21	*/
22	p1 = HTParse(url, "", PARSE_HOST);	22	p1 = HTParse(url, "", PARSE_HOST);
Lines 32-71 Link Here
32	FREE(p1);	32	FREE(p1);
33		33
34	HTSprintf0(&line, "%s%s", WWW_FIND_MESSAGE, host);	34	HTSprintf0(&line, "%s%s", WWW_FIND_MESSAGE, host);
35	--- WWW/Library/Implementation/HTTP.c_orig 2016-12-01 15:13:24.171404704 +0000	35	--- WWW/Library/Implementation/HTUtils.h.orig 2014-02-05 00:50:18 UTC
36	+++ WWW/Library/Implementation/HTTP.c 2016-12-01 15:19:59.699276204 +0000	36	+++ WWW/Library/Implementation/HTUtils.h
37	@@ -426,7 +426,7 @@	37	@@ -801,6 +801,8 @@ extern "C" {
38	/*
39	* Strip any username from the given string so we retain only the host.
40	*/
41	-static void strip_userid(char *host)
42	+void strip_userid(char *host, int parse_only)
43	{
44	char *p1 = host;
45	char *p2 = StrChr(host, '@');
46	@@ -439,7 +439,8 @@
47		38
48	CTRACE((tfp, "parsed:%s\n", fake));
49	HTSprintf0(&msg, gettext("Address contains a username: %s"), host);
50	- HTAlert(msg);
51	+ if (msg !=0 && !parse_only)
52	+ HTAlert(msg);
53	FREE(msg);
54	}
55	while ((p1++ = p2++) != '\0') {
56	@@ -1081,7 +1082,7 @@
57	char *host = NULL;
58
59	if ((host = HTParse(anAnchor->address, "", PARSE_HOST)) != NULL) {
60	- strip_userid(host);
61	+ strip_userid(host, TRUE);
62	HTBprintf(&command, "Host: %s%c%c", host, CR, LF);
63	FREE(host);
64	}
65	--- WWW/Library/Implementation/HTUtils.h_orig 2016-12-01 15:21:38.919699987 +0000
66	+++ WWW/Library/Implementation/HTUtils.h 2016-12-01 15:22:57.870511104 +0000
67	@@ -801,6 +801,8 @@
68
69	extern FILE *TraceFP(void);	39	extern FILE *TraceFP(void);
70		40
71	+ extern void strip_userid(char *host, int warn);	41	+ extern void strip_userid(char *host, int warn);
Lines 73-81 Link Here
73	#ifdef USE_SSL	43	#ifdef USE_SSL
74	extern SSL *HTGetSSLHandle(void);	44	extern SSL *HTGetSSLHandle(void);
75	extern void HTSSLInitPRNG(void);	45	extern void HTSSLInitPRNG(void);
76	--- src/LYUtils.c_orig 2016-12-01 15:25:21.769447171 +0000	46	--- src/LYUtils.c.orig 2014-03-09 21:43:10 UTC
77	+++ src/LYUtils.c 2016-12-01 15:28:31.901411555 +0000	47	+++ src/LYUtils.c
78	@@ -4693,6 +4693,7 @@	48	@@ -4693,6 +4693,7 @@ BOOLEAN LYExpandHostForURL(char **Alloca
79	* Do a DNS test on the potential host field as presently trimmed. - FM	49	* Do a DNS test on the potential host field as presently trimmed. - FM
80	*/	50	*/
81	StrAllocCopy(host, Str);	51	StrAllocCopy(host, Str);

Lines 1-5 Link Here

(-)files/patch-makefile.in (-4 / +5 lines)
1	Index: makefile.in	1	--- makefile.in.orig 2014-03-09 21:43:10 UTC
2	@@ -433,7 +433,9 @@	2	+++ makefile.in
		3	@@ -413,7 +413,9 @@ install-help : $(CFG2HTML) help_files.se
3	else \	4	else \
4	cp $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.tmp ; \	5	cp $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.tmp ; \
5	fi'	6	fi'
Lines 10-16 Link Here
10	@ECHO_CC@sed -e '/^HELPFILE:http/s!^!#!' \	11	@ECHO_CC@sed -e '/^HELPFILE:http/s!^!#!' \
11	-e '/^#HELPFILE:file/s!#!!' \	12	-e '/^#HELPFILE:file/s!#!!' \
12	$(SYSCONFDIR)/lynx.tmp \| \	13	$(SYSCONFDIR)/lynx.tmp \| \
13	@@ -441,9 +443,11 @@	14	@@ -421,9 +423,11 @@ install-help : $(CFG2HTML) help_files.se
14	$(SHELL) $(scripts_dir)/cfg_path.sh lynx_doc $(helpdir) \| \	15	$(SHELL) $(scripts_dir)/cfg_path.sh lynx_doc $(helpdir) \| \
15	sed -e '/^HELPFILE:file/s!$$!$(COMPRESS_EXT)!' \	16	sed -e '/^HELPFILE:file/s!$$!$(COMPRESS_EXT)!' \
16	-e '/^HELPFILE:file/s!$(COMPRESS_EXT)$(COMPRESS_EXT)$$!$(COMPRESS_EXT)!' \	17	-e '/^HELPFILE:file/s!$(COMPRESS_EXT)$(COMPRESS_EXT)$$!$(COMPRESS_EXT)!' \
Lines 24-30 Link Here
24		25
25	LYHelp.h : help_files.sed $(srcdir)/LYHelp.hin	26	LYHelp.h : help_files.sed $(srcdir)/LYHelp.hin
26	@echo Creating $@	27	@echo Creating $@
27	@@ -465,17 +469,17 @@	28	@@ -445,17 +449,17 @@ cfg_defs.h : $(scripts_dir)/cfg_defs.sh
28	$(SHELL) -c 'SHELL=$(SHELL) $(SHELL) $(scripts_dir)/cfg_defs.sh $(srcdir)'	29	$(SHELL) -c 'SHELL=$(SHELL) $(SHELL) $(scripts_dir)/cfg_defs.sh $(srcdir)'
29		30
30	install-cfg : $(SYSCONFDIR)	31	install-cfg : $(SYSCONFDIR)