From a458460cec77aceefdcd9b966e5c1813ea16c883 Mon Sep 17 00:00:00 2001
From: Georg <georg@lysergic.dev>
Date: Thu, 26 Aug 2021 16:58:04 +0200
Subject: [PATCH] Adding option for sample IP

Signed-off-by: Georg <georg@lysergic.dev>
---
 __pycache__/config.cpython-38.pyc | Bin 2233 -> 2453 bytes
 __pycache__/plugin.cpython-38.pyc | Bin 8221 -> 8248 bytes
 config.py                         |  10 ++++++++++
 plugin.py                         |  10 ++++++----
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/__pycache__/config.cpython-38.pyc b/__pycache__/config.cpython-38.pyc
index ee342f3ce1d412b456e0e698371a56d199263644..172cadd5c7b0679b0bf6d57baffefd77e68382db 100644
GIT binary patch
delta 471
zcmZvWJ5Rz;6vulDA~Zar_!jk`D53^82Um4qL1NMU>N!B6w4}E{;vk>EMAEoJ;-V{)
zo1eqaqR~<zk?7e@e*f3&%ws%y8Hp&8d-ijhU&Oo71bgW2zjZ<stVVEw<f?*;xP&pB
zzxVZhOd{3`du+Kcd!MJQMsdZ{u3}<BJEm(cjo~_O{7YfflN{5liRev|d&3!9eR(ut
z9Gh}U47YLT4@rAu7c)NuL#mY78$7X3xf2k)-q7h?x_wc=J=HJ^+!ACRL$RU>;JR+M
z1=uDCvVnt5!q$v3<O;wMEfV4Yv=Z1Af`;BKYX*pl>w#+mYH_{EZ9*^&(6W?u?Yeox
zbuh?on^r9g#iL<ITXPL&i!4h+8aDn)CjlkPtb>|AFXm3p)TFo4>G>Oj*(v5@31=>N
b$nKoeU@8^}Gld11?2|wIU;b&Q7R-MG-p7I~

delta 227
zcmbO#yi<@bl$V!_0SJ=X)Ds^IPUMqeESac%Ae<+aBa1ghY#|dPLn`9}P7p7PFGW0+
zDT^ybB1JNVKSi{cc_A~3tQ1g|KSer42CJ+rNbh6^Mj5vSTq$xXiVK<0v@4}DE#Oa4
zPEo;-Q3cDWrKm$>QaFPdG&MFKVEoH8xtKMd=@!H0N34v@j8c=IaOg7@O%~x)VP@uG
Job1l&2LNFOH@W}-

