Basic Auth: allow almost all possible characters for user/pass
previously was restricted to alphanumeric chars only.
This commit is contained in:
parent
f44d0f387b
commit
dc41b35333
@ -52,6 +52,8 @@
|
|||||||
#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 USERNAME "([^:]*)"
|
||||||
|
#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 +259,7 @@ struct {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
BEGIN "(upstream)" WS "(http|socks4|socks5)" WS
|
BEGIN "(upstream)" WS "(http|socks4|socks5)" WS
|
||||||
"(" ALNUM /*username*/ ":" ALNUM /*password*/ "@" ")?"
|
"(" USERNAME /*username*/ ":" PASSWORD /*password*/ "@" ")?"
|
||||||
"(" IP "|" ALNUM ")"
|
"(" IP "|" ALNUM ")"
|
||||||
":" INT "(" WS STR ")?"
|
":" INT "(" WS STR ")?"
|
||||||
END, handle_upstream, NULL
|
END, handle_upstream, NULL
|
||||||
|
Loading…
x
Reference in New Issue
Block a user