PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-02-15 01:46:35 +00:00
Code Issues Projects Releases Wiki Activity

Made proxy handlers return errors to caller when unable to handle proxy replies.

Browse Source 
Errors are returned internally as -1 * <errno code>.
This commit is contained in:
henri
2013-04-22 19:36:38 +00:00
parent eda720a389
commit 03ff0651c7
2 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
nsock/src/proxy_http.c
View File

@@ -60,6 +60,7 @@
#include "nsock.h"
#include "nsock_internal.h"
#include "nsock_log.h"
#include <netdb.h>
#include <string.h>
@@ -125,7 +126,7 @@ void proxy_http_node_delete(struct proxy_node *node) {
free(node);
}
static void handle_state_initial(mspool *nsp, msevent *nse, void *udata) {
static int handle_state_initial(mspool *nsp, msevent *nse, void *udata) {
struct proxy_chain_context *px_ctx = nse->iod->px_ctx;
struct sockaddr_storage *ss;
size_t sslen;
@@ -154,9 +155,11 @@ static void handle_state_initial(mspool *nsp, msevent *nse, void *udata) {
nsock_readlines(nsp, (nsock_iod)nse->iod, nsock_proxy_ev_dispatch,
timeout, udata, 1);
return 0;
}
static void handle_state_tcp_connected(mspool *nsp, msevent *nse, void *udata) {
static int handle_state_tcp_connected(mspool *nsp, msevent *nse, void *udata) {
struct proxy_chain_context *px_ctx = nse->iod->px_ctx;
char *res;
int reslen;
@@ -164,10 +167,16 @@ static void handle_state_tcp_connected(mspool *nsp, msevent *nse, void *udata) {
res = nse_readbuf(nse, &reslen);
/* TODO string check!! */
if ((reslen >= 15) && strstr(res, "200 OK")) {
px_ctx->px_state = PROXY_STATE_HTTP_TUNNEL_ESTABLISHED;
if (!((reslen >= 15) && strstr(res, "200 OK"))) {
struct proxy_node *node;
node = proxy_ctx_node_current(px_ctx);
nsock_log_debug(nsp, "Connection refused from proxy %s", node->nodestr);
return -EINVAL;
}
px_ctx->px_state = PROXY_STATE_HTTP_TUNNEL_ESTABLISHED;
if (px_ctx->px_current->next == NULL) {
forward_event(nsp, nse, udata);
} else {
@@ -175,20 +184,22 @@ static void handle_state_tcp_connected(mspool *nsp, msevent *nse, void *udata) {
px_ctx->px_state = PROXY_STATE_INITIAL;
nsock_proxy_ev_dispatch(nsp, nse, udata);
}
return 0;
}
void proxy_http_handler(nsock_pool nspool, nsock_event nsevent, void *udata) {
int rc = 0;
mspool *nsp = (mspool *)nspool;
msevent *nse = (msevent *)nsevent;
switch (nse->iod->px_ctx->px_state) {
case PROXY_STATE_INITIAL:
handle_state_initial(nsp, nse, udata);
rc = handle_state_initial(nsp, nse, udata);
break;
case PROXY_STATE_HTTP_TCP_CONNECTED:
if (nse->type == NSE_TYPE_READ)
handle_state_tcp_connected(nsp, nse, udata);
rc = handle_state_tcp_connected(nsp, nse, udata);
break;
case PROXY_STATE_HTTP_TUNNEL_ESTABLISHED:
@@ -198,5 +209,10 @@ void proxy_http_handler(nsock_pool nspool, nsock_event nsevent, void *udata) {
default:
fatal("Invalid proxy state!");
}
if (rc) {
nse->status = NSE_STATUS_PROXYERROR;
forward_event(nsp, nse, udata);
}
}

18
nsock/src/proxy_socks4.c
View File

@@ -157,7 +157,7 @@ static inline void socks4_data_init(struct socks4_data *socks4,
socks4->address = sin->sin_addr.s_addr;
}
static void handle_state_initial(mspool *nsp, msevent *nse, void *udata) {
static int handle_state_initial(mspool *nsp, msevent *nse, void *udata) {
struct proxy_chain_context *px_ctx = nse->iod->px_ctx;
struct sockaddr_storage *ss;
size_t sslen;
@@ -188,9 +188,10 @@ static void handle_state_initial(mspool *nsp, msevent *nse, void *udata) {
nsock_readbytes(nsp, (nsock_iod)nse->iod, nsock_proxy_ev_dispatch, timeout,
udata, 8);
return 0;
}
static void handle_state_tcp_connected(mspool *nsp, msevent *nse, void *udata) {
static int handle_state_tcp_connected(mspool *nsp, msevent *nse, void *udata) {
struct proxy_chain_context *px_ctx = nse->iod->px_ctx;
char *res;
int reslen;
@@ -203,7 +204,7 @@ static void handle_state_tcp_connected(mspool *nsp, msevent *nse, void *udata) {
node = proxy_ctx_node_current(px_ctx);
nsock_log_debug(nsp, "Ignoring invalid socks4 reply from proxy %s",
node->nodestr);
return;
return -EINVAL;
}
px_ctx->px_state = PROXY_STATE_SOCKS4_TUNNEL_ESTABLISHED;
@@ -215,20 +216,22 @@ static void handle_state_tcp_connected(mspool *nsp, msevent *nse, void *udata) {
px_ctx->px_state = PROXY_STATE_INITIAL;
nsock_proxy_ev_dispatch(nsp, nse, udata);
}
return 0;
}
void proxy_socks4_handler(nsock_pool nspool, nsock_event nsevent, void *udata) {
int rc = 0;
mspool *nsp = (mspool *)nspool;
msevent *nse = (msevent *)nsevent;
switch (nse->iod->px_ctx->px_state) {
case PROXY_STATE_INITIAL:
handle_state_initial(nsp, nse, udata);
rc = handle_state_initial(nsp, nse, udata);
break;
case PROXY_STATE_SOCKS4_TCP_CONNECTED:
if (nse->type == NSE_TYPE_READ)
handle_state_tcp_connected(nsp, nse, udata);
rc = handle_state_tcp_connected(nsp, nse, udata);
break;
case PROXY_STATE_SOCKS4_TUNNEL_ESTABLISHED:
@@ -238,5 +241,10 @@ void proxy_socks4_handler(nsock_pool nspool, nsock_event nsevent, void *udata) {
default:
fatal("Invalid proxy state!");
}
if (rc) {
nse->status = NSE_STATUS_PROXYERROR;
forward_event(nsp, nse, udata);
}
}