bughz/tinyproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added new field to upstream struct; added new function for registering an upstream proxy with basic auth

Browse Source
This commit is contained in:
Valen Blanco 2016-10-03 17:33:10 +02:00
parent e541456ee7
commit 9fac3ef792
2 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/upstream.c
View File

@ -30,9 +30,12 @@
#ifdef UPSTREAM_SUPPORT #ifdef UPSTREAM_SUPPORT
/** /**
* Construct an upstream struct from input data. * Construct an upstream struct from input data, with basic auth credentials.
* 'basic_auth' can be NULL.
*/ */
static struct upstream *upstream_build (const char *host, int port, const char *domain) static struct upstream *upstream_build (const char *host, int port,
const char *basic_auth,
const char *domain)
{ {
char *ptr; char *ptr;
struct upstream *up; struct upstream *up;
@ -44,7 +47,7 @@ static struct upstream *upstream_build (const char *host, int port, const char *
return NULL; return NULL;
} }
up->host = up->domain = NULL; up->host = up->domain = up->basic_auth = NULL;
up->ip = up->mask = 0; up->ip = up->mask = 0;
if (domain == NULL) { if (domain == NULL) {
@ -57,6 +60,9 @@ static struct upstream *upstream_build (const char *host, int port, const char *
up->host = safestrdup (host); up->host = safestrdup (host);
up->port = port; up->port = port;
if (basic_auth != NULL)
up->basic_auth = safestrdup (basic_auth);
log_message (LOG_INFO, "Added upstream %s:%d for [default]", log_message (LOG_INFO, "Added upstream %s:%d for [default]",
host, port); host, port);
} else if (host == NULL) { } else if (host == NULL) {
@ -101,6 +107,9 @@ static struct upstream *upstream_build (const char *host, int port, const char *
up->port = port; up->port = port;
up->domain = safestrdup (domain); up->domain = safestrdup (domain);
if (basic_auth != NULL)
up->basic_auth = safestrdup (basic_auth);
log_message (LOG_INFO, "Added upstream %s:%d for %s", log_message (LOG_INFO, "Added upstream %s:%d for %s",
host, port, domain); host, port, domain);
} }
@ -109,6 +118,7 @@ static struct upstream *upstream_build (const char *host, int port, const char *
fail: fail:
safefree (up->host); safefree (up->host);
safefree (up->basic_auth);
safefree (up->domain); safefree (up->domain);
safefree (up); safefree (up);
@ -116,14 +126,15 @@ fail:
} }
/* /*
* Add an entry to the upstream list * Add an entry to the upstream list, with basic auth credentials.
* 'basic_auth' can be NULL.
*/ */
void upstream_add (const char *host, int port, const char *domain, void upstream_bauth_add (const char *host, int port, const char *basic_auth,
struct upstream **upstream_list) const char *domain, struct upstream **upstream_list)
{ {
struct upstream *up; struct upstream *up;
up = upstream_build (host, port, domain); up = upstream_build (host, port, basic_auth, domain);
if (up == NULL) { if (up == NULL) {
return; return;
} }
@ -155,12 +166,22 @@ void upstream_add (const char *host, int port, const char *domain,
upstream_cleanup: upstream_cleanup:
safefree (up->host); safefree (up->host);
safefree (up->basic_auth);
safefree (up->domain); safefree (up->domain);
safefree (up); safefree (up);
return; return;
} }
/*
* Add an entry to the upstream list
*/
void upstream_add (const char *host, int port, const char *domain,
struct upstream **upstream_list)
{
upstream_bauth_add (host, port, NULL, domain, upstream_list);
}
/* /*
* Check if a host is in the upstream list * Check if a host is in the upstream list
*/ */
@ -216,6 +237,7 @@ void free_upstream_list (struct upstream *up)
struct upstream *tmp = up; struct upstream *tmp = up;
up = up->next; up = up->next;
safefree (tmp->domain); safefree (tmp->domain);
safefree (tmp->basic_auth);
safefree (tmp->host); safefree (tmp->host);
safefree (tmp); safefree (tmp);
} }

4
src/upstream.h
View File

@ -36,12 +36,16 @@ struct upstream {
char *domain; /* optional */ char *domain; /* optional */
char *host; char *host;
int port; int port;
char *basic_auth; /* optional, Base64 basic auth */
in_addr_t ip, mask; in_addr_t ip, mask;
}; };
#ifdef UPSTREAM_SUPPORT #ifdef UPSTREAM_SUPPORT
extern void upstream_add (const char *host, int port, const char *domain, extern void upstream_add (const char *host, int port, const char *domain,
struct upstream **upstream_list); struct upstream **upstream_list);
extern void upstream_bauth_add (const char *host, int port,
const char *basic_auth, const char *domain,
struct upstream **upstream_list);
extern struct upstream *upstream_get (char *host, struct upstream *up); extern struct upstream *upstream_get (char *host, struct upstream *up);
extern void free_upstream_list (struct upstream *up); extern void free_upstream_list (struct upstream *up);
#endif /* UPSTREAM_SUPPORT */ #endif /* UPSTREAM_SUPPORT */