PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-25 17:09:02 +00:00
Code Issues Projects Releases Wiki Activity

Added SOCKS4 support

Browse Source 
Beware socks4a extention is not supported. Target hostnames
therefore need to be resolved somehow.

Initial patch by David and sed :)
This commit is contained in:
henri
2013-04-22 19:34:11 +00:00
parent a3fbe7d7d6
commit ab6a7a4f9e
4 changed files with 225 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
nsock/src/Makefile.in
View File

@@ -27,11 +27,22 @@ NBASEDIR=@NBASEDIR@
TARGET = libnsock.a
SRCS = error.c filespace.c gh_list.c nsock_connect.c nsock_core.c nsock_iod.c nsock_proxy.c nsock_read.c nsock_timers.c nsock_write.c nsock_ssl.c nsock_event.c nsock_pool.c netutils.c nsock_pcap.c nsock_engines.c engine_select.c engine_epoll.c engine_kqueue.c engine_poll.c nsock_log.c proxy_http.c @COMPAT_SRCS@
SRCS = error.c filespace.c gh_list.c nsock_connect.c nsock_core.c \
nsock_iod.c nsock_read.c nsock_timers.c nsock_write.c \
nsock_ssl.c nsock_event.c nsock_pool.c netutils.c nsock_pcap.c \
nsock_engines.c engine_select.c engine_epoll.c engine_kqueue.c \
engine_poll.c nsock_proxy.c nsock_log.c proxy_http.c proxy_socks4.c \
@COMPAT_SRCS@
OBJS = error.o filespace.o gh_list.o nsock_connect.o nsock_core.o nsock_iod.o nsock_proxy.o nsock_read.o nsock_timers.o nsock_write.o nsock_ssl.o nsock_event.o nsock_pool.o netutils.o nsock_pcap.o nsock_engines.o engine_select.o engine_epoll.o engine_kqueue.o engine_poll.o nsock_log.o proxy_http.o @COMPAT_OBJS@
OBJS = error.o filespace.o gh_list.o nsock_connect.o nsock_core.o \
nsock_iod.o nsock_read.o nsock_timers.o nsock_write.o \
nsock_ssl.o nsock_event.o nsock_pool.o netutils.o nsock_pcap.o \
nsock_engines.o engine_select.o engine_epoll.o engine_kqueue.o \
engine_poll.o nsock_proxy.o nsock_log.o proxy_http.o proxy_socks4.o \
@COMPAT_OBJS@
DEPS = error.h filespace.h gh_list.h nsock_internal.h netutils.h nsock_pcap.h nsock_log.h nsock_proxy.h ../include/nsock.h $(NBASEDIR)/libnbase.a
DEPS = error.h filespace.h gh_list.h nsock_internal.h netutils.h nsock_pcap.h \
nsock_log.h nsock_proxy.h ../include/nsock.h $(NBASEDIR)/libnbase.a
.c.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@

2
nsock/src/nsock_proxy.c
View File

@@ -75,10 +75,12 @@ static void proxy_parser_delete(struct proxy_parser *parser);
/* --- Implemented proxy backends --- */
extern const struct proxy_op proxy_http_ops;
extern const struct proxy_op proxy_socks4_ops;
const static struct proxy_op *ProxyBackends[] = {
&proxy_http_ops,
&proxy_socks4_ops,
NULL
};

7
nsock/src/nsock_proxy.h
View File

@@ -64,6 +64,7 @@
/* ------------------- CONSTANTS ------------------- */
enum nsock_proxy_type {
PROXY_TYPE_HTTP = 0,
PROXY_TYPE_SOCKS4,
PROXY_TYPE_COUNT,
};
@@ -73,7 +74,11 @@ enum nsock_proxy_state {
/* HTTP proxy states. */
PROXY_STATE_HTTP_TCP_CONNECTED,
PROXY_STATE_HTTP_TUNNEL_ESTABLISHED
PROXY_STATE_HTTP_TUNNEL_ESTABLISHED,
/* SOCKS 4 proxy states. */
PROXY_STATE_SOCKS4_TCP_CONNECTED,
PROXY_STATE_SOCKS4_TUNNEL_ESTABLISHED,
};

203
nsock/src/proxy_socks4.c Normal file
View File

