Build 5.7.1

src/drivers/npm/README.md

@@ -49,7 +49,7 @@ node index.js [url] [options]
 const Wappalyzer = require('./driver');
 const Browser = require('./browsers/zombie');
 
-const url = 'https://www.wappalyzer.com;
+const url = 'https://www.wappalyzer.com';
 
 const options = {
   debug: false,

src/drivers/npm/npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "wappalyzer",
-  "version": "5.6.2",
+  "version": "5.7.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

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.6.3",
+  "version": "5.7.2",
   "author": "Elbert Alias",
   "license": "GPL-3.0",
   "repository": {

src/drivers/webextension/_locales/de/messages.json

@@ -11,6 +11,8 @@
 	"nothingToDo":              { "message": "Nichts zu tun." },
 	"noAppsDetected":           { "message": "Keine Applikation entdeckt." },
   "categoryPin":              { "message": "Immer Icon anzeigen" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "CMS" },
 	"categoryName2":            { "message": "Nachrichten Board" },
 	"categoryName3":            { "message": "Datenbankverwaltung" },

src/drivers/webextension/_locales/el/messages.json

@@ -11,6 +11,8 @@
 	"nothingToDo":              { "message": "Καμία ενέργεια." },
 	"noAppsDetected":           { "message": "Δεν ανιχνεύθηκαν εφαρμογές." },
   "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "CMS" },
 	"categoryName2":            { "message": "Διαδικτυακό Φόρουμ" },
 	"categoryName3":            { "message": "Διαχειριστής Βάσης Δεδομένων" },

src/drivers/webextension/_locales/en/messages.json

@@ -11,6 +11,9 @@
 	"nothingToDo":              { "message": "Nothing to do here." },
 	"noAppsDetected":           { "message": "No technologies detected." },
   "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
+  "privacyPolicy":            { "message": "Privacy policy" },
 	"categoryName1":            { "message": "CMS" },
 	"categoryName2":            { "message": "Message Board" },
 	"categoryName3":            { "message": "Database Manager" },

src/drivers/webextension/_locales/es/messages.json

@@ -11,6 +11,8 @@
 	"nothingToDo":              { "message": "Nada que hacer aquí." },
 	"noAppsDetected":           { "message": "Aplicaciones no detectadas." },
   "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "Gestor de Contenido" },
 	"categoryName2":            { "message": "Foro" },
 	"categoryName3":            { "message": "Gestor de Bases de Datos" },

src/drivers/webextension/_locales/fa/messages.json

@@ -11,6 +11,8 @@
 	"nothingToDo":              { "message": "هیچ چیز برای انجام اینجا نیست." },
 	"noAppsDetected":           { "message": "هیچ فن آوری شناسایی نشده است." },
   "categoryPin":              { "message": "همیشه نماد را نشان بده" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "سیستم مدیریت محتوا" },
 	"categoryName2":            { "message": "انجمن پیام" },
 	"categoryName3":            { "message": "مدیر پایگاه داده" },

src/drivers/webextension/_locales/fr/messages.json

@@ -11,6 +11,8 @@
 	"twitter":                  { "message": "Suivre Wappalyzer sur Twitter" },
 	"website":                  { "message": "Aller sur wappalyzer.com" },
 	"categoryPin":              { "message": " Toujours afficher l'icône" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "CMS" },
 	"categoryName2":            { "message": "Forum" },
 	"categoryName3":            { "message": "Gestionnaire de base de données" },

src/drivers/webextension/_locales/gr/messages.json

@@ -11,6 +11,8 @@
 	"nothingToDo":              { "message": "Καμία ενέργεια." },
 	"noAppsDetected":           { "message": "Δεν ανιχνεύθηκαν εφαρμογές." },
   "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "CMS" },
 	"categoryName2":            { "message": "Διαδικτυακό Φόρουμ" },
 	"categoryName3":            { "message": "Διαχειριστής Βάσης Δεδομένων" },

src/drivers/webextension/_locales/id/messages.json

@@ -11,6 +11,8 @@
 	"nothingToDo":              { "message": "Tak ada yang dilakukan disini." },
 	"noAppsDetected":           { "message": "Tidak ada aplikasi yang terdeteksi." },
   "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "Sistem Pengelola Konten" },
 	"categoryName2":            { "message": "Papan Pesan" },
 	"categoryName3":            { "message": "Pengelola Basis Data" },

src/drivers/webextension/_locales/it/messages.json

@@ -11,6 +11,8 @@
 	"nothingToDo":              { "message": "Niente da fare qui." },
 	"noAppsDetected":           { "message": "Nessuna applicazione rilevata." },
   "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "CMS" },
 	"categoryName2":            { "message": "Forum" },
 	"categoryName3":            { "message": "Gestore di Database" },

src/drivers/webextension/_locales/pl/messages.json

@@ -11,6 +11,8 @@
 	"nothingToDo":              { "message": "Nic tu nie ma." },
 	"noAppsDetected":           { "message": "Nie wykryto żadnych aplikacji." },
   "categoryPin":              { "message": "Zawsze pokazuj tą ikonę" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "System zarządzania treścią" },
 	"categoryName2":            { "message": "Forum" },
 	"categoryName3":            { "message": "Menedżer baz danych" },

src/drivers/webextension/_locales/pt/messages.json

@@ -11,6 +11,8 @@
   "twitter":                  { "message": "Seguir Wappalyzer no Twitter" },
   "website":                  { "message": "Ir para wappalyzer.com" },
   "categoryPin":              { "message": "Mostrar sempre ícone" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
   "categoryName1":            { "message": "CMS" },
   "categoryName2":            { "message": "Fórum" },
   "categoryName3":            { "message": "Gestor de Base de Dados" },

src/drivers/webextension/_locales/pt_BR/messages.json

@@ -11,6 +11,8 @@
 	"nothingToDo":              { "message": "Nada a fazer aqui." },
 	"noAppsDetected":           { "message": "Nenhuma tecnologia identificada." },
   "categoryPin":              { "message": "Sempre mostrar ícone" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "CMS" },
 	"categoryName2":            { "message": "Fórum" },
 	"categoryName3":            { "message": "Gestão de banco de dados" },

src/drivers/webextension/_locales/ro/messages.json

@@ -11,6 +11,8 @@
 	"nothingToDo":              { "message": "Nimic de făcut pe pagina curentă." },
 	"noAppsDetected":           { "message": "Nici o aplicație detectată." },
   "categoryPin":              { "message": "Afișează icon tot timpul" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "CMS" },
 	"categoryName2":            { "message": "Forum de discuții" },
 	"categoryName3":            { "message": "Manager baze de date" },

src/drivers/webextension/_locales/ru/messages.json

@@ -64,6 +64,8 @@
   "twitter":                  { "message": "Следите за новостями в Твиттере" },
   "website":                  { "message": "Перейти на Wappalyzer.com" },
   "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
   "categoryName54":           { "message": "SEO" },
   "categoryName55":           { "message": "Бухгалтерский учёт" },
 	"categoryName56":           { "message": "Криптомайнер" },

src/drivers/webextension/_locales/sk/messages.json

@@ -11,6 +11,8 @@
   "nothingToDo":              { "message": "Nie je tu čo robiť." },
   "noAppsDetected":           { "message": "Žiadne aplikácie neboli zistené." },
   "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
   "categoryName1":            { "message": "CMS" },
   "categoryName2":            { "message": "Message Board" },
   "categoryName3":            { "message": "Správca databáz" },

src/drivers/webextension/_locales/tr/messages.json

@@ -11,6 +11,8 @@
 	"nothingToDo":              { "message": "Burada yapacak birşey yok." },
 	"noAppsDetected":           { "message": "Uygulamalar tespit edilemedi." },
   "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "CMS" },
 	"categoryName2":            { "message": "Mesaj Tahtası" },
 	"categoryName3":            { "message": "Veritabanı Yöneticisi" },

src/drivers/webextension/_locales/uk/messages.json

@@ -11,6 +11,8 @@
 	"nothingToDo":              { "message": "Тут нічого робити." },
 	"noAppsDetected":           { "message": "Нічого не знайдено." },
   "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "CMS" },
 	"categoryName2":            { "message": "Форум" },
 	"categoryName3":            { "message": "Менеджер БД" },

src/drivers/webextension/_locales/uz/messages.json

@@ -11,6 +11,8 @@
 	"nothingToDo":              { "message": "Bu yerda tekshirib bolmaydi." },
 	"noAppsDetected":           { "message": "Hech qanday dastur aniqlanmadi." },
   "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "CMS (KBT)" },
 	"categoryName2":            { "message": "Forum" },
 	"categoryName3":            { "message": "MB boshqaruvi" },

src/drivers/webextension/_locales/zh_CN/messages.json

@@ -11,6 +11,8 @@
   "nothingToDo":              { "message": "这儿啥也没有。" },
   "noAppsDetected":           { "message": "未检测到任何应用。" },
   "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
   "categoryName1":            { "message": "内容管理系统（CMS）" },
   "categoryName2":            { "message": "消息板" },
   "categoryName3":            { "message": "数据库管理器" },

src/drivers/webextension/_locales/zh_TW/messages.json

@@ -11,6 +11,8 @@
 	"nothingToDo":              { "message": "這裡什麼也沒有。" },
 	"noAppsDetected":           { "message": "未識別到技術。" },
 	"categoryPin":              { "message": "永遠顯示圖示" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "內容管理系統（CMS）" },
 	"categoryName2":            { "message": "留言板/討論區" },
 	"categoryName3":            { "message": "資料庫管理" },

src/drivers/webextension/css/popup.css

@@ -155,3 +155,48 @@ body {
 
 .empty__text {
 }
+
+.terms {
+  align-items: center;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  height: 100%;
+  width: 100%;
+}
+
+.terms__wrapper {
+  display: none;
+  height: 100%;
+  width: 100%;
+}
+
+.terms__wrapper--active {
+  display: block;
+}
+
+.terms__content {
+  font-size: .9rem;
+  line-height: 150%;
+  text-align: center;
+  margin-bottom: 1rem;
+  width: 80%;
+}
+
+.terms__accept {
+  background-color: #4608ad;
+  border: none;
+  border-radius: 3px;
+  color: white;
+  cursor: pointer;
+  font-size: .9rem;
+  padding: .8rem 3rem;
+}
+
+.terms__accept:hover {
+  background-color: #4107a1;
+}
+
+.terms__privacy {
+  margin-top: 1rem;
+}

src/drivers/webextension/html/popup.html

@@ -17,6 +17,16 @@
       </a>
     </div>
 
-    <div class="container"></div>
+    <div class="container">
+      <div class="terms__wrapper">
+        <div class="terms">
+          <div class="terms__content" data-i18n="termsContent"></div>
+
+          <button class="terms__accept" data-i18n="termsAccept"></button>
+
+          <a class="terms__privacy" href="https://www.wappalyzer.com/privacy" data-i18n="privacyPolicy"></a>
+        </div>
+      </div>
+    </div>
 	</body>
 </html>

src/drivers/webextension/js/content.js

@@ -66,7 +66,7 @@ if (typeof browser !== 'undefined' && typeof document.body !== 'undefined') {
           postMessage({
             id: 'patterns',
             patterns: response.patterns,
-          }, '*');
+          }, window.location.href);
         }
       });
     };

