From 6f187d9ee962be185f8bfd77bb089fb20ce3df92 Mon Sep 17 00:00:00 2001 From: Julien Date: Mon, 4 May 2020 14:29:03 +0200 Subject: [PATCH 1/2] Revert "Fix technology links in bookmarklet driver" This reverts commit 323dafd7bd5affa73ce7589fc6e1f443437259e9. --- src/drivers/bookmarklet/driver.js | 43 ++++++++++++++++++------------- src/drivers/npm/package.json | 2 +- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/src/drivers/bookmarklet/driver.js b/src/drivers/bookmarklet/driver.js index fdddff2c5..361862657 100644 --- a/src/drivers/bookmarklet/driver.js +++ b/src/drivers/bookmarklet/driver.js @@ -1,7 +1,9 @@ -/* eslint-env browser */ -/* eslint-disable func-names, no-unused-expressions, no-restricted-globals */ -/* eslint-disable no-restricted-syntax, no-continue */ -/* global wappalyzer */ +/** + * Bookmarklet driver + */ + +/** global: wappalyzer */ +/** global: XMLHttpRequest */ (function () { wappalyzer.driver.document = document; @@ -14,7 +16,6 @@ * Log messages to console */ wappalyzer.driver.log = (message, source, type) => { - // eslint-disable-next-line no-console console.log(`[wappalyzer ${type}]`, `[${source}]`, message); }; @@ -50,14 +51,14 @@ if (xhr.readyState === 4 && xhr.status) { const headers = xhr.getAllResponseHeaders().split('\n'); - if (headers.length > 0 && headers[0]) { + if (headers.length > 0 && headers[0] != '') { wappalyzer.log(`responseHeaders: ${xhr.getAllResponseHeaders()}`, 'driver'); const responseHeaders = {}; headers.forEach((line) => { - let name; - let value; + let name, + value; if (line) { name = line.substring(0, line.indexOf(': ')); @@ -80,10 +81,6 @@ xhr.send(); } - function slugify(string) { - return string.toLowerCase().replace(/[^a-z0-9-]/g, '-').replace(/--+/g, '-').replace(/(?:^-|-$)/, ''); - } - /** * Display apps */ @@ -106,13 +103,12 @@ continue; } - const { version, confidence } = detected[app]; - - category = wappalyzer.categories[wappalyzer.apps[app].cats[0]].name; + let version = detected[app].version, + confidence = detected[app].confidence; html += `
` - + `` + + `` + '' + ` ${app }${ @@ -126,7 +122,7 @@ category = wappalyzer.categories[wappalyzer.apps[app].cats[i]].name; - html += `${category}`; + html += `${category}`; } html += '
'; @@ -134,14 +130,25 @@ first = false; } } else { - html += '
No technologies detected
'; + html += '
No applications detected
'; } html += ''; container.innerHTML = html; + }, + + /** + * Open a tab + */ + function openTab(args) { + open(args.url); }; + function slugify(string) { + return string.toLowerCase().replace(/[^a-z0-9-]/g, '-').replace(/--+/g, '-').replace(/(?:^-|-$)/, ''); + } + getPageContent(); getResponseHeaders(); }()); diff --git a/src/drivers/npm/package.json b/src/drivers/npm/package.json index 6bad6ee83..330d7079d 100644 --- a/src/drivers/npm/package.json +++ b/src/drivers/npm/package.json @@ -2,7 +2,7 @@ "name": "wappalyzer", "description": "Identify technology on websites", "homepage": "https://www.wappalyzer.com", - "version": "5.9.34", + "version": "5.9.33", "author": "Wappalyzer", "license": "MIT", "repository": { From 34346a3e9eae3dac9d801d47842bbfa25005fb59 Mon Sep 17 00:00:00 2001 From: Julien Date: Mon, 4 May 2020 14:46:18 +0200 Subject: [PATCH 2/2] Add AppDynamics support (with version) --- src/apps.json | 8 ++++++++ src/icons/AppDynamics.png | Bin 0 -> 2220 bytes 2 files changed, 8 insertions(+) create mode 100644 src/icons/AppDynamics.png diff --git a/src/apps.json b/src/apps.json index 7b7865430..2920782e6 100644 --- a/src/apps.json +++ b/src/apps.json @@ -960,6 +960,14 @@ "icon": "apostrophecms.svg", "implies": "Node.js", "website": "http://apostrophecms.org" + }, + "AppDynamics": { + "cats": [ + 10 + ], + "icon": "AppDynamics.png", + "script": "adrum\\.js|adrum.([0-9].*)\\.js\\;version:\\1", + "website": "https://appdynamics.com" }, "AppNexus": { "cats": [ diff --git a/src/icons/AppDynamics.png b/src/icons/AppDynamics.png new file mode 100644 index 0000000000000000000000000000000000000000..1470b96fd7996a152bcfeafebf6504078de09bb4 GIT binary patch literal 2220 zcmY*a2Uru?7M@TvMIh2d5+Fp7B4MZkF@P+Q;sORlNLW!y0s)aA$x5VXa4FJ@%lbe? znyV-a(nN|FMMTks#|k2f5ki#!(p>`LOO)rnckXxY`RB}k{&UaF_syh`+#F@#s&D`R zWSpId9-@d5J9LX^XGTXa0RSW}#NM9dY;TVtMKXdy!e{`Xn{z$8`JkjbGU?0U1-e@eA8R65z`HMz{G6nnug7SiJu3$Y{hb~>Cu zD4}42D`8qU{YJP(8m7VHFV;EMpo!P1r1)E*^nB`3awiTkt8;JYF;wDTO0=u(e|=DV z+RBfLd61aVAwXVRZr->dGp6LbB~0?MsmaT2eBJrS1rIGJQsPu`2L^|Z*0C?wQs?bH zx$eD)vC&l4N@G~=z?~g2xI`=n{ksK!Hyq*(5 z-x-)9$$zkzI)-UW5CvF-6NL!?@+`4KctIK>2?!;`lguK!y5IvDCk_3ni~yP;`(%W; z3LvoYB6yO<^2e}GhJ`cnY-{XS23~~4X%LI~N@1O_#*$r07<)z}4P$O-W@v=9fnzWj zLL@Z^??H6fEEio_W9ckb1ReyVqM{6=Obr>4!Jx5~l@(}Y0-BiML<}7BOgPJ*jSFY) z`X=&U9U_ex7#R}53Sop}#Jc_gjGtN7Sgg3wcl&luR!Go4ox+)$V~GX?#dknsLnH9J zwy2aK&f*V6hR{Tv#rihJgs;s1%Wd`{fa2!=bC_?Fe$9$TwSg1B?~ly}?(#^70svCe z&O|#;GVH$hkGeCyitl+0e)Q;>U0F{{iF!d(&C~$8ZlgyDl|Iy*pA$bv(~`_5QHdpl z-45#R4(ciKBS&~yf$x`ps)*|zIfrg&jq(2c=}p%1-&gBbj>TwbxR%-2A=jLGJ31VP z*L)Ygq)VXBJ$Wb)2yTp`mg{nl#R~}9dHMLovbJB&wZ;W*EG(3)udn~z zMkJB4Q`6E8H#Rn=UfCm2EL>abTU<1~A)z<#WXK`NYQxpk)W-XB-CuUUcrm(h={1PA zwY|1BGczL`9*#fx#=2~zO_5t}seCpzwxa*lt0keZsqosh{jh(aYu^(9F)5uyt`V2>qBxRaQSoD*$8#9v*s;^K zBc5AFP4cf^9Scm$MW~`shZ73A%_u`wx3>tf-rn9F*y7^iRN$1xb+p!5Hs*oDqw^j< z6w0&7@>k6IU3T~D>&KFgvD6xg&IhBy!YbUHo&95QINa_Gk1|)Or%=hJ)>bbB0&(;m zG~LeD+`L`jHhJbrW6tu;o4QAQd~WG}bl`+uh!z>@!I~*RgwvE2<>gE0JN5{*Q!{^^ znws)RPEJPKBn+U6JzuH~YbE{KG}Q!wLZN=wFJDHDleqPWlDC1#q1mKp9?bRJCMU;)&i{?E z+bF9r#Nn#XC;U`LBbb`DE$Hr-;w@EGR+2qq{f0bY#+qqaSy@f>^?7*+INU5UMb59) z;%q;-((p!3Eql_v+CP7Cl0Gi_sJ(D>a3H(wU*M=(0A!?Q*wfkB@V!9C(p;~$wl;ys z;{~Czl_u&083sJ*%tPh}HJ_&$$la`#;v9g)+wj=S%gawJxn>p?fho@EB~3q{K3#*J z1&FdWp09b@@A4f1q*B}DNYlHwZ(lzBGCErJd*|emgfbU}LQU7Tv|L%`a)DlR5B+Y_ zLN>!j3fRd(j%21*#z7E8GBPsLEe#F*ll(qbbaZDZHZ9&8;6sO{ksXI#B_K#GTPN>z z)RjCyrLq@L