@@ -0,0 +1,203 @@
/***************************************************************************
* proxy_socks4.c -- SOCKS4 proxying. *
* *
***********************IMPORTANT NSOCK LICENSE TERMS***********************
* *
* The nsock parallel socket event library is (C) 1999-2012 Insecure.Com *
* LLC This library is free software; you may redistribute and/or *
* modify it under the terms of the GNU General Public License as *
* published by the Free Software Foundation; Version 2. This guarantees *
* your right to use, modify, and redistribute this software under certain *
* conditions. If this license is unacceptable to you, Insecure.Com LLC *
* may be willing to sell alternative licenses (contact *
* sales@insecure.com ). *
* *
* As a special exception to the GPL terms, Insecure.Com LLC grants *
* permission to link the code of this program with any version of the *
* OpenSSL library which is distributed under a license identical to that *
* listed in the included docs/licenses/OpenSSL.txt file, and distribute *
* linked combinations including the two. You must obey the GNU GPL in all *
* respects for all of the code used other than OpenSSL. If you modify *
* this file, you may extend this exception to your version of the file, *
* but you are not obligated to do so. *
* *
* If you received these files with a written license agreement stating *
* terms other than the (GPL) terms above, then that alternative license *
* agreement takes precedence over this comment. *
* *
* Source is provided to this software because we believe users have a *
* right to know exactly what a program is going to do before they run it. *
* This also allows you to audit the software for security holes (none *
* have been found so far). *
* *
* Source code also allows you to port Nmap to new platforms, fix bugs, *
* and add new features. You are highly encouraged to send your changes *
* to nmap-dev@insecure.org for possible incorporation into the main *
* distribution. By sending these changes to Fyodor or one of the *
* Insecure.Org development mailing lists, it is assumed that you are *
* offering the Nmap Project (Insecure.Com LLC) the unlimited, *
* non-exclusive right to reuse, modify, and relicense the code. Nmap *
* will always be available Open Source, but this is important because the *
* inability to relicense code has caused devastating problems for other *
* Free Software projects (such as KDE and NASM). We also occasionally *
* relicense the code to third parties as discussed above. If you wish to *
* specify special license conditions of your contributions, just say so *
* when you send them. *
* *
* This program is distributed in the hope that it will be useful, but *
* WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* General Public License v2.0 for more details *
* (http://www.gnu.org/licenses/gpl-2.0.html). *
* *
***************************************************************************/
/* $Id $ */
#include "nsock.h"
#include "nsock_internal.h"
#include <netdb.h>
#include <string.h>
#define DEFAULT_PROXY_PORT_SOCKS4 1080
struct socks4_data {
char version;
char type;
unsigned short port;
unsigned long address;
char null;
} __attribute__((packed));
/* ---- PROTOTYPES ---- */
static int proxy_socks4_node_new(struct proxy_node **node, const struct uri *uri);
static void proxy_socks4_node_delete(struct proxy_node *node);
static void proxy_socks4_handler(nsock_pool nspool, nsock_event nsevent, void *udata);
/* ---- PROXY DEFINITION ---- */
const struct proxy_op proxy_socks4_ops = {
.prefix = "socks4://",
.type = PROXY_TYPE_SOCKS4,
.node_new = proxy_socks4_node_new,
.node_delete = proxy_socks4_node_delete,
.handler = proxy_socks4_handler,
};
int proxy_socks4_node_new(struct proxy_node **node, const struct uri *uri) {
int rc;
struct proxy_node *proxy;
proxy = (struct proxy_node *)safe_zalloc(sizeof(struct proxy_node));
proxy->ops = &proxy_socks4_ops;
rc = proxy_resolve(uri->host, (struct sockaddr *)&proxy->ss, &proxy->sslen);
if (rc < 0)
goto err_out;
if (proxy->ss.ss_family != AF_INET) {
rc = -1;
goto err_out;
}
if (uri->port == -1)
proxy->port = DEFAULT_PROXY_PORT_SOCKS4;
else
proxy->port = (unsigned short)uri->port;
rc = 1;
err_out:
if (rc < 0) {
free(proxy);
proxy = NULL;
}
*node = proxy;
return rc;
}
void proxy_socks4_node_delete(struct proxy_node *node) {
if (node)
free(node);
}
static inline void socks4_init(struct socks4_data *socks4,
struct sockaddr_storage *ss, size_t sslen,
unsigned short port) {
struct sockaddr_in *sin = (struct sockaddr_in *)ss;
memset(socks4, 0x00, sizeof(struct socks4_data));
socks4->version = 4;
socks4->type = 1;
socks4->port = htons(port);
assert(ss->ss_family == AF_INET);
socks4->address = sin->sin_addr.s_addr;
}
void proxy_socks4_handler(nsock_pool nspool, nsock_event nsevent, void *udata) {
mspool *nsp = (mspool *)nspool;
msevent *nse = (msevent *)nsevent;
struct sockaddr_storage *ss;
size_t sslen;
unsigned short port;
struct proxy_node *next;
switch (nse->iod->px_ctx->px_state) {
struct socks4_data socks4;
case PROXY_STATE_INITIAL:
nse->iod->px_ctx->px_state = PROXY_STATE_SOCKS4_TCP_CONNECTED;
next = proxy_ctx_node_next(nse->iod->px_ctx);
if (next) {
ss = &next->ss;
sslen = next->sslen;
port = next->port;
} else {
ss = &nse->iod->px_ctx->target_ss;
sslen = nse->iod->px_ctx->target_sslen;
port = nse->iod->px_ctx->target_port;
}
socks4_init(&socks4, ss, sslen, port);
nsock_write(nspool, (nsock_iod)nse->iod, nsock_proxy_ev_dispatch,
4000, udata, (char *)&socks4, 9);
nsock_readbytes(nspool, (nsock_iod)nse->iod, nsock_proxy_ev_dispatch,
4000, udata, 8);
break;
case PROXY_STATE_SOCKS4_TCP_CONNECTED:
if (nse->type == NSE_TYPE_READ) {
char *res;
int reslen;
res = nse_readbuf(nse, &reslen);
if (!(reslen == 8 && res[1] == 90)) {
assert(0);
}
nse->iod->px_ctx->px_state = PROXY_STATE_SOCKS4_TUNNEL_ESTABLISHED;
if (nse->iod->px_ctx->px_current->next == NULL) {
forward_event(nsp, nse, udata);
} else {
nse->iod->px_ctx->px_current = nse->iod->px_ctx->px_current->next;
nse->iod->px_ctx->px_state = PROXY_STATE_INITIAL;
nsock_proxy_ev_dispatch(nsp, nse, udata);
}
}
break;
case PROXY_STATE_SOCKS4_TUNNEL_ESTABLISHED:
forward_event(nsp, nse, udata);
break;
default:
fatal("Invalid proxy state!");
}
}