Merge.

[irc/quakenet/newserv.git] / proxyscan / proxyscan.c

diff --git a/proxyscan/proxyscan.c b/proxyscan/proxyscan.c
index eab2cabd51aa74f11f526124f5a7fc61d8c6c29e..210686486377a1e5c0d9fb4249ba35fdbbecfe63 100644 (file)
--- a/proxyscan/proxyscan.c
+++ b/proxyscan/proxyscan.c
@@ -21,6 +21,13 @@
 #include <string.h>
 #include "../irc/irc.h"
 #include "../lib/irc_string.h"
+#include "../lib/version.h"
+#include "../channel/channel.h"
+#include "../localuser/localuserchannel.h"
+#include "../core/nsmalloc.h"
+#include "../lib/irc_ipv6.h"
+
+MODULE_VERSION("")
 
 #define SCANTIMEOUT      60
 
@@ -40,7 +47,9 @@ int scansdone;
 int rescaninterval;
 int warningsent;
 int glinedhosts;
-time_t starttime;
+time_t ps_starttime;
+int ps_cache_ext;
+int ps_extscan_ext;
 
 int numscans; /* number of scan types currently valid */
 scantype thescans[PSCAN_MAXSCANS];
@@ -61,6 +70,8 @@ unsigned long scanspermin;
 unsigned long tempscanspermin=0;
 unsigned long lastscants=0;
 
+unsigned int ps_start_ts=0;
+
 nick *proxyscannick;
 
 FILE *ps_logfile;