diff --git a/__pycache__/plugin.cpython-38.pyc b/__pycache__/plugin.cpython-38.pyc
index 37a61da964b9a05a366f15e0dfb8a293b4b12042..461f9d94d4d2abe8a7376f916948b79b5a7ea095 100644
GIT binary patch
delta 974
zcmZ9KPfQa*6vp@MmTkM;?QWOtUkWXPK@zE&iYCMoP)sz@hNvVaTxdH*5Lj@*n2;$N
zy_sm5OrjVe0S`z#7)>u6Ja{ni;N63F4_rN%=mC8@w4|_``SP1L-+TMsWY>pwhO{wF
zQv`hAT~Fc5N9~_1id{9+`%{wsLRW21xhTRTHmt?MbV=NhsAm%@9s<-eBUiymvRN(j
zkO~`KB5#6YH>jf63Y9lx;zj#D`H%v{Ur}*sxPnBf=v27tqY4Q;gNi{^>ZLyFrwR>F
zm1;y=^HoA5NJB)A3$F!YAcZ)YNUfYKr13Dv2x62|j2dW<<37RnZAeK@?MNLit(z4S
zoApzmA~iQ95J;*%(|3|SpiXu>c&5i4BFe{chlr75)S_V;p-~zmU28Hn*^PB|_92+-
zYpPfU`&_-M=sf0Cy;YY^VSP?4p=ZI%@_HO}Hl=4fo3ibv^<2qOd4^m?VxRP3^zP}s
z;U+H`;2lfO4!dAv15N$1Wup!KFN|EO*?)=qJ<dro(jfNB=tt*?Q0kELTK#;5TyGGY
z3}p{_Zt{~BM<BNv#CAes=M{dt-R|ukx$8y-J;<PByq-(hh<RB*lFL@jC#L#fYJPe#
zvsjp0m@V&m@TX;&R+20tEL&+kB%RLYa)X0<TFg(EW(M@MQ)2I1`}+tQoU^V=ON%$k
zg;~2WS9XufZcI&!S4T_p_w6M&G|3Fhf;;TEHKG0RE|upNiUqq@c8ct!^&5)pd3Xg?
zi>#t<MZTii(Ph-#=oV@<76rn#V{eg1<5wWSUd6MX6n=(%i|4~7w~>S^QCE0h<yt1;
zhxX4H5I_-CQ2_-!prY=-7^#i6Z36_^pX64HlSd<a(>?+5n$+P3Sg2_!9pK)7D0KRp

delta 985
zcmZ9KL1@!Z7{~L{Hf_@;Y0`FS*LCf1po6L1x(Wt6=jvgCQ`sCI9MZI}gKe&pI4|R6
z9=r)c;ax;G=|DCW5u_kH=t<C<h{xR&Jb2l0pa=DPX*;?lypP}ezW?{nm&e-~+ZdB(
zBuV7pF`gec&%KrY34(BA;_9X8hV1?6^6q+?n|*PdA1rw|j_?cIEN{DPH*pcPfEM|h
z$GWw`*ImTDiEKAU#Jwn3f9afb>OK~1kqC7Gd!ZD-K063Yf+b_Wtq^X(OGGR_LUsrT
zh?n??pNJ$tf<(f>b)T(biKtkPb5A*}0EHY<fi#E0KoN(cKwS>$Bn0Xh?BntCtg#y~
z;gouSl8iPqTO(ZEM-btOw&_9~?qyTgkhOzT2b88&c_`2aqwCF|ps(ZvlIbTof3l;u
zhN@>;{k(;pes7J@X>f9gW|VA#`NZ%LiI6DKNemCKd*BEAVJ4ZbDcQab$LhlazdgrA
z0KYx@O}PMHkAw!I9a?NS^SZ1jbSjiRG;J-!rhOgCr#kfoNAI>|e6dZ`r{+L8s-_Mp
zFSqJNJlQ5n)a)V6bgS|MUvCrrqRyQ4J7?R^&i2SjH#^|Yv^p5wbb1-h(yyvc?`ng}
z5eNE4dl1%!%}mx9$z(D{E@$B3jA771826ZPe^(=EMRjGe`TXdplIE|>mlq8sZI$T9
zaBjQ|0&9e+q%=QOF>hDRr3x!!mJ6o&OV`TF_o^!_RbeT)=}>4V=co}WYQNl2+x4zg
zmhP0y>VROGbUU(-O!_Rk1~J+77~;FG&k)!2Rfxa!Er|7)j>>c=whdg2Pau)LjA!Zh
z_++#MepWXNIt$L2xKZf#qxgGBa7g5Xyoh|rje<yIFYj*5Cte^Fq*`*z^#>iJACg6+
RH+p;h2vr*=QVK%L{{f)f0PFw&

diff --git a/config.py b/config.py
index cb1084a..9617979 100644
--- a/config.py
+++ b/config.py
@@ -61,6 +61,9 @@ conf.registerGlobalValue(SnoParser, 'AutoVhost',
 conf.registerGlobalValue(SnoParser, 'preventHighlight',
     registry.Boolean(True, ("""Toggles in channel highlights with ZWSP""")))
 
+###
+##  WHOIS related settings below:
+###
 conf.registerGroup(SnoParser, 'whois')
 conf.registerGlobalValue(SnoParser.whois, 'debug',
     registry.Boolean('false',
@@ -69,6 +72,13 @@ conf.registerGlobalValue(SnoParser.whois, 'debug',
     """
     , private=True
 ))
+conf.registerGlobalValue(SnoParser.whois, 'sample',
+    registry.String('',
+    """
+    SnoParser: This allows to set a testing IP address, if the plugin shall be evaluated on i.e. a local network. This will override all IP addresses from SNOTICES!
+    """
+    , private=True
+))
 conf.registerGroup(SnoParser.whois, 'redis')
 conf.registerGlobalValue(SnoParser.whois.redis, 'host',
     registry.String('127.0.0.1',
diff --git a/plugin.py b/plugin.py
index 39e2457..10eddb5 100644
--- a/plugin.py
+++ b/plugin.py
@@ -85,7 +85,7 @@ class SnoParser(callbacks.Plugin):
                asn = whoisres['asn_registry']
                country = whoisres['asn_country_code']
                description = whoisres['asn_description']
-               whoisout = 'WHOIS ' + asn + ' ' + country + ' ' + description
+               whoisout = '# ' + asn + ' ' + country + ' ' + description
         except ipwhois.exceptions.IPDefinedError:
                whoisout = 'RFC 4291 (Local)'
 
@@ -124,7 +124,7 @@ class SnoParser(callbacks.Plugin):
             print("DEBUG - ELSE WHOIS_FRESH CALLED")
             print(data)
             print(sourceip)
-            if data.startswith("WHOIS"):
+            if data.startswith("#"):
                 #data["cache"] = False
                 print("DEBUG - CACHE: FALSE")
                 data = json.dumps(data)
@@ -167,8 +167,10 @@ class SnoParser(callbacks.Plugin):
                 nickname = couple.group(1)
                 username = couple.group(2)
                 host = couple.group(3)
-                #ip = couple.group(4)
-                ip = '2a03:4000:55:d20::'
+                if self.registryValue('whois.sample'):
+                    ip = self.registryValue('whois.sample')
+                else:
+                    ip = couple.group(4)
                 realname = couple.group(5)
                 ip_seen = 0
                 nick_seen = 0