mirror of
https://github.com/unrealircd/unrealircd.git
synced 2026-07-10 01:43:12 +02:00
+- Added scan_http, scans on 80, 3128, 8080 in a threaded manner
This commit is contained in:
stskeeps
@@ -797,3 +797,4 @@ seen. gmtime warning still there
|
||||
helping fix the bug
|
||||
- Fixed a win32 bug that can cause unexpected crashes while using the editor
|
||||
- Some httpd stuff and a #define CHROOTDIR problem found by Zhadum
|
||||
- Added scan_http, scans on 80, 3128, 8080 in a threaded manner
|
||||
|
||||
@@ -27,7 +27,7 @@ INCLUDES = ../include/struct.h ../include/config.h \
|
||||
R_MODULES=m_sethost.so m_chghost.so m_chgident.so m_setname.so \
|
||||
m_setident.so m_sdesc.so m_svsmode.so m_swhois.so\
|
||||
m_svsmotd.so m_svsnline.so m_who.so \
|
||||
scan.so scan_socks.so web/httpd.so
|
||||
scan.so scan_socks.so scan_http.so web/httpd.so
|
||||
|
||||
COMMANDS=m_sethost.c m_chghost.c m_chgident.c m_setname.c m_setident.c \
|
||||
m_sdesc.c m_svsmode.c m_swhois.c m_svsmotd.c m_svsnline.c \
|
||||
@@ -96,6 +96,10 @@ scan_socks.so: scan_socks.c $(INCLUDES)
|
||||
$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
|
||||
-o scan_socks.so scan_socks.c
|
||||
|
||||
scan_http.so: scan_http.c $(INCLUDES)
|
||||
$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
|
||||
-o scan_http.so scan_http.c
|
||||
|
||||
web/httpd.so: web/httpd.c web/u_stats.c web/vfs.c web/phtml.c $(INCLUDES)
|
||||
$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
|
||||
-o web/httpd.so web/httpd.c web/u_stats.c web/vfs.c web/phtml.c
|
||||
|
||||
@@ -0,0 +1,291 @@
|
||||
/*
|
||||
* IRC - Internet Relay Chat, src/modules/scan_http.c
|
||||
* (C) 2001 Carsten Munk (Techie/Stskeeps) <stskeeps@tspre.org>
|
||||
*
|
||||
* SOCKS4 scanning module for scan.so
|
||||
*
|
||||
* See file AUTHORS in IRC package for additional names of
|
||||
* the programmers.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 1, or (at your option)
|
||||
* any later version.
|
||||
*
|
||||
* 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 for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
|
||||
*/
|
||||
#include "config.h"
|
||||
#include "struct.h"
|
||||
#include "common.h"
|
||||
#include "sys.h"
|
||||
#include "numeric.h"
|
||||
#include "msg.h"
|
||||
#include "channel.h"
|
||||
#include <time.h>
|
||||
#include <sys/stat.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#ifdef _WIN32
|
||||
#include <io.h>
|
||||
#else
|
||||
#include <sys/socket.h>
|
||||
#include <sys/file.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/resource.h>
|
||||
#endif
|
||||
#include <fcntl.h>
|
||||
#include "h.h"
|
||||
#ifdef STRIPBADWORDS
|
||||
#include "badwords.h"
|
||||
#endif
|
||||
#ifdef _WIN32
|
||||
#include "version.h"
|
||||
#endif
|
||||
|
||||
#include "modules/scan.h"
|
||||
#include "modules/blackhole.h"
|
||||
|
||||
typedef struct _hsstruct HSStruct;
|
||||
|
||||
struct _hsstruct
|
||||
{
|
||||
HStruct *hs;
|
||||
int port;
|
||||
};
|
||||
|
||||
|
||||
iFP xVS_add = NULL;
|
||||
ConfigItem_blackhole *blackh_conf = NULL;
|
||||
void scan_http_scan(HStruct *h);
|
||||
void scan_http_scan_port(HSStruct *z);
|
||||
#ifndef DYNAMIC_LINKING
|
||||
ModuleInfo scan_http_info
|
||||
#else
|
||||
ModuleInfo mod_header
|
||||
#endif
|
||||
= {
|
||||
2,
|
||||
"scan_http", /* Name of module */
|
||||
"$Id$", /* Version */
|
||||
"scanning API: http proxies", /* Short description of module */
|
||||
NULL, /* Pointer to our dlopen() return value */
|
||||
NULL
|
||||
};
|
||||
|
||||
/*
|
||||
* Our symbol depencies
|
||||
*/
|
||||
#ifdef STATIC_LINKING
|
||||
MSymbolTable scan_http_depend[] = {
|
||||
#else
|
||||
MSymbolTable mod_depend[] = {
|
||||
#endif
|
||||
SymD(VS_Add, xVS_add),
|
||||
SymD(HSlock, xHSlock),
|
||||
SymD(VSlock, xVSlock),
|
||||
SymD(blackhole_conf, blackh_conf),
|
||||
{NULL, NULL}
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* The purpose of these ifdefs, are that we can "static" link the ircd if we
|
||||
* want to
|
||||
*/
|
||||
|
||||
/* This is called on module init, before Server Ready */
|
||||
#ifdef DYNAMIC_LINKING
|
||||
DLLFUNC int mod_init(int module_load)
|
||||
#else
|
||||
int scan_http_init(int module_load)
|
||||
#endif
|
||||
{
|
||||
/*
|
||||
* Add scanning hooks
|
||||
*/
|
||||
add_HookX(HOOKTYPE_SCAN_HOST, NULL, scan_http_scan);
|
||||
}
|
||||
|
||||
/* Is first run when server is 100% ready */
|
||||
#ifdef DYNAMIC_LINKING
|
||||
DLLFUNC int mod_load(int module_load)
|
||||
#else
|
||||
int scan_http_load(int module_load)
|
||||
#endif
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
/* Called when module is unloaded */
|
||||
#ifdef DYNAMIC_LINKING
|
||||
DLLFUNC void mod_unload(void)
|
||||
#else
|
||||
void scan_http_unload(void)
|
||||
#endif
|
||||
{
|
||||
del_HookX(HOOKTYPE_SCAN_HOST, NULL, scan_http_scan);
|
||||
}
|
||||
|
||||
#define HICHAR(s) (((unsigned short) s) >> 8)
|
||||
#define LOCHAR(s) (((unsigned short) s) & 0xFF)
|
||||
|
||||
|
||||
void scan_http_scan(HStruct *h)
|
||||
{
|
||||
THREAD thread[5];
|
||||
THREAD_ATTR thread_attr;
|
||||
HSStruct *p = NULL;
|
||||
|
||||
IRCMutexLock((*xHSlock));
|
||||
/* First we take 3128 .. */
|
||||
h->refcnt++;
|
||||
p = MyMalloc(sizeof(HSStruct));
|
||||
p->hs = h;
|
||||
p->port = 3128;
|
||||
IRCCreateThread(thread[0], thread_attr, scan_http_scan_port, p);
|
||||
/* Then we take 8080 .. */
|
||||
h->refcnt++;
|
||||
p = MyMalloc(sizeof(HSStruct));
|
||||
p->hs = h;
|
||||
p->port = 80;
|
||||
IRCCreateThread(thread[1], thread_attr, scan_http_scan_port, p);
|
||||
/* And then we try to infect them with Code Red .. */
|
||||
h->refcnt++;
|
||||
p = MyMalloc(sizeof(HSStruct));
|
||||
p->hs = h;
|
||||
p->port = 80;
|
||||
IRCCreateThread(thread[2], thread_attr, scan_http_scan_port, p);
|
||||
IRCMutexUnlock((*xHSlock));
|
||||
IRCJoinThread(thread[0], NULL);
|
||||
IRCJoinThread(thread[1], NULL);
|
||||
IRCJoinThread(thread[2], NULL);
|
||||
IRCMutexLock((*xHSlock));
|
||||
h->refcnt--;
|
||||
IRCMutexUnlock((*xHSlock));
|
||||
IRCExitThread(NULL);
|
||||
return;
|
||||
}
|
||||
|
||||
void scan_http_scan_port(HSStruct *z)
|
||||
{
|
||||
HStruct *h = z->hs;
|
||||
int retval;
|
||||
char host[SCAN_HOSTLENGTH];
|
||||
struct sockaddr_in sin;
|
||||
SOCKET fd;
|
||||
int sinlen = sizeof(struct sockaddr_in);
|
||||
unsigned short sport = blackh_conf->port;
|
||||
unsigned char httpbuf[160];
|
||||
fd_set rfds;
|
||||
struct timeval tv;
|
||||
int len;
|
||||
/* Get host */
|
||||
IRCMutexLock((*xHSlock));
|
||||
strcpy(host, h->host);
|
||||
IRCMutexUnlock((*xHSlock));
|
||||
/* IPv6 ?*/
|
||||
if (strchr(host, ':'))
|
||||
goto exituniverse;
|
||||
|
||||
sin.sin_addr.s_addr = inet_addr(host);
|
||||
if ((fd = socket(AFINET, SOCK_STREAM, 0)) < 0)
|
||||
{
|
||||
goto exituniverse;
|
||||
return;
|
||||
}
|
||||
|
||||
sin.sin_port = htons(z->port);
|
||||
sin.sin_family = AF_INET;
|
||||
/* We do this non-blocking to prevent a hang of the entire ircd with newer
|
||||
* versions of glibc. Don't you just love new "features?"
|
||||
* Passing null to this is probably bad, a better method is needed.
|
||||
* Maybe a version of set_non_blocking that doesn't send error messages?
|
||||
* -Zogg
|
||||
*
|
||||
* set_non_blocking(fd,cptr)
|
||||
* when cptr == NULL, it doesnt error - changed some months ago
|
||||
* also, don't we need a select loop to make this better?
|
||||
* -Stskeeps
|
||||
* I just gave a select loop a shot (select in a while(), waiting for
|
||||
* the thing to either set the writable flags or return a -# and set
|
||||
* errno to EINTR. Could be my ignorance, or my glibc, but select()
|
||||
* NEVER returned a negative number, and if I passed it a timeout (ie, tv)
|
||||
* then the loops never ended, either.
|
||||
* -Zogg
|
||||
*/
|
||||
set_non_blocking(fd, NULL);
|
||||
if ((retval = connect(fd, (struct sockaddr *)&sin,
|
||||
sizeof(sin))) == -1 && ERRNO != P_EINPROGRESS)
|
||||
{
|
||||
/* we have no http server! */
|
||||
CLOSE_SOCK(fd);
|
||||
goto exituniverse;
|
||||
return;
|
||||
}
|
||||
|
||||
/* We wait for write-ready */
|
||||
tv.tv_sec = 40;
|
||||
tv.tv_usec = 0;
|
||||
FD_ZERO(&rfds);
|
||||
FD_SET(fd, &rfds);
|
||||
if (!select(fd + 1, NULL, &rfds, NULL, &tv))
|
||||
{
|
||||
CLOSE_SOCK(fd);
|
||||
goto exituniverse;
|
||||
}
|
||||
|
||||
sin.sin_addr.s_addr = inet_addr(blackh_conf->outip ? blackh_conf->outip : blackh_conf->ip);
|
||||
bzero(httpbuf, sizeof(httpbuf));
|
||||
sprintf(httpbuf, "CONNECT %s:%i HTTP/1.1\n\n",
|
||||
blackh_conf->ip, blackh_conf->port);
|
||||
|
||||
if ((retval = send(fd, httpbuf, strlen(httpbuf), 0)) != strlen(httpbuf))
|
||||
{
|
||||
CLOSE_SOCK(fd);
|
||||
goto exituniverse;
|
||||
}
|
||||
/* Now we wait for data. 10 secs ought to be enough */
|
||||
tv.tv_sec = 10;
|
||||
tv.tv_usec = 0;
|
||||
FD_ZERO(&rfds);
|
||||
FD_SET(fd, &rfds);
|
||||
if (retval = select(fd + 1, &rfds, NULL, NULL, &tv))
|
||||
{
|
||||
/* There's data in the jar. Let's read it */
|
||||
len = recv(fd, httpbuf, 13, 0);
|
||||
CLOSE_SOCK(fd);
|
||||
if (len < 4)
|
||||
{
|
||||
goto exituniverse;
|
||||
}
|
||||
ircd_log(LOG_ERROR, "%s", httpbuf);
|
||||
if (!strncmp(httpbuf, "HTTP/1.0 200", 12))
|
||||
{
|
||||
/* Gotcha */
|
||||
IRCMutexLock((*xVSlock));
|
||||
(*xVS_add)(host, "Open HTTP proxy");
|
||||
IRCMutexUnlock((*xVSlock));
|
||||
goto exituniverse;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
CLOSE_SOCK(fd);
|
||||
}
|
||||
exituniverse:
|
||||
MyFree(z);
|
||||
IRCMutexLock((*xHSlock));
|
||||
h->refcnt--;
|
||||
IRCMutexUnlock((*xHSlock));
|
||||
IRCExitThread(NULL);
|
||||
return;
|
||||
}
|
||||
@@ -243,7 +243,6 @@ void scan_socks_scan(HStruct *h)
|
||||
}
|
||||
else
|
||||
{
|
||||
socksbuf[0] = retval;
|
||||
CLOSE_SOCK(fd);
|
||||
}
|
||||
exituniverse:
|
||||
|
||||
Reference in New Issue
Block a user