From 1b26dc11284f73c2b5b0332ca183ecc331c85b24 Mon Sep 17 00:00:00 2001 From: Vasily Date: Fri, 16 Nov 2018 14:17:04 +0300 Subject: [PATCH] Added more liberty to upstream username, too --- src/conf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/conf.c b/src/conf.c index c39ee50..5ebf179 100644 --- a/src/conf.c +++ b/src/conf.c @@ -52,7 +52,8 @@ #define BOOL "(yes|on|no|off)" #define INT "((0x)?[[:digit:]]+)" #define ALNUM "([-a-z0-9._]+)" -#define PASSWORD "([^:@]*)" +#define USERNAME "([^:]*)" +#define PASSWORD "([^@]*)" #define IP "((([0-9]{1,3})\\.){3}[0-9]{1,3})" #define IPMASK "(" IP "(/[[:digit:]]+)?)" #define IPV6 "(" \ @@ -258,7 +259,7 @@ struct { }, { BEGIN "(upstream)" WS "(http|socks4|socks5)" WS - "(" ALNUM /*username*/ ":" PASSWORD /*password*/ "@" ")?" + "(" USERNAME /*username*/ ":" PASSWORD /*password*/ "@" ")?" "(" IP "|" ALNUM ")" ":" INT "(" WS STR ")?" END, handle_upstream, NULL