Rename apps.json to technologies.json

bin/build.js

@@ -17,7 +17,7 @@ if (!version) {
 ;[
   './src/package.json',
   './src/drivers/npm/package.json',
-  './src/drivers/webextension/manifest.json'
+  './src/drivers/webextension/manifest.json',
 ].forEach((file) => {
   const json = JSON.parse(fs.readFileSync(file))
 

bin/link.js

@@ -9,9 +9,9 @@ const link = (src, dest) => {
 }
 
 // WebExtension
-link('./src/apps.json', './src/drivers/webextension/apps.json')
+link('./src/technologies.json', './src/drivers/webextension/technologies.json')
 link('./src/wappalyzer.js', './src/drivers/webextension/js/wappalyzer.js')
 
 // NPM
-link('./src/apps.json', './src/drivers/npm/apps.json')
+link('./src/technologies.json', './src/drivers/npm/technologies.json')
 link('./src/wappalyzer.js', './src/drivers/npm/wappalyzer.js')

bin/validate.js

@@ -2,8 +2,8 @@ const fs = require('fs')
 
 const iconPath = './src/drivers/webextension/images/icons'
 
-const { apps: technologies, categories } = JSON.parse(
+const { technologies, categories } = JSON.parse(
-  fs.readFileSync('./src/apps.json')
+  fs.readFileSync('./src/technologies.json')
 )
 
 try {

package.json

@@ -17,9 +17,9 @@
   "scripts": {
     "link": "node ./bin/link.js",
     "lint": "eslint --fix src/**/*.js",
-    "validate": "yarn run lint && jsonlint -qV ./schema.json ./src/apps.json && node ./bin/validate.js",
+    "validate": "yarn run lint && jsonlint -qV ./schema.json ./src/technologies.json && node ./bin/validate.js",
     "convert": "cd ./src/drivers/webextension/images/icons ; cp *.svg converted ; cd converted ; convert-svg-to-png *.svg --width 32 --height 32 ; rm *.svg",
-    "prettify": "jsonlint -si --trim-trailing-commas --enforce-double-quotes ./src/apps.json",
+    "prettify": "jsonlint -si --trim-trailing-commas --enforce-double-quotes ./src/technologies.json",
     "build": "yarn run link && yarn run validate && yarn run prettify && yarn run convert && node ./bin/build.js",
     "build:safari": "xcrun safari-web-extension-converter --swift --project-location build --force src/drivers/webextension"
   }

schema.json

@@ -8,7 +8,7 @@
 	},
 	"type": "object",
 	"additionalProperties": false,
-	"required": ["categories","apps"],
+	"required": ["technologies", "categories"],
 	"properties": {
 		"$schema": {
 			"type": "string"
@@ -31,7 +31,7 @@
 				}
 			}
 		},
-		"apps": {
+		"technologies": {
 			"type": "object",
 			"additionalProperties": {
 				"additionalProperties": false,
@@ -110,6 +110,19 @@
 							}
 						]
 					},
+					"certIssuer": {
+						"oneOf": [
+							{
+								"type": "array",
+								"items": {
+									"$ref": "#/definitions/non-empty-non-blank-string"
+								}
+							},
+							{
+								"$ref": "#/definitions/non-empty-non-blank-string"
+							}
+						]
+					},
 					"excludes": {
 						"oneOf": [
 							{
@@ -147,7 +160,7 @@
 							}
 						}
 					},
-					"script": {
+					"scripts": {
 						"oneOf": [
 							{
 								"type": "array",

src/README.md

@@ -17,9 +17,9 @@ const fs = require('fs')
 const Wappalyzer = require('./wappalyzer')
 
 // See https://www.wappalyzer.com/docs/dev/specification or use
-// https://raw.githubusercontent.com/AliasIO/wappalyzer/master/src/apps.json
+// https://raw.githubusercontent.com/AliasIO/wappalyzer/master/src/technologies.json
-const { apps: technologies, categories } = JSON.parse(
+const { technologies, categories } = JSON.parse(
-  fs.readFileSync('./apps.json')
+  fs.readFileSync('./technologies.json')
 )
 
 Wappalyzer.setTechnologies(technologies)

src/drivers/npm/Dockerfile

@@ -17,10 +17,10 @@ RUN mkdir -p "$WAPPALYZER_ROOT/browsers"
 
 WORKDIR "$WAPPALYZER_ROOT"
 
-ADD apps.json .
 ADD cli.js .
 ADD driver.js .
 ADD package.json .
+ADD technologies.json .
 ADD wappalyzer.js .
 ADD yarn.lock .
 

src/drivers/npm/driver.js

@@ -43,8 +43,8 @@ if (AWS_LAMBDA_FUNCTION_NAME) {
 
 const extensions = /^([^.]+$|\.(asp|aspx|cgi|htm|html|jsp|php)$)/
 
-const { apps: technologies, categories } = JSON.parse(
+const { technologies, categories } = JSON.parse(
-  fs.readFileSync(path.resolve(`${__dirname}/apps.json`))
+  fs.readFileSync(path.resolve(`${__dirname}/technologies.json`))
 )
 
 setTechnologies(technologies)
@@ -321,8 +321,6 @@ class Site {
               ? response.securityDetails().issuer()
               : ''
 
-            console.log(certIssuer)
-
             this.onDetect(analyze({ headers, certIssuer }))
 
             await this.emit('response', { page, response })

src/drivers/npm/package.json

@@ -25,10 +25,10 @@
   },
   "main": "driver.js",
   "files": [
-    "apps.json",
     "cli.js",
     "driver.js",
     "index.js",
+    "technologies.json",
     "wappalyzer.js"
   ],
   "bin": {
@@ -37,4 +37,4 @@
   "dependencies": {
     "puppeteer": "^5.2.1"
   }
-}
+}

src/drivers/webextension/js/driver.js

@@ -106,8 +106,8 @@ const Driver = {
    */
   async loadTechnologies() {
     try {
-      const { apps: technologies, categories } = await (
+      const { technologies, categories } = await (
-        await fetch(chrome.extension.getURL('apps.json'))
+        await fetch(chrome.extension.getURL('technologies.json'))
       ).json()
 
       setTechnologies(technologies)

src/wappalyzer.js

@@ -226,7 +226,7 @@ const Wappalyzer = {
         headers,
         certIssuer,
         cookies,
-        script,
+        scripts,
         js,
         implies,
         excludes,
@@ -246,7 +246,7 @@ const Wappalyzer = {
         certIssuer: transform(certIssuer),
         robots: transform(robots),
         meta: transform(meta),
-        scripts: transform(script),
+        scripts: transform(scripts),
         js: transform(js, true),
         implies: transform(implies).map(({ value, confidence }) => ({
           name: value,