From e619fce6e91f89be24dd8efc6470cd5014fe409a Mon Sep 17 00:00:00 2001
From: Elbert Alias <77259+AliasIO@users.noreply.github.com>
Date: Thu, 3 Sep 2020 09:12:26 +1000
Subject: [PATCH] Add CSS inspection, add Vuetify detection

---
 schema.json                                   | 13 ++++++++++++
 .../webextension/images/icons/Vuetify.svg     |  6 ++++++
 src/drivers/webextension/js/content.js        | 21 ++++++++++++++++++-
 src/drivers/webextension/js/driver.js         | 11 ++++++++--
 src/technologies.json                         | 10 +++++++++
 src/wappalyzer.js                             | 15 ++++++++++++-
 6 files changed, 72 insertions(+), 4 deletions(-)
 create mode 100644 src/drivers/webextension/images/icons/Vuetify.svg

diff --git a/schema.json b/schema.json
index d8446e962..1ec5a3478 100644
--- a/schema.json
+++ b/schema.json
@@ -97,6 +97,19 @@
 							}
 						]
 					},
+					"css": {
+						"oneOf": [
+							{
+								"type": "array",
+								"items": {
+									"$ref": "#/definitions/non-empty-non-blank-string"
+								}
+							},
+							{
+								"$ref": "#/definitions/non-empty-non-blank-string"
+							}
+						]
+					},
 					"robots": {
 						"oneOf": [
 							{
diff --git a/src/drivers/webextension/images/icons/Vuetify.svg b/src/drivers/webextension/images/icons/Vuetify.svg
new file mode 100644
index 000000000..15bbf3b98
--- /dev/null
+++ b/src/drivers/webextension/images/icons/Vuetify.svg
@@ -0,0 +1,6 @@
+<svg width="295" height="295" viewBox="0 0 295 295" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M146.67 0H86.55L146.67 142.1" fill="#1697F6"/>
+<path d="M146.67 183.81V294.1L18 42.89H85.4" fill="#7BC6FF"/>
+<path d="M146.67 0H206.79L146.67 142.1" fill="#1867C0"/>
+<path d="M146.67 183.81V294.1L275.34 42.89H207.94" fill="#AEDDFF"/>
+</svg>
diff --git a/src/drivers/webextension/js/content.js b/src/drivers/webextension/js/content.js
index 2606e15c9..eef2ad298 100644
--- a/src/drivers/webextension/js/content.js
+++ b/src/drivers/webextension/js/content.js
@@ -47,6 +47,25 @@ const Content = {
             : resolve()
         ))
 
+      // CSS rules
+      let css = []
+
+      try {
+        for (const sheet of Array.from(document.styleSheets)) {
+          for (const rules of Array.from(sheet.cssRules)) {
+            css.push(rules.cssText)
+
+            if (css.length >= 3000) {
+              break
+            }
+          }
+        }
+      } catch (error) {
+        // Continue
+      }
+
+      css = css.join('\n')
+
       // Script tags
       const scripts = Array.from(document.scripts)
         .filter(({ src }) => src)
@@ -69,7 +88,7 @@ const Content = {
 
       Content.driver('onContentLoad', [
         location.href,
-        { html, scripts, meta },
+        { html, css, scripts, meta },
         language,
       ])
 
diff --git a/src/drivers/webextension/js/driver.js b/src/drivers/webextension/js/driver.js
index 1e93aec82..063488131 100644
--- a/src/drivers/webextension/js/driver.js
+++ b/src/drivers/webextension/js/driver.js
@@ -139,6 +139,13 @@ const Driver = {
     }
   },
 
+  /**
+   * Wrapper for analyze
+   */
+  analyze(...args) {
+    return analyze(...args)
+  },
+
   /**
    * Analyse JavaScript variables
    * @param {String} url
@@ -216,13 +223,13 @@ const Driver = {
 
           let certIssuer = ''
 
-          if (browser) {
+          if (typeof browser !== 'undefined') {
             // Currently only works in Firefox
             // See https://stackoverflow.com/a/50484642
             const { certificates } = await browser.webRequest.getSecurityInfo(
               request.requestId,
               {
-                certificateChain: true,
+                certificateChain: false,
                 rawDER: false,
               }
             )
diff --git a/src/technologies.json b/src/technologies.json
index c65f9c353..86c1191a8 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -979,6 +979,16 @@
       "scripts": "/([\\d.rc-]+)?/angular-material(?:\\.min)?\\.js\\;version:\\1",
       "website": "https://material.angularjs.org"
     },
+    "Vuetify": {
+      "cats": [
+        66
+      ],
+      "icon": "Vuetify.svg",
+      "implies": "Vue.js",
+      "html": "<div data-app[^>]+class=\"v-application",
+      "css": "\\.v-application \\.d-block ",
+      "website": "https://vuetifyjs.com"
+    },
     "AngularDart": {
       "cats": [
         18
diff --git a/src/wappalyzer.js b/src/wappalyzer.js
index ac9741dfa..46903e1ed 100644
--- a/src/wappalyzer.js
+++ b/src/wappalyzer.js
@@ -180,7 +180,17 @@ const Wappalyzer = {
    * Initialize analyzation.
    * @param {*} param0
    */
-  analyze({ url, html, robots, meta, headers, certIssuer, cookies, scripts }) {
+  analyze({
+    url,
+    html,
+    css,
+    robots,
+    meta,
+    headers,
+    certIssuer,
+    cookies,
+    scripts,
+  }) {
     const oo = Wappalyzer.analyzeOneToOne
     const om = Wappalyzer.analyzeOneToMany
     const mm = Wappalyzer.analyzeManyToMany
@@ -193,6 +203,7 @@ const Wappalyzer = {
           flatten([
             oo(technology, 'url', url),
             oo(technology, 'html', html),
+            oo(technology, 'css', css),
             oo(technology, 'robots', robots),
             oo(technology, 'certIssuer', certIssuer),
             om(technology, 'scripts', scripts),
@@ -221,6 +232,7 @@ const Wappalyzer = {
         cats,
         url,
         html,
+        css,
         robots,
         meta,
         headers,
@@ -243,6 +255,7 @@ const Wappalyzer = {
         headers: transform(headers),
         cookies: transform(cookies),
         html: transform(html),
+        css: transform(css),
         certIssuer: transform(certIssuer),
         robots: transform(robots),
         meta: transform(meta),