Added way more liberty on password value

This commit is contained in:
Vasily 2018-10-25 11:08:56 +03:00
parent f44d0f387b
commit 34165fd351

View File

@ -52,6 +52,7 @@
#define BOOL "(yes|on|no|off)" #define BOOL "(yes|on|no|off)"
#define INT "((0x)?[[:digit:]]+)" #define INT "((0x)?[[:digit:]]+)"
#define ALNUM "([-a-z0-9._]+)" #define ALNUM "([-a-z0-9._]+)"
#define PASSWORD "([^:@]+)"
#define IP "((([0-9]{1,3})\\.){3}[0-9]{1,3})" #define IP "((([0-9]{1,3})\\.){3}[0-9]{1,3})"
#define IPMASK "(" IP "(/[[:digit:]]+)?)" #define IPMASK "(" IP "(/[[:digit:]]+)?)"
#define IPV6 "(" \ #define IPV6 "(" \
@ -257,7 +258,7 @@ struct {
}, },
{ {
BEGIN "(upstream)" WS "(http|socks4|socks5)" WS BEGIN "(upstream)" WS "(http|socks4|socks5)" WS
"(" ALNUM /*username*/ ":" ALNUM /*password*/ "@" ")?" "(" ALNUM /*username*/ ":" PASSWORD /*password*/ "@" ")?"
"(" IP "|" ALNUM ")" "(" IP "|" ALNUM ")"
":" INT "(" WS STR ")?" ":" INT "(" WS STR ")?"
END, handle_upstream, NULL END, handle_upstream, NULL