src/drivers/webextension/js/driver.js

@@ -3,9 +3,10 @@
  */
 
 /* eslint-env browser */
-/* global browser, fetch, Wappalyzer */
+/* global browser, chrome, fetch, Wappalyzer */
 
 /** global: browser */
+/** global: chrome */
 /** global: fetch */
 /** global: Wappalyzer */
 
@@ -20,6 +21,22 @@ browser.tabs.onRemoved.addListener((tabId) => {
   tabCache[tabId] = null;
 });
 
+function userAgent() {
+  const url = chrome.extension.getURL('/');
+
+  if (url.match(/^chrome-/)) {
+    return 'chrome';
+  }
+
+  if (url.match(/^moz-/)) {
+    return 'firefox';
+  }
+
+  if (url.match(/^ms-browser-/)) {
+    return 'edge';
+  }
+}
+
 /**
  * Get a value from localStorage
  */
@@ -160,6 +177,7 @@ browser.runtime.onMessage.addListener(async (message, sender) => {
         apps: wappalyzer.apps,
         categories: wappalyzer.categories,
         pinnedCategory,
+        termsAccepted: userAgent() === 'chrome' || await getOption('termsAccepted', false),
       };
 
       break;
@@ -295,8 +313,9 @@ wappalyzer.driver.getRobotsTxt = async (host, secure = false) => {
  */
 wappalyzer.driver.ping = async (hostnameCache = {}, adCache = []) => {
   const tracking = await getOption('tracking', true);
+  const termsAccepted = userAgent() === 'chrome' || await getOption('termsAccepted', false);
 
-  if (tracking) {
+  if (tracking && termsAccepted) {
     if (Object.keys(hostnameCache).length) {
       post('https://api.wappalyzer.com/ping/v1/', hostnameCache);
     }

src/drivers/webextension/js/inject.js

@@ -53,7 +53,7 @@
         }
       }
 
-      postMessage({ id: 'js', js }, '*');
+      postMessage({ id: 'js', js }, window.location.href);
     };
 
     addEventListener('message', onMessage);

src/drivers/webextension/js/lib/iframe.js

@@ -882,7 +882,7 @@
       let win = window;
       while (win !== win.top) {
         win = win.parent;
-        win.postMessage(adData, '*');
+        win.postMessage(adData, win.location.href);
       }
     }
 
@@ -998,7 +998,7 @@
       }
 
       if (!adData) return;
