diff --git a/src/apps.json b/src/apps.json index 24326e933..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" }, @@ -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/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; } 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/icons/Google Code Prettify.png b/src/icons/Google Code Prettify.png deleted file mode 100644 index 78b69568a..000000000 Binary files a/src/icons/Google Code Prettify.png and /dev/null differ diff --git a/src/icons/Google Web Server.png b/src/icons/Google Web Server.png deleted file mode 100644 index 78b69568a..000000000 Binary files a/src/icons/Google Web Server.png and /dev/null differ diff --git a/src/icons/Google.svg b/src/icons/Google.svg new file mode 100644 index 000000000..06dc52f0a --- /dev/null +++ b/src/icons/Google.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/OpenGSE.png b/src/icons/OpenGSE.png deleted file mode 100644 index 78b69568a..000000000 Binary files a/src/icons/OpenGSE.png and /dev/null differ 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; }