From cd4b8b1224a302d8cffa07fc52beb1ae15297cd2 Mon Sep 17 00:00:00 2001 From: Elbert Alias Date: Mon, 28 Aug 2017 15:32:41 +1000 Subject: [PATCH 1/3] Remove horizontal scrollbar in popup --- src/drivers/webextension/css/popup.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/drivers/webextension/css/popup.css b/src/drivers/webextension/css/popup.css index 98c56c2de..5c922c3b0 100644 --- a/src/drivers/webextension/css/popup.css +++ b/src/drivers/webextension/css/popup.css @@ -30,7 +30,7 @@ body { .container { height: 15.8rem; - overflow: scroll; + overflow-y: auto; padding: 1rem 1.5rem 0rem 1.5rem; } From 91bed3e3d0fd1569d056352fba36e3de7195b1a0 Mon Sep 17 00:00:00 2001 From: Elbert Alias Date: Tue, 29 Aug 2017 15:08:07 +1000 Subject: [PATCH 2/3] Fix implied applications not being detected, SVG icons not displaying --- src/apps.json | 2 +- src/drivers/npm/package.json | 2 +- src/drivers/webextension/js/iframe.js | 4 ++-- src/drivers/webextension/js/network.js | 2 +- src/drivers/webextension/manifest.edge.json | 2 +- src/drivers/webextension/manifest.json | 2 +- src/wappalyzer.js | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/apps.json b/src/apps.json index 24326e933..50d82aaa2 100755 --- a/src/apps.json +++ b/src/apps.json @@ -10653,7 +10653,7 @@ }, "13": { "name": "Issue Trackers", - "priority": "9" + "priority": "2" }, "14": { "name": "Video Players", diff --git a/src/drivers/npm/package.json b/src/drivers/npm/package.json index 9f9e36f00..e588c0b14 100644 --- a/src/drivers/npm/package.json +++ b/src/drivers/npm/package.json @@ -2,7 +2,7 @@ "name": "wappalyzer", "description": "Uncovers the technologies used on websites", "homepage": "https://github.com/AliasIO/Wappalyzer", - "version": "5.1.0", + "version": "5.1.1", "author": "Elbert Alias", "license": "GPL-3.0", "repository": { diff --git a/src/drivers/webextension/js/iframe.js b/src/drivers/webextension/js/iframe.js index 0dd339d58..af4d823a6 100644 --- a/src/drivers/webextension/js/iframe.js +++ b/src/drivers/webextension/js/iframe.js @@ -181,7 +181,7 @@ var exports = {}; video_assets: opt_video_assets, assets: opt_assets, version: '3', - mrev: '4d79384-d', + mrev: '6f3a97b-c', msgNum: this.msgNum, timestamp: new Date().getTime(), pageVis: document.visibilityState, @@ -890,7 +890,7 @@ var exports = {}; var _pageTags; var INIT_MS_BW_SEARCHES = 2000; var PAGE_TAG_RE = new RegExp('gpt|oascentral'); - var POST_MSG_ID = '1503096304-372-12333-31563-11152'; + var POST_MSG_ID = '1503946945-8336-24876-10613-9147'; var AD_SERVER_RE = new RegExp('^(google_ads_iframe|oas_frame|atwAdFrame)'); function getPageTags(doc) { diff --git a/src/drivers/webextension/js/network.js b/src/drivers/webextension/js/network.js index d5bc4458c..1ff4dadb5 100644 --- a/src/drivers/webextension/js/network.js +++ b/src/drivers/webextension/js/network.js @@ -66,7 +66,7 @@ 'washingtonpost.com' ]; - var robotsTxtAllows = wappalyzer.robotsTxtAllows; + var robotsTxtAllows = wappalyzer.robotsTxtAllows.bind(wappalyzer); if ( !String.prototype.endsWith ) { String.prototype.endsWith = function(searchString, position) { var subjectString = this.toString(); diff --git a/src/drivers/webextension/manifest.edge.json b/src/drivers/webextension/manifest.edge.json index f00a16d05..4d50e5f47 100644 --- a/src/drivers/webextension/manifest.edge.json +++ b/src/drivers/webextension/manifest.edge.json @@ -4,7 +4,7 @@ "author": "Elbert Alias", "homepage_url": "https://wappalyzer.com/", "description": "Identify web technologies", - "version": "5.1.0", + "version": "5.1.1", "default_locale": "en", "manifest_version": 2, "icons": { diff --git a/src/drivers/webextension/manifest.json b/src/drivers/webextension/manifest.json index 0d0c48123..371a312c6 100644 --- a/src/drivers/webextension/manifest.json +++ b/src/drivers/webextension/manifest.json @@ -4,7 +4,7 @@ "author": "Elbert Alias", "homepage_url": "https://wappalyzer.com/", "description": "Identify web technologies", - "version": "5.1.0", + "version": "5.1.1", "default_locale": "en", "manifest_version": 2, "icons": { diff --git a/src/wappalyzer.js b/src/wappalyzer.js index 093f1b0bb..02c29d98c 100644 --- a/src/wappalyzer.js +++ b/src/wappalyzer.js @@ -270,7 +270,7 @@ class Wappalyzer { Object.keys(apps).forEach(appName => { var app = apps[appName]; - if ( app && app.implies ) { + if ( app && app.props.implies ) { this.asArray(app.props.implies).forEach(implied => { implied = this.parsePatterns(implied)[0]; @@ -281,7 +281,7 @@ class Wappalyzer { } if ( !( implied.string in apps ) ) { - apps[implied.string] = this.detected[url] && this.detected[url][implied.string] ? this.detected[url][implied.string] : new Application(implied.string, true); + apps[implied.string] = this.detected[url] && this.detected[url][implied.string] ? this.detected[url][implied.string] : new Application(implied.string, this.apps[implied.string], true); checkImplies = true; } From c4498ca951f384bf3affe4c76651ac052e5316a0 Mon Sep 17 00:00:00 2001 From: Elbert Alias Date: Tue, 29 Aug 2017 16:55:09 +1000 Subject: [PATCH 3/3] Update Google Icon --- src/apps.json | 6 +++--- src/icons/Google Code Prettify.png | Bin 1274 -> 0 bytes src/icons/Google Web Server.png | Bin 1274 -> 0 bytes src/icons/Google.svg | 1 + src/icons/OpenGSE.png | Bin 1274 -> 0 bytes 5 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 src/icons/Google Code Prettify.png delete mode 100644 src/icons/Google Web Server.png create mode 100644 src/icons/Google.svg delete mode 100644 src/icons/OpenGSE.png diff --git a/src/apps.json b/src/apps.json index 50d82aaa2..d360c51b9 100755 --- a/src/apps.json +++ b/src/apps.json @@ -3100,7 +3100,7 @@ "19" ], "env": "^prettyPrint$", - "icon": "Google Code Prettify.png", + "icon": "Google.svg", "website": "http://code.google.com/p/google-code-prettify" }, "Google Font API": { @@ -3193,7 +3193,7 @@ "headers": { "Server": "gws" }, - "icon": "Google Web Server.png", + "icon": "Google.svg", "website": "http://en.wikipedia.org/wiki/Google_Web_Server" }, "Google Web Toolkit": { @@ -5826,7 +5826,7 @@ "headers": { "Server": "GSE" }, - "icon": "OpenGSE.png", + "icon": "Google.svg", "implies": "Java", "website": "http://code.google.com/p/opengse" }, diff --git a/src/icons/Google Code Prettify.png b/src/icons/Google Code Prettify.png deleted file mode 100644 index 78b69568a62c5ffe18e5d2bc2a7df8584b413d25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1274 zcmVy0K=;s|Egu#jjH5*!8)Ng`xu#E?vhL4;(95($bEfl zO$aiFV~T1diZD@-&$R-qY>rI=+q#Vsy22P8W$mOL?Y-~cD`92j23!kI^2;T;%f0`5 z?)@OQ+fAzX+S}VZ91aJX&$eR4kEbxLxE5I}58b*h*m?qoPn|{NepG8K9C>+gj2ow0 zTSQh?pfxM2vBP4SNs+p6;le_v(}|v*9(471F}3^*jGxtOj9lJ;udFWk{r)?yU4wtp zB>2+Obh|Fg=rNmdJ~NZITP$C+?eSLihg+lmrj~gt%>7J68HN)E3kD(=w9fLxo zTbMBnBqzgbG{QM%OcQxL9)!bT0KiiP>Oe~y?rTEnIow_0oE(IR5RZTw;JY)B&FVO^SCzL)?^mPwe+#EIe-4PbsUg-iyfs{>bjLAtwy!4UW0VrYO!<%}Px zD?spOD0XztiF-T={f3wT?_`f6;>rVM7*k@#SL*AD4-AlCj3UlY9!oX(Q|QOSmv8xf z>1660#kvOX4@Hp;MFfVhLxJP3un6eqR$_6?nU;_=fSF3TvET0 zTua|I*=S3xD<(jsj-0!K^bdA{&Hq{B%fB4a=d9gUjQDN@*mf2-X}biuQub5kng;A| z^=Wpu?!F*a?rg^NwTCfb^?tlrZo{e0-st`6_G+Y7r-D_ngh*9tfUng68LR3bebRt} zKQF1fVHkR9ZPQw?ZS0{)+tdIRvR@k9T#664=$XPsdZV(9R_%3B<;kn`Q)91Yz1zBN zR9Ig~39Y%|WGp)ZX|WY-u}x#*#zxK8uWwopR>2;cR3Sm$66pX2*SB`dH9gKW9hf_I zE}2qHkE{c?e?e$ij>|qxfJ|d1?R$M6nI3xtArK8PJeS8$$2+{55ZO;>lRei?mNd&F z=m72cjSo-*AfP&fr-Ge6~iK~jqw`+RDtibN6wouKKK)7Zy^it~bqm!@XLy0K=;s|Egu#jjH5*!8)Ng`xu#E?vhL4;(95($bEfl zO$aiFV~T1diZD@-&$R-qY>rI=+q#Vsy22P8W$mOL?Y-~cD`92j23!kI^2;T;%f0`5 z?)@OQ+fAzX+S}VZ91aJX&$eR4kEbxLxE5I}58b*h*m?qoPn|{NepG8K9C>+gj2ow0 zTSQh?pfxM2vBP4SNs+p6;le_v(}|v*9(471F}3^*jGxtOj9lJ;udFWk{r)?yU4wtp zB>2+Obh|Fg=rNmdJ~NZITP$C+?eSLihg+lmrj~gt%>7J68HN)E3kD(=w9fLxo zTbMBnBqzgbG{QM%OcQxL9)!bT0KiiP>Oe~y?rTEnIow_0oE(IR5RZTw;JY)B&FVO^SCzL)?^mPwe+#EIe-4PbsUg-iyfs{>bjLAtwy!4UW0VrYO!<%}Px zD?spOD0XztiF-T={f3wT?_`f6;>rVM7*k@#SL*AD4-AlCj3UlY9!oX(Q|QOSmv8xf z>1660#kvOX4@Hp;MFfVhLxJP3un6eqR$_6?nU;_=fSF3TvET0 zTua|I*=S3xD<(jsj-0!K^bdA{&Hq{B%fB4a=d9gUjQDN@*mf2-X}biuQub5kng;A| z^=Wpu?!F*a?rg^NwTCfb^?tlrZo{e0-st`6_G+Y7r-D_ngh*9tfUng68LR3bebRt} zKQF1fVHkR9ZPQw?ZS0{)+tdIRvR@k9T#664=$XPsdZV(9R_%3B<;kn`Q)91Yz1zBN zR9Ig~39Y%|WGp)ZX|WY-u}x#*#zxK8uWwopR>2;cR3Sm$66pX2*SB`dH9gKW9hf_I zE}2qHkE{c?e?e$ij>|qxfJ|d1?R$M6nI3xtArK8PJeS8$$2+{55ZO;>lRei?mNd&F z=m72cjSo-*AfP&fr-Ge6~iK~jqw`+RDtibN6wouKKK)7Zy^it~bqm!@XL \ No newline at end of file diff --git a/src/icons/OpenGSE.png b/src/icons/OpenGSE.png deleted file mode 100644 index 78b69568a62c5ffe18e5d2bc2a7df8584b413d25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1274 zcmVy0K=;s|Egu#jjH5*!8)Ng`xu#E?vhL4;(95($bEfl zO$aiFV~T1diZD@-&$R-qY>rI=+q#Vsy22P8W$mOL?Y-~cD`92j23!kI^2;T;%f0`5 z?)@OQ+fAzX+S}VZ91aJX&$eR4kEbxLxE5I}58b*h*m?qoPn|{NepG8K9C>+gj2ow0 zTSQh?pfxM2vBP4SNs+p6;le_v(}|v*9(471F}3^*jGxtOj9lJ;udFWk{r)?yU4wtp zB>2+Obh|Fg=rNmdJ~NZITP$C+?eSLihg+lmrj~gt%>7J68HN)E3kD(=w9fLxo zTbMBnBqzgbG{QM%OcQxL9)!bT0KiiP>Oe~y?rTEnIow_0oE(IR5RZTw;JY)B&FVO^SCzL)?^mPwe+#EIe-4PbsUg-iyfs{>bjLAtwy!4UW0VrYO!<%}Px zD?spOD0XztiF-T={f3wT?_`f6;>rVM7*k@#SL*AD4-AlCj3UlY9!oX(Q|QOSmv8xf z>1660#kvOX4@Hp;MFfVhLxJP3un6eqR$_6?nU;_=fSF3TvET0 zTua|I*=S3xD<(jsj-0!K^bdA{&Hq{B%fB4a=d9gUjQDN@*mf2-X}biuQub5kng;A| z^=Wpu?!F*a?rg^NwTCfb^?tlrZo{e0-st`6_G+Y7r-D_ngh*9tfUng68LR3bebRt} zKQF1fVHkR9ZPQw?ZS0{)+tdIRvR@k9T#664=$XPsdZV(9R_%3B<;kn`Q)91Yz1zBN zR9Ig~39Y%|WGp)ZX|WY-u}x#*#zxK8uWwopR>2;cR3Sm$66pX2*SB`dH9gKW9hf_I zE}2qHkE{c?e?e$ij>|qxfJ|d1?R$M6nI3xtArK8PJeS8$$2+{55ZO;>lRei?mNd&F z=m72cjSo-*AfP&fr-Ge6~iK~jqw`+RDtibN6wouKKK)7Zy^it~bqm!@XL