-      
+
       if (adData.postMessageId === POST_MSG_ID) {
         delete adData.postMessageId;
 

src/drivers/webextension/js/popup.js

@@ -6,11 +6,20 @@
 /** global: jsonToDOM */
 
 let pinnedCategory = null;
+let termsAccepted = false;
 
 function slugify(string) {
   return string.toLowerCase().replace(/[^a-z0-9-]/g, '-').replace(/--+/g, '-').replace(/(?:^-|-$)/, '');
 }
 
+function i18n() {
+  const nodes = document.querySelectorAll('[data-i18n]');
+
+  Array.prototype.forEach.call(nodes, (node) => {
+    node.innerHTML = browser.i18n.getMessage(node.dataset.i18n);
+  });
+}
+
 function replaceDom(domTemplate) {
   const container = document.getElementsByClassName('container')[0];
 
@@ -20,11 +29,7 @@ function replaceDom(domTemplate) {
 
   container.appendChild(jsonToDOM(domTemplate, document, {}));
 
-  const nodes = document.querySelectorAll('[data-i18n]');
-
-  Array.prototype.forEach.call(nodes, (node) => {
-    node.childNodes[0].nodeValue = browser.i18n.getMessage(node.dataset.i18n);
-  });
+  i18n();
 
   Array.from(document.querySelectorAll('.detected__category-pin-wrapper')).forEach((pin) => {
     pin.addEventListener('click', () => {
@@ -188,8 +193,29 @@ const func = (tabs) => {
     source: 'popup.js',
   }, (response) => {
     pinnedCategory = response.pinnedCategory;
+    termsAccepted = response.termsAccepted;
+
+    if (termsAccepted) {
+      replaceDomWhenReady(appsToDomTemplate(response));
+    } else {
+      i18n();
+
+      const wrapper = document.querySelector('.terms__wrapper');
+
+      document.querySelector('.terms__accept').addEventListener('click', () => {
+        (chrome || browser).runtime.sendMessage({
+          id: 'set_option',
+          key: 'termsAccepted',
+          value: true,
+        });
 
-    replaceDomWhenReady(appsToDomTemplate(response));
+        wrapper.classList.remove('terms__wrapper--active');
+
+        func(tabs);
+      });
+
+      wrapper.classList.add('terms__wrapper--active');
+    }
   });
 };
 

src/drivers/webextension/manifest.json

@@ -4,7 +4,7 @@
   "author": "Elbert Alias",
   "homepage_url": "https://www.wappalyzer.com",
   "description": "Identify web technologies",
-  "version": "5.6.3",
+  "version": "5.7.2",
   "default_locale": "en",
   "manifest_version": 2,
   "icons": {
@@ -77,7 +77,7 @@
   "applications": {
     "gecko": {
       "id": "wappalyzer@crunchlabz.com",
-      "strict_min_version": "42.0"
+      "strict_min_version": "60.0"
     }
   }
 }