@@ -117,13 +128,26 @@ void _init(void) {
   sstring *cfgstr;
   int ipbits[4];
 
+  ps_start_ts = time(NULL);
+
+  ps_cache_ext = registernodeext("proxyscancache");
+  if( ps_cache_ext == -1 ) {
+    Error("proxyscan",ERR_INFO,"failed to reg node ext");
+    return;
+  }
+  ps_extscan_ext = registernodeext("proxyscanextscan");
+  if ( ps_extscan_ext == -1) { 
+    Error("proxyscan",ERR_INFO,"failed to reg node ext");
+    return;
+  }
+
   memset(scantable,0,sizeof(scantable));
   maxscans=200;
   activescans=0;
   queuedhosts=0;
   scansdone=0;
   warningsent=0;
-  starttime=time(NULL);
+  ps_starttime=time(NULL);
   glinedhosts=0;
 
   scanspermin=0;
@@ -153,10 +177,10 @@ void _init(void) {
   myip=((ipbits[0]&0xFF)<<24)+((ipbits[1]&0xFF)<<16)+
     ((ipbits[2]&0xFF)<<8)+(ipbits[3]&0xFF);
 
+#if defined(PROXYSCAN_MAIL)
   /* Mailer host */
   cfgstr=getcopyconfigitem("proxyscan","mailerip","",16);
   
-#if defined(PROXYSCAN_MAIL)
   psm_mailerfd=-1;
   if (cfgstr) {
     sscanf(cfgstr->content,"%d.%d.%d.%d",&ipbits[0],&ipbits[1],&ipbits[2],&ipbits[3]);
@@ -166,7 +190,7 @@ void _init(void) {
     freesstring(cfgstr);
     
     ps_mailname=getcopyconfigitem("proxyscan","mailname","some.mail.server",HOSTLEN);
-    Error("proxyscan",ERR_INFO,"Proxyscan mailer enabled; mailing to %s as %s.",IPtostr(ps_mailip),ps_mailname->content);
+    Error("proxyscan",ERR_INFO,"Proxyscan mailer enabled; mailing to %s as %s.",IPlongtostr(ps_mailip),ps_mailname->content);
   } else {
     ps_mailport=0;
     ps_mailname=NULL;
@@ -184,6 +208,9 @@ void _init(void) {
   /* Read in the clean hosts */
   loadcachehosts();
 
+  /* Read in any custom ports to scan */
+  loadextrascans();
+
   /* Set up the database */
   if ((proxyscandbinit())!=0) {
     brokendb=1;
@@ -203,6 +230,7 @@ void _init(void) {
   proxyscan_addscantype(STYPE_HTTP, 808);
   proxyscan_addscantype(STYPE_HTTP, 3332);
   proxyscan_addscantype(STYPE_HTTP, 2282);
+  proxyscan_addscantype(STYPE_SOCKS4, 559);
   proxyscan_addscantype(STYPE_SOCKS4, 1080);
   proxyscan_addscantype(STYPE_SOCKS5, 1080);
   proxyscan_addscantype(STYPE_SOCKS4, 1075);
@@ -211,6 +239,8 @@ void _init(void) {
   proxyscan_addscantype(STYPE_SOCKS5, 2280);
   proxyscan_addscantype(STYPE_SOCKS4, 1180);
   proxyscan_addscantype(STYPE_SOCKS5, 1180);
+  proxyscan_addscantype(STYPE_SOCKS4, 9999);
+  proxyscan_addscantype(STYPE_SOCKS5, 9999);
   proxyscan_addscantype(STYPE_WINGATE, 23);
   proxyscan_addscantype(STYPE_CISCO, 23);
   proxyscan_addscantype(STYPE_WINGATE, 1181);
@@ -221,7 +251,6 @@ void _init(void) {
   proxyscan_addscantype(STYPE_HTTP, 65506);
   proxyscan_addscantype(STYPE_HTTP, 63809);
   proxyscan_addscantype(STYPE_HTTP, 63000);
-  proxyscan_addscantype(STYPE_SOCKS4, 559);
   proxyscan_addscantype(STYPE_SOCKS4, 29992);
   
   /* Schedule saves */
@@ -233,6 +262,7 @@ void _init(void) {
 void registerproxyscannick(void *arg) {
   sstring *psnick,*psuser,*pshost,*psrealname;
   /* Set up our nick on the network */
+  channel *cp;
 
   psnick=getcopyconfigitem("proxyscan","nick","P",NICKLEN);
   psuser=getcopyconfigitem("proxyscan","user","proxyscan",USERLEN);
@@ -248,11 +278,22 @@ void registerproxyscannick(void *arg) {
   freesstring(psuser);
   freesstring(pshost);
   freesstring(psrealname);
+
+  cp=findchannel("#twilightzone");
+  if (!cp) {
+    localcreatechannel(proxyscannick,"#twilightzone");
+  } else {
+    localjoinchannel(proxyscannick,cp);
+    localgetops(proxyscannick,cp);
+  }
 }
 
 void _fini(void) {
 
   deregisterlocaluser(proxyscannick,NULL);
+  
+  releasenodeext(ps_cache_ext);
+  releasenodeext(ps_extscan_ext);
 
   deregisterhook(HOOK_NICK_NEWNICK,&proxyscan_newnick);
 
@@ -267,8 +308,9 @@ void _fini(void) {
   dumpcachehosts(NULL);
 
   /* free() all our structures */
-  sfreeall();
+  nsfreeall(POOL_PROXYSCAN);
   
+  freesstring(myipstr);
   freesstring(ps_mailname);
 #if defined(PROXYSCAN_MAIL)
   if (psm_mailerfd!=-1)
@@ -283,6 +325,9 @@ void proxyscanuserhandler(nick *target, int message, void **params) {
   nick *sender;
   char *msg;
   int i;
+  struct irc_in_addr sin;
+  unsigned char bits;
+  patricia_node_t *node;
 
   switch(message) {
   case LU_KILLED:
@@ -336,14 +381,14 @@ void proxyscanuserhandler(nick *target, int message, void **params) {
       }
 
       if (!ircd_strncmp(msg,"scan ",5)) {
-        unsigned long a,b,c,d;
-        if (4 != sscanf(&msg[5],"%lu.%lu.%lu.%lu",&a,&b,&c,&d)) {
-          sendnoticetouser(proxyscannick,sender,"Usage: scan a.b.c.d");
+        if (0 == ipmask_parse(&msg[5],&sin, &bits)) {
+          sendnoticetouser(proxyscannick,sender,"Usage: scan <ip>");
         } else {
-          sendnoticetouser(proxyscannick,sender,"Forcing scan of %lu.%lu.%lu.%lu",a,b,c,d);
-         /* Just queue the scans directly here.. plonk them on the priority queue */
-         for(i=0;i<numscans;i++) {
-           queuescan((a<<24)+(b<<16)+(c<<8)+d,thescans[i].type,thescans[i].port,SCLASS_NORMAL,time(NULL));
+          sendnoticetouser(proxyscannick,sender,"Forcing scan of %s",IPtostr(sin));
+         // * Just queue the scans directly here.. plonk them on the priority queue * /
+          node = refnode(iptree, &sin, bits); /* node leaks node here - should only allow to scan a nick? */
+          for(i=0;i<numscans;i++) {
+           queuescan(node,thescans[i].type,thescans[i].port,SCLASS_NORMAL,time(NULL));
          }
         }      
       }
@@ -426,9 +471,8 @@ scan *findscan(int fd) {
   return NULL;
 }
 
-void startscan(unsigned int IP, int type, int port, int class) {
+void startscan(patricia_node_t *node, int type, int port, int class) {
   scan *sp;
-
   float scantmp;
 
   if (scansdone>maxscans)
@@ -451,14 +495,14 @@ void startscan(unsigned int IP, int type, int port, int class) {
   
   sp->outcome=SOUTCOME_INPROGRESS;
   sp->port=port;
-  sp->IP=IP;
+  sp->node=node;
   sp->type=type;
   sp->class=class;
   sp->bytesread=0;
   sp->totalbytesread=0;
   memset(sp->readbuf, '\0', PSCAN_READBUFSIZE);
 
-  sp->fd=createconnectsocket(sp->IP,sp->port);
+  sp->fd=createconnectsocket(irc_in_addr_v4_to_int(&((patricia_node_t *)sp->node)->prefix->sin),sp->port);
   sp->state=SSTATE_CONNECTING;
   if (sp->fd<0) {
     /* Couldn't set up the socket? */
@@ -497,21 +541,23 @@ void killsock(scan *sp, int outcome) {
   if (sp->outcome==SOUTCOME_CLOSED &&
       ((sp->class==SCLASS_CHECK) ||
        (sp->class==SCLASS_NORMAL && (sp->state==SSTATE_SENTREQUEST || sp->state==SSTATE_GOTRESPONSE))))
-    queuescan(sp->IP, sp->type, sp->port, SCLASS_PASS2, time(NULL)+300);
+    queuescan(sp->node, sp->type, sp->port, SCLASS_PASS2, time(NULL)+300);
 
   if (sp->outcome==SOUTCOME_CLOSED && sp->class==SCLASS_PASS2)
-    queuescan(sp->IP, sp->type, sp->port, SCLASS_PASS3, time(NULL)+300);
+    queuescan(sp->node, sp->type, sp->port, SCLASS_PASS3, time(NULL)+300);
 
   if (sp->outcome==SOUTCOME_CLOSED && sp->class==SCLASS_PASS3)
-    queuescan(sp->IP, sp->type, sp->port, SCLASS_PASS4, time(NULL)+300);
+    queuescan(sp->node, sp->type, sp->port, SCLASS_PASS4, time(NULL)+300);
 
   if (sp->outcome==SOUTCOME_OPEN) {
     hitsbyclass[sp->class]++;
   
     /* Lets try and get the cache record.  If there isn't one, make a new one. */
-    if (!(chp=findcachehost(sp->IP)))
-      chp=addcleanhost(sp->IP, time(NULL));
-    
+    if (!(chp=findcachehost(sp->node))) {
+      chp=addcleanhost(time(NULL));
+      patricia_ref_prefix(sp->node->prefix);
+      sp->node->exts[ps_cache_ext] = chp;
+    }
     /* Stick it on the cache's list of proxies, if necessary */
     for (fpp=chp->proxies;fpp;fpp=fpp->next)
       if (fpp->type==sp->type && fpp->port==sp->port)
@@ -527,12 +573,12 @@ void killsock(scan *sp, int outcome) {
     
     if (!chp->glineid) {
       glinedhosts++;
-      loggline(chp);
+      loggline(chp, sp->node);
       irc_send("%s GL * +*@%s 1800 :Open Proxy, see http://www.quakenet.org/openproxies.html - ID: %d",
-              mynumeric->content,IPtostr(sp->IP),chp->glineid);
-      Error("proxyscan",ERR_DEBUG,"Found open proxy on host %s",IPtostr(sp->IP));
+              mynumeric->content,IPtostr(((patricia_node_t *)sp->node)->prefix->sin),chp->glineid);
+      Error("proxyscan",ERR_DEBUG,"Found open proxy on host %s",IPtostr(((patricia_node_t *)sp->node)->prefix->sin));
     } else {
-      loggline(chp);  /* Update log only */
+      loggline(chp, sp->node);  /* Update log only */
     }
 
     /* Update counter */
@@ -740,8 +786,11 @@ void killallscans() {
   for(i=0;i<SCANHASHSIZE;i++) {
     for(sp=scantable[i];sp;sp=sp->next) {
       /* If there is a pending scan, delete it's clean host record.. */
-      if ((chp=findcachehost(sp->IP)) && !chp->proxies)
+      if ((chp=findcachehost(sp->node)) && !chp->proxies) {
+        sp->node->exts[ps_cache_ext] = NULL;
+        derefnode(iptree,sp->node); 
         delcachehost(chp);
+      }
         
       if (sp->fd!=-1) {
        deregisterhandler(sp->fd,1);
@@ -789,7 +838,7 @@ void proxyscandostatus(nick *np) {
   int totaldetects=0;
   int ord[PSCAN_MAXSCANS];
   
-  sendnoticetouser(proxyscannick,np,"Service uptime: %s",longtoduration(time(NULL)-starttime, 1));
+  sendnoticetouser(proxyscannick,np,"Service uptime: %s",longtoduration(time(NULL)-ps_starttime, 1));
   sendnoticetouser(proxyscannick,np,"Total scans completed:  %d",scansdone);
   sendnoticetouser(proxyscannick,np,"Total hosts glined:     %d",glinedhosts);
 
@@ -802,7 +851,8 @@ void proxyscandostatus(nick *np) {
   sendnoticetouser(proxyscannick,np,"Timed queued scans:     %d",prioqueuedscans);
   sendnoticetouser(proxyscannick,np,"'Clean' cached hosts:   %d",cleancount());
   sendnoticetouser(proxyscannick,np,"'Dirty' cached hosts:   %d",dirtycount());
-  
+ 
+  sendnoticetouser(proxyscannick,np,"Extra scans: %d", extrascancount());
   for (i=0;i<5;i++)
     sendnoticetouser(proxyscannick,np,"Open proxies, class %1d:  %d/%d (%.2f%%)",i,hitsbyclass[i],scansbyclass[i],((float)hitsbyclass[i]*100)/scansbyclass[i]);
   
@@ -828,6 +878,8 @@ void proxyscandebug(nick *np) {
   int activescansfound=0;
   int totalscansfound=0;
   scan *sp;
+  patricia_node_t *node;
+  cachehost *chp;
 
   sendnoticetouser(proxyscannick,np,"Active scans : %d",activescans);
   
@@ -838,9 +890,17 @@ void proxyscandebug(nick *np) {
       }
       totalscansfound++;
       sendnoticetouser(proxyscannick,np,"fd: %d type: %d port: %d state: %d outcome: %d IP: %s",
-                      sp->fd,sp->type,sp->port,sp->state,sp->outcome,IPtostr(sp->IP));
+                      sp->fd,sp->type,sp->port,sp->state,sp->outcome,IPtostr(((patricia_node_t *)sp->node)->prefix->sin));
     }
   }
 
+  PATRICIA_WALK (iptree->head, node) {
+    if ( node->exts[ps_cache_ext] ) {
+      chp = (cachehost *) node->exts[ps_cache_ext];
+      if (chp)
+        sendnoticetouser(proxyscannick,np,"node: %s , chp: %p", IPtostr(((patricia_node_t *)node)->prefix->sin), chp);
+    }
+  } PATRICIA_WALK_END;
+
   sendnoticetouser(proxyscannick,np,"Total %d scans actually found (%d active)",totalscansfound,activescansfound);
 }