From 688c850c500d140ede8a4bd02a6204949553e977 Mon Sep 17 00:00:00 2001
From: Dorian Niemiec <dorian.niemiec@svrjs.org>
Date: Thu, 18 Jan 2024 01:21:25 +0100
Subject: [PATCH] Update to SVR.JS 3.13.1

---
 index.html          | 12 ++++--------
 licenses/index.html |  8 ++++----
 svr.js              | 29 +++++++++++++++++++----------
 tests.html          |  4 ++--
 4 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/index.html b/index.html
index 695d6e8..7a87c60 100644
--- a/index.html
+++ b/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>SVR.JS 3.13.0</title>
+    <title>SVR.JS 3.13.1</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta charset="UTF-8" />
     <style>
@@ -12,7 +12,7 @@
     </style>
   </head>
   <body>
-    <h1>Welcome to SVR.JS 3.13.0</h1>
+    <h1>Welcome to SVR.JS 3.13.1</h1>
     <br/>
     <img src="/logo.png" style="width: 256px;" />
     <br/>
@@ -134,12 +134,8 @@
     </div>
     <p>Changes:</p>
     <ul>
-      <li>Added support for skipping URL rewriting, when the URL refers to a file or a directory.</li>
-      <li>Dropped support for svrmodpack.</li>
-      <li>Added support for 307 and 308 redirects (both in config.json and in redirect() SVR.JS API method).</li>
-      <li>Mitigated log file injection vulnerability for HTTP authentication.</li>
-      <li>Mitigated log file injection vulnerability for SVR.JS mod file names.</li>
-      <li>SVR.JS no longer crashes, when access to a log file is denied.</li>
+      <li>Fixed error handling for invalid URL rewrite regexes.</li>
+      <li>Fixed bug with non-working HTTP proxy handler (excluding CONNECT method).</li>
     </ul>
     <br/>
     <a href="/tests.html">Tests</a><br/>
diff --git a/licenses/index.html b/licenses/index.html
index 8dc995a..2bc57f2 100644
--- a/licenses/index.html
+++ b/licenses/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>SVR.JS 3.13.0 Licenses</title>
+    <title>SVR.JS 3.13.1 Licenses</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta charset="UTF-8" />
     <style>
@@ -12,8 +12,8 @@
     </style>
   </head>
   <body>
-    <h1>SVR.JS 3.13.0 Licenses</h1>
-    <h2>SVR.JS 3.13.0</h2>
+    <h1>SVR.JS 3.13.1 Licenses</h1>
+    <h2>SVR.JS 3.13.1</h2>
     <div style="display: inline-block; text-align: left; border-width: 2px; border-style: solid; border-color: gray; padding: 8px;">
       MIT License<br/>
       <br/>
@@ -37,7 +37,7 @@
       OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE<br/>
       SOFTWARE.<br/>
     </div>
-    <h2>Packages used by SVR.JS 3.13.0</h2>
+    <h2>Packages used by SVR.JS 3.13.1</h2>
     <div style="width: 100%; background-color: #ccc; border: 1px solid green; text-align: left; margin: 10px 0;">
       <div style="float: right;">License: MIT</div>
       <div style="font-size: 20px;">
diff --git a/svr.js b/svr.js
index b3558d9..173635b 100644
--- a/svr.js
+++ b/svr.js
@@ -69,7 +69,7 @@ function deleteFolderRecursive(path) {
 }
 
 var os = require("os");
-var version = "3.13.0";
+var version = "3.13.1";
 var singlethreaded = false;
 
 if (process.versions) process.versions.svrjs = version; // Inject SVR.JS into process.versions
@@ -4168,9 +4168,9 @@ if (!cluster.isPrimary) {
       // Handle URL rewriting
       function rewriteURL(address, map, callback, _fileState, _mapBegIndex) {
         var rewrittenURL = address;
+        var doCallback = true;
         if (!isProxy) {
-          var doCallback = true;
-          for(var i=(_mapBegIndex ? _mapBegIndex : 0);i<map.length;i++) {
+          for (var i = (_mapBegIndex ? _mapBegIndex : 0); i < map.length; i++) {
             var mapEntry = map[i];
             if(href != "/" && (mapEntry.isNotDirectory || mapEntry.isNotFile) && !_fileState) {
               fs.stat("." + decodeURIComponent(href), function(err, stats) {
@@ -4190,15 +4190,20 @@ if (!cluster.isPrimary) {
               break;
             }
             if (matchHostname(mapEntry.host) && createRegex(mapEntry.definingRegex).test(address) && !(mapEntry.isNotDirectory && _fileState == 2) && !(mapEntry.isNotFile && _fileState == 1)) {
-              mapEntry.replacements.forEach(function (replacement) {
-                rewrittenURL = rewrittenURL.replace(createRegex(replacement.regex), replacement.replacement);
-              });
-              if (mapEntry.append) rewrittenURL += mapEntry.append;
+              try {
+                mapEntry.replacements.forEach(function (replacement) {
+                  rewrittenURL = rewrittenURL.replace(createRegex(replacement.regex), replacement.replacement);
+                });
+                if (mapEntry.append) rewrittenURL += mapEntry.append;
+              } catch (err) {
+                doCallback = false;
+                callback(err, address);
+              }
               break;
             }
           }
         }
-        if(doCallback) callback(rewrittenURL);
+        if(doCallback) callback(null, rewrittenURL);
       }
 
       // Trailing slash redirection
@@ -4207,7 +4212,7 @@ if (!cluster.isPrimary) {
           fs.stat("." + decodeURIComponent(href), function (err, stats) {
             if (err || !stats.isDirectory()) {
               try {
-                callback();  
+                callback();
               } catch (err) {
                 callServerError(500, undefined, err);
               }
@@ -4233,7 +4238,11 @@ if (!cluster.isPrimary) {
       var origHref = href;
 
       // Rewrite URLs
-      rewriteURL(req.url, rewriteMap, function(rewrittenURL) {
+      rewriteURL(req.url, rewriteMap, function(err, rewrittenURL) {
+        if (err) {
+          callServerError(500, undefined, err);
+          return;
+        }
         if (rewrittenURL != req.url) {
           serverconsole.resmessage("URL rewritten: " + req.url + " => " + rewrittenURL);
           req.url = rewrittenURL;
diff --git a/tests.html b/tests.html
index 3e9a9e4..418fc9d 100644
--- a/tests.html
+++ b/tests.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>SVR.JS 3.13.0 Tests</title>
+    <title>SVR.JS 3.13.1 Tests</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta charset="UTF-8" />
     <style>
@@ -12,7 +12,7 @@
     </style>
   </head>
   <body>
-    <h1>SVR.JS 3.13.0 Tests</h1>
+    <h1>SVR.JS 3.13.1 Tests</h1>
     <h2>Directory (without trailing slash)</h2>
     <iframe src="/testdir" width="50%" height="300px"></iframe>
     <h2>Directory (with query)</h2>
