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

minor changes in clientnegotiate()

Browse Source 
1. Use [] for hostname in form of IPv6 address
2. Remove large buffer from stack
This commit is contained in:
z3APA3A 2016-01-04 01:30:49 +03:00
parent 4c3f19cd20
commit 9dda666d8d
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/auth.c
View File

@ -10,7 +10,8 @@
int clientnegotiate(struct chain * redir, struct clientparam * param, struct sockaddr * addr){ int clientnegotiate(struct chain * redir, struct clientparam * param, struct sockaddr * addr){
unsigned char buf[1024]; unsigned char *buf;
unsigned char *username;
int res; int res;
int len=0; int len=0;
unsigned char * user, *pass; unsigned char * user, *pass;
@ -18,6 +19,13 @@ int clientnegotiate(struct chain * redir, struct clientparam * param, struct soc
user = redir->extuser; user = redir->extuser;
pass = redir->extpass; pass = redir->extpass;
if (param->srvinbuf < 4096){
if(param->srvbuf)myfree(param->srvbuf);
param->srvbuf = myalloc(4096);
param->srvbufsize = 4096;
}
buf = param->srvbuf;
username = buf + 2048;
if(user) { if(user) {
if (*user == '*') { if (*user == '*') {
if(!param->username) return 4; if(!param->username) return 4;
@ -34,7 +42,11 @@ int clientnegotiate(struct chain * redir, struct clientparam * param, struct soc
{ {
len = sprintf((char *)buf, "CONNECT "); len = sprintf((char *)buf, "CONNECT ");
if(redir->type == R_CONNECTP && param->hostname) { if(redir->type == R_CONNECTP && param->hostname) {
char * needreplace;
needreplace = strchr(param->hostname, ':');
if(needreplace) buf[len++] = '[';
len =+ sprintf((char *)buf + len, "%.256s", param->hostname); len =+ sprintf((char *)buf + len, "%.256s", param->hostname);
if(needreplace) buf[len++] = ']';
} }
else { else {
if(*SAFAMILY(addr) == AF_INET6) buf[len++] = '['; if(*SAFAMILY(addr) == AF_INET6) buf[len++] = '[';
@ -44,7 +56,6 @@ 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\nProxy-Connection: keep-alive\r\n", ntohs(*SAPORT(addr))); ":%hu HTTP/1.0\r\nProxy-Connection: keep-alive\r\n", ntohs(*SAPORT(addr)));
if(user){ if(user){
unsigned char username[256];
len += sprintf((char *)buf + len, "Proxy-authorization: basic "); len += sprintf((char *)buf + len, "Proxy-authorization: basic ");
sprintf((char *)username, "%.128s:%.64s", user, pass?pass:(unsigned char *)""); sprintf((char *)username, "%.128s:%.64s", user, pass?pass:(unsigned char *)"");
en64(username, buf+len, (int)strlen((char *)username)); en64(username, buf+len, (int)strlen((char *)username));