bughz/3proxy
1
0
Fork 0
mirror of https://github.com/3proxy/3proxy.git synced 2025-02-23 10:35:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Send Basic vs basic for Basic HTTP auth to deal with reportedly broken implementation

Browse Source
This commit is contained in:
z3APA3A 2019-10-16 11:29:07 +03:00
parent 22cf9254c5
commit 9996856698
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/auth.c
View File

@ -55,7 +55,7 @@ int clientnegotiate(struct chain * redir, struct clientparam * param, struct soc
len += sprintf((char *)buf + len, len += sprintf((char *)buf + len,
":%hu HTTP/1.0\r\nConnection: keep-alive\r\n", ntohs(*SAPORT(addr))); ":%hu HTTP/1.0\r\nConnection: keep-alive\r\n", ntohs(*SAPORT(addr)));
if(user){ if(user){
len += sprintf((char *)buf + len, "Proxy-authorization: basic "); len += sprintf((char *)buf + len, "Proxy-authorization: Basic ");
sprintf((char *)username, "%.128s:%.128s", user, pass?pass:(unsigned char *)""); sprintf((char *)username, "%.128s:%.128s", user, pass?pass:(unsigned char *)"");
en64(username, buf+len, (int)strlen((char *)username)); en64(username, buf+len, (int)strlen((char *)username));
len = (int)strlen((char *)buf); len = (int)strlen((char *)buf);

6
src/proxy.c
View File

@ -92,7 +92,7 @@ char * proxy_stringtable[] = {
#ifndef NOCRYPT #ifndef NOCRYPT
"Proxy-Authenticate: NTLM\r\n" "Proxy-Authenticate: NTLM\r\n"
#endif #endif
"Proxy-Authenticate: basic realm=\"proxy\"\r\n" "Proxy-Authenticate: Basic realm=\"proxy\"\r\n"
"Connection: close\r\n" "Connection: close\r\n"
"Content-type: text/html; charset=utf-8\r\n" "Content-type: text/html; charset=utf-8\r\n"
"\r\n" "\r\n"
@ -118,7 +118,7 @@ char * proxy_stringtable[] = {
"<body><h2>503 Service Unavailable</h2><h3>Your request violates configured policy</h3></body></html>\r\n", "<body><h2>503 Service Unavailable</h2><h3>Your request violates configured policy</h3></body></html>\r\n",
/* 16*/ "HTTP/1.0 401 Authentication Required\r\n" /* 16*/ "HTTP/1.0 401 Authentication Required\r\n"
"WWW-Authenticate: basic realm=\"FTP Server\"\r\n" "WWW-Authenticate: Basic realm=\"FTP Server\"\r\n"
"Connection: close\r\n" "Connection: close\r\n"
"Content-type: text/html; charset=utf-8\r\n" "Content-type: text/html; charset=utf-8\r\n"
"\r\n" "\r\n"
@ -859,7 +859,7 @@ for(;;){
sprintf((char*)buf+strlen((char *)buf), "Connection: %s\r\n", keepalive? "keep-alive":"close"); sprintf((char*)buf+strlen((char *)buf), "Connection: %s\r\n", keepalive? "keep-alive":"close");
} }
if(param->extusername){ if(param->extusername){
sprintf((char*)buf + strlen((char *)buf), "%s: basic ", (redirect)?"Proxy-Authorization":"Authorization"); sprintf((char*)buf + strlen((char *)buf), "%s: Basic ", (redirect)?"Proxy-Authorization":"Authorization");
sprintf((char*)username, "%.128s:%.128s", param->extusername, param->extpassword?param->extpassword:(unsigned char*)""); sprintf((char*)username, "%.128s:%.128s", param->extusername, param->extpassword?param->extpassword:(unsigned char*)"");
en64(username, buf+strlen((char *)buf), (int)strlen((char *)username)); en64(username, buf+strlen((char *)buf), (int)strlen((char *)username));
sprintf((char*)buf + strlen((char *)buf), "\r\n"); sprintf((char*)buf + strlen((char *)buf), "\r\n");