From 88259efe50b22f1988a81e964b02fd9bb685ab3a Mon Sep 17 00:00:00 2001
From: Fabian Franz <franz.fabian.94@gmail.com>
Date: Sun, 4 Jul 2021 22:36:25 +0200
Subject: [PATCH] www/nginx, security/tor: non-hotfix relevant changes

---
 security/tor/Makefile                                    | 2 +-
 www/nginx/Makefile                                       | 1 +
 www/nginx/pkg-descr                                      | 4 ++++
 www/nginx/src/opnsense/www/js/nginx/package.json         | 3 ++-
 .../opnsense/www/js/nginx/src/templates/Fingerprint.html | 9 +++++----
 .../src/opnsense/www/js/nginx/src/tls_handshakes.js      | 2 +-
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/security/tor/Makefile b/security/tor/Makefile
index e13b2366c..5c19670bb 100644
--- a/security/tor/Makefile
+++ b/security/tor/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		tor
 PLUGIN_VERSION=		1.8
-PLUGIN_REVISION=	2
+PLUGIN_REVISION=	3
 PLUGIN_COMMENT=		The Onion Router
 PLUGIN_DEPENDS=		tor ruby
 PLUGIN_MAINTAINER=	franz.fabian.94@gmail.com
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index df5c3e49e..1653e31ad 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,5 +1,6 @@
 PLUGIN_NAME=		nginx
 PLUGIN_VERSION=		1.23
+PLUGIN_REVISION=	1
 PLUGIN_COMMENT=		Nginx HTTP server and reverse proxy
 PLUGIN_DEPENDS=		nginx
 PLUGIN_MAINTAINER=	franz.fabian.94@gmail.com
diff --git a/www/nginx/pkg-descr b/www/nginx/pkg-descr
index 5dde33a51..978c576ff 100644
--- a/www/nginx/pkg-descr
+++ b/www/nginx/pkg-descr
@@ -10,6 +10,10 @@ WWW: https://nginx.org/
 Plugin Changelog
 ================
 
+1.23_1
+
+* fix some issues with the MVC router
+
 1.23
 
 * Add custom error pages on a per HTTP server basis (contributed by 8191)
diff --git a/www/nginx/src/opnsense/www/js/nginx/package.json b/www/nginx/src/opnsense/www/js/nginx/package.json
index 67feb82a8..8aa881c9e 100644
--- a/www/nginx/src/opnsense/www/js/nginx/package.json
+++ b/www/nginx/src/opnsense/www/js/nginx/package.json
@@ -11,6 +11,7 @@
   },
   "scripts": {
     "webpack-cli": "webpack-cli",
-    "build": "webpack-cli --config webpack.conf.js"
+    "build": "webpack-cli --config webpack.conf.js",
+    "build-dev": "webpack-cli --config webpack.conf.js --mode development"
   }
 }
diff --git a/www/nginx/src/opnsense/www/js/nginx/src/templates/Fingerprint.html b/www/nginx/src/opnsense/www/js/nginx/src/templates/Fingerprint.html
index c124365e7..d28a7ac35 100644
--- a/www/nginx/src/opnsense/www/js/nginx/src/templates/Fingerprint.html
+++ b/www/nginx/src/opnsense/www/js/nginx/src/templates/Fingerprint.html
@@ -1,22 +1,23 @@
+<% if (typeof count !== 'undefined' && typeof ciphers !== 'undefined' && typeof curves !== 'undefined') { %>
 <div>
     <div class="col-md-10">
         <div class="row">
             <div class="col-md-3">
                 Count
             </div>
-            <div class="col-md-9"><%= _.escape(count) %></div>
+            <div class="col-md-9"><%= _.escape(count || '') %></div>
             <div class="col-md-3">
                 Ciphers
             </div>
-            <div class="col-md-9"><%= _.escape(ciphers) %></div>
+            <div class="col-md-9"><%= _.escape(ciphers || '') %></div>
             <div class="col-md-3">
                 Curves
             </div>
-            <div class="col-md-9"><%= _.escape(curves) %></div>
+            <div class="col-md-9"><%= _.escape(curves || '') %></div>
         </div>
     </div>
     <div class="col-md-2">
         <button class="btn btn-primary"><i class="fa fa-thumbs-up"></i> Store / Trust</button>
     </div>
-
 </div>
+<% } %>
diff --git a/www/nginx/src/opnsense/www/js/nginx/src/tls_handshakes.js b/www/nginx/src/opnsense/www/js/nginx/src/tls_handshakes.js
index 697e64666..50d580d0c 100644
--- a/www/nginx/src/opnsense/www/js/nginx/src/tls_handshakes.js
+++ b/www/nginx/src/opnsense/www/js/nginx/src/tls_handshakes.js
@@ -119,7 +119,7 @@ const FingerprintMain = Backbone.View.extend({
     render_all(attributes) {
         for (const ua in attributes) {
             // skip loop if the property is from prototype
-            if (attributes.hasOwnProperty(ua)) {
+            if (attributes.hasOwnProperty(ua) && typeof attributes[ua] !== 'undefined' && typeof attributes[ua] !== 'function') {
                 const fingerprints = new Backbone.Collection(attributes[ua]);
                 const fingerprints_view = new FingerPrintList({'collection': fingerprints, 'ua': ua});
                 this.$el.append(fingerprints_view.$el);