Build v5.5.2

6 years ago · 4e57ea2671
parent c9174c1129
commit 4e57ea2671
6 changed files with 76 additions and 82 deletions
--- a/bin/build
+++ b/bin/build
@ -20,9 +20,9 @@ echo "Deleting junk files..."

 find . -name ".DS_Store" -exec rm {} \;

-#echo "Prettifying apps.json..."
+echo "Prettifying apps.json..."

-#jsonlint -ips src/apps.json
+sed -e 's/\\\\/{{ESCAPE}}/g' src/apps.json | jsonlint-cli -ps | sed -e 's/{{ESCAPE}}/\\\\/g' > /tmp/apps.json && cat /tmp/apps.json > src/apps.json

 echo "Converting SVG icons to PNG..."

--- a/bin/validate
+++ b/bin/validate
@ -4,9 +4,9 @@ cd "$(dirname $0)/.."

 set -eu

-#echo "Validating apps.json..."
+echo "Validating apps.json..."

-#jsonlint -V schema.json src/apps.json
+jsonlint-cli -s schema.json src/apps.json

 echo "Validating regular expressions..."

--- a/schema.json
+++ b/schema.json
@ -38,6 +38,12 @@
 						},
 						"required": true
 					},
+					"cookies": {
+						"type": "object",
+						"additionalProperties": {
+							"type": "string"
+						}
+					},
 					"js": {
 						"type": "object",
 						"additionalProperties": {
--- a/src/apps.json
+++ b/src/apps.json
@ -3,11 +3,11 @@
  "apps": {
    "1C-Bitrix": {
      "cats": [
-             "1"
+        1
      ],
      "headers": {
-             "Set-Cookie": "BITRIX_",
-             "X-Powered-CMS": "Bitrix Site Manager"
+        "Set-Cookie": "BITRIX_",
+        "X-Powered-CMS": "Bitrix Site Manager"
      },
      "html": "(?:<link[^>]+components/bitrix|(?:src|href)=\"/bitrix/(?:js|templates))",
      "icon": "1C-Bitrix.png",
@ -606,12 +606,12 @@
        "AngularDart",
        "AngularJS"
      ],
-      "js": {
-        "ng.probe": "",
-        "ng.coreTokens": ""
-      },
      "html": "<[^>]+ ng-version=\"([\\d.]+)\"\\;version:\\1",
      "icon": "Angular.svg",
+      "js": {
+        "ng.coreTokens": "",
+        "ng.probe": ""
+      },
      "website": "https://angular.io"
    },
    "Angular Material": {
@ -3034,10 +3034,10 @@
      "cats": [
        6
      ],
+      "icon": "Fbits.png",
      "js": {
        "fbits": ""
      },
-      "icon": "Fbits.png",
      "website": "https://www.traycorp.com.br"
    },
    "Fedora": {
@ -5708,8 +5708,8 @@
      ],
      "icon": "MakeShopKorea.png",
      "js": {
-        "MakeshopLogUniqueId": "",
-        "Makeshop": ""
+        "Makeshop": "",
+        "MakeshopLogUniqueId": ""
      },
      "website": "https://www.makeshop.co.kr"
    },
@ -5813,6 +5813,27 @@
      "script": "([\\d.]+)?/mathjax\\.js\\;version:\\1",
      "website": "https://www.mathjax.org"
    },
+    "Matomo": {
+      "cats": [
+        10
+      ],
+      "cookies": {
+        "PIWIK_SESSID": ""
+      },
+      "icon": "Piwik.png",
+      "js": {
+        "Matomo": "",
+        "Piwik": "",
+        "_paq": ""
+      },
+      "meta": {
+        "apple-itunes-app": "app-id=737216887",
+        "generator": "(?:Matomo|Piwik) - Open Source Web Analytics",
+        "google-play-app": "app-id=org\\.piwik\\.mobile2"
+      },
+      "script": "piwik\\.js|piwik\\.php",
+      "website": "http://piwik.org"
+    },
    "Mattermost": {
      "cats": [
        2
@ -6358,11 +6379,11 @@
      "cats": [
        1
      ],
+      "icon": "Mono.net.png",
+      "implies": "Matomo",
      "js": {
        "_monoTracker": ""
      },
-      "icon": "Mono.net.png",
-      "implies": "Matomo",
      "script": "monotracker(?:\\.min)?\\.js",
      "website": "https://www.mono.net/en"
    },
@ -7473,39 +7494,6 @@
      "script": "//assets\\.pinterest\\.com/js/pinit\\.js",
      "website": "http://pinterest.com"
    },
