Migrations
/
wappalyzer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revamped WebExtension popup

Browse Source
main
Elbert Alias 7 years ago
parent 735e00383f
commit 20b2f9df80
9 changed files with 195 additions and 117 deletions
Show Stats Download Patch File Download Diff File

2
src/drivers/npm/package.json
Unescape View File

@ -2,7 +2,7 @@
"name": "wappalyzer", "name": "wappalyzer",
"description": "Uncovers the technologies used on websites", "description": "Uncovers the technologies used on websites",
"homepage": "https://github.com/AliasIO/Wappalyzer", "homepage": "https://github.com/AliasIO/Wappalyzer",
"version": "5.0.7", "version": "5.1.0",
"author": "Elbert Alias", "author": "Elbert Alias",
"license": "GPL-3.0", "license": "GPL-3.0",
"repository": { "repository": {

130
src/drivers/webextension/css/popup.css
Unescape View File

@ -1,31 +1,95 @@
body { body {
background: #fff; background: #fff;
color: #4a4a4a;
font-family: Helvetica, Arial, sans-serif; font-family: Helvetica, Arial, sans-serif;
font-size: 13px; font-size: .8rem;
line-height: 16px; height: 20.8rem;
margin: 0; margin: 0;
min-width: 200px; overflow: hidden;
overflow-x: hidden; width: 30rem;
padding: 15px;
} }
a { .header {
color: #4a4a4a; align-items: center;
background: linear-gradient(160deg, #32067c, #150233);
height: 4rem;
display: flex;
} }
a:focus { .header__link:focus {
outline: 0; outline: none;
} }
img { .header__logo {
display: inline-block;
margin: .2rem 0 0 1.5rem;
-webkit-backface-visibility: hidden;
-webkit-transform: translateZ(0) scale(1.0, 1.0);
transform: translateZ(0);
height: 2rem;
}
.container {
height: 15.8rem;
overflow: scroll;
padding: 1rem 1.5rem 0rem 1.5rem;
}
.detected {
columns: 2;
column-gap: 1.5rem;
line-height: 1.4rem;
}
.detected__category {
break-inside: avoid-column;
padding-bottom: 1rem;
}
.detected__category-link {
border-bottom: 1px solid #dbdbdb;
display: block;
margin-bottom: .5rem;
text-decoration: none;
}
.detected__category-name {
color: #4608ad;
display: block;
font-weight: bold;
line-height: 2rem;
}
.detected__category-link:hover .detected__category-name {
color: #4a4a4a;
}
.detected__app {
display: block;
line-height: 1.7rem;
text-decoration: none;
}
.detected__app:focus {
display: block;
outline: 0;
}
.detected__app-icon {
display: inline-block; display: inline-block;
height: 16px; height: 16px;
margin-right: 8px; margin-right: .5rem;
vertical-align: top; vertical-align: -.2rem;
width: 16px; width: 16px;
} }
.detected__app-name {
color: #4a4a4a;
}
.detected__app:hover .detected__app-name {
border-bottom: 1px solid #4a4a4a;
}
.detected-app { .detected-app {
padding: 7px 0; padding: 7px 0;
} }
@ -39,40 +103,12 @@ img {
padding-bottom: 0; padding-bottom: 0;
} }
.detected-app a { .empty {
color: #4608ad; display: flex;
display: block; height: 16rem;
text-decoration: none; align-items: center;
} justify-content: center;
.detected-app a .label .name {
border-bottom: 1px solid transparent;
}
.detected-app a:hover .label .name {
border-bottom: 1px solid #4608ad;
}
.detected-app a .category .name {
color: #4a4a4a;
border-bottom: 1px solid transparent;
}
.detected-app a:hover .category .name {
border-bottom: 1px solid #4a4a4a;
}
.label {
font-weight: bold;
}
.category {
display: block;
margin: 5px 0 0 24px;
} }
.empty { .empty__text {
color: #999;
font-style: italic;
text-align: center;
} }

7
src/drivers/webextension/html/popup.html
Unescape View File

@ -11,5 +11,12 @@
<script src="../js/popup.js"></script> <script src="../js/popup.js"></script>
</head> </head>
<body> <body>
<div class="header">
<a href="https://wappalyzer.com/" class="header__link" target="_blank">
<img class="header__logo" src="../images/logo-white.svg">
</a>
</div>
<div class="container"></div>
</body> </body>
</html> </html>

10
src/drivers/webextension/js/driver.js
Unescape View File

@ -28,7 +28,7 @@ function getOption(name, defaultValue) {
// Chrome, Firefox // Chrome, Firefox
browser.storage.local.get(name) browser.storage.local.get(name)
.then(callback) .then(callback)
.catch(console.error); .catch(error => wappalyzer.log(error, 'driver', 'error'));
} catch ( e ) { } catch ( e ) {
// Edge // Edge
browser.storage.local.get(name, callback); browser.storage.local.get(name, callback);
@ -125,7 +125,7 @@ var callback = tabs => {
try { try {
browser.tabs.query({}) browser.tabs.query({})
.then(callback) .then(callback)
.catch(console.error); .catch(error => wappalyzer.log(error, 'driver', 'error'));
} catch ( e ) { } catch ( e ) {
browser.tabs.query({}, callback); browser.tabs.query({}, callback);
} }
@ -281,10 +281,10 @@ wappalyzer.driver.getRobotsTxt = (host, secure = false) => {
fetch('http' + ( secure ? 's' : '' ) + '://' + host + '/robots.txt') fetch('http' + ( secure ? 's' : '' ) + '://' + host + '/robots.txt')
.then(response => { .then(response => {
if ( !response.ok ) { if ( !response.ok ) {
if (response.status === 404) { if ( response.status === 404 ) {
return ''; return '';
} else { } else {
throw 'GET ' + response.url + ' was not ok'; throw 'GET ' + response.url + ' was not ok';
} }
} }

31
src/drivers/webextension/js/iframe.js
Unescape View File

@ -181,7 +181,7 @@ var exports = {};
video_assets: opt_video_assets, video_assets: opt_video_assets,
assets: opt_assets, assets: opt_assets,
version: '3', version: '3',
mrev: '082d7cb-d', mrev: '4d79384-d',
msgNum: this.msgNum, msgNum: this.msgNum,
timestamp: new Date().getTime(), timestamp: new Date().getTime(),
pageVis: document.visibilityState, pageVis: document.visibilityState,
@ -890,7 +890,7 @@ var exports = {};
var _pageTags; var _pageTags;
var INIT_MS_BW_SEARCHES = 2000; var INIT_MS_BW_SEARCHES = 2000;
var PAGE_TAG_RE = new RegExp('gpt|oascentral'); var PAGE_TAG_RE = new RegExp('gpt|oascentral');
var POST_MSG_ID = '1501281986-4236-27733-5465-12184'; var POST_MSG_ID = '1503096304-372-12333-31563-11152';
var AD_SERVER_RE = new RegExp('^(google_ads_iframe|oas_frame|atwAdFrame)'); var AD_SERVER_RE = new RegExp('^(google_ads_iframe|oas_frame|atwAdFrame)');
function getPageTags(doc) { function getPageTags(doc) {
@ -1104,6 +1104,23 @@ var exports = {};
} }
}, },
blockedRobotsMsgGen: function(sendFcn, origUrl) {
if ( origUrl.indexOf('google.com/_/chrome/newtab') === -1 ) {
var onBlockedRobotsMessage = function() {
var log;
log = _logGen.log('invalid-robotstxt', []);
log.doc.finalPageUrl = log.doc.url;
log.doc.url = exports.utils.normalizeUrl(origUrl);
sendFcn(log);
};
return onBlockedRobotsMessage;
} else {
return function() {};
}
},
init: function(onAdFound) { init: function(onAdFound) {
if ( exports.utils.SCRIPT_IN_FRIENDLY_IFRAME ) { if ( exports.utils.SCRIPT_IN_FRIENDLY_IFRAME ) {
@ -1137,6 +1154,8 @@ if ( exports.utils.SCRIPT_IN_WINDOW_TOP ) {
init: exports.coordinator.init, init: exports.coordinator.init,
addPostMessageListener: exports.coordinator.addPostMessageListener, addPostMessageListener: exports.coordinator.addPostMessageListener,
askIfTrackingEnabled: exports.utils.askIfTrackingEnabled, askIfTrackingEnabled: exports.utils.askIfTrackingEnabled,
blockedRobotsMsgGen: exports.coordinator.blockedRobotsMsgGen,
inWindowTop: exports.utils.SCRIPT_IN_WINDOW_TOP,
sendToBackground: exports.utils.sendToBackground sendToBackground: exports.utils.sendToBackground
}; };
} else { } else {
@ -1149,18 +1168,18 @@ if ( exports.utils.SCRIPT_IN_WINDOW_TOP ) {
); );
} }
})(window); })(window);
(function(adparser) { (function(adparser, pageUrl) {
function onAdFound(log) { function onAdFound(log) {
adparser.sendToBackground({ id: 'ad_log', subject: log }, 'ad_log', '', function(){}); adparser.sendToBackground({ id: 'ad_log', subject: log }, 'ad_log', '', function(){});
} }
if ( window === window.top ) { if ( adparser && adparser.inWindowTop ) {
adparser.addPostMessageListener(); adparser.addPostMessageListener();
adparser.askIfTrackingEnabled( adparser.askIfTrackingEnabled(
function() { function() {
adparser.init(onAdFound); adparser.init(onAdFound);
}, },
function() {} adparser.blockedRobotsMsgGen(onAdFound, pageUrl)
) )
} }
})(window.adparser); })(window.adparser, window.location.href);

26
src/drivers/webextension/js/network.js
Unescape View File

@ -66,6 +66,7 @@
'washingtonpost.com' 'washingtonpost.com'
]; ];
var robotsTxtAllows = wappalyzer.robotsTxtAllows;
if ( !String.prototype.endsWith ) { if ( !String.prototype.endsWith ) {
String.prototype.endsWith = function(searchString, position) { String.prototype.endsWith = function(searchString, position) {
var subjectString = this.toString(); var subjectString = this.toString();
@ -114,10 +115,10 @@
} }
} }
function ifTrackingEnabled(url, ifCallback, elseCallback) { function ifTrackingEnabled(details, ifCallback, elseCallback) {
var fullIfCallback = function() { var fullIfCallback = function() {
allowedByRobotsTxt(url, ifCallback, elseCallback); allowedByRobotsTxt(details, ifCallback, elseCallback);
}; };
browser.storage.local.get('tracking').then(function(item) { browser.storage.local.get('tracking').then(function(item) {
@ -135,9 +136,9 @@
} }
function allowedByRobotsTxt(url, ifCallback, elseCallback) { function allowedByRobotsTxt(details, ifCallback, elseCallback) {
if ( ! url.startsWith('chrome://') ) { if ( details.url && !details.url.startsWith('chrome://') ) {
wappalyzer.robotsTxtAllows(url).then(ifCallback, elseCallback); robotsTxtAllows(details.url).then(ifCallback, elseCallback);
} else { } else {
elseCallback(); elseCallback();
} }
@ -219,7 +220,7 @@
this.cleanupCollector(tabId); this.cleanupCollector(tabId);
ifTrackingEnabled( ifTrackingEnabled(
details.url, details,
function() { function() {
if ( !areListenersRegistered ) { if ( !areListenersRegistered ) {
@ -279,18 +280,20 @@
browserProxy.tabs.sendMessage(this.tabId, message); browserProxy.tabs.sendMessage(this.tabId, message);
}; };
PageNetworkTrafficCollector.prototype.sendToTab = function(assetReq, reqs, curPageUrl, isValidAd) { PageNetworkTrafficCollector.prototype.sendToTab = function(assetReq, reqs, curPageUrl, nonAdTrackingEvent) {
var msg = {}; var msg = {};
msg.assets = []; msg.assets = [];
msg.requests = [];
msg.event_data = {}; msg.event_data = {};
if ( isValidAd ) { if ( !nonAdTrackingEvent ) {
msg.event = 'new-video-ad'; msg.event = 'new-video-ad';
msg.requests = reqs; msg.requests = reqs;
msg.requests.sort(function(reqA, reqB) {return reqA.requestTimestamp - reqB.requestTimestamp;}); msg.requests.sort(function(reqA, reqB) {return reqA.requestTimestamp - reqB.requestTimestamp;});
if ( assetReq ) { if ( assetReq ) {
msg.assets = [assetReq]; msg.assets = [assetReq];
} }
} else { } else if ( nonAdTrackingEvent === 'new-invalid-video-ad' ) {
msg.event = nonAdTrackingEvent;
msg.requests = reqs.map(function(request) { msg.requests = reqs.map(function(request) {
return parseHostnameFromUrl(request.url); return parseHostnameFromUrl(request.url);
}); });
@ -301,7 +304,8 @@
contentType: assetReq.contentType, contentType: assetReq.contentType,
size: assetReq.size size: assetReq.size
}]; }];
msg.event = 'new-invalid-video-ad'; } else if ( nonAdTrackingEvent === 'robots-txt-no-scraping' ) {
msg.event = nonAdTrackingEvent;
} }
msg.origUrl = curPageUrl; msg.origUrl = curPageUrl;
msg.displayAdFound = this.displayAdFound; msg.displayAdFound = this.displayAdFound;
@ -805,7 +809,7 @@
browserProxy.runtime.onMessage.addListener(function(request, sender, sendResponse) { browserProxy.runtime.onMessage.addListener(function(request, sender, sendResponse) {
if ( request === 'is_tracking_enabled' ) { if ( request === 'is_tracking_enabled' ) {
ifTrackingEnabled( ifTrackingEnabled(
sender.tab.url, sender.tab,
function() { function() {
try {sendResponse({'tracking_enabled': true});} try {sendResponse({'tracking_enabled': true});}
catch(err) {} }, catch(err) {} },

102
src/drivers/webextension/js/popup.js
Unescape View File

@ -32,26 +32,16 @@ function replaceDomWhenReady(dom) {
} }
function replaceDom(domTemplate) { function replaceDom(domTemplate) {
var body = document.body; var container = document.getElementsByClassName('container')[0];
while ( body.firstChild ) { while ( container.firstChild ) {
body.removeChild(body.firstChild); container.removeChild(container.firstChild);
} }
body.appendChild(jsonToDOM(domTemplate, document, {})); container.appendChild(jsonToDOM(domTemplate, document, {}));
var nodes = document.querySelectorAll('[data-i18n]'); var nodes = document.querySelectorAll('[data-i18n]');
for ( let ms = 200; ms < 500; ms += 50 ) {
setTimeout(() => {
let div = document.createElement('div');
div.style.display = 'none';
body.appendChild(div);
}, ms);
};
Array.prototype.forEach.call(nodes, node => { Array.prototype.forEach.call(nodes, node => {
node.childNodes[0].nodeValue = browser.i18n.getMessage(node.dataset.i18n); node.childNodes[0].nodeValue = browser.i18n.getMessage(node.dataset.i18n);
}); });
@ -63,65 +53,87 @@ function appsToDomTemplate(response) {
template = []; template = [];
if ( response.tabCache && Object.keys(response.tabCache.detected).length > 0 ) { if ( response.tabCache && Object.keys(response.tabCache.detected).length > 0 ) {
for ( appName in response.tabCache.detected ) { const categories = {};
confidence = response.tabCache.detected[appName].confidenceTotal;
version = response.tabCache.detected[appName].version;
categories = [];
// Group apps by category
for ( appName in response.tabCache.detected ) {
response.apps[appName].cats.forEach(cat => { response.apps[appName].cats.forEach(cat => {
categories.push( categories[cat] = categories[cat] || { apps: [] };
categories[cat].apps[appName] = appName;
});
}
for ( cat in categories ) {
const apps = [];
for ( appName in categories[cat].apps ) {
confidence = response.tabCache.detected[appName].confidenceTotal;
version = response.tabCache.detected[appName].version;
apps.push(
[ [
'a', { 'a', {
class: 'detected__app',
target: '_blank', target: '_blank',
href: 'https://wappalyzer.com/categories/' + slugify(response.categories[cat].name) href: 'https://wappalyzer.com/applications/' + slugify(appName)
}, [ }, [
'img', {
class: 'detected__app-icon',
src: '../images/icons/' + ( response.apps[appName].icon || 'default.svg' )
},
], [
'span', { 'span', {
class: 'category' class: 'detected__app-name'
}, [ },
'span', { appName + ( version ? ' ' + version : '' ) + ( confidence < 100 ? ' (' + confidence + '% sure)' : '' )
class: 'name'
},
browser.i18n.getMessage('categoryName' + cat)
]
] ]
] ]
); );
}); }
template.push( template.push(
[ [
'div', { 'div', {
class: 'detected-app' class: 'detected__category'
}, [ }, [
'a', { 'a', {
class: 'detected__category-link',
target: '_blank', target: '_blank',
href: 'https://wappalyzer.com/applications/' + slugify(appName) href: 'https://wappalyzer.com/categories/' + slugify(response.categories[cat].name)
}, [ }, [
'img', {
src: '../images/icons/' + ( response.apps[appName].icon || 'default.svg' )
}
], [
'span', { 'span', {
class: 'label' class: 'detected__category-name'
}, [ },
'span', { browser.i18n.getMessage('categoryName' + cat)
class: 'name'
},
appName
],
( version ? ' ' + version : '' ) + ( confidence < 100 ? ' (' + confidence + '% sure)' : '' )
] ]
], ], [
categories 'div', {
class: 'detected__apps'
},
apps
]
] ]
); );
} }
template = [
'div', {
class: 'detected'
},
template
];
} else { } else {
template = [ template = [
'div', { 'div', {
class: 'empty' class: 'empty'
}, },
browser.i18n.getMessage('noAppsDetected') [
'span', {
class: 'empty__text'
},
browser.i18n.getMessage('noAppsDetected')
],
]; ];
} }

2
src/drivers/webextension/manifest.edge.json
Unescape View File

@ -4,7 +4,7 @@
"author": "Elbert Alias", "author": "Elbert Alias",
"homepage_url": "https://wappalyzer.com/", "homepage_url": "https://wappalyzer.com/",
"description": "Identify web technologies", "description": "Identify web technologies",
"version": "5.0.7", "version": "5.1.0",
"default_locale": "en", "default_locale": "en",
"manifest_version": 2, "manifest_version": 2,
"icons": { "icons": {

2
src/drivers/webextension/manifest.json
Unescape View File

@ -4,7 +4,7 @@
"author": "Elbert Alias", "author": "Elbert Alias",
"homepage_url": "https://wappalyzer.com/", "homepage_url": "https://wappalyzer.com/",
"description": "Identify web technologies", "description": "Identify web technologies",
"version": "5.0.7", "version": "5.1.0",
"default_locale": "en", "default_locale": "en",
"manifest_version": 2, "manifest_version": 2,
"icons": { "icons": {

Write Preview
Loading…
Cancel
Save