From e542df33775ce77bced6fd8b2fec7738c33ecbc5 Mon Sep 17 00:00:00 2001 From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 27 Jun 2021 23:51:30 +0200 Subject: [PATCH] :bug: fix ip address lookup --- package-lock.json | Bin 670808 -> 653984 bytes package.json | 2 +- src/util/ipAddress.ts | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 321c36e320adc0c4f5af7b6ae2a08493f21a5744..90fb4674bb666c845948aef3b5a1a8c72570cfbe 100644 GIT binary patch delta 3222 zcmd5;Yj6|S8J*qL?n<@+8~ng7*uvp87M6A;tsW!=%aZl5E$d;e{1}=>mL+SY)x&z5 zkW!M8HZ&w)W%zzTg5BxRCR19dr`%B9DQ%~nQlO-52$Yaeeq=%iXiMAaBdG)-o$#xF zXu5y)-m`aS&pqG$&e^yAwtD8yssr0dOf&a&vh}UGOINNDbBC|3l@LWC3Ge=eSd1Bg z)l+P3d7e>qssfdJC!=J6eU)zahocj5&YAbx`y)j~GSj0jCPT3iJ!6WPyfIBc7l{oh zG>#-24KhqLJDIcPiz8y6n6dJaIN#%A{9HDqGY3Z%)&x3G%gns@;swdvr1Mew@yG z1Z+`Dnj7xYzDHh_%88;%qh*;AtL$tFCq*$?=uC&kg>)#G&9twTx3fwPW|MeZiMc_| zU4P%TXl~tyzv@D7ug88KM(4hT{aTHVT*5YVL0db%1ZLjAHE^y^CI^L|=1ZxcG(pKv zKZca8xP^iPt8fw}R^XAEd7t_a+&&{|hG`AOta^|_S>^|!&I+Y1*Qs{CESab^3mZ4) zC$pSIs}1;u$E>3p71r$3u%FGREd#pAbVw{_!y}%)A*Rp845@vpNUXdzuKqAN<&INT~4D3m#AuW>xqrF!ZWqCA`Vve}sfl(o(A3ErGUeG8L-T z;$01>zZdVN(0Ba!`>m*vrPxKy{FEUYjjuiXn?& z(gb_$k?fFMSG$nu6jFC_P5GFA0*lG< zKqgYbwMtg6WV!q6#dNMS7zjo}m1kV}6?WGVnu9M);~j9xK(xWEL&Ct7^#lcskywDS zrBnOlyrJj{dhL00G?5IB4|2g&Vc0Y5-x!ZaxDcnv1bWmSTQcN{kM+g9gSuXg-;+wY zU5+f{OvHN>+M+m`%*Ce|o7=`%7^mOi85=OMrJbugATwRo?n~XoQaG8yB(R*3so`b4>6NOs83Eo(XX}n{A`X>KY!gK2;{FOj1%jfEIw zr}0G)i;|y%+UhC|9FCF;;llSN%lUwow|N3XZaZg;yN3CZgvq836%s+upjOaYwHjYu z)0;Fo6&bbPVu}wM2QqyITgu|>Pn+%TSjOtpM>KsppDW1^B-E)fy*D{r)RwT?4(KP# z!ZWDMTuaFRjM}2wWu_$}KhTZjCEPyi#j8sH2umFOdvtxcoSm2nAhw zhmf_pqvNWP?$BgmC^2Oj8q4+DjibY!ac9_KGWdFu`c$49HcW-ndB00j9P1tH=fxhc z*_jXPhM9D>3wJ1M$=O z=-3Lv_9D_9A`TkR>6^ry3A(x^5_D_5cK zd{%-x(dAY$+==!&$sc`yo>@!%m_Rk_DKGKg6-PnMzThs*wy10bCrAJ43T1%mW8|V$y|IeXt{vE0l zc05K)E2*&lJ#rQ(p&34OW!v| z$))Js*XgSNk>%fhja)N&_s`_6w?72W_rRXTxC~x;jcSlo5&};Bo@D=H{5Z=2_9nUP z;aEQeN^~Q1y-d!N-VY==zm;zKI0Uv+?EMf>U6QTvKa>zCz?LUTmYxcTqL9f#>V&in zJV)p|aCH+&Q}wAO@6x*qeyNOV?>I$iclL;`pSK5JmN9lcapH%=r3Zt7p zNq{dGq|NBBXJ|z=`rSqPZ5s-=ODAbK=EG~?ouw4H>rYtCrwt#K4SzR=Ug(tWu0daX zRC@6#r2nCGD}xI`xCulHT)j#B26mj4R-v!mkp9+yK2pgH3D|i;@*$jjj$DY=&B|V` bhSM=>Av(EV_GmZy!EIUBDzvzzs;m9qtO7)v delta 11036 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 KuRgEF=Kd3ceb6fa diff --git a/package.json b/package.json index aead4876..e66a588c 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "@types/node-fetch": "^2.5.7", "@zerollup/ts-transform-paths": "^1.7.18", "0x": "^4.10.2", - "ipdata": "^1.1.2", + "ipdata": "^1.1.3", "jest": "^26.6.3", "node-fetch": "^2.6.1", "ts-node": "^9.1.1", diff --git a/src/util/ipAddress.ts b/src/util/ipAddress.ts index b736c0e9..74090d61 100644 --- a/src/util/ipAddress.ts +++ b/src/util/ipAddress.ts @@ -75,6 +75,7 @@ export async function IPAnalysis(ip: string): Promise { } export function isProxy(data: LookupResponse) { + if (!data || !data.asn || !data.threat) return false; if (data.asn.type !== "isp") return true; if (Object.values(data.threat).some((x) => x)) return true;