Commit d4ff5616814b2632f0c6f5fe84b38a57029e80aa - nginx

+9

-6

src/core/ngx_string.c less more

1018	1018	0xffffffff /* 1111 1111 1111 1111 1111 1111 1111 1111 */
1019	1019	};
1020	1020
1021		/* " ", """, "%", "'", %00-%1F, %7F-%FF */
	1021	/* " ", "#", """, "%", "'", %00-%1F, %7F-%FF */
1022	1022
1023	1023	static uint32_t html[] = {
1024	1024	0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */

1038	1038	0xffffffff /* 1111 1111 1111 1111 1111 1111 1111 1111 */
1039	1039	};
1040	1040
1041		/* " ", """, "'", %00-%1F, %7F-%FF */
	1041	/* " ", """, "%", "'", %00-%1F, %7F-%FF */
1042	1042
1043	1043	static uint32_t refresh[] = {
1044	1044	0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */
1045	1045
1046	1046	/* ?>=< ;:98 7654 3210 /.-, +)( '&%$ #"! /
1047		0x00000085, /* 0000 0000 0000 0000 0000 0000 1000 0101 */
	1047	0x000000a5, /* 0000 0000 0000 0000 0000 0000 1010 0101 */
1048	1048
1049	1049	/* _^]\ [ZYX WVUT SRQP ONML KJIH GFED CBA@ */
1050	1050	0x00000000, /* 0000 0000 0000 0000 0000 0000 0000 0000 */

1058	1058	0xffffffff /* 1111 1111 1111 1111 1111 1111 1111 1111 */
1059	1059	};
1060	1060
1061		/* " ", %00-%1F */
	1061	/* " ", "%", %00-%1F */
1062	1062
1063	1063	static uint32_t memcached[] = {
1064	1064	0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */
1065	1065
1066	1066	/* ?>=< ;:98 7654 3210 /.-, +)( '&%$ #"! /
1067		0x00000001, /* 0000 0000 0000 0000 0000 0000 0000 0001 */
	1067	0x00000021, /* 0000 0000 0000 0000 0000 0000 0010 0001 */
1068	1068
1069	1069	/* _^]\ [ZYX WVUT SRQP ONML KJIH GFED CBA@ */
1070	1070	0x00000000, /* 0000 0000 0000 0000 0000 0000 0000 0000 */

1078	1078	0x00000000, /* 0000 0000 0000 0000 0000 0000 0000 0000 */
1079	1079	};
1080	1080
1081		static uint32_t *map[] = { uri, args, html, refresh, memcached };
	1081	/* mail_auth is the same as memcached */
	1082
	1083	static uint32_t *map[] =
	1084	{ uri, args, html, refresh, memcached, memcached };
1082	1085
1083	1086
1084	1087	escape = map[type];

+1

-0

src/core/ngx_string.h less more

154	154	#define NGX_ESCAPE_HTML 2
155	155	#define NGX_ESCAPE_REFRESH 3
156	156	#define NGX_ESCAPE_MEMCACHED 4
	157	#define NGX_ESCAPE_MAIL_AUTH 5
157	158
158	159	#define NGX_UNESCAPE_URI 1
159	160

+6

-32

src/mail/ngx_mail_auth_http_module.c less more

1250	1250	static ngx_int_t
1251	1251	ngx_mail_auth_http_escape(ngx_pool_t pool, ngx_str_t text, ngx_str_t *escaped)
1252	1252	{
1253		u_char ch, *p;
1254		ngx_uint_t i, n;
1255
1256		n = 0;
1257
1258		for (i = 0; i < text->len; i++) {
1259		ch = text->data[i];
1260
1261		if (ch == CR \|\| ch == LF) {
1262		n++;
1263		}
1264		}
	1253	u_char *p;
	1254	uintptr_t n;
	1255
	1256	n = ngx_escape_uri(NULL, text->data, text->len, NGX_ESCAPE_MAIL_AUTH);
1265	1257
1266	1258	if (n == 0) {
1267	1259	escaped = text;

1275	1267	return NGX_ERROR;
1276	1268	}
1277	1269
	1270	(void) ngx_escape_uri(p, text->data, text->len, NGX_ESCAPE_MAIL_AUTH);
	1271
1278	1272	escaped->data = p;
1279
1280		for (i = 0; i < text->len; i++) {
1281		ch = text->data[i];
1282
1283		if (ch == CR) {
1284		*p++ = '%';
1285		*p++ = '0';
1286		*p++ = 'D';
1287		continue;
1288		}
1289
1290		if (ch == LF) {
1291		*p++ = '%';
1292		*p++ = '0';
1293		*p++ = 'A';
1294		continue;
1295		}
1296
1297		*p++ = ch;
1298		}
1299	1273
1300	1274	return NGX_OK;
1301	1275	}

+4

-0

src/mail/ngx_mail_parse.c less more

433	433	break;
434	434
435	435	case sw_argument:
	436	if (ch == ' ' && s->quoted) {
	437	break;
	438	}
	439
436	440	switch (ch) {
437	441	case '"':
438	442	if (!s->quoted) {