-    "pirobase CMS": {
-      "cats": [
-        1
-      ],
-      "html": [
-        "<(?:script|link)[^>]/site/[a-z0-9/._-]+/resourceCached/[a-z0-9/._-]+",
-        "<input[^>]+cbi:///cms/"
-      ],
-      "icon": "pirobaseCMS.svg",
-      "implies": "Java",
-      "website": "https://www.pirobase-imperia.com/de/produkte/produktuebersicht/pirobase-cms"
-    },
-    "Matomo": {
-      "cats": [
-        10
-      ],
-      "js": {
-        "Matomo": "",
-        "Piwik": "",
-        "_paq": ""
-      },
-      "cookies": {
-        "PIWIK_SESSID": ""
-      },
-      "icon": "Piwik.png",
-      "meta": {
-        "apple-itunes-app": "app-id=737216887",
-        "generator": "(?:Matomo|Piwik) - Open Source Web Analytics",
-        "google-play-app": "app-id=org\\.piwik\\.mobile2"
-      },
-      "script": "piwik\\.js|piwik\\.php",
-      "website": "http://piwik.org"
-    },
    "Planet": {
      "cats": [
        49
@ -7596,6 +7584,17 @@
      },
      "website": "http://www.po.st/"
    },
+    "Polyfill": {
+      "cats": [
+        59
+      ],
+      "icon": "polyfill.svg",
+      "script": [
+        "^https?://cdn\\.polyfill\\.io/",
+        "/polyfill\\.min\\.js"
+      ],
+      "website": "https://polyfill.io"
+    },
    "Polymer": {
      "cats": [
        12
@ -7608,17 +7607,6 @@
      "script": "polymer\\.js",
      "website": "http://polymer-project.org"
    },
-    "Polyfill": {
-      "cats": [
-        59
-      ],
-			"icon": "polyfill.svg",
-      "script": [
-				"^https?://cdn\\.polyfill\\.io/",
-				"/polyfill\\.min\\.js"
-			],
-      "website": "https://polyfill.io"
-    },
    "Posterous": {
      "cats": [
        1,
@ -9097,14 +9085,14 @@
    },
    "SoftTr": {
      "cats": [
-      6
+        6
      ],
      "icon": "softtr.png",
      "meta": {
-      "author": "SoftTr E-Ticaret Sitesi Yazılımı"
+        "author": "SoftTr E-Ticaret Sitesi Yazılımı"
      },
      "website": "http://www.softtr.com"
-      },
+    },
    "Solodev": {
      "cats": [
        1
@ -10582,20 +10570,6 @@
      "script": "web2py\\.js",
      "website": "http://web2py.com"
    },
-    "Webdev": {
-      "cats": [
-        20
-      ],
-      "headers": {
-        "WebDevSrc": ""
-			},
-      "icon": "webdev.png",
-			"html": "<!-- [a-zA-Z0-9_]+ [\\d/]+ [\\d:]+ WebDev \\d\\d ([\\d.]+) -->\\;version:\\1",
-      "meta": {
-        "generator": "^WEBDEV$"
-      },
-      "website": "https://www.windev.com/webdev/index.html"
-    },
    "WebGUI": {
      "cats": [
        1
@ -10630,6 +10604,20 @@
      },
      "website": "http://websitex5.com"
    },
+    "Webdev": {
+      "cats": [
+        20
+      ],
+      "headers": {
+        "WebDevSrc": ""
+      },
+      "html": "<!-- [a-zA-Z0-9_]+ [\\d/]+ [\\d:]+ WebDev \\d\\d ([\\d.]+) -->\\;version:\\1",
+      "icon": "webdev.png",
+      "meta": {
+        "generator": "^WEBDEV$"
+      },
+      "website": "https://www.windev.com/webdev/index.html"
+    },
    "Webix": {
      "cats": [
        12
@ -11234,7 +11222,7 @@
        "PHP"
      ],
      "script": [
-        "/assets/[a-zA-Z0-9]{8}\/yii\\.js$",
+        "/assets/[a-zA-Z0-9]{8}\\/yii\\.js$",
        "/yii\\.(?:validation|activeForm)\\.js"
      ],
      "website": "https://www.yiiframework.com"
@ -12431,9 +12419,9 @@
      "cats": [
        2
      ],
+      "html": "<div id=\"copyright\">Powered by vBulletin",
      "icon": "vBulletin.png",
      "implies": "PHP",
-			"html": "<div id=\"copyright\">Powered by vBulletin",
      "js": {
        "vBulletin": ""
      },
--- 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.5.1",
+  "version": "5.5.2",
  "author": "Elbert Alias",
  "license": "GPL-3.0",
  "repository": {
--- a/src/drivers/webextension/manifest.json
+++ b/src/drivers/webextension/manifest.json
@ -4,7 +4,7 @@
 	"author": "Elbert Alias",
 	"homepage_url": "https://www.wappalyzer.com",
 	"description": "Identify web technologies",
-	"version": "5.5.1",
+	"version": "5.5.2",
 	"default_locale": "en",
 	"manifest_version": 2,
 	"icons": {
@ -47,7 +47,7 @@
 				"https://*/*"
 			],
 			"exclude_matches": [
-				"*.modirum.com/*",
+				"https://*.modirum.com/*",
 				"https://www.alphaecommerce.gr/*"
 			],
 			"js": [