From 6fb0b80a2d02884afc0805900cdb0efaf632eef2 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Tue, 13 Apr 2021 13:32:56 -0500
Subject: [PATCH 001/154] Update webapp.js

---
 webapp.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/webapp.js b/webapp.js
index 584456b8..10081e28 100644
--- a/webapp.js
+++ b/webapp.js
@@ -754,4 +754,3 @@ Changes with nginx 0.7.9                                         12 Aug 2008
     WSC.WebApplication = WebApplication
 
 })();
-

From 4b8a35004e5b8b49ce6637749dba478da3c6a2e3 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Tue, 13 Apr 2021 13:33:56 -0500
Subject: [PATCH 002/154] Update manifest.json

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 81854e39..75611aa8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -4,7 +4,7 @@
     "short_name": "Web Server",
     "description": "A Web Server for Chrome, serves web pages from a local folder over the network, using HTTP. Runs offline.",
     "author": "Kyle Graehl",
-    "version": "0.5.0",
+    "version": "0.5.3",
     "manifest_version": 2,
     "offline_enabled": true,
     "minimum_chrome_version": "45",

From 69c13302fd99722728d4785916a8aed20210ff1b Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Tue, 13 Apr 2021 13:34:36 -0500
Subject: [PATCH 003/154] Update handlers.js

---
 handlers.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/handlers.js b/handlers.js
index 5f9ab5ae..7c333464 100644
--- a/handlers.js
+++ b/handlers.js
@@ -293,12 +293,15 @@
                         (this.request.headers['accept'] && this.request.headers['accept'].toLowerCase() == 'application/json')
                        ) {
                         this.renderDirectoryListingJSON(results)
-                    } else if (this.request.arguments && this.request.arguments.static == '1' ||
+                    } else if (this.app.opts.optDir404 && this.app.opts.optRenderIndex) {
+                            this.write("404 - File not found", 404)
+                            this.finish()
+                        } else if (this.request.arguments && this.request.arguments.static == '1' ||
                         this.request.arguments.static == 'true' ||
 						this.app.opts.optStatic
                        ) {
                         this.renderDirectoryListing(results)
-                    } else {
+                        } else {
                         this.renderDirectoryListingTemplate(results)
                     }
                 }

From e8e878ceecd9afe95317588dc39c087c52616fa9 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Tue, 13 Apr 2021 13:35:18 -0500
Subject: [PATCH 004/154] Update options.js

---
 react-ui/js/options.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/react-ui/js/options.js b/react-ui/js/options.js
index 98b26163..74dc213d 100644
--- a/react-ui/js/options.js
+++ b/react-ui/js/options.js
@@ -170,6 +170,12 @@ const options = {
     type: Boolean,
     default: true
   },
+  optDir404: {
+    label: '404 instead of directory listing',
+    help: 'When no index.html is found, you will get a 404 error.',
+    type: Boolean,
+    default: false
+  },
   optUpload: {
     label: 'Allow File upload',
     help: 'The files directory listing allows drag-and-drop to upload small files',

From 21f5d6043ab5dad3b2d5dc5c31d838dcc28e1779 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Tue, 13 Apr 2021 13:35:35 -0500
Subject: [PATCH 005/154] Update index.js

---
 react-ui/js/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/react-ui/js/index.js b/react-ui/js/index.js
index 65776158..0951d369 100644
--- a/react-ui/js/index.js
+++ b/react-ui/js/index.js
@@ -255,6 +255,7 @@ class App extends React.Component {
       optDoPortMapping: ['optAllInterfaces'],
       optPreventSleep: null,
       optRenderIndex: null,
+      optDir404: ['optRenderIndex'],
       port: null,
     };
     const optAdvanced = {

From 2766460b9ff3f9b81afa5ff2663d534e053d51cc Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Tue, 13 Apr 2021 13:45:32 -0500
Subject: [PATCH 006/154] Update README.md

Fix cws sample image
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d99bf345..ad975da6 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<a target="_blank" href="https://chrome.google.com/webstore/detail/web-server-for-chrome/ofhbbkphhbklhfoeikjpcbhemlocgigb">![Try it now in CWS](https://raw.github.com/GoogleChrome/chrome-app-samples/master/tryitnowbutton.png "Click here to install this sample from the Chrome Web Store")</a>
+<a target="_blank" href="https://chrome.google.com/webstore/detail/web-server-for-chrome/ofhbbkphhbklhfoeikjpcbhemlocgigb">![Try it now in CWS](https://raw.githubusercontent.com/kzahel/web-server-chrome/master/images/200ok-128.png "Click here to install this sample from the Chrome Web Store")</a>
 
 ## Web Server for Chrome
 

From e6f85a9e80fc3533692b6e00a6a3e290699bc4bf Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Tue, 13 Apr 2021 14:06:48 -0500
Subject: [PATCH 007/154] Update options.js

---
 react-ui/js/options.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/react-ui/js/options.js b/react-ui/js/options.js
index 74dc213d..e1973175 100644
--- a/react-ui/js/options.js
+++ b/react-ui/js/options.js
@@ -172,7 +172,7 @@ const options = {
   },
   optDir404: {
     label: '404 instead of directory listing',
-    help: 'When no index.html is found, you will get a 404 error.',
+    help: 'When no index.html is found in a directory, you will get a 404 error.',
     type: Boolean,
     default: false
   },

From b9f8a447fe900de9370d971ec46f4796069a6a30 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Tue, 13 Apr 2021 14:08:05 -0500
Subject: [PATCH 008/154] Update options.js

---
 react-ui/js/options.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/react-ui/js/options.js b/react-ui/js/options.js
index e1973175..3c636775 100644
--- a/react-ui/js/options.js
+++ b/react-ui/js/options.js
@@ -172,7 +172,7 @@ const options = {
   },
   optDir404: {
     label: '404 instead of directory listing',
-    help: 'When no index.html is found in a directory, you will get a 404 error.',
+    help: 'When no index.html is found in a directory, you will get a 404 error',
     type: Boolean,
     default: false
   },

From c152e43de6eacee152d2c6de02fbbb598fb57b7e Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 22 Apr 2021 12:58:41 -0500
Subject: [PATCH 009/154] Changed index of current directory message to path

---
 handlers.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/handlers.js b/handlers.js
index 7c333464..8ac72e71 100644
--- a/handlers.js
+++ b/handlers.js
@@ -422,9 +422,14 @@
             this.setHeader('transfer-encoding','chunked')
             this.writeHeaders(200)
             this.writeChunk(WSC.template_data )
-            var html = ['<script>start("current directory...")</script>',
-                        '<script>addRow("..","..",1,"170 B","10/2/15, 8:32:45 PM");</script>']
-
+                if (this.request.path != '') {
+                    var html = ['<script>start("'+this.request.path+'")</script>',
+                                '<script>addRow("..","..",1,"170 B","10/2/15, 8:32:45 PM");</script>']
+                    } else {
+                    var html = ['<script>start("/")</script>',
+                                '<script>addRow("..","..",1,"170 B","10/2/15, 8:32:45 PM");</script>']
+                    }
+		
             for (var i=0; i<results.length; i++) {
                 var rawname = results[i].name
                 var name = encodeURIComponent(results[i].name)

From 2834de1fd599f7d712ace24c3161bcd2eb60de7d Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 22 Apr 2021 13:00:28 -0500
Subject: [PATCH 010/154] Update webapp.js

---
 webapp.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webapp.js b/webapp.js
index 10081e28..584456b8 100644
--- a/webapp.js
+++ b/webapp.js
@@ -754,3 +754,4 @@ Changes with nginx 0.7.9                                         12 Aug 2008
     WSC.WebApplication = WebApplication
 
 })();
+

From d8d2eabf8570a9f74f641a7168f3401ae16df3ce Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Tue, 27 Apr 2021 08:58:26 -0500
Subject: [PATCH 011/154] Update directory-listing-template.html

---
 directory-listing-template.html | 750 +++++++++++++-------------------
 1 file changed, 312 insertions(+), 438 deletions(-)

diff --git a/directory-listing-template.html b/directory-listing-template.html
index f8a158b9..f13dae64 100644
--- a/directory-listing-template.html
+++ b/directory-listing-template.html
@@ -1,52 +1,48 @@
 <!DOCTYPE html>
 
-<html i18n-values="dir:textdirection;lang:language">
+<html dir="ltr" lang="en">
 
 <head>
 <meta charset="utf-8">
 <meta name="google" value="notranslate">
 
 <script>
-function addRow(name, url, isdir, size, date_modified) {
-  if (name == ".")
+function addRow(name, url, isdir,
+    size, size_string, date_modified, date_modified_string) {
+  if (name == "." || name == "..")
     return;
 
   var root = document.location.pathname;
   if (root.substr(-1) !== "/")
     root += "/";
 
-  var table = document.getElementById("table");
+  var tbody = document.getElementById("tbody");
   var row = document.createElement("tr");
   var file_cell = document.createElement("td");
   var link = document.createElement("a");
 
   link.className = isdir ? "icon dir" : "icon file";
 
-  if (name == "..") {
-    link.href = root + "..";
-    link.innerText = document.getElementById("parentDirText").innerText;
-    link.className = "icon up";
-    size = "";
-    date_modified = "";
+  if (isdir) {
+    name = name + "/";
+    url = url + "/";
+    size = 0;
+    size_string = "";
   } else {
-    if (isdir) {
-      name = name + "/";
-      url = url + "/";
-      size = "";
-    } else {
-      link.draggable = "true";
-      link.addEventListener("dragstart", onDragStart, false);
-    }
-    link.innerText = name;
-    link.href = root + url;
+    link.draggable = "true";
+    link.addEventListener("dragstart", onDragStart, false);
   }
+  link.innerText = name;
+  link.href = root + url;
+
+  file_cell.dataset.value = name;
   file_cell.appendChild(link);
 
   row.appendChild(file_cell);
-  row.appendChild(createCell(size));
-  row.appendChild(createCell(date_modified));
+  row.appendChild(createCell(size, size_string));
+  row.appendChild(createCell(date_modified, date_modified_string));
 
-  table.appendChild(row);
+  tbody.appendChild(row);
 }
 
 function onDragStart(e) {
@@ -57,9 +53,10 @@
   e.dataTransfer.effectAllowed = "copy";
 }
 
-function createCell(text) {
+function createCell(value, text) {
   var cell = document.createElement("td");
   cell.setAttribute("class", "detailsColumn");
+  cell.dataset.value = value;
   cell.innerText = text;
   return cell;
 }
@@ -71,12 +68,80 @@
   document.getElementById("title").innerText = header.innerText;
 }
 
+function onHasParentDirectory() {
+  var box = document.getElementById("parentDirLinkBox");
+  box.style.display = "block";
+
+  var root = document.location.pathname;
+  if (!root.endsWith("/"))
+    root += "/";
+
+  var link = document.getElementById("parentDirLink");
+  link.href = root + "..";
+}
+
 function onListingParsingError() {
   var box = document.getElementById("listingParsingErrorBox");
   box.innerHTML = box.innerHTML.replace("LOCATION", encodeURI(document.location)
       + "?raw");
   box.style.display = "block";
 }
+
+function sortTable(column) {
+  var theader = document.getElementById("theader");
+  var oldOrder = theader.cells[column].dataset.order || '1';
+  oldOrder = parseInt(oldOrder, 10)
+  var newOrder = 0 - oldOrder;
+  theader.cells[column].dataset.order = newOrder;
+
+  var tbody = document.getElementById("tbody");
+  var rows = tbody.rows;
+  var list = [], i;
+  for (i = 0; i < rows.length; i++) {
+    list.push(rows[i]);
+  }
+
+  list.sort(function(row1, row2) {
+    var a = row1.cells[column].dataset.value;
+    var b = row2.cells[column].dataset.value;
+    if (column) {
+      a = parseInt(a, 10);
+      b = parseInt(b, 10);
+      return a > b ? newOrder : a < b ? oldOrder : 0;
+    }
+
+    // Column 0 is text.
+    if (a > b)
+      return newOrder;
+    if (a < b)
+      return oldOrder;
+    return 0;
+  });
+
+  // Appending an existing child again just moves it.
+  for (i = 0; i < list.length; i++) {
+    tbody.appendChild(list[i]);
+  }
+}
+
+// Add event handlers to column headers.
+function addHandlers(element, column) {
+  element.onclick = (e) => sortTable(column);
+  element.onkeydown = (e) => {
+    if (e.key == 'Enter' || e.key == ' ') {
+      sortTable(column);
+      e.preventDefault();
+    }
+  };
+}
+
+function onLoad() {
+  addHandlers(document.getElementById('nameColumnHeader'), 0);
+  addHandlers(document.getElementById('sizeColumnHeader'), 1);
+  addHandlers(document.getElementById('dateColumnHeader'), 2);
+}
+
+window.addEventListener('DOMContentLoaded', onLoad);
 </script>
 
 <style>
@@ -92,22 +157,20 @@
     border-collapse: collapse;
   }
 
-  tr.header {
-    font-weight: bold;
+  th {
+    cursor: pointer;
   }
 
   td.detailsColumn {
     -webkit-padding-start: 2em;
-    padding-inline-start: 2em;
     text-align: end;
     white-space: nowrap;
   }
 
   a.icon {
     -webkit-padding-start: 1.5em;
-    padding-inline-start: 1.5em;
     text-decoration: none;
-    padding-left: 20px;
+    user-select: auto;
   }
 
   a.icon:hover {
@@ -130,6 +193,11 @@
     background-position-x: right;
   }
 
+  #parentDirLinkBox {
+    margin-bottom: 10px;
+    padding-bottom: 10px;
+  }
+
   #listingParsingErrorBox {
     border: 1px solid black;
     background: #fae691;
@@ -144,18 +212,30 @@
 
 <body>
 
-<div id="listingParsingErrorBox" i18n-values=".innerHTML:listingParsingErrorBoxText"></div>
-
-<span id="parentDirText" style="display:none" i18n-content="parentDirText"></span>
-
-<h1 id="header" i18n-content="header"></h1>
-
-<table id="table">
-  <tr class="header">
-    <td i18n-content="headerName"></td>
-    <td class="detailsColumn" i18n-content="headerSize"></td>
-    <td class="detailsColumn" i18n-content="headerDateModified"></td>
-  </tr>
+<div id="listingParsingErrorBox">Oh, no! This server is sending data Google Chrome can't understand. Please <a href="http://code.google.com/p/chromium/issues/entry">report a bug</a>, and include the <a href="LOCATION">raw listing</a>.</div>
+
+<h1 id="header">Index of LOCATION</h1>
+
+<div id="parentDirLinkBox" style="display:none">
+  <a id="parentDirLink" class="icon up">
+    <span id="parentDirText">[parent directory]</span>
+  </a>
+</div>
+
+<table>
+  <thead>
+    <tr class="header" id="theader">
+      <th id="nameColumnHeader" tabindex=0 role="button">Name</th>
+      <th id="sizeColumnHeader" class="detailsColumn" tabindex=0 role="button">
+        Size
+      </th>
+      <th id="dateColumnHeader" class="detailsColumn" tabindex=0 role="button">
+        Date Modified
+      </th>
+    </tr>
+  </thead>
+  <tbody id="tbody">
+  </tbody>
 </table>
 
 </body>
@@ -171,443 +251,237 @@ <h1 id="header" i18n-content="header"></h1>
  * content has finished loading). This data includes both localized strings and
  * any data that is important to have ready from a very early stage (e.g. things
  * that must be displayed right away).
+ *
+ * Note that loadTimeData is not guaranteed to be consistent between page
+ * refreshes (https://crbug.com/740629) and should not contain values that might
+ * change if the page is re-opened later.
  */
 
-var loadTimeData;
-
-// Expose this type globally as a temporary work around until
-// https://github.com/google/closure-compiler/issues/544 is fixed.
-/** @constructor */
-function LoadTimeData() {}
-
-(function() {
-  'use strict';
-
-  LoadTimeData.prototype = {
-    /**
-     * Sets the backing object.
-     *
-     * Note that there is no getter for |data_| to discourage abuse of the form:
-     *
-     *     var value = loadTimeData.data()['key'];
-     *
-     * @param {Object} value The de-serialized page data.
-     */
-    set data(value) {
-      expect(!this.data_, 'Re-setting data.');
-      this.data_ = value;
-    },
-
-    /**
-     * Returns a JsEvalContext for |data_|.
-     * @returns {JsEvalContext}
-     */
-    createJsEvalContext: function() {
-      return new JsEvalContext(this.data_);
-    },
-
-    /**
-     * @param {string} id An ID of a value that might exist.
-     * @return {boolean} True if |id| is a key in the dictionary.
-     */
-    valueExists: function(id) {
-      return id in this.data_;
-    },
-
-    /**
-     * Fetches a value, expecting that it exists.
-     * @param {string} id The key that identifies the desired value.
-     * @return {*} The corresponding value.
-     */
-    getValue: function(id) {
-      expect(this.data_, 'No data. Did you remember to include strings.js?');
-      var value = this.data_[id];
-      expect(typeof value != 'undefined', 'Could not find value for ' + id);
-      return value;
-    },
-
-    /**
-     * As above, but also makes sure that the value is a string.
-     * @param {string} id The key that identifies the desired string.
-     * @return {string} The corresponding string value.
-     */
-    getString: function(id) {
-      var value = this.getValue(id);
-      expectIsType(id, value, 'string');
-      return /** @type {string} */ (value);
-    },
-
-    /**
-     * Returns a formatted localized string where $1 to $9 are replaced by the
-     * second to the tenth argument.
-     * @param {string} id The ID of the string we want.
-     * @param {...string} var_args The extra values to include in the formatted
-     *     output.
-     * @return {string} The formatted string.
-     */
-    getStringF: function(id, var_args) {
-      var value = this.getString(id);
-      if (!value)
-        return '';
-
-      var varArgs = arguments;
-      return value.replace(/\$[$1-9]/g, function(m) {
-        return m == '$$' ? '$' : varArgs[m[1]];
-      });
-    },
-
-    /**
-     * As above, but also makes sure that the value is a boolean.
-     * @param {string} id The key that identifies the desired boolean.
-     * @return {boolean} The corresponding boolean value.
-     */
-    getBoolean: function(id) {
-      var value = this.getValue(id);
-      expectIsType(id, value, 'boolean');
-      return /** @type {boolean} */ (value);
-    },
-
-    /**
-     * As above, but also makes sure that the value is an integer.
-     * @param {string} id The key that identifies the desired number.
-     * @return {number} The corresponding number value.
-     */
-    getInteger: function(id) {
-      var value = this.getValue(id);
-      expectIsType(id, value, 'number');
-      expect(value == Math.floor(value), 'Number isn\'t integer: ' + value);
-      return /** @type {number} */ (value);
-    },
-
-    /**
-     * Override values in loadTimeData with the values found in |replacements|.
-     * @param {Object} replacements The dictionary object of keys to replace.
-     */
-    overrideValues: function(replacements) {
-      expect(typeof replacements == 'object',
-             'Replacements must be a dictionary object.');
-      for (var key in replacements) {
-        this.data_[key] = replacements[key];
-      }
-    }
-  };
+// #import {assert} from './assert.m.js';
+// #import {parseHtmlSubset} from './parse_html_subset.m.js';
+
+/**
+ * @typedef {{
+ *   substitutions: (!Array<string>|undefined),
+ *   attrs: (!Array<string>|undefined),
+ *   tags: (!Array<string>|undefined),
+ * }}
+ */
+/* #export */ let SanitizeInnerHtmlOpts;
+
+// eslint-disable-next-line no-var
+/* #export */ /** @type {!LoadTimeData} */ var loadTimeData;
+
+class LoadTimeData {
+  constructor() {
+    /** @type {Object} */
+    this.data_;
+  }
 
   /**
-   * Checks condition, displays error message if expectation fails.
-   * @param {*} condition The condition to check for truthiness.
-   * @param {string} message The message to display if the check fails.
+   * Sets the backing object.
+   *
+   * Note that there is no getter for |data_| to discourage abuse of the form:
+   *
+   *     var value = loadTimeData.data()['key'];
+   *
+   * @param {Object} value The de-serialized page data.
    */
-  function expect(condition, message) {
-    if (!condition) {
-      console.error('Unexpected condition on ' + document.location.href + ': ' +
-                    message);
-    }
+  set data(value) {
+    expect(!this.data_, 'Re-setting data.');
+    this.data_ = value;
   }
 
   /**
-   * Checks that the given value has the given type.
-   * @param {string} id The id of the value (only used for error message).
-   * @param {*} value The value to check the type on.
-   * @param {string} type The type we expect |value| to be.
+   * Returns a JsEvalContext for |data_|.
+   * @returns {JsEvalContext}
    */
-  function expectIsType(id, value, type) {
-    expect(typeof value == type, '[' + value + '] (' + id +
-                                 ') is not a ' + type);
+  createJsEvalContext() {
+    return new JsEvalContext(this.data_);
   }
 
-  expect(!loadTimeData, 'should only include this file once');
-  loadTimeData = new LoadTimeData;
-})();
-</script><script>loadTimeData.data = {"header":"Index of LOCATION","headerDateModified":"Date Modified","headerName":"Name","headerSize":"Size","listingParsingErrorBoxText":"Oh, no! This server is sending data Google Chrome can't understand. Please \u003Ca href=\"http://code.google.com/p/chromium/issues/entry\">report a bug\u003C/a>, and include the \u003Ca href=\"LOCATION\">raw listing\u003C/a>.","parentDirText":"[parent directory]","textdirection":"ltr"};</script><script>// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+  /**
+   * @param {string} id An ID of a value that might exist.
+   * @return {boolean} True if |id| is a key in the dictionary.
+   */
+  valueExists(id) {
+    return id in this.data_;
+  }
 
-/** @typedef {Document|DocumentFragment|Element} */
-var ProcessingRoot;
+  /**
+   * Fetches a value, expecting that it exists.
+   * @param {string} id The key that identifies the desired value.
+   * @return {*} The corresponding value.
+   */
+  getValue(id) {
+    expect(this.data_, 'No data. Did you remember to include strings.js?');
+    const value = this.data_[id];
+    expect(typeof value !== 'undefined', 'Could not find value for ' + id);
+    return value;
+  }
 
-/**
- * @fileoverview This is a simple template engine inspired by JsTemplates
- * optimized for i18n.
- *
- * It currently supports three handlers:
- *
- *   * i18n-content which sets the textContent of the element.
- *
- *     <span i18n-content="myContent"></span>
- *
- *   * i18n-options which generates <option> elements for a <select>.
- *
- *     <select i18n-options="myOptionList"></select>
- *
- *   * i18n-values is a list of attribute-value or property-value pairs.
- *     Properties are prefixed with a '.' and can contain nested properties.
- *
- *     <span i18n-values="title:myTitle;.style.fontSize:fontSize"></span>
- *
- * This file is a copy of i18n_template.js, with minor tweaks to support using
- * load_time_data.js. It should replace i18n_template.js eventually.
- */
+  /**
+   * As above, but also makes sure that the value is a string.
+   * @param {string} id The key that identifies the desired string.
+   * @return {string} The corresponding string value.
+   */
+  getString(id) {
+    const value = this.getValue(id);
+    expectIsType(id, value, 'string');
+    return /** @type {string} */ (value);
+  }
 
-var i18nTemplate = (function() {
   /**
-   * This provides the handlers for the templating engine. The key is used as
-   * the attribute name and the value is the function that gets called for every
-   * single node that has this attribute.
-   * @type {!Object}
+   * Returns a formatted localized string where $1 to $9 are replaced by the
+   * second to the tenth argument.
+   * @param {string} id The ID of the string we want.
+   * @param {...(string|number)} var_args The extra values to include in the
+   *     formatted output.
+   * @return {string} The formatted string.
    */
-  var handlers = {
-    /**
-     * This handler sets the textContent of the element.
-     * @param {!HTMLElement} element The node to modify.
-     * @param {string} key The name of the value in |data|.
-     * @param {!LoadTimeData} data The data source to draw from.
-     * @param {!Array<ProcessingRoot>} visited
-     */
-    'i18n-content': function(element, key, data, visited) {
-      element.textContent = data.getString(key);
-    },
-
-    /**
-     * This handler adds options to a <select> element.
-     * @param {!HTMLElement} select The node to modify.
-     * @param {string} key The name of the value in |data|. It should
-     *     identify an array of values to initialize an <option>. Each value,
-     *     if a pair, represents [content, value]. Otherwise, it should be a
-     *     content string with no value.
-     * @param {!LoadTimeData} data The data source to draw from.
-     * @param {!Array<ProcessingRoot>} visited
-     */
-    'i18n-options': function(select, key, data, visited) {
-      var options = data.getValue(key);
-      options.forEach(function(optionData) {
-        var option = typeof optionData == 'string' ?
-            new Option(optionData) :
-            new Option(optionData[1], optionData[0]);
-        select.appendChild(option);
-      });
-    },
-
-    /**
-     * This is used to set HTML attributes and DOM properties. The syntax is:
-     *   attributename:key;
-     *   .domProperty:key;
-     *   .nested.dom.property:key
-     * @param {!HTMLElement} element The node to modify.
-     * @param {string} attributeAndKeys The path of the attribute to modify
-     *     followed by a colon, and the name of the value in |data|.
-     *     Multiple attribute/key pairs may be separated by semicolons.
-     * @param {!LoadTimeData} data The data source to draw from.
-     * @param {!Array<ProcessingRoot>} visited
-     */
-    'i18n-values': function(element, attributeAndKeys, data, visited) {
-      var parts = attributeAndKeys.replace(/\s/g, '').split(/;/);
-      parts.forEach(function(part) {
-        if (!part)
-          return;
-
-        var attributeAndKeyPair = part.match(/^([^:]+):(.+)$/);
-        if (!attributeAndKeyPair)
-          throw new Error('malformed i18n-values: ' + attributeAndKeys);
-
-        var propName = attributeAndKeyPair[1];
-        var propExpr = attributeAndKeyPair[2];
-
-        var value = data.getValue(propExpr);
-
-        // Allow a property of the form '.foo.bar' to assign a value into
-        // element.foo.bar.
-        if (propName[0] == '.') {
-          var path = propName.slice(1).split('.');
-          var targetObject = element;
-          while (targetObject && path.length > 1) {
-            targetObject = targetObject[path.shift()];
-          }
-          if (targetObject) {
-            targetObject[path] = value;
-            // In case we set innerHTML (ignoring others) we need to recursively
-            // check the content.
-            if (path == 'innerHTML') {
-              for (var i = 0; i < element.children.length; ++i) {
-                processWithoutCycles(element.children[i], data, visited, false);
-              }
-            }
-          }
-        } else {
-          element.setAttribute(propName, /** @type {string} */(value));
-        }
-      });
+  getStringF(id, var_args) {
+    const value = this.getString(id);
+    if (!value) {
+      return '';
     }
-  };
-
-  var prefixes = [''];
 
-  // Only look through shadow DOM when it's supported. As of April 2015, iOS
-  // Chrome doesn't support shadow DOM.
-  if (Element.prototype.createShadowRoot)
-    prefixes.push('* /deep/ ');
-
-  var attributeNames = Object.keys(handlers);
-  var selector = prefixes.map(function(prefix) {
-    return prefix + '[' + attributeNames.join('], ' + prefix + '[') + ']';
-  }).join(', ');
+    const args = Array.prototype.slice.call(arguments);
+    args[0] = value;
+    return this.substituteString.apply(this, args);
+  }
 
   /**
-   * Processes a DOM tree using a |data| source to populate template values.
-   * @param {!ProcessingRoot} root The root of the DOM tree to process.
-   * @param {!LoadTimeData} data The data to draw from.
+   * Make a string safe for use with with Polymer bindings that are
+   * inner-h-t-m-l (or other innerHTML use).
+   * @param {string} rawString The unsanitized string.
+   * @param {SanitizeInnerHtmlOpts=} opts Optional additional allowed tags and
+   *     attributes.
+   * @return {string}
    */
-  function process(root, data) {
-    processWithoutCycles(root, data, [], true);
+  sanitizeInnerHtml(rawString, opts) {
+    opts = opts || {};
+    return parseHtmlSubset('<b>' + rawString + '</b>', opts.tags, opts.attrs)
+        .firstChild.innerHTML;
   }
 
   /**
-   * Internal process() method that stops cycles while processing.
-   * @param {!ProcessingRoot} root
-   * @param {!LoadTimeData} data
-   * @param {!Array<ProcessingRoot>} visited Already visited roots.
-   * @param {boolean} mark Whether nodes should be marked processed.
+   * Returns a formatted localized string where $1 to $9 are replaced by the
+   * second to the tenth argument. Any standalone $ signs must be escaped as
+   * $$.
+   * @param {string} label The label to substitute through.
+   *     This is not an resource ID.
+   * @param {...(string|number)} var_args The extra values to include in the
+   *     formatted output.
+   * @return {string} The formatted string.
    */
-  function processWithoutCycles(root, data, visited, mark) {
-    if (visited.indexOf(root) >= 0) {
-      // Found a cycle. Stop it.
-      return;
-    }
-
-    // Mark the node as visited before recursing.
-    visited.push(root);
+  substituteString(label, var_args) {
+    const varArgs = arguments;
+    return label.replace(/\$(.|$|\n)/g, function(m) {
+      assert(m.match(/\$[$1-9]/), 'Unescaped $ found in localized string.');
+      return m === '$$' ? '$' : varArgs[m[1]];
+    });
+  }
 
-    var importLinks = root.querySelectorAll('link[rel=import]');
-    for (var i = 0; i < importLinks.length; ++i) {
-      var importLink = /** @type {!HTMLLinkElement} */(importLinks[i]);
-      if (!importLink.import) {
-        // Happens when a <link rel=import> is inside a <template>.
-        // TODO(dbeam): should we log an error if we detect that here?
-        continue;
+  /**
+   * Returns a formatted string where $1 to $9 are replaced by the second to
+   * tenth argument, split apart into a list of pieces describing how the
+   * substitution was performed. Any standalone $ signs must be escaped as $$.
+   * @param {string} label A localized string to substitute through.
+   *     This is not an resource ID.
+   * @param {...(string|number)} var_args The extra values to include in the
+   *     formatted output.
+   * @return {!Array<!{value: string, arg: (null|string)}>} The formatted
+   *     string pieces.
+   */
+  getSubstitutedStringPieces(label, var_args) {
+    const varArgs = arguments;
+    // Split the string by separately matching all occurrences of $1-9 and of
+    // non $1-9 pieces.
+    const pieces = (label.match(/(\$[1-9])|(([^$]|\$([^1-9]|$))+)/g) ||
+                    []).map(function(p) {
+      // Pieces that are not $1-9 should be returned after replacing $$
+      // with $.
+      if (!p.match(/^\$[1-9]$/)) {
+        assert(
+            (p.match(/\$/g) || []).length % 2 === 0,
+            'Unescaped $ found in localized string.');
+        return {value: p.replace(/\$\$/g, '$'), arg: null};
       }
-      processWithoutCycles(importLink.import, data, visited, mark);
-    }
 
-    var templates = root.querySelectorAll('template');
-    for (var i = 0; i < templates.length; ++i) {
-      var template = /** @type {HTMLTemplateElement} */(templates[i]);
-      processWithoutCycles(template.content, data, visited, mark);
-    }
+      // Otherwise, return the substitution value.
+      return {value: varArgs[p[1]], arg: p};
+    });
 
-    var isElement = root instanceof Element;
-    if (isElement && root.matches(selector))
-      processElement(/** @type {!Element} */(root), data, visited);
+    return pieces;
+  }
 
-    var elements = root.querySelectorAll(selector);
-    for (var i = 0; i < elements.length; ++i) {
-      processElement(elements[i], data, visited);
-    }
+  /**
+   * As above, but also makes sure that the value is a boolean.
+   * @param {string} id The key that identifies the desired boolean.
+   * @return {boolean} The corresponding boolean value.
+   */
+  getBoolean(id) {
+    const value = this.getValue(id);
+    expectIsType(id, value, 'boolean');
+    return /** @type {boolean} */ (value);
+  }
 
-    if (mark) {
-      var processed = isElement ? [root] : root.children;
-      if (processed) {
-        for (var i = 0; i < processed.length; ++i) {
-          processed[i].setAttribute('i18n-processed', '');
-        }
-      }
-    }
+  /**
+   * As above, but also makes sure that the value is an integer.
+   * @param {string} id The key that identifies the desired number.
+   * @return {number} The corresponding number value.
+   */
+  getInteger(id) {
+    const value = this.getValue(id);
+    expectIsType(id, value, 'number');
+    expect(value === Math.floor(value), 'Number isn\'t integer: ' + value);
+    return /** @type {number} */ (value);
   }
 
   /**
-   * Run through various [i18n-*] attributes and populate.
-   * @param {!Element} element
-   * @param {!LoadTimeData} data
-   * @param {!Array<ProcessingRoot>} visited
+   * Override values in loadTimeData with the values found in |replacements|.
+   * @param {Object} replacements The dictionary object of keys to replace.
    */
-  function processElement(element, data, visited) {
-    for (var i = 0; i < attributeNames.length; i++) {
-      var name = attributeNames[i];
-      var attribute = element.getAttribute(name);
-      if (attribute != null)
-        handlers[name](element, attribute, data, visited);
+  overrideValues(replacements) {
+    expect(
+        typeof replacements === 'object',
+        'Replacements must be a dictionary object.');
+    for (const key in replacements) {
+      this.data_[key] = replacements[key];
     }
   }
-
-  return {
-    process: process
-  };
-}());
-
-
-i18nTemplate.process(document, loadTimeData);
-
-document.addEventListener("DOMContentLoaded", function(e) {
-    console.log("DOM CONTENT LOADED")
-    // apparently for drop to work everywhere, you have to prevent default for enter/over/leave
-    // but we lose the cool icon hmm -- tried dropEffect "copy" everywhere, seems to work
-    // http://www.quirksmode.org/blog/archives/2009/09/the_html5_drag.html
-    document.addEventListener("dragover", dragOver, false);
-    document.addEventListener("dragleave", dragLeave, false);
-    document.addEventListener("dragenter", dragEnter, false);
-    document.addEventListener("drop", drop, false);
-})
-
-function dragOver(evt) {
-    console.log(arguments.callee.name)
-    evt.dataTransfer.dropEffect = 'copy'
-    evt.preventDefault();
-    return false;
-}
-function dragLeave(evt) {
-    console.log(arguments.callee.name)
-    evt.dataTransfer.dropEffect = 'copy'
-    evt.preventDefault();
-    return false;
-}
-function dragEnter(evt) {
-    console.log(arguments.callee.name)
-    evt.dataTransfer.dropEffect = 'copy'
-    evt.preventDefault();
-    return false;
-}
-function drop(evt) {
-    console.log(arguments.callee.name)
-    evt.dataTransfer.dropEffect = 'copy'
-    evt.preventDefault();
-    handleDrop(evt)
-    return false;
-}
-
-function handleDrop(evt) {
-        var items = evt.dataTransfer.items
-        if (items) {
-            for (var i=0; i<items.length; i++) {
-                item = items[i]
-                //console.log('drop found item',item)
-                if (item.kind == 'file') {
-                    var entry = item.webkitGetAsEntry()
-                    handleEntry(entry)
-                    }
-                    }
-                    }
 }
-function handleEntry(entry) {
-    console.log('handle entry',entry)
 
-    function onread(evt) {
-        doupload(entry, evt.target.result)
+  /**
+   * Checks condition, displays error message if expectation fails.
+   * @param {*} condition The condition to check for truthiness.
+   * @param {string} message The message to display if the check fails.
+   */
+  function expect(condition, message) {
+    if (!condition) {
+      console.error(
+          'Unexpected condition on ' + document.location.href + ': ' + message);
     }
+  }
 
-    var fr = new FileReader
-    fr.onload = fr.onerror = onread
+  /**
+   * Checks that the given value has the given type.
+   * @param {string} id The id of the value (only used for error message).
+   * @param {*} value The value to check the type on.
+   * @param {string} type The type we expect |value| to be.
+   */
+  function expectIsType(id, value, type) {
+    expect(
+        typeof value === type, '[' + value + '] (' + id + ') is not a ' + type);
+  }
 
-    entry.file( function(f) {
-        fr.readAsArrayBuffer(f)
-    })
-}
+  expect(!loadTimeData, 'should only include this file once');
+  loadTimeData = new LoadTimeData;
 
-function doupload(entry, data) {
-    console.log('doupload',entry,data)
-    fetch(window.location.pathname + encodeURIComponent(entry.name), {method:'PUT',body:data}).then(
-                                          function(r){console.log('upload resp',r); window.location.reload()}).catch(
-                                          function(e){console.log('upload err',e)})
-}
-</script>
+  // Expose |loadTimeData| directly on |window|. This is only necessary by the
+  // auto-generated load_time_data.m.js, since within a JS module the scope is
+  // local.
+  window.loadTimeData = loadTimeData;
+
+/* #ignore */ console.warn('crbug/1173575, non-JS module files deprecated.');
+</script><script>loadTimeData.data = {"header":"Index of LOCATION","headerDateModified":"Date Modified","headerName":"Name","headerSize":"Size","language":"en","listingParsingErrorBoxText":"Oh, no! This server is sending data Google Chrome can't understand. Please \u003Ca href=\"http://code.google.com/p/chromium/issues/entry\">report a bug\u003C/a>, and include the \u003Ca href=\"LOCATION\">raw listing\u003C/a>.","parentDirText":"[parent directory]","textdirection":"ltr"};</script>

From 44738e1af70b3e8d75d7e03c6d8c5f9b30b0bfbf Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Tue, 27 Apr 2021 09:02:28 -0500
Subject: [PATCH 012/154] Update handlers.js

---
 handlers.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/handlers.js b/handlers.js
index 8ac72e71..d1a9cb3f 100644
--- a/handlers.js
+++ b/handlers.js
@@ -429,16 +429,20 @@
                     var html = ['<script>start("/")</script>',
                                 '<script>addRow("..","..",1,"170 B","10/2/15, 8:32:45 PM");</script>']
                     }
-		
+                if (this.request.path != '') {
+                    html.push('<script>onHasParentDirectory();</script>')
+                    }
             for (var i=0; i<results.length; i++) {
                 var rawname = results[i].name
                 var name = encodeURIComponent(results[i].name)
                 var isdirectory = results[i].isDirectory
                 var filesize = '""'
-                //var modified = '10/13/15, 10:38:40 AM'
-                var modified = ''
-                // raw, urlencoded, isdirectory, size, 
-                html.push('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+','+filesize+',"'+modified+'");</script>')
+                //var modified = '4/27/121, 10:38:40 AM'
+                var modified = '""'
+		var filesizestr = '""'
+		var modifiedstr = '""'
+                // raw, urlencoded, isdirectory, size, size as string, date modified, date modified as string
+                html.push('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+','+filesize+','+filesizestr+','+modified+','+modifiedstr+');</script>')
             }
             var data = html.join('\n')
             data = new TextEncoder('utf-8').encode(data).buffer

From a3e5f8fb3b3bd8794b8fe52d69e0b02d1b3048c0 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Tue, 27 Apr 2021 10:32:10 -0500
Subject: [PATCH 013/154] Update handlers.js

---
 handlers.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/handlers.js b/handlers.js
index d1a9cb3f..c175dac1 100644
--- a/handlers.js
+++ b/handlers.js
@@ -423,11 +423,9 @@
             this.writeHeaders(200)
             this.writeChunk(WSC.template_data )
                 if (this.request.path != '') {
-                    var html = ['<script>start("'+this.request.path+'")</script>',
-                                '<script>addRow("..","..",1,"170 B","10/2/15, 8:32:45 PM");</script>']
+                    var html = ['<script>start("'+this.request.path+'")</script>']
                     } else {
-                    var html = ['<script>start("/")</script>',
-                                '<script>addRow("..","..",1,"170 B","10/2/15, 8:32:45 PM");</script>']
+                    var html = ['<script>start("/")</script>']
                     }
                 if (this.request.path != '') {
                     html.push('<script>onHasParentDirectory();</script>')

From 93393effb3496309f476de6a458f59ce37f7fd8d Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Tue, 27 Apr 2021 11:30:08 -0500
Subject: [PATCH 014/154] Update directory-listing-template.html

---
 directory-listing-template.html | 73 +++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/directory-listing-template.html b/directory-listing-template.html
index f13dae64..c1c0fbe6 100644
--- a/directory-listing-template.html
+++ b/directory-listing-template.html
@@ -484,4 +484,77 @@ <h1 id="header">Index of LOCATION</h1>
   window.loadTimeData = loadTimeData;
 
 /* #ignore */ console.warn('crbug/1173575, non-JS module files deprecated.');
+    
+ document.addEventListener("DOMContentLoaded", function(e) {
+    console.log("DOM CONTENT LOADED")
+    // apparently for drop to work everywhere, you have to prevent default for enter/over/leave
+    // but we lose the cool icon hmm -- tried dropEffect "copy" everywhere, seems to work
+    // http://www.quirksmode.org/blog/archives/2009/09/the_html5_drag.html
+    document.addEventListener("dragover", dragOver, false);
+    document.addEventListener("dragleave", dragLeave, false);
+    document.addEventListener("dragenter", dragEnter, false);
+    document.addEventListener("drop", drop, false);
+})
+
+function dragOver(evt) {
+    console.log(arguments.callee.name)
+    evt.dataTransfer.dropEffect = 'copy'
+    evt.preventDefault();
+    return false;
+}
+function dragLeave(evt) {
+    console.log(arguments.callee.name)
+    evt.dataTransfer.dropEffect = 'copy'
+    evt.preventDefault();
+    return false;
+}
+function dragEnter(evt) {
+    console.log(arguments.callee.name)
+    evt.dataTransfer.dropEffect = 'copy'
+    evt.preventDefault();
+    return false;
+}
+function drop(evt) {
+    console.log(arguments.callee.name)
+    evt.dataTransfer.dropEffect = 'copy'
+    evt.preventDefault();
+    handleDrop(evt)
+    return false;
+}
+
+function handleDrop(evt) {
+        var items = evt.dataTransfer.items
+        if (items) {
+            for (var i=0; i<items.length; i++) {
+                item = items[i]
+                //console.log('drop found item',item)
+                if (item.kind == 'file') {
+                    var entry = item.webkitGetAsEntry()
+                    handleEntry(entry)
+                    }
+                    }
+                    }
+}
+
+function handleEntry(entry) {
+    console.log('handle entry',entry)
+
+    function onread(evt) {
+        doupload(entry, evt.target.result)
+    }
+
+    var fr = new FileReader
+    fr.onload = fr.onerror = onread
+
+    entry.file( function(f) {
+        fr.readAsArrayBuffer(f)
+    })
+}
+
+function doupload(entry, data) {
+    console.log('doupload',entry,data)
+    fetch(window.location.pathname + encodeURIComponent(entry.name), {method:'PUT',body:data}).then(
+                                          function(r){console.log('upload resp',r); window.location.reload()}).catch(
+                                          function(e){console.log('upload err',e)})
+}
 </script><script>loadTimeData.data = {"header":"Index of LOCATION","headerDateModified":"Date Modified","headerName":"Name","headerSize":"Size","language":"en","listingParsingErrorBoxText":"Oh, no! This server is sending data Google Chrome can't understand. Please \u003Ca href=\"http://code.google.com/p/chromium/issues/entry\">report a bug\u003C/a>, and include the \u003Ca href=\"LOCATION\">raw listing\u003C/a>.","parentDirText":"[parent directory]","textdirection":"ltr"};</script>

From f7ad64957f0294a570fb2454ec49c3d3a795f204 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 29 Apr 2021 09:26:33 -0500
Subject: [PATCH 015/154] Update package.json

---
 makedeps/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/makedeps/package.json b/makedeps/package.json
index d4efff4f..80b688fe 100644
--- a/makedeps/package.json
+++ b/makedeps/package.json
@@ -12,8 +12,8 @@
     "@material-ui/lab": "^4.0.0-alpha.57",
     "browserify": "^16.5.0",
     "node-forge": "^0.10.0",
-    "react": "^16.12.0",
-    "react-dom": "^16.12.0",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
     "underscore": "^1.9.1"
   }
 }

From 91c53f88845ed6b8b9ea8c2fb15772e52b540c6e Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 29 Apr 2021 09:37:36 -0500
Subject: [PATCH 016/154] Fix #226

---
 react-ui/js/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/react-ui/js/index.js b/react-ui/js/index.js
index 0951d369..561c5d9c 100644
--- a/react-ui/js/index.js
+++ b/react-ui/js/index.js
@@ -102,7 +102,6 @@ const functions = {
     app.webapp.updateOption('optUseHttps', val);
     if (app.webapp.started) {
       app.webapp.stop();
-      app.webapp.start();
     }
   }
 };

From 3c3462865b1946e468aea09cc87a0e4eeba41665 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 29 Apr 2021 10:20:22 -0500
Subject: [PATCH 017/154] Add delete support

---
 connection.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/connection.js b/connection.js
index cb12c284..77a69523 100644
--- a/connection.js
+++ b/connection.js
@@ -66,7 +66,7 @@
                 return
             }
 
-            if (['GET','HEAD','PUT','OPTIONS'].includes(method)) {
+            if (['GET','HEAD','PUT','DELETE','OPTIONS'].includes(method)) {
                 this.onRequest(this.curRequest)
             } else {
                 console.error('how to handle',this.curRequest)

From 95395df2897023b164c38f425206b1b19d25c93a Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 29 Apr 2021 10:21:02 -0500
Subject: [PATCH 018/154] Add delete support

---
 handlers.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/handlers.js b/handlers.js
index c175dac1..b3d25145 100644
--- a/handlers.js
+++ b/handlers.js
@@ -94,6 +94,21 @@
         head: function() {
             this.get()
         },
+        delete: function() {
+            if (! this.app.opts.optDelete) {
+                this.responseLength = 0
+                this.writeHeaders(400)
+                this.finish()
+                return
+            }
+            this.fs.getByPath(this.request.path, (entry) => {
+                entry.remove(()=>{
+                    this.responseLength = 0
+                    this.writeHeaders(200)
+                    this.finish()
+                });
+            });
+        },
         put: function() {
             if (! this.app.opts.optUpload) {
                 this.responseLength = 0

From 2b9faa1f361663cdcbf88e4d7e5f37a74a39b4ea Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 29 Apr 2021 10:21:34 -0500
Subject: [PATCH 019/154] Add delete support

---
 react-ui/js/options.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/react-ui/js/options.js b/react-ui/js/options.js
index 3c636775..5e5b78b3 100644
--- a/react-ui/js/options.js
+++ b/react-ui/js/options.js
@@ -182,6 +182,12 @@ const options = {
     type: Boolean,
     default: false
   },
+  optDelete: {
+    label: 'Allow Deleting Files',
+    help: 'Enables the delete request',
+    type: Boolean,
+    default: false
+  },
   optModRewriteEnable: {
     label: 'Enable mod-rewrite (for SPA)',
     help: 'For SPA (single page apps) that support HTML5 history location',

From 9a453a7b65812ff96049bdc66f0281f85f33213a Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 29 Apr 2021 10:22:08 -0500
Subject: [PATCH 020/154] Add delete support

---
 react-ui/js/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/react-ui/js/index.js b/react-ui/js/index.js
index 561c5d9c..0c2b5552 100644
--- a/react-ui/js/index.js
+++ b/react-ui/js/index.js
@@ -262,6 +262,7 @@ class App extends React.Component {
       optIPV6: null,
       optStatic: null,
       optUpload: null,
+      optDelete: null,
       optVerbose: null,
       optModRewriteEnable: null,
       optModRewriteRegexp: ['optModRewriteEnable'],

From f59c533f59e260254630c0dbe9c688cad3aa3114 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 29 Apr 2021 12:32:08 -0500
Subject: [PATCH 021/154] Add Custom 404 support

---
 react-ui/js/index.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/react-ui/js/index.js b/react-ui/js/index.js
index 0c2b5552..fc65bfdd 100644
--- a/react-ui/js/index.js
+++ b/react-ui/js/index.js
@@ -87,6 +87,10 @@ const functions = {
 			bg.backgroundSettingChange({'optBackground':val})
 		}
   },
+  optCustom404location: (app, k, val) => {
+    console.assert(typeof val === 'string')
+    app.webapp.updateOption('optCustom404location', val);
+  },
   optPrivateKey: (app, k, val) => {
     //console.log('privateKey')
     console.assert(typeof val === 'string')
@@ -264,6 +268,8 @@ class App extends React.Component {
       optUpload: null,
       optDelete: null,
       optVerbose: null,
+      optCustom404: null,
+      optCustom404location: ['optCustom404'],
       optModRewriteEnable: null,
       optModRewriteRegexp: ['optModRewriteEnable'],
       optModRewriteNegate: ['optModRewriteEnable'],

From 35bc1c1d2f03e8f44e9c0806f0d80a783a23d059 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 29 Apr 2021 12:32:20 -0500
Subject: [PATCH 022/154] Add Custom 404 support

---
 react-ui/js/options.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/react-ui/js/options.js b/react-ui/js/options.js
index 5e5b78b3..f0171abf 100644
--- a/react-ui/js/options.js
+++ b/react-ui/js/options.js
@@ -176,6 +176,18 @@ const options = {
     type: Boolean,
     default: false
   },
+  optCustom404: {
+    label: 'Custom 404 page',
+    help: 'Custom 404 page',
+    type: Boolean,
+    default: false
+  },
+  optCustom404location: {
+    label: 'Location of 404 page',
+    help: 'Where is the 404 html page',
+    type: String,
+    default: '/404.html'
+  },
   optUpload: {
     label: 'Allow File upload',
     help: 'The files directory listing allows drag-and-drop to upload small files',

From f40d5ea30a655c9f6617333825fdcb33f13817ad Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 29 Apr 2021 12:32:40 -0500
Subject: [PATCH 023/154] Add Custom 404 support

---
 handlers.js | 81 +++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 75 insertions(+), 6 deletions(-)

diff --git a/handlers.js b/handlers.js
index b3d25145..59b20faf 100644
--- a/handlers.js
+++ b/handlers.js
@@ -265,15 +265,50 @@
                     this.writeHeaders(404)
                     this.finish()
                 } else {
+                    if (this.app.opts.optCustom404) {
+                        this.fs.getByPath(this.app.opts.optCustom404location, (file) => {
+                        if (! file.error) {
+                            file.file( function(filee) {
+                            var reader = new FileReader();
+                            reader.onload = function(e){
+                                var data = e.target.result
+                                    this.write(data, 404)
+                                    this.finish() 
+                        }.bind(this)
+                        reader.readAsText(filee)
+                        }.bind(this))
+                        } else {
+                        this.write('Path of 404 html was not found - 404 path is set to: '+this.app.opts.optCustom404location, 500)
+                        this.finish()
+                        }})
+                    } else {
                     this.write('no entry',404)
-                }
+                }}
             } else if (entry.error) {
                 if (this.request.method == "HEAD") {
                     this.responseLength = 0
                     this.writeHeaders(404)
                     this.finish()
                 } else {
-                    this.write('entry not found: ' + (this.rewrite_to || this.request.path), 404)
+                    if (this.app.opts.optCustom404) {
+                        this.fs.getByPath(this.app.opts.optCustom404location, (file) => {
+                        if (! file.error) {
+                            file.file( function(filee) {
+                            var reader = new FileReader();
+                            reader.onload = function(e){
+                                var data = e.target.result
+                                    this.write(data, 404)
+                                    this.finish() 
+                        }.bind(this)
+                        reader.readAsText(filee)
+                        }.bind(this))
+                        } else {
+                        this.write('Path of 404 html was not found - 404 path is set to: '+this.app.opts.optCustom404location, 500)
+                        this.finish()
+                        }})
+                    } else {
+                        this.write('entry not found: ' + (this.rewrite_to || this.request.path), 404)
+                    }
                 }
             } else if (entry.isFile) {
                 this.renderFileContents(entry)
@@ -309,8 +344,26 @@
                        ) {
                         this.renderDirectoryListingJSON(results)
                     } else if (this.app.opts.optDir404 && this.app.opts.optRenderIndex) {
+                        if (this.app.opts.optCustom404) {
+                            this.fs.getByPath(this.app.opts.optCustom404location, (file) => {
+                            if (! file.error) {
+                                file.file( function(filee) {
+                                var reader = new FileReader();
+                                reader.onload = function(e){
+                                    var data = e.target.result
+                                        this.write(data, 404)
+                                        this.finish() 
+                            }.bind(this)
+                            reader.readAsText(filee)
+                            }.bind(this))
+                            } else {
+                            this.write('Path of 404 html was not found - 404 path is set to: '+this.app.opts.optCustom404location, 500)
+                            this.finish()
+                            }})
+                        } else {
                             this.write("404 - File not found", 404)
                             this.finish()
+                            }
                         } else if (this.request.arguments && this.request.arguments.static == '1' ||
                         this.request.arguments.static == 'true' ||
 						this.app.opts.optStatic
@@ -340,10 +393,27 @@
         renderFileContents: function(entry, file) {
             getEntryFile(entry, function(file) {
                 if (file instanceof DOMException) {
+                    if (this.app.opts.optCustom404) {
+                        this.fs.getByPath(this.app.opts.optCustom404location, (file) => {
+                        if (! file.error) {
+                            file.file( function(filee) {
+                            var reader = new FileReader();
+                            reader.onload = function(e){
+                                var data = e.target.result
+                                    this.write(data, 404)
+                                    this.finish() 
+                        }.bind(this)
+                        reader.readAsText(filee)
+                        }.bind(this))
+                        } else {
+                        this.write('Path of 404 html was not found - 404 path is set to: '+this.app.opts.optCustom404location, 500)
+                        this.finish()
+                        }})
+                    } else {
                     this.write("File not found", 404)
                     this.finish()
                     return
-                }
+                }}
                 this.file = file
                 if (this.request.method == "HEAD") {
                     this.responseLength = this.file.size
@@ -452,8 +522,8 @@
                 var filesize = '""'
                 //var modified = '4/27/121, 10:38:40 AM'
                 var modified = '""'
-		var filesizestr = '""'
-		var modifiedstr = '""'
+		        var filesizestr = '""'
+		        var modifiedstr = '""'
                 // raw, urlencoded, isdirectory, size, size as string, date modified, date modified as string
                 html.push('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+','+filesize+','+filesizestr+','+modified+','+modifiedstr+');</script>')
             }
@@ -523,7 +593,6 @@
         })
     }
 
-
     WSC.DirectoryEntryHandler = DirectoryEntryHandler
 
 })();

From d34645e917e63cc29a42b71ebcc245030fc9a2e6 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 29 Apr 2021 13:18:40 -0500
Subject: [PATCH 024/154] Fix #263

---
 webapp.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/webapp.js b/webapp.js
index 584456b8..7b7e749b 100644
--- a/webapp.js
+++ b/webapp.js
@@ -316,7 +316,8 @@
 			if (result && ! result.error) {
 				if (gateway.device && gateway.device.externalIP) {
 					var extIP = gateway.device.externalIP
-					this.extra_urls = [{url:'http://'+extIP+':' + this.port}]
+					let prot = this.opts.optUseHttps ? 'https' : 'http';
+					this.extra_urls = [{url:prot+'://'+extIP+':' + this.port}]
 				}
 			}
             this.onReady()

From 65305ed0e4c10c5022d435febc071387c7729f70 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 29 Apr 2021 13:33:22 -0500
Subject: [PATCH 025/154] Clean up

---
 handlers.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/handlers.js b/handlers.js
index 59b20faf..312516dd 100644
--- a/handlers.js
+++ b/handlers.js
@@ -509,15 +509,13 @@
             this.writeChunk(WSC.template_data )
                 if (this.request.path != '') {
                     var html = ['<script>start("'+this.request.path+'")</script>']
+                    html.push('<script>onHasParentDirectory();</script>')
                     } else {
                     var html = ['<script>start("/")</script>']
                     }
-                if (this.request.path != '') {
-                    html.push('<script>onHasParentDirectory();</script>')
-                    }
             for (var i=0; i<results.length; i++) {
-                var rawname = results[i].name
-                var name = encodeURIComponent(results[i].name)
+                var rawname = '"'+results[i].name+'"'
+                var name = '"'+encodeURIComponent(results[i].name)+'"'
                 var isdirectory = results[i].isDirectory
                 var filesize = '""'
                 //var modified = '4/27/121, 10:38:40 AM'
@@ -525,7 +523,7 @@
 		        var filesizestr = '""'
 		        var modifiedstr = '""'
                 // raw, urlencoded, isdirectory, size, size as string, date modified, date modified as string
-                html.push('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+','+filesize+','+filesizestr+','+modified+','+modifiedstr+');</script>')
+                html.push('<script>addRow('+rawname+','+name+','+isdirectory+','+filesize+','+filesizestr+','+modified+','+modifiedstr+');</script>')
             }
             var data = html.join('\n')
             data = new TextEncoder('utf-8').encode(data).buffer

From 1b75741cef7f427b6a62add94fb1def1e8d882b4 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 29 Apr 2021 14:33:19 -0500
Subject: [PATCH 026/154] Add 404 variable feature

---
 react-ui/js/options.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/react-ui/js/options.js b/react-ui/js/options.js
index f0171abf..61f1a75b 100644
--- a/react-ui/js/options.js
+++ b/react-ui/js/options.js
@@ -188,6 +188,18 @@ const options = {
     type: String,
     default: '/404.html'
   },
+  optCustom404usevar: {
+    label: 'Send variable? (Javascript)',
+    help: 'Javascript Variable to customize html (Variable is equal to user request path)',
+    type: Boolean,
+    default: false
+  },
+  optCustom404usevarvar: {
+    label: 'Variable name',
+    help: 'Name of variable to send',
+    type: String,
+    default: 'locationoflostuser'
+  },
   optUpload: {
     label: 'Allow File upload',
     help: 'The files directory listing allows drag-and-drop to upload small files',

From af24b6f598c94dbf5fc13a2341c5205aeb68c458 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 29 Apr 2021 14:33:32 -0500
Subject: [PATCH 027/154] Add 404 variable feature

---
 react-ui/js/index.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/react-ui/js/index.js b/react-ui/js/index.js
index fc65bfdd..12c33fe5 100644
--- a/react-ui/js/index.js
+++ b/react-ui/js/index.js
@@ -91,6 +91,10 @@ const functions = {
     console.assert(typeof val === 'string')
     app.webapp.updateOption('optCustom404location', val);
   },
+  optCustom404usevarvar: (app, k, val) => {
+    console.assert(typeof val === 'string')
+    app.webapp.updateOption('optCustom404usevarvar', val);
+  },
   optPrivateKey: (app, k, val) => {
     //console.log('privateKey')
     console.assert(typeof val === 'string')
@@ -270,6 +274,8 @@ class App extends React.Component {
       optVerbose: null,
       optCustom404: null,
       optCustom404location: ['optCustom404'],
+      optCustom404usevar: ['optCustom404'],
+      optCustom404usevarvar: ['optCustom404','optCustom404usevar'],
       optModRewriteEnable: null,
       optModRewriteRegexp: ['optModRewriteEnable'],
       optModRewriteNegate: ['optModRewriteEnable'],

From 1091ae1a428ad67d17a6ee1eefb9d96106f29e4c Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 29 Apr 2021 14:33:42 -0500
Subject: [PATCH 028/154] Add 404 variable feature

---
 handlers.js | 68 +++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 58 insertions(+), 10 deletions(-)

diff --git a/handlers.js b/handlers.js
index 312516dd..4db5fd2f 100644
--- a/handlers.js
+++ b/handlers.js
@@ -272,8 +272,20 @@
                             var reader = new FileReader();
                             reader.onload = function(e){
                                 var data = e.target.result
-                                    this.write(data, 404)
-                                    this.finish() 
+                                    if (this.app.opts.optCustom404usevar) {
+                                        if (this.app.opts.optCustom404usevarvar != '') {
+                                        var html = ['<script>var '+this.app.opts.optCustom404usevarvar+' = "'+this.request.path+'";</script>']
+                                    } else {
+                                        this.write('javascript location variable is blank', 500)
+                                        return
+                                    }
+                                    } else {
+                                    var html = ['']
+                                    }
+                                    html.push(data)
+                                    var finaldata = html.join('\n')
+                                    this.write(finaldata, 404)
+                                    this.finish()
                         }.bind(this)
                         reader.readAsText(filee)
                         }.bind(this))
@@ -297,8 +309,20 @@
                             var reader = new FileReader();
                             reader.onload = function(e){
                                 var data = e.target.result
-                                    this.write(data, 404)
-                                    this.finish() 
+                                    if (this.app.opts.optCustom404usevar) {
+                                        if (this.app.opts.optCustom404usevarvar != '') {
+                                        var html = ['<script>var '+this.app.opts.optCustom404usevarvar+' = "'+this.request.path+'";</script>']
+                                    } else {
+                                        this.write('javascript location variable is blank', 500)
+                                        return
+                                    }
+                                    } else {
+                                    var html = ['']
+                                    }
+                                    html.push(data)
+                                    var finaldata = html.join('\n')
+                                    this.write(finaldata, 404)
+                                    this.finish()
                         }.bind(this)
                         reader.readAsText(filee)
                         }.bind(this))
@@ -350,10 +374,22 @@
                                 file.file( function(filee) {
                                 var reader = new FileReader();
                                 reader.onload = function(e){
-                                    var data = e.target.result
-                                        this.write(data, 404)
-                                        this.finish() 
-                            }.bind(this)
+                                var data = e.target.result
+                                    if (this.app.opts.optCustom404usevar) {
+                                        if (this.app.opts.optCustom404usevarvar != '') {
+                                        var html = ['<script>var '+this.app.opts.optCustom404usevarvar+' = "'+this.request.path+'";</script>']
+                                    } else {
+                                        this.write('javascript location variable is blank', 500)
+                                        return
+                                    }
+                                    } else {
+                                    var html = ['']
+                                    }
+                                    html.push(data)
+                                    var finaldata = html.join('\n')
+                                    this.write(finaldata, 404)
+                                    this.finish()
+                                }.bind(this)
                             reader.readAsText(filee)
                             }.bind(this))
                             } else {
@@ -400,8 +436,20 @@
                             var reader = new FileReader();
                             reader.onload = function(e){
                                 var data = e.target.result
-                                    this.write(data, 404)
-                                    this.finish() 
+                                    if (this.app.opts.optCustom404usevar) {
+                                        if (this.app.opts.optCustom404usevarvar != '') {
+                                        var html = ['<script>var '+this.app.opts.optCustom404usevarvar+' = "'+this.request.path+'";</script>']
+                                    } else {
+                                        this.write('javascript location variable is blank', 500)
+                                        return
+                                    }
+                                    } else {
+                                    var html = ['']
+                                    }
+                                    html.push(data)
+                                    var finaldata = html.join('\n')
+                                    this.write(finaldata, 404)
+                                    this.finish()
                         }.bind(this)
                         reader.readAsText(filee)
                         }.bind(this))

From 09a139401be651995c749b7e0d97537f6b6397a9 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Mon, 3 May 2021 08:40:53 -0500
Subject: [PATCH 029/154] Fix #267

---
 background.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/background.js b/background.js
index 30b1bf3f..427c135b 100644
--- a/background.js
+++ b/background.js
@@ -131,7 +131,8 @@ function triggerKeepAwake() {
     // HACK: make an XHR to cause onSuspendCanceled event
     console.log('triggerKeepAwake')
     var xhr = new XMLHttpRequest
-    xhr.open("GET","http://127.0.0.1:" + (localOptions.port || 8887) + '/dummyUrlPing')
+    let prot = this.opts.optUseHttps ? 'https' : 'http';
+    xhr.open("GET",prot+"://127.0.0.1:" + (localOptions.port || 8887) + '/dummyUrlPing')
     function onload(evt) {
         console.log('triggerKeepAwake XHR loaded',evt)
     }
@@ -283,7 +284,7 @@ function hidden_click_configure() {
 function create_hidden() {
     if (OS != 'Chrome') { return }
 
-    if (app.opts && app.opts.optBackground && app.opts.optAllInterfaces) {
+    if (app.opts && app.opts.optBackground && app.opts.optAllInterfaces && this.webapp.started) {
         console.log('creating hidden window')
         var W = 300
         var H = 120

From 2c910ebcd7b83308ba4f6dd297aefdb9bf63ab56 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Mon, 3 May 2021 08:58:30 -0500
Subject: [PATCH 030/154] Update handlers.js

---
 handlers.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/handlers.js b/handlers.js
index 4db5fd2f..5e268e94 100644
--- a/handlers.js
+++ b/handlers.js
@@ -351,12 +351,12 @@
                 function alldone(results) {
                     if (this.app.opts.optRenderIndex) {
                         for (var i=0; i<results.length; i++) {
-                            if (results[i].name == 'index.xhtml' || results[i].name == 'index.xhtm') {
+                            if (results[i].name.toLowerCase() == 'index.xhtml' || results[i].name.toLowerCase() == 'index.xhtm') {
                                 this.setHeader('content-type','application/xhtml+xml; charset=utf-8')
                                 this.renderFileContents(results[i])
                                 return
                             }
-                            else if (results[i].name == 'index.html' || results[i].name == 'index.htm') {
+                            else if (results[i].name.toLowerCase() == 'index.html' || results[i].name.toLowerCase() == 'index.htm') {
                                 this.setHeader('content-type','text/html; charset=utf-8')
                                 this.renderFileContents(results[i])
                                 return

From 1e25659e9194d7ecff71a9e57913662eac9e577d Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Mon, 3 May 2021 11:13:06 -0500
Subject: [PATCH 031/154] UI Cleanup

---
 react-ui/js/index.js | 40 ++++++++++++++++++++++++++++++++++------
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/react-ui/js/index.js b/react-ui/js/index.js
index 12c33fe5..87d5ba5d 100644
--- a/react-ui/js/index.js
+++ b/react-ui/js/index.js
@@ -271,15 +271,25 @@ class App extends React.Component {
       optStatic: null,
       optUpload: null,
       optDelete: null,
-      optVerbose: null,
-      optCustom404: null,
+      optVerbose: null
+    };
+    const optCustom404Main = {
+      optCustom404: null
+    };
+    const optCustom404Info = {
       optCustom404location: ['optCustom404'],
       optCustom404usevar: ['optCustom404'],
-      optCustom404usevarvar: ['optCustom404','optCustom404usevar'],
-      optModRewriteEnable: null,
+      optCustom404usevarvar: ['optCustom404','optCustom404usevar']
+    };
+    const optRewrite = {
+      optModRewriteEnable: null
+    };
+    const optRewriteInfo = {
       optModRewriteRegexp: ['optModRewriteEnable'],
       optModRewriteNegate: ['optModRewriteEnable'],
-      optModRewriteTo: ['optModRewriteEnable'],
+      optModRewriteTo: ['optModRewriteEnable']
+    };
+    const optHttps = {
       optUseHttps: null
     };
     const optHttpsInfo = {
@@ -313,6 +323,24 @@ class App extends React.Component {
     }}
     >{this.state.showAdvanced ? 'Hide Advanced Options' : 'Show Advanced Options'}</a></div>)
 
+    const Custom404Main = renderOpts(optCustom404Main)
+
+    const Custom404Options = (() => {
+      let disabletwo = (!this.webapp || !this.webapp.opts.optCustom404);
+      const textboxestwo = renderOpts(optCustom404Info)
+      return [(<div>{!disabletwo && textboxestwo}</div>)];
+    })();
+
+    const rewriteMain = renderOpts(optRewrite)
+
+    const rewriteOptions = (() => {
+      let disableone = (!this.webapp || !this.webapp.opts.optModRewriteEnable);
+      const textboxesone = renderOpts(optRewriteInfo)
+      return [(<div>{!disableone && textboxesone}</div>)];
+    })();
+
+    const httpsMain = renderOpts(optHttps)
+
     const httpsOptions = (() => {
       let disable = (!this.webapp || !this.webapp.opts.optUseHttps);
       let hasCrypto = this.webapp && (this.webapp.opts.optPrivateKey || this.webapp.opts.optCertificate);
@@ -389,7 +417,7 @@ class App extends React.Component {
           {options}
 
           {advancedButton}
-          {state.showAdvanced && <div>{advOptions}{httpsOptions}</div> }
+          {state.showAdvanced && <div>{advOptions}{Custom404Main}{Custom404Options}{rewriteMain}{rewriteOptions}{httpsMain}{httpsOptions}</div> }
         </CardContent>
       </Card>
 

From 6d51d3f06ff051652223c4c9fd536131cc0d3597 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Mon, 3 May 2021 11:36:41 -0500
Subject: [PATCH 032/154] Update index.js

---
 react-ui/js/index.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/react-ui/js/index.js b/react-ui/js/index.js
index 87d5ba5d..e0460a09 100644
--- a/react-ui/js/index.js
+++ b/react-ui/js/index.js
@@ -279,6 +279,8 @@ class App extends React.Component {
     const optCustom404Info = {
       optCustom404location: ['optCustom404'],
       optCustom404usevar: ['optCustom404'],
+    };
+    const optCustom404InfoPt2 = {
       optCustom404usevarvar: ['optCustom404','optCustom404usevar']
     };
     const optRewrite = {
@@ -331,6 +333,12 @@ class App extends React.Component {
       return [(<div>{!disabletwo && textboxestwo}</div>)];
     })();
 
+    const Custom404OptionsPt2 = (() => {
+      let disablethree = (!this.webapp || !this.webapp.opts.optCustom404 || !this.webapp.opts.optCustom404usevar);
+      const textboxesthree = renderOpts(optCustom404InfoPt2)
+      return [(<div>{!disablethree && textboxesthree}</div>)];
+    })();
+
     const rewriteMain = renderOpts(optRewrite)
 
     const rewriteOptions = (() => {
@@ -417,7 +425,7 @@ class App extends React.Component {
           {options}
 
           {advancedButton}
-          {state.showAdvanced && <div>{advOptions}{Custom404Main}{Custom404Options}{rewriteMain}{rewriteOptions}{httpsMain}{httpsOptions}</div> }
+          {state.showAdvanced && <div>{advOptions}{Custom404Main}{Custom404Options}{Custom404OptionsPt2}{rewriteMain}{rewriteOptions}{httpsMain}{httpsOptions}</div> }
         </CardContent>
       </Card>
 

From e6b6bcd908f46e5bc0149b00c7d07df42a59402e Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Mon, 3 May 2021 13:13:32 -0500
Subject: [PATCH 033/154] Update handlers.js

---
 handlers.js | 43 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/handlers.js b/handlers.js
index 5e268e94..8e36143e 100644
--- a/handlers.js
+++ b/handlers.js
@@ -174,6 +174,17 @@
 
             // strip '/' off end of path
 
+            if (this.app.opts.optExcludeDotHtml){
+                var extension = this.request.path.split('.').pop();
+                if (extension == 'html') {
+                    var path = this.request.path
+                    var newpath = path.substring(0, path.length - 5);
+                    this.setHeader('location', newpath)
+                    this.writeHeaders(307)
+                    this.finish()
+                }
+            }
+
             if (this.rewrite_to) {
                 this.fs.getByPath(this.rewrite_to, this.onEntry.bind(this))
             } else if (this.fs.isFile) {
@@ -242,15 +253,31 @@
         onEntry: function(entry) {
             this.entry = entry
 
-            if (this.entry && this.entry.isDirectory && ! this.request.origpath.endsWith('/')) {
-                var newloc = this.request.origpath + '/'
-                this.setHeader('location', newloc) // XXX - encode latin-1 somehow?
-                this.responseLength = 0
-                //console.log('redirect ->',newloc)
-                this.writeHeaders(301)
+            if (this.app.opts.optExcludeDotHtml && this.request.path != '') {
+                this.fs.getByPath(this.request.path+'.html', (file) => {
+                if (! file.error) {
+                    this.renderFileContents(file)
+                    return
+                } else {
+                    if (this.entry && this.entry.isDirectory && ! this.request.origpath.endsWith('/')) {
+                    var newloc = this.request.origpath + '/'
+                    this.setHeader('location', newloc) // XXX - encode latin-1 somehow?
+                    this.responseLength = 0
+                    //console.log('redirect ->',newloc)
+                    this.writeHeaders(301)
 
-                this.finish()
-                return
+                    this.finish()
+                    return
+                    }
+                }})} else if (this.entry && this.entry.isDirectory && ! this.request.origpath.endsWith('/')) {
+                    var newloc = this.request.origpath + '/'
+                    this.setHeader('location', newloc) // XXX - encode latin-1 somehow?
+                    this.responseLength = 0
+                    //console.log('redirect ->',newloc)
+                    this.writeHeaders(301)
+
+                    this.finish()
+                    return
             }
 
 

From 2712cda707d7fa3996e784e786d6a8fb83de5629 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Mon, 3 May 2021 13:13:49 -0500
Subject: [PATCH 034/154] Update index.js

---
 react-ui/js/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/react-ui/js/index.js b/react-ui/js/index.js
index e0460a09..9bf30ea2 100644
--- a/react-ui/js/index.js
+++ b/react-ui/js/index.js
@@ -271,7 +271,8 @@ class App extends React.Component {
       optStatic: null,
       optUpload: null,
       optDelete: null,
-      optVerbose: null
+      optVerbose: null,
+      optExcludeDotHtml: null
     };
     const optCustom404Main = {
       optCustom404: null

From 6325345fcd50a114618315a8cc2f4aefb699a4e4 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Mon, 3 May 2021 13:13:55 -0500
Subject: [PATCH 035/154] Update options.js

---
 react-ui/js/options.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/react-ui/js/options.js b/react-ui/js/options.js
index 61f1a75b..dd7fd247 100644
--- a/react-ui/js/options.js
+++ b/react-ui/js/options.js
@@ -236,6 +236,12 @@ const options = {
     type: String,
     default: '/index.html'
   },
+  optExcludeDotHtml: {
+    label: 'Exclude .html in url',
+    help: 'Will not show .html extension in request path',
+    type: Boolean,
+    default: false
+  },
   optUseHttps: {
     label: 'Use https://',
     help: 'Serve pages through https://',

From 73c92d8bc3b6a47dfc97cf286add005750296f1b Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Mon, 3 May 2021 14:24:19 -0500
Subject: [PATCH 036/154] Added gz mime type

---
 mime.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mime.js b/mime.js
index 8a0f9cc4..b277d63f 100644
--- a/mime.js
+++ b/mime.js
@@ -294,6 +294,7 @@ var MIMETYPES = {
   "gv": "text/vnd.graphviz", 
   "gxf": "application/gxf", 
   "gxt": "application/vnd.geonext", 
+  "gz": "application/gzip", 
   "h": "text/x-c", 
   "h261": "video/h261", 
   "h263": "video/h263", 

From 2e4ebcbc0ba6c0e06acdd7b593e34f0dd18be1c3 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Mon, 3 May 2021 16:20:39 -0500
Subject: [PATCH 037/154] Update options.js

---
 react-ui/js/options.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/react-ui/js/options.js b/react-ui/js/options.js
index dd7fd247..84f52faa 100644
--- a/react-ui/js/options.js
+++ b/react-ui/js/options.js
@@ -238,7 +238,7 @@ const options = {
   },
   optExcludeDotHtml: {
     label: 'Exclude .html in url',
-    help: 'Will not show .html extension in request path',
+    help: 'Will not show .html extension in request path (BETA - MAY BREAK LONGER REQUEST URLS)',
     type: Boolean,
     default: false
   },

From 7fd300952d7f18e806860b0ce68f8c4097e59be2 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Mon, 3 May 2021 16:26:48 -0500
Subject: [PATCH 038/154] Update options.js

---
 react-ui/js/options.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/react-ui/js/options.js b/react-ui/js/options.js
index 84f52faa..8bdae1f1 100644
--- a/react-ui/js/options.js
+++ b/react-ui/js/options.js
@@ -237,7 +237,7 @@ const options = {
     default: '/index.html'
   },
   optExcludeDotHtml: {
-    label: 'Exclude .html in url',
+    label: 'Exclude .html in url (BETA)',
     help: 'Will not show .html extension in request path (BETA - MAY BREAK LONGER REQUEST URLS)',
     type: Boolean,
     default: false

From ba3743952832230334691ed031e801bb5dec3db5 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Mon, 3 May 2021 17:28:26 -0500
Subject: [PATCH 039/154] Update options.js

---
 react-ui/js/options.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/react-ui/js/options.js b/react-ui/js/options.js
index 8bdae1f1..9878dd87 100644
--- a/react-ui/js/options.js
+++ b/react-ui/js/options.js
@@ -237,8 +237,8 @@ const options = {
     default: '/index.html'
   },
   optExcludeDotHtml: {
-    label: 'Exclude .html in url (BETA)',
-    help: 'Will not show .html extension in request path (BETA - MAY BREAK LONGER REQUEST URLS)',
+    label: 'Exclude .html extension from url',
+    help: 'Will not show .html extension in url path',
     type: Boolean,
     default: false
   },

From 252a6403fdc516bcc941119e79506ce88330aa05 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Mon, 3 May 2021 17:28:50 -0500
Subject: [PATCH 040/154] Update handlers.js

---
 handlers.js | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/handlers.js b/handlers.js
index 8e36143e..410a86d4 100644
--- a/handlers.js
+++ b/handlers.js
@@ -253,23 +253,8 @@
         onEntry: function(entry) {
             this.entry = entry
 
-            if (this.app.opts.optExcludeDotHtml && this.request.path != '') {
-                this.fs.getByPath(this.request.path+'.html', (file) => {
-                if (! file.error) {
-                    this.renderFileContents(file)
-                    return
-                } else {
-                    if (this.entry && this.entry.isDirectory && ! this.request.origpath.endsWith('/')) {
-                    var newloc = this.request.origpath + '/'
-                    this.setHeader('location', newloc) // XXX - encode latin-1 somehow?
-                    this.responseLength = 0
-                    //console.log('redirect ->',newloc)
-                    this.writeHeaders(301)
-
-                    this.finish()
-                    return
-                    }
-                }})} else if (this.entry && this.entry.isDirectory && ! this.request.origpath.endsWith('/')) {
+            function onEntryMain() {
+                if (this.entry && this.entry.isDirectory && ! this.request.origpath.endsWith('/')) {
                     var newloc = this.request.origpath + '/'
                     this.setHeader('location', newloc) // XXX - encode latin-1 somehow?
                     this.responseLength = 0
@@ -278,10 +263,8 @@
 
                     this.finish()
                     return
-            }
-
-
-
+                }
+                
             if (this.request.connection.stream.closed) {
                 console.warn(this.request.connection.stream.sockId,'request closed while processing request')
                 return
@@ -452,6 +435,21 @@
                 reader.readEntries( onreadsuccess.bind(this),
                                     onreaderr.bind(this))
             }
+            }
+
+            if (this.app.opts.optExcludeDotHtml && this.request.path != '') {
+                this.fs.getByPath(this.request.path+'.html', (file) => {
+                if (! file.error) {
+                    this.renderFileContents(file)
+                    console.log('file found')
+                    return
+                } else {
+                    onEntryMain.bind(this)()
+                    }
+                })} else {
+                onEntryMain.bind(this)()
+            }
+
         },
         renderFileContents: function(entry, file) {
             getEntryFile(entry, function(file) {

From b91d452b17d4b534b5910bc3eb1eeaf5cccbf39e Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Tue, 4 May 2021 12:16:01 -0500
Subject: [PATCH 041/154] Fix 404 mimetype

---
 handlers.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/handlers.js b/handlers.js
index 410a86d4..5d5fe4fe 100644
--- a/handlers.js
+++ b/handlers.js
@@ -32,6 +32,7 @@
     }
     _.extend(ProxyHandler.prototype, {
         get: function() {
+            this.is404html = false
             if (! this.validator(this.request)) {
                 this.responseLength = 0
                 this.writeHeaders(403)
@@ -95,6 +96,7 @@
             this.get()
         },
         delete: function() {
+            this.is404html = false
             if (! this.app.opts.optDelete) {
                 this.responseLength = 0
                 this.writeHeaders(400)
@@ -110,6 +112,7 @@
             });
         },
         put: function() {
+            this.is404html = false
             if (! this.app.opts.optUpload) {
                 this.responseLength = 0
                 this.writeHeaders(400)
@@ -122,6 +125,7 @@
             this.fs.getByPath(this.request.path, this.onPutEntry.bind(this), true)
         },
         onPutEntry: function(entry) {
+            this.is404html = false
             var parts = this.request.path.split('/')
             var path = parts.slice(0,parts.length-1).join('/')
             var filename = parts[parts.length-1]
@@ -142,6 +146,7 @@
             }
         },
         onPutFolder: function(filename, folder) {
+            this.is404html = false
             var onwritten = function(evt) {
                 console.log('write complete',evt)
                 // TODO write 400 in other cases...
@@ -162,6 +167,7 @@
             folder.getFile(filename, {create:true}, onfile, onfile)
         },
         get: function() {
+            this.is404html = false
             //this.request.connection.stream.onWriteBufferEmpty = this.onWriteBufferEmpty.bind(this)
 
             this.setHeader('accept-ranges','bytes')
@@ -254,6 +260,7 @@
             this.entry = entry
 
             function onEntryMain() {
+            this.is404html = false
                 if (this.entry && this.entry.isDirectory && ! this.request.origpath.endsWith('/')) {
                     var newloc = this.request.origpath + '/'
                     this.setHeader('location', newloc) // XXX - encode latin-1 somehow?
@@ -281,6 +288,7 @@
                             file.file( function(filee) {
                             var reader = new FileReader();
                             reader.onload = function(e){
+                            this.is404html = true
                                 var data = e.target.result
                                     if (this.app.opts.optCustom404usevar) {
                                         if (this.app.opts.optCustom404usevarvar != '') {
@@ -294,8 +302,10 @@
                                     }
                                     html.push(data)
                                     var finaldata = html.join('\n')
+                                    this.setHeader('content-type','text/html; charset=utf-8')
                                     this.write(finaldata, 404)
                                     this.finish()
+                                    this.is404html = false
                         }.bind(this)
                         reader.readAsText(filee)
                         }.bind(this))
@@ -318,6 +328,7 @@
                             file.file( function(filee) {
                             var reader = new FileReader();
                             reader.onload = function(e){
+                            this.is404html = true
                                 var data = e.target.result
                                     if (this.app.opts.optCustom404usevar) {
                                         if (this.app.opts.optCustom404usevarvar != '') {
@@ -331,8 +342,10 @@
                                     }
                                     html.push(data)
                                     var finaldata = html.join('\n')
+                                    this.setHeader('content-type','text/html; charset=utf-8')
                                     this.write(finaldata, 404)
                                     this.finish()
+                                    this.is404html = false
                         }.bind(this)
                         reader.readAsText(filee)
                         }.bind(this))
@@ -384,6 +397,7 @@
                                 file.file( function(filee) {
                                 var reader = new FileReader();
                                 reader.onload = function(e){
+                                this.is404html = true
                                 var data = e.target.result
                                     if (this.app.opts.optCustom404usevar) {
                                         if (this.app.opts.optCustom404usevarvar != '') {
@@ -397,8 +411,10 @@
                                     }
                                     html.push(data)
                                     var finaldata = html.join('\n')
+                                    this.setHeader('content-type','text/html; charset=utf-8')
                                     this.write(finaldata, 404)
                                     this.finish()
+                                    this.is404html = false
                                 }.bind(this)
                             reader.readAsText(filee)
                             }.bind(this))
@@ -460,6 +476,7 @@
                             file.file( function(filee) {
                             var reader = new FileReader();
                             reader.onload = function(e){
+                            this.is404html = true
                                 var data = e.target.result
                                     if (this.app.opts.optCustom404usevar) {
                                         if (this.app.opts.optCustom404usevarvar != '') {
@@ -473,8 +490,10 @@
                                     }
                                     html.push(data)
                                     var finaldata = html.join('\n')
+                                    this.setHeader('content-type','text/html; charset=utf-8')
                                     this.write(finaldata, 404)
                                     this.finish()
+                                    this.is404html = false
                         }.bind(this)
                         reader.readAsText(filee)
                         }.bind(this))

From 33335345f433c5c8c47443a9fa4402b768c80781 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Tue, 4 May 2021 12:17:01 -0500
Subject: [PATCH 042/154] Fix 404 mimetype

---
 webapp.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp.js b/webapp.js
index 7b7e749b..84897e30 100644
--- a/webapp.js
+++ b/webapp.js
@@ -641,7 +641,7 @@
             }
 
             var p = this.request.path.split('.')
-            if (p.length > 1 && ! this.isDirectoryListing) {
+            if (p.length > 1 && ! this.isDirectoryListing && this.is404html == false) {
                 var ext = p[p.length-1].toLowerCase()
                 var type = WSC.MIMETYPES[ext]
                 if (type) {

From dcda51fdb10f73eb75781b6d878298e64d249716 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Tue, 4 May 2021 14:13:15 -0500
Subject: [PATCH 043/154] Fix no .html mimetype

---
 handlers.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/handlers.js b/handlers.js
index 5d5fe4fe..840e0b61 100644
--- a/handlers.js
+++ b/handlers.js
@@ -457,7 +457,8 @@
                 this.fs.getByPath(this.request.path+'.html', (file) => {
                 if (! file.error) {
                     this.renderFileContents(file)
-                    console.log('file found')
+                    //console.log('file found')
+                    this.setHeader('content-type','text/html; charset=utf-8')
                     return
                 } else {
                     onEntryMain.bind(this)()

From eb0479b62996381c1c3856bff732d130807e5fc5 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Tue, 4 May 2021 14:30:32 -0500
Subject: [PATCH 044/154] Add some more mimetypes

---
 mime.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mime.js b/mime.js
index b277d63f..1404e17a 100644
--- a/mime.js
+++ b/mime.js
@@ -595,6 +595,7 @@ var MIMETYPES = {
   "plc": "application/vnd.mobius.plc", 
   "plf": "application/vnd.pocketlearn", 
   "pls": "application/pls+xml", 
+  "pmd":"application/x-pmd" ,
   "pml": "application/vnd.ctc-posml", 
   "png": "image/png", 
   "pnm": "image/x-portable-anymap", 
@@ -859,6 +860,7 @@ var MIMETYPES = {
   "vcx": "application/vnd.vcx", 
   "vis": "application/vnd.visionary", 
   "viv": "video/vnd.vivo", 
+  "vmd":"application/vocaltec-media-desc" ,
   "vob": "video/x-ms-vob", 
   "vor": "application/vnd.stardivision.writer", 
   "vox": "application/x-authorware-bin", 

From b957884cd41b68a24234256df4c888ade1b50d7e Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Wed, 5 May 2021 17:13:46 -0500
Subject: [PATCH 045/154] Create README.md

---
 htaccess/README.md | 49 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 htaccess/README.md

diff --git a/htaccess/README.md b/htaccess/README.md
new file mode 100644
index 00000000..9459a418
--- /dev/null
+++ b/htaccess/README.md
@@ -0,0 +1,49 @@
+
+<h1>How to use wsc.htaccess</h1>
+<br>
+<p>Why not just .htaccess?</p>
+<p>Chrome os does not allow you to name a file starting with a dot. This allows chrome os users to use this feature!</p>
+<p>Also, Web Server for Chrome DOES NOT have support for .htaccess files. Instead, we have wsc.htaccess files, which gets the same thing done (Not all features implimented).
+<br><br>
+<h1>How to</h1>
+<h2>Currently supported</h2>
+<p>301 - Moved Permanently. Tells the server that when chosen file is requested to move to a different directory or file. The browser will cache this</p>
+<p>302 - Found. Tells the server that when chosen file is requested to move to a different directory or file. Not cached by the browser</p>
+<p>307 - Temporary Redirect. Tells the server that when chosen file is requested to move to a different directory or file. Not cached by the browser.</p>
+<br>
+<h2>Planned features (Doesnt mean it will happen)</h2>
+<p>401 - Unauthorized</p>
+<p>undetermined - requires Authentication</p>
+<br>
+<h1>Making the file</h1>
+<p>A wsc.htaccess file is actually a json string, which means one problem with the file will cause it not to work - So be careful. No additional info can be put into the file</p>
+<br>
+<h2>301 Example</h2>
+
+```
+{
+    "request_path": "name of file you want to modify the destination of",
+    "type": 301, 
+    "redirto": "/path/you/want/to/redirect/to"
+}
+```
+<br>
+<h2>302 Example</h2>
+
+```
+{
+    "request_path": "name of file you want to modify the destination of",
+    "type": 302, 
+    "redirto": "/path/you/want/to/redirect/to"
+}
+```
+<br>
+<h2>307 Example</h2>
+
+```
+{
+    "request_path": "name of file you want to modify the destination of",
+    "type": 307, 
+    "redirto": "/path/you/want/to/redirect/to"
+}
+```

From 05b46ab6aa4c740974430ed2b91cdde71ec7efdd Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Wed, 5 May 2021 17:51:44 -0500
Subject: [PATCH 046/154] Update README.md

---
 htaccess/README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htaccess/README.md b/htaccess/README.md
index 9459a418..3f2f3dab 100644
--- a/htaccess/README.md
+++ b/htaccess/README.md
@@ -17,6 +17,14 @@
 <br>
 <h1>Making the file</h1>
 <p>A wsc.htaccess file is actually a json string, which means one problem with the file will cause it not to work - So be careful. No additional info can be put into the file</p>
+<p>Note - If you are trying to redirect to some index.html file and you have the option to automatically show index.html turned on, your path will go from '/somepath/index.html' to '/somepath/'</p>
+<p>Note - If you are trying to redirect to some .html file and you have the option to remove .html extension turned on, your path will go from '/somepath/blah.html' to '/somepath/blah'</p>
+
+Note - when selecting the file to scan, if the file is index.html and you have the option to automatically show index.html turned on, leave the path blank. It should look like this:  `"request_path": "",`
+
+Note - when selecting the file to scan, if the file is some .html and you have the option to remove the .html extension turned on, remove the .html from the file. It should go from:  `"request_path": "somehtml.html",` to: `"request_path": "somehtml",`
+
+<p>Note - Currently, Only ONE ruleset can be set in a directory which means only 1 file per directory can use these features. Plan for this to change.</p>
 <br>
 <h2>301 Example</h2>
 

From 975667e938f98750c946696d0f0d03f95e61dd90 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Wed, 5 May 2021 17:54:58 -0500
Subject: [PATCH 047/154] add wsc.htaccess support

---
 handlers.js            | 55 ++++++++++++++++++++++++++++++++++++++++--
 react-ui/js/index.js   | 14 ++++++++++-
 react-ui/js/options.js |  6 +++++
 3 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/handlers.js b/handlers.js
index 840e0b61..546d3717 100644
--- a/handlers.js
+++ b/handlers.js
@@ -260,7 +260,13 @@
             this.entry = entry
 
             function onEntryMain() {
-            this.is404html = false
+                this.is404html = false
+                if (entry.name == 'wsc.htaccess') {
+                    this.write('<h1>Forbidden</h1>', 403)
+                    this.finish()
+                    return
+                }
+                
                 if (this.entry && this.entry.isDirectory && ! this.request.origpath.endsWith('/')) {
                     var newloc = this.request.origpath + '/'
                     this.setHeader('location', newloc) // XXX - encode latin-1 somehow?
@@ -453,6 +459,7 @@
             }
             }
 
+        function excludedothtmlcheck() {
             if (this.app.opts.optExcludeDotHtml && this.request.path != '') {
                 this.fs.getByPath(this.request.path+'.html', (file) => {
                 if (! file.error) {
@@ -466,7 +473,51 @@
                 })} else {
                 onEntryMain.bind(this)()
             }
-
+        }
+        
+            if (this.app.opts.optScanForHtaccess) {
+                var fullrequestpath = this.request.path
+                if (entry.isDirectory) {
+                    var finalpath = fullrequestpath+'/'
+                } else {
+                    var finapath = fullrequestpath
+                    var finpath = finapath.split('/').pop();
+                    var finalpath = fullrequestpath.substring(0, fullrequestpath.length - finpath.length);
+                }
+                if (this.request.path == '') {
+                    var finalpath = '/'
+                }
+                var htaccesspath = finalpath+'wsc.htaccess'
+                this.fs.getByPath(htaccesspath, (file) => {
+                if (! file.error) {
+                    file.file( function(filee) {
+                        var reader = new FileReader();
+                        reader.onload = function(e){
+                            var dataa = e.target.result
+                            var data = JSON.parse(dataa)
+                            console.log(data)
+                            var filerequest = this.request.path
+                            var filerequested = filerequest.split('/').pop();
+                                if (data.type == 301 || data.type == 302 || data.type == 307) {
+                                    if (data.request_path == filerequested) {
+                                        this.setHeader('location', data.redirto)
+                                        this.writeHeaders(data.type)
+                                        this.finish()
+                                    } else {
+                                        excludedothtmlcheck.bind(this)()
+                                    }
+                            } else {
+                                excludedothtmlcheck.bind(this)()
+                            }
+                        }.bind(this)
+                        reader.readAsText(filee)
+                    }.bind(this))
+                } else {
+                    excludedothtmlcheck.bind(this)()
+                }})
+            } else {
+                excludedothtmlcheck.bind(this)()
+            }
         },
         renderFileContents: function(entry, file) {
             getEntryFile(entry, function(file) {
diff --git a/react-ui/js/index.js b/react-ui/js/index.js
index 9bf30ea2..230d01cd 100644
--- a/react-ui/js/index.js
+++ b/react-ui/js/index.js
@@ -284,6 +284,9 @@ class App extends React.Component {
     const optCustom404InfoPt2 = {
       optCustom404usevarvar: ['optCustom404','optCustom404usevar']
     };
+    const optHtaccess = {
+      optScanForHtaccess: null
+    };
     const optRewrite = {
       optModRewriteEnable: null
     };
@@ -328,6 +331,15 @@ class App extends React.Component {
 
     const Custom404Main = renderOpts(optCustom404Main)
 
+    const HtaccessMain = renderOpts(optHtaccess)
+
+    const HtaccessInfo = (() => {
+      let disable = (!this.webapp || !this.webapp.opts.optScanForHtaccess);
+      return [(<div style={{paddingLeft: 20}}>{!disable}
+        {!disable && <Alert severity="info">For more info on how to use wsc.htaccess files, go <a href="https://github.com/ethanaobrien/web-server-chrome/tree/master/htaccess#readme" target="_blank">here</a></Alert>}
+	  </div>)];
+    })();
+
     const Custom404Options = (() => {
       let disabletwo = (!this.webapp || !this.webapp.opts.optCustom404);
       const textboxestwo = renderOpts(optCustom404Info)
@@ -426,7 +438,7 @@ class App extends React.Component {
           {options}
 
           {advancedButton}
-          {state.showAdvanced && <div>{advOptions}{Custom404Main}{Custom404Options}{Custom404OptionsPt2}{rewriteMain}{rewriteOptions}{httpsMain}{httpsOptions}</div> }
+          {state.showAdvanced && <div>{advOptions}{Custom404Main}{Custom404Options}{Custom404OptionsPt2}{HtaccessMain}{HtaccessInfo}{rewriteMain}{rewriteOptions}{httpsMain}{httpsOptions}</div> }
         </CardContent>
       </Card>
 
diff --git a/react-ui/js/options.js b/react-ui/js/options.js
index 9878dd87..f57c8fc3 100644
--- a/react-ui/js/options.js
+++ b/react-ui/js/options.js
@@ -242,6 +242,12 @@ const options = {
     type: Boolean,
     default: false
   },
+  optScanForHtaccess: {
+    label: 'Look for wsc.htaccess files',
+    help: 'Check for more info',
+    type: Boolean,
+    default: false
+  },
   optUseHttps: {
     label: 'Use https://',
     help: 'Serve pages through https://',

From b0e28bd1e18507b40b43a46f23804bf2485326cb Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Wed, 5 May 2021 18:20:32 -0500
Subject: [PATCH 048/154] Update README.md

---
 htaccess/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htaccess/README.md b/htaccess/README.md
index 3f2f3dab..3f87223c 100644
--- a/htaccess/README.md
+++ b/htaccess/README.md
@@ -25,6 +25,7 @@ Note - when selecting the file to scan, if the file is index.html and you have t
 Note - when selecting the file to scan, if the file is some .html and you have the option to remove the .html extension turned on, remove the .html from the file. It should go from:  `"request_path": "somehtml.html",` to: `"request_path": "somehtml",`
 
 <p>Note - Currently, Only ONE ruleset can be set in a directory which means only 1 file per directory can use these features. Plan for this to change.</p>
+<p>Note - wsc.htaccess file MUST be in the same directory as the file you want to change. The file does not need to exist, as it overrides rendering the file</p>
 <br>
 <h2>301 Example</h2>
 

From 50446c09824cb486f969bfa6c6a27fffc78c8924 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Wed, 5 May 2021 18:21:12 -0500
Subject: [PATCH 049/154] Update README.md

---
 htaccess/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htaccess/README.md b/htaccess/README.md
index 3f87223c..ffe3592d 100644
--- a/htaccess/README.md
+++ b/htaccess/README.md
@@ -10,6 +10,7 @@
 <p>301 - Moved Permanently. Tells the server that when chosen file is requested to move to a different directory or file. The browser will cache this</p>
 <p>302 - Found. Tells the server that when chosen file is requested to move to a different directory or file. Not cached by the browser</p>
 <p>307 - Temporary Redirect. Tells the server that when chosen file is requested to move to a different directory or file. Not cached by the browser.</p>
+<p>If you want more features - Make an issue!</p>
 <br>
 <h2>Planned features (Doesnt mean it will happen)</h2>
 <p>401 - Unauthorized</p>

From db382bcc2a011d6035923ef1f5351737b53a729f Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Wed, 5 May 2021 18:33:50 -0500
Subject: [PATCH 050/154] Update README.md

---
 htaccess/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htaccess/README.md b/htaccess/README.md
index ffe3592d..9938d9be 100644
--- a/htaccess/README.md
+++ b/htaccess/README.md
@@ -27,6 +27,7 @@ Note - when selecting the file to scan, if the file is some .html and you have t
 
 <p>Note - Currently, Only ONE ruleset can be set in a directory which means only 1 file per directory can use these features. Plan for this to change.</p>
 <p>Note - wsc.htaccess file MUST be in the same directory as the file you want to change. The file does not need to exist, as it overrides rendering the file</p>
+<p>IMPORTANT NOTE - EVERYTHING IN THE FILE (AND THE FILE NAME) IS CASE SENSITIVE!!</p>
 <br>
 <h2>301 Example</h2>
 

From 3cf47ce06a1e01b643ea224574b863596e29cfcd Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 6 May 2021 10:02:10 -0500
Subject: [PATCH 051/154] Add 401

---
 htaccess/README.md | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/htaccess/README.md b/htaccess/README.md
index 9938d9be..61aef214 100644
--- a/htaccess/README.md
+++ b/htaccess/README.md
@@ -10,12 +10,9 @@
 <p>301 - Moved Permanently. Tells the server that when chosen file is requested to move to a different directory or file. The browser will cache this</p>
 <p>302 - Found. Tells the server that when chosen file is requested to move to a different directory or file. Not cached by the browser</p>
 <p>307 - Temporary Redirect. Tells the server that when chosen file is requested to move to a different directory or file. Not cached by the browser.</p>
+<p>401 - Unauthorized. The page will require login. For some reason, I cannot find how to clear the cache of the authorization header, which means that once you type it in, the browser will not ask for a login, unless you have multiple password protected pages with different passwords, The authentication header will change whenever you enter a different password.</p>
 <p>If you want more features - Make an issue!</p>
 <br>
-<h2>Planned features (Doesnt mean it will happen)</h2>
-<p>401 - Unauthorized</p>
-<p>undetermined - requires Authentication</p>
-<br>
 <h1>Making the file</h1>
 <p>A wsc.htaccess file is actually a json string, which means one problem with the file will cause it not to work - So be careful. No additional info can be put into the file</p>
 <p>Note - If you are trying to redirect to some index.html file and you have the option to automatically show index.html turned on, your path will go from '/somepath/index.html' to '/somepath/'</p>
@@ -25,7 +22,8 @@ Note - when selecting the file to scan, if the file is index.html and you have t
 
 Note - when selecting the file to scan, if the file is some .html and you have the option to remove the .html extension turned on, remove the .html from the file. It should go from:  `"request_path": "somehtml.html",` to: `"request_path": "somehtml",`
 
-<p>Note - Currently, Only ONE ruleset can be set in a directory which means only 1 file per directory can use these features. Plan for this to change.</p>
+Note - Currently, Only ONE ruleset can be set per directory, you can set all of the files or one of the files to obey this. To protect / redirect all files in a directory, change the value of `"request_path"` to `"all files"` to make `"request_path": "all files",`. Expect for this to change
+
 <p>Note - wsc.htaccess file MUST be in the same directory as the file you want to change. The file does not need to exist, as it overrides rendering the file</p>
 <p>IMPORTANT NOTE - EVERYTHING IN THE FILE (AND THE FILE NAME) IS CASE SENSITIVE!!</p>
 <br>
@@ -33,7 +31,7 @@ Note - when selecting the file to scan, if the file is some .html and you have t
 
 ```
 {
-    "request_path": "name of file you want to modify the destination of",
+    "request_path": "name of file you want to modify",
     "type": 301, 
     "redirto": "/path/you/want/to/redirect/to"
 }
@@ -43,7 +41,7 @@ Note - when selecting the file to scan, if the file is some .html and you have t
 
 ```
 {
-    "request_path": "name of file you want to modify the destination of",
+    "request_path": "name of file you want to modify",
     "type": 302, 
     "redirto": "/path/you/want/to/redirect/to"
 }
@@ -53,8 +51,19 @@ Note - when selecting the file to scan, if the file is some .html and you have t
 
 ```
 {
-    "request_path": "name of file you want to modify the destination of",
+    "request_path": "name of file you want to modify",
     "type": 307, 
     "redirto": "/path/you/want/to/redirect/to"
 }
 ```
+<br>
+<h2>401 Example</h2>
+
+```
+{
+    "request_path": "name of file you want to modify",
+    "type": 401,
+    "username": "test",
+    "password": "example"
+}
+```

From f783733a33a7a5ee715b0f7fd7efdc6f8a3759cb Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 6 May 2021 10:02:54 -0500
Subject: [PATCH 052/154] Add 401 feature to htaccess

---
 handlers.js | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/handlers.js b/handlers.js
index 546d3717..60b04c37 100644
--- a/handlers.js
+++ b/handlers.js
@@ -498,16 +498,35 @@
                             console.log(data)
                             var filerequest = this.request.path
                             var filerequested = filerequest.split('/').pop();
+                            if (data.request_path == filerequested || data.request_path == 'all files') {
                                 if (data.type == 301 || data.type == 302 || data.type == 307) {
-                                    if (data.request_path == filerequested) {
                                         this.setHeader('location', data.redirto)
                                         this.writeHeaders(data.type)
                                         this.finish()
-                                    } else {
-                                        excludedothtmlcheck.bind(this)()
+                            } else if (data.type == 401) {
+                                var validAuth = false
+                                var auth = this.request.headers['authorization']
+                                if (auth) {
+                                    if (auth.slice(0,6).toLowerCase() == 'basic ') {
+                                        var userpass = atob(auth.slice(6,auth.length)).split(':')
+                                        if (userpass[0] == data.username && userpass[1] == data.password) {
+                                            validAuth = true
+                                        }
                                     }
+                                }
+                                if (! validAuth) {
+                                    this.setHeader("WWW-Authenticate", "Basic")
+                                    this.write("<h1>401 - Unauthorized</h1>", 401)
+                                    this.finish()
+                                    return
+                                }
+                                if (validAuth) {
+                                    excludedothtmlcheck.bind(this)()
+                                }
                             } else {
                                 excludedothtmlcheck.bind(this)()
+                            }} else {
+                                excludedothtmlcheck.bind(this)()
                             }
                         }.bind(this)
                         reader.readAsText(filee)

From f6831fee088c96fae0ca0caaf52d684ef4f27dd2 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 6 May 2021 10:16:33 -0500
Subject: [PATCH 053/154] Secutity fixes with rendering directory listing when
 wsc.htaccess present

---
 handlers.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/handlers.js b/handlers.js
index 60b04c37..fb3cc106 100644
--- a/handlers.js
+++ b/handlers.js
@@ -262,7 +262,7 @@
             function onEntryMain() {
                 this.is404html = false
                 if (entry.name == 'wsc.htaccess') {
-                    this.write('<h1>Forbidden</h1>', 403)
+                    this.write('<h1>403 - Forbidden</h1>', 403)
                     this.finish()
                     return
                 }
@@ -686,8 +686,9 @@
 		        var filesizestr = '""'
 		        var modifiedstr = '""'
                 // raw, urlencoded, isdirectory, size, size as string, date modified, date modified as string
+                if (rawname != '"wsc.htaccess"') {
                 html.push('<script>addRow('+rawname+','+name+','+isdirectory+','+filesize+','+filesizestr+','+modified+','+modifiedstr+');</script>')
-            }
+            }}
             var data = html.join('\n')
             data = new TextEncoder('utf-8').encode(data).buffer
             this.writeChunk(data)
@@ -708,7 +709,9 @@
                 if (results[i].isDirectory) {
                     html.push('<li class="directory"><a href="' + name + '/?static=1">' + name + '</a></li>')
                 } else {
-                    html.push('<li><a href="' + name + '?static=1">' + name + '</a></li>')
+                    if (name != 'wsc.htaccess') {
+                        html.push('<li><a href="' + name + '?static=1">' + name + '</a></li>')
+                    }
                 }
             }
             html.push('</ul></html>')

From af4eb44445fec3928fb08592473b199e57e78f20 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 6 May 2021 10:26:26 -0500
Subject: [PATCH 054/154] Add invalid json string failsafe

---
 handlers.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/handlers.js b/handlers.js
index fb3cc106..a018a027 100644
--- a/handlers.js
+++ b/handlers.js
@@ -494,7 +494,15 @@
                         var reader = new FileReader();
                         reader.onload = function(e){
                             var dataa = e.target.result
-                            var data = JSON.parse(dataa)
+                            if(true) {
+                                try {
+                                    var data = JSON.parse(dataa)
+                                } catch(e) {
+                                    this.write('wsc.htaccess file found, but it is not a valid json string', 500)
+                                    this.finish()
+                                    return
+                                }
+                            }
                             console.log(data)
                             var filerequest = this.request.path
                             var filerequested = filerequest.split('/').pop();

From 8feffc7ea20a1dcf200065f0a97b4200844988a7 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 6 May 2021 11:06:38 -0500
Subject: [PATCH 055/154] Update README.md

---
 htaccess/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htaccess/README.md b/htaccess/README.md
index 61aef214..0e9e8f2c 100644
--- a/htaccess/README.md
+++ b/htaccess/README.md
@@ -22,7 +22,7 @@ Note - when selecting the file to scan, if the file is index.html and you have t
 
 Note - when selecting the file to scan, if the file is some .html and you have the option to remove the .html extension turned on, remove the .html from the file. It should go from:  `"request_path": "somehtml.html",` to: `"request_path": "somehtml",`
 
-Note - Currently, Only ONE ruleset can be set per directory, you can set all of the files or one of the files to obey this. To protect / redirect all files in a directory, change the value of `"request_path"` to `"all files"` to make `"request_path": "all files",`. Expect for this to change
+Note - Currently, Only ONE ruleset can be set per directory, you can set all of the files or one of the files to obey this. To protect / redirect all files in a directory, change the value of `"request_path"` to `"all files"` to make `"request_path": "all files",`. Do not expect this to change. It would be overly complicated (and make the performance extremely low) to use arrays and to find which one is what and I'ts just not going to happen.
 
 <p>Note - wsc.htaccess file MUST be in the same directory as the file you want to change. The file does not need to exist, as it overrides rendering the file</p>
 <p>IMPORTANT NOTE - EVERYTHING IN THE FILE (AND THE FILE NAME) IS CASE SENSITIVE!!</p>

From 03074acf8a0ed168fc05966fb573d086f5010321 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 6 May 2021 11:21:53 -0500
Subject: [PATCH 056/154] Change this.is404html variable to this.useDefaultMime

---
 webapp.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp.js b/webapp.js
index 84897e30..c5f6ca43 100644
--- a/webapp.js
+++ b/webapp.js
@@ -641,7 +641,7 @@
             }
 
             var p = this.request.path.split('.')
-            if (p.length > 1 && ! this.isDirectoryListing && this.is404html == false) {
+            if (p.length > 1 && ! this.isDirectoryListing && this.useDefaultMime) {
                 var ext = p[p.length-1].toLowerCase()
                 var type = WSC.MIMETYPES[ext]
                 if (type) {

From 0fa72e01071f9f0a6ebc709ae4736473911ece73 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 6 May 2021 11:22:30 -0500
Subject: [PATCH 057/154] Add setting this.useDefaultMime on startup

---
 background.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/background.js b/background.js
index 427c135b..a2b0f1f1 100644
--- a/background.js
+++ b/background.js
@@ -1,4 +1,5 @@
 console.log('background.js')
+this.useDefaultMime = true
 var ALARMID = "check_wsc_periodic"
 var WSCID = "ofhbbkphhbklhfoeikjpcbhemlocgigb"
 var HADEVENT = false

From f17761c9bc316a22b4df99088c135a3fe5fb0916 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 6 May 2021 11:23:15 -0500
Subject: [PATCH 058/154] Fix 401 mimetype and change 404 mimetype variable

---
 handlers.js | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/handlers.js b/handlers.js
index a018a027..7d4ed983 100644
--- a/handlers.js
+++ b/handlers.js
@@ -32,7 +32,6 @@
     }
     _.extend(ProxyHandler.prototype, {
         get: function() {
-            this.is404html = false
             if (! this.validator(this.request)) {
                 this.responseLength = 0
                 this.writeHeaders(403)
@@ -96,7 +95,6 @@
             this.get()
         },
         delete: function() {
-            this.is404html = false
             if (! this.app.opts.optDelete) {
                 this.responseLength = 0
                 this.writeHeaders(400)
@@ -112,7 +110,6 @@
             });
         },
         put: function() {
-            this.is404html = false
             if (! this.app.opts.optUpload) {
                 this.responseLength = 0
                 this.writeHeaders(400)
@@ -125,7 +122,6 @@
             this.fs.getByPath(this.request.path, this.onPutEntry.bind(this), true)
         },
         onPutEntry: function(entry) {
-            this.is404html = false
             var parts = this.request.path.split('/')
             var path = parts.slice(0,parts.length-1).join('/')
             var filename = parts[parts.length-1]
@@ -146,7 +142,6 @@
             }
         },
         onPutFolder: function(filename, folder) {
-            this.is404html = false
             var onwritten = function(evt) {
                 console.log('write complete',evt)
                 // TODO write 400 in other cases...
@@ -167,7 +162,6 @@
             folder.getFile(filename, {create:true}, onfile, onfile)
         },
         get: function() {
-            this.is404html = false
             //this.request.connection.stream.onWriteBufferEmpty = this.onWriteBufferEmpty.bind(this)
 
             this.setHeader('accept-ranges','bytes')
@@ -260,7 +254,7 @@
             this.entry = entry
 
             function onEntryMain() {
-                this.is404html = false
+                this.useDefaultMime = true
                 if (entry.name == 'wsc.htaccess') {
                     this.write('<h1>403 - Forbidden</h1>', 403)
                     this.finish()
@@ -294,7 +288,7 @@
                             file.file( function(filee) {
                             var reader = new FileReader();
                             reader.onload = function(e){
-                            this.is404html = true
+                            this.useDefaultMime = false
                                 var data = e.target.result
                                     if (this.app.opts.optCustom404usevar) {
                                         if (this.app.opts.optCustom404usevarvar != '') {
@@ -311,7 +305,7 @@
                                     this.setHeader('content-type','text/html; charset=utf-8')
                                     this.write(finaldata, 404)
                                     this.finish()
-                                    this.is404html = false
+                                    this.useDefaultMime = true
                         }.bind(this)
                         reader.readAsText(filee)
                         }.bind(this))
@@ -334,7 +328,7 @@
                             file.file( function(filee) {
                             var reader = new FileReader();
                             reader.onload = function(e){
-                            this.is404html = true
+                            this.useDefaultMime = false
                                 var data = e.target.result
                                     if (this.app.opts.optCustom404usevar) {
                                         if (this.app.opts.optCustom404usevarvar != '') {
@@ -351,7 +345,7 @@
                                     this.setHeader('content-type','text/html; charset=utf-8')
                                     this.write(finaldata, 404)
                                     this.finish()
-                                    this.is404html = false
+                                    this.useDefaultMime = true
                         }.bind(this)
                         reader.readAsText(filee)
                         }.bind(this))
@@ -403,7 +397,7 @@
                                 file.file( function(filee) {
                                 var reader = new FileReader();
                                 reader.onload = function(e){
-                                this.is404html = true
+                                this.useDefaultMime = false
                                 var data = e.target.result
                                     if (this.app.opts.optCustom404usevar) {
                                         if (this.app.opts.optCustom404usevarvar != '') {
@@ -420,7 +414,7 @@
                                     this.setHeader('content-type','text/html; charset=utf-8')
                                     this.write(finaldata, 404)
                                     this.finish()
-                                    this.is404html = false
+                                    this.useDefaultMime = true
                                 }.bind(this)
                             reader.readAsText(filee)
                             }.bind(this))
@@ -523,10 +517,13 @@
                                     }
                                 }
                                 if (! validAuth) {
+                                    this.useDefaultMime = false
+                                    this.setHeader('content-type','text/html; charset=utf-8')
                                     this.setHeader("WWW-Authenticate", "Basic")
                                     this.write("<h1>401 - Unauthorized</h1>", 401)
                                     this.finish()
                                     return
+                                    this.useDefaultMime = true
                                 }
                                 if (validAuth) {
                                     excludedothtmlcheck.bind(this)()
@@ -555,7 +552,7 @@
                             file.file( function(filee) {
                             var reader = new FileReader();
                             reader.onload = function(e){
-                            this.is404html = true
+                            this.useDefaultMime = false
                                 var data = e.target.result
                                     if (this.app.opts.optCustom404usevar) {
                                         if (this.app.opts.optCustom404usevarvar != '') {
@@ -572,7 +569,7 @@
                                     this.setHeader('content-type','text/html; charset=utf-8')
                                     this.write(finaldata, 404)
                                     this.finish()
-                                    this.is404html = false
+                                    this.useDefaultMime = true
                         }.bind(this)
                         reader.readAsText(filee)
                         }.bind(this))

From c0fd8a96a9758f1f6d567c1c2f24215b0317d861 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 6 May 2021 11:29:09 -0500
Subject: [PATCH 059/154] Clean console

---
 handlers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/handlers.js b/handlers.js
index 7d4ed983..bbca2f20 100644
--- a/handlers.js
+++ b/handlers.js
@@ -497,7 +497,7 @@
                                     return
                                 }
                             }
-                            console.log(data)
+                            //console.log(data)
                             var filerequest = this.request.path
                             var filerequested = filerequest.split('/').pop();
                             if (data.request_path == filerequested || data.request_path == 'all files') {

From dd7b548d2eb6b91f76c5e0cbf7d5cdad90b18f84 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 6 May 2021 13:23:47 -0500
Subject: [PATCH 060/154] Added security fix

---
 handlers.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/handlers.js b/handlers.js
index bbca2f20..1076902e 100644
--- a/handlers.js
+++ b/handlers.js
@@ -500,6 +500,9 @@
                             //console.log(data)
                             var filerequest = this.request.path
                             var filerequested = filerequest.split('/').pop();
+                            if (filerequested == 'index.html' || filerequested == 'index' || filerequested == 'index.htm') {
+                                var filerequested = ''
+                            }
                             if (data.request_path == filerequested || data.request_path == 'all files') {
                                 if (data.type == 301 || data.type == 302 || data.type == 307) {
                                         this.setHeader('location', data.redirto)

From 9ad1c25fcab17e5946ca4f3b8ddd7cb4e363dc58 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 6 May 2021 13:29:39 -0500
Subject: [PATCH 061/154] Update README.md

---
 htaccess/README.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htaccess/README.md b/htaccess/README.md
index 0e9e8f2c..f05f84db 100644
--- a/htaccess/README.md
+++ b/htaccess/README.md
@@ -16,11 +16,13 @@
 <h1>Making the file</h1>
 <p>A wsc.htaccess file is actually a json string, which means one problem with the file will cause it not to work - So be careful. No additional info can be put into the file</p>
 <p>Note - If you are trying to redirect to some index.html file and you have the option to automatically show index.html turned on, your path will go from '/somepath/index.html' to '/somepath/'</p>
-<p>Note - If you are trying to redirect to some .html file and you have the option to remove .html extension turned on, your path will go from '/somepath/blah.html' to '/somepath/blah'</p>
+<p>Note - If you are trying to redirect to some .html file and you have the option to remove .html extension turned on put the .html extension. The web server will handle the request and forward it to have no .html extension</p>
 
-Note - when selecting the file to scan, if the file is index.html and you have the option to automatically show index.html turned on, leave the path blank. It should look like this:  `"request_path": "",`
+Note - when selecting the file to scan, if the file is index.html and you have the option to automatically show index.html turned on, leave the path blank. It should look like this:  `"request_path": "",`.
 
-Note - when selecting the file to scan, if the file is some .html and you have the option to remove the .html extension turned on, remove the .html from the file. It should go from:  `"request_path": "somehtml.html",` to: `"request_path": "somehtml",`
+Note - There are security measures that when request_path = "" It will deny access to index.html, index (For no .html extension) and index.htm. Use `"request_path": "",`. if the file is index.html or index.htm - This will protect every way of access.
+
+Note - when selecting the file to scan, if the file is some .html and you have the option to remove the .html extension turned on, remove the .html from the file. It should go from:  `"request_path": "somehtml.html",` to: `"request_path": "somehtml",` - Plan for this to change 
 
 Note - Currently, Only ONE ruleset can be set per directory, you can set all of the files or one of the files to obey this. To protect / redirect all files in a directory, change the value of `"request_path"` to `"all files"` to make `"request_path": "all files",`. Do not expect this to change. It would be overly complicated (and make the performance extremely low) to use arrays and to find which one is what and I'ts just not going to happen.
 

From 0b26c479d288bf9e5bd0454df123a06be7473b35 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 6 May 2021 13:37:49 -0500
Subject: [PATCH 062/154] Fix Security for no .html option

---
 handlers.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/handlers.js b/handlers.js
index 1076902e..3934f37e 100644
--- a/handlers.js
+++ b/handlers.js
@@ -503,6 +503,9 @@
                             if (filerequested == 'index.html' || filerequested == 'index' || filerequested == 'index.htm') {
                                 var filerequested = ''
                             }
+                            if (this.app.opts.optExcludeDotHtml) {
+                                var filerequested = filerequested+'.html'
+                            }
                             if (data.request_path == filerequested || data.request_path == 'all files') {
                                 if (data.type == 301 || data.type == 302 || data.type == 307) {
                                         this.setHeader('location', data.redirto)

From 8f6c446e8e14eec92fcae54eea4ed707838d7438 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 6 May 2021 13:39:16 -0500
Subject: [PATCH 063/154] Update README.md

---
 htaccess/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htaccess/README.md b/htaccess/README.md
index f05f84db..bfb585bb 100644
--- a/htaccess/README.md
+++ b/htaccess/README.md
@@ -22,7 +22,7 @@ Note - when selecting the file to scan, if the file is index.html and you have t
 
 Note - There are security measures that when request_path = "" It will deny access to index.html, index (For no .html extension) and index.htm. Use `"request_path": "",`. if the file is index.html or index.htm - This will protect every way of access.
 
-Note - when selecting the file to scan, if the file is some .html and you have the option to remove the .html extension turned on, remove the .html from the file. It should go from:  `"request_path": "somehtml.html",` to: `"request_path": "somehtml",` - Plan for this to change 
+Note - when selecting the file to scan, if the file is some .html and you have the option to remove the .html extension turned on, include the .html extension in the request path. The web server will handle it
 
 Note - Currently, Only ONE ruleset can be set per directory, you can set all of the files or one of the files to obey this. To protect / redirect all files in a directory, change the value of `"request_path"` to `"all files"` to make `"request_path": "all files",`. Do not expect this to change. It would be overly complicated (and make the performance extremely low) to use arrays and to find which one is what and I'ts just not going to happen.
 

From e1f1a3da26398cdb55ba41454d6316e8e856733a Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 6 May 2021 13:48:30 -0500
Subject: [PATCH 064/154] Update handlers.js

---
 handlers.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/handlers.js b/handlers.js
index 3934f37e..1076902e 100644
--- a/handlers.js
+++ b/handlers.js
@@ -503,9 +503,6 @@
                             if (filerequested == 'index.html' || filerequested == 'index' || filerequested == 'index.htm') {
                                 var filerequested = ''
                             }
-                            if (this.app.opts.optExcludeDotHtml) {
-                                var filerequested = filerequested+'.html'
-                            }
                             if (data.request_path == filerequested || data.request_path == 'all files') {
                                 if (data.type == 301 || data.type == 302 || data.type == 307) {
                                         this.setHeader('location', data.redirto)

From f04bed11b5ed49a6926d30b07f981a669a8bc4e9 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 6 May 2021 13:49:11 -0500
Subject: [PATCH 065/154] Update README.md

---
 htaccess/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htaccess/README.md b/htaccess/README.md
index bfb585bb..7be886b2 100644
--- a/htaccess/README.md
+++ b/htaccess/README.md
@@ -22,7 +22,7 @@ Note - when selecting the file to scan, if the file is index.html and you have t
 
 Note - There are security measures that when request_path = "" It will deny access to index.html, index (For no .html extension) and index.htm. Use `"request_path": "",`. if the file is index.html or index.htm - This will protect every way of access.
 
-Note - when selecting the file to scan, if the file is some .html and you have the option to remove the .html extension turned on, include the .html extension in the request path. The web server will handle it
+Note - when selecting the file to scan, if the file is some .html and you have the option to remove the .html extension turned on, remove the .html from the file. It should go from:  `"request_path": "somehtml.html",` to: `"request_path": "somehtml",`.
 
 Note - Currently, Only ONE ruleset can be set per directory, you can set all of the files or one of the files to obey this. To protect / redirect all files in a directory, change the value of `"request_path"` to `"all files"` to make `"request_path": "all files",`. Do not expect this to change. It would be overly complicated (and make the performance extremely low) to use arrays and to find which one is what and I'ts just not going to happen.
 

From e5bc531749356d77ebfc0e6deca7f4c507aafc9c Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Fri, 7 May 2021 08:47:59 -0500
Subject: [PATCH 066/154] Added 403 to htaccess

---
 htaccess/README.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/htaccess/README.md b/htaccess/README.md
index 7be886b2..1f4edfec 100644
--- a/htaccess/README.md
+++ b/htaccess/README.md
@@ -11,6 +11,7 @@
 <p>302 - Found. Tells the server that when chosen file is requested to move to a different directory or file. Not cached by the browser</p>
 <p>307 - Temporary Redirect. Tells the server that when chosen file is requested to move to a different directory or file. Not cached by the browser.</p>
 <p>401 - Unauthorized. The page will require login. For some reason, I cannot find how to clear the cache of the authorization header, which means that once you type it in, the browser will not ask for a login, unless you have multiple password protected pages with different passwords, The authentication header will change whenever you enter a different password.</p>
+<p>403 - Forbidden. This will deny direct access to image/video/audio files. This option onyl works is https is enabled/p>
 <p>If you want more features - Make an issue!</p>
 <br>
 <h1>Making the file</h1>
@@ -69,3 +70,12 @@ Note - Currently, Only ONE ruleset can be set per directory, you can set all of
     "password": "example"
 }
 ```
+<br>
+<h2>403 Example</h2>
+
+```
+{
+    "request_path": "name of file you want to modify",
+    "type": 403
+}
+```

From 803f204e9cb4330e90105e0ee3dfd6f63c98ad33 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Fri, 7 May 2021 08:48:00 -0500
Subject: [PATCH 067/154] Added 403 to htaccess

---
 handlers.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/handlers.js b/handlers.js
index 1076902e..2f0d80ac 100644
--- a/handlers.js
+++ b/handlers.js
@@ -531,6 +531,22 @@
                                 if (validAuth) {
                                     excludedothtmlcheck.bind(this)()
                                 }
+                            } else if (data.type == 403) {
+                                var method = this.request.headers['sec-fetch-dest']
+                                console.log(method)
+                                var name = this.request.path
+                                var extension = name.split('.').pop();
+                                console.log(extension)
+                                if (method == "document") {
+                                    if (extension != 'html' && extension != 'htm' && ! this.request.origpath.endsWith('/') && this.request.path != '') {
+                                        this.write('403 - Forbidden')
+                                        this.finish()
+                                    } else {
+                                        excludedothtmlcheck.bind(this)()
+                                    }
+                                } else {
+                                    excludedothtmlcheck.bind(this)()
+                                }
                             } else {
                                 excludedothtmlcheck.bind(this)()
                             }} else {

From 0abe5ac1a9832c3c13da9325bc7da10874cea571 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Fri, 7 May 2021 08:49:03 -0500
Subject: [PATCH 068/154] Fix Typo

---
 htaccess/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htaccess/README.md b/htaccess/README.md
index 1f4edfec..94e7a672 100644
--- a/htaccess/README.md
+++ b/htaccess/README.md
@@ -11,7 +11,7 @@
 <p>302 - Found. Tells the server that when chosen file is requested to move to a different directory or file. Not cached by the browser</p>
 <p>307 - Temporary Redirect. Tells the server that when chosen file is requested to move to a different directory or file. Not cached by the browser.</p>
 <p>401 - Unauthorized. The page will require login. For some reason, I cannot find how to clear the cache of the authorization header, which means that once you type it in, the browser will not ask for a login, unless you have multiple password protected pages with different passwords, The authentication header will change whenever you enter a different password.</p>
-<p>403 - Forbidden. This will deny direct access to image/video/audio files. This option onyl works is https is enabled/p>
+<p>403 - Forbidden. This will deny direct access to image/video/audio files. This option only works if https is enabled/p>
 <p>If you want more features - Make an issue!</p>
 <br>
 <h1>Making the file</h1>

From 8e06cb418fb06ea1b88c161fc68896f172e8e9f6 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Fri, 7 May 2021 08:50:42 -0500
Subject: [PATCH 069/154] Clean logging

---
 handlers.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/handlers.js b/handlers.js
index 2f0d80ac..e5494e07 100644
--- a/handlers.js
+++ b/handlers.js
@@ -533,10 +533,10 @@
                                 }
                             } else if (data.type == 403) {
                                 var method = this.request.headers['sec-fetch-dest']
-                                console.log(method)
+                                //console.log(method)
                                 var name = this.request.path
                                 var extension = name.split('.').pop();
-                                console.log(extension)
+                                //console.log(extension)
                                 if (method == "document") {
                                     if (extension != 'html' && extension != 'htm' && ! this.request.origpath.endsWith('/') && this.request.path != '') {
                                         this.write('403 - Forbidden')

From 57755d267cad9dc4e982255b272874403fc05243 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Fri, 7 May 2021 09:12:06 -0500
Subject: [PATCH 070/154] Cleaner sending

---
 handlers.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/handlers.js b/handlers.js
index e5494e07..68313d7e 100644
--- a/handlers.js
+++ b/handlers.js
@@ -533,13 +533,13 @@
                                 }
                             } else if (data.type == 403) {
                                 var method = this.request.headers['sec-fetch-dest']
-                                //console.log(method)
+                                console.log(method)
                                 var name = this.request.path
                                 var extension = name.split('.').pop();
-                                //console.log(extension)
+                                console.log(extension)
                                 if (method == "document") {
                                     if (extension != 'html' && extension != 'htm' && ! this.request.origpath.endsWith('/') && this.request.path != '') {
-                                        this.write('403 - Forbidden')
+                                        this.write('<h1>403 - Forbidden</h1>')
                                         this.finish()
                                     } else {
                                         excludedothtmlcheck.bind(this)()

From 85d68d4157b9ac4b089de3435a0138bbd81bb70a Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Fri, 7 May 2021 10:55:15 -0500
Subject: [PATCH 071/154] Fix Typo

---
 htaccess/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htaccess/README.md b/htaccess/README.md
index 94e7a672..941b2080 100644
--- a/htaccess/README.md
+++ b/htaccess/README.md
@@ -11,7 +11,7 @@
 <p>302 - Found. Tells the server that when chosen file is requested to move to a different directory or file. Not cached by the browser</p>
 <p>307 - Temporary Redirect. Tells the server that when chosen file is requested to move to a different directory or file. Not cached by the browser.</p>
 <p>401 - Unauthorized. The page will require login. For some reason, I cannot find how to clear the cache of the authorization header, which means that once you type it in, the browser will not ask for a login, unless you have multiple password protected pages with different passwords, The authentication header will change whenever you enter a different password.</p>
-<p>403 - Forbidden. This will deny direct access to image/video/audio files. This option only works if https is enabled/p>
+<p>403 - Forbidden. This will deny direct access to image/video/audio files. This option only works if https is enabled</p>
 <p>If you want more features - Make an issue!</p>
 <br>
 <h1>Making the file</h1>
@@ -25,7 +25,7 @@ Note - There are security measures that when request_path = "" It will deny acce
 
 Note - when selecting the file to scan, if the file is some .html and you have the option to remove the .html extension turned on, remove the .html from the file. It should go from:  `"request_path": "somehtml.html",` to: `"request_path": "somehtml",`.
 
-Note - Currently, Only ONE ruleset can be set per directory, you can set all of the files or one of the files to obey this. To protect / redirect all files in a directory, change the value of `"request_path"` to `"all files"` to make `"request_path": "all files",`. Do not expect this to change. It would be overly complicated (and make the performance extremely low) to use arrays and to find which one is what and I'ts just not going to happen.
+Note - Currently, Only ONE ruleset can be set per directory, you can set all of the files or one of the files to obey this. To protect / redirect all files in a directory, change the value of `"request_path"` to `"all files"` to make `"request_path": "all files",`. Do not expect this to change. It would be overly complicated (and make the performance extremely slow) to use arrays and to find which one is what and I'ts just not going to happen.
 
 <p>Note - wsc.htaccess file MUST be in the same directory as the file you want to change. The file does not need to exist, as it overrides rendering the file</p>
 <p>IMPORTANT NOTE - EVERYTHING IN THE FILE (AND THE FILE NAME) IS CASE SENSITIVE!!</p>

From e22ec58df6258befba735f8a720e031f8eef22ee Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Fri, 7 May 2021 18:44:04 +0100
Subject: [PATCH 072/154] Add Custom 403 and 401 pages

---
 handlers.js            |  99 ++++++++++++++++++++++++++++-------
 react-ui/js/index.js   | 116 +++++++++++++++++++++++++++++++----------
 react-ui/js/options.js |  24 +++++++++
 3 files changed, 192 insertions(+), 47 deletions(-)

diff --git a/handlers.js b/handlers.js
index 68313d7e..6c65886a 100644
--- a/handlers.js
+++ b/handlers.js
@@ -256,10 +256,30 @@
             function onEntryMain() {
                 this.useDefaultMime = true
                 if (entry.name == 'wsc.htaccess') {
-                    this.write('<h1>403 - Forbidden</h1>', 403)
-                    this.finish()
-                    return
-                }
+                    if (this.app.opts.optCustom403) {
+                        this.fs.getByPath(this.app.opts.optCustom403location, (file) => {
+                        if (! file.error) {
+                            file.file( function(filee) {
+                                var reader = new FileReader();
+                                reader.onload = function(e){
+                                    this.useDefaultMime = false
+                                    var data = e.target.result
+                                    this.setHeader('content-type','text/html; charset=utf-8')
+                                    this.write(data, 403)
+                                    this.finish()
+                                    this.useDefaultMime = true
+                                }.bind(this)
+                                reader.readAsText(filee)
+                            }.bind(this))
+                        } else {
+                            this.write('Path of 403 html was not found - 403 path is set to: '+this.app.opts.optCustom403location, 500)
+                            this.finish()
+                        }})
+                    } else {
+                        this.write('<h1>403 - Forbidden</h1>', 403)
+                        this.finish()
+                        return
+                }}
                 
                 if (this.entry && this.entry.isDirectory && ! this.request.origpath.endsWith('/')) {
                     var newloc = this.request.origpath + '/'
@@ -520,27 +540,71 @@
                                     }
                                 }
                                 if (! validAuth) {
-                                    this.useDefaultMime = false
-                                    this.setHeader('content-type','text/html; charset=utf-8')
-                                    this.setHeader("WWW-Authenticate", "Basic")
-                                    this.write("<h1>401 - Unauthorized</h1>", 401)
-                                    this.finish()
-                                    return
-                                    this.useDefaultMime = true
+                                    if (this.app.opts.optCustom401) {
+                                        this.fs.getByPath(this.app.opts.optCustom401location, (file) => {
+                                        if (! file.error) {
+                                            file.file( function(filee) {
+                                                var reader = new FileReader();
+                                                reader.onload = function(e){
+                                                    this.useDefaultMime = false
+                                                    var data = e.target.result
+                                                    this.setHeader('content-type','text/html; charset=utf-8')
+                                                    this.setHeader("WWW-Authenticate", "Basic")
+                                                    this.write(data, 401)
+                                                    this.finish()
+                                                    this.useDefaultMime = true
+                                                }.bind(this)
+                                                reader.readAsText(filee)
+                                            }.bind(this))
+                                        } else {
+                                            this.write('Path of 401 html was not found - 401 path is set to: '+this.app.opts.optCustom401location, 500)
+                                            this.finish()
+                                        }})
+                                    } else {
+                                        this.useDefaultMime = false
+                                        this.setHeader('content-type','text/html; charset=utf-8')
+                                        this.setHeader("WWW-Authenticate", "Basic")
+                                        this.write("<h1>401 - Unauthorized</h1>", 401)
+                                        this.finish()
+                                        return
+                                        this.useDefaultMime = true
+                                    }
                                 }
                                 if (validAuth) {
                                     excludedothtmlcheck.bind(this)()
                                 }
                             } else if (data.type == 403) {
                                 var method = this.request.headers['sec-fetch-dest']
-                                console.log(method)
+                                //console.log(method)
                                 var name = this.request.path
                                 var extension = name.split('.').pop();
-                                console.log(extension)
+                                //console.log(extension)
                                 if (method == "document") {
                                     if (extension != 'html' && extension != 'htm' && ! this.request.origpath.endsWith('/') && this.request.path != '') {
-                                        this.write('<h1>403 - Forbidden</h1>')
-                                        this.finish()
+                                        if (this.app.opts.optCustom403) {
+                                            this.fs.getByPath(this.app.opts.optCustom403location, (file) => {
+                                            if (! file.error) {
+                                                file.file( function(filee) {
+                                                    var reader = new FileReader();
+                                                    reader.onload = function(e){
+                                                        this.useDefaultMime = false
+                                                        var data = e.target.result
+                                                        this.setHeader('content-type','text/html; charset=utf-8')
+                                                        this.write(data, 403)
+                                                        this.finish()
+                                                        this.useDefaultMime = true
+                                                    }.bind(this)
+                                                    reader.readAsText(filee)
+                                                }.bind(this))
+                                            } else {
+                                                this.write('Path of 403 html was not found - 403 path is set to: '+this.app.opts.optCustom403location, 500)
+                                                this.finish()
+                                            }})
+                                        } else {
+                                            this.write('<h1>403 - Forbidden</h1>', 403)
+                                            this.finish()
+                                            return
+                                    }
                                     } else {
                                         excludedothtmlcheck.bind(this)()
                                     }
@@ -648,11 +712,6 @@
                         this.responseLength = this.file.size
                         this.writeHeaders(200)
                     }
-                    
-                    
-
-
-
                 } else {
                     //console.log(entry,file)
                     var fr = new FileReader
diff --git a/react-ui/js/index.js b/react-ui/js/index.js
index 230d01cd..fb65622e 100644
--- a/react-ui/js/index.js
+++ b/react-ui/js/index.js
@@ -91,6 +91,14 @@ const functions = {
     console.assert(typeof val === 'string')
     app.webapp.updateOption('optCustom404location', val);
   },
+  optCustom403location: (app, k, val) => {
+    console.assert(typeof val === 'string')
+    app.webapp.updateOption('optCustom403location', val);
+  },
+  optCustom401location: (app, k, val) => {
+    console.assert(typeof val === 'string')
+    app.webapp.updateOption('optCustom401location', val);
+  },
   optCustom404usevarvar: (app, k, val) => {
     console.assert(typeof val === 'string')
     app.webapp.updateOption('optCustom404usevarvar', val);
@@ -255,15 +263,27 @@ class App extends React.Component {
   }
   render() {
     // option: [dependencies]
-    const optDisplay = {
-      optBackground: null,
-      optAutoStart: ['optBackground'],
-      optAllInterfaces: null,
-      optDoPortMapping: ['optAllInterfaces'],
+    const backgroundMain = {
+      optBackground: null
+    };
+    const backgroundOptions = {
+      optAutoStart: ['optBackground']
+    };
+    const availabilityMain = {
+      optAllInterfaces: null
+    };
+    const availabilityOptions = {
+      optDoPortMapping: ['optAllInterfaces']
+    };
+    const optIndexMain = {
       optPreventSleep: null,
-      optRenderIndex: null,
-      optDir404: ['optRenderIndex'],
-      port: null,
+      optRenderIndex: null
+    };
+    const optIndexOptions = {
+      optDir404: ['optRenderIndex']
+    };
+    const optPortOption = {
+      port: null
     };
     const optAdvanced = {
       optCORS: null,
@@ -279,11 +299,23 @@ class App extends React.Component {
     };
     const optCustom404Info = {
       optCustom404location: ['optCustom404'],
-      optCustom404usevar: ['optCustom404'],
+      optCustom404usevar: ['optCustom404']
     };
     const optCustom404InfoPt2 = {
       optCustom404usevarvar: ['optCustom404','optCustom404usevar']
     };
+    const optCustom403Main = {
+      optCustom403: null
+    };
+    const optCustom403Info = {
+      optCustom403location: ['optCustom403']
+    };
+    const optCustom401Main = {
+      optCustom401: null
+    };
+    const optCustom401Info = {
+      optCustom401location: ['optCustom401']
+    };
     const optHtaccess = {
       optScanForHtaccess: null
     };
@@ -321,7 +353,6 @@ class App extends React.Component {
       return options;
     }
 
-    const options = renderOpts(optDisplay)
     const advOptions = renderOpts(optAdvanced)
     const advancedButton = (<div><a href="#" onClick={e => {
       e.preventDefault();
@@ -330,37 +361,68 @@ class App extends React.Component {
     >{this.state.showAdvanced ? 'Hide Advanced Options' : 'Show Advanced Options'}</a></div>)
 
     const Custom404Main = renderOpts(optCustom404Main)
-
     const HtaccessMain = renderOpts(optHtaccess)
+    const rewriteMain = renderOpts(optRewrite)
+    const httpsMain = renderOpts(optHttps)
+    const Portoption = renderOpts(optPortOption)
+    const IndexMain = renderOpts(optIndexMain)
+    const AvailabilityMain = renderOpts(availabilityMain)
+    const BackgroundMain = renderOpts(backgroundMain)
 
     const HtaccessInfo = (() => {
-      let disable = (!this.webapp || !this.webapp.opts.optScanForHtaccess);
-      return [(<div style={{paddingLeft: 20}}>{!disable}
-        {!disable && <Alert severity="info">For more info on how to use wsc.htaccess files, go <a href="https://github.com/ethanaobrien/web-server-chrome/tree/master/htaccess#readme" target="_blank">here</a></Alert>}
+      let disablezero = (!this.webapp || !this.webapp.opts.optScanForHtaccess);
+      return [(<div style={{paddingLeft: 20}}>{!disablezero}
+        {!disablezero && <Alert severity="info">For more info on how to use wsc.htaccess files, go <a href="https://github.com/ethanaobrien/web-server-chrome/tree/master/htaccess#readme" target="_blank">here</a></Alert>}
 	  </div>)];
     })();
 
-    const Custom404Options = (() => {
-      let disabletwo = (!this.webapp || !this.webapp.opts.optCustom404);
-      const textboxestwo = renderOpts(optCustom404Info)
+    const Custom403Options = (() => {
+      let disableone = (!this.webapp || !this.webapp.opts.optCustom403);
+      const textboxesone = renderOpts(optCustom403Info)
+      return [(<div>{!disableone && textboxesone}</div>)];
+    })();
+
+    const Custom401Options = (() => {
+      let disabletwo = (!this.webapp || !this.webapp.opts.optCustom401);
+      const textboxestwo = renderOpts(optCustom401Info)
       return [(<div>{!disabletwo && textboxestwo}</div>)];
     })();
 
-    const Custom404OptionsPt2 = (() => {
-      let disablethree = (!this.webapp || !this.webapp.opts.optCustom404 || !this.webapp.opts.optCustom404usevar);
-      const textboxesthree = renderOpts(optCustom404InfoPt2)
+    const Custom404Options = (() => {
+      let disablethree = (!this.webapp || !this.webapp.opts.optCustom404);
+      const textboxesthree = renderOpts(optCustom404Info)
       return [(<div>{!disablethree && textboxesthree}</div>)];
     })();
 
-    const rewriteMain = renderOpts(optRewrite)
+    const Custom404OptionsPt2 = (() => {
+      let disablefour = (!this.webapp || !this.webapp.opts.optCustom404 || !this.webapp.opts.optCustom404usevar);
+      const textboxesfour = renderOpts(optCustom404InfoPt2)
+      return [(<div>{!disablefour && textboxesfour}</div>)];
+    })();
 
     const rewriteOptions = (() => {
-      let disableone = (!this.webapp || !this.webapp.opts.optModRewriteEnable);
-      const textboxesone = renderOpts(optRewriteInfo)
-      return [(<div>{!disableone && textboxesone}</div>)];
+      let disablefive = (!this.webapp || !this.webapp.opts.optModRewriteEnable);
+      const textboxefive = renderOpts(optRewriteInfo)
+      return [(<div>{!disablefive && textboxefive}</div>)];
     })();
 
-    const httpsMain = renderOpts(optHttps)
+    const IndexOptions = (() => {
+      let disablesix = (!this.webapp || !this.webapp.opts.optRenderIndex);
+      const textboxessix = renderOpts(optIndexOptions)
+      return [(<div>{!disablesix && textboxessix}</div>)];
+    })();
+
+    const AvailabilityOptions = (() => {
+      let disableseven = (!this.webapp || !this.webapp.opts.optAllInterfaces);
+      const textboxesseven = renderOpts(availabilityOptions)
+      return [(<div>{!disableseven && textboxesseven}</div>)];
+    })();
+
+    const BackgroundOptions = (() => {
+      let disableeight = (!this.webapp || !this.webapp.opts.optBackground);
+      const textboxeseight = renderOpts(backgroundOptions)
+      return [(<div>{!disableeight && textboxeseight}</div>)];
+    })();
 
     const httpsOptions = (() => {
       let disable = (!this.webapp || !this.webapp.opts.optUseHttps);
@@ -435,10 +497,10 @@ class App extends React.Component {
             <span>Options (may require restart)</span>
           </Tooltip>
           
-          {options}
+          {BackgroundMain}{BackgroundOptions}{AvailabilityMain}{AvailabilityOptions}{IndexMain}{IndexOptions}{Portoption}
 
           {advancedButton}
-          {state.showAdvanced && <div>{advOptions}{Custom404Main}{Custom404Options}{Custom404OptionsPt2}{HtaccessMain}{HtaccessInfo}{rewriteMain}{rewriteOptions}{httpsMain}{httpsOptions}</div> }
+          {state.showAdvanced && <div>{advOptions}{Custom401Main}{Custom401Options}{Custom403Main}{Custom403Options}{Custom404Main}{Custom404Options}{Custom404OptionsPt2}{HtaccessMain}{HtaccessInfo}{rewriteMain}{rewriteOptions}{httpsMain}{httpsOptions}</div> }
         </CardContent>
       </Card>
 
diff --git a/react-ui/js/options.js b/react-ui/js/options.js
index f57c8fc3..2d6f8a1b 100644
--- a/react-ui/js/options.js
+++ b/react-ui/js/options.js
@@ -200,6 +200,30 @@ const options = {
     type: String,
     default: 'locationoflostuser'
   },
+  optCustom403: {
+    label: 'Custom 403 page',
+    help: 'Custom 403 page',
+    type: Boolean,
+    default: false
+  },
+  optCustom403location: {
+    label: 'Location of 403 page',
+    help: 'Where is the 403 html page',
+    type: String,
+    default: '/403.html'
+  },
+  optCustom401: {
+    label: 'Custom 401 page',
+    help: 'Custom 401 page',
+    type: Boolean,
+    default: false
+  },
+  optCustom401location: {
+    label: 'Location of 401 page',
+    help: 'Where is the 401 html page',
+    type: String,
+    default: '/401.html'
+  },
   optUpload: {
     label: 'Allow File upload',
     help: 'The files directory listing allows drag-and-drop to upload small files',

From e93589fa0aa0af246053cf485c9be373df7f85c1 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Fri, 7 May 2021 19:02:38 +0100
Subject: [PATCH 073/154] Critical UI Bug Fix

---
 react-ui/js/index.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/react-ui/js/index.js b/react-ui/js/index.js
index fb65622e..cb0caadb 100644
--- a/react-ui/js/index.js
+++ b/react-ui/js/index.js
@@ -263,16 +263,16 @@ class App extends React.Component {
   }
   render() {
     // option: [dependencies]
-    const backgroundMain = {
+    const optbackgroundMain = {
       optBackground: null
     };
-    const backgroundOptions = {
+    const optbackgroundOptions = {
       optAutoStart: ['optBackground']
     };
-    const availabilityMain = {
+    const optavailabilityMain = {
       optAllInterfaces: null
     };
-    const availabilityOptions = {
+    const optavailabilityOptions = {
       optDoPortMapping: ['optAllInterfaces']
     };
     const optIndexMain = {
@@ -366,9 +366,11 @@ class App extends React.Component {
     const httpsMain = renderOpts(optHttps)
     const Portoption = renderOpts(optPortOption)
     const IndexMain = renderOpts(optIndexMain)
-    const AvailabilityMain = renderOpts(availabilityMain)
-    const BackgroundMain = renderOpts(backgroundMain)
-
+    const AvailabilityMain = renderOpts(optavailabilityMain)
+    const BackgroundMain = renderOpts(optbackgroundMain)
+    const Custom401Main = renderOpts(optCustom401Main)
+    const Custom403Main = renderOpts(optCustom403Main)
+    
     const HtaccessInfo = (() => {
       let disablezero = (!this.webapp || !this.webapp.opts.optScanForHtaccess);
       return [(<div style={{paddingLeft: 20}}>{!disablezero}
@@ -414,13 +416,13 @@ class App extends React.Component {
 
     const AvailabilityOptions = (() => {
       let disableseven = (!this.webapp || !this.webapp.opts.optAllInterfaces);
-      const textboxesseven = renderOpts(availabilityOptions)
+      const textboxesseven = renderOpts(optavailabilityOptions)
       return [(<div>{!disableseven && textboxesseven}</div>)];
     })();
 
     const BackgroundOptions = (() => {
       let disableeight = (!this.webapp || !this.webapp.opts.optBackground);
-      const textboxeseight = renderOpts(backgroundOptions)
+      const textboxeseight = renderOpts(optbackgroundOptions)
       return [(<div>{!disableeight && textboxeseight}</div>)];
     })();
 

From 349c163df6af88b62d59d4c04cce3f30371ee275 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Fri, 7 May 2021 19:53:22 +0100
Subject: [PATCH 074/154] Fix 401 index.html bug

---
 handlers.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/handlers.js b/handlers.js
index 6c65886a..538f78cb 100644
--- a/handlers.js
+++ b/handlers.js
@@ -519,7 +519,11 @@
                             }
                             //console.log(data)
                             var filerequest = this.request.path
+                            if (entry.isDirectory) {
+                                var filerequest = filerequested+'/'
+                            }
                             var filerequested = filerequest.split('/').pop();
+                            //console.log(filerequested)
                             if (filerequested == 'index.html' || filerequested == 'index' || filerequested == 'index.htm') {
                                 var filerequested = ''
                             }

From 6ccfa6703e003a6a9409068a4b873a3666de842c Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Tue, 11 May 2021 10:23:52 -0500
Subject: [PATCH 075/154] Add Additional Info

---
 htaccess/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htaccess/README.md b/htaccess/README.md
index 941b2080..af94d88c 100644
--- a/htaccess/README.md
+++ b/htaccess/README.md
@@ -11,7 +11,7 @@
 <p>302 - Found. Tells the server that when chosen file is requested to move to a different directory or file. Not cached by the browser</p>
 <p>307 - Temporary Redirect. Tells the server that when chosen file is requested to move to a different directory or file. Not cached by the browser.</p>
 <p>401 - Unauthorized. The page will require login. For some reason, I cannot find how to clear the cache of the authorization header, which means that once you type it in, the browser will not ask for a login, unless you have multiple password protected pages with different passwords, The authentication header will change whenever you enter a different password.</p>
-<p>403 - Forbidden. This will deny direct access to image/video/audio files. This option only works if https is enabled</p>
+<p>403 - Forbidden. This will deny direct access to image/video/audio files. This option only works if https is enabled or if the user is on a localhost address.</p>
 <p>If you want more features - Make an issue!</p>
 <br>
 <h1>Making the file</h1>

From 47f1df58cc9536cea9bdd30fe3c82db6c587d163 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 13 May 2021 10:39:49 -0500
Subject: [PATCH 076/154] Fix console.assert error with no .html option

---
 handlers.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/handlers.js b/handlers.js
index 538f78cb..83db649a 100644
--- a/handlers.js
+++ b/handlers.js
@@ -179,6 +179,7 @@
                 if (extension == 'html') {
                     var path = this.request.path
                     var newpath = path.substring(0, path.length - 5);
+                    this.responseLength = 0
                     this.setHeader('location', newpath)
                     this.writeHeaders(307)
                     this.finish()
@@ -530,6 +531,7 @@
                             if (data.request_path == filerequested || data.request_path == 'all files') {
                                 if (data.type == 301 || data.type == 302 || data.type == 307) {
                                         this.setHeader('location', data.redirto)
+                                        this.responseLength = 0
                                         this.writeHeaders(data.type)
                                         this.finish()
                             } else if (data.type == 401) {

From 484f6f1b1d4f78a37435fd581e7c1cc18a5e00fd Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 13 May 2021 10:48:42 -0500
Subject: [PATCH 077/154] How could I forget this

---
 handlers.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/handlers.js b/handlers.js
index 83db649a..83a39c31 100644
--- a/handlers.js
+++ b/handlers.js
@@ -183,6 +183,7 @@
                     this.setHeader('location', newpath)
                     this.writeHeaders(307)
                     this.finish()
+                    return
                 }
             }
 

From 431bc5354e508fd4ea3ccf536cf9cde762ed013b Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Fri, 14 May 2021 12:21:19 -0500
Subject: [PATCH 078/154] Added htaccess security features

---
 handlers.js            | 25 -------------------------
 htaccess/README.md     |  7 +++++++
 react-ui/js/index.js   |  8 +++++++-
 react-ui/js/options.js | 18 ++++++++++++++++++
 webapp.js              | 40 +++++++++++++++++++++++++++++++++++++++-
 5 files changed, 71 insertions(+), 27 deletions(-)

diff --git a/handlers.js b/handlers.js
index 83a39c31..077c625e 100644
--- a/handlers.js
+++ b/handlers.js
@@ -257,31 +257,6 @@
 
             function onEntryMain() {
                 this.useDefaultMime = true
-                if (entry.name == 'wsc.htaccess') {
-                    if (this.app.opts.optCustom403) {
-                        this.fs.getByPath(this.app.opts.optCustom403location, (file) => {
-                        if (! file.error) {
-                            file.file( function(filee) {
-                                var reader = new FileReader();
-                                reader.onload = function(e){
-                                    this.useDefaultMime = false
-                                    var data = e.target.result
-                                    this.setHeader('content-type','text/html; charset=utf-8')
-                                    this.write(data, 403)
-                                    this.finish()
-                                    this.useDefaultMime = true
-                                }.bind(this)
-                                reader.readAsText(filee)
-                            }.bind(this))
-                        } else {
-                            this.write('Path of 403 html was not found - 403 path is set to: '+this.app.opts.optCustom403location, 500)
-                            this.finish()
-                        }})
-                    } else {
-                        this.write('<h1>403 - Forbidden</h1>', 403)
-                        this.finish()
-                        return
-                }}
                 
                 if (this.entry && this.entry.isDirectory && ! this.request.origpath.endsWith('/')) {
                     var newloc = this.request.origpath + '/'
diff --git a/htaccess/README.md b/htaccess/README.md
index af94d88c..9579c368 100644
--- a/htaccess/README.md
+++ b/htaccess/README.md
@@ -14,6 +14,13 @@
 <p>403 - Forbidden. This will deny direct access to image/video/audio files. This option only works if https is enabled or if the user is on a localhost address.</p>
 <p>If you want more features - Make an issue!</p>
 <br>
+<h1>Extra Features</h1>
+<p>You can now control the amount of access the user has.</p>
+<p>You can now allow/deny the user the option to view (GET request) wsc.htaccess files</p>
+<p>You can now allow/deny uploading (PUT request) wsc.htaccess files (Helpful for when making something like a file hosting, the only question with doing that is why are you using a web server as simple as this)</p>
+<p>You can now allow/deny deleting (DELETE request) wsc.htaccess files (Why you would enable this - I dont know)</p>
+<p>FOR MAXIMUM SECURITY - IT IS RECOMMENDED TO LEAVE THESE ALL TURNED OFF!!</p>
+<p>Custom 400 (Bad Request) page not supported</p>
 <h1>Making the file</h1>
 <p>A wsc.htaccess file is actually a json string, which means one problem with the file will cause it not to work - So be careful. No additional info can be put into the file</p>
 <p>Note - If you are trying to redirect to some index.html file and you have the option to automatically show index.html turned on, your path will go from '/somepath/index.html' to '/somepath/'</p>
diff --git a/react-ui/js/index.js b/react-ui/js/index.js
index cb0caadb..ea6410b3 100644
--- a/react-ui/js/index.js
+++ b/react-ui/js/index.js
@@ -319,6 +319,11 @@ class App extends React.Component {
     const optHtaccess = {
       optScanForHtaccess: null
     };
+    const optHtaccessOptions = {
+      optGETHtaccess: ['optScanForHtaccess'],
+      optPUTPOSTHtaccess: ['optScanForHtaccess'],
+      optDELETEHtaccess: ['optScanForHtaccess']
+    };
     const optRewrite = {
       optModRewriteEnable: null
     };
@@ -373,7 +378,8 @@ class App extends React.Component {
     
     const HtaccessInfo = (() => {
       let disablezero = (!this.webapp || !this.webapp.opts.optScanForHtaccess);
-      return [(<div style={{paddingLeft: 20}}>{!disablezero}
+      const htaccesstextbox = renderOpts(optHtaccessOptions)
+      return [(<div style={{paddingLeft: 20}}>{!disablezero && htaccesstextbox}
         {!disablezero && <Alert severity="info">For more info on how to use wsc.htaccess files, go <a href="https://github.com/ethanaobrien/web-server-chrome/tree/master/htaccess#readme" target="_blank">here</a></Alert>}
 	  </div>)];
     })();
diff --git a/react-ui/js/options.js b/react-ui/js/options.js
index 2d6f8a1b..edb5b939 100644
--- a/react-ui/js/options.js
+++ b/react-ui/js/options.js
@@ -272,6 +272,24 @@ const options = {
     type: Boolean,
     default: false
   },
+  optGETHtaccess: {
+    label: 'Allow GET request for htaccess files',
+    help: 'will allow the user to request and view htaccess files',
+    type: Boolean,
+    default: false
+  },
+  optPUTPOSTHtaccess: {
+    label: 'Allow PUT/POST requests for htaccess files',
+    help: 'Will allow user to upload wsc.htaccess files',
+    type: Boolean,
+    default: false
+  },
+  optDELETEHtaccess: {
+    label: 'Allow Delete request for htaccess files',
+    help: 'Will allow user to delete htaccess files',
+    type: Boolean,
+    default: false
+  },
   optUseHttps: {
     label: 'Use https://',
     help: 'Serve pages through https://',
diff --git a/webapp.js b/webapp.js
index c5f6ca43..6ffe8d8d 100644
--- a/webapp.js
+++ b/webapp.js
@@ -499,6 +499,44 @@
         onRequest: function(stream, connection, request) {
             console.log('Request',request.method, request.uri)
 
+            //console.log(request)
+            var filename = request.path.split('/').pop()
+            if (filename == 'wsc.htaccess') {
+                if (request.method == 'GET' && this.opts.optGETHtaccess == false) {
+                    var handler = new WSC.BaseHandler(request)
+                    handler.app = this
+                    handler.request = request
+                    handler.write('<h1>400 - Bad Request</h1>', 400)
+                    handler.finish()
+                    return
+                }
+                if (request.method == 'PUT' && this.opts.optPUTPOSTHtaccess == false) {
+                    var handler = new WSC.BaseHandler(request)
+                    handler.app = this
+                    handler.request = request
+                    handler.write('<h1>400 - Bad Request</h1>', 400)
+                    handler.finish()
+                    return
+                }
+                if (request.method == 'POST' && this.opts.optPUTPOSTHtaccess == false) {
+                    var handler = new WSC.BaseHandler(request)
+                    handler.app = this
+                    handler.request = request
+                    handler.write('<h1>400 - Bad Request</h1>', 400)
+                    handler.finish()
+                    return
+                }
+                if (request.method == 'DELETE' && this.opts.optPUTPOSTHtaccess == false) {
+                    var handler = new WSC.BaseHandler(request)
+                    handler.app = this
+                    handler.request = request
+                    handler.write('<h1>400 - Bad Request</h1>', 400)
+                    handler.finish()
+                    return
+                }
+            }
+
+
             if (this.opts.auth) {
                 var validAuth = false
                 var auth = request.headers['authorization']
@@ -600,7 +638,7 @@
         },
         setCORS: function() {
             this.setHeader('access-control-allow-origin','*')
-            this.setHeader('access-control-allow-methods','GET, POST, PUT')
+            this.setHeader('access-control-allow-methods','GET, POST, PUT, DELETE')
             this.setHeader('access-control-max-age','120')
         },
         get_argument: function(key,def) {

From 844507db1e899b91a3bf72192404333fe3ce58eb Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Sat, 15 May 2021 22:33:05 -0500
Subject: [PATCH 079/154] More Htaccess Features, Added better handling for no
 .html when htaccess being used

---
 handlers.js        | 291 ++++++++++++++++++++++++++++++---------------
 htaccess/README.md | 106 ++++++++++++-----
 2 files changed, 268 insertions(+), 129 deletions(-)

diff --git a/handlers.js b/handlers.js
index 077c625e..0b157b60 100644
--- a/handlers.js
+++ b/handlers.js
@@ -454,6 +454,10 @@
             if (this.app.opts.optExcludeDotHtml && this.request.path != '') {
                 this.fs.getByPath(this.request.path+'.html', (file) => {
                 if (! file.error) {
+                    if (this.request.origpath.endsWith("/")) {
+                        onEntryMain.bind(this)()
+                        return
+                    }
                     this.renderFileContents(file)
                     //console.log('file found')
                     this.setHeader('content-type','text/html; charset=utf-8')
@@ -467,18 +471,15 @@
         }
         
             if (this.app.opts.optScanForHtaccess) {
-                var fullrequestpath = this.request.path
-                if (entry.isDirectory) {
-                    var finalpath = fullrequestpath+'/'
-                } else {
+                var fullrequestpath = this.request.origpath
                     var finapath = fullrequestpath
                     var finpath = finapath.split('/').pop();
                     var finalpath = fullrequestpath.substring(0, fullrequestpath.length - finpath.length);
-                }
                 if (this.request.path == '') {
                     var finalpath = '/'
                 }
                 var htaccesspath = finalpath+'wsc.htaccess'
+                //console.log(htaccesspath)
                 this.fs.getByPath(htaccesspath, (file) => {
                 if (! file.error) {
                     file.file( function(filee) {
@@ -487,117 +488,213 @@
                             var dataa = e.target.result
                             if(true) {
                                 try {
-                                    var data = JSON.parse(dataa)
+                                    var origdata = JSON.parse(dataa)
                                 } catch(e) {
                                     this.write('wsc.htaccess file found, but it is not a valid json string', 500)
                                     this.finish()
                                     return
                                 }
                             }
-                            //console.log(data)
-                            var filerequest = this.request.path
-                            if (entry.isDirectory) {
-                                var filerequest = filerequested+'/'
-                            }
-                            var filerequested = filerequest.split('/').pop();
-                            //console.log(filerequested)
-                            if (filerequested == 'index.html' || filerequested == 'index' || filerequested == 'index.htm') {
-                                var filerequested = ''
-                            }
-                            if (data.request_path == filerequested || data.request_path == 'all files') {
-                                if (data.type == 301 || data.type == 302 || data.type == 307) {
-                                        this.setHeader('location', data.redirto)
-                                        this.responseLength = 0
-                                        this.writeHeaders(data.type)
-                                        this.finish()
-                            } else if (data.type == 401) {
-                                var validAuth = false
-                                var auth = this.request.headers['authorization']
-                                if (auth) {
-                                    if (auth.slice(0,6).toLowerCase() == 'basic ') {
-                                        var userpass = atob(auth.slice(6,auth.length)).split(':')
-                                        if (userpass[0] == data.username && userpass[1] == data.password) {
-                                            validAuth = true
-                                        }
+                            
+                            
+                            function htaccessMain(filerequested) {
+                                var filefound = false
+                                for (var i=0; i<origdata.length; i++) {
+                                    if (origdata[i].request_path == filerequested || 
+                                        origdata[i].request_path == 'all files' || 
+                                        (origdata[i].type == 'directory listing' && filerequested == '')) {
+                                        var data = origdata[i]
+                                        //console.log(data)
+                                        var filefound = true
+                                        break
                                     }
                                 }
-                                if (! validAuth) {
-                                    if (this.app.opts.optCustom401) {
-                                        this.fs.getByPath(this.app.opts.optCustom401location, (file) => {
-                                        if (! file.error) {
-                                            file.file( function(filee) {
-                                                var reader = new FileReader();
-                                                reader.onload = function(e){
-                                                    this.useDefaultMime = false
-                                                    var data = e.target.result
-                                                    this.setHeader('content-type','text/html; charset=utf-8')
-                                                    this.setHeader("WWW-Authenticate", "Basic")
-                                                    this.write(data, 401)
-                                                    this.finish()
-                                                    this.useDefaultMime = true
-                                                }.bind(this)
-                                                reader.readAsText(filee)
-                                            }.bind(this))
-                                        } else {
-                                            this.write('Path of 401 html was not found - 401 path is set to: '+this.app.opts.optCustom401location, 500)
+                                //console.log(filefound)
+                                if (filefound) {
+                                    if (data.request_path == filerequested || 
+                                        data.request_path == 'all files' || 
+                                        data.type == 'directory listing') {
+                                        if (data.type == 301 || data.type == 302 || data.type == 307) {
+                                            this.setHeader('location', data.redirto)
+                                            this.responseLength = 0
+                                            this.writeHeaders(data.type)
                                             this.finish()
-                                        }})
-                                    } else {
-                                        this.useDefaultMime = false
-                                        this.setHeader('content-type','text/html; charset=utf-8')
-                                        this.setHeader("WWW-Authenticate", "Basic")
-                                        this.write("<h1>401 - Unauthorized</h1>", 401)
-                                        this.finish()
-                                        return
-                                        this.useDefaultMime = true
-                                    }
-                                }
-                                if (validAuth) {
-                                    excludedothtmlcheck.bind(this)()
-                                }
-                            } else if (data.type == 403) {
-                                var method = this.request.headers['sec-fetch-dest']
-                                //console.log(method)
-                                var name = this.request.path
-                                var extension = name.split('.').pop();
-                                //console.log(extension)
-                                if (method == "document") {
-                                    if (extension != 'html' && extension != 'htm' && ! this.request.origpath.endsWith('/') && this.request.path != '') {
-                                        if (this.app.opts.optCustom403) {
-                                            this.fs.getByPath(this.app.opts.optCustom403location, (file) => {
-                                            if (! file.error) {
-                                                file.file( function(filee) {
-                                                    var reader = new FileReader();
-                                                    reader.onload = function(e){
-                                                        this.useDefaultMime = false
-                                                        var data = e.target.result
-                                                        this.setHeader('content-type','text/html; charset=utf-8')
-                                                        this.write(data, 403)
-                                                        this.finish()
-                                                        this.useDefaultMime = true
-                                                    }.bind(this)
-                                                    reader.readAsText(filee)
-                                                }.bind(this))
+                                    } else if (data.type == 401) {
+                                        var validAuth = false
+                                        var auth = this.request.headers['authorization']
+                                        if (auth) {
+                                            if (auth.slice(0,6).toLowerCase() == 'basic ') {
+                                                var userpass = atob(auth.slice(6,auth.length)).split(':')
+                                                if (userpass[0] == data.username && userpass[1] == data.password) {
+                                                    validAuth = true
+                                                }
+                                            }
+                                        }
+                                        if (! validAuth) {
+                                            if (this.app.opts.optCustom401) {
+                                                this.fs.getByPath(this.app.opts.optCustom401location, (file) => {
+                                                if (! file.error) {
+                                                    file.file( function(filee) {
+                                                        var reader = new FileReader();
+                                                        reader.onload = function(e){
+                                                            this.useDefaultMime = false
+                                                            var data = e.target.result
+                                                            this.setHeader('content-type','text/html; charset=utf-8')
+                                                            this.setHeader("WWW-Authenticate", "Basic")
+                                                            this.write(data, 401)
+                                                            this.finish()
+                                                            this.useDefaultMime = true
+                                                        }.bind(this)
+                                                        reader.readAsText(filee)
+                                                    }.bind(this))
+                                                } else {
+                                                    this.write('Path of 401 html was not found - 401 path is set to: '+this.app.opts.optCustom401location, 500)
+                                                    this.finish()
+                                                }})
                                             } else {
-                                                this.write('Path of 403 html was not found - 403 path is set to: '+this.app.opts.optCustom403location, 500)
+                                                this.useDefaultMime = false
+                                                this.setHeader('content-type','text/html; charset=utf-8')
+                                                this.setHeader("WWW-Authenticate", "Basic")
+                                                this.write("<h1>401 - Unauthorized</h1>", 401)
                                                 this.finish()
-                                            }})
+                                                return
+                                                this.useDefaultMime = true
+                                            }
+                                        }
+                                        if (validAuth) {
+                                            excludedothtmlcheck.bind(this)()
+                                        }
+                                    } else if (data.type == 403) {
+                                        var method = this.request.headers['sec-fetch-dest']
+                                        //console.log(method)
+                                        var name = this.request.path
+                                        var extension = name.split('.').pop();
+                                        //console.log(extension)
+                                        if (method == "document") {
+                                            if (extension != 'html' && extension != 'htm' && ! this.request.origpath.endsWith('/') && this.request.path != '') {
+                                                if (this.app.opts.optCustom403) {
+                                                    this.fs.getByPath(this.app.opts.optCustom403location, (file) => {
+                                                    if (! file.error) {
+                                                        file.file( function(filee) {
+                                                            var reader = new FileReader();
+                                                            reader.onload = function(e){
+                                                                this.useDefaultMime = false
+                                                                var data = e.target.result
+                                                                this.setHeader('content-type','text/html; charset=utf-8')
+                                                                this.write(data, 403)
+                                                                this.finish()
+                                                                this.useDefaultMime = true
+                                                            }.bind(this)
+                                                            reader.readAsText(filee)
+                                                        }.bind(this))
+                                                    } else {
+                                                        this.write('Path of 403 html was not found - 403 path is set to: '+this.app.opts.optCustom403location, 500)
+                                                        this.finish()
+                                                    }})
+                                                } else {
+                                                    this.write('<h1>403 - Forbidden</h1>', 403)
+                                                    this.finish()
+                                                    return
+                                            }
+                                            } else {
+                                                excludedothtmlcheck.bind(this)()
+                                            }
                                         } else {
-                                            this.write('<h1>403 - Forbidden</h1>', 403)
-                                            this.finish()
-                                            return
-                                    }
+                                            excludedothtmlcheck.bind(this)()
+                                        }
+                                    } else if (data.type == 'directory listing') {
+                                        function finished(results) {
+                                            if (this.request.arguments && this.request.arguments.static == '1' ||
+                                                this.request.arguments.static == 'true' ||
+                                                this.app.opts.optStatic
+                                               ) {
+                                                this.renderDirectoryListing(results)
+                                                return
+                                                } else {
+                                                this.renderDirectoryListingTemplate(results)
+                                                return
+                                            }
+                                        }
+                                        var reader = entry.createReader()
+                                        var allresults = []
+
+                                        function onreaderr(evt) {
+                                            WSC.entryCache.unset(this.entry.filesystem.name + this.entry.fullPath)
+                                            console.error('error reading dir',evt)
+                                            this.request.connection.close()
+                                        }
+
+                                        function onreadsuccess(results) {
+                                            //console.log('onreadsuccess',results.length)
+                                            if (results.length == 0) {
+                                                finished.bind(this)(allresults)
+                                            } else {
+                                                allresults = allresults.concat( results )
+                                                reader.readEntries( onreadsuccess.bind(this),
+                                                                    onreaderr.bind(this) )
+                                            }
+                                        }
+
+                                        //console.log('readentries')
+                                        reader.readEntries( onreadsuccess.bind(this),
+                                                            onreaderr.bind(this))
+
+
                                     } else {
                                         excludedothtmlcheck.bind(this)()
+                                    }} else {
+                                        excludedothtmlcheck.bind(this)()
                                     }
                                 } else {
                                     excludedothtmlcheck.bind(this)()
                                 }
-                            } else {
-                                excludedothtmlcheck.bind(this)()
-                            }} else {
-                                excludedothtmlcheck.bind(this)()
+
                             }
+                            var filerequest = this.request.origpath
+                            
+                            if (this.app.opts.optExcludeDotHtml) {
+                                this.fs.getByPath(this.request.path+'.html', (file) => {
+                                if (! file.error) {
+                                    var filerequested = this.request.path+'.html'
+                                    var filerequested = filerequested.split('/').pop();
+                                    htaccessMain.bind(this)(filerequested)
+                                    return
+                                } else {
+                                    if (this.entry && this.entry.isDirectory && ! this.request.origpath.endsWith('/')) {
+                                        var newloc = this.request.origpath + '/'
+                                        this.setHeader('location', newloc)
+                                        this.responseLength = 0
+                                        this.writeHeaders(301)
+
+                                        this.finish()
+                                        return
+                                    }
+                                    var filerequested = filerequest.split('/').pop();
+                                    //console.log(filerequested)
+                                    if (filerequested == 'index.html' || filerequested == 'index.htm') {
+                                        var filerequested = ''
+                                    }
+                                    htaccessMain.bind(this)(filerequested)
+                                    }
+                                })} else {
+                                    if (this.entry && this.entry.isDirectory && ! this.request.origpath.endsWith('/')) {
+                                        var newloc = this.request.origpath + '/'
+                                        this.setHeader('location', newloc)
+                                        this.responseLength = 0
+                                        this.writeHeaders(301)
+
+                                        this.finish()
+                                        return
+                                    }
+                                    var filerequested = filerequest.split('/').pop();
+                                    //console.log(filerequested)
+                                    if (filerequested == 'index.html' || filerequested == 'index.htm') {
+                                        var filerequested = ''
+                                    }
+                                    htaccessMain.bind(this)(filerequested)
+                                    
+                                }
+                            
                         }.bind(this)
                         reader.readAsText(filee)
                     }.bind(this))
diff --git a/htaccess/README.md b/htaccess/README.md
index 9579c368..4976febb 100644
--- a/htaccess/README.md
+++ b/htaccess/README.md
@@ -3,7 +3,7 @@
 <br>
 <p>Why not just .htaccess?</p>
 <p>Chrome os does not allow you to name a file starting with a dot. This allows chrome os users to use this feature!</p>
-<p>Also, Web Server for Chrome DOES NOT have support for .htaccess files. Instead, we have wsc.htaccess files, which gets the same thing done (Not all features implimented).
+<p>Also, Web Server for Chrome DOES NOT have support for .htaccess files. Instead, we have wsc.htaccess files, which gets the same thing done (Not all features implimented).</p>
 <br><br>
 <h1>How to</h1>
 <h2>Currently supported</h2>
@@ -12,6 +12,7 @@
 <p>307 - Temporary Redirect. Tells the server that when chosen file is requested to move to a different directory or file. Not cached by the browser.</p>
 <p>401 - Unauthorized. The page will require login. For some reason, I cannot find how to clear the cache of the authorization header, which means that once you type it in, the browser will not ask for a login, unless you have multiple password protected pages with different passwords, The authentication header will change whenever you enter a different password.</p>
 <p>403 - Forbidden. This will deny direct access to image/video/audio files. This option only works if https is enabled or if the user is on a localhost address.</p>
+<p>Render Directory Listing - Ignores the value of 404 instead of directory listing and renders the directory listing</p>
 <p>If you want more features - Make an issue!</p>
 <br>
 <h1>Extra Features</h1>
@@ -22,67 +23,108 @@
 <p>FOR MAXIMUM SECURITY - IT IS RECOMMENDED TO LEAVE THESE ALL TURNED OFF!!</p>
 <p>Custom 400 (Bad Request) page not supported</p>
 <h1>Making the file</h1>
-<p>A wsc.htaccess file is actually a json string, which means one problem with the file will cause it not to work - So be careful. No additional info can be put into the file</p>
+<p>A wsc.htaccess file is actually a javascript array, which means one problem with the file will cause it not to work - So be careful. No additional info can be put into the file</p>
 <p>Note - If you are trying to redirect to some index.html file and you have the option to automatically show index.html turned on, your path will go from '/somepath/index.html' to '/somepath/'</p>
-<p>Note - If you are trying to redirect to some .html file and you have the option to remove .html extension turned on put the .html extension. The web server will handle the request and forward it to have no .html extension</p>
+<p>Note - If you are trying to redirect to some .html file and you have the option to remove .html extension turned on, leave the .html extension. The web server will handle the request and forward it to have no .html extension</p>
 
-Note - when selecting the file to scan, if the file is index.html and you have the option to automatically show index.html turned on, leave the path blank. It should look like this:  `"request_path": "",`.
+Note - when selecting the file to scan for, if the file is index.html and the file is `index.html` or `index.htm`, leave the path blank. It should look like this:  `"request_path": "",`. The web server will take care of the rest
 
 Note - There are security measures that when request_path = "" It will deny access to index.html, index (For no .html extension) and index.htm. Use `"request_path": "",`. if the file is index.html or index.htm - This will protect every way of access.
 
-Note - when selecting the file to scan, if the file is some .html and you have the option to remove the .html extension turned on, remove the .html from the file. It should go from:  `"request_path": "somehtml.html",` to: `"request_path": "somehtml",`.
+Note - when selecting the file to scan, if the file is some .html and you have the option to remove the .html extension turned on, leave the .html extension. The Web Server is programed to handle the request!
 
-Note - Currently, Only ONE ruleset can be set per directory, you can set all of the files or one of the files to obey this. To protect / redirect all files in a directory, change the value of `"request_path"` to `"all files"` to make `"request_path": "all files",`. Do not expect this to change. It would be overly complicated (and make the performance extremely slow) to use arrays and to find which one is what and I'ts just not going to happen.
+Note - To set more than 1 ruleset per file, see instruction at bottom of the page
 
-<p>Note - wsc.htaccess file MUST be in the same directory as the file you want to change. The file does not need to exist, as it overrides rendering the file</p>
+<p>Note - wsc.htaccess file MUST be in the same directory as the file you want to change. The file does need to exist, due to the way the web server works.</p>
 <p>IMPORTANT NOTE - EVERYTHING IN THE FILE (AND THE FILE NAME) IS CASE SENSITIVE!!</p>
 <br>
 <h2>301 Example</h2>
 
 ```
-{
-    "request_path": "name of file you want to modify",
-    "type": 301, 
-    "redirto": "/path/you/want/to/redirect/to"
-}
+[
+    {
+        "request_path": "name of file you want to modify",
+        "type": 301, 
+        "redirto": "/path/you/want/to/redirect/to"
+    }
+]
 ```
 <br>
 <h2>302 Example</h2>
 
 ```
-{
-    "request_path": "name of file you want to modify",
-    "type": 302, 
-    "redirto": "/path/you/want/to/redirect/to"
-}
+[
+    {
+        "request_path": "name of file you want to modify",
+        "type": 302, 
+        "redirto": "/path/you/want/to/redirect/to"
+    }
+]
 ```
 <br>
 <h2>307 Example</h2>
 
 ```
-{
-    "request_path": "name of file you want to modify",
-    "type": 307, 
-    "redirto": "/path/you/want/to/redirect/to"
-}
+[
+    {
+        "request_path": "name of file you want to modify",
+        "type": 307, 
+        "redirto": "/path/you/want/to/redirect/to"
+    }
+]
 ```
 <br>
 <h2>401 Example</h2>
 
 ```
-{
-    "request_path": "name of file you want to modify",
-    "type": 401,
-    "username": "test",
-    "password": "example"
-}
+[
+    {
+        "request_path": "name of file you want to modify",
+        "type": 401,
+        "username": "test",
+        "password": "example"
+    }
+]
 ```
 <br>
 <h2>403 Example</h2>
 
 ```
-{
-    "request_path": "name of file you want to modify",
-    "type": 403
-}
+[
+    {
+        "request_path": "name of file you want to modify",
+        "type": 403
+    }
+]
 ```
+<br>
+<h2>Directory Listing</h2>
+
+```
+[
+    {
+        "type": "directory listing"
+    }
+]
+```
+<br>
+<h1>How to use more than 1 ruleset per file</h1>
+<p>Pay VERY close attention to the syntax. One thing wrong will cause an error!!</p>
+<p>First, I provide an example</p>
+```
+[
+    {
+        "request_path": "oranges.html",
+        "type": 401,
+        "username": "Username",
+        "password": "Password"
+    },
+    {
+        "type": "directory listing"
+    }
+]
+```
+You basically have `[` and `]` surrounding the entire file and each ruleset inside `{` these `}`
+You MUST separate each ruleset with a comma (As shown in the example). The failure to do so will result in an error.
+For the last ruleset, no comma can be after the `}`. This will break the array and give you an error.
+Currently, each file can only have 1 ruleset.
\ No newline at end of file

From 2f164e3f1c5e0ea17dc944b9a97ce2479565fdd0 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Sat, 15 May 2021 22:43:24 -0500
Subject: [PATCH 080/154] Fixed code not displaying

---
 htaccess/README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htaccess/README.md b/htaccess/README.md
index 4976febb..fd3c8e42 100644
--- a/htaccess/README.md
+++ b/htaccess/README.md
@@ -35,6 +35,7 @@ Note - when selecting the file to scan, if the file is some .html and you have t
 
 Note - To set more than 1 ruleset per file, see instruction at bottom of the page
 
+Note - 401 (unauthorized) username and passwords are CASE SENSITIVE!!
 <p>Note - wsc.htaccess file MUST be in the same directory as the file you want to change. The file does need to exist, due to the way the web server works.</p>
 <p>IMPORTANT NOTE - EVERYTHING IN THE FILE (AND THE FILE NAME) IS CASE SENSITIVE!!</p>
 <br>
@@ -111,6 +112,7 @@ Note - To set more than 1 ruleset per file, see instruction at bottom of the pag
 <h1>How to use more than 1 ruleset per file</h1>
 <p>Pay VERY close attention to the syntax. One thing wrong will cause an error!!</p>
 <p>First, I provide an example</p>
+
 ```
 [
     {
@@ -124,7 +126,8 @@ Note - To set more than 1 ruleset per file, see instruction at bottom of the pag
     }
 ]
 ```
+
 You basically have `[` and `]` surrounding the entire file and each ruleset inside `{` these `}`
 You MUST separate each ruleset with a comma (As shown in the example). The failure to do so will result in an error.
 For the last ruleset, no comma can be after the `}`. This will break the array and give you an error.
-Currently, each file can only have 1 ruleset.
\ No newline at end of file
+Currently, each file can only have 1 ruleset.

From 1da986bd4a6ff8a173fce3217c7fd80d6d9d1fb3 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Mon, 17 May 2021 10:25:42 -0500
Subject: [PATCH 081/154] Add Size and Date Modified to directory listing

---
 handlers.js | 386 ++++++++++++++++++++++++++++++++--------------------
 1 file changed, 236 insertions(+), 150 deletions(-)

diff --git a/handlers.js b/handlers.js
index 0b157b60..da052696 100644
--- a/handlers.js
+++ b/handlers.js
@@ -174,7 +174,7 @@
 
             // strip '/' off end of path
 
-            if (this.app.opts.optExcludeDotHtml){
+            if (this.app.opts.optExcludeDotHtml && ! this.request.origpath.endsWith("/")) {
                 var extension = this.request.path.split('.').pop();
                 if (extension == 'html') {
                     var path = this.request.path
@@ -280,36 +280,7 @@
                     this.finish()
                 } else {
                     if (this.app.opts.optCustom404) {
-                        this.fs.getByPath(this.app.opts.optCustom404location, (file) => {
-                        if (! file.error) {
-                            file.file( function(filee) {
-                            var reader = new FileReader();
-                            reader.onload = function(e){
-                            this.useDefaultMime = false
-                                var data = e.target.result
-                                    if (this.app.opts.optCustom404usevar) {
-                                        if (this.app.opts.optCustom404usevarvar != '') {
-                                        var html = ['<script>var '+this.app.opts.optCustom404usevarvar+' = "'+this.request.path+'";</script>']
-                                    } else {
-                                        this.write('javascript location variable is blank', 500)
-                                        return
-                                    }
-                                    } else {
-                                    var html = ['']
-                                    }
-                                    html.push(data)
-                                    var finaldata = html.join('\n')
-                                    this.setHeader('content-type','text/html; charset=utf-8')
-                                    this.write(finaldata, 404)
-                                    this.finish()
-                                    this.useDefaultMime = true
-                        }.bind(this)
-                        reader.readAsText(filee)
-                        }.bind(this))
-                        } else {
-                        this.write('Path of 404 html was not found - 404 path is set to: '+this.app.opts.optCustom404location, 500)
-                        this.finish()
-                        }})
+                        this.renderCustom404Html.bind(this)()
                     } else {
                     this.write('no entry',404)
                 }}
@@ -320,36 +291,7 @@
                     this.finish()
                 } else {
                     if (this.app.opts.optCustom404) {
-                        this.fs.getByPath(this.app.opts.optCustom404location, (file) => {
-                        if (! file.error) {
-                            file.file( function(filee) {
-                            var reader = new FileReader();
-                            reader.onload = function(e){
-                            this.useDefaultMime = false
-                                var data = e.target.result
-                                    if (this.app.opts.optCustom404usevar) {
-                                        if (this.app.opts.optCustom404usevarvar != '') {
-                                        var html = ['<script>var '+this.app.opts.optCustom404usevarvar+' = "'+this.request.path+'";</script>']
-                                    } else {
-                                        this.write('javascript location variable is blank', 500)
-                                        return
-                                    }
-                                    } else {
-                                    var html = ['']
-                                    }
-                                    html.push(data)
-                                    var finaldata = html.join('\n')
-                                    this.setHeader('content-type','text/html; charset=utf-8')
-                                    this.write(finaldata, 404)
-                                    this.finish()
-                                    this.useDefaultMime = true
-                        }.bind(this)
-                        reader.readAsText(filee)
-                        }.bind(this))
-                        } else {
-                        this.write('Path of 404 html was not found - 404 path is set to: '+this.app.opts.optCustom404location, 500)
-                        this.finish()
-                        }})
+                        this.renderCustom404Html.bind(this)()
                     } else {
                         this.write('entry not found: ' + (this.rewrite_to || this.request.path), 404)
                     }
@@ -389,36 +331,7 @@
                         this.renderDirectoryListingJSON(results)
                     } else if (this.app.opts.optDir404 && this.app.opts.optRenderIndex) {
                         if (this.app.opts.optCustom404) {
-                            this.fs.getByPath(this.app.opts.optCustom404location, (file) => {
-                            if (! file.error) {
-                                file.file( function(filee) {
-                                var reader = new FileReader();
-                                reader.onload = function(e){
-                                this.useDefaultMime = false
-                                var data = e.target.result
-                                    if (this.app.opts.optCustom404usevar) {
-                                        if (this.app.opts.optCustom404usevarvar != '') {
-                                        var html = ['<script>var '+this.app.opts.optCustom404usevarvar+' = "'+this.request.path+'";</script>']
-                                    } else {
-                                        this.write('javascript location variable is blank', 500)
-                                        return
-                                    }
-                                    } else {
-                                    var html = ['']
-                                    }
-                                    html.push(data)
-                                    var finaldata = html.join('\n')
-                                    this.setHeader('content-type','text/html; charset=utf-8')
-                                    this.write(finaldata, 404)
-                                    this.finish()
-                                    this.useDefaultMime = true
-                                }.bind(this)
-                            reader.readAsText(filee)
-                            }.bind(this))
-                            } else {
-                            this.write('Path of 404 html was not found - 404 path is set to: '+this.app.opts.optCustom404location, 500)
-                            this.finish()
-                            }})
+                            this.renderCustom404Html.bind(this)()
                         } else {
                             this.write("404 - File not found", 404)
                             this.finish()
@@ -513,7 +426,7 @@
                                 if (filefound) {
                                     if (data.request_path == filerequested || 
                                         data.request_path == 'all files' || 
-                                        data.type == 'directory listing') {
+                                        (data.type == 'directory listing' && filerequested == '')) {
                                         if (data.type == 301 || data.type == 302 || data.type == 307) {
                                             this.setHeader('location', data.redirto)
                                             this.responseLength = 0
@@ -655,6 +568,13 @@
                             if (this.app.opts.optExcludeDotHtml) {
                                 this.fs.getByPath(this.request.path+'.html', (file) => {
                                 if (! file.error) {
+                                    if (this.request.origpath.endsWith("/")) {
+                                        var filerequested = filerequest.split('/').pop();
+                                        if (filerequested == 'index.html' || filerequested == 'index.htm' || filerequested == 'index') {
+                                            var filerequested = ''
+                                        }
+                                        htaccessMain.bind(this)(filerequested)
+                                    }
                                     var filerequested = this.request.path+'.html'
                                     var filerequested = filerequested.split('/').pop();
                                     htaccessMain.bind(this)(filerequested)
@@ -709,40 +629,11 @@
             getEntryFile(entry, function(file) {
                 if (file instanceof DOMException) {
                     if (this.app.opts.optCustom404) {
-                        this.fs.getByPath(this.app.opts.optCustom404location, (file) => {
-                        if (! file.error) {
-                            file.file( function(filee) {
-                            var reader = new FileReader();
-                            reader.onload = function(e){
-                            this.useDefaultMime = false
-                                var data = e.target.result
-                                    if (this.app.opts.optCustom404usevar) {
-                                        if (this.app.opts.optCustom404usevarvar != '') {
-                                        var html = ['<script>var '+this.app.opts.optCustom404usevarvar+' = "'+this.request.path+'";</script>']
-                                    } else {
-                                        this.write('javascript location variable is blank', 500)
-                                        return
-                                    }
-                                    } else {
-                                    var html = ['']
-                                    }
-                                    html.push(data)
-                                    var finaldata = html.join('\n')
-                                    this.setHeader('content-type','text/html; charset=utf-8')
-                                    this.write(finaldata, 404)
-                                    this.finish()
-                                    this.useDefaultMime = true
-                        }.bind(this)
-                        reader.readAsText(filee)
-                        }.bind(this))
-                        } else {
-                        this.write('Path of 404 html was not found - 404 path is set to: '+this.app.opts.optCustom404location, 500)
-                        this.finish()
-                        }})
+                        this.renderCustom404Html.bind(this)()
                     } else {
-                    this.write("File not found", 404)
-                    this.finish()
-                    return
+                        this.write("File not found", 404)
+                        this.finish()
+                        return
                 }}
                 this.file = file
                 if (this.request.method == "HEAD") {
@@ -828,34 +719,196 @@
             if (! WSC.template_data) {
                 return this.renderDirectoryListing(results)
             }
+            function DirRenderFinish() {
+                var data = html.join('\n')
+                data = new TextEncoder('utf-8').encode(data).buffer
+                this.writeChunk(data)
+                this.request.connection.write(WSC.str2ab('0\r\n\r\n'))
+                this.finish()
+            }
+            function sendFileList() {
+                var isdirectory = results[w].isDirectory
+                if (! isdirectory) {
+                    results[w].file(function(file) {
+                        //console.log(file)
+                        var rawname = file.name
+                        //from https://stackoverflow.com/questions/10420352/converting-file-size-in-bytes-to-human-readable-string/10420404
+                        function humanFileSize(bytes, si=false, dp=1) {
+                          const thresh = si ? 1000 : 1024;
+
+                          if (Math.abs(bytes) < thresh) {
+                            return bytes + ' B';
+                          }
+
+                          const units = si 
+                            ? ['kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'] 
+                            : ['KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];
+                          let u = -1;
+                          const r = 10**dp;
+
+                          do {
+                            bytes /= thresh;
+                            ++u;
+                          } while (Math.round(Math.abs(bytes) * r) / r >= thresh && u < units.length - 1);
+
+
+                          return bytes.toFixed(dp) + ' ' + units[u];
+                        }
+                        
+                        var lastModifiedMonth = file.lastModifiedDate.getMonth() + 1
+                        var lastModifiedDay = file.lastModifiedDate.getDate()
+                        var lastModifiedYear = file.lastModifiedDate.getFullYear().toString().substring(2, 4)
+                        var lastModifiedHours = file.lastModifiedDate.getHours() + 1
+                        var lastModifiedMinutes = file.lastModifiedDate.getMinutes() + 1
+                        var lastModifiedSeconds = file.lastModifiedDate.getSeconds() + 1
+
+                        var lastModified = lastModifiedMonth+
+                                           lastModifiedDay+
+                                           lastModifiedYear+
+                                           lastModifiedHours+
+                                           lastModifiedMinutes+
+                                           lastModifiedSeconds
+                        if (lastModifiedSeconds.toString().length != 2) {
+                            var lastModifiedSeconds = '0' + lastModifiedSeconds
+                        }
+                        if (lastModifiedMinutes.toString().length != 2) {
+                            var lastModifiedMinutes = '0' + lastModifiedMinutes
+                        }
+                        if (lastModifiedDay.toString().length != 2) {
+                            var lastModifiedDay = '0' + lastModifiedDay
+                        }
+                        if (lastModifiedHours >= 12) {
+                            var lastModifiedAmPm = 'PM'
+                            if (lastModifiedHours > 12) {
+                                var lastModifiedHours = lastModifiedHours - 12
+                            }
+                        } else {
+                            var lastModifiedAmPm = 'AM'
+                        }
+                        var lastModifiedStr = lastModifiedMonth+'/'+
+                                           lastModifiedDay+'/'+
+                                           lastModifiedYear+', '+
+                                           lastModifiedHours+':'+
+                                           lastModifiedMinutes+':'+
+                                           lastModifiedSeconds +' '+
+                                           lastModifiedAmPm
+
+                        var name = encodeURIComponent(file.name)
+                        var isdirectory = results[w].isDirectory
+                        //var modified = '4/27/21, 10:38:40 AM'
+                        var modified = lastModified
+                        var filesize = file.size
+                        var filesizestr = humanFileSize(file.size)
+                        var modifiedstr = lastModifiedStr
+                        // raw, urlencoded, isdirectory, size, size as string, date modified, date modified as string
+                        if (rawname != 'wsc.htaccess') {
+                        html.push('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+',"'+filesize+'","'+filesizestr+'","'+modified+'","'+modifiedstr+'");</script>')
+                        }
+                        if (w != results.length - 1) {
+                            w++
+                            sendFileList.bind(this, results)()
+                        } else {
+                            DirRenderFinish.bind(this, results)()
+                        }
+                    }.bind(this))
+                } else {
+                    results[w].getMetadata(function(file) {
+                        //console.log(file)
+                        var rawname = results[w].name
+                        //from https://stackoverflow.com/questions/10420352/converting-file-size-in-bytes-to-human-readable-string/10420404
+                        function humanFileSize(bytes, si=false, dp=1) {
+                          const thresh = si ? 1000 : 1024;
+
+                          if (Math.abs(bytes) < thresh) {
+                            return bytes + ' B';
+                          }
+
+                          const units = si 
+                            ? ['kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'] 
+                            : ['KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];
+                          let u = -1;
+                          const r = 10**dp;
+
+                          do {
+                            bytes /= thresh;
+                            ++u;
+                          } while (Math.round(Math.abs(bytes) * r) / r >= thresh && u < units.length - 1);
+
+
+                          return bytes.toFixed(dp) + ' ' + units[u];
+                        }
+                        var lastModifiedMonth = file.modificationTime.getMonth() + 1
+                        var lastModifiedDay = file.modificationTime.getDate()
+                        var lastModifiedYear = file.modificationTime.getFullYear().toString().substring(2, 4)
+                        var lastModifiedHours = file.modificationTime.getHours() + 1
+                        var lastModifiedMinutes = file.modificationTime.getMinutes() + 1
+                        var lastModifiedSeconds = file.modificationTime.getSeconds() + 1
+
+                        var lastModified = lastModifiedMonth+
+                                           lastModifiedDay+
+                                           lastModifiedYear+
+                                           lastModifiedHours+
+                                           lastModifiedMinutes+
+                                           lastModifiedSeconds
+                        if (lastModifiedSeconds.toString().length != 2) {
+                            var lastModifiedSeconds = '0' + lastModifiedSeconds
+                        }
+                        if (lastModifiedMinutes.toString().length != 2) {
+                            var lastModifiedMinutes = '0' + lastModifiedMinutes
+                        }
+                        if (lastModifiedDay.toString().length != 2) {
+                            var lastModifiedDay = '0' + lastModifiedDay
+                        }
+                        if (lastModifiedHours >= 12) {
+                            var lastModifiedAmPm = 'PM'
+                            if (lastModifiedHours > 12) {
+                                var lastModifiedHours = lastModifiedHours - 12
+                            }
+                        } else {
+                            var lastModifiedAmPm = 'AM'
+                        }
+                        var lastModifiedStr = lastModifiedMonth+'/'+
+                                           lastModifiedDay+'/'+
+                                           lastModifiedYear+', '+
+                                           lastModifiedHours+':'+
+                                           lastModifiedMinutes+':'+
+                                           lastModifiedSeconds +' '+
+                                           lastModifiedAmPm
+
+                        var name = encodeURIComponent(results[w].name)
+                        var isdirectory = results[w].isDirectory
+                        //var modified = '4/27/21, 10:38:40 AM'
+                        var modified = lastModified
+                        var filesize = file.size
+                        var filesizestr = humanFileSize(file.size)
+                        var modifiedstr = lastModifiedStr
+                        // raw, urlencoded, isdirectory, size, size as string, date modified, date modified as string
+                        if (rawname != 'wsc.htaccess') {
+                        html.push('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+',"'+filesize+'","'+filesizestr+'","'+modified+'","'+modifiedstr+'");</script>')
+                        }
+                        if (w != results.length - 1) {
+                            w++
+                            sendFileList.bind(this, results)()
+                        } else {
+                            DirRenderFinish.bind(this, results)()
+                        }
+
 
-            this.setHeader('transfer-encoding','chunked')
-            this.writeHeaders(200)
-            this.writeChunk(WSC.template_data )
+                    }.bind(this), function(error) {
+                        console.log('error reading metadata '+error.code)
+                    })
+                }}
+                this.setHeader('transfer-encoding','chunked')
+                this.writeHeaders(200)
+                this.writeChunk(WSC.template_data )
                 if (this.request.path != '') {
-                    var html = ['<script>start("'+this.request.path+'")</script>']
-                    html.push('<script>onHasParentDirectory();</script>')
-                    } else {
+                    var html = ['<script>start("'+this.request.path+'")</script>',
+                                '<script>onHasParentDirectory();</script>']
+                } else {
                     var html = ['<script>start("/")</script>']
-                    }
-            for (var i=0; i<results.length; i++) {
-                var rawname = '"'+results[i].name+'"'
-                var name = '"'+encodeURIComponent(results[i].name)+'"'
-                var isdirectory = results[i].isDirectory
-                var filesize = '""'
-                //var modified = '4/27/121, 10:38:40 AM'
-                var modified = '""'
-		        var filesizestr = '""'
-		        var modifiedstr = '""'
-                // raw, urlencoded, isdirectory, size, size as string, date modified, date modified as string
-                if (rawname != '"wsc.htaccess"') {
-                html.push('<script>addRow('+rawname+','+name+','+isdirectory+','+filesize+','+filesizestr+','+modified+','+modifiedstr+');</script>')
-            }}
-            var data = html.join('\n')
-            data = new TextEncoder('utf-8').encode(data).buffer
-            this.writeChunk(data)
-            this.request.connection.write(WSC.str2ab('0\r\n\r\n'))
-            this.finish()
+                }
+                var w = 0
+                sendFileList.bind(this, results)()
         },
         renderDirectoryListing: function(results) {
             var html = ['<html>']
@@ -892,6 +945,39 @@
                 this.write(evt.target.result)
             }
 
+        },
+        renderCustom404Html: function() {
+            this.fs.getByPath(this.app.opts.optCustom404location, (file) => {
+            if (! file.error) {
+                file.file( function(filee) {
+                var reader = new FileReader();
+                    reader.onload = function(e){
+                        this.useDefaultMime = false
+                        var data = e.target.result
+                        if (this.app.opts.optCustom404usevar) {
+                            if (this.app.opts.optCustom404usevarvar != '') {
+                            var html = ['<script>var '+this.app.opts.optCustom404usevarvar+' = "'+this.request.path+'";</script>']
+                        } else {
+                            this.write('javascript location variable is blank', 500)
+                            return
+                        }
+                        } else {
+                            var html = ['']
+                        }
+                    html.push(data)
+                    var finaldata = html.join('\n')
+                    this.setHeader('content-type','text/html; charset=utf-8')
+                    this.write(finaldata, 404)
+                    this.finish()
+                    this.useDefaultMime = true
+                }.bind(this)
+            reader.readAsText(filee)
+            }.bind(this))
+            } else {
+                this.write('Path of 404 html was not found - 404 path is set to: '+this.app.opts.optCustom404location, 500)
+                this.finish()
+            }})
+        
         }
     }, WSC.BaseHandler.prototype)
 

From d30b0dea9c2ca115839776f17781774a06b7fd77 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Mon, 17 May 2021 10:51:37 -0500
Subject: [PATCH 082/154] removed duplicate code

---
 handlers.js | 90 ++---------------------------------------------------
 1 file changed, 2 insertions(+), 88 deletions(-)

diff --git a/handlers.js b/handlers.js
index da052696..36b68761 100644
--- a/handlers.js
+++ b/handlers.js
@@ -728,90 +728,6 @@
             }
             function sendFileList() {
                 var isdirectory = results[w].isDirectory
-                if (! isdirectory) {
-                    results[w].file(function(file) {
-                        //console.log(file)
-                        var rawname = file.name
-                        //from https://stackoverflow.com/questions/10420352/converting-file-size-in-bytes-to-human-readable-string/10420404
-                        function humanFileSize(bytes, si=false, dp=1) {
-                          const thresh = si ? 1000 : 1024;
-
-                          if (Math.abs(bytes) < thresh) {
-                            return bytes + ' B';
-                          }
-
-                          const units = si 
-                            ? ['kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'] 
-                            : ['KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];
-                          let u = -1;
-                          const r = 10**dp;
-
-                          do {
-                            bytes /= thresh;
-                            ++u;
-                          } while (Math.round(Math.abs(bytes) * r) / r >= thresh && u < units.length - 1);
-
-
-                          return bytes.toFixed(dp) + ' ' + units[u];
-                        }
-                        
-                        var lastModifiedMonth = file.lastModifiedDate.getMonth() + 1
-                        var lastModifiedDay = file.lastModifiedDate.getDate()
-                        var lastModifiedYear = file.lastModifiedDate.getFullYear().toString().substring(2, 4)
-                        var lastModifiedHours = file.lastModifiedDate.getHours() + 1
-                        var lastModifiedMinutes = file.lastModifiedDate.getMinutes() + 1
-                        var lastModifiedSeconds = file.lastModifiedDate.getSeconds() + 1
-
-                        var lastModified = lastModifiedMonth+
-                                           lastModifiedDay+
-                                           lastModifiedYear+
-                                           lastModifiedHours+
-                                           lastModifiedMinutes+
-                                           lastModifiedSeconds
-                        if (lastModifiedSeconds.toString().length != 2) {
-                            var lastModifiedSeconds = '0' + lastModifiedSeconds
-                        }
-                        if (lastModifiedMinutes.toString().length != 2) {
-                            var lastModifiedMinutes = '0' + lastModifiedMinutes
-                        }
-                        if (lastModifiedDay.toString().length != 2) {
-                            var lastModifiedDay = '0' + lastModifiedDay
-                        }
-                        if (lastModifiedHours >= 12) {
-                            var lastModifiedAmPm = 'PM'
-                            if (lastModifiedHours > 12) {
-                                var lastModifiedHours = lastModifiedHours - 12
-                            }
-                        } else {
-                            var lastModifiedAmPm = 'AM'
-                        }
-                        var lastModifiedStr = lastModifiedMonth+'/'+
-                                           lastModifiedDay+'/'+
-                                           lastModifiedYear+', '+
-                                           lastModifiedHours+':'+
-                                           lastModifiedMinutes+':'+
-                                           lastModifiedSeconds +' '+
-                                           lastModifiedAmPm
-
-                        var name = encodeURIComponent(file.name)
-                        var isdirectory = results[w].isDirectory
-                        //var modified = '4/27/21, 10:38:40 AM'
-                        var modified = lastModified
-                        var filesize = file.size
-                        var filesizestr = humanFileSize(file.size)
-                        var modifiedstr = lastModifiedStr
-                        // raw, urlencoded, isdirectory, size, size as string, date modified, date modified as string
-                        if (rawname != 'wsc.htaccess') {
-                        html.push('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+',"'+filesize+'","'+filesizestr+'","'+modified+'","'+modifiedstr+'");</script>')
-                        }
-                        if (w != results.length - 1) {
-                            w++
-                            sendFileList.bind(this, results)()
-                        } else {
-                            DirRenderFinish.bind(this, results)()
-                        }
-                    }.bind(this))
-                } else {
                     results[w].getMetadata(function(file) {
                         //console.log(file)
                         var rawname = results[w].name
@@ -837,6 +753,7 @@
 
                           return bytes.toFixed(dp) + ' ' + units[u];
                         }
+                        
                         var lastModifiedMonth = file.modificationTime.getMonth() + 1
                         var lastModifiedDay = file.modificationTime.getDate()
                         var lastModifiedYear = file.modificationTime.getFullYear().toString().substring(2, 4)
@@ -892,12 +809,9 @@
                         } else {
                             DirRenderFinish.bind(this, results)()
                         }
-
-
                     }.bind(this), function(error) {
                         console.log('error reading metadata '+error.code)
-                    })
-                }}
+                    })}
                 this.setHeader('transfer-encoding','chunked')
                 this.writeHeaders(200)
                 this.writeChunk(WSC.template_data )

From 0cf7aaedea88f8c10477c8b85f7602dbfbe0a572 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Mon, 17 May 2021 12:16:54 -0500
Subject: [PATCH 083/154] Cleanup

---
 handlers.js        | 66 +++++++++++++++++++++++++++++++++++++---------
 htaccess/README.md | 11 +++++---
 2 files changed, 61 insertions(+), 16 deletions(-)

diff --git a/handlers.js b/handlers.js
index 36b68761..c9edb342 100644
--- a/handlers.js
+++ b/handlers.js
@@ -413,8 +413,18 @@
                             function htaccessMain(filerequested) {
                                 var filefound = false
                                 for (var i=0; i<origdata.length; i++) {
-                                    if (origdata[i].request_path == filerequested || 
-                                        origdata[i].request_path == 'all files' || 
+                                    origdata[i].original_request_path = origdata[i].request_path
+                                    if (origdata[i].request_path == 'index.html' ||
+                                        origdata[i].request_path == 'index.htm' ||
+                                        origdata[i].request_path == 'index' ||
+                                        origdata[i].request_path == 'index.xhtm' ||
+                                        origdata[i].request_path == 'index.xhtml' ||
+                                        origdata[i].request_path == '') {
+                                        origdata[i].request_path = ''
+                                    }
+                                    //console.log(origdata)
+                                    if (origdata[i].request_path == filerequested ||
+                                        origdata[i].request_path == 'all files' ||
                                         (origdata[i].type == 'directory listing' && filerequested == '')) {
                                         var data = origdata[i]
                                         //console.log(data)
@@ -424,8 +434,16 @@
                                 }
                                 //console.log(filefound)
                                 if (filefound) {
-                                    if (data.request_path == filerequested || 
-                                        data.request_path == 'all files' || 
+                                    if (data.request_path == 'index.html' ||
+                                        data.request_path == 'index.htm' ||
+                                        data.request_path == 'index' ||
+                                        data.request_path == 'index.xhtm' ||
+                                        data.request_path == 'index.xhtml' ||
+                                        data.request_path == '') {
+                                        data.request_path = ''
+                                    }
+                                    if (data.request_path == filerequested ||
+                                        data.request_path == 'all files' ||
                                         (data.type == 'directory listing' && filerequested == '')) {
                                         if (data.type == 301 || data.type == 302 || data.type == 307) {
                                             this.setHeader('location', data.redirto)
@@ -570,13 +588,26 @@
                                 if (! file.error) {
                                     if (this.request.origpath.endsWith("/")) {
                                         var filerequested = filerequest.split('/').pop();
-                                        if (filerequested == 'index.html' || filerequested == 'index.htm' || filerequested == 'index') {
+                                        if (filerequested == 'index.html' ||
+                                            filerequested == 'index.htm' ||
+                                            filerequested == 'index' ||
+                                            filerequested == 'index.xhtm' ||
+                                            filerequested == 'index.xhtml' ||
+                                            filerequested == '') {
                                             var filerequested = ''
                                         }
                                         htaccessMain.bind(this)(filerequested)
                                     }
                                     var filerequested = this.request.path+'.html'
                                     var filerequested = filerequested.split('/').pop();
+                                    if (filerequested == 'index.html' ||
+                                        filerequested == 'index.htm' ||
+                                        filerequested == 'index' ||
+                                        filerequested == 'index.xhtm' ||
+                                        filerequested == 'index.xhtml' ||
+                                        filerequested == '') {
+                                        var filerequested = ''
+                                    }
                                     htaccessMain.bind(this)(filerequested)
                                     return
                                 } else {
@@ -591,7 +622,12 @@
                                     }
                                     var filerequested = filerequest.split('/').pop();
                                     //console.log(filerequested)
-                                    if (filerequested == 'index.html' || filerequested == 'index.htm') {
+                                    if (filerequested == 'index.html' ||
+                                        filerequested == 'index.htm' ||
+                                        filerequested == 'index' ||
+                                        filerequested == 'index.xhtm' ||
+                                        filerequested == 'index.xhtml' ||
+                                        filerequested == '') {
                                         var filerequested = ''
                                     }
                                     htaccessMain.bind(this)(filerequested)
@@ -608,7 +644,11 @@
                                     }
                                     var filerequested = filerequest.split('/').pop();
                                     //console.log(filerequested)
-                                    if (filerequested == 'index.html' || filerequested == 'index.htm') {
+                                    if (filerequested == 'index.html' ||
+                                        filerequested == 'index.htm' ||
+                                        filerequested == 'index.xhtm' ||
+                                        filerequested == 'index.xhtml' ||
+                                        filerequested == '') {
                                         var filerequested = ''
                                     }
                                     htaccessMain.bind(this)(filerequested)
@@ -785,12 +825,12 @@
                             var lastModifiedAmPm = 'AM'
                         }
                         var lastModifiedStr = lastModifiedMonth+'/'+
-                                           lastModifiedDay+'/'+
-                                           lastModifiedYear+', '+
-                                           lastModifiedHours+':'+
-                                           lastModifiedMinutes+':'+
-                                           lastModifiedSeconds +' '+
-                                           lastModifiedAmPm
+                                              lastModifiedDay+'/'+
+                                              lastModifiedYear+', '+
+                                              lastModifiedHours+':'+
+                                              lastModifiedMinutes+':'+
+                                              lastModifiedSeconds +' '+
+                                              lastModifiedAmPm
 
                         var name = encodeURIComponent(results[w].name)
                         var isdirectory = results[w].isDirectory
diff --git a/htaccess/README.md b/htaccess/README.md
index fd3c8e42..bcb7ca98 100644
--- a/htaccess/README.md
+++ b/htaccess/README.md
@@ -6,6 +6,7 @@
 <p>Also, Web Server for Chrome DOES NOT have support for .htaccess files. Instead, we have wsc.htaccess files, which gets the same thing done (Not all features implimented).</p>
 <br><br>
 <h1>How to</h1>
+<p>All Htaccess features are built to have 100% compatibility with changes in settings</p>
 <h2>Currently supported</h2>
 <p>301 - Moved Permanently. Tells the server that when chosen file is requested to move to a different directory or file. The browser will cache this</p>
 <p>302 - Found. Tells the server that when chosen file is requested to move to a different directory or file. Not cached by the browser</p>
@@ -27,9 +28,7 @@
 <p>Note - If you are trying to redirect to some index.html file and you have the option to automatically show index.html turned on, your path will go from '/somepath/index.html' to '/somepath/'</p>
 <p>Note - If you are trying to redirect to some .html file and you have the option to remove .html extension turned on, leave the .html extension. The web server will handle the request and forward it to have no .html extension</p>
 
-Note - when selecting the file to scan for, if the file is index.html and the file is `index.html` or `index.htm`, leave the path blank. It should look like this:  `"request_path": "",`. The web server will take care of the rest
-
-Note - There are security measures that when request_path = "" It will deny access to index.html, index (For no .html extension) and index.htm. Use `"request_path": "",`. if the file is index.html or index.htm - This will protect every way of access.
+Note - when selecting the file to scan for, if you are trying to edit some index.html (or index.htm, or index.xhtml, or index.xhtm) Put the file name in place of request path. example: `"request_path": "index.html",`. Security will scan any way to get the the file
 
 Note - when selecting the file to scan, if the file is some .html and you have the option to remove the .html extension turned on, leave the .html extension. The Web Server is programed to handle the request!
 
@@ -40,6 +39,7 @@ Note - 401 (unauthorized) username and passwords are CASE SENSITIVE!!
 <p>IMPORTANT NOTE - EVERYTHING IN THE FILE (AND THE FILE NAME) IS CASE SENSITIVE!!</p>
 <br>
 <h2>301 Example</h2>
+<p>Tells the server that when chosen file is requested to move to a different directory or file. The browser will cache this</p>
 
 ```
 [
@@ -52,6 +52,7 @@ Note - 401 (unauthorized) username and passwords are CASE SENSITIVE!!
 ```
 <br>
 <h2>302 Example</h2>
+<p>Tells the server that when chosen file is requested to move to a different directory or file. Not cached by the browser</p>
 
 ```
 [
@@ -64,6 +65,7 @@ Note - 401 (unauthorized) username and passwords are CASE SENSITIVE!!
 ```
 <br>
 <h2>307 Example</h2>
+<p>Tells the server that when chosen file is requested to move to a different directory or file. Not cached by the browser.</p>
 
 ```
 [
@@ -76,6 +78,7 @@ Note - 401 (unauthorized) username and passwords are CASE SENSITIVE!!
 ```
 <br>
 <h2>401 Example</h2>
+<p>The page will require login.</p>
 
 ```
 [
@@ -89,6 +92,7 @@ Note - 401 (unauthorized) username and passwords are CASE SENSITIVE!!
 ```
 <br>
 <h2>403 Example</h2>
+<p>This will deny direct access to image/video/audio files. This option only works if https is enabled or if the user is on a localhost address.</p>
 
 ```
 [
@@ -100,6 +104,7 @@ Note - 401 (unauthorized) username and passwords are CASE SENSITIVE!!
 ```
 <br>
 <h2>Directory Listing</h2>
+<p>Ignores the value of 404 instead of directory listing and renders the directory listing</p>
 
 ```
 [

From 7bb4ecb6f224fdfda621b72b1e5863ee2f843488 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Mon, 17 May 2021 17:52:23 -0500
Subject: [PATCH 084/154] Read Metadata error will continue function

---
 handlers.js | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/handlers.js b/handlers.js
index c9edb342..2d0a375d 100644
--- a/handlers.js
+++ b/handlers.js
@@ -851,7 +851,13 @@
                         }
                     }.bind(this), function(error) {
                         console.log('error reading metadata '+error.code)
-                    })}
+                        if (w != results.length - 1) {
+                            w++
+                            sendFileList.bind(this, results)()
+                        } else {
+                            DirRenderFinish.bind(this, results)()
+                        }
+                    }.bind(this))}
                 this.setHeader('transfer-encoding','chunked')
                 this.writeHeaders(200)
                 this.writeChunk(WSC.template_data )
@@ -905,19 +911,19 @@
             if (! file.error) {
                 file.file( function(filee) {
                 var reader = new FileReader();
-                    reader.onload = function(e){
-                        this.useDefaultMime = false
-                        var data = e.target.result
-                        if (this.app.opts.optCustom404usevar) {
-                            if (this.app.opts.optCustom404usevarvar != '') {
-                            var html = ['<script>var '+this.app.opts.optCustom404usevarvar+' = "'+this.request.path+'";</script>']
-                        } else {
-                            this.write('javascript location variable is blank', 500)
-                            return
-                        }
-                        } else {
-                            var html = ['']
-                        }
+                reader.onload = function(e){
+                    this.useDefaultMime = false
+                    var data = e.target.result
+                    if (this.app.opts.optCustom404usevar) {
+                        if (this.app.opts.optCustom404usevarvar != '') {
+                        var html = ['<script>var '+this.app.opts.optCustom404usevarvar+' = "'+this.request.path+'";</script>']
+                    } else {
+                        this.write('javascript location variable is blank', 500)
+                        return
+                    }
+                    } else {
+                        var html = ['']
+                    }
                     html.push(data)
                     var finaldata = html.join('\n')
                     this.setHeader('content-type','text/html; charset=utf-8')

From 859dd40cbe781b0a59ea4ef1f6a766bad4dd93eb Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Tue, 18 May 2021 09:41:08 -0500
Subject: [PATCH 085/154] Custom 400 page

---
 htaccess/README.md     |  1 -
 react-ui/js/index.js   | 19 +++++++++++-
 react-ui/js/options.js | 12 ++++++++
 webapp.js              | 69 ++++++++++++++++++++++++------------------
 4 files changed, 69 insertions(+), 32 deletions(-)

diff --git a/htaccess/README.md b/htaccess/README.md
index bcb7ca98..ecb00fba 100644
--- a/htaccess/README.md
+++ b/htaccess/README.md
@@ -22,7 +22,6 @@
 <p>You can now allow/deny uploading (PUT request) wsc.htaccess files (Helpful for when making something like a file hosting, the only question with doing that is why are you using a web server as simple as this)</p>
 <p>You can now allow/deny deleting (DELETE request) wsc.htaccess files (Why you would enable this - I dont know)</p>
 <p>FOR MAXIMUM SECURITY - IT IS RECOMMENDED TO LEAVE THESE ALL TURNED OFF!!</p>
-<p>Custom 400 (Bad Request) page not supported</p>
 <h1>Making the file</h1>
 <p>A wsc.htaccess file is actually a javascript array, which means one problem with the file will cause it not to work - So be careful. No additional info can be put into the file</p>
 <p>Note - If you are trying to redirect to some index.html file and you have the option to automatically show index.html turned on, your path will go from '/somepath/index.html' to '/somepath/'</p>
diff --git a/react-ui/js/index.js b/react-ui/js/index.js
index ea6410b3..e8840189 100644
--- a/react-ui/js/index.js
+++ b/react-ui/js/index.js
@@ -87,6 +87,10 @@ const functions = {
 			bg.backgroundSettingChange({'optBackground':val})
 		}
   },
+  optCustom400location: (app, k, val) => {
+    console.assert(typeof val === 'string')
+    app.webapp.updateOption('optCustom400location', val);
+  },
   optCustom404location: (app, k, val) => {
     console.assert(typeof val === 'string')
     app.webapp.updateOption('optCustom404location', val);
@@ -310,6 +314,12 @@ class App extends React.Component {
     const optCustom403Info = {
       optCustom403location: ['optCustom403']
     };
+    const optCustom400Main = {
+      optCustom400: null
+    };
+    const optCustom400Info = {
+      optCustom400location: ['optCustom400']
+    };
     const optCustom401Main = {
       optCustom401: null
     };
@@ -375,6 +385,7 @@ class App extends React.Component {
     const BackgroundMain = renderOpts(optbackgroundMain)
     const Custom401Main = renderOpts(optCustom401Main)
     const Custom403Main = renderOpts(optCustom403Main)
+    const Custom400Main = renderOpts(optCustom400Main)
     
     const HtaccessInfo = (() => {
       let disablezero = (!this.webapp || !this.webapp.opts.optScanForHtaccess);
@@ -390,6 +401,12 @@ class App extends React.Component {
       return [(<div>{!disableone && textboxesone}</div>)];
     })();
 
+    const Custom400Options = (() => {
+      let disablenine = (!this.webapp || !this.webapp.opts.optCustom400);
+      const textboxesnine = renderOpts(optCustom400Info)
+      return [(<div>{!disablenine && textboxesnine}</div>)];
+    })();
+
     const Custom401Options = (() => {
       let disabletwo = (!this.webapp || !this.webapp.opts.optCustom401);
       const textboxestwo = renderOpts(optCustom401Info)
@@ -508,7 +525,7 @@ class App extends React.Component {
           {BackgroundMain}{BackgroundOptions}{AvailabilityMain}{AvailabilityOptions}{IndexMain}{IndexOptions}{Portoption}
 
           {advancedButton}
-          {state.showAdvanced && <div>{advOptions}{Custom401Main}{Custom401Options}{Custom403Main}{Custom403Options}{Custom404Main}{Custom404Options}{Custom404OptionsPt2}{HtaccessMain}{HtaccessInfo}{rewriteMain}{rewriteOptions}{httpsMain}{httpsOptions}</div> }
+          {state.showAdvanced && <div>{advOptions}{Custom400Main}{Custom400Options}{Custom401Main}{Custom401Options}{Custom403Main}{Custom403Options}{Custom404Main}{Custom404Options}{Custom404OptionsPt2}{HtaccessMain}{HtaccessInfo}{rewriteMain}{rewriteOptions}{httpsMain}{httpsOptions}</div> }
         </CardContent>
       </Card>
 
diff --git a/react-ui/js/options.js b/react-ui/js/options.js
index edb5b939..28156c24 100644
--- a/react-ui/js/options.js
+++ b/react-ui/js/options.js
@@ -176,6 +176,18 @@ const options = {
     type: Boolean,
     default: false
   },
+  optCustom400: {
+    label: 'Custom 400 page',
+    help: 'Custom 400 page',
+    type: Boolean,
+    default: false
+  },
+  optCustom400location: {
+    label: 'Location of 400 page',
+    help: 'Where is the 400 html page',
+    type: String,
+    default: '/400.html'
+  },
   optCustom404: {
     label: 'Custom 404 page',
     help: 'Custom 404 page',
diff --git a/webapp.js b/webapp.js
index 6ffe8d8d..d8e80c14 100644
--- a/webapp.js
+++ b/webapp.js
@@ -496,42 +496,51 @@
             connection.addRequestCallback(this.onRequest.bind(this,stream,connection))
             connection.tryRead()
         },
+        render400HTML: function(request) {
+            var handler = new WSC.BaseHandler(request)
+            handler.app = this
+            handler.request = request
+            if (request.method == "HEAD") {
+                handler.responseLength = 0
+                handler.writeHeaders(400)
+                handler.finish()
+                return
+            }
+            if (this.opts.optCustom400) {
+                this.fs.getByPath(this.opts.optCustom400location, (file) => {
+                if (! file.error) {
+                    file.file( function(filee) {
+                    var reader = new FileReader();
+                    reader.onload = function(e){
+                        this.useDefaultMime = false
+                        var data = e.target.result
+                        handler.setHeader('content-type','text/html; charset=utf-8')
+                        handler.write(data, 400)
+                        handler.finish()
+                        this.useDefaultMime = true
+                    }.bind(this)
+                reader.readAsText(filee)
+                }.bind(this))
+                } else {
+                    handler.write('Path of 400 html was not found - 400 path is set to: '+this.opts.optCustom400location, 500)
+                    handler.finish()
+                }})
+            } else {
+                handler.write('<h1>400 - Bad Request</h1>', 400)
+                handler.finish()
+            }
+        },
         onRequest: function(stream, connection, request) {
             console.log('Request',request.method, request.uri)
 
             //console.log(request)
             var filename = request.path.split('/').pop()
             if (filename == 'wsc.htaccess') {
-                if (request.method == 'GET' && this.opts.optGETHtaccess == false) {
-                    var handler = new WSC.BaseHandler(request)
-                    handler.app = this
-                    handler.request = request
-                    handler.write('<h1>400 - Bad Request</h1>', 400)
-                    handler.finish()
-                    return
-                }
-                if (request.method == 'PUT' && this.opts.optPUTPOSTHtaccess == false) {
-                    var handler = new WSC.BaseHandler(request)
-                    handler.app = this
-                    handler.request = request
-                    handler.write('<h1>400 - Bad Request</h1>', 400)
-                    handler.finish()
-                    return
-                }
-                if (request.method == 'POST' && this.opts.optPUTPOSTHtaccess == false) {
-                    var handler = new WSC.BaseHandler(request)
-                    handler.app = this
-                    handler.request = request
-                    handler.write('<h1>400 - Bad Request</h1>', 400)
-                    handler.finish()
-                    return
-                }
-                if (request.method == 'DELETE' && this.opts.optPUTPOSTHtaccess == false) {
-                    var handler = new WSC.BaseHandler(request)
-                    handler.app = this
-                    handler.request = request
-                    handler.write('<h1>400 - Bad Request</h1>', 400)
-                    handler.finish()
+                if ((request.method == 'GET' && ! this.opts.optGETHtaccess) ||
+                    (request.method == 'PUT' && ! this.opts.optPUTPOSTHtaccess) ||
+                    (request.method == 'POST' && ! this.opts.optPUTPOSTHtaccess) ||
+                    (request.method == 'DELETE' && ! this.opts.optPUTPOSTHtaccess)) {
+                    this.render400HTML.bind(this)(request)
                     return
                 }
             }

From 0d452caf3131064ee4703393e4542170edef427f Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Wed, 19 May 2021 09:01:57 -0500
Subject: [PATCH 086/154] One last bug I found

---
 handlers.js | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/handlers.js b/handlers.js
index 2d0a375d..0cf08d26 100644
--- a/handlers.js
+++ b/handlers.js
@@ -173,17 +173,33 @@
             //var path = decodeURI(this.request.path)
 
             // strip '/' off end of path
+                console.log(this.request.path)
+                console.log(this.request.origpath)
+                console.log(this.request.uri)
+                console.log(this.request)
 
             if (this.app.opts.optExcludeDotHtml && ! this.request.origpath.endsWith("/")) {
                 var extension = this.request.path.split('.').pop();
+                var more = this.request.uri.split('.html').pop()
                 if (extension == 'html') {
-                    var path = this.request.path
-                    var newpath = path.substring(0, path.length - 5);
-                    this.responseLength = 0
-                    this.setHeader('location', newpath)
-                    this.writeHeaders(307)
-                    this.finish()
-                    return
+                    if (more != this.request.uri) {
+                        var path = this.request.path
+                        var newpath = path.substring(0, path.length - 5);
+                        var newpath = newpath+more
+                        this.responseLength = 0
+                        this.setHeader('location', newpath)
+                        this.writeHeaders(307)
+                        this.finish()
+                        return
+                    } else {
+                        var path = this.request.path
+                        var newpath = path.substring(0, path.length - 5);
+                        this.responseLength = 0
+                        this.setHeader('location', newpath)
+                        this.writeHeaders(307)
+                        this.finish()
+                        return
+                    }
                 }
             }
 

From 8485f4c912ba01361c62e67330e8c380a6c8efad Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Wed, 19 May 2021 09:17:50 -0500
Subject: [PATCH 087/154] Remove console.log()

---
 handlers.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/handlers.js b/handlers.js
index 0cf08d26..69b97615 100644
--- a/handlers.js
+++ b/handlers.js
@@ -173,10 +173,6 @@
             //var path = decodeURI(this.request.path)
 
             // strip '/' off end of path
-                console.log(this.request.path)
-                console.log(this.request.origpath)
-                console.log(this.request.uri)
-                console.log(this.request)
 
             if (this.app.opts.optExcludeDotHtml && ! this.request.origpath.endsWith("/")) {
                 var extension = this.request.path.split('.').pop();

From 9a32baedf44c2149dd5e757a4a5208f4510d9d81 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 20 May 2021 14:59:27 -0500
Subject: [PATCH 088/154] My last htaccess feature (In this pr)

---
 handlers.js        | 173 ++++++++++++++++++++++++++++++++++++++++-----
 htaccess/README.md |  60 ++++++++++++++++
 2 files changed, 214 insertions(+), 19 deletions(-)

diff --git a/handlers.js b/handlers.js
index 69b97615..39685298 100644
--- a/handlers.js
+++ b/handlers.js
@@ -95,31 +95,166 @@
             this.get()
         },
         delete: function() {
-            if (! this.app.opts.optDelete) {
-                this.responseLength = 0
-                this.writeHeaders(400)
-                this.finish()
-                return
+            function deleteMain() {
+                this.fs.getByPath(this.request.path, (entry) => {
+                    entry.remove(()=>{
+                        this.responseLength = 0
+                        this.writeHeaders(200)
+                        this.finish()
+                    });
+                });
             }
-            this.fs.getByPath(this.request.path, (entry) => {
-                entry.remove(()=>{
+            function deleteCheck() {
+                if (! this.app.opts.optDelete) {
                     this.responseLength = 0
-                    this.writeHeaders(200)
+                    this.writeHeaders(400)
                     this.finish()
-                });
-            });
+                    return
+                } else {
+                    deleteMain.bind(this)()
+                }
+            }
+            if (this.app.opts.optScanForHtaccess) {
+                var fullrequestpath = this.request.origpath
+                    var finapath = fullrequestpath
+                    var finpath = finapath.split('/').pop();
+                    var finalpath = fullrequestpath.substring(0, fullrequestpath.length - finpath.length);
+                if (this.request.path == '') {
+                    var finalpath = '/'
+                }
+                var htaccesspath = finalpath+'wsc.htaccess'
+                //console.log(htaccesspath)
+                this.fs.getByPath(htaccesspath, (file) => {
+                if (! file.error) {
+                    file.file( function(filee) {
+                        var reader = new FileReader();
+                        reader.onload = function(e){
+                            var dataa = e.target.result
+                            if(true) {
+                                try {
+                                    var origdata = JSON.parse(dataa)
+                                } catch(e) {
+                                    this.responseLength = 0
+                                    this.writeHeaders(500)
+                                    this.finish()
+                                    return
+                                }
+                            }
+                            var filerequest = this.request.origpath
+                            var filerequested = filerequest.split('/').pop();
+                            var filefound = false
+                            for (var i=0; i<origdata.length; i++) {
+                                if ((origdata[i].type == 'allow delete' && origdata[i].request_path == filerequested) ||
+                                    (origdata[i].type == 'allow delete' && origdata[i].request_path == 'all files') ||
+                                    (origdata[i].type == 'deny delete' && origdata[i].request_path == filerequested) ||
+                                    (origdata[i].type == 'deny delete' && origdata[i].request_path == 'all files')) {
+                                    var data = origdata[i]
+                                    var filefound = true
+                                    break
+                                }
+                            }
+                            //console.log(filefound)
+                            if (filefound) {
+                                if (data.type == 'allow delete') {
+                                    deleteMain.bind(this)()
+                                } else if (data.type == 'deny delete') {
+                                    this.responseLength = 0
+                                    this.writeHeaders(400)
+                                    this.finish()
+                                    return
+                                }
+                            } else {
+                                deleteCheck.bind(this)()
+                            }
+                        }.bind(this)
+                        reader.readAsText(filee)
+                    }.bind(this))
+                } else {
+                    deleteCheck.bind(this)()
+                }})} else {
+                    deleteCheck.bind(this)()
+                }
         },
         put: function() {
-            if (! this.app.opts.optUpload) {
-                this.responseLength = 0
-                this.writeHeaders(400)
-                this.finish()
-                return
+            function putMain() {
+                
+                // if upload enabled in options...
+                // check if file exists...
+                this.fs.getByPath(this.request.path, this.onPutEntry.bind(this), true)
             }
-
-            // if upload enabled in options...
-            // check if file exists...
-            this.fs.getByPath(this.request.path, this.onPutEntry.bind(this), true)
+            function putCheck() {
+                if (! this.app.opts.optUpload) {
+                    this.responseLength = 0
+                    this.writeHeaders(400)
+                    this.finish()
+                    return
+                } else {
+                    putMain.bind(this)()
+                }
+            }
+            
+            if (this.app.opts.optScanForHtaccess) {
+                var fullrequestpath = this.request.origpath
+                    var finapath = fullrequestpath
+                    var finpath = finapath.split('/').pop();
+                    var finalpath = fullrequestpath.substring(0, fullrequestpath.length - finpath.length);
+                if (this.request.path == '') {
+                    var finalpath = '/'
+                }
+                var htaccesspath = finalpath+'wsc.htaccess'
+                //console.log(htaccesspath)
+                this.fs.getByPath(htaccesspath, (file) => {
+                if (! file.error) {
+                    file.file( function(filee) {
+                        var reader = new FileReader();
+                        reader.onload = function(e){
+                            var dataa = e.target.result
+                            if(true) {
+                                try {
+                                    var origdata = JSON.parse(dataa)
+                                } catch(e) {
+                                    this.responseLength = 0
+                                    this.writeHeaders(500)
+                                    this.finish()
+                                    return
+                                }
+                            }
+                            var filerequest = this.request.origpath
+                            var filerequested = filerequest.split('/').pop();
+                            var filefound = false
+                            for (var i=0; i<origdata.length; i++) {
+                                if ((origdata[i].type == 'allow put' && origdata[i].request_path == filerequested) ||
+                                    (origdata[i].type == 'allow put' && origdata[i].request_path == 'all files') ||
+                                    (origdata[i].type == 'deny put' && origdata[i].request_path == filerequested) ||
+                                    (origdata[i].type == 'deny put' && origdata[i].request_path == 'all files')) {
+                                    var data = origdata[i]
+                                    var filefound = true
+                                    break
+                                }
+                            }
+                            //console.log(filefound)
+                            if (filefound) {
+                                if (data.type == 'allow put') {
+                                    putMain.bind(this)()
+                                } else if (data.type == 'deny put') {
+                                    this.responseLength = 0
+                                    this.writeHeaders(400)
+                                    this.finish()
+                                    return
+                                } else {
+                                    putCheck.bind(this)()
+                                }
+                            } else {
+                                putCheck.bind(this)()
+                            }
+                        }.bind(this)
+                        reader.readAsText(filee)
+                    }.bind(this))
+                } else {
+                    putCheck.bind(this)()
+                }})} else {
+                    putCheck.bind(this)()
+                }
         },
         onPutEntry: function(entry) {
             var parts = this.request.path.split('/')
diff --git a/htaccess/README.md b/htaccess/README.md
index ecb00fba..293fe32a 100644
--- a/htaccess/README.md
+++ b/htaccess/README.md
@@ -14,6 +14,10 @@
 <p>401 - Unauthorized. The page will require login. For some reason, I cannot find how to clear the cache of the authorization header, which means that once you type it in, the browser will not ask for a login, unless you have multiple password protected pages with different passwords, The authentication header will change whenever you enter a different password.</p>
 <p>403 - Forbidden. This will deny direct access to image/video/audio files. This option only works if https is enabled or if the user is on a localhost address.</p>
 <p>Render Directory Listing - Ignores the value of 404 instead of directory listing and renders the directory listing</p>
+<p>Deny deleting for a specific file or directory - Ignores value of delete option and will deny delete to requested file (Currently only 1 delete can be set per htaccess file)</p>
+<p>Allow deleting for certian file - Ignores value of delete option and will allow deleting requested file (Currently only 1 delete can be set per htaccess file)</p>
+<p>Deny uploading for a specific file or directory - Ignores value of PUT option and will deny put to requested file (Currently only 1 put can be set per htaccess file)</p>
+<p>Allow uploading for certian file - Ignores value of PUT option and will allow deleting requested file (Currently only 1 put can be set per htaccess file)</p>
 <p>If you want more features - Make an issue!</p>
 <br>
 <h1>Extra Features</h1>
@@ -36,6 +40,10 @@ Note - To set more than 1 ruleset per file, see instruction at bottom of the pag
 Note - 401 (unauthorized) username and passwords are CASE SENSITIVE!!
 <p>Note - wsc.htaccess file MUST be in the same directory as the file you want to change. The file does need to exist, due to the way the web server works.</p>
 <p>IMPORTANT NOTE - EVERYTHING IN THE FILE (AND THE FILE NAME) IS CASE SENSITIVE!!</p>
+<br>
+
+To use option for all files, the value of request path will be 'all files' It should look like this `"request_path": "all files",`
+
 <br>
 <h2>301 Example</h2>
 <p>Tells the server that when chosen file is requested to move to a different directory or file. The browser will cache this</p>
@@ -113,6 +121,54 @@ Note - 401 (unauthorized) username and passwords are CASE SENSITIVE!!
 ]
 ```
 <br>
+<h2>Deny uploading</h2>
+<p>Ignores value of PUT option and will deny put to requested file (Currently only 1 put can be set per htaccess file)</p>
+
+```
+[
+    {
+        "request_path": "name of file you want to modify",
+        "type": "deny put"
+    }
+]
+```
+<br>
+<h2>Deny delete</h2>
+<p>Ignores value of delete option and will deny delete to requested file (Currently only 1 delete can be set per htaccess file)</p>
+
+```
+[
+    {
+        "request_path": "name of file you want to modify",
+        "type": "deny delete"
+    }
+]
+```
+<br>
+<h2>Allow Uploading</h2>
+<p>Ignores value of PUT option and will allow deleting requested file (Currently only 1 put can be set per htaccess file)</p>
+
+```
+[
+    {
+        "request_path": "name of file you want to modify",
+        "type": "allow put"
+    }
+]
+```
+<br>
+<h2>Allow delete</h2>
+<p>Ignores value of delete option and will allow deleting requested file (Currently only 1 delete can be set per htaccess file)</p>
+
+```
+[
+    {
+        "request_path": "name of file you want to modify",
+        "type": "allow delete"
+    }
+]
+```
+<br>
 <h1>How to use more than 1 ruleset per file</h1>
 <p>Pay VERY close attention to the syntax. One thing wrong will cause an error!!</p>
 <p>First, I provide an example</p>
@@ -127,6 +183,10 @@ Note - 401 (unauthorized) username and passwords are CASE SENSITIVE!!
     },
     {
         "type": "directory listing"
+    },
+    {
+        "request_path": "all files",
+        "type": "deny delete"
     }
 ]
 ```

From 93c1fc565c0fb4984e788c369a731097bb48a35f Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Fri, 21 May 2021 10:50:15 -0500
Subject: [PATCH 089/154] Htaccess Bug Squash

---
 handlers.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/handlers.js b/handlers.js
index 39685298..5a3ccc96 100644
--- a/handlers.js
+++ b/handlers.js
@@ -744,6 +744,7 @@
                                             var filerequested = ''
                                         }
                                         htaccessMain.bind(this)(filerequested)
+                                        return
                                     }
                                     var filerequested = this.request.path+'.html'
                                     var filerequested = filerequested.split('/').pop();
@@ -777,7 +778,8 @@
                                         filerequested == '') {
                                         var filerequested = ''
                                     }
-                                    htaccessMain.bind(this)(filerequested)
+                                        htaccessMain.bind(this)(filerequested)
+                                        return
                                     }
                                 })} else {
                                     if (this.entry && this.entry.isDirectory && ! this.request.origpath.endsWith('/')) {
@@ -799,7 +801,7 @@
                                         var filerequested = ''
                                     }
                                     htaccessMain.bind(this)(filerequested)
-                                    
+                                    return
                                 }
                             
                         }.bind(this)

From 403a350f4b8261268b6c5f6616de0f1e982f41b4 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Fri, 21 May 2021 19:08:53 -0500
Subject: [PATCH 090/154] I squashed a bug

---
 handlers.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/handlers.js b/handlers.js
index 5a3ccc96..397837a8 100644
--- a/handlers.js
+++ b/handlers.js
@@ -591,7 +591,7 @@
                                     }
                                     if (data.request_path == filerequested ||
                                         data.request_path == 'all files' ||
-                                        (data.type == 'directory listing' && filerequested == '')) {
+                                        (data.type == 'directory listing' && this.request.uri.split('/').pop() == '')) {
                                         if (data.type == 301 || data.type == 302 || data.type == 307) {
                                             this.setHeader('location', data.redirto)
                                             this.responseLength = 0
@@ -688,7 +688,7 @@
                                                ) {
                                                 this.renderDirectoryListing(results)
                                                 return
-                                                } else {
+                                            } else {
                                                 this.renderDirectoryListingTemplate(results)
                                                 return
                                             }

From df138fc59da857ea40db24543533db394eb11dbf Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Fri, 21 May 2021 21:50:00 -0500
Subject: [PATCH 091/154] Fix 2 bugs I mentioned

---
 handlers.js          | 216 +++++++++++++++++++++++--------------------
 react-ui/js/index.js |  51 ++--------
 2 files changed, 125 insertions(+), 142 deletions(-)

diff --git a/handlers.js b/handlers.js
index 397837a8..7dba61f7 100644
--- a/handlers.js
+++ b/handlers.js
@@ -908,116 +908,132 @@
             if (! WSC.template_data) {
                 return this.renderDirectoryListing(results)
             }
-            function DirRenderFinish() {
-                var data = html.join('\n')
-                data = new TextEncoder('utf-8').encode(data).buffer
-                this.writeChunk(data)
-                this.request.connection.write(WSC.str2ab('0\r\n\r\n'))
-                this.finish()
-            }
-            function sendFileList() {
-                var isdirectory = results[w].isDirectory
-                    results[w].getMetadata(function(file) {
-                        //console.log(file)
-                        var rawname = results[w].name
-                        //from https://stackoverflow.com/questions/10420352/converting-file-size-in-bytes-to-human-readable-string/10420404
-                        function humanFileSize(bytes, si=false, dp=1) {
-                          const thresh = si ? 1000 : 1024;
+            if (results.length > 0) {
+                function DirRenderFinish() {
+                    var data = html.join('\n')
+                    data = new TextEncoder('utf-8').encode(data).buffer
+                    this.writeChunk(data)
+                    this.request.connection.write(WSC.str2ab('0\r\n\r\n'))
+                    this.finish()
+                }
+                function sendFileList() {
+                        results[w].getMetadata(function(file) {
+                            //console.log(file)
+                            var rawname = results[w].name
+                            //from https://stackoverflow.com/questions/10420352/converting-file-size-in-bytes-to-human-readable-string/10420404
+                            function humanFileSize(bytes, si=false, dp=1) {
+                              const thresh = si ? 1000 : 1024;
 
-                          if (Math.abs(bytes) < thresh) {
-                            return bytes + ' B';
-                          }
+                              if (Math.abs(bytes) < thresh) {
+                                return bytes + ' B';
+                              }
 
-                          const units = si 
-                            ? ['kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'] 
-                            : ['KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];
-                          let u = -1;
-                          const r = 10**dp;
+                              const units = si 
+                                ? ['kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'] 
+                                : ['KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];
+                              let u = -1;
+                              const r = 10**dp;
 
-                          do {
-                            bytes /= thresh;
-                            ++u;
-                          } while (Math.round(Math.abs(bytes) * r) / r >= thresh && u < units.length - 1);
+                              do {
+                                bytes /= thresh;
+                                ++u;
+                              } while (Math.round(Math.abs(bytes) * r) / r >= thresh && u < units.length - 1);
 
 
-                          return bytes.toFixed(dp) + ' ' + units[u];
-                        }
-                        
-                        var lastModifiedMonth = file.modificationTime.getMonth() + 1
-                        var lastModifiedDay = file.modificationTime.getDate()
-                        var lastModifiedYear = file.modificationTime.getFullYear().toString().substring(2, 4)
-                        var lastModifiedHours = file.modificationTime.getHours() + 1
-                        var lastModifiedMinutes = file.modificationTime.getMinutes() + 1
-                        var lastModifiedSeconds = file.modificationTime.getSeconds() + 1
+                              return bytes.toFixed(dp) + ' ' + units[u];
+                            }
 
-                        var lastModified = lastModifiedMonth+
-                                           lastModifiedDay+
-                                           lastModifiedYear+
-                                           lastModifiedHours+
-                                           lastModifiedMinutes+
-                                           lastModifiedSeconds
-                        if (lastModifiedSeconds.toString().length != 2) {
-                            var lastModifiedSeconds = '0' + lastModifiedSeconds
-                        }
-                        if (lastModifiedMinutes.toString().length != 2) {
-                            var lastModifiedMinutes = '0' + lastModifiedMinutes
-                        }
-                        if (lastModifiedDay.toString().length != 2) {
-                            var lastModifiedDay = '0' + lastModifiedDay
-                        }
-                        if (lastModifiedHours >= 12) {
-                            var lastModifiedAmPm = 'PM'
-                            if (lastModifiedHours > 12) {
-                                var lastModifiedHours = lastModifiedHours - 12
+                            var lastModifiedMonth = file.modificationTime.getMonth() + 1
+                            var lastModifiedDay = file.modificationTime.getDate()
+                            var lastModifiedYear = file.modificationTime.getFullYear().toString().substring(2, 4)
+                            var lastModifiedHours = file.modificationTime.getHours() + 1
+                            var lastModifiedMinutes = file.modificationTime.getMinutes() + 1
+                            var lastModifiedSeconds = file.modificationTime.getSeconds() + 1
+
+                            var lastModified = lastModifiedMonth+
+                                               lastModifiedDay+
+                                               lastModifiedYear+
+                                               lastModifiedHours+
+                                               lastModifiedMinutes+
+                                               lastModifiedSeconds
+                            if (lastModifiedSeconds.toString().length != 2) {
+                                var lastModifiedSeconds = '0' + lastModifiedSeconds
                             }
-                        } else {
-                            var lastModifiedAmPm = 'AM'
-                        }
-                        var lastModifiedStr = lastModifiedMonth+'/'+
-                                              lastModifiedDay+'/'+
-                                              lastModifiedYear+', '+
-                                              lastModifiedHours+':'+
-                                              lastModifiedMinutes+':'+
-                                              lastModifiedSeconds +' '+
-                                              lastModifiedAmPm
+                            if (lastModifiedMinutes.toString().length != 2) {
+                                var lastModifiedMinutes = '0' + lastModifiedMinutes
+                            }
+                            if (lastModifiedDay.toString().length != 2) {
+                                var lastModifiedDay = '0' + lastModifiedDay
+                            }
+                            if (lastModifiedHours >= 12) {
+                                var lastModifiedAmPm = 'PM'
+                                if (lastModifiedHours > 12) {
+                                    var lastModifiedHours = lastModifiedHours - 12
+                                }
+                            } else {
+                                var lastModifiedAmPm = 'AM'
+                            }
+                            var lastModifiedStr = lastModifiedMonth+'/'+
+                                                  lastModifiedDay+'/'+
+                                                  lastModifiedYear+', '+
+                                                  lastModifiedHours+':'+
+                                                  lastModifiedMinutes+':'+
+                                                  lastModifiedSeconds +' '+
+                                                  lastModifiedAmPm
 
-                        var name = encodeURIComponent(results[w].name)
-                        var isdirectory = results[w].isDirectory
-                        //var modified = '4/27/21, 10:38:40 AM'
-                        var modified = lastModified
-                        var filesize = file.size
-                        var filesizestr = humanFileSize(file.size)
-                        var modifiedstr = lastModifiedStr
-                        // raw, urlencoded, isdirectory, size, size as string, date modified, date modified as string
-                        if (rawname != 'wsc.htaccess') {
-                        html.push('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+',"'+filesize+'","'+filesizestr+'","'+modified+'","'+modifiedstr+'");</script>')
-                        }
-                        if (w != results.length - 1) {
-                            w++
-                            sendFileList.bind(this, results)()
-                        } else {
-                            DirRenderFinish.bind(this, results)()
-                        }
-                    }.bind(this), function(error) {
-                        console.log('error reading metadata '+error.code)
-                        if (w != results.length - 1) {
-                            w++
-                            sendFileList.bind(this, results)()
-                        } else {
-                            DirRenderFinish.bind(this, results)()
-                        }
-                    }.bind(this))}
-                this.setHeader('transfer-encoding','chunked')
-                this.writeHeaders(200)
-                this.writeChunk(WSC.template_data )
-                if (this.request.path != '') {
-                    var html = ['<script>start("'+this.request.path+'")</script>',
-                                '<script>onHasParentDirectory();</script>']
+                            var name = encodeURIComponent(results[w].name)
+                            var isdirectory = results[w].isDirectory
+                            //var modified = '4/27/21, 10:38:40 AM'
+                            var modified = lastModified
+                            var filesize = file.size
+                            var filesizestr = humanFileSize(file.size)
+                            var modifiedstr = lastModifiedStr
+                            // raw, urlencoded, isdirectory, size, size as string, date modified, date modified as string
+                            if (rawname != 'wsc.htaccess') {
+                            html.push('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+',"'+filesize+'","'+filesizestr+'","'+modified+'","'+modifiedstr+'");</script>')
+                            }
+                            if (w != results.length - 1) {
+                                w++
+                                sendFileList.bind(this, results)()
+                            } else {
+                                DirRenderFinish.bind(this, results)()
+                            }
+                        }.bind(this), function(error) {
+                            console.log('error reading metadata '+error.code)
+                            if (w != results.length - 1) {
+                                w++
+                                sendFileList.bind(this, results)()
+                            } else {
+                                DirRenderFinish.bind(this, results)()
+                            }
+                        }.bind(this))}
+                    this.setHeader('transfer-encoding','chunked')
+                    this.writeHeaders(200)
+                    this.writeChunk(WSC.template_data )
+                    if (this.request.path != '') {
+                        var html = ['<script>start("'+this.request.path+'")</script>',
+                                    '<script>onHasParentDirectory();</script>']
+                    } else {
+                        var html = ['<script>start("/")</script>']
+                    }
+                    var w = 0
+                    sendFileList.bind(this, results)()
                 } else {
-                    var html = ['<script>start("/")</script>']
+                    this.setHeader('transfer-encoding','chunked')
+                    this.writeHeaders(200)
+                    this.writeChunk(WSC.template_data )
+                    if (this.request.path != '') {
+                        var html = ['<script>start("'+this.request.path+'")</script>',
+                                    '<script>onHasParentDirectory();</script>']
+                    } else {
+                        var html = ['<script>start("/")</script>']
+                    }
+                    var data = html.join('\n')
+                    data = new TextEncoder('utf-8').encode(data).buffer
+                    this.writeChunk(data)
+                    this.request.connection.write(WSC.str2ab('0\r\n\r\n'))
+                    this.finish()
                 }
-                var w = 0
-                sendFileList.bind(this, results)()
         },
         renderDirectoryListing: function(results) {
             var html = ['<html>']
diff --git a/react-ui/js/index.js b/react-ui/js/index.js
index e8840189..4fb8d17f 100644
--- a/react-ui/js/index.js
+++ b/react-ui/js/index.js
@@ -267,26 +267,14 @@ class App extends React.Component {
   }
   render() {
     // option: [dependencies]
-    const optbackgroundMain = {
-      optBackground: null
-    };
-    const optbackgroundOptions = {
-      optAutoStart: ['optBackground']
-    };
-    const optavailabilityMain = {
-      optAllInterfaces: null
-    };
-    const optavailabilityOptions = {
-      optDoPortMapping: ['optAllInterfaces']
-    };
-    const optIndexMain = {
+    const optDisplay = {
+      optBackground: null,
+      optAutoStart: ['optBackground'],
+      optAllInterfaces: null,
+      optDoPortMapping: ['optAllInterfaces'],
       optPreventSleep: null,
-      optRenderIndex: null
-    };
-    const optIndexOptions = {
-      optDir404: ['optRenderIndex']
-    };
-    const optPortOption = {
+      optRenderIndex: null,
+      optDir404: ['optRenderIndex'],
       port: null
     };
     const optAdvanced = {
@@ -368,6 +356,7 @@ class App extends React.Component {
       return options;
     }
 
+    const options = renderOpts(optDisplay)
     const advOptions = renderOpts(optAdvanced)
     const advancedButton = (<div><a href="#" onClick={e => {
       e.preventDefault();
@@ -379,10 +368,6 @@ class App extends React.Component {
     const HtaccessMain = renderOpts(optHtaccess)
     const rewriteMain = renderOpts(optRewrite)
     const httpsMain = renderOpts(optHttps)
-    const Portoption = renderOpts(optPortOption)
-    const IndexMain = renderOpts(optIndexMain)
-    const AvailabilityMain = renderOpts(optavailabilityMain)
-    const BackgroundMain = renderOpts(optbackgroundMain)
     const Custom401Main = renderOpts(optCustom401Main)
     const Custom403Main = renderOpts(optCustom403Main)
     const Custom400Main = renderOpts(optCustom400Main)
@@ -431,24 +416,6 @@ class App extends React.Component {
       return [(<div>{!disablefive && textboxefive}</div>)];
     })();
 
-    const IndexOptions = (() => {
-      let disablesix = (!this.webapp || !this.webapp.opts.optRenderIndex);
-      const textboxessix = renderOpts(optIndexOptions)
-      return [(<div>{!disablesix && textboxessix}</div>)];
-    })();
-
-    const AvailabilityOptions = (() => {
-      let disableseven = (!this.webapp || !this.webapp.opts.optAllInterfaces);
-      const textboxesseven = renderOpts(optavailabilityOptions)
-      return [(<div>{!disableseven && textboxesseven}</div>)];
-    })();
-
-    const BackgroundOptions = (() => {
-      let disableeight = (!this.webapp || !this.webapp.opts.optBackground);
-      const textboxeseight = renderOpts(optbackgroundOptions)
-      return [(<div>{!disableeight && textboxeseight}</div>)];
-    })();
-
     const httpsOptions = (() => {
       let disable = (!this.webapp || !this.webapp.opts.optUseHttps);
       let hasCrypto = this.webapp && (this.webapp.opts.optPrivateKey || this.webapp.opts.optCertificate);
@@ -522,7 +489,7 @@ class App extends React.Component {
             <span>Options (may require restart)</span>
           </Tooltip>
           
-          {BackgroundMain}{BackgroundOptions}{AvailabilityMain}{AvailabilityOptions}{IndexMain}{IndexOptions}{Portoption}
+          {options}
 
           {advancedButton}
           {state.showAdvanced && <div>{advOptions}{Custom400Main}{Custom400Options}{Custom401Main}{Custom401Options}{Custom403Main}{Custom403Options}{Custom404Main}{Custom404Options}{Custom404OptionsPt2}{HtaccessMain}{HtaccessInfo}{rewriteMain}{rewriteOptions}{httpsMain}{httpsOptions}</div> }

From 3883e94b4012ee3ed332d9c830c5f11b95cd72b4 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Fri, 21 May 2021 22:04:43 -0500
Subject: [PATCH 092/154] Change some outdated info

---
 README.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index ad975da6..a67b6ec0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<a target="_blank" href="https://chrome.google.com/webstore/detail/web-server-for-chrome/ofhbbkphhbklhfoeikjpcbhemlocgigb">![Try it now in CWS](https://raw.githubusercontent.com/kzahel/web-server-chrome/master/images/200ok-128.png "Click here to install this sample from the Chrome Web Store")</a>
+<a target="_blank" href="https://chrome.google.com/webstore/detail/web-server-for-chrome/ofhbbkphhbklhfoeikjpcbhemlocgigb">![Try it now in CWS](https://raw.githubusercontent.com/GoogleChrome/chrome-extensions-samples/master/apps/tryitnowbutton.png "Click here to install this sample from the Chrome Web Store")</a>
 
 ## Web Server for Chrome
 
@@ -19,10 +19,14 @@ Features
 - options for autostart, start in background, etc etc.
 - handles range requests, HEAD, etc
 - options for CORS
-- optional PUT, DELETE request (for upload files)
+- optional PUT request (for uploading files)
+- optional DELETE request (for deleting files)
 - sets MIME types
 - can render directory listing
-- See relevant options: https://github.com/kzahel/web-server-chrome/blob/master/polymer-ui/options.js
+- Custom 400, 401, 403, and 404 pages
+- option to exclude .html extension
+- htaccess like feature: https://github.com/ethanaobrien/web-server-chrome/blob/master/htaccess/README.md
+- See relevant options: https://github.com/kzahel/web-server-chrome/blob/master/react-ui/js/options.js
 
 
 How to include into your own chrome app

From b601fc8f2fe011e30aeaa72a9ad0b7b311b74a9c Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Sat, 22 May 2021 21:56:04 -0500
Subject: [PATCH 093/154] Update htaccess handler

---
 handlers.js        | 134 ++++++++++++++++++++++++---------------------
 htaccess/README.md |  22 +++++---
 2 files changed, 84 insertions(+), 72 deletions(-)

diff --git a/handlers.js b/handlers.js
index 7dba61f7..20f569b8 100644
--- a/handlers.js
+++ b/handlers.js
@@ -559,6 +559,8 @@
                             
                             function htaccessMain(filerequested) {
                                 var filefound = false
+                                var auth = false
+                                var authdata
                                 for (var i=0; i<origdata.length; i++) {
                                     origdata[i].original_request_path = origdata[i].request_path
                                     if (origdata[i].request_path == 'index.html' ||
@@ -569,79 +571,38 @@
                                         origdata[i].request_path == '') {
                                         origdata[i].request_path = ''
                                     }
+                                    if (origdata[i].type == 401 &&
+                                        (origdata[i].request_path == filerequested || origdata[i].request_path == 'all files')) {
+                                        var auth = true
+                                        var authdata = origdata[i]
+                                        break
+                                    }
+                                }
+                                for (var i=0; i<origdata.length; i++) {
                                     //console.log(origdata)
                                     if (origdata[i].request_path == filerequested ||
                                         origdata[i].request_path == 'all files' ||
-                                        (origdata[i].type == 'directory listing' && filerequested == '')) {
+                                        (origdata[i].type == 'directory listing' && this.request.uri.split('/').pop() == '')) {
+                                        if (origdata[i].type != 'allow delete' &&
+                                            origdata[i].type != 'allow put' &&
+                                            origdata[i].type != 'deny delete' &&
+                                            origdata[i].type != 'deny put' &&
+                                            origdata[i].type != 401) {
                                         var data = origdata[i]
                                         //console.log(data)
                                         var filefound = true
                                         break
+                                        }
                                     }
                                 }
                                 //console.log(filefound)
-                                if (filefound) {
-                                    if (data.request_path == 'index.html' ||
-                                        data.request_path == 'index.htm' ||
-                                        data.request_path == 'index' ||
-                                        data.request_path == 'index.xhtm' ||
-                                        data.request_path == 'index.xhtml' ||
-                                        data.request_path == '') {
-                                        data.request_path = ''
-                                    }
-                                    if (data.request_path == filerequested ||
-                                        data.request_path == 'all files' ||
-                                        (data.type == 'directory listing' && this.request.uri.split('/').pop() == '')) {
+                                    function htaccessCheck2() {
+                                        if (filefound) {
                                         if (data.type == 301 || data.type == 302 || data.type == 307) {
                                             this.setHeader('location', data.redirto)
                                             this.responseLength = 0
                                             this.writeHeaders(data.type)
                                             this.finish()
-                                    } else if (data.type == 401) {
-                                        var validAuth = false
-                                        var auth = this.request.headers['authorization']
-                                        if (auth) {
-                                            if (auth.slice(0,6).toLowerCase() == 'basic ') {
-                                                var userpass = atob(auth.slice(6,auth.length)).split(':')
-                                                if (userpass[0] == data.username && userpass[1] == data.password) {
-                                                    validAuth = true
-                                                }
-                                            }
-                                        }
-                                        if (! validAuth) {
-                                            if (this.app.opts.optCustom401) {
-                                                this.fs.getByPath(this.app.opts.optCustom401location, (file) => {
-                                                if (! file.error) {
-                                                    file.file( function(filee) {
-                                                        var reader = new FileReader();
-                                                        reader.onload = function(e){
-                                                            this.useDefaultMime = false
-                                                            var data = e.target.result
-                                                            this.setHeader('content-type','text/html; charset=utf-8')
-                                                            this.setHeader("WWW-Authenticate", "Basic")
-                                                            this.write(data, 401)
-                                                            this.finish()
-                                                            this.useDefaultMime = true
-                                                        }.bind(this)
-                                                        reader.readAsText(filee)
-                                                    }.bind(this))
-                                                } else {
-                                                    this.write('Path of 401 html was not found - 401 path is set to: '+this.app.opts.optCustom401location, 500)
-                                                    this.finish()
-                                                }})
-                                            } else {
-                                                this.useDefaultMime = false
-                                                this.setHeader('content-type','text/html; charset=utf-8')
-                                                this.setHeader("WWW-Authenticate", "Basic")
-                                                this.write("<h1>401 - Unauthorized</h1>", 401)
-                                                this.finish()
-                                                return
-                                                this.useDefaultMime = true
-                                            }
-                                        }
-                                        if (validAuth) {
-                                            excludedothtmlcheck.bind(this)()
-                                        }
                                     } else if (data.type == 403) {
                                         var method = this.request.headers['sec-fetch-dest']
                                         //console.log(method)
@@ -718,14 +679,61 @@
                                                             onreaderr.bind(this))
 
 
+                                        } else {
+                                            excludedothtmlcheck.bind(this)()
+                                        }
                                     } else {
                                         excludedothtmlcheck.bind(this)()
-                                    }} else {
-                                        excludedothtmlcheck.bind(this)()
                                     }
-                                } else {
-                                    excludedothtmlcheck.bind(this)()
-                                }
+                                    }
+                                    if (auth && authdata.type == 401) {
+                                            var validAuth = false
+                                            var auth = this.request.headers['authorization']
+                                            if (auth) {
+                                                if (auth.slice(0,6).toLowerCase() == 'basic ') {
+                                                    var userpass = atob(auth.slice(6,auth.length)).split(':')
+                                                    if (userpass[0] == authdata.username && userpass[1] == authdata.password) {
+                                                        validAuth = true
+                                                    }
+                                                }
+                                            }
+                                            if (! validAuth) {
+                                                if (this.app.opts.optCustom401) {
+                                                    this.fs.getByPath(this.app.opts.optCustom401location, (file) => {
+                                                    if (! file.error) {
+                                                        file.file( function(filee) {
+                                                            var reader = new FileReader();
+                                                            reader.onload = function(e){
+                                                                this.useDefaultMime = false
+                                                                var data = e.target.result
+                                                                this.setHeader('content-type','text/html; charset=utf-8')
+                                                                this.setHeader("WWW-Authenticate", "Basic")
+                                                                this.write(data, 401)
+                                                                this.finish()
+                                                                this.useDefaultMime = true
+                                                            }.bind(this)
+                                                            reader.readAsText(filee)
+                                                        }.bind(this))
+                                                    } else {
+                                                        this.write('Path of 401 html was not found - 401 path is set to: '+this.app.opts.optCustom401location, 500)
+                                                        this.finish()
+                                                    }})
+                                                } else {
+                                                    this.useDefaultMime = false
+                                                    this.setHeader('content-type','text/html; charset=utf-8')
+                                                    this.setHeader("WWW-Authenticate", "Basic")
+                                                    this.write("<h1>401 - Unauthorized</h1>", 401)
+                                                    this.finish()
+                                                    this.useDefaultMime = true
+                                                    return
+                                                }
+                                            }
+                                            if (validAuth) {
+                                                htaccessCheck2.bind(this)()
+                                            }
+                                        } else {
+                                            htaccessCheck2.bind(this)()
+                                        }
 
                             }
                             var filerequest = this.request.origpath
diff --git a/htaccess/README.md b/htaccess/README.md
index 293fe32a..f7781511 100644
--- a/htaccess/README.md
+++ b/htaccess/README.md
@@ -14,10 +14,10 @@
 <p>401 - Unauthorized. The page will require login. For some reason, I cannot find how to clear the cache of the authorization header, which means that once you type it in, the browser will not ask for a login, unless you have multiple password protected pages with different passwords, The authentication header will change whenever you enter a different password.</p>
 <p>403 - Forbidden. This will deny direct access to image/video/audio files. This option only works if https is enabled or if the user is on a localhost address.</p>
 <p>Render Directory Listing - Ignores the value of 404 instead of directory listing and renders the directory listing</p>
-<p>Deny deleting for a specific file or directory - Ignores value of delete option and will deny delete to requested file (Currently only 1 delete can be set per htaccess file)</p>
-<p>Allow deleting for certian file - Ignores value of delete option and will allow deleting requested file (Currently only 1 delete can be set per htaccess file)</p>
-<p>Deny uploading for a specific file or directory - Ignores value of PUT option and will deny put to requested file (Currently only 1 put can be set per htaccess file)</p>
-<p>Allow uploading for certian file - Ignores value of PUT option and will allow deleting requested file (Currently only 1 put can be set per htaccess file)</p>
+<p>Deny deleting for a specific file or directory - Ignores value of delete option and will deny delete to requested file</p>
+<p>Allow deleting for certian file - Ignores value of delete option and will allow deleting requested file</p>
+<p>Deny uploading for a specific file or directory - Ignores value of PUT option and will deny put to requested file</p>
+<p>Allow uploading for certian file - Ignores value of PUT option and will allow deleting requested file.</p>
 <p>If you want more features - Make an issue!</p>
 <br>
 <h1>Extra Features</h1>
@@ -122,7 +122,7 @@ To use option for all files, the value of request path will be 'all files' It sh
 ```
 <br>
 <h2>Deny uploading</h2>
-<p>Ignores value of PUT option and will deny put to requested file (Currently only 1 put can be set per htaccess file)</p>
+<p>Ignores value of PUT option and will deny put to requested file</p>
 
 ```
 [
@@ -134,7 +134,7 @@ To use option for all files, the value of request path will be 'all files' It sh
 ```
 <br>
 <h2>Deny delete</h2>
-<p>Ignores value of delete option and will deny delete to requested file (Currently only 1 delete can be set per htaccess file)</p>
+<p>Ignores value of delete option and will deny delete to requested file</p>
 
 ```
 [
@@ -146,7 +146,7 @@ To use option for all files, the value of request path will be 'all files' It sh
 ```
 <br>
 <h2>Allow Uploading</h2>
-<p>Ignores value of PUT option and will allow deleting requested file (Currently only 1 put can be set per htaccess file)</p>
+<p>Ignores value of PUT option and will allow deleting requested file</p>
 
 ```
 [
@@ -158,7 +158,7 @@ To use option for all files, the value of request path will be 'all files' It sh
 ```
 <br>
 <h2>Allow delete</h2>
-<p>Ignores value of delete option and will allow deleting requested file (Currently only 1 delete can be set per htaccess file)</p>
+<p>Ignores value of delete option and will allow deleting requested file</p>
 
 ```
 [
@@ -194,4 +194,8 @@ To use option for all files, the value of request path will be 'all files' It sh
 You basically have `[` and `]` surrounding the entire file and each ruleset inside `{` these `}`
 You MUST separate each ruleset with a comma (As shown in the example). The failure to do so will result in an error.
 For the last ruleset, no comma can be after the `}`. This will break the array and give you an error.
-Currently, each file can only have 1 ruleset.
+
+When using multiple rulesets per file, the server will first check if an authentication rule is in place. If it is, the server will require the user to enter the password before it will allow the user to do anything. After the user has correct auth (if the auth is present) it will check for rulesets from the top of the file, to the bottom. The redirects and the directory listing cannot both be used, whatever the web server picks up first is what will be executed.
+
+
+

From 61b007a3e5a9d6812e6a9008304b4c28523a995d Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Sun, 23 May 2021 10:34:39 -0500
Subject: [PATCH 094/154] Update handlers.js

Fix time
---
 handlers.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/handlers.js b/handlers.js
index 20f569b8..7f1839fc 100644
--- a/handlers.js
+++ b/handlers.js
@@ -954,9 +954,9 @@
                             var lastModifiedMonth = file.modificationTime.getMonth() + 1
                             var lastModifiedDay = file.modificationTime.getDate()
                             var lastModifiedYear = file.modificationTime.getFullYear().toString().substring(2, 4)
-                            var lastModifiedHours = file.modificationTime.getHours() + 1
-                            var lastModifiedMinutes = file.modificationTime.getMinutes() + 1
-                            var lastModifiedSeconds = file.modificationTime.getSeconds() + 1
+                            var lastModifiedHours = file.modificationTime.getHours()
+                            var lastModifiedMinutes = file.modificationTime.getMinutes()
+                            var lastModifiedSeconds = file.modificationTime.getSeconds()
 
                             var lastModified = lastModifiedMonth+
                                                lastModifiedDay+

From 1863b5376c67fe3204be702acd4c3e3e520f71b4 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Sun, 23 May 2021 11:30:41 -0500
Subject: [PATCH 095/154] auth

---
 react-ui/js/index.js   | 30 ++++++++++++++++++++++++--
 react-ui/js/options.js | 18 ++++++++++++++++
 webapp.js              | 49 +++++++++++++++++++++++++++++++++---------
 3 files changed, 85 insertions(+), 12 deletions(-)

diff --git a/react-ui/js/index.js b/react-ui/js/index.js
index 4fb8d17f..f217a218 100644
--- a/react-ui/js/index.js
+++ b/react-ui/js/index.js
@@ -107,6 +107,18 @@ const functions = {
     console.assert(typeof val === 'string')
     app.webapp.updateOption('optCustom404usevarvar', val);
   },
+  optUsebasicauth: (app, k, val) => {
+    console.assert(typeof val === 'string')
+    app.webapp.updateOption('optUsebasicauth', val);
+  },
+  optAuthUsername: (app, k, val) => {
+    console.assert(typeof val === 'string')
+    app.webapp.updateOption('optAuthUsername', val);
+  },
+  optAuthPassword: (app, k, val) => {
+    console.assert(typeof val === 'string')
+    app.webapp.updateOption('optAuthPassword', val);
+  },
   optPrivateKey: (app, k, val) => {
     //console.log('privateKey')
     console.assert(typeof val === 'string')
@@ -314,6 +326,13 @@ class App extends React.Component {
     const optCustom401Info = {
       optCustom401location: ['optCustom401']
     };
+	const optAuthMain = {
+	  optUsebasicauth: null
+	};
+	const optAuthOptions = {
+	  optAuthUsername: ['optUsebasicauth'],
+	  optAuthPassword: ['optUsebasicauth']
+	}
     const optHtaccess = {
       optScanForHtaccess: null
     };
@@ -371,7 +390,8 @@ class App extends React.Component {
     const Custom401Main = renderOpts(optCustom401Main)
     const Custom403Main = renderOpts(optCustom403Main)
     const Custom400Main = renderOpts(optCustom400Main)
-    
+    const authMain = renderOpts(optAuthMain)
+	
     const HtaccessInfo = (() => {
       let disablezero = (!this.webapp || !this.webapp.opts.optScanForHtaccess);
       const htaccesstextbox = renderOpts(optHtaccessOptions)
@@ -416,6 +436,12 @@ class App extends React.Component {
       return [(<div>{!disablefive && textboxefive}</div>)];
     })();
 
+    const authOptions = (() => {
+      let disableeleven = (!this.webapp || !this.webapp.opts.optUsebasicauth);
+      const textboxeeleven = renderOpts(optAuthOptions)
+      return [(<div>{!disableeleven && textboxeeleven}</div>)];
+    })();
+
     const httpsOptions = (() => {
       let disable = (!this.webapp || !this.webapp.opts.optUseHttps);
       let hasCrypto = this.webapp && (this.webapp.opts.optPrivateKey || this.webapp.opts.optCertificate);
@@ -492,7 +518,7 @@ class App extends React.Component {
           {options}
 
           {advancedButton}
-          {state.showAdvanced && <div>{advOptions}{Custom400Main}{Custom400Options}{Custom401Main}{Custom401Options}{Custom403Main}{Custom403Options}{Custom404Main}{Custom404Options}{Custom404OptionsPt2}{HtaccessMain}{HtaccessInfo}{rewriteMain}{rewriteOptions}{httpsMain}{httpsOptions}</div> }
+          {state.showAdvanced && <div>{advOptions}{Custom400Main}{Custom400Options}{Custom401Main}{Custom401Options}{Custom403Main}{Custom403Options}{Custom404Main}{Custom404Options}{Custom404OptionsPt2}{authMain}{authOptions}{HtaccessMain}{HtaccessInfo}{rewriteMain}{rewriteOptions}{httpsMain}{httpsOptions}</div> }
         </CardContent>
       </Card>
 
diff --git a/react-ui/js/options.js b/react-ui/js/options.js
index 28156c24..db739309 100644
--- a/react-ui/js/options.js
+++ b/react-ui/js/options.js
@@ -145,6 +145,24 @@ const options = {
     visible: false,
     default: true
   },
+  optUsebasicauth: {
+	label: 'Use basic auth',
+	help: 'Webserver will require auth to access',
+	type: Boolean,
+	default: false
+  },
+  optAuthUsername: {
+    label: 'Username',
+    help: 'Username',
+    type: String,
+    default: 'admin'
+  },
+  optAuthPassword: {
+    label: 'Password',
+    help: 'Password',
+    type: String,
+    default: 'admin'
+  },
   optPreventSleep: {
     label: 'Prevent computer from sleeping',
     help: 'If the server is running, prevent the computer from going into sleep mode',
diff --git a/webapp.js b/webapp.js
index d8e80c14..c36fd20a 100644
--- a/webapp.js
+++ b/webapp.js
@@ -530,6 +530,41 @@
                 handler.finish()
             }
         },
+		render401HTML: function(request) {
+            var handler = new WSC.BaseHandler(request)
+		    handler.app = this
+            handler.request = request
+            if (this.opts.optCustom401) {
+                this.fs.getByPath(this.opts.optCustom401location, (file) => {
+                if (! file.error) {
+                    file.file( function(filee) {
+                        var reader = new FileReader();
+                        reader.onload = function(e){
+                            this.useDefaultMime = false
+                            var data = e.target.result
+                            handler.setHeader('content-type','text/html; charset=utf-8')
+                            handler.setHeader("WWW-Authenticate", "Basic")
+                            handler.write(data, 401)
+                            handler.finish()
+                            this.useDefaultMime = true
+                            return
+                        }.bind(this)
+                        reader.readAsText(filee)
+                    }.bind(this))
+                } else {
+                    handler.write('Path of 401 html was not found - 401 path is set to: '+this.opts.optCustom401location, 500)
+                    handler.finish()
+                }})
+            } else {
+                this.useDefaultMime = false
+                handler.setHeader('content-type','text/html; charset=utf-8')
+                handler.setHeader("WWW-Authenticate", "Basic")
+                handler.write("<h1>401 - Unauthorized</h1>", 401)
+                handler.finish()
+                this.useDefaultMime = true
+                return
+            }
+		},
         onRequest: function(stream, connection, request) {
             console.log('Request',request.method, request.uri)
 
@@ -546,27 +581,21 @@
             }
 
 
-            if (this.opts.auth) {
+            if (this.opts.optUsebasicauth) {
                 var validAuth = false
                 var auth = request.headers['authorization']
                 if (auth) {
                     if (auth.slice(0,6).toLowerCase() == 'basic ') {
                         var userpass = atob(auth.slice(6,auth.length)).split(':')
-                        if (userpass[0] == this.opts.auth.username &&
-                            userpass[1] == this.opts.auth.password) {
+                        if (userpass[0] == this.opts.optAuthUsername &&
+                            userpass[1] == this.opts.optAuthPassword) {
                             validAuth = true
                         }
                     }
                 }
 
                 if (! validAuth) {
-                    var handler = new WSC.BaseHandler(request)
-                    
-                    handler.app = this
-                    handler.request = request
-                    handler.setHeader("WWW-Authenticate", "Basic")
-                    handler.write("", 401)
-                    handler.finish()
+                    this.render401HTML.bind(this)(request)
                     return
                 }
             }

From 7df38dc8bad9969d6259afdf08ebc04c3111736f Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Mon, 24 May 2021 22:12:03 -0500
Subject: [PATCH 096/154] Add cache control option

---
 handlers.js            |  3 +++
 react-ui/js/index.js   | 21 +++++++++++++++++++--
 react-ui/js/options.js | 12 ++++++++++++
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/handlers.js b/handlers.js
index 7f1839fc..c5317c2e 100644
--- a/handlers.js
+++ b/handlers.js
@@ -529,6 +529,9 @@
                 onEntryMain.bind(this)()
             }
         }
+            if (this.app.opts.optCacheControl) {
+                this.setHeader('Cache-Control',this.app.opts.optCacheControlValue)
+            }
         
             if (this.app.opts.optScanForHtaccess) {
                 var fullrequestpath = this.request.origpath
diff --git a/react-ui/js/index.js b/react-ui/js/index.js
index f217a218..ae4d1f5e 100644
--- a/react-ui/js/index.js
+++ b/react-ui/js/index.js
@@ -87,6 +87,10 @@ const functions = {
 			bg.backgroundSettingChange({'optBackground':val})
 		}
   },
+  optCacheControlValue: (app, k, val) => {
+    console.assert(typeof val === 'string')
+    app.webapp.updateOption('optCacheControlValue', val);
+  },
   optCustom400location: (app, k, val) => {
     console.assert(typeof val === 'string')
     app.webapp.updateOption('optCustom400location', val);
@@ -332,7 +336,13 @@ class App extends React.Component {
 	const optAuthOptions = {
 	  optAuthUsername: ['optUsebasicauth'],
 	  optAuthPassword: ['optUsebasicauth']
-	}
+	};
+	const optCacheMain = {
+	  optCacheControl: null
+	};
+	const optCacheOptions = {
+	  optCacheControlValue: ['optCacheControl']
+	};
     const optHtaccess = {
       optScanForHtaccess: null
     };
@@ -391,6 +401,7 @@ class App extends React.Component {
     const Custom403Main = renderOpts(optCustom403Main)
     const Custom400Main = renderOpts(optCustom400Main)
     const authMain = renderOpts(optAuthMain)
+    const cacheMain = renderOpts(optCacheMain)
 	
     const HtaccessInfo = (() => {
       let disablezero = (!this.webapp || !this.webapp.opts.optScanForHtaccess);
@@ -442,6 +453,12 @@ class App extends React.Component {
       return [(<div>{!disableeleven && textboxeeleven}</div>)];
     })();
 
+    const cacheOptions = (() => {
+      let disabletwelve = (!this.webapp || !this.webapp.opts.optCacheControl);
+      const textboxetwelve = renderOpts(optCacheOptions)
+      return [(<div>{!disabletwelve && textboxetwelve}</div>)];
+    })();
+
     const httpsOptions = (() => {
       let disable = (!this.webapp || !this.webapp.opts.optUseHttps);
       let hasCrypto = this.webapp && (this.webapp.opts.optPrivateKey || this.webapp.opts.optCertificate);
@@ -518,7 +535,7 @@ class App extends React.Component {
           {options}
 
           {advancedButton}
-          {state.showAdvanced && <div>{advOptions}{Custom400Main}{Custom400Options}{Custom401Main}{Custom401Options}{Custom403Main}{Custom403Options}{Custom404Main}{Custom404Options}{Custom404OptionsPt2}{authMain}{authOptions}{HtaccessMain}{HtaccessInfo}{rewriteMain}{rewriteOptions}{httpsMain}{httpsOptions}</div> }
+          {state.showAdvanced && <div>{advOptions}{Custom400Main}{Custom400Options}{Custom401Main}{Custom401Options}{Custom403Main}{Custom403Options}{Custom404Main}{Custom404Options}{Custom404OptionsPt2}{authMain}{authOptions}{HtaccessMain}{HtaccessInfo}{cacheMain}{cacheOptions}{rewriteMain}{rewriteOptions}{httpsMain}{httpsOptions}</div> }
         </CardContent>
       </Card>
 
diff --git a/react-ui/js/options.js b/react-ui/js/options.js
index db739309..262a044a 100644
--- a/react-ui/js/options.js
+++ b/react-ui/js/options.js
@@ -163,6 +163,18 @@ const options = {
     type: String,
     default: 'admin'
   },
+  optCacheControl: {
+    label: 'Enable Cache Control Header',
+    help: 'Client will cache requests according to header value',
+    type: Boolean,
+    default: false
+  },
+  optCacheControlValue: {
+    label: 'Cache control header value',
+    help: 'Do not include "Cache-Control: " part of the header, only the info after that',
+    type: String,
+    default: 'must-revalidate'
+  },
   optPreventSleep: {
     label: 'Prevent computer from sleeping',
     help: 'If the server is running, prevent the computer from going into sleep mode',

From 18217ea62094bdce20dfc1ce33abcbde15ee384f Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Mon, 24 May 2021 22:22:42 -0500
Subject: [PATCH 097/154] Why did I set it to the directory and not the file?

---
 react-ui/js/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/react-ui/js/index.js b/react-ui/js/index.js
index ae4d1f5e..81578da5 100644
--- a/react-ui/js/index.js
+++ b/react-ui/js/index.js
@@ -407,7 +407,7 @@ class App extends React.Component {
       let disablezero = (!this.webapp || !this.webapp.opts.optScanForHtaccess);
       const htaccesstextbox = renderOpts(optHtaccessOptions)
       return [(<div style={{paddingLeft: 20}}>{!disablezero && htaccesstextbox}
-        {!disablezero && <Alert severity="info">For more info on how to use wsc.htaccess files, go <a href="https://github.com/ethanaobrien/web-server-chrome/tree/master/htaccess#readme" target="_blank">here</a></Alert>}
+        {!disablezero && <Alert severity="info">For more info on how to use wsc.htaccess files, go <a href="https://github.com/ethanaobrien/web-server-chrome/blob/master/htaccess/README.md" target="_blank">here</a></Alert>}
 	  </div>)];
     })();
 

From ca5d2c1d731c1a78d36d0bff009fa0881f3b4816 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Tue, 25 May 2021 07:58:47 -0500
Subject: [PATCH 098/154] Syntax cleanup

---
 handlers.js | 178 ++++++++++++++++++++++++++--------------------------
 1 file changed, 90 insertions(+), 88 deletions(-)

diff --git a/handlers.js b/handlers.js
index c5317c2e..c2b85d82 100644
--- a/handlers.js
+++ b/handlers.js
@@ -171,9 +171,10 @@
                     }.bind(this))
                 } else {
                     deleteCheck.bind(this)()
-                }})} else {
-                    deleteCheck.bind(this)()
-                }
+                }})
+            } else {
+                deleteCheck.bind(this)()
+            }
         },
         put: function() {
             function putMain() {
@@ -252,9 +253,10 @@
                     }.bind(this))
                 } else {
                     putCheck.bind(this)()
-                }})} else {
-                    putCheck.bind(this)()
-                }
+                }})
+            } else {
+                putCheck.bind(this)()
+            }
         },
         onPutEntry: function(entry) {
             var parts = this.request.path.split('/')
@@ -415,99 +417,99 @@
                     this.finish()
                     return
                 }
-                
-            if (this.request.connection.stream.closed) {
-                console.warn(this.request.connection.stream.sockId,'request closed while processing request')
-                return
-            }
-            if (! entry) {
-                if (this.request.method == "HEAD") {
-                    this.responseLength = 0
-                    this.writeHeaders(404)
-                    this.finish()
-                } else {
-                    if (this.app.opts.optCustom404) {
-                        this.renderCustom404Html.bind(this)()
+
+                if (this.request.connection.stream.closed) {
+                    console.warn(this.request.connection.stream.sockId,'request closed while processing request')
+                    return
+                }
+                if (! entry) {
+                    if (this.request.method == "HEAD") {
+                        this.responseLength = 0
+                        this.writeHeaders(404)
+                        this.finish()
                     } else {
-                    this.write('no entry',404)
-                }}
-            } else if (entry.error) {
-                if (this.request.method == "HEAD") {
-                    this.responseLength = 0
-                    this.writeHeaders(404)
-                    this.finish()
-                } else {
-                    if (this.app.opts.optCustom404) {
-                        this.renderCustom404Html.bind(this)()
+                        if (this.app.opts.optCustom404) {
+                            this.renderCustom404Html.bind(this)()
+                        } else {
+                        this.write('no entry',404)
+                    }}
+                } else if (entry.error) {
+                    if (this.request.method == "HEAD") {
+                        this.responseLength = 0
+                        this.writeHeaders(404)
+                        this.finish()
                     } else {
-                        this.write('entry not found: ' + (this.rewrite_to || this.request.path), 404)
+                        if (this.app.opts.optCustom404) {
+                            this.renderCustom404Html.bind(this)()
+                        } else {
+                            this.write('entry not found: ' + (this.rewrite_to || this.request.path), 404)
+                        }
                     }
-                }
-            } else if (entry.isFile) {
-                this.renderFileContents(entry)
-            } else {
-                // directory
-                var reader = entry.createReader()
-                var allresults = []
-                this.isDirectoryListing = true
+                } else if (entry.isFile) {
+                    this.renderFileContents(entry)
+                } else {
+                    // directory
+                    var reader = entry.createReader()
+                    var allresults = []
+                    this.isDirectoryListing = true
 
-                function onreaderr(evt) {
-                    WSC.entryCache.unset(this.entry.filesystem.name + this.entry.fullPath)
-                    console.error('error reading dir',evt)
-                    this.request.connection.close()
-                }
+                    function onreaderr(evt) {
+                        WSC.entryCache.unset(this.entry.filesystem.name + this.entry.fullPath)
+                        console.error('error reading dir',evt)
+                        this.request.connection.close()
+                    }
 
-                function alldone(results) {
-                    if (this.app.opts.optRenderIndex) {
-                        for (var i=0; i<results.length; i++) {
-                            if (results[i].name.toLowerCase() == 'index.xhtml' || results[i].name.toLowerCase() == 'index.xhtm') {
-                                this.setHeader('content-type','application/xhtml+xml; charset=utf-8')
-                                this.renderFileContents(results[i])
-                                return
-                            }
-                            else if (results[i].name.toLowerCase() == 'index.html' || results[i].name.toLowerCase() == 'index.htm') {
-                                this.setHeader('content-type','text/html; charset=utf-8')
-                                this.renderFileContents(results[i])
-                                return
+                    function alldone(results) {
+                        if (this.app.opts.optRenderIndex) {
+                            for (var i=0; i<results.length; i++) {
+                                if (results[i].name.toLowerCase() == 'index.xhtml' || results[i].name.toLowerCase() == 'index.xhtm') {
+                                    this.setHeader('content-type','application/xhtml+xml; charset=utf-8')
+                                    this.renderFileContents(results[i])
+                                    return
+                                }
+                                else if (results[i].name.toLowerCase() == 'index.html' || results[i].name.toLowerCase() == 'index.htm') {
+                                    this.setHeader('content-type','text/html; charset=utf-8')
+                                    this.renderFileContents(results[i])
+                                    return
+                                }
                             }
                         }
+                        if (this.request.arguments && this.request.arguments.json == '1' ||
+                            (this.request.headers['accept'] && this.request.headers['accept'].toLowerCase() == 'application/json')
+                           ) {
+                            this.renderDirectoryListingJSON(results)
+                        } else if (this.app.opts.optDir404 && this.app.opts.optRenderIndex) {
+                            if (this.app.opts.optCustom404) {
+                                this.renderCustom404Html.bind(this)()
+                            } else {
+                                this.write("404 - File not found", 404)
+                                this.finish()
+                                }
+                            } else if (this.request.arguments && this.request.arguments.static == '1' ||
+                            this.request.arguments.static == 'true' ||
+                            this.app.opts.optStatic
+                           ) {
+                            this.renderDirectoryListing(results)
+                            } else {
+                            this.renderDirectoryListingTemplate(results)
+                        }
                     }
-                    if (this.request.arguments && this.request.arguments.json == '1' ||
-                        (this.request.headers['accept'] && this.request.headers['accept'].toLowerCase() == 'application/json')
-                       ) {
-                        this.renderDirectoryListingJSON(results)
-                    } else if (this.app.opts.optDir404 && this.app.opts.optRenderIndex) {
-                        if (this.app.opts.optCustom404) {
-                            this.renderCustom404Html.bind(this)()
-                        } else {
-                            this.write("404 - File not found", 404)
-                            this.finish()
-                            }
-                        } else if (this.request.arguments && this.request.arguments.static == '1' ||
-                        this.request.arguments.static == 'true' ||
-						this.app.opts.optStatic
-                       ) {
-                        this.renderDirectoryListing(results)
+
+                    function onreadsuccess(results) {
+                        //console.log('onreadsuccess',results.length)
+                        if (results.length == 0) {
+                            alldone.bind(this)(allresults)
                         } else {
-                        this.renderDirectoryListingTemplate(results)
+                            allresults = allresults.concat( results )
+                            reader.readEntries( onreadsuccess.bind(this),
+                                                onreaderr.bind(this) )
+                        }
                     }
-                }
 
-                function onreadsuccess(results) {
-                    //console.log('onreadsuccess',results.length)
-                    if (results.length == 0) {
-                        alldone.bind(this)(allresults)
-                    } else {
-                        allresults = allresults.concat( results )
-                        reader.readEntries( onreadsuccess.bind(this),
-                                            onreaderr.bind(this) )
-                    }
+                    //console.log('readentries')
+                    reader.readEntries( onreadsuccess.bind(this),
+                                        onreaderr.bind(this))
                 }
-
-                //console.log('readentries')
-                reader.readEntries( onreadsuccess.bind(this),
-                                    onreaderr.bind(this))
-            }
             }
 
         function excludedothtmlcheck() {
@@ -637,7 +639,7 @@
                                                     this.write('<h1>403 - Forbidden</h1>', 403)
                                                     this.finish()
                                                     return
-                                            }
+                                                }
                                             } else {
                                                 excludedothtmlcheck.bind(this)()
                                             }

From e977e9f1e45495e6fa1d242ebb265a4e59b6ed13 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Tue, 25 May 2021 13:36:16 -0500
Subject: [PATCH 099/154] Fix outdated description

---
 htaccess/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htaccess/README.md b/htaccess/README.md
index f7781511..305cd76d 100644
--- a/htaccess/README.md
+++ b/htaccess/README.md
@@ -38,7 +38,7 @@ Note - when selecting the file to scan, if the file is some .html and you have t
 Note - To set more than 1 ruleset per file, see instruction at bottom of the page
 
 Note - 401 (unauthorized) username and passwords are CASE SENSITIVE!!
-<p>Note - wsc.htaccess file MUST be in the same directory as the file you want to change. The file does need to exist, due to the way the web server works.</p>
+<p>Note - wsc.htaccess file MUST be in the same directory as the file you want to change. The file does not need to exist.</p>
 <p>IMPORTANT NOTE - EVERYTHING IN THE FILE (AND THE FILE NAME) IS CASE SENSITIVE!!</p>
 <br>
 

From d0cd60e2dd5f4789a61f990410eafc7bb1bea846 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Tue, 25 May 2021 13:37:29 -0500
Subject: [PATCH 100/154] Update README.md

---
 htaccess/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htaccess/README.md b/htaccess/README.md
index 305cd76d..6a57dd6e 100644
--- a/htaccess/README.md
+++ b/htaccess/README.md
@@ -38,7 +38,7 @@ Note - when selecting the file to scan, if the file is some .html and you have t
 Note - To set more than 1 ruleset per file, see instruction at bottom of the page
 
 Note - 401 (unauthorized) username and passwords are CASE SENSITIVE!!
-<p>Note - wsc.htaccess file MUST be in the same directory as the file you want to change. The file does not need to exist.</p>
+<p>Note - wsc.htaccess file MUST be in the same directory as the file you want to change. The file does not need to exist (Mainly for 301, 302, and 307).</p>
 <p>IMPORTANT NOTE - EVERYTHING IN THE FILE (AND THE FILE NAME) IS CASE SENSITIVE!!</p>
 <br>
 

From c6ec47ec516e08156d182a1f5cfbed1e63543032 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Wed, 26 May 2021 11:52:30 -0500
Subject: [PATCH 101/154] More htaccess features

---
 handlers.js        | 505 +++++++++++++++++++++++----------------------
 htaccess/README.md |  65 ++++++
 manifest.json      |   2 +-
 minimize.sh        |   2 +-
 4 files changed, 320 insertions(+), 254 deletions(-)

diff --git a/handlers.js b/handlers.js
index c2b85d82..5969df04 100644
--- a/handlers.js
+++ b/handlers.js
@@ -312,27 +312,19 @@
             // strip '/' off end of path
 
             if (this.app.opts.optExcludeDotHtml && ! this.request.origpath.endsWith("/")) {
-                var extension = this.request.path.split('.').pop();
+                var extension = this.request.uri.split('.').pop();
                 var more = this.request.uri.split('.html').pop()
                 if (extension == 'html') {
+                    var path = this.request.path
+                    var newpath = path.substring(0, path.length - 5);
                     if (more != this.request.uri) {
-                        var path = this.request.path
-                        var newpath = path.substring(0, path.length - 5);
                         var newpath = newpath+more
-                        this.responseLength = 0
-                        this.setHeader('location', newpath)
-                        this.writeHeaders(307)
-                        this.finish()
-                        return
-                    } else {
-                        var path = this.request.path
-                        var newpath = path.substring(0, path.length - 5);
-                        this.responseLength = 0
-                        this.setHeader('location', newpath)
-                        this.writeHeaders(307)
-                        this.finish()
-                        return
                     }
+                    this.responseLength = 0
+                    this.setHeader('location', newpath)
+                    this.writeHeaders(307)
+                    this.finish()
+                    return
                 }
             }
 
@@ -555,8 +547,9 @@
                                 try {
                                     var origdata = JSON.parse(dataa)
                                 } catch(e) {
-                                    this.write('wsc.htaccess file found, but it is not a valid json string', 500)
+                                    this.write('<p>wsc.htaccess file found, but it is not a valid json array. Please read the htaccess readme <a href="https://github.com/ethanaobrien/web-server-chrome/blob/master/htaccess/README.md">here</a></p>', 500)
                                     this.finish()
+                                    console.error('json array error')
                                     return
                                 }
                             }
@@ -566,40 +559,58 @@
                                 var filefound = false
                                 var auth = false
                                 var authdata
+                                var j=0
+                                var data
+                                var htaccessHeaders = [ ]
+                                var additionalHeaders = false
                                 for (var i=0; i<origdata.length; i++) {
                                     origdata[i].original_request_path = origdata[i].request_path
-                                    if (origdata[i].request_path == 'index.html' ||
-                                        origdata[i].request_path == 'index.htm' ||
-                                        origdata[i].request_path == 'index' ||
-                                        origdata[i].request_path == 'index.xhtm' ||
-                                        origdata[i].request_path == 'index.xhtml' ||
-                                        origdata[i].request_path == '') {
-                                        origdata[i].request_path = ''
-                                    }
+                                    origdata[i].filerequested = filerequested
+                                    origdata[i].request_path = WSC.utilityHandler.htaccessFileRequested(origdata[i].request_path)
                                     if (origdata[i].type == 401 &&
+                                        ! auth &&
                                         (origdata[i].request_path == filerequested || origdata[i].request_path == 'all files')) {
                                         var auth = true
                                         var authdata = origdata[i]
-                                        break
                                     }
-                                }
-                                for (var i=0; i<origdata.length; i++) {
-                                    //console.log(origdata)
-                                    if (origdata[i].request_path == filerequested ||
-                                        origdata[i].request_path == 'all files' ||
-                                        (origdata[i].type == 'directory listing' && this.request.uri.split('/').pop() == '')) {
-                                        if (origdata[i].type != 'allow delete' &&
-                                            origdata[i].type != 'allow put' &&
-                                            origdata[i].type != 'deny delete' &&
-                                            origdata[i].type != 'deny put' &&
-                                            origdata[i].type != 401) {
+                                    if (origdata[i].type == 'directory listing' &&
+                                        this.request.uri.split('/').pop() == '' &&
+                                        ! filefound) {
                                         var data = origdata[i]
-                                        //console.log(data)
                                         var filefound = true
-                                        break
+                                    }
+                                    if (origdata[i].type == 'send directory contents' && origdata[i].request_path == filerequested) {
+                                        var extension = origdata[i].original_request_path.split('.').pop()
+                                        if (extension == 'html' || extension == 'htm') {
+                                            var data = origdata[i]
+                                            var filefound = true
                                         }
                                     }
+                                    if ((origdata[i].request_path == filerequested || origdata[i].request_path == 'all files') &&
+                                        ! filefound &&
+                                        origdata[i].type != 'allow delete' &&
+                                        origdata[i].type != 'allow put' &&
+                                        origdata[i].type != 'deny delete' &&
+                                        origdata[i].type != 'deny put' &&
+                                        origdata[i].type != 401 &&
+                                        origdata[i].type != 'directory listing' &&
+                                        origdata[i].type != 'additional header' &&
+                                        origdata[i].type != 'send directory contents') {
+                                            var data = origdata[i]
+                                            //console.log(data)
+                                            var filefound = true
+                                    }
+                                    //console.log(origdata[i].request_path == filerequested)
+                                    if ((origdata[i].request_path == filerequested || origdata[i].request_path == 'all files') &&
+                                        origdata[i].type == 'additional header') {
+                                        //console.log('additional header')
+                                        var additionalHeaders = true
+                                        htaccessHeaders[j] = origdata[i]
+                                        j++
+                                    }
                                 }
+                                //console.log(data)
+                                //console.log(authdata)
                                 //console.log(filefound)
                                     function htaccessCheck2() {
                                         if (filefound) {
@@ -608,88 +619,170 @@
                                             this.responseLength = 0
                                             this.writeHeaders(data.type)
                                             this.finish()
-                                    } else if (data.type == 403) {
-                                        var method = this.request.headers['sec-fetch-dest']
-                                        //console.log(method)
-                                        var name = this.request.path
-                                        var extension = name.split('.').pop();
-                                        //console.log(extension)
-                                        if (method == "document") {
-                                            if (extension != 'html' && extension != 'htm' && ! this.request.origpath.endsWith('/') && this.request.path != '') {
-                                                if (this.app.opts.optCustom403) {
-                                                    this.fs.getByPath(this.app.opts.optCustom403location, (file) => {
-                                                    if (! file.error) {
-                                                        file.file( function(filee) {
-                                                            var reader = new FileReader();
-                                                            reader.onload = function(e){
-                                                                this.useDefaultMime = false
-                                                                var data = e.target.result
-                                                                this.setHeader('content-type','text/html; charset=utf-8')
-                                                                this.write(data, 403)
-                                                                this.finish()
-                                                                this.useDefaultMime = true
-                                                            }.bind(this)
-                                                            reader.readAsText(filee)
-                                                        }.bind(this))
+                                        } else if (data.type == 403) {
+                                            var method = this.request.headers['sec-fetch-dest']
+                                            //console.log(method)
+                                            var name = this.request.path
+                                            var extension = name.split('.').pop();
+                                            //console.log(extension)
+                                            if (method == "document") {
+                                                if (extension != 'html' && extension != 'htm' && ! this.request.origpath.endsWith('/') && this.request.path != '') {
+                                                    if (this.app.opts.optCustom403) {
+                                                        this.fs.getByPath(this.app.opts.optCustom403location, (file) => {
+                                                        if (! file.error) {
+                                                            file.file( function(filee) {
+                                                                var reader = new FileReader();
+                                                                reader.onload = function(e){
+                                                                    this.useDefaultMime = false
+                                                                    var data = e.target.result
+                                                                    this.setHeader('content-type','text/html; charset=utf-8')
+                                                                    this.write(data, 403)
+                                                                    this.finish()
+                                                                    this.useDefaultMime = true
+                                                                }.bind(this)
+                                                                reader.readAsText(filee)
+                                                            }.bind(this))
+                                                        } else {
+                                                            this.write('Path of 403 html was not found - 403 path is set to: '+this.app.opts.optCustom403location, 500)
+                                                            this.finish()
+                                                        }})
                                                     } else {
-                                                        this.write('Path of 403 html was not found - 403 path is set to: '+this.app.opts.optCustom403location, 500)
+                                                        this.write('<h1>403 - Forbidden</h1>', 403)
                                                         this.finish()
-                                                    }})
+                                                        return
+                                                    }
                                                 } else {
-                                                    this.write('<h1>403 - Forbidden</h1>', 403)
-                                                    this.finish()
-                                                    return
+                                                    excludedothtmlcheck.bind(this)()
                                                 }
                                             } else {
                                                 excludedothtmlcheck.bind(this)()
                                             }
-                                        } else {
-                                            excludedothtmlcheck.bind(this)()
-                                        }
-                                    } else if (data.type == 'directory listing') {
-                                        function finished(results) {
-                                            if (this.request.arguments && this.request.arguments.static == '1' ||
-                                                this.request.arguments.static == 'true' ||
-                                                this.app.opts.optStatic
-                                               ) {
-                                                this.renderDirectoryListing(results)
-                                                return
-                                            } else {
-                                                this.renderDirectoryListingTemplate(results)
-                                                return
+                                        } else if (data.type == 'directory listing') {
+                                            function finished(results) {
+                                                if (this.request.arguments && this.request.arguments.static == '1' ||
+                                                    this.request.arguments.static == 'true' ||
+                                                    this.app.opts.optStatic
+                                                   ) {
+                                                    this.renderDirectoryListing(results)
+                                                    return
+                                                } else {
+                                                    this.renderDirectoryListingTemplate(results)
+                                                    return
+                                                }
                                             }
-                                        }
-                                        var reader = entry.createReader()
-                                        var allresults = []
+                                            var reader = entry.createReader()
+                                            var allresults = []
 
-                                        function onreaderr(evt) {
-                                            WSC.entryCache.unset(this.entry.filesystem.name + this.entry.fullPath)
-                                            console.error('error reading dir',evt)
-                                            this.request.connection.close()
-                                        }
+                                            function onreaderr(evt) {
+                                                WSC.entryCache.unset(this.entry.filesystem.name + this.entry.fullPath)
+                                                console.error('error reading dir',evt)
+                                                this.request.connection.close()
+                                            }
 
-                                        function onreadsuccess(results) {
-                                            //console.log('onreadsuccess',results.length)
-                                            if (results.length == 0) {
-                                                finished.bind(this)(allresults)
-                                            } else {
-                                                allresults = allresults.concat( results )
-                                                reader.readEntries( onreadsuccess.bind(this),
-                                                                    onreaderr.bind(this) )
+                                            function onreadsuccess(results) {
+                                                //console.log('onreadsuccess',results.length)
+                                                if (results.length == 0) {
+                                                    finished.bind(this)(allresults)
+                                                } else {
+                                                    allresults = allresults.concat( results )
+                                                    reader.readEntries( onreadsuccess.bind(this),
+                                                                        onreaderr.bind(this) )
+                                                }
                                             }
-                                        }
 
-                                        //console.log('readentries')
-                                        reader.readEntries( onreadsuccess.bind(this),
-                                                            onreaderr.bind(this))
+                                            //console.log('readentries')
+                                            reader.readEntries( onreadsuccess.bind(this),
+                                                                onreaderr.bind(this))
 
 
+                                            } else if (data.type == 'send directory contents') {
+                                                function finished(results) {
+                                                    var filepath = this.request.uri
+                                                    if (filepath.endsWith("/")) {
+                                                        var filepath = filepath+data.original_request_path
+                                                    }
+                                                    //console.log(filepath)
+                                                    this.fs.getByPath(filepath, (file) => {
+                                                        if (! file.error) {
+                                                            file.file( function(file) {
+                                                                var reader = new FileReader();
+                                                                reader.onload = function(e){
+                                                                    function finish() {
+                                                                        var data = html.join('\n')
+                                                                        this.setHeader('content-type','text/html; charset=utf-8')
+                                                                        this.write(data, 200)
+                                                                        this.finish()
+                                                                    }
+                                                                    function sendFile() {
+                                                                        results[i].getMetadata(function(filee) {
+                                                                            var rawname = results[i].name
+                                                                            var name = encodeURIComponent(results[i].name)
+                                                                            var isdirectory = results[i].isDirectory
+                                                                            var filesize = filee.size
+                                                                            var modified = WSC.utilityHandler.lastModified(filee.modificationTime)
+                                                                            var filesizestr = WSC.utilityHandler.humanFileSize(filee.size)
+                                                                            var modifiedstr = WSC.utilityHandler.lastModifiedStr(filee.modificationTime)
+                                                                            if (rawname != 'wsc.htaccess') {
+                                                                                html.push('<script>addRow("'+rawname+'", "'+name+'", '+isdirectory+', '+filesize+', "'+filesizestr+'", '+modified+', "'+modifiedstr+'")</script>')
+                                                                            }
+                                                                            if (i != results.length - 1) {
+                                                                                i++
+                                                                                sendFile.bind(this, results)()
+                                                                            } else {
+                                                                                finish.bind(this, results)()
+                                                                            }
+                                                                        }.bind(this), function(error) {
+                                                                            console.error('error reading metadata '+error)
+                                                                            if (i != results.length - 1) {
+                                                                                i++
+                                                                                sendFileList.bind(this, results)()
+                                                                            } else {
+                                                                                DirRenderFinish.bind(this, results)()
+                                                                            }
+                                                                        }.bind(this))
+                                                                    }
+                                                                    var html = [e.target.result]
+                                                                    var i = 0
+                                                                    sendFile.bind(this, results)()
+                                                                }.bind(this)
+                                                                reader.readAsText(file)
+                                                            }.bind(this))
+                                                        } else {
+                                                            this.write('An unexpected error occured. Please check your wsc.htaccess file for any configuration errors.\nPlease remember, the send directory listing feature CANNOT use "all files", you must specify each file separately.\nPlease check your settings. If everything seems to be in place, please report an issue on github.\n\nhttps://github.com/kzahel/web-server-chrome\n\nPlease copy and paste the following information.\n\n\nfilepath: '+filepath+'\nrequestURI: '+this.request.uri+'\nrequested file (according to htaccess): '+data.original_request_path+'\nrequested file (according to requestURI): '+data.filerequested)
+                                                            this.finish()
+                                                        }
+                                                    })
+                                                }
+                                                var reader = entry.createReader()
+                                                var allresults = []
+                                                function onreaderr(evt) {
+                                                    WSC.entryCache.unset(this.entry.filesystem.name + this.entry.fullPath)
+                                                    console.error('error reading dir',evt)
+                                                    this.request.connection.close()
+                                                }
+                                                function onreadsuccess(results) {
+                                                    if (results.length == 0) {
+                                                        finished.bind(this)(allresults)
+                                                    } else {
+                                                        allresults = allresults.concat( results )
+                                                        reader.readEntries( onreadsuccess.bind(this),
+                                                                            onreaderr.bind(this) )
+                                                    }
+                                                }
+                                                reader.readEntries( onreadsuccess.bind(this),
+                                                                    onreaderr.bind(this))
+                                            } else {
+                                                excludedothtmlcheck.bind(this)()
+                                            }
                                         } else {
                                             excludedothtmlcheck.bind(this)()
                                         }
-                                    } else {
-                                        excludedothtmlcheck.bind(this)()
                                     }
+                                    //console.log(htaccessHeaders)
+                                    if (additionalHeaders) {
+                                        for (var i=0; i<htaccessHeaders.length; i++) {
+                                            this.setHeader(htaccessHeaders[i].headerType, htaccessHeaders[i].headerValue)
+                                        }
                                     }
                                     if (auth && authdata.type == 401) {
                                             var validAuth = false
@@ -739,7 +832,6 @@
                                         } else {
                                             htaccessCheck2.bind(this)()
                                         }
-
                             }
                             var filerequest = this.request.origpath
                             
@@ -748,27 +840,13 @@
                                 if (! file.error) {
                                     if (this.request.origpath.endsWith("/")) {
                                         var filerequested = filerequest.split('/').pop();
-                                        if (filerequested == 'index.html' ||
-                                            filerequested == 'index.htm' ||
-                                            filerequested == 'index' ||
-                                            filerequested == 'index.xhtm' ||
-                                            filerequested == 'index.xhtml' ||
-                                            filerequested == '') {
-                                            var filerequested = ''
-                                        }
+                                        var filerequested = WSC.utilityHandler.htaccessFileRequested(filerequested)
                                         htaccessMain.bind(this)(filerequested)
                                         return
                                     }
                                     var filerequested = this.request.path+'.html'
                                     var filerequested = filerequested.split('/').pop();
-                                    if (filerequested == 'index.html' ||
-                                        filerequested == 'index.htm' ||
-                                        filerequested == 'index' ||
-                                        filerequested == 'index.xhtm' ||
-                                        filerequested == 'index.xhtml' ||
-                                        filerequested == '') {
-                                        var filerequested = ''
-                                    }
+                                    var filerequested = WSC.utilityHandler.htaccessFileRequested(filerequested)
                                     htaccessMain.bind(this)(filerequested)
                                     return
                                 } else {
@@ -783,14 +861,7 @@
                                     }
                                     var filerequested = filerequest.split('/').pop();
                                     //console.log(filerequested)
-                                    if (filerequested == 'index.html' ||
-                                        filerequested == 'index.htm' ||
-                                        filerequested == 'index' ||
-                                        filerequested == 'index.xhtm' ||
-                                        filerequested == 'index.xhtml' ||
-                                        filerequested == '') {
-                                        var filerequested = ''
-                                    }
+                                    var filerequested = WSC.utilityHandler.htaccessFileRequested(filerequested)
                                         htaccessMain.bind(this)(filerequested)
                                         return
                                     }
@@ -806,13 +877,7 @@
                                     }
                                     var filerequested = filerequest.split('/').pop();
                                     //console.log(filerequested)
-                                    if (filerequested == 'index.html' ||
-                                        filerequested == 'index.htm' ||
-                                        filerequested == 'index.xhtm' ||
-                                        filerequested == 'index.xhtml' ||
-                                        filerequested == '') {
-                                        var filerequested = ''
-                                    }
+                                    var filerequested = WSC.utilityHandler.htaccessFileRequested(filerequested)
                                     htaccessMain.bind(this)(filerequested)
                                     return
                                 }
@@ -930,123 +995,59 @@
                     this.finish()
                 }
                 function sendFileList() {
-                        results[w].getMetadata(function(file) {
-                            //console.log(file)
-                            var rawname = results[w].name
-                            //from https://stackoverflow.com/questions/10420352/converting-file-size-in-bytes-to-human-readable-string/10420404
-                            function humanFileSize(bytes, si=false, dp=1) {
-                              const thresh = si ? 1000 : 1024;
-
-                              if (Math.abs(bytes) < thresh) {
-                                return bytes + ' B';
-                              }
-
-                              const units = si 
-                                ? ['kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'] 
-                                : ['KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];
-                              let u = -1;
-                              const r = 10**dp;
-
-                              do {
-                                bytes /= thresh;
-                                ++u;
-                              } while (Math.round(Math.abs(bytes) * r) / r >= thresh && u < units.length - 1);
-
-
-                              return bytes.toFixed(dp) + ' ' + units[u];
-                            }
-
-                            var lastModifiedMonth = file.modificationTime.getMonth() + 1
-                            var lastModifiedDay = file.modificationTime.getDate()
-                            var lastModifiedYear = file.modificationTime.getFullYear().toString().substring(2, 4)
-                            var lastModifiedHours = file.modificationTime.getHours()
-                            var lastModifiedMinutes = file.modificationTime.getMinutes()
-                            var lastModifiedSeconds = file.modificationTime.getSeconds()
-
-                            var lastModified = lastModifiedMonth+
-                                               lastModifiedDay+
-                                               lastModifiedYear+
-                                               lastModifiedHours+
-                                               lastModifiedMinutes+
-                                               lastModifiedSeconds
-                            if (lastModifiedSeconds.toString().length != 2) {
-                                var lastModifiedSeconds = '0' + lastModifiedSeconds
-                            }
-                            if (lastModifiedMinutes.toString().length != 2) {
-                                var lastModifiedMinutes = '0' + lastModifiedMinutes
-                            }
-                            if (lastModifiedDay.toString().length != 2) {
-                                var lastModifiedDay = '0' + lastModifiedDay
-                            }
-                            if (lastModifiedHours >= 12) {
-                                var lastModifiedAmPm = 'PM'
-                                if (lastModifiedHours > 12) {
-                                    var lastModifiedHours = lastModifiedHours - 12
-                                }
-                            } else {
-                                var lastModifiedAmPm = 'AM'
-                            }
-                            var lastModifiedStr = lastModifiedMonth+'/'+
-                                                  lastModifiedDay+'/'+
-                                                  lastModifiedYear+', '+
-                                                  lastModifiedHours+':'+
-                                                  lastModifiedMinutes+':'+
-                                                  lastModifiedSeconds +' '+
-                                                  lastModifiedAmPm
-
-                            var name = encodeURIComponent(results[w].name)
-                            var isdirectory = results[w].isDirectory
-                            //var modified = '4/27/21, 10:38:40 AM'
-                            var modified = lastModified
-                            var filesize = file.size
-                            var filesizestr = humanFileSize(file.size)
-                            var modifiedstr = lastModifiedStr
-                            // raw, urlencoded, isdirectory, size, size as string, date modified, date modified as string
-                            if (rawname != 'wsc.htaccess') {
-                            html.push('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+',"'+filesize+'","'+filesizestr+'","'+modified+'","'+modifiedstr+'");</script>')
-                            }
-                            if (w != results.length - 1) {
-                                w++
-                                sendFileList.bind(this, results)()
-                            } else {
-                                DirRenderFinish.bind(this, results)()
-                            }
-                        }.bind(this), function(error) {
-                            console.log('error reading metadata '+error.code)
-                            if (w != results.length - 1) {
-                                w++
-                                sendFileList.bind(this, results)()
-                            } else {
-                                DirRenderFinish.bind(this, results)()
-                            }
-                        }.bind(this))}
-                    this.setHeader('transfer-encoding','chunked')
-                    this.writeHeaders(200)
-                    this.writeChunk(WSC.template_data )
-                    if (this.request.path != '') {
-                        var html = ['<script>start("'+this.request.path+'")</script>',
-                                    '<script>onHasParentDirectory();</script>']
-                    } else {
-                        var html = ['<script>start("/")</script>']
-                    }
-                    var w = 0
-                    sendFileList.bind(this, results)()
-                } else {
-                    this.setHeader('transfer-encoding','chunked')
-                    this.writeHeaders(200)
-                    this.writeChunk(WSC.template_data )
-                    if (this.request.path != '') {
-                        var html = ['<script>start("'+this.request.path+'")</script>',
-                                    '<script>onHasParentDirectory();</script>']
-                    } else {
-                        var html = ['<script>start("/")</script>']
-                    }
-                    var data = html.join('\n')
-                    data = new TextEncoder('utf-8').encode(data).buffer
-                    this.writeChunk(data)
-                    this.request.connection.write(WSC.str2ab('0\r\n\r\n'))
-                    this.finish()
+                    results[w].getMetadata(function(file) {
+                        //console.log(file)
+                        var rawname = results[w].name
+                        var name = encodeURIComponent(results[w].name)
+                        var isdirectory = results[w].isDirectory
+                        //var modified = '4/27/21, 10:38:40 AM'
+                        var modified = WSC.utilityHandler.lastModified(file.modificationTime)
+                        var filesize = file.size
+                        var filesizestr = WSC.utilityHandler.humanFileSize(file.size)
+                        var modifiedstr = WSC.utilityHandler.lastModifiedStr(file.modificationTime)
+                        // raw, urlencoded, isdirectory, size, size as string, date modified, date modified as string
+                        if (rawname != 'wsc.htaccess') {
+                        html.push('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+',"'+filesize+'","'+filesizestr+'","'+modified+'","'+modifiedstr+'");</script>')
+                        }
+                        if (w != results.length - 1) {
+                            w++
+                            sendFileList.bind(this, results)()
+                        } else {
+                            DirRenderFinish.bind(this, results)()
+                        }
+                    }.bind(this), function(error) {
+                        console.error('error reading metadata '+error)
+                        if (w != results.length - 1) {
+                            w++
+                            sendFileList.bind(this, results)()
+                        } else {
+                            DirRenderFinish.bind(this, results)()
+                        }
+                    }.bind(this))
                 }
+                this.setHeader('transfer-encoding','chunked')
+                this.writeHeaders(200)
+                this.writeChunk(WSC.template_data )
+                var html = ['<script>start("'+this.request.uri+'")</script>']
+                if (this.request.uri != '/') {
+                    html.push('<script>onHasParentDirectory();</script>')
+                }
+                var w = 0
+                sendFileList.bind(this, results)()
+            } else {
+                this.setHeader('transfer-encoding','chunked')
+                this.writeHeaders(200)
+                this.writeChunk(WSC.template_data )
+                var html = ['<script>start("'+this.request.uri+'")</script>']
+                if (this.request.uri != '/') {
+                    html.push('<script>onHasParentDirectory();</script>')
+                }
+                var data = html.join('\n')
+                data = new TextEncoder('utf-8').encode(data).buffer
+                this.writeChunk(data)
+                this.request.connection.write(WSC.str2ab('0\r\n\r\n'))
+                this.finish()
+            }
         },
         renderDirectoryListing: function(results) {
             var html = ['<html>']
@@ -1094,7 +1095,7 @@
                     var data = e.target.result
                     if (this.app.opts.optCustom404usevar) {
                         if (this.app.opts.optCustom404usevarvar != '') {
-                        var html = ['<script>var '+this.app.opts.optCustom404usevarvar+' = "'+this.request.path+'";</script>']
+                        var html = ['<script>var '+this.app.opts.optCustom404usevarvar+' = "'+this.request.uri+'";</script>']
                     } else {
                         this.write('javascript location variable is blank', 500)
                         return
diff --git a/htaccess/README.md b/htaccess/README.md
index 6a57dd6e..577f095d 100644
--- a/htaccess/README.md
+++ b/htaccess/README.md
@@ -18,6 +18,8 @@
 <p>Allow deleting for certian file - Ignores value of delete option and will allow deleting requested file</p>
 <p>Deny uploading for a specific file or directory - Ignores value of PUT option and will deny put to requested file</p>
 <p>Allow uploading for certian file - Ignores value of PUT option and will allow deleting requested file.</p>
+<p>send directory contents - Will send the current directory at the end of the file. See the How To for a more advanced description</p>
+<p>additional header - Will set an additional header</p>
 <p>If you want more features - Make an issue!</p>
 <br>
 <h1>Extra Features</h1>
@@ -169,6 +171,69 @@ To use option for all files, the value of request path will be 'all files' It sh
 ]
 ```
 <br>
+<h2>additional header</h2>
+<p>Sends an additional header</p>
+
+```
+[
+    {
+        "request_path": "name of file you want to modify",
+        "type": "additional header",
+        "headerType": "the type of header",
+        "headerValue": "the value of the header"
+    }
+]
+```
+<p>If you go to a site (Like <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers">Mozilla</a>) it will show the header as</p>
+
+`Cookie: name=value`. The first part of the header (In this case, `Cookie`) will be the `headerType` and the second part of the header (In this case, `name=value`) will be the `headerValue`.
+The end result will be
+```
+[
+    {
+        "request_path": "name of file you want to modify",
+        "type": "additional header",
+        "headerType": "Cookie",
+        "headerValue": "name=value"
+    }
+]
+```
+
+<br>
+<h2>send directory contents</h2>
+<p>Will send the current directory along with the file</p>
+<p>Example:</p>
+
+```
+[
+    {
+        "request_path": "name of file you want to modify",
+        "type": "send directory contents"
+    }
+]
+```
+<p>More howto (send directory contents)</p>
+
+This feature CANNOT use the `all files` value for the `request_path` field. You must specify each file separately
+<p>Getting info from sent contents</p>
+<p>This is what is sent</p>
+
+```
+<script>addRow("index.html", "index.html", false, 6276, "6.1 KiB", 302113940, "5/25/21, 1:09:40 PM")</script>
+```
+<p>It will send as an addRow function. The contents are, as follows.</p>
+
+`addRow(filename, filenameencoded, isdirectory, size, sizestr, date, datestr)`
+
+
+`filename`: The raw file name.
+`filenameencoded`: The encoded file name (For things like setting link locations)
+`isdirectory`: If the sent row is a directory, this will be true. Will send as `true` or `false`
+`size`: File size (in Bytes) Example: `254014`
+`sizestr`: File size (As a string) Example: `248.1 KiB`
+`date`: Date not in a string format. Example: `142132146`
+`datestr`: Date as a string. Example: `3/11/21, 3:21:46 AM`
+<br>
 <h1>How to use more than 1 ruleset per file</h1>
 <p>Pay VERY close attention to the syntax. One thing wrong will cause an error!!</p>
 <p>First, I provide an example</p>
diff --git a/manifest.json b/manifest.json
index 75611aa8..7dc265a2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -12,7 +12,7 @@
         "background": {
             "scripts": ["underscore.js","encoding.js","common.js","assets/bundle.js",
             "log-full.js", "mime.js", "buffer.js","request.js","crypto.js","stream.js", "chromesocketxhr.js",
-            "connection.js","webapp.js","websocket.js","handlers.js","httplib.js","upnp.js","background.js"]
+            "connection.js","webapp.js","websocket.js","handlers.js","httplib.js","upnp.js","background.js","utils.js"]
         }
     },
     "permissions": [
diff --git a/minimize.sh b/minimize.sh
index 2862f793..f1010b91 100644
--- a/minimize.sh
+++ b/minimize.sh
@@ -1 +1 @@
-cat "underscore.js" "encoding.js" "common.js" "log-full.js" "mime.js" "buffer.js" "request.js" "crypto.js" "stream.js" "chromesocketxhr.js" "connection.js" "webapp.js" "websocket.js" "upnp.js" "handlers.js" "httplib.js" > wsc-chrome.min.js
+cat "underscore.js" "encoding.js" "common.js" "log-full.js" "mime.js" "buffer.js" "request.js" "crypto.js" "stream.js" "chromesocketxhr.js" "connection.js" "webapp.js" "websocket.js" "upnp.js" "handlers.js" "httplib.js" "utils.js" > wsc-chrome.min.js

From a24c711886439720a2b66796b501dba796e38471 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Wed, 26 May 2021 11:55:39 -0500
Subject: [PATCH 102/154] I apparently don't know how to use git

---
 utils.js | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 utils.js

diff --git a/utils.js b/utils.js
new file mode 100644
index 00000000..6d192569
--- /dev/null
+++ b/utils.js
@@ -0,0 +1,82 @@
+(function() {
+    var utilityHandler = [ ]
+    utilityHandler.humanFileSize = function(bytes, si=false, dp=1) {
+            //from https://stackoverflow.com/questions/10420352/converting-file-size-in-bytes-to-human-readable-string/10420404
+            const thresh = si ? 1000 : 1024;
+            if (Math.abs(bytes) < thresh) {
+              return bytes + ' B';
+            }
+            const units = si 
+              ? ['kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'] 
+              : ['KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];
+            let u = -1;
+            const r = 10**dp;
+            do {
+              bytes /= thresh;
+              ++u;
+            } while (Math.round(Math.abs(bytes) * r) / r >= thresh && u < units.length - 1);
+            return bytes.toFixed(dp) + ' ' + units[u];
+    }
+    utilityHandler.lastModified = function(modificationTime) {
+        var lastModifiedMonth = modificationTime.getMonth() + 1
+        var lastModifiedDay = modificationTime.getDate()
+        var lastModifiedYear = modificationTime.getFullYear().toString().substring(2, 4)
+        var lastModifiedHours = modificationTime.getHours()
+        var lastModifiedMinutes = modificationTime.getMinutes()
+        var lastModifiedSeconds = modificationTime.getSeconds()
+        var lastModified = lastModifiedMonth+
+                           lastModifiedDay+
+                           lastModifiedYear+
+                           lastModifiedHours+
+                           lastModifiedMinutes+
+                           lastModifiedSeconds
+        return lastModified
+    }
+    utilityHandler.lastModifiedStr = function(modificationTime) {
+        var lastModifiedMonth = modificationTime.getMonth() + 1
+        var lastModifiedDay = modificationTime.getDate()
+        var lastModifiedYear = modificationTime.getFullYear().toString().substring(2, 4)
+        var lastModifiedHours = modificationTime.getHours()
+        var lastModifiedMinutes = modificationTime.getMinutes()
+        var lastModifiedSeconds = modificationTime.getSeconds()
+        if (lastModifiedSeconds.toString().length != 2) {
+            var lastModifiedSeconds = '0' + lastModifiedSeconds
+        }
+        if (lastModifiedMinutes.toString().length != 2) {
+            var lastModifiedMinutes = '0' + lastModifiedMinutes
+        }
+        if (lastModifiedDay.toString().length != 2) {
+            var lastModifiedDay = '0' + lastModifiedDay
+        }
+        if (lastModifiedHours >= 12) {
+            var lastModifiedAmPm = 'PM'
+            if (lastModifiedHours > 12) {
+                var lastModifiedHours = lastModifiedHours - 12
+            }
+        } else {
+            var lastModifiedAmPm = 'AM'
+        }
+        var lastModifiedStr = lastModifiedMonth+'/'+
+                              lastModifiedDay+'/'+
+                              lastModifiedYear+', '+
+                              lastModifiedHours+':'+
+                              lastModifiedMinutes+':'+
+                              lastModifiedSeconds +' '+
+                              lastModifiedAmPm
+        return lastModifiedStr
+    }
+    utilityHandler.htaccessFileRequested = function(filerequested) {
+        if (filerequested == 'index.html' ||
+            filerequested == 'index.htm' ||
+            filerequested == 'index' ||
+            filerequested == 'index.xhtm' ||
+            filerequested == 'index.xhtml' ||
+            filerequested == '') {
+            var filerequested = ''
+            return filerequested
+        } else {
+            return filerequested
+        }
+    }
+    WSC.utilityHandler = utilityHandler
+})();

From 67370a637f3b8462586aff90f1606e9c83bc2c79 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Wed, 26 May 2021 12:08:28 -0500
Subject: [PATCH 103/154] Update outdated description

---
 htaccess/README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htaccess/README.md b/htaccess/README.md
index 577f095d..d1e0a619 100644
--- a/htaccess/README.md
+++ b/htaccess/README.md
@@ -260,7 +260,9 @@ You basically have `[` and `]` surrounding the entire file and each ruleset insi
 You MUST separate each ruleset with a comma (As shown in the example). The failure to do so will result in an error.
 For the last ruleset, no comma can be after the `}`. This will break the array and give you an error.
 
-When using multiple rulesets per file, the server will first check if an authentication rule is in place. If it is, the server will require the user to enter the password before it will allow the user to do anything. After the user has correct auth (if the auth is present) it will check for rulesets from the top of the file, to the bottom. The redirects and the directory listing cannot both be used, whatever the web server picks up first is what will be executed.
+When using multiple rulesets per file, the server will first check if an authentication rule is in place. If it is, the server will require the user to enter the password before it will allow the user to do anything. After the user has correct auth (if the auth is present) it will check for rulesets from the top of the file, to the bottom. The redirects, the directory listing, and sending the current directory with the file cannot both be used, whatever the web server picks up first is what will be executed.
+
+You can have as many additional headers as you like!
 
 
 

From 3c3ff61e32e4b8826b219e28ab4ff0dea6b9264c Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Wed, 26 May 2021 14:48:38 -0500
Subject: [PATCH 104/154] Bug fix

---
 handlers.js | 59 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 34 insertions(+), 25 deletions(-)

diff --git a/handlers.js b/handlers.js
index 5969df04..dae20144 100644
--- a/handlers.js
+++ b/handlers.js
@@ -529,9 +529,9 @@
         
             if (this.app.opts.optScanForHtaccess) {
                 var fullrequestpath = this.request.origpath
-                    var finapath = fullrequestpath
-                    var finpath = finapath.split('/').pop();
-                    var finalpath = fullrequestpath.substring(0, fullrequestpath.length - finpath.length);
+                var finapath = fullrequestpath
+                var finpath = finapath.split('/').pop();
+                var finalpath = fullrequestpath.substring(0, fullrequestpath.length - finpath.length);
                 if (this.request.path == '') {
                     var finalpath = '/'
                 }
@@ -697,12 +697,12 @@
 
                                             } else if (data.type == 'send directory contents') {
                                                 function finished(results) {
-                                                    var filepath = this.request.uri
-                                                    if (filepath.endsWith("/")) {
-                                                        var filepath = filepath+data.original_request_path
-                                                    }
+                                                    var fullrequestpath = this.request.origpath
+                                                    var finapath = fullrequestpath
+                                                    var finpath = finapath.split('/').pop();
+                                                    var finalpath = fullrequestpath.substring(0, fullrequestpath.length - finpath.length) + data.original_request_path
                                                     //console.log(filepath)
-                                                    this.fs.getByPath(filepath, (file) => {
+                                                    this.fs.getByPath(finalpath, (file) => {
                                                         if (! file.error) {
                                                             file.file( function(file) {
                                                                 var reader = new FileReader();
@@ -753,24 +753,33 @@
                                                         }
                                                     })
                                                 }
-                                                var reader = entry.createReader()
-                                                var allresults = []
-                                                function onreaderr(evt) {
-                                                    WSC.entryCache.unset(this.entry.filesystem.name + this.entry.fullPath)
-                                                    console.error('error reading dir',evt)
-                                                    this.request.connection.close()
-                                                }
-                                                function onreadsuccess(results) {
-                                                    if (results.length == 0) {
-                                                        finished.bind(this)(allresults)
-                                                    } else {
-                                                        allresults = allresults.concat( results )
-                                                        reader.readEntries( onreadsuccess.bind(this),
-                                                                            onreaderr.bind(this) )
+                                                var fullrequestpath = this.request.origpath
+                                                var finapath = fullrequestpath
+                                                var finpath = finapath.split('/').pop();
+                                                var finalpath = fullrequestpath.substring(0, fullrequestpath.length - finpath.length);
+                                                //console.log(finalpath)
+                                                //console.log(data)
+                                                this.fs.getByPath(finalpath, function(entryy) {
+                                                    var reader = entryy.createReader()
+                                                    var allresults = []
+                                                    function onreaderr(evt) {
+                                                        WSC.entryCache.unset(this.entry.filesystem.name + this.entry.fullPath)
+                                                        console.error('error reading dir',evt)
+                                                        this.request.connection.close()
                                                     }
-                                                }
-                                                reader.readEntries( onreadsuccess.bind(this),
-                                                                    onreaderr.bind(this))
+                                                    function onreadsuccess(results) {
+                                                        if (results.length == 0) {
+                                                            finished.bind(this)(allresults)
+                                                        } else {
+                                                            allresults = allresults.concat( results )
+                                                            reader.readEntries( onreadsuccess.bind(this),
+                                                                                onreaderr.bind(this) )
+                                                        }
+                                                    }
+                                                    reader.readEntries( onreadsuccess.bind(this),
+                                                                        onreaderr.bind(this))
+                                                
+                                                }.bind(this))
                                             } else {
                                                 excludedothtmlcheck.bind(this)()
                                             }

From cdd0760ca4e69aa38c8a52b66d365f1e4959a4c0 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 3 Jun 2021 11:19:26 -0500
Subject: [PATCH 105/154] Cleanup, Htaccess feature, no .htm

---
 handlers.js            | 289 ++++++++++++++++++++++++++---------------
 htaccess/README.md     |  33 +++++
 react-ui/js/index.js   |  14 +-
 react-ui/js/options.js |   6 +
 4 files changed, 235 insertions(+), 107 deletions(-)

diff --git a/handlers.js b/handlers.js
index dae20144..086935fe 100644
--- a/handlers.js
+++ b/handlers.js
@@ -94,31 +94,12 @@
         head: function() {
             this.get()
         },
-        delete: function() {
-            function deleteMain() {
-                this.fs.getByPath(this.request.path, (entry) => {
-                    entry.remove(()=>{
-                        this.responseLength = 0
-                        this.writeHeaders(200)
-                        this.finish()
-                    });
-                });
-            }
-            function deleteCheck() {
-                if (! this.app.opts.optDelete) {
-                    this.responseLength = 0
-                    this.writeHeaders(400)
-                    this.finish()
-                    return
-                } else {
-                    deleteMain.bind(this)()
-                }
-            }
+        deletePutHtaccess: function(allow, deny, callback, callbackSkip) {
             if (this.app.opts.optScanForHtaccess) {
                 var fullrequestpath = this.request.origpath
-                    var finapath = fullrequestpath
-                    var finpath = finapath.split('/').pop();
-                    var finalpath = fullrequestpath.substring(0, fullrequestpath.length - finpath.length);
+                var finapath = fullrequestpath
+                var finpath = finapath.split('/').pop();
+                var finalpath = fullrequestpath.substring(0, fullrequestpath.length - finpath.length);
                 if (this.request.path == '') {
                     var finalpath = '/'
                 }
@@ -143,42 +124,81 @@
                             var filerequest = this.request.origpath
                             var filerequested = filerequest.split('/').pop();
                             var filefound = false
+                            var invalid = false
+                            if (origdata.length == 0) {
+                                excludedothtmlcheck.bind(this)()
+                                return
+                            }
                             for (var i=0; i<origdata.length; i++) {
-                                if ((origdata[i].type == 'allow delete' && origdata[i].request_path == filerequested) ||
-                                    (origdata[i].type == 'allow delete' && origdata[i].request_path == 'all files') ||
-                                    (origdata[i].type == 'deny delete' && origdata[i].request_path == filerequested) ||
-                                    (origdata[i].type == 'deny delete' && origdata[i].request_path == 'all files')) {
+                                if (! origdata[i].type) {
+                                    this.htaccessError.bind(this)('missing type')
+                                    var invalid = true
+                                    break
+                                }
+                                if (! origdata[i].request_path && origdata[i].type != 'directory listing') {
+                                    this.htaccessError.bind(this)('missing request path')
+                                    var invalid = true
+                                    break
+                                }
+                                if ((origdata[i].type == allow && origdata[i].request_path == filerequested) ||
+                                    (origdata[i].type == allow && origdata[i].request_path == 'all files') ||
+                                    (origdata[i].type == deny && origdata[i].request_path == filerequested) ||
+                                    (origdata[i].type == deny && origdata[i].request_path == 'all files')) {
                                     var data = origdata[i]
                                     var filefound = true
                                     break
                                 }
                             }
+                            if (invalid) {
+                                return
+                            }
                             //console.log(filefound)
                             if (filefound) {
-                                if (data.type == 'allow delete') {
-                                    deleteMain.bind(this)()
-                                } else if (data.type == 'deny delete') {
+                                if (data.type == allow) {
+                                    callbackSkip()
+                                } else if (data.type == deny) {
                                     this.responseLength = 0
                                     this.writeHeaders(400)
                                     this.finish()
                                     return
                                 }
                             } else {
-                                deleteCheck.bind(this)()
+                                callback()
                             }
                         }.bind(this)
                         reader.readAsText(filee)
                     }.bind(this))
                 } else {
-                    deleteCheck.bind(this)()
+                    callback()
                 }})
             } else {
-                deleteCheck.bind(this)()
+                callback()
+            }
+        },
+        delete: function() {
+            function deleteMain() {
+                this.fs.getByPath(this.request.path, (entry) => {
+                    entry.remove(()=>{
+                        this.responseLength = 0
+                        this.writeHeaders(200)
+                        this.finish()
+                    });
+                });
+            }
+            function deleteCheck() {
+                if (! this.app.opts.optDelete) {
+                    this.responseLength = 0
+                    this.writeHeaders(400)
+                    this.finish()
+                    return
+                } else {
+                    deleteMain.bind(this)()
+                }
             }
+            this.deletePutHtaccess('allow delete', 'deny delete', deleteCheck.bind(this), deleteMain.bind(this))
         },
         put: function() {
             function putMain() {
-                
                 // if upload enabled in options...
                 // check if file exists...
                 this.fs.getByPath(this.request.path, this.onPutEntry.bind(this), true)
@@ -193,70 +213,7 @@
                     putMain.bind(this)()
                 }
             }
-            
-            if (this.app.opts.optScanForHtaccess) {
-                var fullrequestpath = this.request.origpath
-                    var finapath = fullrequestpath
-                    var finpath = finapath.split('/').pop();
-                    var finalpath = fullrequestpath.substring(0, fullrequestpath.length - finpath.length);
-                if (this.request.path == '') {
-                    var finalpath = '/'
-                }
-                var htaccesspath = finalpath+'wsc.htaccess'
-                //console.log(htaccesspath)
-                this.fs.getByPath(htaccesspath, (file) => {
-                if (! file.error) {
-                    file.file( function(filee) {
-                        var reader = new FileReader();
-                        reader.onload = function(e){
-                            var dataa = e.target.result
-                            if(true) {
-                                try {
-                                    var origdata = JSON.parse(dataa)
-                                } catch(e) {
-                                    this.responseLength = 0
-                                    this.writeHeaders(500)
-                                    this.finish()
-                                    return
-                                }
-                            }
-                            var filerequest = this.request.origpath
-                            var filerequested = filerequest.split('/').pop();
-                            var filefound = false
-                            for (var i=0; i<origdata.length; i++) {
-                                if ((origdata[i].type == 'allow put' && origdata[i].request_path == filerequested) ||
-                                    (origdata[i].type == 'allow put' && origdata[i].request_path == 'all files') ||
-                                    (origdata[i].type == 'deny put' && origdata[i].request_path == filerequested) ||
-                                    (origdata[i].type == 'deny put' && origdata[i].request_path == 'all files')) {
-                                    var data = origdata[i]
-                                    var filefound = true
-                                    break
-                                }
-                            }
-                            //console.log(filefound)
-                            if (filefound) {
-                                if (data.type == 'allow put') {
-                                    putMain.bind(this)()
-                                } else if (data.type == 'deny put') {
-                                    this.responseLength = 0
-                                    this.writeHeaders(400)
-                                    this.finish()
-                                    return
-                                } else {
-                                    putCheck.bind(this)()
-                                }
-                            } else {
-                                putCheck.bind(this)()
-                            }
-                        }.bind(this)
-                        reader.readAsText(filee)
-                    }.bind(this))
-                } else {
-                    putCheck.bind(this)()
-                }})
-            } else {
-                putCheck.bind(this)()
-            }
+            this.deletePutHtaccess('allow put', 'deny put', putCheck.bind(this), putMain.bind(this))
         },
         onPutEntry: function(entry) {
             var parts = this.request.path.split('/')
@@ -312,11 +269,19 @@
             // strip '/' off end of path
 
             if (this.app.opts.optExcludeDotHtml && ! this.request.origpath.endsWith("/")) {
+				var htmhtml = 'html'
+				if (this.app.opts.optExcludeDotHtml) {
+					var htmhtml = 'htm'
+				}
                 var extension = this.request.uri.split('.').pop();
-                var more = this.request.uri.split('.html').pop()
-                if (extension == 'html') {
+                var more = this.request.uri.split('.'+htmhtml).pop()
+                if (extension == htmhtml) {
                     var path = this.request.path
-                    var newpath = path.substring(0, path.length - 5);
+					if (htmhtml == 'html') {
+						var newpath = path.substring(0, path.length - 5);
+					} else {
+						var newpath = path.substring(0, path.length - 4);
+					}
                     if (more != this.request.uri) {
                         var newpath = newpath+more
                     }
@@ -395,6 +360,7 @@
         },
         onEntry: function(entry) {
             this.entry = entry
+			this.useDefaultMime = true
 
             function onEntryMain() {
                 this.useDefaultMime = true
@@ -506,7 +472,12 @@
 
         function excludedothtmlcheck() {
             if (this.app.opts.optExcludeDotHtml && this.request.path != '') {
-                this.fs.getByPath(this.request.path+'.html', (file) => {
+                if (this.app.opts.optExcludeDotHtm) {
+                    var htmHtml = '.htm'
+                } else {
+                    var htmHtml = '.html'
+                }
+                this.fs.getByPath(this.request.path+htmHtml, (file) => {
                 if (! file.error) {
                     if (this.request.origpath.endsWith("/")) {
                         onEntryMain.bind(this)()
@@ -562,8 +533,23 @@
                                 var j=0
                                 var data
                                 var htaccessHeaders = [ ]
+                                var invalid = false
                                 var additionalHeaders = false
+                                if (origdata.length == 0) {
+                                    excludedothtmlcheck.bind(this)()
+                                    return
+                                }
                                 for (var i=0; i<origdata.length; i++) {
+                                    if (! origdata[i].type) {
+                                        this.htaccessError.bind(this)('missing type')
+                                        var invalid = true
+                                        break
+                                    }
+                                    if (! origdata[i].request_path && origdata[i].type != 'directory listing') {
+                                        this.htaccessError.bind(this)('missing request path')
+                                        var invalid = true
+                                        break
+                                    }
                                     origdata[i].original_request_path = origdata[i].request_path
                                     origdata[i].filerequested = filerequested
                                     origdata[i].request_path = WSC.utilityHandler.htaccessFileRequested(origdata[i].request_path)
@@ -612,9 +598,16 @@
                                 //console.log(data)
                                 //console.log(authdata)
                                 //console.log(filefound)
-                                    function htaccessCheck2() {
-                                        if (filefound) {
+                                if (invalid) {
+                                    return
+                                }
+                                function htaccessCheck2() {
+                                    if (filefound) {
                                         if (data.type == 301 || data.type == 302 || data.type == 307) {
+                                            if (! data.redirto) {
+                                                this.htaccessError.bind(this)('missing redirect location')
+                                                return
+                                            }
                                             this.setHeader('location', data.redirto)
                                             this.responseLength = 0
                                             this.writeHeaders(data.type)
@@ -696,6 +689,14 @@
 
 
                                             } else if (data.type == 'send directory contents') {
+                                                if (! data.headerType) {
+                                                    this.htaccessError.bind(this)('missing Header Type')
+                                                    return
+                                                }
+                                                if (! data.headerValue) {
+                                                    this.htaccessError.bind(this)('missing Header Value')
+                                                    return
+                                                }
                                                 function finished(results) {
                                                     var fullrequestpath = this.request.origpath
                                                     var finapath = fullrequestpath
@@ -780,6 +781,64 @@
                                                                         onreaderr.bind(this))
                                                 
                                                 }.bind(this))
+                                            } else if (data.type == 'versioning') {
+												//console.log('versioning')
+                                                if (! data.version_data || data.version_data.length == 0) {
+                                                    this.htaccessError.bind(this)('missing version data')
+                                                    return
+                                                }
+                                                if (! data.default) {
+                                                    this.htaccessError.bind(this)('missing default file selection')
+                                                    return
+                                                }
+                                                var vdata = this.request.uri.split("?").pop()
+                                                var vdata4
+												var versionData = data.version_data
+                                                if (vdata == this.request.uri) {
+                                                    var vdata4 = data.default
+                                                } else {
+													var vdata = '?'+vdata
+                                                    var vdata1 = vdata.split('?'+data.variable+'=').pop()
+													if (vdata1 == vdata) {
+														var vdata1 = vdata.split('&'+data.variable+'=').pop()
+													}
+                                                    var vdata2 = vdata1.split("&")
+                                                    var vdata3 = vdata2[0]
+                                                    var vdata4 = vdata3.toString()
+                                                }
+                                                if (versionData[vdata4]) {
+                                                    var vdataa = versionData[vdata4]
+                                                    //console.log(vdataa)
+                                                    this.fs.getByPath(vdataa, function(file) {
+                                                        if (! file.error) {
+															var entry = file
+															this.entry = entry
+															this.useDefaultMime = true
+															this.request.path = vdataa
+                                                            this.renderFileContents(entry)
+                                                            return
+                                                        } else {
+                                                            this.write('path in htaccess file for version '+vdata4+' is missing or the file does not exist. Please check to make sure you have properly inputed the value', 500)
+                                                            this.finish()
+                                                            return
+                                                        }
+                                                    }.bind(this))
+                                                } else {
+                                                    this.fs.getByPath(versionData[data.default.toString()], function(file) {
+														if (! file.error) {
+															var entry = file
+															this.entry = entry
+															this.useDefaultMime = true
+															this.request.path = versionData[data.default.toString()]
+															this.renderFileContents(entry)
+															return
+														} else {
+                                                            this.write('path in htaccess file for version '+data.default+' is missing or the file does not exist. Please check to make sure you have properly inputed the value', 500)
+                                                            this.finish()
+                                                            return
+                                                        }
+                                                    }.bind(this))
+                                                }
                                             } else {
                                                 excludedothtmlcheck.bind(this)()
                                             }
@@ -794,6 +853,14 @@
                                         }
                                     }
                                     if (auth && authdata.type == 401) {
+                                         if (! authdata.username) {
+                                             this.htaccessError.bind(this)('missing Auth Username')
+                                             return
+                                         }
+                                         if (! authdata.password) {
+                                             this.htaccessError.bind(this)('missing Auth Password')
+                                             return
+                                         }
                                             var validAuth = false
                                             var auth = this.request.headers['authorization']
                                             if (auth) {
@@ -845,7 +912,12 @@
                             var filerequest = this.request.origpath
                             
                             if (this.app.opts.optExcludeDotHtml) {
-                                this.fs.getByPath(this.request.path+'.html', (file) => {
+                                if (this.app.opts.optExcludeDotHtm) {
+                                    var htmHtml = '.htm'
+                                } else {
+                                    var htmHtml = '.html'
+                                }
+                                this.fs.getByPath(this.request.path+htmHtml, (file) => {
                                 if (! file.error) {
                                     if (this.request.origpath.endsWith("/")) {
                                         var filerequested = filerequest.split('/').pop();
@@ -853,7 +925,7 @@
                                         htaccessMain.bind(this)(filerequested)
                                         return
                                     }
-                                    var filerequested = this.request.path+'.html'
+                                    var filerequested = this.request.path+htmHtml
                                     var filerequested = filerequested.split('/').pop();
                                     var filerequested = WSC.utilityHandler.htaccessFileRequested(filerequested)
                                     htaccessMain.bind(this)(filerequested)
@@ -1126,6 +1198,11 @@
                 this.finish()
             }})
         
+        },
+        htaccessError: function(errormsg) {
+            this.write('Htaccess Configuration error. Please check to make sure that you are not missing some values.\n\nError Message: '+errormsg, 500)
+            this.finish()
+            return
         }
     }, WSC.BaseHandler.prototype)
 
diff --git a/htaccess/README.md b/htaccess/README.md
index d1e0a619..561496c1 100644
--- a/htaccess/README.md
+++ b/htaccess/README.md
@@ -20,6 +20,7 @@
 <p>Allow uploading for certian file - Ignores value of PUT option and will allow deleting requested file.</p>
 <p>send directory contents - Will send the current directory at the end of the file. See the How To for a more advanced description</p>
 <p>additional header - Will set an additional header</p>
+<p>Versioning - relative file hosting</p>
 <p>If you want more features - Make an issue!</p>
 <br>
 <h1>Extra Features</h1>
@@ -171,6 +172,38 @@ To use option for all files, the value of request path will be 'all files' It sh
 ]
 ```
 <br>
+<h2>Versioning</h2>
+<p>Versions of a file</p>
+
+```
+[
+    {
+        "request_path": "name of file you want to modify",
+        "type": "versioning",
+        "default": 4,
+		"variable": "v",
+        "version_data": {"1": "FULL path of file (From root of selected folder)",
+                         "2": "FULL path of file (From root of selected folder)",
+                         "3": "FULL path of file (From root of selected folder)",
+                         "4": "FULL path of file (From root of selected folder)"
+                        }
+    }
+]
+```
+<p>Example of request path</p>
+
+```
+{
+    "1": "/data/path/to/file/index.html"
+}
+```
+<p>You can add as many versions as you would like.</p>
+<p>Please be sure to correctly input the FULL path of the file (From root of selected folder)</p>
+<p>Please note - this feature is compatible with auth (you must use the request path, not the path of the file) and additional headers but you CANNOT use ANY other htaccess features!</p>
+
+The variable is what the user needs to request. If we use v, the user would request something like `localhost:8887/example.mp4?v=1`
+<p>Note that you do not need an extension for the requested file.</p>
+<br>
 <h2>additional header</h2>
 <p>Sends an additional header</p>
 
diff --git a/react-ui/js/index.js b/react-ui/js/index.js
index 81578da5..3ef54f69 100644
--- a/react-ui/js/index.js
+++ b/react-ui/js/index.js
@@ -300,8 +300,13 @@ class App extends React.Component {
       optUpload: null,
       optDelete: null,
       optVerbose: null,
+    };
+    const optnodothtmlMain = {
       optExcludeDotHtml: null
     };
+    const optnodothtmlInfo = {
+      optExcludeDotHtm: ['optExcludeDotHtml']
+    };
     const optCustom404Main = {
       optCustom404: null
     };
@@ -402,6 +407,7 @@ class App extends React.Component {
     const Custom400Main = renderOpts(optCustom400Main)
     const authMain = renderOpts(optAuthMain)
     const cacheMain = renderOpts(optCacheMain)
+    const nodothtmlMain = renderOpts(optnodothtmlMain)
 	
     const HtaccessInfo = (() => {
       let disablezero = (!this.webapp || !this.webapp.opts.optScanForHtaccess);
@@ -459,6 +465,12 @@ class App extends React.Component {
       return [(<div>{!disabletwelve && textboxetwelve}</div>)];
     })();
 
+    const nodothtmlOptions = (() => {
+      let disabletenn = (!this.webapp || !this.webapp.opts.optExcludeDotHtml);
+      const textboxetenn = renderOpts(optnodothtmlInfo)
+      return [(<div>{!disabletenn && textboxetenn}</div>)];
+    })();
+
     const httpsOptions = (() => {
       let disable = (!this.webapp || !this.webapp.opts.optUseHttps);
       let hasCrypto = this.webapp && (this.webapp.opts.optPrivateKey || this.webapp.opts.optCertificate);
@@ -535,7 +547,7 @@ class App extends React.Component {
           {options}
 
           {advancedButton}
-          {state.showAdvanced && <div>{advOptions}{Custom400Main}{Custom400Options}{Custom401Main}{Custom401Options}{Custom403Main}{Custom403Options}{Custom404Main}{Custom404Options}{Custom404OptionsPt2}{authMain}{authOptions}{HtaccessMain}{HtaccessInfo}{cacheMain}{cacheOptions}{rewriteMain}{rewriteOptions}{httpsMain}{httpsOptions}</div> }
+          {state.showAdvanced && <div>{advOptions}{nodothtmlMain}{nodothtmlOptions}{Custom400Main}{Custom400Options}{Custom401Main}{Custom401Options}{Custom403Main}{Custom403Options}{Custom404Main}{Custom404Options}{Custom404OptionsPt2}{authMain}{authOptions}{HtaccessMain}{HtaccessInfo}{cacheMain}{cacheOptions}{rewriteMain}{rewriteOptions}{httpsMain}{httpsOptions}</div> }
         </CardContent>
       </Card>
 
diff --git a/react-ui/js/options.js b/react-ui/js/options.js
index 262a044a..3ae6f49c 100644
--- a/react-ui/js/options.js
+++ b/react-ui/js/options.js
@@ -308,6 +308,12 @@ const options = {
     type: Boolean,
     default: false
   },
+  optExcludeDotHtm: {
+    label: 'Instead, Exclude .htm extension',
+    help: 'Will not show .htm extension in url path',
+    type: Boolean,
+    default: false
+  },
   optScanForHtaccess: {
     label: 'Look for wsc.htaccess files',
     help: 'Check for more info',

From 2356a92d97ef968804f4975d0c6adc9e6edfced9 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Sun, 6 Jun 2021 13:00:24 -0500
Subject: [PATCH 106/154] Bug

---
 handlers.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/handlers.js b/handlers.js
index 086935fe..8e4fe908 100644
--- a/handlers.js
+++ b/handlers.js
@@ -689,14 +689,6 @@
 
 
                                             } else if (data.type == 'send directory contents') {
-                                                if (! data.headerType) {
-                                                    this.htaccessError.bind(this)('missing Header Type')
-                                                    return
-                                                }
-                                                if (! data.headerValue) {
-                                                    this.htaccessError.bind(this)('missing Header Value')
-                                                    return
-                                                }
                                                 function finished(results) {
                                                     var fullrequestpath = this.request.origpath
                                                     var finapath = fullrequestpath

From 0ef16d717c5526044228fc4dc093df5bd333bf19 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Sat, 12 Jun 2021 19:22:56 -0500
Subject: [PATCH 107/154] LOTS and LOTS of cleanup

---
 background.js          |   3 +-
 handlers.js            | 730 +++++++++++++++--------------------------
 htaccess/README.md     |  17 +-
 react-ui/js/index.js   |  20 +-
 react-ui/js/options.js |   6 +
 webapp.js              | 142 ++++----
 6 files changed, 362 insertions(+), 556 deletions(-)

diff --git a/background.js b/background.js
index a2b0f1f1..742342ef 100644
--- a/background.js
+++ b/background.js
@@ -1,5 +1,4 @@
 console.log('background.js')
-this.useDefaultMime = true
 var ALARMID = "check_wsc_periodic"
 var WSCID = "ofhbbkphhbklhfoeikjpcbhemlocgigb"
 var HADEVENT = false
@@ -285,7 +284,7 @@ function hidden_click_configure() {
 function create_hidden() {
     if (OS != 'Chrome') { return }
 
-    if (app.opts && app.opts.optBackground && app.opts.optAllInterfaces && this.webapp.started) {
+    if (app.opts.optBackground) {
         console.log('creating hidden window')
         var W = 300
         var H = 120
diff --git a/handlers.js b/handlers.js
index 8e4fe908..01ed19f3 100644
--- a/handlers.js
+++ b/handlers.js
@@ -97,8 +97,7 @@
         deletePutHtaccess: function(allow, deny, callback, callbackSkip) {
             if (this.app.opts.optScanForHtaccess) {
                 var fullrequestpath = this.request.origpath
-                var finapath = fullrequestpath
-                var finpath = finapath.split('/').pop();
+                var finpath = fullrequestpath.split('/').pop();
                 var finalpath = fullrequestpath.substring(0, fullrequestpath.length - finpath.length);
                 if (this.request.path == '') {
                     var finalpath = '/'
@@ -106,71 +105,64 @@
                 var htaccesspath = finalpath+'wsc.htaccess'
                 //console.log(htaccesspath)
                 this.fs.getByPath(htaccesspath, (file) => {
-                if (! file.error) {
-                    file.file( function(filee) {
-                        var reader = new FileReader();
-                        reader.onload = function(e){
-                            var dataa = e.target.result
-                            if(true) {
-                                try {
-                                    var origdata = JSON.parse(dataa)
-                                } catch(e) {
-                                    this.responseLength = 0
-                                    this.writeHeaders(500)
-                                    this.finish()
-                                    return
-                                }
-                            }
-                            var filerequest = this.request.origpath
-                            var filerequested = filerequest.split('/').pop();
-                            var filefound = false
-                            var invalid = false
-                            if (origdata.length == 0) {
-                                excludedothtmlcheck.bind(this)()
-                                return
-                            }
-                            for (var i=0; i<origdata.length; i++) {
-                                if (! origdata[i].type) {
-                                    this.htaccessError.bind(this)('missing type')
-                                    var invalid = true
-                                    break
-                                }
-                                if (! origdata[i].request_path && origdata[i].type != 'directory listing') {
-                                    this.htaccessError.bind(this)('missing request path')
-                                    var invalid = true
-                                    break
-                                }
-                                if ((origdata[i].type == allow && origdata[i].request_path == filerequested) ||
-                                    (origdata[i].type == allow && origdata[i].request_path == 'all files') ||
-                                    (origdata[i].type == deny && origdata[i].request_path == filerequested) ||
-                                    (origdata[i].type == deny && origdata[i].request_path == 'all files')) {
-                                    var data = origdata[i]
-                                    var filefound = true
-                                    break
-                                }
-                            }
-                            if (invalid) {
-                                return
-                            }
-                            //console.log(filefound)
-                            if (filefound) {
-                                if (data.type == allow) {
-                                    callbackSkip()
-                                } else if (data.type == deny) {
-                                    this.responseLength = 0
-                                    this.writeHeaders(400)
-                                    this.finish()
-                                    return
-                                }
-                            } else {
-                                callback()
-                            }
-                        }.bind(this)
-                        reader.readAsText(filee)
-                    }.bind(this))
-                } else {
-                    callback()
-                }})
+					if (! file.error) {
+						file.file( function(filee) {
+							var reader = new FileReader();
+							reader.onload = function(e){
+								var dataa = e.target.result
+								try {
+									var origdata = JSON.parse(dataa)
+								} catch(e) {
+									this.responseLength = 0
+									this.writeHeaders(500)
+									this.finish()
+									return
+								}
+								var filerequest = this.request.origpath
+								var filerequested = filerequest.split('/').pop();
+								var filefound = false
+								if (origdata.length == 0 || ! origdata.length) {
+									excludedothtmlcheck.bind(this)()
+									return
+								}
+								for (var i=0; i<origdata.length; i++) {
+									if (! origdata[i].type) {
+										this.htaccessError.bind(this)('missing type')
+										return
+									}
+									if (! origdata[i].request_path && origdata[i].type != 'directory listing') {
+										this.htaccessError.bind(this)('missing request path')
+										return
+									}
+									if ((origdata[i].type == allow && origdata[i].request_path == filerequested) ||
+										(origdata[i].type == allow && origdata[i].request_path == 'all files') ||
+										(origdata[i].type == deny && origdata[i].request_path == filerequested) ||
+										(origdata[i].type == deny && origdata[i].request_path == 'all files')) {
+										var data = origdata[i]
+										var filefound = true
+										break
+									}
+								}
+								//console.log(filefound)
+								if (filefound) {
+									if (data.type == allow) {
+										callbackSkip()
+									} else if (data.type == deny) {
+										this.responseLength = 0
+										this.writeHeaders(400)
+										this.finish()
+										return
+									}
+								} else {
+									callback()
+								}
+							}.bind(this)
+							reader.readAsText(filee)
+						}.bind(this))
+					} else {
+						callback()
+					}
+				})
             } else {
                 callback()
             }
@@ -197,10 +189,12 @@
             }
             this.deletePutHtaccess('allow delete', 'deny delete', deleteCheck.bind(this), deleteMain.bind(this))
         },
+		post: function() {
+			//not sure what we can do about this
+			this.put()
+		},
         put: function() {
             function putMain() {
-                // if upload enabled in options...
-                // check if file exists...
                 this.fs.getByPath(this.request.path, this.onPutEntry.bind(this), true)
             }
             function putCheck() {
@@ -224,21 +218,24 @@
                 // good, we can upload it here ...
                 this.fs.getByPath(path, this.onPutFolder.bind(this,filename))
             } else {
-                var allowReplaceFile = true
                 console.log('file already exists', entry)
-                if (allowReplaceFile) {
+                if (this.app.opts.optAllowReplaceFile) {
                     // truncate file
                     var onremove = function(evt) {
                         this.fs.getByPath(path, this.onPutFolder.bind(this,filename))
                     }.bind(this)
                     entry.remove( onremove, onremove )
-                }
+                } else {
+					this.responseLength = 0
+					this.writeHeaders(400)
+					this.finish()
+					return
+				}
             }
         },
         onPutFolder: function(filename, folder) {
             var onwritten = function(evt) {
                 console.log('write complete',evt)
-                // TODO write 400 in other cases...
                 this.responseLength = 0
                 this.writeHeaders(200)
                 this.finish()
@@ -266,14 +263,9 @@
             }
             //var path = decodeURI(this.request.path)
 
-            // strip '/' off end of path
-
             if (this.app.opts.optExcludeDotHtml && ! this.request.origpath.endsWith("/")) {
-				var htmhtml = 'html'
-				if (this.app.opts.optExcludeDotHtml) {
-					var htmhtml = 'htm'
-				}
-                var extension = this.request.uri.split('.').pop();
+				var htmhtml = this.app.opts.optExcludeDotHtm ? 'htm' : 'html';
+                var extension = this.request.path.split('.').pop();
                 var more = this.request.uri.split('.'+htmhtml).pop()
                 if (extension == htmhtml) {
                     var path = this.request.path
@@ -360,10 +352,8 @@
         },
         onEntry: function(entry) {
             this.entry = entry
-			this.useDefaultMime = true
 
             function onEntryMain() {
-                this.useDefaultMime = true
                 
                 if (this.entry && this.entry.isDirectory && ! this.request.origpath.endsWith('/')) {
                     var newloc = this.request.origpath + '/'
@@ -371,7 +361,6 @@
                     this.responseLength = 0
                     //console.log('redirect ->',newloc)
                     this.writeHeaders(301)
-
                     this.finish()
                     return
                 }
@@ -381,41 +370,13 @@
                     return
                 }
                 if (! entry) {
-                    if (this.request.method == "HEAD") {
-                        this.responseLength = 0
-                        this.writeHeaders(404)
-                        this.finish()
-                    } else {
-                        if (this.app.opts.optCustom404) {
-                            this.renderCustom404Html.bind(this)()
-                        } else {
-                        this.write('no entry',404)
-                    }}
+					this.error('no entry',404)
                 } else if (entry.error) {
-                    if (this.request.method == "HEAD") {
-                        this.responseLength = 0
-                        this.writeHeaders(404)
-                        this.finish()
-                    } else {
-                        if (this.app.opts.optCustom404) {
-                            this.renderCustom404Html.bind(this)()
-                        } else {
-                            this.write('entry not found: ' + (this.rewrite_to || this.request.path), 404)
-                        }
-                    }
+					this.error('entry not found: ' + (this.rewrite_to || this.request.path), 404)
                 } else if (entry.isFile) {
                     this.renderFileContents(entry)
                 } else {
                     // directory
-                    var reader = entry.createReader()
-                    var allresults = []
-                    this.isDirectoryListing = true
-
-                    function onreaderr(evt) {
-                        WSC.entryCache.unset(this.entry.filesystem.name + this.entry.fullPath)
-                        console.error('error reading dir',evt)
-                        this.request.connection.close()
-                    }
 
                     function alldone(results) {
                         if (this.app.opts.optRenderIndex) {
@@ -437,36 +398,18 @@
                            ) {
                             this.renderDirectoryListingJSON(results)
                         } else if (this.app.opts.optDir404 && this.app.opts.optRenderIndex) {
-                            if (this.app.opts.optCustom404) {
-                                this.renderCustom404Html.bind(this)()
-                            } else {
-                                this.write("404 - File not found", 404)
-                                this.finish()
-                                }
-                            } else if (this.request.arguments && this.request.arguments.static == '1' ||
+							this.error("404 - File not found", 404)
+                        } else if (this.request.arguments && this.request.arguments.static == '1' ||
                             this.request.arguments.static == 'true' ||
                             this.app.opts.optStatic
                            ) {
                             this.renderDirectoryListing(results)
-                            } else {
-                            this.renderDirectoryListingTemplate(results)
-                        }
-                    }
-
-                    function onreadsuccess(results) {
-                        //console.log('onreadsuccess',results.length)
-                        if (results.length == 0) {
-                            alldone.bind(this)(allresults)
                         } else {
-                            allresults = allresults.concat( results )
-                            reader.readEntries( onreadsuccess.bind(this),
-                                                onreaderr.bind(this) )
+                            this.renderDirectoryListingTemplate(results)
                         }
                     }
 
-                    //console.log('readentries')
-                    reader.readEntries( onreadsuccess.bind(this),
-                                        onreaderr.bind(this))
+                    this.getDirContents(entry, alldone.bind(this))
                 }
             }
 
@@ -500,8 +443,7 @@
         
             if (this.app.opts.optScanForHtaccess) {
                 var fullrequestpath = this.request.origpath
-                var finapath = fullrequestpath
-                var finpath = finapath.split('/').pop();
+                var finpath = fullrequestpath.split('/').pop();
                 var finalpath = fullrequestpath.substring(0, fullrequestpath.length - finpath.length);
                 if (this.request.path == '') {
                     var finalpath = '/'
@@ -520,12 +462,11 @@
                                 } catch(e) {
                                     this.write('<p>wsc.htaccess file found, but it is not a valid json array. Please read the htaccess readme <a href="https://github.com/ethanaobrien/web-server-chrome/blob/master/htaccess/README.md">here</a></p>', 500)
                                     this.finish()
-                                    console.error('json array error')
+                                    console.error('htaccess json array error')
                                     return
                                 }
                             }
                             
-                            
                             function htaccessMain(filerequested) {
                                 var filefound = false
                                 var auth = false
@@ -533,22 +474,19 @@
                                 var j=0
                                 var data
                                 var htaccessHeaders = [ ]
-                                var invalid = false
                                 var additionalHeaders = false
-                                if (origdata.length == 0) {
+                                if (origdata.length == 0 || ! origdata.length) {
                                     excludedothtmlcheck.bind(this)()
                                     return
                                 }
                                 for (var i=0; i<origdata.length; i++) {
                                     if (! origdata[i].type) {
                                         this.htaccessError.bind(this)('missing type')
-                                        var invalid = true
-                                        break
+                                        return
                                     }
                                     if (! origdata[i].request_path && origdata[i].type != 'directory listing') {
                                         this.htaccessError.bind(this)('missing request path')
-                                        var invalid = true
-                                        break
+                                        return
                                     }
                                     origdata[i].original_request_path = origdata[i].request_path
                                     origdata[i].filerequested = filerequested
@@ -598,9 +536,6 @@
                                 //console.log(data)
                                 //console.log(authdata)
                                 //console.log(filefound)
-                                if (invalid) {
-                                    return
-                                }
                                 function htaccessCheck2() {
                                     if (filefound) {
                                         if (data.type == 301 || data.type == 302 || data.type == 307) {
@@ -615,38 +550,8 @@
                                         } else if (data.type == 403) {
                                             var method = this.request.headers['sec-fetch-dest']
                                             //console.log(method)
-                                            var name = this.request.path
-                                            var extension = name.split('.').pop();
-                                            //console.log(extension)
                                             if (method == "document") {
-                                                if (extension != 'html' && extension != 'htm' && ! this.request.origpath.endsWith('/') && this.request.path != '') {
-                                                    if (this.app.opts.optCustom403) {
-                                                        this.fs.getByPath(this.app.opts.optCustom403location, (file) => {
-                                                        if (! file.error) {
-                                                            file.file( function(filee) {
-                                                                var reader = new FileReader();
-                                                                reader.onload = function(e){
-                                                                    this.useDefaultMime = false
-                                                                    var data = e.target.result
-                                                                    this.setHeader('content-type','text/html; charset=utf-8')
-                                                                    this.write(data, 403)
-                                                                    this.finish()
-                                                                    this.useDefaultMime = true
-                                                                }.bind(this)
-                                                                reader.readAsText(filee)
-                                                            }.bind(this))
-                                                        } else {
-                                                            this.write('Path of 403 html was not found - 403 path is set to: '+this.app.opts.optCustom403location, 500)
-                                                            this.finish()
-                                                        }})
-                                                    } else {
-                                                        this.write('<h1>403 - Forbidden</h1>', 403)
-                                                        this.finish()
-                                                        return
-                                                    }
-                                                } else {
-                                                    excludedothtmlcheck.bind(this)()
-                                                }
+                                                this.error('<h1>403 - Forbidden</h1>', 403)
                                             } else {
                                                 excludedothtmlcheck.bind(this)()
                                             }
@@ -654,8 +559,7 @@
                                             function finished(results) {
                                                 if (this.request.arguments && this.request.arguments.static == '1' ||
                                                     this.request.arguments.static == 'true' ||
-                                                    this.app.opts.optStatic
-                                                   ) {
+                                                    this.app.opts.optStatic ) {
                                                     this.renderDirectoryListing(results)
                                                     return
                                                 } else {
@@ -663,36 +567,13 @@
                                                     return
                                                 }
                                             }
-                                            var reader = entry.createReader()
-                                            var allresults = []
-
-                                            function onreaderr(evt) {
-                                                WSC.entryCache.unset(this.entry.filesystem.name + this.entry.fullPath)
-                                                console.error('error reading dir',evt)
-                                                this.request.connection.close()
-                                            }
-
-                                            function onreadsuccess(results) {
-                                                //console.log('onreadsuccess',results.length)
-                                                if (results.length == 0) {
-                                                    finished.bind(this)(allresults)
-                                                } else {
-                                                    allresults = allresults.concat( results )
-                                                    reader.readEntries( onreadsuccess.bind(this),
-                                                                        onreaderr.bind(this) )
-                                                }
-                                            }
-
-                                            //console.log('readentries')
-                                            reader.readEntries( onreadsuccess.bind(this),
-                                                                onreaderr.bind(this))
-
-
+											
+                                            this.getDirContents(entry, finished.bind(this))
+											
                                             } else if (data.type == 'send directory contents') {
                                                 function finished(results) {
                                                     var fullrequestpath = this.request.origpath
-                                                    var finapath = fullrequestpath
-                                                    var finpath = finapath.split('/').pop();
+                                                    var finpath = fullrequestpath.split('/').pop();
                                                     var finalpath = fullrequestpath.substring(0, fullrequestpath.length - finpath.length) + data.original_request_path
                                                     //console.log(filepath)
                                                     this.fs.getByPath(finalpath, (file) => {
@@ -747,31 +628,12 @@
                                                     })
                                                 }
                                                 var fullrequestpath = this.request.origpath
-                                                var finapath = fullrequestpath
-                                                var finpath = finapath.split('/').pop();
+                                                var finpath = fullrequestpath.split('/').pop();
                                                 var finalpath = fullrequestpath.substring(0, fullrequestpath.length - finpath.length);
                                                 //console.log(finalpath)
                                                 //console.log(data)
                                                 this.fs.getByPath(finalpath, function(entryy) {
-                                                    var reader = entryy.createReader()
-                                                    var allresults = []
-                                                    function onreaderr(evt) {
-                                                        WSC.entryCache.unset(this.entry.filesystem.name + this.entry.fullPath)
-                                                        console.error('error reading dir',evt)
-                                                        this.request.connection.close()
-                                                    }
-                                                    function onreadsuccess(results) {
-                                                        if (results.length == 0) {
-                                                            finished.bind(this)(allresults)
-                                                        } else {
-                                                            allresults = allresults.concat( results )
-                                                            reader.readEntries( onreadsuccess.bind(this),
-                                                                                onreaderr.bind(this) )
-                                                        }
-                                                    }
-                                                    reader.readEntries( onreadsuccess.bind(this),
-                                                                        onreaderr.bind(this))
-                                                
+                                                    this.getDirContents(entryy, finished.bind(this))
                                                 }.bind(this))
                                             } else if (data.type == 'versioning') {
 												//console.log('versioning')
@@ -779,58 +641,60 @@
                                                     this.htaccessError.bind(this)('missing version data')
                                                     return
                                                 }
+                                                if (! data.variable) {
+                                                    this.htaccessError.bind(this)('missing variable')
+                                                    return
+                                                }
                                                 if (! data.default) {
                                                     this.htaccessError.bind(this)('missing default file selection')
                                                     return
                                                 }
-                                                var vdata = this.request.uri.split("?").pop()
-                                                var vdata4
 												var versionData = data.version_data
-                                                if (vdata == this.request.uri) {
-                                                    var vdata4 = data.default
-                                                } else {
-													var vdata = '?'+vdata
-                                                    var vdata1 = vdata.split('?'+data.variable+'=').pop()
-													if (vdata1 == vdata) {
-														var vdata1 = vdata.split('&'+data.variable+'=').pop()
-													}
-                                                    var vdata2 = vdata1.split("&")
-                                                    var vdata3 = vdata2[0]
-                                                    var vdata4 = vdata3.toString()
-                                                }
-                                                if (versionData[vdata4]) {
-                                                    var vdataa = versionData[vdata4]
-                                                    //console.log(vdataa)
-                                                    this.fs.getByPath(vdataa, function(file) {
-                                                        if (! file.error) {
-															var entry = file
-															this.entry = entry
-															this.useDefaultMime = true
-															this.request.path = vdataa
-                                                            this.renderFileContents(entry)
-                                                            return
-                                                        } else {
-                                                            this.write('path in htaccess file for version '+vdata4+' is missing or the file does not exist. Please check to make sure you have properly inputed the value', 500)
-                                                            this.finish()
-                                                            return
-                                                        }
-                                                    }.bind(this))
-                                                } else {
-                                                    this.fs.getByPath(versionData[data.default.toString()], function(file) {
-														if (! file.error) {
-															var entry = file
-															this.entry = entry
-															this.useDefaultMime = true
-															this.request.path = versionData[data.default.toString()]
-															this.renderFileContents(entry)
-															return
+												var vdata4 = this.request.arguments[data.variable]
+												if ( ! versionData[vdata4]) {
+													vdata4 = data.default
+												}
+                                                var vdataa = versionData[vdata4]
+												var fullrequestpath = this.request.origpath
+												var finpath = fullrequestpath.split('/').pop();
+												var finalpath = fullrequestpath.substring(0, fullrequestpath.length - finpath.length);
+												if (this.request.path == '') {
+													var finalpath = '/'
+												}
+												var split1 = finalpath.split('/')
+												var split2 = vdataa.split('/')
+												if (! vdataa.startsWith('/')) {
+													for (var w=0; w<split2.length; w++) {
+														if (split2[w] == '' || split2[w] == '.') {
+															// . means current directory. Leave this here for spacing
+														} else if (split2[w] == '..') {
+															if (split1.length > 0) {
+																var split1 = split1.splice(-1,1)
+															}
 														} else {
-                                                            this.write('path in htaccess file for version '+data.default+' is missing or the file does not exist. Please check to make sure you have properly inputed the value', 500)
-                                                            this.finish()
-                                                            return
-                                                        }
-                                                    }.bind(this))
-                                                }
+															split1.push(split2[w])
+														}
+													}
+													var vdataa = split1.join('/')
+													if (! vdataa.startsWith('/')) {
+														var vdataa = '/' + vdataa
+													}
+													//console.log(vdataa)
+												}
+                                                //console.log(vdataa)
+                                                this.fs.getByPath(vdataa, function(file) {
+                                                    if (! file.error) {
+														var entry = file
+														this.entry = entry
+														this.request.path = vdataa
+                                                        this.renderFileContents(entry)
+                                                        return
+                                                    } else {
+                                                        this.write('path in htaccess file for version '+vdata4+' is missing or the file does not exist. Please check to make sure you have properly inputed the value', 500)
+                                                        this.finish()
+                                                        return
+                                                    }
+                                                }.bind(this))
                                             } else {
                                                 excludedothtmlcheck.bind(this)()
                                             }
@@ -864,35 +728,7 @@
                                                 }
                                             }
                                             if (! validAuth) {
-                                                if (this.app.opts.optCustom401) {
-                                                    this.fs.getByPath(this.app.opts.optCustom401location, (file) => {
-                                                    if (! file.error) {
-                                                        file.file( function(filee) {
-                                                            var reader = new FileReader();
-                                                            reader.onload = function(e){
-                                                                this.useDefaultMime = false
-                                                                var data = e.target.result
-                                                                this.setHeader('content-type','text/html; charset=utf-8')
-                                                                this.setHeader("WWW-Authenticate", "Basic")
-                                                                this.write(data, 401)
-                                                                this.finish()
-                                                                this.useDefaultMime = true
-                                                            }.bind(this)
-                                                            reader.readAsText(filee)
-                                                        }.bind(this))
-                                                    } else {
-                                                        this.write('Path of 401 html was not found - 401 path is set to: '+this.app.opts.optCustom401location, 500)
-                                                        this.finish()
-                                                    }})
-                                                } else {
-                                                    this.useDefaultMime = false
-                                                    this.setHeader('content-type','text/html; charset=utf-8')
-                                                    this.setHeader("WWW-Authenticate", "Basic")
-                                                    this.write("<h1>401 - Unauthorized</h1>", 401)
-                                                    this.finish()
-                                                    this.useDefaultMime = true
-                                                    return
-                                                }
+                                                this.error("<h1>401 - Unauthorized</h1>", 401)
                                             }
                                             if (validAuth) {
                                                 htaccessCheck2.bind(this)()
@@ -910,50 +746,47 @@
                                     var htmHtml = '.html'
                                 }
                                 this.fs.getByPath(this.request.path+htmHtml, (file) => {
-                                if (! file.error) {
-                                    if (this.request.origpath.endsWith("/")) {
-                                        var filerequested = filerequest.split('/').pop();
-                                        var filerequested = WSC.utilityHandler.htaccessFileRequested(filerequested)
-                                        htaccessMain.bind(this)(filerequested)
-                                        return
-                                    }
-                                    var filerequested = this.request.path+htmHtml
-                                    var filerequested = filerequested.split('/').pop();
-                                    var filerequested = WSC.utilityHandler.htaccessFileRequested(filerequested)
-                                    htaccessMain.bind(this)(filerequested)
-                                    return
-                                } else {
-                                    if (this.entry && this.entry.isDirectory && ! this.request.origpath.endsWith('/')) {
-                                        var newloc = this.request.origpath + '/'
-                                        this.setHeader('location', newloc)
-                                        this.responseLength = 0
-                                        this.writeHeaders(301)
-
-                                        this.finish()
-                                        return
-                                    }
-                                    var filerequested = filerequest.split('/').pop();
-                                    //console.log(filerequested)
-                                    var filerequested = WSC.utilityHandler.htaccessFileRequested(filerequested)
-                                        htaccessMain.bind(this)(filerequested)
-                                        return
-                                    }
-                                })} else {
-                                    if (this.entry && this.entry.isDirectory && ! this.request.origpath.endsWith('/')) {
-                                        var newloc = this.request.origpath + '/'
-                                        this.setHeader('location', newloc)
-                                        this.responseLength = 0
-                                        this.writeHeaders(301)
-
-                                        this.finish()
-                                        return
-                                    }
-                                    var filerequested = filerequest.split('/').pop();
-                                    //console.log(filerequested)
-                                    var filerequested = WSC.utilityHandler.htaccessFileRequested(filerequested)
-                                    htaccessMain.bind(this)(filerequested)
+									if (! file.error) {
+										if (this.request.origpath.endsWith("/")) {
+											htaccessMain.bind(this)('')
+											return
+										}
+										var filerequested = this.request.path+htmHtml
+										var filerequested = filerequested.split('/').pop();
+										var filerequested = WSC.utilityHandler.htaccessFileRequested(filerequested)
+										htaccessMain.bind(this)(filerequested)
+										return
+									} else {
+										if (this.entry && this.entry.isDirectory && ! this.request.origpath.endsWith('/')) {
+											var newloc = this.request.origpath + '/'
+											this.setHeader('location', newloc)
+											this.responseLength = 0
+											this.writeHeaders(301)
+											this.finish()
+											return
+										}
+										var filerequested = filerequest.split('/').pop();
+										//console.log(filerequested)
+										var filerequested = WSC.utilityHandler.htaccessFileRequested(filerequested)
+											htaccessMain.bind(this)(filerequested)
+											return
+                                    	}
+                                })
+							} else {
+                                if (this.entry && this.entry.isDirectory && ! this.request.origpath.endsWith('/')) {
+                                    var newloc = this.request.origpath + '/'
+                                    this.setHeader('location', newloc)
+                                    this.responseLength = 0
+                                    this.writeHeaders(301)
+                                    this.finish()
                                     return
                                 }
+                                var filerequested = filerequest.split('/').pop();
+                                //console.log(filerequested)
+                                var filerequested = WSC.utilityHandler.htaccessFileRequested(filerequested)
+                                htaccessMain.bind(this)(filerequested)
+                                return
+                                }
                             
                         }.bind(this)
                         reader.readAsText(filee)
@@ -968,13 +801,8 @@
         renderFileContents: function(entry, file) {
             getEntryFile(entry, function(file) {
                 if (file instanceof DOMException) {
-                    if (this.app.opts.optCustom404) {
-                        this.renderCustom404Html.bind(this)()
-                    } else {
-                        this.write("File not found", 404)
-                        this.finish()
-                        return
-                }}
+					this.error("File not found", 404)
+                }
                 this.file = file
                 if (this.request.method == "HEAD") {
                     this.responseLength = this.file.size
@@ -1059,68 +887,52 @@
             if (! WSC.template_data) {
                 return this.renderDirectoryListing(results)
             }
-            if (results.length > 0) {
-                function DirRenderFinish() {
-                    var data = html.join('\n')
-                    data = new TextEncoder('utf-8').encode(data).buffer
-                    this.writeChunk(data)
-                    this.request.connection.write(WSC.str2ab('0\r\n\r\n'))
-                    this.finish()
-                }
-                function sendFileList() {
-                    results[w].getMetadata(function(file) {
-                        //console.log(file)
-                        var rawname = results[w].name
-                        var name = encodeURIComponent(results[w].name)
-                        var isdirectory = results[w].isDirectory
-                        //var modified = '4/27/21, 10:38:40 AM'
-                        var modified = WSC.utilityHandler.lastModified(file.modificationTime)
-                        var filesize = file.size
-                        var filesizestr = WSC.utilityHandler.humanFileSize(file.size)
-                        var modifiedstr = WSC.utilityHandler.lastModifiedStr(file.modificationTime)
-                        // raw, urlencoded, isdirectory, size, size as string, date modified, date modified as string
-                        if (rawname != 'wsc.htaccess') {
-                        html.push('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+',"'+filesize+'","'+filesizestr+'","'+modified+'","'+modifiedstr+'");</script>')
-                        }
-                        if (w != results.length - 1) {
-                            w++
-                            sendFileList.bind(this, results)()
-                        } else {
-                            DirRenderFinish.bind(this, results)()
-                        }
-                    }.bind(this), function(error) {
-                        console.error('error reading metadata '+error)
-                        if (w != results.length - 1) {
-                            w++
-                            sendFileList.bind(this, results)()
-                        } else {
-                            DirRenderFinish.bind(this, results)()
-                        }
-                    }.bind(this))
-                }
-                this.setHeader('transfer-encoding','chunked')
-                this.writeHeaders(200)
-                this.writeChunk(WSC.template_data )
-                var html = ['<script>start("'+this.request.uri+'")</script>']
-                if (this.request.uri != '/') {
-                    html.push('<script>onHasParentDirectory();</script>')
-                }
-                var w = 0
-                sendFileList.bind(this, results)()
-            } else {
-                this.setHeader('transfer-encoding','chunked')
-                this.writeHeaders(200)
-                this.writeChunk(WSC.template_data )
-                var html = ['<script>start("'+this.request.uri+'")</script>']
-                if (this.request.uri != '/') {
-                    html.push('<script>onHasParentDirectory();</script>')
-                }
-                var data = html.join('\n')
-                data = new TextEncoder('utf-8').encode(data).buffer
-                this.writeChunk(data)
-                this.request.connection.write(WSC.str2ab('0\r\n\r\n'))
+            function DirRenderFinish() {
+				this.write(html.join('\n'))
                 this.finish()
             }
+            function sendFileList() {
+                results[w].getMetadata(function(file) {
+                    //console.log(file)
+                    var rawname = results[w].name
+                    var name = encodeURIComponent(results[w].name)
+                    var isdirectory = results[w].isDirectory
+                    //var modified = '4/27/21, 10:38:40 AM'
+                    var modified = WSC.utilityHandler.lastModified(file.modificationTime)
+                    var filesize = file.size
+                    var filesizestr = WSC.utilityHandler.humanFileSize(file.size)
+                    var modifiedstr = WSC.utilityHandler.lastModifiedStr(file.modificationTime)
+                    // raw, urlencoded, isdirectory, size, size as string, date modified, date modified as string
+                    if (rawname != 'wsc.htaccess') {
+                    html.push('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+',"'+filesize+'","'+filesizestr+'","'+modified+'","'+modifiedstr+'");</script>')
+                    }
+                    if (w != results.length - 1) {
+                        w++
+                        sendFileList.bind(this, results)()
+                    } else {
+                        DirRenderFinish.bind(this, results)()
+                    }
+                }.bind(this), function(error) {
+                    console.error('error reading metadata '+error)
+                    if (w != results.length - 1) {
+                        w++
+                        sendFileList.bind(this, results)()
+                    } else {
+                        DirRenderFinish.bind(this, results)()
+                    }
+                }.bind(this))
+            }
+			var html = [WSC.template_data]
+            html.push('<script>start("'+this.request.origpath+'")</script>')
+            if (this.request.origpath != '/') {
+                html.push('<script>onHasParentDirectory();</script>')
+            }
+            var w = 0
+			if (results.length == 0) {
+				DirRenderFinish()
+				return
+			}
+            sendFileList.bind(this, results)()
         },
         renderDirectoryListing: function(results) {
             var html = ['<html>']
@@ -1158,39 +970,26 @@
             }
 
         },
-        renderCustom404Html: function() {
-            this.fs.getByPath(this.app.opts.optCustom404location, (file) => {
-            if (! file.error) {
-                file.file( function(filee) {
-                var reader = new FileReader();
-                reader.onload = function(e){
-                    this.useDefaultMime = false
-                    var data = e.target.result
-                    if (this.app.opts.optCustom404usevar) {
-                        if (this.app.opts.optCustom404usevarvar != '') {
-                        var html = ['<script>var '+this.app.opts.optCustom404usevarvar+' = "'+this.request.uri+'";</script>']
-                    } else {
-                        this.write('javascript location variable is blank', 500)
-                        return
-                    }
-                    } else {
-                        var html = ['']
-                    }
-                    html.push(data)
-                    var finaldata = html.join('\n')
-                    this.setHeader('content-type','text/html; charset=utf-8')
-                    this.write(finaldata, 404)
-                    this.finish()
-                    this.useDefaultMime = true
-                }.bind(this)
-            reader.readAsText(filee)
-            }.bind(this))
-            } else {
-                this.write('Path of 404 html was not found - 404 path is set to: '+this.app.opts.optCustom404location, 500)
-                this.finish()
-            }})
-        
-        },
+		getDirContents: function(entry, callback) {
+   			var reader = entry.createReader()
+            var allresults = []
+            function onreaderr(evt) {
+                WSC.entryCache.unset(this.entry.filesystem.name + this.entry.fullPath)
+                console.error('error reading dir',evt)
+                this.request.connection.close()
+            }
+            function onreadsuccess(results) {
+                if (results.length == 0) {
+                    callback(allresults)
+                } else {
+                    allresults = allresults.concat( results )
+                    reader.readEntries( onreadsuccess.bind(this),
+                                        onreaderr.bind(this) )
+                }
+            }
+            reader.readEntries( onreadsuccess.bind(this),
+                                onreaderr.bind(this))
+		},
         htaccessError: function(errormsg) {
             this.write('Htaccess Configuration error. Please check to make sure that you are not missing some values.\n\nError Message: '+errormsg, 500)
             this.finish()
@@ -1198,29 +997,28 @@
         }
     }, WSC.BaseHandler.prototype)
 
-    if (chrome.runtime.id == WSC.store_id || true) {
-        
-        chrome.runtime.getPackageDirectoryEntry( function(pentry) {
-            var template_filename = 'directory-listing-template.html'
-            var onfile = function(e) {
-                if (e instanceof DOMException) {
-                    console.error('template fetch:',e)
-                } else {
-                    var onfile = function(file) {
-                        var onread = function(evt) {
-                            WSC.template_data = evt.target.result
-                        }
-                        var fr = new FileReader
-                        fr.onload = onread
-                        fr.onerror = onread
-                        fr.readAsArrayBuffer(file)
+    //if (chrome.runtime.id == WSC.store_id || true) {
+    
+    chrome.runtime.getPackageDirectoryEntry( function(pentry) {
+        var template_filename = 'directory-listing-template.html'
+        var onfile = function(e) {
+            if (e instanceof DOMException) {
+                console.error('template fetch:',e)
+            } else {
+                var onfile = function(file) {
+                    var onread = function(evt) {
+                        WSC.template_data = evt.target.result
                     }
-                    e.file( onfile, onfile )
+                    var fr = new FileReader
+                    fr.onload = onread
+                    fr.onerror = onread
+                    fr.readAsText(file)
                 }
+                e.file( onfile, onfile )
             }
-            pentry.getFile(template_filename,{create:false},onfile,onfile)
-        })
-    }
+        }
+        pentry.getFile(template_filename,{create:false},onfile,onfile)
+    })
 
     WSC.DirectoryEntryHandler = DirectoryEntryHandler
 
diff --git a/htaccess/README.md b/htaccess/README.md
index 561496c1..56943d2c 100644
--- a/htaccess/README.md
+++ b/htaccess/README.md
@@ -182,10 +182,10 @@ To use option for all files, the value of request path will be 'all files' It sh
         "type": "versioning",
         "default": 4,
 		"variable": "v",
-        "version_data": {"1": "FULL path of file (From root of selected folder)",
-                         "2": "FULL path of file (From root of selected folder)",
-                         "3": "FULL path of file (From root of selected folder)",
-                         "4": "FULL path of file (From root of selected folder)"
+        "version_data": {"1": "Path to file",
+                         "2": "Path to file",
+                         "3": "Path to file",
+                         "4": "Path to file"
                         }
     }
 ]
@@ -197,8 +197,15 @@ To use option for all files, the value of request path will be 'all files' It sh
     "1": "/data/path/to/file/index.html"
 }
 ```
+or, if the you were in the `/data/asd/` directory
+
+```
+{
+    "1": "../path/to/file/index.html"
+}
+```
 <p>You can add as many versions as you would like.</p>
-<p>Please be sure to correctly input the FULL path of the file (From root of selected folder)</p>
+<p>I have recently made it to where you can use relative paths!</p>
 <p>Please note - this feature is compatible with auth (you must use the request path, not the path of the file) and additional headers but you CANNOT use ANY other htaccess features!</p>
 
 The variable is what the user needs to request. If we use v, the user would request something like `localhost:8887/example.mp4?v=1`
diff --git a/react-ui/js/index.js b/react-ui/js/index.js
index 3ef54f69..be53c7f7 100644
--- a/react-ui/js/index.js
+++ b/react-ui/js/index.js
@@ -137,7 +137,10 @@ const functions = {
     console.log("useHttps", val);
     app.webapp.updateOption('optUseHttps', val);
     if (app.webapp.started) {
-      app.webapp.stop();
+	  // we must call the start function as a callback
+      app.webapp.stop('https option changed', function() {
+		  app.webapp.start()
+	  });
     }
   }
 };
@@ -298,10 +301,13 @@ class App extends React.Component {
       optIPV6: null,
       optStatic: null,
       optUpload: null,
-      optDelete: null,
-      optVerbose: null,
     };
+	const optUploadOptions = {
+	  optAllowReplaceFile: ['optUpload']
+	};
     const optnodothtmlMain = {
+      optDelete: null,
+      optVerbose: null,
       optExcludeDotHtml: null
     };
     const optnodothtmlInfo = {
@@ -417,6 +423,12 @@ class App extends React.Component {
 	  </div>)];
     })();
 
+	const UploadOption = (() => {
+		let disableoneasd = (!this.webapp || !this.webapp.opts.optUpload);
+		const uploadasd = renderOpts(optUploadOptions)
+		return [(<div>{!disableoneasd && uploadasd}</div>)];
+	})();
+
     const Custom403Options = (() => {
       let disableone = (!this.webapp || !this.webapp.opts.optCustom403);
       const textboxesone = renderOpts(optCustom403Info)
@@ -547,7 +559,7 @@ class App extends React.Component {
           {options}
 
           {advancedButton}
-          {state.showAdvanced && <div>{advOptions}{nodothtmlMain}{nodothtmlOptions}{Custom400Main}{Custom400Options}{Custom401Main}{Custom401Options}{Custom403Main}{Custom403Options}{Custom404Main}{Custom404Options}{Custom404OptionsPt2}{authMain}{authOptions}{HtaccessMain}{HtaccessInfo}{cacheMain}{cacheOptions}{rewriteMain}{rewriteOptions}{httpsMain}{httpsOptions}</div> }
+          {state.showAdvanced && <div>{advOptions}{UploadOption}{nodothtmlMain}{nodothtmlOptions}{Custom400Main}{Custom400Options}{Custom401Main}{Custom401Options}{Custom403Main}{Custom403Options}{Custom404Main}{Custom404Options}{Custom404OptionsPt2}{authMain}{authOptions}{HtaccessMain}{HtaccessInfo}{cacheMain}{cacheOptions}{rewriteMain}{rewriteOptions}{httpsMain}{httpsOptions}</div> }
         </CardContent>
       </Card>
 
diff --git a/react-ui/js/options.js b/react-ui/js/options.js
index 3ae6f49c..c66a583d 100644
--- a/react-ui/js/options.js
+++ b/react-ui/js/options.js
@@ -272,6 +272,12 @@ const options = {
     type: Boolean,
     default: false
   },
+  optAllowReplaceFile: {
+    label: 'Allow Replace file',
+    help: 'Will allow the user to overwrite a file',
+    type: Boolean,
+    default: false
+  },
   optDelete: {
     label: 'Allow Deleting Files',
     help: 'Enables the delete request',
diff --git a/webapp.js b/webapp.js
index c36fd20a..70db8cbd 100644
--- a/webapp.js
+++ b/webapp.js
@@ -455,12 +455,8 @@
         },*/
         ensureFirewallOpen: function() {
             // on chromeOS, if there are no foreground windows,
-            if (this.opts.optAllInterfaces && chrome.app.window.getAll().length == 0) {
-                if (chrome.app.window.getAll().length == 0) {
-                    if (window.create_hidden) {
-                        create_hidden() // only on chrome OS
-                    }
-                }
+            if (this.opts.optAllInterfaces && chrome.app.window.getAll().length == 0 && window.create_hidden && this.webapp.started) {
+                create_hidden() // only on chrome OS
             }
         },
         bindAcceptCallbacks: function() {
@@ -496,75 +492,6 @@
             connection.addRequestCallback(this.onRequest.bind(this,stream,connection))
             connection.tryRead()
         },
-        render400HTML: function(request) {
-            var handler = new WSC.BaseHandler(request)
-            handler.app = this
-            handler.request = request
-            if (request.method == "HEAD") {
-                handler.responseLength = 0
-                handler.writeHeaders(400)
-                handler.finish()
-                return
-            }
-            if (this.opts.optCustom400) {
-                this.fs.getByPath(this.opts.optCustom400location, (file) => {
-                if (! file.error) {
-                    file.file( function(filee) {
-                    var reader = new FileReader();
-                    reader.onload = function(e){
-                        this.useDefaultMime = false
-                        var data = e.target.result
-                        handler.setHeader('content-type','text/html; charset=utf-8')
-                        handler.write(data, 400)
-                        handler.finish()
-                        this.useDefaultMime = true
-                    }.bind(this)
-                reader.readAsText(filee)
-                }.bind(this))
-                } else {
-                    handler.write('Path of 400 html was not found - 400 path is set to: '+this.opts.optCustom400location, 500)
-                    handler.finish()
-                }})
-            } else {
-                handler.write('<h1>400 - Bad Request</h1>', 400)
-                handler.finish()
-            }
-        },
-		render401HTML: function(request) {
-            var handler = new WSC.BaseHandler(request)
-		    handler.app = this
-            handler.request = request
-            if (this.opts.optCustom401) {
-                this.fs.getByPath(this.opts.optCustom401location, (file) => {
-                if (! file.error) {
-                    file.file( function(filee) {
-                        var reader = new FileReader();
-                        reader.onload = function(e){
-                            this.useDefaultMime = false
-                            var data = e.target.result
-                            handler.setHeader('content-type','text/html; charset=utf-8')
-                            handler.setHeader("WWW-Authenticate", "Basic")
-                            handler.write(data, 401)
-                            handler.finish()
-                            this.useDefaultMime = true
-                            return
-                        }.bind(this)
-                        reader.readAsText(filee)
-                    }.bind(this))
-                } else {
-                    handler.write('Path of 401 html was not found - 401 path is set to: '+this.opts.optCustom401location, 500)
-                    handler.finish()
-                }})
-            } else {
-                this.useDefaultMime = false
-                handler.setHeader('content-type','text/html; charset=utf-8')
-                handler.setHeader("WWW-Authenticate", "Basic")
-                handler.write("<h1>401 - Unauthorized</h1>", 401)
-                handler.finish()
-                this.useDefaultMime = true
-                return
-            }
-		},
         onRequest: function(stream, connection, request) {
             console.log('Request',request.method, request.uri)
 
@@ -574,8 +501,11 @@
                 if ((request.method == 'GET' && ! this.opts.optGETHtaccess) ||
                     (request.method == 'PUT' && ! this.opts.optPUTPOSTHtaccess) ||
                     (request.method == 'POST' && ! this.opts.optPUTPOSTHtaccess) ||
-                    (request.method == 'DELETE' && ! this.opts.optPUTPOSTHtaccess)) {
-                    this.render400HTML.bind(this)(request)
+                    (request.method == 'DELETE' && ! this.opts.optDELETEHtaccess)) {
+					var handler = new WSC.BaseHandler(request)
+					handler.app = this
+					handler.request = request
+					handler.error('<h1>400 - Bad Request</h1>', 400)
                     return
                 }
             }
@@ -595,7 +525,10 @@
                 }
 
                 if (! validAuth) {
-                    this.render401HTML.bind(this)(request)
+					var handler = new WSC.BaseHandler(request)
+					handler.app = this
+					handler.request = request
+					handler.error("<h1>401 - Unauthorized</h1>", 401)
                     return
                 }
             }
@@ -674,6 +607,57 @@
                 this.finish()
             }
         },
+        error: function(defaultMsg, httpCode) {
+			if (this.request.method == "HEAD") {
+                this.responseLength = 0
+                this.writeHeaders(httpCode)
+                this.finish()
+				return
+            } else {
+				// We set the request.path to a .html file to override the mimetype of the requested file
+				this.request.path = 'error.html'
+				if (this.app.opts['optCustom'+httpCode]) {
+					this.fs.getByPath(this.app.opts['optCustom'+httpCode+'location'], (file) => {
+						if (! file.error) {
+							file.file( function(file) {
+								var reader = new FileReader()
+								reader.onload = function(e) {
+									var data = e.target.result
+									if (httpCode == 404) {
+										if (this.app.opts.optCustom404usevar) {
+											if (this.app.opts.optCustom404usevarvar.replace(' ', '') != '') {
+												var data = '<script>var '+this.app.opts.optCustom404usevarvar+' = "'+this.request.uri+'";</script>\n' + data
+											} else {
+												this.write('javascript location variable is blank', 500)
+												this.finish()
+												return
+											}
+										}
+									}
+									if (httpCode == 401) {
+										this.setHeader("WWW-Authenticate", "Basic")
+									}
+									this.write(data, httpCode)
+									this.finish()
+								}.bind(this)
+								reader.readAsText(file)
+							}.bind(this))
+						} else {
+							if ([400,401,403,404].includes(httpCode)) {
+								this.write('Path of Custom '+httpCode+' html was not found. Custom '+httpCode+' is set to '+this.app.opts['optCustom'+httpCode+'location'], 500)
+								this.finish()
+							} else {
+								this.write(defaultMsg, httpCode)
+								this.finish()
+							}
+						}
+					})
+				} else {
+					this.write(defaultMsg, httpCode)
+					this.finish()
+				}
+			}
+		},
         setCORS: function() {
             this.setHeader('access-control-allow-origin','*')
             this.setHeader('access-control-allow-methods','GET, POST, PUT, DELETE')
@@ -717,7 +701,7 @@
             }
 
             var p = this.request.path.split('.')
-            if (p.length > 1 && ! this.isDirectoryListing && this.useDefaultMime) {
+            if (p.length > 1 && ! this.isDirectoryListing) {
                 var ext = p[p.length-1].toLowerCase()
                 var type = WSC.MIMETYPES[ext]
                 if (type) {

From 201da7b751a8dfc2e3bf4b50ce9551d88c128b62 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Sun, 13 Jun 2021 17:47:16 -0500
Subject: [PATCH 108/154] Sequrity fix (#274)

---
 handlers.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/handlers.js b/handlers.js
index 01ed19f3..0dd250fa 100644
--- a/handlers.js
+++ b/handlers.js
@@ -354,6 +354,13 @@
             this.entry = entry
 
             function onEntryMain() {
+				
+				if (entry.isFile && this.request.origpath.endsWith('/')) {
+					this.setHeader('location', this.request.path)
+                    this.writeHeaders(301)
+                    this.finish()
+                    return
+				}
                 
                 if (this.entry && this.entry.isDirectory && ! this.request.origpath.endsWith('/')) {
                     var newloc = this.request.origpath + '/'

From b4ffcd9af1419b23a07e34d13add220be13de8cd Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Mon, 14 Jun 2021 13:13:59 -0500
Subject: [PATCH 109/154] Bug Fix

---
 webapp.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/webapp.js b/webapp.js
index 70db8cbd..bfc5e3d1 100644
--- a/webapp.js
+++ b/webapp.js
@@ -648,6 +648,9 @@
 								this.finish()
 							} else {
 								this.write(defaultMsg, httpCode)
+								if (httpCode == 401) {
+									this.setHeader("WWW-Authenticate", "Basic")
+								}
 								this.finish()
 							}
 						}

From 3502691cab94796ea8f78e62a4ff2f957d5e857f Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Mon, 14 Jun 2021 16:26:44 -0500
Subject: [PATCH 110/154] Bug Fix

---
 handlers.js | 2 +-
 webapp.js   | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/handlers.js b/handlers.js
index 0dd250fa..ba648692 100644
--- a/handlers.js
+++ b/handlers.js
@@ -355,7 +355,7 @@
 
             function onEntryMain() {
 				
-				if (entry.isFile && this.request.origpath.endsWith('/')) {
+				if (this.entry && this.entry.isFile && this.request.origpath.endsWith('/')) {
 					this.setHeader('location', this.request.path)
                     this.writeHeaders(301)
                     this.finish()
diff --git a/webapp.js b/webapp.js
index bfc5e3d1..8063e826 100644
--- a/webapp.js
+++ b/webapp.js
@@ -647,15 +647,18 @@
 								this.write('Path of Custom '+httpCode+' html was not found. Custom '+httpCode+' is set to '+this.app.opts['optCustom'+httpCode+'location'], 500)
 								this.finish()
 							} else {
-								this.write(defaultMsg, httpCode)
 								if (httpCode == 401) {
 									this.setHeader("WWW-Authenticate", "Basic")
 								}
+								this.write(defaultMsg, httpCode)
 								this.finish()
 							}
 						}
 					})
 				} else {
+					if (httpCode == 401) {
+						this.setHeader("WWW-Authenticate", "Basic")
+					}
 					this.write(defaultMsg, httpCode)
 					this.finish()
 				}

From f7fb3649a056c23c2a9d9daad7a2be7c6b12b821 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Wed, 16 Jun 2021 09:57:19 -0500
Subject: [PATCH 111/154] post

---
 connection.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/connection.js b/connection.js
index 77a69523..8fee877e 100644
--- a/connection.js
+++ b/connection.js
@@ -66,7 +66,7 @@
                 return
             }
 
-            if (['GET','HEAD','PUT','DELETE','OPTIONS'].includes(method)) {
+            if (['GET','HEAD','PUT','POST','DELETE','OPTIONS'].includes(method)) {
                 this.onRequest(this.curRequest)
             } else {
                 console.error('how to handle',this.curRequest)

From 4f72a80e22d8c756ea7b5c802eb0070f8de86d95 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Wed, 16 Jun 2021 18:24:11 -0500
Subject: [PATCH 112/154] More Cleanup

---
 handlers.js        | 731 ++++++++++++++++++++++++---------------------
 htaccess/README.md |   4 +-
 webapp.js          |   7 +-
 3 files changed, 393 insertions(+), 349 deletions(-)

diff --git a/handlers.js b/handlers.js
index ba648692..7548cb9f 100644
--- a/handlers.js
+++ b/handlers.js
@@ -261,8 +261,12 @@
                 this.write("error: need to select a directory to serve",500)
                 return
             }
+            this.request.isVersioning == false
             //var path = decodeURI(this.request.path)
 
+            if (this.app.opts.optCacheControl) {
+                this.setHeader('Cache-Control',this.app.opts.optCacheControlValue)
+            }
             if (this.app.opts.optExcludeDotHtml && ! this.request.origpath.endsWith("/")) {
 				var htmhtml = this.app.opts.optExcludeDotHtm ? 'htm' : 'html';
                 var extension = this.request.path.split('.').pop();
@@ -400,12 +404,12 @@
                                 }
                             }
                         }
-                        if (this.request.arguments && this.request.arguments.json == '1' ||
+                        if (this.app.opts.optDir404 && this.app.opts.optRenderIndex) {
+							this.error("404 - File not found", 404)
+                        } else if (this.request.arguments && this.request.arguments.json == '1' ||
                             (this.request.headers['accept'] && this.request.headers['accept'].toLowerCase() == 'application/json')
                            ) {
                             this.renderDirectoryListingJSON(results)
-                        } else if (this.app.opts.optDir404 && this.app.opts.optRenderIndex) {
-							this.error("404 - File not found", 404)
                         } else if (this.request.arguments && this.request.arguments.static == '1' ||
                             this.request.arguments.static == 'true' ||
                             this.app.opts.optStatic
@@ -415,38 +419,34 @@
                             this.renderDirectoryListingTemplate(results)
                         }
                     }
-
                     this.getDirContents(entry, alldone.bind(this))
                 }
             }
 
-        function excludedothtmlcheck() {
-            if (this.app.opts.optExcludeDotHtml && this.request.path != '') {
-                if (this.app.opts.optExcludeDotHtm) {
-                    var htmHtml = '.htm'
-                } else {
-                    var htmHtml = '.html'
-                }
-                this.fs.getByPath(this.request.path+htmHtml, (file) => {
-                if (! file.error) {
-                    if (this.request.origpath.endsWith("/")) {
-                        onEntryMain.bind(this)()
-                        return
-                    }
-                    this.renderFileContents(file)
-                    //console.log('file found')
-                    this.setHeader('content-type','text/html; charset=utf-8')
-                    return
-                } else {
-                    onEntryMain.bind(this)()
-                    }
-                })} else {
-                onEntryMain.bind(this)()
-            }
-        }
-            if (this.app.opts.optCacheControl) {
-                this.setHeader('Cache-Control',this.app.opts.optCacheControlValue)
-            }
+			function excludedothtmlcheck() {
+				if (this.app.opts.optExcludeDotHtml && this.request.path != '') {
+					if (this.app.opts.optExcludeDotHtm) {
+						var htmHtml = '.htm'
+					} else {
+						var htmHtml = '.html'
+					}
+					this.fs.getByPath(this.request.path+htmHtml, (file) => {
+					if (! file.error) {
+						if (this.request.origpath.endsWith("/")) {
+							onEntryMain.bind(this)()
+							return
+						}
+						this.renderFileContents(file)
+						//console.log('file found')
+						this.setHeader('content-type','text/html; charset=utf-8')
+						return
+					} else {
+						onEntryMain.bind(this)()
+						}
+					})} else {
+					onEntryMain.bind(this)()
+				}
+			}
         
             if (this.app.opts.optScanForHtaccess) {
                 var fullrequestpath = this.request.origpath
@@ -456,351 +456,393 @@
                     var finalpath = '/'
                 }
                 var htaccesspath = finalpath+'wsc.htaccess'
-                //console.log(htaccesspath)
                 this.fs.getByPath(htaccesspath, (file) => {
-                if (! file.error) {
-                    file.file( function(filee) {
-                        var reader = new FileReader();
-                        reader.onload = function(e){
-                            var dataa = e.target.result
-                            if(true) {
-                                try {
-                                    var origdata = JSON.parse(dataa)
-                                } catch(e) {
-                                    this.write('<p>wsc.htaccess file found, but it is not a valid json array. Please read the htaccess readme <a href="https://github.com/ethanaobrien/web-server-chrome/blob/master/htaccess/README.md">here</a></p>', 500)
-                                    this.finish()
-                                    console.error('htaccess json array error')
-                                    return
-                                }
-                            }
-                            
-                            function htaccessMain(filerequested) {
-                                var filefound = false
-                                var auth = false
-                                var authdata
-                                var j=0
-                                var data
-                                var htaccessHeaders = [ ]
-                                var additionalHeaders = false
-                                if (origdata.length == 0 || ! origdata.length) {
-                                    excludedothtmlcheck.bind(this)()
-                                    return
-                                }
-                                for (var i=0; i<origdata.length; i++) {
-                                    if (! origdata[i].type) {
-                                        this.htaccessError.bind(this)('missing type')
+                    if (! file.error && file.isFile) {
+                        file.file( function(filee) {
+                            var reader = new FileReader();
+                            reader.onload = function(e){
+                                var dataa = e.target.result
+                                if(true) {
+                                    try {
+                                        var origdata = JSON.parse(dataa)
+                                    } catch(e) {
+                                        this.write('<p>wsc.htaccess file found, but it is not a valid json array. Please read the htaccess readme <a href="https://github.com/ethanaobrien/web-server-chrome/blob/master/htaccess/README.md">here</a></p>\n\n\n'+e, 500)
+                                        this.finish()
+                                        console.error('htaccess json array error')
                                         return
                                     }
-                                    if (! origdata[i].request_path && origdata[i].type != 'directory listing') {
-                                        this.htaccessError.bind(this)('missing request path')
+                                }
+
+                                function htaccessMain(filerequested) {
+                                    var filefound = false
+                                    var auth = false
+                                    var authdata = false
+                                    var j=0
+                                    var data = false
+                                    var htaccessHeaders = [ ]
+                                    var additionalHeaders = false
+                                    if (origdata.length == 0 || ! origdata.length) {
+                                        excludedothtmlcheck.bind(this)()
                                         return
                                     }
-                                    origdata[i].original_request_path = origdata[i].request_path
-                                    origdata[i].filerequested = filerequested
-                                    origdata[i].request_path = WSC.utilityHandler.htaccessFileRequested(origdata[i].request_path)
-                                    if (origdata[i].type == 401 &&
-                                        ! auth &&
-                                        (origdata[i].request_path == filerequested || origdata[i].request_path == 'all files')) {
-                                        var auth = true
-                                        var authdata = origdata[i]
-                                    }
-                                    if (origdata[i].type == 'directory listing' &&
-                                        this.request.uri.split('/').pop() == '' &&
-                                        ! filefound) {
-                                        var data = origdata[i]
-                                        var filefound = true
-                                    }
-                                    if (origdata[i].type == 'send directory contents' && origdata[i].request_path == filerequested) {
-                                        var extension = origdata[i].original_request_path.split('.').pop()
-                                        if (extension == 'html' || extension == 'htm') {
-                                            var data = origdata[i]
-                                            var filefound = true
+                                    for (var i=0; i<origdata.length; i++) {
+                                        if (! origdata[i].type) {
+                                            this.htaccessError.bind(this)('missing type')
+                                            return
                                         }
-                                    }
-                                    if ((origdata[i].request_path == filerequested || origdata[i].request_path == 'all files') &&
-                                        ! filefound &&
-                                        origdata[i].type != 'allow delete' &&
-                                        origdata[i].type != 'allow put' &&
-                                        origdata[i].type != 'deny delete' &&
-                                        origdata[i].type != 'deny put' &&
-                                        origdata[i].type != 401 &&
-                                        origdata[i].type != 'directory listing' &&
-                                        origdata[i].type != 'additional header' &&
-                                        origdata[i].type != 'send directory contents') {
+                                        if (! origdata[i].request_path && origdata[i].type != 'directory listing') {
+                                            this.htaccessError.bind(this)('missing request path')
+                                            return
+                                        }
+                                        origdata[i].original_request_path = origdata[i].request_path
+                                        origdata[i].filerequested = filerequested
+                                        origdata[i].request_path = WSC.utilityHandler.htaccessFileRequested(origdata[i].request_path)
+                                        if (origdata[i].type == 401 &&
+                                            ! auth &&
+                                            (origdata[i].request_path == filerequested || origdata[i].request_path == 'all files') && ! this.request.isVersioning) {
+                                            var auth = true
+                                            var authdata = origdata[i]
+                                        }
+                                        if (origdata[i].type == 'directory listing' &&
+                                            this.request.uri.split('/').pop() == '' &&
+                                            ! filefound) {
                                             var data = origdata[i]
-                                            //console.log(data)
                                             var filefound = true
-                                    }
-                                    //console.log(origdata[i].request_path == filerequested)
-                                    if ((origdata[i].request_path == filerequested || origdata[i].request_path == 'all files') &&
-                                        origdata[i].type == 'additional header') {
-                                        //console.log('additional header')
-                                        var additionalHeaders = true
-                                        htaccessHeaders[j] = origdata[i]
-                                        j++
-                                    }
-                                }
-                                //console.log(data)
-                                //console.log(authdata)
-                                //console.log(filefound)
-                                function htaccessCheck2() {
-                                    if (filefound) {
-                                        if (data.type == 301 || data.type == 302 || data.type == 307) {
-                                            if (! data.redirto) {
-                                                this.htaccessError.bind(this)('missing redirect location')
-                                                return
-                                            }
-                                            this.setHeader('location', data.redirto)
-                                            this.responseLength = 0
-                                            this.writeHeaders(data.type)
-                                            this.finish()
-                                        } else if (data.type == 403) {
-                                            var method = this.request.headers['sec-fetch-dest']
-                                            //console.log(method)
-                                            if (method == "document") {
-                                                this.error('<h1>403 - Forbidden</h1>', 403)
-                                            } else {
-                                                excludedothtmlcheck.bind(this)()
+                                        }
+                                        if (origdata[i].type == 'send directory contents' && origdata[i].request_path == filerequested) {
+                                            var extension = origdata[i].original_request_path.split('.').pop()
+                                            if (extension == 'html' || extension == 'htm') {
+                                                var data = origdata[i]
+                                                var filefound = true
                                             }
-                                        } else if (data.type == 'directory listing') {
-                                            function finished(results) {
-                                                if (this.request.arguments && this.request.arguments.static == '1' ||
-                                                    this.request.arguments.static == 'true' ||
-                                                    this.app.opts.optStatic ) {
-                                                    this.renderDirectoryListing(results)
+                                        }
+                                        if ((origdata[i].request_path == filerequested || origdata[i].request_path == 'all files') &&
+                                            ! filefound &&
+                                            origdata[i].type != 'allow delete' &&
+                                            origdata[i].type != 'allow put' &&
+                                            origdata[i].type != 'deny delete' &&
+                                            origdata[i].type != 'deny put' &&
+                                            origdata[i].type != 401 &&
+                                            origdata[i].type != 'directory listing' &&
+                                            origdata[i].type != 'additional header' &&
+                                            origdata[i].type != 'send directory contents') {
+                                                var data = origdata[i]
+                                                //console.log(data)
+                                                var filefound = true
+                                        }
+                                        //console.log(origdata[i].request_path == filerequested)
+                                        if ((origdata[i].request_path == filerequested || origdata[i].request_path == 'all files') &&
+                                            origdata[i].type == 'additional header') {
+                                            //console.log('additional header')
+                                            var additionalHeaders = true
+                                            htaccessHeaders[j] = origdata[i]
+                                            j++
+                                        }
+                                    }
+                                    //console.log(data)
+                                    //console.log(authdata)
+                                    //console.log(filefound)
+                                    function htaccessCheck2() {
+                                        if (filefound) {
+                                            if (data.type == 301 || data.type == 302 || data.type == 307) {
+                                                if (! data.redirto) {
+                                                    this.htaccessError.bind(this)('missing redirect location')
                                                     return
+                                                }
+                                                this.setHeader('location', data.redirto)
+                                                this.responseLength = 0
+                                                this.writeHeaders(data.type)
+                                                this.finish()
+                                            } else if (data.type == 403) {
+                                                var method = this.request.headers['sec-fetch-dest']
+                                                //console.log(method)
+                                                if (method == "document") {
+                                                    this.error('<h1>403 - Forbidden</h1>', 403)
                                                 } else {
-                                                    this.renderDirectoryListingTemplate(results)
-                                                    return
+                                                    excludedothtmlcheck.bind(this)()
                                                 }
-                                            }
-											
-                                            this.getDirContents(entry, finished.bind(this))
-											
-                                            } else if (data.type == 'send directory contents') {
+                                            } else if (data.type == 'directory listing') {
                                                 function finished(results) {
+                                                    if (this.request.arguments.json == '1' ||
+                                                        this.request.headers['accept'].toLowerCase() == 'application/json') {
+                                                        this.renderDirectoryListingJSON(results)
+                                                    } else if (this.request.arguments.static == '1' ||
+                                                               this.request.arguments.static == 'true' ||
+                                                               this.app.opts.optStatic) {
+                                                        this.renderDirectoryListing(results)
+                                                    } else {
+                                                        this.renderDirectoryListingTemplate(results)
+                                                    }
+                                                }
+
+                                                this.getDirContents(entry, finished.bind(this))
+
+                                                } else if (data.type == 'send directory contents') {
+                                                    if (! data.dir_to_send || data.dir_to_send.replace(' ', '') == '') {
+                                                        data.dir_to_send = './'
+                                                    }
+                                                    function finished(results) {
+                                                        var fullrequestpath = this.request.origpath
+                                                        var finpath = fullrequestpath.split('/').pop();
+                                                        var finalpath = fullrequestpath.substring(0, fullrequestpath.length - finpath.length) + data.original_request_path
+                                                        //console.log(filepath)
+                                                        this.fs.getByPath(finalpath, (file) => {
+                                                            if (! file.error && file.isFile) {
+                                                                file.file( function(file) {
+                                                                    var reader = new FileReader();
+                                                                    reader.onload = function(e){
+                                                                        function finish() {
+                                                                            var data = html.join('\n')
+                                                                            this.setHeader('content-type','text/html; charset=utf-8')
+                                                                            this.write(data, 200)
+                                                                            this.finish()
+                                                                        }
+                                                                        function sendFile() {
+                                                                            results[i].getMetadata(function(filee) {
+                                                                                var rawname = results[i].name
+                                                                                var name = encodeURIComponent(results[i].name)
+                                                                                var isdirectory = results[i].isDirectory
+                                                                                var filesize = filee.size
+                                                                                var modified = WSC.utilityHandler.lastModified(filee.modificationTime)
+                                                                                var filesizestr = WSC.utilityHandler.humanFileSize(filee.size)
+                                                                                var modifiedstr = WSC.utilityHandler.lastModifiedStr(filee.modificationTime)
+                                                                                if (rawname != 'wsc.htaccess') {
+                                                                                    html.push('<script>addRow("'+rawname+'", "'+name+'", '+isdirectory+', '+filesize+', "'+filesizestr+'", '+modified+', "'+modifiedstr+'")</script>')
+                                                                                }
+                                                                                if (i != results.length - 1) {
+                                                                                    i++
+                                                                                    sendFile.bind(this, results)()
+                                                                                } else {
+                                                                                    finish.bind(this, results)()
+                                                                                }
+                                                                            }.bind(this), function(error) {
+                                                                                console.error('error reading metadata '+error)
+                                                                                if (i != results.length - 1) {
+                                                                                    i++
+                                                                                    sendFileList.bind(this, results)()
+                                                                                } else {
+                                                                                    DirRenderFinish.bind(this, results)()
+                                                                                }
+                                                                            }.bind(this))
+                                                                        }
+                                                                        var html = [e.target.result]
+                                                                        var i = 0
+                                                                        sendFile.bind(this, results)()
+                                                                    }.bind(this)
+                                                                    reader.readAsText(file)
+                                                                }.bind(this))
+                                                            } else {
+                                                                this.write('An unexpected error occured. Please check your wsc.htaccess file for any configuration errors.\nPlease remember, the send directory listing feature CANNOT use "all files", you must specify each file separately.\nPlease check your settings. If everything seems to be in place, please report an issue on github.\n\nhttps://github.com/kzahel/web-server-chrome\n\nPlease copy and paste the following information.\n\n\nfilepath: '+filepath+'\nrequestURI: '+this.request.uri+'\nrequested file (according to htaccess): '+data.original_request_path+'\nrequested file (according to requestURI): '+data.filerequested, 500)
+                                                                this.finish()
+                                                            }
+                                                        })
+                                                    }
+                                                    var path2Send = data.dir_to_send
                                                     var fullrequestpath = this.request.origpath
                                                     var finpath = fullrequestpath.split('/').pop();
-                                                    var finalpath = fullrequestpath.substring(0, fullrequestpath.length - finpath.length) + data.original_request_path
-                                                    //console.log(filepath)
-                                                    this.fs.getByPath(finalpath, (file) => {
-                                                        if (! file.error) {
-                                                            file.file( function(file) {
-                                                                var reader = new FileReader();
-                                                                reader.onload = function(e){
-                                                                    function finish() {
-                                                                        var data = html.join('\n')
-                                                                        this.setHeader('content-type','text/html; charset=utf-8')
-                                                                        this.write(data, 200)
-                                                                        this.finish()
-                                                                    }
-                                                                    function sendFile() {
-                                                                        results[i].getMetadata(function(filee) {
-                                                                            var rawname = results[i].name
-                                                                            var name = encodeURIComponent(results[i].name)
-                                                                            var isdirectory = results[i].isDirectory
-                                                                            var filesize = filee.size
-                                                                            var modified = WSC.utilityHandler.lastModified(filee.modificationTime)
-                                                                            var filesizestr = WSC.utilityHandler.humanFileSize(filee.size)
-                                                                            var modifiedstr = WSC.utilityHandler.lastModifiedStr(filee.modificationTime)
-                                                                            if (rawname != 'wsc.htaccess') {
-                                                                                html.push('<script>addRow("'+rawname+'", "'+name+'", '+isdirectory+', '+filesize+', "'+filesizestr+'", '+modified+', "'+modifiedstr+'")</script>')
-                                                                            }
-                                                                            if (i != results.length - 1) {
-                                                                                i++
-                                                                                sendFile.bind(this, results)()
-                                                                            } else {
-                                                                                finish.bind(this, results)()
-                                                                            }
-                                                                        }.bind(this), function(error) {
-                                                                            console.error('error reading metadata '+error)
-                                                                            if (i != results.length - 1) {
-                                                                                i++
-                                                                                sendFileList.bind(this, results)()
-                                                                            } else {
-                                                                                DirRenderFinish.bind(this, results)()
-                                                                            }
-                                                                        }.bind(this))
-                                                                    }
-                                                                    var html = [e.target.result]
-                                                                    var i = 0
-                                                                    sendFile.bind(this, results)()
-                                                                }.bind(this)
-                                                                reader.readAsText(file)
-                                                            }.bind(this))
+                                                    var finalpath = fullrequestpath.substring(0, fullrequestpath.length - finpath.length);
+                                                    if (this.request.path == '') {
+                                                        var finalpath = '/'
+                                                    }
+                                                    var split1 = finalpath.split('/')
+                                                    var split2 = path2Send.split('/')
+                                                    
+                                                    if (! path2Send.startsWith('/')) {
+                                                        for (var w=0; w<split2.length; w++) {
+                                                            if (split2[w] == '' || split2[w] == '.') {
+                                                                // . means current directory. Leave this here for spacing
+                                                            } else if (split2[w] == '..') {
+                                                                if (split1.length > 0) {
+                                                                    var split1 = split1.splice(-1,1)
+                                                                }
+                                                            } else {
+                                                                split1.push(split2[w])
+                                                            }
+                                                        }
+                                                        var path2Send = split1.join('/')
+                                                        if (! path2Send.startsWith('/')) {
+                                                            var path2Send = '/' + path2Send
+                                                        }
+                                                    }
+                                                    
+                                                    //console.log(finalpath)
+                                                    //console.log(data)
+                                                    this.fs.getByPath(path2Send, function(entryy) {
+                                                        if (! entry.error) {
+                                                            this.getDirContents(entryy, finished.bind(this))
                                                         } else {
-                                                            this.write('An unexpected error occured. Please check your wsc.htaccess file for any configuration errors.\nPlease remember, the send directory listing feature CANNOT use "all files", you must specify each file separately.\nPlease check your settings. If everything seems to be in place, please report an issue on github.\n\nhttps://github.com/kzahel/web-server-chrome\n\nPlease copy and paste the following information.\n\n\nfilepath: '+filepath+'\nrequestURI: '+this.request.uri+'\nrequested file (according to htaccess): '+data.original_request_path+'\nrequested file (according to requestURI): '+data.filerequested)
-                                                            this.finish()
+                                                            this.htaccessError.bind(this)('invalid path to send dir contents')
                                                         }
-                                                    })
-                                                }
-                                                var fullrequestpath = this.request.origpath
-                                                var finpath = fullrequestpath.split('/').pop();
-                                                var finalpath = fullrequestpath.substring(0, fullrequestpath.length - finpath.length);
-                                                //console.log(finalpath)
-                                                //console.log(data)
-                                                this.fs.getByPath(finalpath, function(entryy) {
-                                                    this.getDirContents(entryy, finished.bind(this))
-                                                }.bind(this))
-                                            } else if (data.type == 'versioning') {
-												//console.log('versioning')
-                                                if (! data.version_data || data.version_data.length == 0) {
-                                                    this.htaccessError.bind(this)('missing version data')
-                                                    return
-                                                }
-                                                if (! data.variable) {
-                                                    this.htaccessError.bind(this)('missing variable')
-                                                    return
-                                                }
-                                                if (! data.default) {
-                                                    this.htaccessError.bind(this)('missing default file selection')
-                                                    return
-                                                }
-												var versionData = data.version_data
-												var vdata4 = this.request.arguments[data.variable]
-												if ( ! versionData[vdata4]) {
-													vdata4 = data.default
-												}
-                                                var vdataa = versionData[vdata4]
-												var fullrequestpath = this.request.origpath
-												var finpath = fullrequestpath.split('/').pop();
-												var finalpath = fullrequestpath.substring(0, fullrequestpath.length - finpath.length);
-												if (this.request.path == '') {
-													var finalpath = '/'
-												}
-												var split1 = finalpath.split('/')
-												var split2 = vdataa.split('/')
-												if (! vdataa.startsWith('/')) {
-													for (var w=0; w<split2.length; w++) {
-														if (split2[w] == '' || split2[w] == '.') {
-															// . means current directory. Leave this here for spacing
-														} else if (split2[w] == '..') {
-															if (split1.length > 0) {
-																var split1 = split1.splice(-1,1)
-															}
-														} else {
-															split1.push(split2[w])
-														}
-													}
-													var vdataa = split1.join('/')
-													if (! vdataa.startsWith('/')) {
-														var vdataa = '/' + vdataa
-													}
-													//console.log(vdataa)
-												}
-                                                //console.log(vdataa)
-                                                this.fs.getByPath(vdataa, function(file) {
-                                                    if (! file.error) {
-														var entry = file
-														this.entry = entry
-														this.request.path = vdataa
-                                                        this.renderFileContents(entry)
+                                                    }.bind(this))
+                                                } else if (data.type == 'versioning') {
+                                                    //console.log('versioning')
+                                                    if (! data.version_data || data.version_data.length == 0) {
+                                                        this.htaccessError.bind(this)('missing version data')
                                                         return
-                                                    } else {
-                                                        this.write('path in htaccess file for version '+vdata4+' is missing or the file does not exist. Please check to make sure you have properly inputed the value', 500)
-                                                        this.finish()
+                                                    }
+                                                    if (! data.variable) {
+                                                        this.htaccessError.bind(this)('missing variable')
                                                         return
                                                     }
-                                                }.bind(this))
+                                                    if (! data.default) {
+                                                        this.htaccessError.bind(this)('missing default file selection')
+                                                        return
+                                                    }
+                                                    var versionData = data.version_data
+                                                    var vdata4 = this.request.arguments[data.variable]
+                                                    if ( ! versionData[vdata4]) {
+                                                        vdata4 = data.default
+                                                    }
+                                                    var vdataa = versionData[vdata4]
+                                                    var fullrequestpath = this.request.origpath
+                                                    var finpath = fullrequestpath.split('/').pop();
+                                                    var finalpath = fullrequestpath.substring(0, fullrequestpath.length - finpath.length);
+                                                    if (this.request.path == '') {
+                                                        var finalpath = '/'
+                                                    }
+                                                    var split1 = finalpath.split('/')
+                                                    var split2 = vdataa.split('/')
+                                                    if (! vdataa.startsWith('/')) {
+                                                        for (var w=0; w<split2.length; w++) {
+                                                            if (split2[w] == '' || split2[w] == '.') {
+                                                                // . means current directory. Leave this here for spacing
+                                                            } else if (split2[w] == '..') {
+                                                                if (split1.length > 0) {
+                                                                    var split1 = split1.splice(-1,1)
+                                                                }
+                                                            } else {
+                                                                split1.push(split2[w])
+                                                            }
+                                                        }
+                                                        var vdataa = split1.join('/')
+                                                        if (! vdataa.startsWith('/')) {
+                                                            var vdataa = '/' + vdataa
+                                                        }
+                                                        //console.log(vdataa)
+                                                    }
+                                                    //console.log(vdataa)
+                                                    this.fs.getByPath(vdataa, function(file) {
+                                                        if (file && ! file.error) {
+                                                            this.request.path = vdataa
+                                                            if (file.isFile) {
+                                                                this.request.origpath = vdataa
+                                                                this.request.uri = vdataa
+                                                            } else {
+                                                                if (vdataa.endsWith("/")) {
+                                                                    this.request.origpath = vdataa
+                                                                    this.request.uri = vdataa
+                                                                } else {
+                                                                    this.request.origpath = vdataa+'/'
+                                                                    this.request.uri = vdataa+'/'
+                                                                }
+                                                            }
+                                                            this.request.isVersioning = true
+                                                            this.onEntry(file)
+                                                        } else {
+                                                            this.write('path in htaccess file for version '+vdata4+' is missing or the file does not exist. Please check to make sure you have properly inputed the value', 500)
+                                                        }
+                                                    }.bind(this))
+                                                } else {
+                                                    excludedothtmlcheck.bind(this)()
+                                                }
                                             } else {
                                                 excludedothtmlcheck.bind(this)()
                                             }
-                                        } else {
-                                            excludedothtmlcheck.bind(this)()
                                         }
-                                    }
-                                    //console.log(htaccessHeaders)
-                                    if (additionalHeaders) {
-                                        for (var i=0; i<htaccessHeaders.length; i++) {
-                                            this.setHeader(htaccessHeaders[i].headerType, htaccessHeaders[i].headerValue)
+                                        //console.log(htaccessHeaders)
+                                        if (additionalHeaders) {
+                                            for (var i=0; i<htaccessHeaders.length; i++) {
+                                                this.setHeader(htaccessHeaders[i].headerType, htaccessHeaders[i].headerValue)
+                                            }
                                         }
-                                    }
-                                    if (auth && authdata.type == 401) {
-                                         if (! authdata.username) {
-                                             this.htaccessError.bind(this)('missing Auth Username')
-                                             return
-                                         }
-                                         if (! authdata.password) {
-                                             this.htaccessError.bind(this)('missing Auth Password')
-                                             return
-                                         }
-                                            var validAuth = false
-                                            var auth = this.request.headers['authorization']
-                                            if (auth) {
-                                                if (auth.slice(0,6).toLowerCase() == 'basic ') {
-                                                    var userpass = atob(auth.slice(6,auth.length)).split(':')
-                                                    if (userpass[0] == authdata.username && userpass[1] == authdata.password) {
-                                                        validAuth = true
+                                        if (auth && authdata.type == 401) {
+                                             if (! authdata.username) {
+                                                 this.htaccessError.bind(this)('missing Auth Username')
+                                                 return
+                                             }
+                                             if (! authdata.password) {
+                                                 this.htaccessError.bind(this)('missing Auth Password')
+                                                 return
+                                             }
+                                                var validAuth = false
+                                                var auth = this.request.headers['authorization']
+                                                if (auth) {
+                                                    if (auth.slice(0,6).toLowerCase() == 'basic ') {
+                                                        var userpass = atob(auth.slice(6,auth.length)).split(':')
+                                                        if (userpass[0] == authdata.username && userpass[1] == authdata.password) {
+                                                            validAuth = true
+                                                        }
                                                     }
                                                 }
-                                            }
-                                            if (! validAuth) {
-                                                this.error("<h1>401 - Unauthorized</h1>", 401)
-                                            }
-                                            if (validAuth) {
+                                                if (! validAuth) {
+                                                    this.error("<h1>401 - Unauthorized</h1>", 401)
+                                                }
+                                                if (validAuth) {
+                                                    htaccessCheck2.bind(this)()
+                                                }
+                                            } else {
                                                 htaccessCheck2.bind(this)()
                                             }
+                                }
+                                var filerequest = this.request.origpath
+
+                                if (this.app.opts.optExcludeDotHtml) {
+                                    if (this.app.opts.optExcludeDotHtm) {
+                                        var htmHtml = '.htm'
+                                    } else {
+                                        var htmHtml = '.html'
+                                    }
+									var htmHtml = this.app.opts.optExcludeDotHtm ? '.htm' : 'html'
+                                    this.fs.getByPath(this.request.path+htmHtml, (file) => {
+                                        if (! file.error) {
+                                            if (this.request.origpath.endsWith("/")) {
+                                                htaccessMain.bind(this)('')
+                                                return
+                                            }
+                                            var filerequested = this.request.path+htmHtml
+                                            var filerequested = filerequested.split('/').pop();
+                                            var filerequested = WSC.utilityHandler.htaccessFileRequested(filerequested)
+                                            htaccessMain.bind(this)(filerequested)
+                                            return
                                         } else {
-                                            htaccessCheck2.bind(this)()
-                                        }
-                            }
-                            var filerequest = this.request.origpath
-                            
-                            if (this.app.opts.optExcludeDotHtml) {
-                                if (this.app.opts.optExcludeDotHtm) {
-                                    var htmHtml = '.htm'
+                                            if (this.entry && this.entry.isDirectory && ! this.request.origpath.endsWith('/')) {
+                                                var newloc = this.request.origpath + '/'
+                                                this.setHeader('location', newloc)
+                                                this.responseLength = 0
+                                                this.writeHeaders(301)
+                                                this.finish()
+                                                return
+                                            }
+                                            var filerequested = filerequest.split('/').pop();
+                                            //console.log(filerequested)
+                                            var filerequested = WSC.utilityHandler.htaccessFileRequested(filerequested)
+                                                htaccessMain.bind(this)(filerequested)
+                                                return
+                                            }
+                                    })
                                 } else {
-                                    var htmHtml = '.html'
-                                }
-                                this.fs.getByPath(this.request.path+htmHtml, (file) => {
-									if (! file.error) {
-										if (this.request.origpath.endsWith("/")) {
-											htaccessMain.bind(this)('')
-											return
-										}
-										var filerequested = this.request.path+htmHtml
-										var filerequested = filerequested.split('/').pop();
-										var filerequested = WSC.utilityHandler.htaccessFileRequested(filerequested)
-										htaccessMain.bind(this)(filerequested)
-										return
-									} else {
-										if (this.entry && this.entry.isDirectory && ! this.request.origpath.endsWith('/')) {
-											var newloc = this.request.origpath + '/'
-											this.setHeader('location', newloc)
-											this.responseLength = 0
-											this.writeHeaders(301)
-											this.finish()
-											return
-										}
-										var filerequested = filerequest.split('/').pop();
-										//console.log(filerequested)
-										var filerequested = WSC.utilityHandler.htaccessFileRequested(filerequested)
-											htaccessMain.bind(this)(filerequested)
-											return
-                                    	}
-                                })
-							} else {
-                                if (this.entry && this.entry.isDirectory && ! this.request.origpath.endsWith('/')) {
-                                    var newloc = this.request.origpath + '/'
-                                    this.setHeader('location', newloc)
-                                    this.responseLength = 0
-                                    this.writeHeaders(301)
-                                    this.finish()
+                                    if (this.entry && this.entry.isDirectory && ! this.request.origpath.endsWith('/')) {
+                                        var newloc = this.request.origpath + '/'
+                                        this.setHeader('location', newloc)
+                                        this.responseLength = 0
+                                        this.writeHeaders(301)
+                                        this.finish()
+                                        return
+                                    }
+                                    var filerequested = filerequest.split('/').pop();
+                                    //console.log(filerequested)
+                                    var filerequested = WSC.utilityHandler.htaccessFileRequested(filerequested)
+                                    htaccessMain.bind(this)(filerequested)
                                     return
-                                }
-                                var filerequested = filerequest.split('/').pop();
-                                //console.log(filerequested)
-                                var filerequested = WSC.utilityHandler.htaccessFileRequested(filerequested)
-                                htaccessMain.bind(this)(filerequested)
-                                return
-                                }
-                            
-                        }.bind(this)
-                        reader.readAsText(filee)
-                    }.bind(this))
-                } else {
-                    excludedothtmlcheck.bind(this)()
-                }})
+                                    }
+
+                            }.bind(this)
+                            reader.readAsText(filee)
+                        }.bind(this))
+                    } else {
+                        excludedothtmlcheck.bind(this)()
+                    }
+                })
             } else {
                 excludedothtmlcheck.bind(this)()
             }
@@ -896,6 +938,7 @@
             }
             function DirRenderFinish() {
 				this.write(html.join('\n'))
+                this.setHeader('content-type','text/html; charset=utf-8')
                 this.finish()
             }
             function sendFileList() {
diff --git a/htaccess/README.md b/htaccess/README.md
index 56943d2c..3e407764 100644
--- a/htaccess/README.md
+++ b/htaccess/README.md
@@ -206,7 +206,7 @@ or, if the you were in the `/data/asd/` directory
 ```
 <p>You can add as many versions as you would like.</p>
 <p>I have recently made it to where you can use relative paths!</p>
-<p>Please note - this feature is compatible with auth (you must use the request path, not the path of the file) and additional headers but you CANNOT use ANY other htaccess features!</p>
+<p>Versioning pretty much just makes the server think that you requested another file. So you can do a directory or whatever! The file will be checked with the htaccess of that current directory</p>
 
 The variable is what the user needs to request. If we use v, the user would request something like `localhost:8887/example.mp4?v=1`
 <p>Note that you do not need an extension for the requested file.</p>
@@ -249,12 +249,14 @@ The end result will be
     {
         "request_path": "name of file you want to modify",
         "type": "send directory contents"
+	"dir_to_send": "../somepath/"
     }
 ]
 ```
 <p>More howto (send directory contents)</p>
 
 This feature CANNOT use the `all files` value for the `request_path` field. You must specify each file separately
+<p>if dir_to_send is not specified, then the current directory will be sent</p>
 <p>Getting info from sent contents</p>
 <p>This is what is sent</p>
 
diff --git a/webapp.js b/webapp.js
index 8063e826..373ec52c 100644
--- a/webapp.js
+++ b/webapp.js
@@ -323,7 +323,6 @@
             this.onReady()
         },
         onReady: function() {
-            this.ensureFirewallOpen()
             //console.log('onListen',result)
             this.starting = false
             this.started = true
@@ -332,6 +331,7 @@
             this.bindAcceptCallbacks()
             this.init_urls()
             this.start_success({urls:this.urls}) // initialize URLs ?
+            this.ensureFirewallOpen()
         },
         init_urls: function() {
             this.urls = [].concat(this.extra_urls)
@@ -583,7 +583,7 @@
                 var handler = new WSC.BaseHandler(request)
                 handler.app = this
                 handler.request = request
-                handler.write("Unhandled request. Did you select a folder to serve?", 404)
+                handler.write("Unhandled request. Did you select a folder to serve?", 500)
                 handler.finish()
             }
         }
@@ -618,7 +618,7 @@
 				this.request.path = 'error.html'
 				if (this.app.opts['optCustom'+httpCode]) {
 					this.fs.getByPath(this.app.opts['optCustom'+httpCode+'location'], (file) => {
-						if (! file.error) {
+						if (! file.error && file.isFile) {
 							file.file( function(file) {
 								var reader = new FileReader()
 								reader.onload = function(e) {
@@ -821,4 +821,3 @@ Changes with nginx 0.7.9                                         12 Aug 2008
     WSC.WebApplication = WebApplication
 
 })();
-

From 3025d20b82d6becd8cdfde6d138411c1dbebfddf Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Sat, 26 Jun 2021 14:23:38 -0500
Subject: [PATCH 113/154] Bug Fix

---
 handlers.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/handlers.js b/handlers.js
index 7548cb9f..98fa5ab2 100644
--- a/handlers.js
+++ b/handlers.js
@@ -253,6 +253,7 @@
             folder.getFile(filename, {create:true}, onfile, onfile)
         },
         get: function() {
+			console.log(this.request)
             //this.request.connection.stream.onWriteBufferEmpty = this.onWriteBufferEmpty.bind(this)
 
             this.setHeader('accept-ranges','bytes')
@@ -504,7 +505,7 @@
                                             var authdata = origdata[i]
                                         }
                                         if (origdata[i].type == 'directory listing' &&
-                                            this.request.uri.split('/').pop() == '' &&
+                                            this.request.origpath.split('/').pop() == '' &&
                                             ! filefound) {
                                             var data = origdata[i]
                                             var filefound = true

From 0a2fa88bd286362bd92ceb1820a9b59ae80d7633 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Sat, 26 Jun 2021 14:24:22 -0500
Subject: [PATCH 114/154] bug fix

---
 handlers.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/handlers.js b/handlers.js
index 98fa5ab2..18fab8e2 100644
--- a/handlers.js
+++ b/handlers.js
@@ -253,7 +253,6 @@
             folder.getFile(filename, {create:true}, onfile, onfile)
         },
         get: function() {
-			console.log(this.request)
             //this.request.connection.stream.onWriteBufferEmpty = this.onWriteBufferEmpty.bind(this)
 
             this.setHeader('accept-ranges','bytes')

From f0f29e8bbce0337d8d089ce88c81505c8e4f1744 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Sat, 26 Jun 2021 14:33:35 -0500
Subject: [PATCH 115/154] htaccess security fix (json directory listing)

---
 handlers.js | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/handlers.js b/handlers.js
index 18fab8e2..bbfe14a7 100644
--- a/handlers.js
+++ b/handlers.js
@@ -926,11 +926,18 @@
         },
         renderDirectoryListingJSON: function(results) {
             this.setHeader('content-type','application/json; charset=utf-8')
-            this.write(JSON.stringify(results.map(function(f) { return { name:f.name,
-                                                                         fullPath:f.fullPath,
-                                                                         isFile:f.isFile,
-                                                                         isDirectory:f.isDirectory }
-                                                              }), null, 2))
+			var origdata = results.map(function(f) { return { name:f.name,
+                                                          fullPath:f.fullPath,
+                                                          isFile:f.isFile,
+                                                          isDirectory:f.isDirectory }
+                                                        })
+			var data = [ ]
+			for (var i=0; i<origdata.length; i++) {
+				if (origdata[i].name != 'wsc.htaccess') {
+					data.push(origdata[i])
+				}
+			}
+            this.write(JSON.stringify(data, null, 2))
         },
         renderDirectoryListingTemplate: function(results) {
             if (! WSC.template_data) {

From b4a89ed2c76efb81cb45d40104670d46b3228c58 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Mon, 28 Jun 2021 21:09:14 -0500
Subject: [PATCH 116/154] Server Side POST handler

---
 handlers.js                             | 191 ++++++++++++++++++++----
 htaccess/README.md => howTo/HTACCESS.md |   0
 howTo/post.md                           | 111 ++++++++++++++
 react-ui/js/index.js                    |  12 +-
 webapp.js                               |  10 +-
 5 files changed, 287 insertions(+), 37 deletions(-)
 rename htaccess/README.md => howTo/HTACCESS.md (100%)
 create mode 100644 howTo/post.md

diff --git a/handlers.js b/handlers.js
index bbfe14a7..29671eb2 100644
--- a/handlers.js
+++ b/handlers.js
@@ -118,11 +118,10 @@
 									this.finish()
 									return
 								}
-								var filerequest = this.request.origpath
-								var filerequested = filerequest.split('/').pop();
+								var filerequested = this.request.origpath.split('/').pop();
 								var filefound = false
 								if (origdata.length == 0 || ! origdata.length) {
-									excludedothtmlcheck.bind(this)()
+									callback()
 									return
 								}
 								for (var i=0; i<origdata.length; i++) {
@@ -190,8 +189,111 @@
             this.deletePutHtaccess('allow delete', 'deny delete', deleteCheck.bind(this), deleteMain.bind(this))
         },
 		post: function() {
-			//not sure what we can do about this
-			this.put()
+            var htaccessPath = WSC.utils.stripOffFile(this.request.origpath)
+			this.fs.getByPath(htaccessPath + 'wsc.htaccess', function(file) {
+				if (file && ! file.error) {
+					file.file( function(file) {
+						var reader = new FileReader()
+						reader.onload = function(e){
+							try {
+								var origdata = JSON.parse(e.target.result)
+							} catch(e) {
+								this.write('Htaccess JSON parse error\n\nError: ' + e, 500)
+								this.finish()
+								return
+							}
+							if (origdata.length == 0 || ! origdata.length) {
+								this.write('htaccess has no length value', 500)
+								this.finish()
+								return
+							}
+							var filerequested = this.request.origpath.split('/').pop()
+							var filefound = false
+							for (var i=0; i<origdata.length; i++) {
+								if (! origdata[i].type) {
+									this.htaccessError.bind(this)('missing type')
+									return
+								}
+								if (! origdata[i].request_path && origdata[i].type != 'directory listing') {
+									this.htaccessError.bind(this)('missing request path')
+									return
+								}
+								if (origdata[i].request_path == filerequested && origdata[i].type == 'POSTkey' && ! filefound) {
+									var data = origdata[i]
+									var filefound = true
+									break
+								}
+							}
+							// Still need to validate POST key
+							if (filefound) {
+								if (! data.key) {
+									this.htaccessError.bind(this)('missing post key')
+									return
+								}
+								this.fs.getByPath(this.request.path, function(file) {
+									if (file && ! file.error) {
+										file.file(function(file) {
+											var reader = new FileReader()
+											reader.onload = function(e) {
+												var contents = e.target.result.split('\r\n')
+												var validFile = false
+												for (var i=0; i<contents.length; i++) {
+													if (contents[i].startsWith('\t')) {
+														contents[i] = contents[i].substring(1, contents[i].length)
+													}
+													// check multiple times ?
+													if (contents[i].startsWith('\t')) {
+														contents[i] = contents[i].substring(1, contents[i].length)
+													}
+													if (contents[i].startsWith('postKey')) {
+														var postkey = contents[i].split('=').pop().replace(' ', '').replace('"', '\'').replace('\'', '').replace('\'', '')
+														if (postkey == data.key) {
+															var validFile = true
+															break
+														}
+													}
+												}
+												if (validFile) {
+													window.req = this.request
+													window.res = this
+													res.end = function() {
+														// We need to cleanup - Which is why we don't want the user to directly call res.finish()
+														if (document.getElementById('tempPOSThandler')) {
+															document.getElementById('tempPOSThandler').remove()
+														}
+														delete this.postRequest
+														delete window.res
+														delete window.req
+														if (window.postKey) {
+															delete window.postKey
+														}
+														this.finish()
+													}
+													var blob = new Blob([file], {type : 'text/javascript'})
+													this.postRequest = document.createElement("script")
+													this.postRequest.src = URL.createObjectURL(blob)
+													this.postRequest.id = 'tempPOSThandler'
+													document.body.appendChild(this.postRequest)
+												} else {
+													this.write('Keys do not match', 403)
+												}
+											}.bind(this)
+											reader.readAsText(file)
+										}.bind(this))
+									} else {
+										this.write('file not found', 404)
+									}
+								}.bind(this))
+							} else {
+							this.put()
+							}
+						}.bind(this)
+						reader.readAsText(file)
+					}.bind(this))
+				} else {
+					this.put()
+				}
+			}.bind(this))
 		},
         put: function() {
             function putMain() {
@@ -496,7 +598,7 @@
                                         }
                                         origdata[i].original_request_path = origdata[i].request_path
                                         origdata[i].filerequested = filerequested
-                                        origdata[i].request_path = WSC.utilityHandler.htaccessFileRequested(origdata[i].request_path)
+                                        origdata[i].request_path = WSC.utils.htaccessFileRequested(origdata[i].request_path)
                                         if (origdata[i].type == 401 &&
                                             ! auth &&
                                             (origdata[i].request_path == filerequested || origdata[i].request_path == 'all files') && ! this.request.isVersioning) {
@@ -504,7 +606,7 @@
                                             var authdata = origdata[i]
                                         }
                                         if (origdata[i].type == 'directory listing' &&
-                                            this.request.origpath.split('/').pop() == '' &&
+                                            this.request.uri.split('/').pop() == '' &&
                                             ! filefound) {
                                             var data = origdata[i]
                                             var filefound = true
@@ -530,6 +632,11 @@
                                                 //console.log(data)
                                                 var filefound = true
                                         }
+										if (origdata[i].request_path == filerequested && origdata[i].type == 'POSTkey') {
+											var filefound = false
+											this.error('<h1>403 - Forbidden</h1>')
+											break
+										}
                                         //console.log(origdata[i].request_path == filerequested)
                                         if ((origdata[i].request_path == filerequested || origdata[i].request_path == 'all files') &&
                                             origdata[i].type == 'additional header') {
@@ -603,9 +710,9 @@
                                                                                 var name = encodeURIComponent(results[i].name)
                                                                                 var isdirectory = results[i].isDirectory
                                                                                 var filesize = filee.size
-                                                                                var modified = WSC.utilityHandler.lastModified(filee.modificationTime)
-                                                                                var filesizestr = WSC.utilityHandler.humanFileSize(filee.size)
-                                                                                var modifiedstr = WSC.utilityHandler.lastModifiedStr(filee.modificationTime)
+                                                                                var modified = WSC.utils.lastModified(filee.modificationTime)
+                                                                                var filesizestr = WSC.utils.humanFileSize(filee.size)
+                                                                                var modifiedstr = WSC.utils.lastModifiedStr(filee.modificationTime)
                                                                                 if (rawname != 'wsc.htaccess') {
                                                                                     html.push('<script>addRow("'+rawname+'", "'+name+'", '+isdirectory+', '+filesize+', "'+filesizestr+'", '+modified+', "'+modifiedstr+'")</script>')
                                                                                 }
@@ -801,7 +908,7 @@
                                             }
                                             var filerequested = this.request.path+htmHtml
                                             var filerequested = filerequested.split('/').pop();
-                                            var filerequested = WSC.utilityHandler.htaccessFileRequested(filerequested)
+                                            var filerequested = WSC.utils.htaccessFileRequested(filerequested)
                                             htaccessMain.bind(this)(filerequested)
                                             return
                                         } else {
@@ -815,7 +922,7 @@
                                             }
                                             var filerequested = filerequest.split('/').pop();
                                             //console.log(filerequested)
-                                            var filerequested = WSC.utilityHandler.htaccessFileRequested(filerequested)
+                                            var filerequested = WSC.utils.htaccessFileRequested(filerequested)
                                                 htaccessMain.bind(this)(filerequested)
                                                 return
                                             }
@@ -831,7 +938,7 @@
                                     }
                                     var filerequested = filerequest.split('/').pop();
                                     //console.log(filerequested)
-                                    var filerequested = WSC.utilityHandler.htaccessFileRequested(filerequested)
+                                    var filerequested = WSC.utils.htaccessFileRequested(filerequested)
                                     htaccessMain.bind(this)(filerequested)
                                     return
                                     }
@@ -926,26 +1033,19 @@
         },
         renderDirectoryListingJSON: function(results) {
             this.setHeader('content-type','application/json; charset=utf-8')
-			var origdata = results.map(function(f) { return { name:f.name,
-                                                          fullPath:f.fullPath,
-                                                          isFile:f.isFile,
-                                                          isDirectory:f.isDirectory }
-                                                        })
-			var data = [ ]
-			for (var i=0; i<origdata.length; i++) {
-				if (origdata[i].name != 'wsc.htaccess') {
-					data.push(origdata[i])
-				}
-			}
-            this.write(JSON.stringify(data, null, 2))
+            this.write(JSON.stringify(results.map(function(f) { return { name:f.name,
+                                                                         fullPath:f.fullPath,
+                                                                         isFile:f.isFile,
+                                                                         isDirectory:f.isDirectory }
+                                                              }), null, 2))
         },
         renderDirectoryListingTemplate: function(results) {
             if (! WSC.template_data) {
                 return this.renderDirectoryListing(results)
             }
             function DirRenderFinish() {
-				this.write(html.join('\n'))
                 this.setHeader('content-type','text/html; charset=utf-8')
+				this.write(html.join('\n'))
                 this.finish()
             }
             function sendFileList() {
@@ -955,13 +1055,13 @@
                     var name = encodeURIComponent(results[w].name)
                     var isdirectory = results[w].isDirectory
                     //var modified = '4/27/21, 10:38:40 AM'
-                    var modified = WSC.utilityHandler.lastModified(file.modificationTime)
+                    var modified = WSC.utils.lastModified(file.modificationTime)
                     var filesize = file.size
-                    var filesizestr = WSC.utilityHandler.humanFileSize(file.size)
-                    var modifiedstr = WSC.utilityHandler.lastModifiedStr(file.modificationTime)
+                    var filesizestr = WSC.utils.humanFileSize(file.size)
+                    var modifiedstr = WSC.utils.lastModifiedStr(file.modificationTime)
                     // raw, urlencoded, isdirectory, size, size as string, date modified, date modified as string
                     if (rawname != 'wsc.htaccess') {
-                    html.push('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+',"'+filesize+'","'+filesizestr+'","'+modified+'","'+modifiedstr+'");</script>')
+						html.push('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+',"'+filesize+'","'+filesizestr+'","'+modified+'","'+modifiedstr+'");</script>')
                     }
                     if (w != results.length - 1) {
                         w++
@@ -986,7 +1086,7 @@
             }
             var w = 0
 			if (results.length == 0) {
-				DirRenderFinish()
+				DirRenderFinish.bind(this)()
 				return
 			}
             sendFileList.bind(this, results)()
@@ -1051,7 +1151,34 @@
             this.write('Htaccess Configuration error. Please check to make sure that you are not missing some values.\n\nError Message: '+errormsg, 500)
             this.finish()
             return
-        }
+        },
+		// everything from here to the end of the prototype are tools for server side post handling
+		getFile: function(path, callback) {
+			// did not expect this to still work :/
+			if (! path.startsWith('/')) {
+				path = WSC.utils.relativePath(path, WSC.utils.stripOffFile(this.request.origpath))
+			}
+			this.fs.getByPath(path, function(file) {
+				if (file.isDirectory) {
+					// automatically get dir contents?
+					this.getDirContents(file, function(results) {
+						results.isDirectory = true
+						results.isFile = false
+						callback(results)
+					})
+				} else if (file && ! file.error) {
+					file.file(function(file) {
+						callback(file)
+					})
+				} else {
+					callback(file)
+				}
+				
+			}.bind(this))
+		},
+		contentType: function(type) {
+			this.setHeader('content-type', type)
+		}
     }, WSC.BaseHandler.prototype)
 
     //if (chrome.runtime.id == WSC.store_id || true) {
diff --git a/htaccess/README.md b/howTo/HTACCESS.md
similarity index 100%
rename from htaccess/README.md
rename to howTo/HTACCESS.md
diff --git a/howTo/post.md b/howTo/post.md
new file mode 100644
index 00000000..52688e1d
--- /dev/null
+++ b/howTo/post.md
@@ -0,0 +1,111 @@
+
+<h1>How to use Server Side POST</h1>
+<br>
+<h2>How it works</h2>
+<br>
+<p>Perform a post request towards a js file, This js file will be checked for a key (Security) and with the correct key, the document will temporarily append the script and will execute the requested script</h2>
+<br>
+<p>As a security feature, you must have the request path and a key programed in a wsc.htaccess file and in the js file.</p>
+<p>You do not need to have htaccess enabled, this does not enable htaccess. It is just easier to keep everything in 1 place</p>
+<br><br>
+<h2>Writing the htaccess file</h2>
+<p>The file needs to be in the same path as the requested file</p>
+<p>The file name should be wsc.htaccess (case sensitive)
+<p>Example:</p>
+
+```
+[
+    {
+        "type": "POSTkey",
+        "request_path": "index.js",
+		"key": "wa4e76yhefy54t4a"
+    }
+]
+```
+Change `request_path` to the file you would like to perform this towards
+Change `key` to a random string of numbers and letters
+Do not change `type`
+Access to the file (through a GET request) is automaticaly blocked
+
+<h2>Adding key verification to the .js file</h2>
+<p>Add the following line to your htaccess file</p>
+
+```
+postKey = 'wa4e76yhefy54t4a'
+```
+Change `wa4e76yhefy54t4a` to the value of the key that you had inputed into the htaccess file
+The start of the line (`postKey = `) MUST STAY THE SAME (case sensitive). The server does not check for a set variable, but it will scan the file for the text `postKey`
+THIS LINE MUST BE ITS OWN LINE!! You CANNOT combine multiple lines of code with `;`
+Indenting this line may cause for the server to not find this line and in result, the code will not be executed
+
+<br>
+<h2>Writing the code inside the file</h2>
+
+Example:
+```
+res.contentType('text/plain')
+res.write('test')
+res.end()
+```
+res contains all the functions to respond, while req contains all the request information
+
+res Commands
+
+`res.end()`: function
+This function MUST be called at the end of the file. If called before finished processing, the server will cut off your script
+This function will close the http request
+You can use this function directly when finished and it will automaticaly respond with an http code of 200 (unless set otherwise)
+
+`res.write(string, httpCode)`: function
+This function will write data to the client. Once called, you canot push any more information.
+
+`res.setHeader(headerType, headerValue)`: function
+This function will set headers of the response.
+Instead of `Cookie: name=value`, you would put `res.setHeader('Cookie', 'name=value')`
+
+`res.getFile(path, callback)`: function
+This function will read a file. Relative urls are supported.
+If the requested path is a directory, the callback function will be called with a listing of all the files in a directory. If you would like to use a file from there you must use the file.file() function.
+Example: 
+```
+`res.getFile('../test.txt', function(file) {
+	if (file.isFile) {
+		//if the file is a file, you can read and do whatever. You will need to use a FileReader to read the file.
+	}
+	if (file.isDirectory) {
+		// This will return an array of all of the files in the directory. To use a file (as you do with file.isFile) you must use file.file() as shown below
+		file[5].file(function(file) {
+			console.log(file)
+		})
+	}
+}
+```
+
+`res.contentType(type)`: function
+This function will set the content type to respond with, you could also use the `res.setHeader()` function
+
+TODO: function to write file
+
+req Commands
+
+`req.body`: ArrayBuffer
+This is an array buffer of the request body, if there is no request body, the value will be null.
+You must use a utf-8 text decoder to read the array (as text)
+
+`req.headers`: json string
+This contains all of the headers that the user sent when making the http request
+
+`req.arguments`: json string
+This contains all of the arguments that the user has put in the url
+
+`req.method`: string
+This contains the request method (should be POST)
+
+`req.uri`: string
+This contains the entire requested path
+
+`req.origpath`: string
+This contains the requested file (Will end with / if is directory)
+
+`req.path`: string
+This contains the requested file. (Will NOT end with / if is directory)
\ No newline at end of file
diff --git a/react-ui/js/index.js b/react-ui/js/index.js
index be53c7f7..725c7c80 100644
--- a/react-ui/js/index.js
+++ b/react-ui/js/index.js
@@ -419,7 +419,7 @@ class App extends React.Component {
       let disablezero = (!this.webapp || !this.webapp.opts.optScanForHtaccess);
       const htaccesstextbox = renderOpts(optHtaccessOptions)
       return [(<div style={{paddingLeft: 20}}>{!disablezero && htaccesstextbox}
-        {!disablezero && <Alert severity="info">For more info on how to use wsc.htaccess files, go <a href="https://github.com/ethanaobrien/web-server-chrome/blob/master/htaccess/README.md" target="_blank">here</a></Alert>}
+        {!disablezero && <Alert severity="info">For more info on how to use wsc.htaccess files, go <a href="https://github.com/ethanaobrien/web-server-chrome/blob/master/howTo/HTACCESS.md" target="_blank">here</a></Alert>}
 	  </div>)];
     })();
 
@@ -495,6 +495,14 @@ class App extends React.Component {
 				}}>Generate crypto</Button>}
 	  </div>)];
     })();
+	
+	const POSTFeatureInfo = (() => {
+		return [(<div>
+					{<Alert severity="info">Server Side POST requests are now supported. Go <a href="https://github.com/ethanaobrien/web-server-chrome/blob/master/howTo/post.md" target="_blank">here</a> to learn how to use this feature</Alert>}
+				</div>)];
+		
+		
+	})();
 
     const {state} = this;
     return (<div>
@@ -559,7 +567,7 @@ class App extends React.Component {
           {options}
 
           {advancedButton}
-          {state.showAdvanced && <div>{advOptions}{UploadOption}{nodothtmlMain}{nodothtmlOptions}{Custom400Main}{Custom400Options}{Custom401Main}{Custom401Options}{Custom403Main}{Custom403Options}{Custom404Main}{Custom404Options}{Custom404OptionsPt2}{authMain}{authOptions}{HtaccessMain}{HtaccessInfo}{cacheMain}{cacheOptions}{rewriteMain}{rewriteOptions}{httpsMain}{httpsOptions}</div> }
+          {state.showAdvanced && <div>{advOptions}{UploadOption}{nodothtmlMain}{nodothtmlOptions}{Custom400Main}{Custom400Options}{Custom401Main}{Custom401Options}{Custom403Main}{Custom403Options}{Custom404Main}{Custom404Options}{Custom404OptionsPt2}{authMain}{authOptions}{HtaccessMain}{HtaccessInfo}{cacheMain}{cacheOptions}{rewriteMain}{rewriteOptions}{httpsMain}{httpsOptions}{POSTFeatureInfo}</div> }
         </CardContent>
       </Card>
 
diff --git a/webapp.js b/webapp.js
index 373ec52c..266ecb27 100644
--- a/webapp.js
+++ b/webapp.js
@@ -615,7 +615,7 @@
 				return
             } else {
 				// We set the request.path to a .html file to override the mimetype of the requested file
-				this.request.path = 'error.html'
+				this.setHeader('content-type','text/html; charset=utf-8')
 				if (this.app.opts['optCustom'+httpCode]) {
 					this.fs.getByPath(this.app.opts['optCustom'+httpCode+'location'], (file) => {
 						if (! file.error && file.isFile) {
@@ -680,7 +680,7 @@
             return this.request.headers[k] || defaultvalue
         },
         setHeader: function(k,v) {
-            this.responseHeaders[k] = v
+			this.responseHeaders[k] = v
         },
         set_status: function(code) {
             console.assert(! this.headersWritten)
@@ -707,7 +707,8 @@
             }
 
             var p = this.request.path.split('.')
-            if (p.length > 1 && ! this.isDirectoryListing) {
+			
+            if (p.length > 1 && ! this.isDirectoryListing && ! this.responseHeaders['content-type']) {
                 var ext = p[p.length-1].toLowerCase()
                 var type = WSC.MIMETYPES[ext]
                 if (type) {
@@ -778,6 +779,9 @@ Changes with nginx 0.7.9                                         12 Aug 2008
             }
         },
         finish: function() {
+			if (document.getElementById('tempPOSThandler')) {
+				document.getElementById('tempPOSThandler').remove()
+			}
             if (! this.headersWritten) {
                 this.responseLength = 0
                 this.writeHeaders()

From 370578e1acd6d0241bb245c9e91fd0c17bc81aa0 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Mon, 28 Jun 2021 21:11:57 -0500
Subject: [PATCH 117/154] Forgot to push new utils.js

---
 utils.js | 191 ++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 111 insertions(+), 80 deletions(-)

diff --git a/utils.js b/utils.js
index 6d192569..874f0ada 100644
--- a/utils.js
+++ b/utils.js
@@ -1,82 +1,113 @@
 (function() {
-    var utilityHandler = [ ]
-    utilityHandler.humanFileSize = function(bytes, si=false, dp=1) {
-            //from https://stackoverflow.com/questions/10420352/converting-file-size-in-bytes-to-human-readable-string/10420404
-            const thresh = si ? 1000 : 1024;
-            if (Math.abs(bytes) < thresh) {
-              return bytes + ' B';
-            }
-            const units = si 
-              ? ['kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'] 
-              : ['KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];
-            let u = -1;
-            const r = 10**dp;
-            do {
-              bytes /= thresh;
-              ++u;
-            } while (Math.round(Math.abs(bytes) * r) / r >= thresh && u < units.length - 1);
-            return bytes.toFixed(dp) + ' ' + units[u];
-    }
-    utilityHandler.lastModified = function(modificationTime) {
-        var lastModifiedMonth = modificationTime.getMonth() + 1
-        var lastModifiedDay = modificationTime.getDate()
-        var lastModifiedYear = modificationTime.getFullYear().toString().substring(2, 4)
-        var lastModifiedHours = modificationTime.getHours()
-        var lastModifiedMinutes = modificationTime.getMinutes()
-        var lastModifiedSeconds = modificationTime.getSeconds()
-        var lastModified = lastModifiedMonth+
-                           lastModifiedDay+
-                           lastModifiedYear+
-                           lastModifiedHours+
-                           lastModifiedMinutes+
-                           lastModifiedSeconds
-        return lastModified
-    }
-    utilityHandler.lastModifiedStr = function(modificationTime) {
-        var lastModifiedMonth = modificationTime.getMonth() + 1
-        var lastModifiedDay = modificationTime.getDate()
-        var lastModifiedYear = modificationTime.getFullYear().toString().substring(2, 4)
-        var lastModifiedHours = modificationTime.getHours()
-        var lastModifiedMinutes = modificationTime.getMinutes()
-        var lastModifiedSeconds = modificationTime.getSeconds()
-        if (lastModifiedSeconds.toString().length != 2) {
-            var lastModifiedSeconds = '0' + lastModifiedSeconds
-        }
-        if (lastModifiedMinutes.toString().length != 2) {
-            var lastModifiedMinutes = '0' + lastModifiedMinutes
-        }
-        if (lastModifiedDay.toString().length != 2) {
-            var lastModifiedDay = '0' + lastModifiedDay
-        }
-        if (lastModifiedHours >= 12) {
-            var lastModifiedAmPm = 'PM'
-            if (lastModifiedHours > 12) {
-                var lastModifiedHours = lastModifiedHours - 12
-            }
-        } else {
-            var lastModifiedAmPm = 'AM'
-        }
-        var lastModifiedStr = lastModifiedMonth+'/'+
-                              lastModifiedDay+'/'+
-                              lastModifiedYear+', '+
-                              lastModifiedHours+':'+
-                              lastModifiedMinutes+':'+
-                              lastModifiedSeconds +' '+
-                              lastModifiedAmPm
-        return lastModifiedStr
-    }
-    utilityHandler.htaccessFileRequested = function(filerequested) {
-        if (filerequested == 'index.html' ||
-            filerequested == 'index.htm' ||
-            filerequested == 'index' ||
-            filerequested == 'index.xhtm' ||
-            filerequested == 'index.xhtml' ||
-            filerequested == '') {
-            var filerequested = ''
-            return filerequested
-        } else {
-            return filerequested
-        }
-    }
-    WSC.utilityHandler = utilityHandler
+	WSC.utils = {
+		humanFileSize: function(bytes, si=false, dp=1) {
+				//from https://stackoverflow.com/questions/10420352/converting-file-size-in-bytes-to-human-readable-string/10420404
+				const thresh = si ? 1000 : 1024;
+				if (Math.abs(bytes) < thresh) {
+				  return bytes + ' B';
+				}
+				const units = si 
+				  ? ['kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'] 
+				  : ['KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];
+				let u = -1;
+				const r = 10**dp;
+				do {
+				  bytes /= thresh;
+				  ++u;
+				} while (Math.round(Math.abs(bytes) * r) / r >= thresh && u < units.length - 1);
+				return bytes.toFixed(dp) + ' ' + units[u];
+		},
+		lastModified: function(modificationTime) {
+			var lastModifiedMonth = modificationTime.getMonth() + 1
+			var lastModifiedDay = modificationTime.getDate()
+			var lastModifiedYear = modificationTime.getFullYear().toString().substring(2, 4)
+			var lastModifiedHours = modificationTime.getHours()
+			var lastModifiedMinutes = modificationTime.getMinutes()
+			var lastModifiedSeconds = modificationTime.getSeconds()
+			var lastModified = lastModifiedMonth+
+							   lastModifiedDay+
+							   lastModifiedYear+
+							   lastModifiedHours+
+							   lastModifiedMinutes+
+							   lastModifiedSeconds
+			return lastModified
+		},
+		lastModifiedStr: function(modificationTime) {
+			var lastModifiedMonth = modificationTime.getMonth() + 1
+			var lastModifiedDay = modificationTime.getDate()
+			var lastModifiedYear = modificationTime.getFullYear().toString().substring(2, 4)
+			var lastModifiedHours = modificationTime.getHours()
+			var lastModifiedMinutes = modificationTime.getMinutes()
+			var lastModifiedSeconds = modificationTime.getSeconds()
+			if (lastModifiedSeconds.toString().length != 2) {
+				var lastModifiedSeconds = '0' + lastModifiedSeconds
+			}
+			if (lastModifiedMinutes.toString().length != 2) {
+				var lastModifiedMinutes = '0' + lastModifiedMinutes
+			}
+			if (lastModifiedDay.toString().length != 2) {
+				var lastModifiedDay = '0' + lastModifiedDay
+			}
+			if (lastModifiedHours >= 12) {
+				var lastModifiedAmPm = 'PM'
+				if (lastModifiedHours > 12) {
+					var lastModifiedHours = lastModifiedHours - 12
+				}
+			} else {
+				var lastModifiedAmPm = 'AM'
+			}
+			var lastModifiedStr = lastModifiedMonth+'/'+
+								  lastModifiedDay+'/'+
+								  lastModifiedYear+', '+
+								  lastModifiedHours+':'+
+								  lastModifiedMinutes+':'+
+								  lastModifiedSeconds +' '+
+								  lastModifiedAmPm
+			return lastModifiedStr
+		},
+		htaccessFileRequested: function(filerequested) {
+			if (filerequested == 'index.html' ||
+				filerequested == 'index.htm' ||
+				filerequested == 'index' ||
+				filerequested == 'index.xhtm' ||
+				filerequested == 'index.xhtml' ||
+				filerequested == '') {
+				var filerequested = ''
+				return filerequested
+			} else {
+				return filerequested
+			}
+		},
+		relativePath: function(reqPath, curPath) {
+			var split1 = curPath.split('/')
+			var split2 = reqPath.split('/')
+			for (var w=0; w<split2.length; w++) {
+				if (split2[w] == '' || split2[w] == '.') {
+					// . means current directory. Leave this here for spacing
+				} else if (split2[w] == '..') {
+					if (split1.length > 0) {
+						var split1 = split1.splice(-1,1)
+					}
+				} else {
+					split1.push(split2[w])
+				}
+			}
+			var newPath = split1.join('/')
+			if (! newPath.startsWith('/')) {
+				var newPath = '/' + newPath
+			}
+			return newPath
+		},
+		stripOffFile: function(origpath) {
+			var fullrequestpath = origpath
+			var finpath = fullrequestpath.split('/').pop()
+			var finalpath = fullrequestpath.substring(0, fullrequestpath.length - finpath.length)
+			if (origpath == '/') {
+				return '/'
+			} else {
+				return finalpath
+			}
+			
+		}
+	}
 })();

From f95d9ded9511b5845f47fce3f29f51ebde8f1e74 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Mon, 28 Jun 2021 21:22:50 -0500
Subject: [PATCH 118/154] Re-fix bug

---
 handlers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/handlers.js b/handlers.js
index 29671eb2..b786e98d 100644
--- a/handlers.js
+++ b/handlers.js
@@ -606,7 +606,7 @@
                                             var authdata = origdata[i]
                                         }
                                         if (origdata[i].type == 'directory listing' &&
-                                            this.request.uri.split('/').pop() == '' &&
+                                            this.request.origpath.split('/').pop() == '' &&
                                             ! filefound) {
                                             var data = origdata[i]
                                             var filefound = true

From 5fa805d8dec93639bef4a93a63149f0dfe51d4c3 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Tue, 29 Jun 2021 18:07:23 +0000
Subject: [PATCH 119/154] Log to file

---
 handlers.js            |  93 +++++++++++++++++++++++++++--
 howTo/post.md          |  13 +++-
 log-full.js            | 132 +++++++++++++++++++++++++++++++++++++++++
 react-ui/js/index.js   |  30 +++++++++-
 react-ui/js/options.js |  18 ++++++
 webapp.js              |   9 ++-
 6 files changed, 283 insertions(+), 12 deletions(-)

diff --git a/handlers.js b/handlers.js
index b786e98d..d1329233 100644
--- a/handlers.js
+++ b/handlers.js
@@ -256,10 +256,11 @@
 												if (validFile) {
 													window.req = this.request
 													window.res = this
+													this.postRequestID = Math.round(Math.random()*100)
 													res.end = function() {
 														// We need to cleanup - Which is why we don't want the user to directly call res.finish()
-														if (document.getElementById('tempPOSThandler')) {
-															document.getElementById('tempPOSThandler').remove()
+														if (document.getElementById('tempPOSThandler' + this.postRequestID)) {
+															document.getElementById('tempPOSThandler' + this.postRequestID).remove()
 														}
 														delete this.postRequest
 														delete window.res
@@ -272,7 +273,7 @@
 													var blob = new Blob([file], {type : 'text/javascript'})
 													this.postRequest = document.createElement("script")
 													this.postRequest.src = URL.createObjectURL(blob)
-													this.postRequest.id = 'tempPOSThandler'
+													this.postRequest.id = 'tempPOSThandler' + this.postRequestID
 													document.body.appendChild(this.postRequest)
 												} else {
 													this.write('Keys do not match', 403)
@@ -1154,9 +1155,11 @@
         },
 		// everything from here to the end of the prototype are tools for server side post handling
 		getFile: function(path, callback) {
-			// did not expect this to still work :/
 			if (! path.startsWith('/')) {
-				path = WSC.utils.relativePath(path, WSC.utils.stripOffFile(this.request.origpath))
+				var path = WSC.utils.relativePath(path, WSC.utils.stripOffFile(this.request.origpath))
+			}
+			if (! callback) {
+				return
 			}
 			this.fs.getByPath(path, function(file) {
 				if (file.isDirectory) {
@@ -1176,6 +1179,86 @@
 				
 			}.bind(this))
 		},
+		writeFile: function(path, data, allowReplaceFile, callback) {
+			if (typeof data == "string") {
+				var data = new TextEncoder('utf-8').encode(data).buffer
+			}
+			if (! path.startsWith('/')) {
+				var path = WSC.utils.relativePath(path, WSC.utils.stripOffFile(this.request.origpath))
+			}
+			if (! callback) {
+				var callback = function(file) { }
+			}
+			var parts = path.split('/')
+			var folderPath = parts.slice(0,parts.length-1).join('/')
+			var filename = parts[parts.length-1]
+			this.fs.getByPath(path, function(file) {
+				if (file && file.error) {
+					app.fs.getByPath(folderPath, function(folder) {
+						folder.getFile(filename, {create:true}, function(entry) {
+							if (entry && entry.isFile) {
+								entry.createWriter(function(writer) {
+									writer.onwrite = writer.onerror = function() {
+										app.fs.getByPath(path, function(file) {
+											if (file && ! file.error) {
+												file.file(function(file) {
+													callback(file)
+												})
+											} else {
+												callback({error: 'Unknown Error'})
+											}
+										})
+									}
+									writer.write(new Blob([data]))
+								})
+							} else {
+								callback({error: 'Unknown Error'})
+							}
+						})
+					})
+				} else if (! file.isDirectory && allowReplaceFile) {
+					app.fs.getByPath(path, function(entry) {
+						entry.remove(function() {
+							app.fs.getByPath(folderPath, function(folder) {
+								folder.getFile(filename, {create:true}, function(entry) {
+									if (entry && entry.isFile) {
+										entry.createWriter(function(writer) {
+											writer.onwrite = writer.onerror = function() {
+												app.fs.getByPath(path, function(file) {
+													if (file && ! file.error) {
+														file.file(function(file) {
+															callback(file)
+														})
+													} else {
+														callback({error: 'Unknown Error'})
+													}
+												})
+											}
+											writer.write(new Blob([data]))
+										})
+									} else {
+										callback({error: 'Unknown Error'})
+									}
+								})
+							})
+						})
+					})
+				} else if (file.isDirectory) {
+					callback({error: 'entry is an existing directory. Deleting Directories not supported'})
+				} else {
+					callback({error: 'File already exists'})
+				}
+				
+				
+			})
+		},
+		httpCode: function(code) {
+			if (! code) {
+				code = 200
+			}
+            this.responseLength = 0
+            this.writeHeaders(code)
+		},
 		contentType: function(type) {
 			this.setHeader('content-type', type)
 		}
diff --git a/howTo/post.md b/howTo/post.md
index 52688e1d..f402bd56 100644
--- a/howTo/post.md
+++ b/howTo/post.md
@@ -84,7 +84,16 @@ Example:
 `res.contentType(type)`: function
 This function will set the content type to respond with, you could also use the `res.setHeader()` function
 
-TODO: function to write file
+`res.writeFile(path, data, allowReplaceFile, callback)`
+This function will save a file
+path: the path of the file
+data: string/arrayBuffer of the file. DO NOT SEND OTHER TYPES OF DATA - THIS COULD BREAK THE APP (Just refresh it)
+allowReplaceFile: if file exists and you want to replace the file, set this to true
+callback: function will be excecuted to tell you if there was an error or it will callback the file
+
+`res.httpCode(httpCode)`: function
+Call this to respond with no message. Dont forget to finish with `res.end()`
+
 
 req Commands
 
@@ -108,4 +117,4 @@ This contains the entire requested path
 This contains the requested file (Will end with / if is directory)
 
 `req.path`: string
-This contains the requested file. (Will NOT end with / if is directory)
\ No newline at end of file
+This contains the requested file. (Will NOT end with / if is directory)
diff --git a/log-full.js b/log-full.js
index afaad713..1daf6a52 100644
--- a/log-full.js
+++ b/log-full.js
@@ -1,6 +1,7 @@
 // add this file to your "blackbox" e.g. blackboxing, making devtools not show logs as coming from here
 (function() {
 	if (console.clog) { return }
+	window.logging = false
 	var L = {
 		UPNP: { show: true, color:'green' },
 		WSC: { show: true, color:'green' }
@@ -12,6 +13,7 @@
         var wrapped = function() {
             var args = Array.prototype.slice.call(arguments)
             ORIGINALCONSOLE[method].apply(console,args)
+			console.logs.push(args)
             if (method == 'error') {
                 args = ['%cError','color:red'].concat(args)
             } else if (method == 'warn') {
@@ -22,6 +24,7 @@
     }
     
     console.log = wrappedlog('log')
+	console.logs = [ ]
     console.warn = wrappedlog('warn')
     console.error = wrappedlog('error')
     console.clog = function() {
@@ -41,4 +44,133 @@
             ORIGINALCONSOLE.log.apply(console,args)
         }
     }
+
+	WSC.saveLogs = function() {
+		if (window.logging) {
+			return
+		}
+		function saveLogs() {
+			if (app.opts.optSaveLogs) {
+				if (console.logs.length > 0) {
+					var a = console.logs
+					var q = '\n'
+					console.logs = [ ]
+					if (a[0][0] == 'background.js') {
+						var q = q + 'STARTUP: ' + new Date().toString() + '\n\n'
+					}
+					for (var i=0; i<a.length; i++) {
+						if (a[i].length == 1) {
+							var q = q + a[i][0] + '\n\n'
+						} else {
+							var b = ''
+							for (var t=0; t<a[i].length; t++) {
+								if (typeof a[i][t] !== 'object') {
+									var b = b+ a[i][t] + ' '
+								} else {
+									var b = b + JSON.stringify(a[i][t], null, 2)
+								}
+							}
+							var q = q + b + '\n\n'
+						}
+					}
+					//console.log(app.opts)
+					var saveTo = app.opts.optSaveLogsFilename
+					if (! saveTo) {
+						var saveTo = '/wsc.log'
+					}
+					if (! saveTo.startsWith('/')) {
+						var saveTo = '/' + saveTo
+					}
+					app.fs.getByPath(saveTo, function(file) {
+						if (file && ! file.error && file.isFile) {
+							file.file(function(file) {
+								var reader = new FileReader()
+								reader.onload = function(e) {
+									var saveTo = app.opts.optSaveLogsFilename
+									if (! saveTo) {
+										var saveTo = '/wsc.log'
+									}
+									if (! saveTo.startsWith('/')) {
+										var saveTo = '/' + saveTo
+									}
+									var oldData = e.target.result
+									var newData = q
+									var data = oldData + newData
+									var data = new TextEncoder('utf-8').encode(data).buffer
+									var parts = saveTo.split('/')
+									var path = parts.slice(0,parts.length-1).join('/')
+									var filename = parts[parts.length-1]
+									app.fs.getByPath(saveTo, function(entry) {
+										entry.remove( function() {
+											app.fs.getByPath(path, function(folder) {
+												folder.getFile(filename, {create:true}, function(entry) {
+													if (entry && entry.isFile) {
+														entry.createWriter(function(writer) {
+															writer.onwrite = writer.onerror = function() {
+																if (WSC.DEBUG) {
+																	console.log('saved logs to ' + saveTo)
+																}
+															}
+															writer.write(new Blob([data]))
+														})
+													}
+												})
+											})
+										})
+									})
+								}
+								reader.readAsText(file)
+							})
+						} else {
+							var saveTo = app.opts.optSaveLogsFilename
+							if (! saveTo) {
+								var saveTo = '/wsc.log'
+							}
+							if (! saveTo.startsWith('/')) {
+								var saveTo = '/' + saveTo
+							}
+							if (file.isDirectory) {
+								if (saveTo.endsWith('/')) {
+									var saveTo = saveTo + 'wsc.log'
+								} else {
+									var saveTo = saveTo + '/wsc.log'
+								}
+								
+							}
+							var data = q
+							var data = new TextEncoder('utf-8').encode(data).buffer
+							var parts = saveTo.split('/')
+							var path = parts.slice(0,parts.length-1).join('/')
+							var filename = parts[parts.length-1]
+							app.fs.getByPath(path, function(folder) {
+								folder.getFile(filename, {create:true}, function(entry) {
+									if (entry && entry.isFile) {
+										entry.createWriter(function(writer) {
+											writer.onwrite = writer.onerror = function() {
+												if (WSC.DEBUG) {
+													console.log('saved logs to ' + saveTo)
+												}
+											}
+											writer.write(new Blob([data]))
+										})
+									}
+								})
+							})
+							
+						}
+					})
+				} else {
+					if (WSC.DEBUG) {
+						console.log('no logs to save!')
+					}
+				}
+			}
+		}
+		window.logging = true
+		if (app.opts.optSaveLogs) {
+			var interval = app.opts.optSaveLogsInterval * 60 * 1000
+			setInterval(saveLogs, interval)
+		}
+	}
+	
 })();
diff --git a/react-ui/js/index.js b/react-ui/js/index.js
index 725c7c80..78b2a682 100644
--- a/react-ui/js/index.js
+++ b/react-ui/js/index.js
@@ -123,6 +123,18 @@ const functions = {
     console.assert(typeof val === 'string')
     app.webapp.updateOption('optAuthPassword', val);
   },
+  optSaveLogsFilename: (app, k, val) => {
+    console.assert(typeof val === 'string')
+    app.webapp.updateOption('optSaveLogsFilename', val);
+  },
+  optSaveLogs: (app, k, val) => {
+	app.webapp.updateLogging()
+    app.webapp.updateOption('optSaveLogs', val);
+  },
+  optSaveLogsInterval: (app, k, val) => {
+    console.assert(typeof val === 'string')
+    app.webapp.updateOption('optSaveLogsInterval', val);
+  },
   optPrivateKey: (app, k, val) => {
     //console.log('privateKey')
     console.assert(typeof val === 'string')
@@ -305,9 +317,16 @@ class App extends React.Component {
 	const optUploadOptions = {
 	  optAllowReplaceFile: ['optUpload']
 	};
-    const optnodothtmlMain = {
+	const optLogMain = {
       optDelete: null,
       optVerbose: null,
+      optSaveLogs: null
+	};
+	const optLogOptions = {
+      optSaveLogsFilename: ['optSaveLogs'],
+      optSaveLogsInterval: ['optSaveLogs']
+	};
+    const optnodothtmlMain = {
       optExcludeDotHtml: null
     };
     const optnodothtmlInfo = {
@@ -414,6 +433,7 @@ class App extends React.Component {
     const authMain = renderOpts(optAuthMain)
     const cacheMain = renderOpts(optCacheMain)
     const nodothtmlMain = renderOpts(optnodothtmlMain)
+	const logMain = renderOpts(optLogMain)
 	
     const HtaccessInfo = (() => {
       let disablezero = (!this.webapp || !this.webapp.opts.optScanForHtaccess);
@@ -423,6 +443,12 @@ class App extends React.Component {
 	  </div>)];
     })();
 
+	const logInfo = (() => {
+		let disablelogasd = (!this.webapp || !this.webapp.opts.optSaveLogs);
+		const logsadge = renderOpts(optLogOptions)
+		return [(<div>{!disablelogasd && logsadge}</div>)];
+	})();
+
 	const UploadOption = (() => {
 		let disableoneasd = (!this.webapp || !this.webapp.opts.optUpload);
 		const uploadasd = renderOpts(optUploadOptions)
@@ -567,7 +593,7 @@ class App extends React.Component {
           {options}
 
           {advancedButton}
-          {state.showAdvanced && <div>{advOptions}{UploadOption}{nodothtmlMain}{nodothtmlOptions}{Custom400Main}{Custom400Options}{Custom401Main}{Custom401Options}{Custom403Main}{Custom403Options}{Custom404Main}{Custom404Options}{Custom404OptionsPt2}{authMain}{authOptions}{HtaccessMain}{HtaccessInfo}{cacheMain}{cacheOptions}{rewriteMain}{rewriteOptions}{httpsMain}{httpsOptions}{POSTFeatureInfo}</div> }
+          {state.showAdvanced && <div>{advOptions}{UploadOption}{logMain}{logInfo}{nodothtmlMain}{nodothtmlOptions}{Custom400Main}{Custom400Options}{Custom401Main}{Custom401Options}{Custom403Main}{Custom403Options}{Custom404Main}{Custom404Options}{Custom404OptionsPt2}{authMain}{authOptions}{HtaccessMain}{HtaccessInfo}{cacheMain}{cacheOptions}{rewriteMain}{rewriteOptions}{httpsMain}{httpsOptions}{POSTFeatureInfo}</div> }
         </CardContent>
       </Card>
 
diff --git a/react-ui/js/options.js b/react-ui/js/options.js
index c66a583d..545b6e91 100644
--- a/react-ui/js/options.js
+++ b/react-ui/js/options.js
@@ -359,6 +359,24 @@ const options = {
   	label: 'Certificate string',
   	help: "String containg certificate, used in pair with private key string.\nEdit them in pairs",
   	type: String 
+  },
+  optSaveLogs: {
+	label: 'Save Logs To File',
+	help: 'All logs will be saved to a file',
+    type: Boolean,
+    default: false
+  },
+  optSaveLogsInterval: {
+	label: 'Save Logs Every _ minutes',
+	help: "Save Logs Every _ minutes. The higher, the less likely an error will happen",
+	type: Number,
+	default: 10
+  },
+  optSaveLogsFilename: {
+	label: 'Path to save log file',
+	help: "Where to save log file",
+	type: String,
+	default: '/wsc.log'
   }
 }
 
diff --git a/webapp.js b/webapp.js
index 266ecb27..a6f8745c 100644
--- a/webapp.js
+++ b/webapp.js
@@ -82,6 +82,10 @@
                 break
             }
         },
+		updateLogging: function() {
+			window.logging = false
+			WSC.saveLogs()
+		},
         get_info: function() {
             return {
                 interfaces: this.interfaces,
@@ -282,6 +286,7 @@
             this.stopped = false
             this.starting = true
             this.change()
+			WSC.saveLogs()
 
             // need to setup some things
             if (this.interfaces.length == 0 && this.opts.optAllInterfaces) {
@@ -499,6 +504,7 @@
             var filename = request.path.split('/').pop()
             if (filename == 'wsc.htaccess') {
                 if ((request.method == 'GET' && ! this.opts.optGETHtaccess) ||
+					(request.method == 'HEAD' && ! this.opts.optGETHtaccess) ||
                     (request.method == 'PUT' && ! this.opts.optPUTPOSTHtaccess) ||
                     (request.method == 'POST' && ! this.opts.optPUTPOSTHtaccess) ||
                     (request.method == 'DELETE' && ! this.opts.optDELETEHtaccess)) {
@@ -779,9 +785,6 @@ Changes with nginx 0.7.9                                         12 Aug 2008
             }
         },
         finish: function() {
-			if (document.getElementById('tempPOSThandler')) {
-				document.getElementById('tempPOSThandler').remove()
-			}
             if (! this.headersWritten) {
                 this.responseLength = 0
                 this.writeHeaders()

From 26cf1c3126b3d31ed3477342a7381cb2917a35a3 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Wed, 30 Jun 2021 14:22:02 +0000
Subject: [PATCH 120/154] Log to file

---
 handlers.js          | 660 +++++++++++++++++++++----------------------
 log-full.js          | 274 +++++++++---------
 react-ui/js/index.js | 148 +++++-----
 utils.js             | 222 +++++++--------
 webapp.js            | 162 +++++------
 5 files changed, 733 insertions(+), 733 deletions(-)

diff --git a/handlers.js b/handlers.js
index d1329233..0886ec7f 100644
--- a/handlers.js
+++ b/handlers.js
@@ -105,63 +105,63 @@
                 var htaccesspath = finalpath+'wsc.htaccess'
                 //console.log(htaccesspath)
                 this.fs.getByPath(htaccesspath, (file) => {
-					if (! file.error) {
-						file.file( function(filee) {
-							var reader = new FileReader();
-							reader.onload = function(e){
-								var dataa = e.target.result
-								try {
-									var origdata = JSON.parse(dataa)
-								} catch(e) {
-									this.responseLength = 0
-									this.writeHeaders(500)
-									this.finish()
-									return
-								}
-								var filerequested = this.request.origpath.split('/').pop();
-								var filefound = false
-								if (origdata.length == 0 || ! origdata.length) {
-									callback()
-									return
-								}
-								for (var i=0; i<origdata.length; i++) {
-									if (! origdata[i].type) {
-										this.htaccessError.bind(this)('missing type')
-										return
-									}
-									if (! origdata[i].request_path && origdata[i].type != 'directory listing') {
-										this.htaccessError.bind(this)('missing request path')
-										return
-									}
-									if ((origdata[i].type == allow && origdata[i].request_path == filerequested) ||
-										(origdata[i].type == allow && origdata[i].request_path == 'all files') ||
-										(origdata[i].type == deny && origdata[i].request_path == filerequested) ||
-										(origdata[i].type == deny && origdata[i].request_path == 'all files')) {
-										var data = origdata[i]
-										var filefound = true
-										break
-									}
-								}
-								//console.log(filefound)
-								if (filefound) {
-									if (data.type == allow) {
-										callbackSkip()
-									} else if (data.type == deny) {
-										this.responseLength = 0
-										this.writeHeaders(400)
-										this.finish()
-										return
-									}
-								} else {
-									callback()
-								}
-							}.bind(this)
-							reader.readAsText(filee)
-						}.bind(this))
-					} else {
-						callback()
-					}
-				})
+                    if (! file.error) {
+                        file.file( function(filee) {
+                            var reader = new FileReader();
+                            reader.onload = function(e){
+                                var dataa = e.target.result
+                                try {
+                                    var origdata = JSON.parse(dataa)
+                                } catch(e) {
+                                    this.responseLength = 0
+                                    this.writeHeaders(500)
+                                    this.finish()
+                                    return
+                                }
+                                var filerequested = this.request.origpath.split('/').pop();
+                                var filefound = false
+                                if (origdata.length == 0 || ! origdata.length) {
+                                    callback()
+                                    return
+                                }
+                                for (var i=0; i<origdata.length; i++) {
+                                    if (! origdata[i].type) {
+                                        this.htaccessError.bind(this)('missing type')
+                                        return
+                                    }
+                                    if (! origdata[i].request_path && origdata[i].type != 'directory listing') {
+                                        this.htaccessError.bind(this)('missing request path')
+                                        return
+                                    }
+                                    if ((origdata[i].type == allow && origdata[i].request_path == filerequested) ||
+                                        (origdata[i].type == allow && origdata[i].request_path == 'all files') ||
+                                        (origdata[i].type == deny && origdata[i].request_path == filerequested) ||
+                                        (origdata[i].type == deny && origdata[i].request_path == 'all files')) {
+                                        var data = origdata[i]
+                                        var filefound = true
+                                        break
+                                    }
+                                }
+                                //console.log(filefound)
+                                if (filefound) {
+                                    if (data.type == allow) {
+                                        callbackSkip()
+                                    } else if (data.type == deny) {
+                                        this.responseLength = 0
+                                        this.writeHeaders(400)
+                                        this.finish()
+                                        return
+                                    }
+                                } else {
+                                    callback()
+                                }
+                            }.bind(this)
+                            reader.readAsText(filee)
+                        }.bind(this))
+                    } else {
+                        callback()
+                    }
+                })
             } else {
                 callback()
             }
@@ -188,114 +188,114 @@
             }
             this.deletePutHtaccess('allow delete', 'deny delete', deleteCheck.bind(this), deleteMain.bind(this))
         },
-		post: function() {
+        post: function() {
             var htaccessPath = WSC.utils.stripOffFile(this.request.origpath)
-			this.fs.getByPath(htaccessPath + 'wsc.htaccess', function(file) {
-				if (file && ! file.error) {
-					file.file( function(file) {
-						var reader = new FileReader()
-						reader.onload = function(e){
-							try {
-								var origdata = JSON.parse(e.target.result)
-							} catch(e) {
-								this.write('Htaccess JSON parse error\n\nError: ' + e, 500)
-								this.finish()
-								return
-							}
-							if (origdata.length == 0 || ! origdata.length) {
-								this.write('htaccess has no length value', 500)
-								this.finish()
-								return
-							}
-							var filerequested = this.request.origpath.split('/').pop()
-							var filefound = false
-							for (var i=0; i<origdata.length; i++) {
-								if (! origdata[i].type) {
-									this.htaccessError.bind(this)('missing type')
-									return
-								}
-								if (! origdata[i].request_path && origdata[i].type != 'directory listing') {
-									this.htaccessError.bind(this)('missing request path')
-									return
-								}
-								if (origdata[i].request_path == filerequested && origdata[i].type == 'POSTkey' && ! filefound) {
-									var data = origdata[i]
-									var filefound = true
-									break
-								}
-							}
-							// Still need to validate POST key
-							if (filefound) {
-								if (! data.key) {
-									this.htaccessError.bind(this)('missing post key')
-									return
-								}
-								this.fs.getByPath(this.request.path, function(file) {
-									if (file && ! file.error) {
-										file.file(function(file) {
-											var reader = new FileReader()
-											reader.onload = function(e) {
-												var contents = e.target.result.split('\r\n')
-												var validFile = false
-												for (var i=0; i<contents.length; i++) {
-													if (contents[i].startsWith('\t')) {
-														contents[i] = contents[i].substring(1, contents[i].length)
-													}
-													// check multiple times ?
-													if (contents[i].startsWith('\t')) {
-														contents[i] = contents[i].substring(1, contents[i].length)
-													}
-													if (contents[i].startsWith('postKey')) {
-														var postkey = contents[i].split('=').pop().replace(' ', '').replace('"', '\'').replace('\'', '').replace('\'', '')
-														if (postkey == data.key) {
-															var validFile = true
-															break
-														}
-													}
-												}
-												if (validFile) {
-													window.req = this.request
-													window.res = this
-													this.postRequestID = Math.round(Math.random()*100)
-													res.end = function() {
-														// We need to cleanup - Which is why we don't want the user to directly call res.finish()
-														if (document.getElementById('tempPOSThandler' + this.postRequestID)) {
-															document.getElementById('tempPOSThandler' + this.postRequestID).remove()
-														}
-														delete this.postRequest
-														delete window.res
-														delete window.req
-														if (window.postKey) {
-															delete window.postKey
-														}
-														this.finish()
-													}
-													var blob = new Blob([file], {type : 'text/javascript'})
-													this.postRequest = document.createElement("script")
-													this.postRequest.src = URL.createObjectURL(blob)
-													this.postRequest.id = 'tempPOSThandler' + this.postRequestID
-													document.body.appendChild(this.postRequest)
-												} else {
-													this.write('Keys do not match', 403)
-												}
-											}.bind(this)
-											reader.readAsText(file)
-										}.bind(this))
-									} else {
-										this.write('file not found', 404)
-									}
-								}.bind(this))
-							} else {
-							this.put()
-							}
-						}.bind(this)
-						reader.readAsText(file)
-					}.bind(this))
-				} else {
-					this.put()
-				}
-			}.bind(this))
-		},
+            this.fs.getByPath(htaccessPath + 'wsc.htaccess', function(file) {
+                if (file && ! file.error) {
+                    file.file( function(file) {
+                        var reader = new FileReader()
+                        reader.onload = function(e){
+                            try {
+                                var origdata = JSON.parse(e.target.result)
+                            } catch(e) {
+                                this.write('Htaccess JSON parse error\n\nError: ' + e, 500)
+                                this.finish()
+                                return
+                            }
+                            if (origdata.length == 0 || ! origdata.length) {
+                                this.write('htaccess has no length value', 500)
+                                this.finish()
+                                return
+                            }
+                            var filerequested = this.request.origpath.split('/').pop()
+                            var filefound = false
+                            for (var i=0; i<origdata.length; i++) {
+                                if (! origdata[i].type) {
+                                    this.htaccessError.bind(this)('missing type')
+                                    return
+                                }
+                                if (! origdata[i].request_path && origdata[i].type != 'directory listing') {
+                                    this.htaccessError.bind(this)('missing request path')
+                                    return
+                                }
+                                if (origdata[i].request_path == filerequested && origdata[i].type == 'POSTkey' && ! filefound) {
+                                    var data = origdata[i]
+                                    var filefound = true
+                                    break
+                                }
+                            }
+                            // Still need to validate POST key
+                            if (filefound) {
+                                if (! data.key) {
+                                    this.htaccessError.bind(this)('missing post key')
+                                    return
+                                }
+                                this.fs.getByPath(this.request.path, function(file) {
+                                    if (file && ! file.error) {
+                                        file.file(function(file) {
+                                            var reader = new FileReader()
+                                            reader.onload = function(e) {
+                                                var contents = e.target.result.split('\r\n')
+                                                var validFile = false
+                                                for (var i=0; i<contents.length; i++) {
+                                                    if (contents[i].startsWith('\t')) {
+                                                        contents[i] = contents[i].substring(1, contents[i].length)
+                                                    }
+                                                    // check multiple times ?
+                                                    if (contents[i].startsWith('\t')) {
+                                                        contents[i] = contents[i].substring(1, contents[i].length)
+                                                    }
+                                                    if (contents[i].startsWith('postKey')) {
+                                                        var postkey = contents[i].split('=').pop().replace(' ', '').replace('"', '\'').replace('\'', '').replace('\'', '')
+                                                        if (postkey == data.key) {
+                                                            var validFile = true
+                                                            break
+                                                        }
+                                                    }
+                                                }
+                                                if (validFile) {
+                                                    window.req = this.request
+                                                    window.res = this
+                                                    this.postRequestID = Math.round(Math.random()*100)
+                                                    res.end = function() {
+                                                        // We need to cleanup - Which is why we don't want the user to directly call res.finish()
+                                                        if (document.getElementById('tempPOSThandler' + this.postRequestID)) {
+                                                            document.getElementById('tempPOSThandler' + this.postRequestID).remove()
+                                                        }
+                                                        delete this.postRequest
+                                                        delete window.res
+                                                        delete window.req
+                                                        if (window.postKey) {
+                                                            delete window.postKey
+                                                        }
+                                                        this.finish()
+                                                    }
+                                                    var blob = new Blob([file], {type : 'text/javascript'})
+                                                    this.postRequest = document.createElement("script")
+                                                    this.postRequest.src = URL.createObjectURL(blob)
+                                                    this.postRequest.id = 'tempPOSThandler' + this.postRequestID
+                                                    document.body.appendChild(this.postRequest)
+                                                } else {
+                                                    this.write('Keys do not match', 403)
+                                                }
+                                            }.bind(this)
+                                            reader.readAsText(file)
+                                        }.bind(this))
+                                    } else {
+                                        this.write('file not found', 404)
+                                    }
+                                }.bind(this))
+                            } else {
+                            this.put()
+                            }
+                        }.bind(this)
+                        reader.readAsText(file)
+                    }.bind(this))
+                } else {
+                    this.put()
+                }
+            }.bind(this))
+        },
         put: function() {
             function putMain() {
                 this.fs.getByPath(this.request.path, this.onPutEntry.bind(this), true)
@@ -329,11 +329,11 @@
                     }.bind(this)
                     entry.remove( onremove, onremove )
                 } else {
-					this.responseLength = 0
-					this.writeHeaders(400)
-					this.finish()
-					return
-				}
+                    this.responseLength = 0
+                    this.writeHeaders(400)
+                    this.finish()
+                    return
+                }
             }
         },
         onPutFolder: function(filename, folder) {
@@ -371,16 +371,16 @@
                 this.setHeader('Cache-Control',this.app.opts.optCacheControlValue)
             }
             if (this.app.opts.optExcludeDotHtml && ! this.request.origpath.endsWith("/")) {
-				var htmhtml = this.app.opts.optExcludeDotHtm ? 'htm' : 'html';
+                var htmhtml = this.app.opts.optExcludeDotHtm ? 'htm' : 'html';
                 var extension = this.request.path.split('.').pop();
                 var more = this.request.uri.split('.'+htmhtml).pop()
                 if (extension == htmhtml) {
                     var path = this.request.path
-					if (htmhtml == 'html') {
-						var newpath = path.substring(0, path.length - 5);
-					} else {
-						var newpath = path.substring(0, path.length - 4);
-					}
+                    if (htmhtml == 'html') {
+                        var newpath = path.substring(0, path.length - 5);
+                    } else {
+                        var newpath = path.substring(0, path.length - 4);
+                    }
                     if (more != this.request.uri) {
                         var newpath = newpath+more
                     }
@@ -461,13 +461,13 @@
             this.entry = entry
 
             function onEntryMain() {
-				
-				if (this.entry && this.entry.isFile && this.request.origpath.endsWith('/')) {
-					this.setHeader('location', this.request.path)
+                
+                if (this.entry && this.entry.isFile && this.request.origpath.endsWith('/')) {
+                    this.setHeader('location', this.request.path)
                     this.writeHeaders(301)
                     this.finish()
                     return
-				}
+                }
                 
                 if (this.entry && this.entry.isDirectory && ! this.request.origpath.endsWith('/')) {
                     var newloc = this.request.origpath + '/'
@@ -484,9 +484,9 @@
                     return
                 }
                 if (! entry) {
-					this.error('no entry',404)
+                    this.error('no entry',404)
                 } else if (entry.error) {
-					this.error('entry not found: ' + (this.rewrite_to || this.request.path), 404)
+                    this.error('entry not found: ' + (this.rewrite_to || this.request.path), 404)
                 } else if (entry.isFile) {
                     this.renderFileContents(entry)
                 } else {
@@ -508,7 +508,7 @@
                             }
                         }
                         if (this.app.opts.optDir404 && this.app.opts.optRenderIndex) {
-							this.error("404 - File not found", 404)
+                            this.error("404 - File not found", 404)
                         } else if (this.request.arguments && this.request.arguments.json == '1' ||
                             (this.request.headers['accept'] && this.request.headers['accept'].toLowerCase() == 'application/json')
                            ) {
@@ -526,30 +526,30 @@
                 }
             }
 
-			function excludedothtmlcheck() {
-				if (this.app.opts.optExcludeDotHtml && this.request.path != '') {
-					if (this.app.opts.optExcludeDotHtm) {
-						var htmHtml = '.htm'
-					} else {
-						var htmHtml = '.html'
-					}
-					this.fs.getByPath(this.request.path+htmHtml, (file) => {
-					if (! file.error) {
-						if (this.request.origpath.endsWith("/")) {
-							onEntryMain.bind(this)()
-							return
-						}
-						this.renderFileContents(file)
-						//console.log('file found')
-						this.setHeader('content-type','text/html; charset=utf-8')
-						return
-					} else {
-						onEntryMain.bind(this)()
-						}
-					})} else {
-					onEntryMain.bind(this)()
-				}
-			}
+            function excludedothtmlcheck() {
+                if (this.app.opts.optExcludeDotHtml && this.request.path != '') {
+                    if (this.app.opts.optExcludeDotHtm) {
+                        var htmHtml = '.htm'
+                    } else {
+                        var htmHtml = '.html'
+                    }
+                    this.fs.getByPath(this.request.path+htmHtml, (file) => {
+                    if (! file.error) {
+                        if (this.request.origpath.endsWith("/")) {
+                            onEntryMain.bind(this)()
+                            return
+                        }
+                        this.renderFileContents(file)
+                        //console.log('file found')
+                        this.setHeader('content-type','text/html; charset=utf-8')
+                        return
+                    } else {
+                        onEntryMain.bind(this)()
+                        }
+                    })} else {
+                    onEntryMain.bind(this)()
+                }
+            }
         
             if (this.app.opts.optScanForHtaccess) {
                 var fullrequestpath = this.request.origpath
@@ -633,11 +633,11 @@
                                                 //console.log(data)
                                                 var filefound = true
                                         }
-										if (origdata[i].request_path == filerequested && origdata[i].type == 'POSTkey') {
-											var filefound = false
-											this.error('<h1>403 - Forbidden</h1>')
-											break
-										}
+                                        if (origdata[i].request_path == filerequested && origdata[i].type == 'POSTkey') {
+                                            var filefound = false
+                                            this.error('<h1>403 - Forbidden</h1>')
+                                            break
+                                        }
                                         //console.log(origdata[i].request_path == filerequested)
                                         if ((origdata[i].request_path == filerequested || origdata[i].request_path == 'all files') &&
                                             origdata[i].type == 'additional header') {
@@ -900,7 +900,7 @@
                                     } else {
                                         var htmHtml = '.html'
                                     }
-									var htmHtml = this.app.opts.optExcludeDotHtm ? '.htm' : 'html'
+                                    var htmHtml = this.app.opts.optExcludeDotHtm ? '.htm' : 'html'
                                     this.fs.getByPath(this.request.path+htmHtml, (file) => {
                                         if (! file.error) {
                                             if (this.request.origpath.endsWith("/")) {
@@ -958,7 +958,7 @@
         renderFileContents: function(entry, file) {
             getEntryFile(entry, function(file) {
                 if (file instanceof DOMException) {
-					this.error("File not found", 404)
+                    this.error("File not found", 404)
                 }
                 this.file = file
                 if (this.request.method == "HEAD") {
@@ -1046,7 +1046,7 @@
             }
             function DirRenderFinish() {
                 this.setHeader('content-type','text/html; charset=utf-8')
-				this.write(html.join('\n'))
+                this.write(html.join('\n'))
                 this.finish()
             }
             function sendFileList() {
@@ -1062,7 +1062,7 @@
                     var modifiedstr = WSC.utils.lastModifiedStr(file.modificationTime)
                     // raw, urlencoded, isdirectory, size, size as string, date modified, date modified as string
                     if (rawname != 'wsc.htaccess') {
-						html.push('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+',"'+filesize+'","'+filesizestr+'","'+modified+'","'+modifiedstr+'");</script>')
+                        html.push('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+',"'+filesize+'","'+filesizestr+'","'+modified+'","'+modifiedstr+'");</script>')
                     }
                     if (w != results.length - 1) {
                         w++
@@ -1080,16 +1080,16 @@
                     }
                 }.bind(this))
             }
-			var html = [WSC.template_data]
+            var html = [WSC.template_data]
             html.push('<script>start("'+this.request.origpath+'")</script>')
             if (this.request.origpath != '/') {
                 html.push('<script>onHasParentDirectory();</script>')
             }
             var w = 0
-			if (results.length == 0) {
-				DirRenderFinish.bind(this)()
-				return
-			}
+            if (results.length == 0) {
+                DirRenderFinish.bind(this)()
+                return
+            }
             sendFileList.bind(this, results)()
         },
         renderDirectoryListing: function(results) {
@@ -1128,8 +1128,8 @@
             }
 
         },
-		getDirContents: function(entry, callback) {
-   			var reader = entry.createReader()
+        getDirContents: function(entry, callback) {
+               var reader = entry.createReader()
             var allresults = []
             function onreaderr(evt) {
                 WSC.entryCache.unset(this.entry.filesystem.name + this.entry.fullPath)
@@ -1147,121 +1147,121 @@
             }
             reader.readEntries( onreadsuccess.bind(this),
                                 onreaderr.bind(this))
-		},
+        },
         htaccessError: function(errormsg) {
             this.write('Htaccess Configuration error. Please check to make sure that you are not missing some values.\n\nError Message: '+errormsg, 500)
             this.finish()
             return
         },
-		// everything from here to the end of the prototype are tools for server side post handling
-		getFile: function(path, callback) {
-			if (! path.startsWith('/')) {
-				var path = WSC.utils.relativePath(path, WSC.utils.stripOffFile(this.request.origpath))
-			}
-			if (! callback) {
-				return
-			}
-			this.fs.getByPath(path, function(file) {
-				if (file.isDirectory) {
-					// automatically get dir contents?
-					this.getDirContents(file, function(results) {
-						results.isDirectory = true
-						results.isFile = false
-						callback(results)
-					})
-				} else if (file && ! file.error) {
-					file.file(function(file) {
-						callback(file)
-					})
-				} else {
-					callback(file)
-				}
-				
-			}.bind(this))
-		},
-		writeFile: function(path, data, allowReplaceFile, callback) {
-			if (typeof data == "string") {
-				var data = new TextEncoder('utf-8').encode(data).buffer
-			}
-			if (! path.startsWith('/')) {
-				var path = WSC.utils.relativePath(path, WSC.utils.stripOffFile(this.request.origpath))
-			}
-			if (! callback) {
-				var callback = function(file) { }
-			}
-			var parts = path.split('/')
-			var folderPath = parts.slice(0,parts.length-1).join('/')
-			var filename = parts[parts.length-1]
-			this.fs.getByPath(path, function(file) {
-				if (file && file.error) {
-					app.fs.getByPath(folderPath, function(folder) {
-						folder.getFile(filename, {create:true}, function(entry) {
-							if (entry && entry.isFile) {
-								entry.createWriter(function(writer) {
-									writer.onwrite = writer.onerror = function() {
-										app.fs.getByPath(path, function(file) {
-											if (file && ! file.error) {
-												file.file(function(file) {
-													callback(file)
-												})
-											} else {
-												callback({error: 'Unknown Error'})
-											}
-										})
-									}
-									writer.write(new Blob([data]))
-								})
-							} else {
-								callback({error: 'Unknown Error'})
-							}
-						})
-					})
-				} else if (! file.isDirectory && allowReplaceFile) {
-					app.fs.getByPath(path, function(entry) {
-						entry.remove(function() {
-							app.fs.getByPath(folderPath, function(folder) {
-								folder.getFile(filename, {create:true}, function(entry) {
-									if (entry && entry.isFile) {
-										entry.createWriter(function(writer) {
-											writer.onwrite = writer.onerror = function() {
-												app.fs.getByPath(path, function(file) {
-													if (file && ! file.error) {
-														file.file(function(file) {
-															callback(file)
-														})
-													} else {
-														callback({error: 'Unknown Error'})
-													}
-												})
-											}
-											writer.write(new Blob([data]))
-										})
-									} else {
-										callback({error: 'Unknown Error'})
-									}
-								})
-							})
-						})
-					})
-				} else if (file.isDirectory) {
-					callback({error: 'entry is an existing directory. Deleting Directories not supported'})
-				} else {
-					callback({error: 'File already exists'})
-				}
-				
-				
-			})
-		},
-		httpCode: function(code) {
-			if (! code) {
-				code = 200
-			}
+        // everything from here to the end of the prototype are tools for server side post handling
+        getFile: function(path, callback) {
+            if (! path.startsWith('/')) {
+                var path = WSC.utils.relativePath(path, WSC.utils.stripOffFile(this.request.origpath))
+            }
+            if (! callback) {
+                return
+            }
+            this.fs.getByPath(path, function(file) {
+                if (file.isDirectory) {
+                    // automatically get dir contents?
+                    this.getDirContents(file, function(results) {
+                        results.isDirectory = true
+                        results.isFile = false
+                        callback(results)
+                    })
+                } else if (file && ! file.error) {
+                    file.file(function(file) {
+                        callback(file)
+                    })
+                } else {
+                    callback(file)
+                }
+                
+            }.bind(this))
+        },
+        writeFile: function(path, data, allowReplaceFile, callback) {
+            if (typeof data == "string") {
+                var data = new TextEncoder('utf-8').encode(data).buffer
+            }
+            if (! path.startsWith('/')) {
+                var path = WSC.utils.relativePath(path, WSC.utils.stripOffFile(this.request.origpath))
+            }
+            if (! callback) {
+                var callback = function(file) { }
+            }
+            var parts = path.split('/')
+            var folderPath = parts.slice(0,parts.length-1).join('/')
+            var filename = parts[parts.length-1]
+            this.fs.getByPath(path, function(file) {
+                if (file && file.error) {
+                    app.fs.getByPath(folderPath, function(folder) {
+                        folder.getFile(filename, {create:true}, function(entry) {
+                            if (entry && entry.isFile) {
+                                entry.createWriter(function(writer) {
+                                    writer.onwrite = writer.onerror = function() {
+                                        app.fs.getByPath(path, function(file) {
+                                            if (file && ! file.error) {
+                                                file.file(function(file) {
+                                                    callback(file)
+                                                })
+                                            } else {
+                                                callback({error: 'Unknown Error'})
+                                            }
+                                        })
+                                    }
+                                    writer.write(new Blob([data]))
+                                })
+                            } else {
+                                callback({error: 'Unknown Error'})
+                            }
+                        })
+                    }, true)
+                } else if (! file.isDirectory && allowReplaceFile) {
+                    app.fs.getByPath(path, function(entry) {
+                        entry.remove(function() {
+                            app.fs.getByPath(folderPath, function(folder) {
+                                folder.getFile(filename, {create:true}, function(entry) {
+                                    if (entry && entry.isFile) {
+                                        entry.createWriter(function(writer) {
+                                            writer.onwrite = writer.onerror = function() {
+                                                app.fs.getByPath(path, function(file) {
+                                                    if (file && ! file.error) {
+                                                        file.file(function(file) {
+                                                            callback(file)
+                                                        })
+                                                    } else {
+                                                        callback({error: 'Unknown Error'})
+                                                    }
+                                                })
+                                            }
+                                            writer.write(new Blob([data]))
+                                        })
+                                    } else {
+                                        callback({error: 'Unknown Error'})
+                                    }
+                                })
+                            }, true)
+                        })
+                    })
+                } else if (file.isDirectory) {
+                    callback({error: 'entry is an existing directory. Deleting Directories not supported'})
+                } else {
+                    callback({error: 'File already exists'})
+                }
+                
+                
+            }, true)
+        },
+        httpCode: function(code) {
+            if (! code) {
+                code = 200
+            }
             this.responseLength = 0
             this.writeHeaders(code)
-		},
-		contentType: function(type) {
-			this.setHeader('content-type', type)
-		}
+        },
+        contentType: function(type) {
+            this.setHeader('content-type', type)
+        }
     }, WSC.BaseHandler.prototype)
 
     //if (chrome.runtime.id == WSC.store_id || true) {
diff --git a/log-full.js b/log-full.js
index 1daf6a52..4ae5baba 100644
--- a/log-full.js
+++ b/log-full.js
@@ -1,11 +1,11 @@
 // add this file to your "blackbox" e.g. blackboxing, making devtools not show logs as coming from here
 (function() {
-	if (console.clog) { return }
-	window.logging = false
-	var L = {
-		UPNP: { show: true, color:'green' },
-		WSC: { show: true, color:'green' }
-	}
+    if (console.clog) { return }
+    window.logging = false
+    var L = {
+        UPNP: { show: true, color:'green' },
+        WSC: { show: true, color:'green' }
+    }
     Object.keys(L).forEach( function(k) { L[k].name = k } )
     window.ORIGINALCONSOLE = {log:console.log, warn:console.warn, error:console.error}
     window.LOGLISTENERS = []
@@ -13,7 +13,7 @@
         var wrapped = function() {
             var args = Array.prototype.slice.call(arguments)
             ORIGINALCONSOLE[method].apply(console,args)
-			console.logs.push(args)
+            console.logs.push(args)
             if (method == 'error') {
                 args = ['%cError','color:red'].concat(args)
             } else if (method == 'warn') {
@@ -24,14 +24,14 @@
     }
     
     console.log = wrappedlog('log')
-	console.logs = [ ]
+    console.logs = [ ]
     console.warn = wrappedlog('warn')
     console.error = wrappedlog('error')
     console.clog = function() {
         if (! WSC.DEBUG) { return }
         // category specific logging
         var tolog = arguments[0]
-		tolog = L[tolog]
+        tolog = L[tolog]
         if (tolog === undefined) {
             var args = Array.prototype.slice.call(arguments,1,arguments.length)
             args = ['%c' + 'UNDEF', 'color:#ac0'].concat(args)
@@ -45,132 +45,132 @@
         }
     }
 
-	WSC.saveLogs = function() {
-		if (window.logging) {
-			return
-		}
-		function saveLogs() {
-			if (app.opts.optSaveLogs) {
-				if (console.logs.length > 0) {
-					var a = console.logs
-					var q = '\n'
-					console.logs = [ ]
-					if (a[0][0] == 'background.js') {
-						var q = q + 'STARTUP: ' + new Date().toString() + '\n\n'
-					}
-					for (var i=0; i<a.length; i++) {
-						if (a[i].length == 1) {
-							var q = q + a[i][0] + '\n\n'
-						} else {
-							var b = ''
-							for (var t=0; t<a[i].length; t++) {
-								if (typeof a[i][t] !== 'object') {
-									var b = b+ a[i][t] + ' '
-								} else {
-									var b = b + JSON.stringify(a[i][t], null, 2)
-								}
-							}
-							var q = q + b + '\n\n'
-						}
-					}
-					//console.log(app.opts)
-					var saveTo = app.opts.optSaveLogsFilename
-					if (! saveTo) {
-						var saveTo = '/wsc.log'
-					}
-					if (! saveTo.startsWith('/')) {
-						var saveTo = '/' + saveTo
-					}
-					app.fs.getByPath(saveTo, function(file) {
-						if (file && ! file.error && file.isFile) {
-							file.file(function(file) {
-								var reader = new FileReader()
-								reader.onload = function(e) {
-									var saveTo = app.opts.optSaveLogsFilename
-									if (! saveTo) {
-										var saveTo = '/wsc.log'
-									}
-									if (! saveTo.startsWith('/')) {
-										var saveTo = '/' + saveTo
-									}
-									var oldData = e.target.result
-									var newData = q
-									var data = oldData + newData
-									var data = new TextEncoder('utf-8').encode(data).buffer
-									var parts = saveTo.split('/')
-									var path = parts.slice(0,parts.length-1).join('/')
-									var filename = parts[parts.length-1]
-									app.fs.getByPath(saveTo, function(entry) {
-										entry.remove( function() {
-											app.fs.getByPath(path, function(folder) {
-												folder.getFile(filename, {create:true}, function(entry) {
-													if (entry && entry.isFile) {
-														entry.createWriter(function(writer) {
-															writer.onwrite = writer.onerror = function() {
-																if (WSC.DEBUG) {
-																	console.log('saved logs to ' + saveTo)
-																}
-															}
-															writer.write(new Blob([data]))
-														})
-													}
-												})
-											})
-										})
-									})
-								}
-								reader.readAsText(file)
-							})
-						} else {
-							var saveTo = app.opts.optSaveLogsFilename
-							if (! saveTo) {
-								var saveTo = '/wsc.log'
-							}
-							if (! saveTo.startsWith('/')) {
-								var saveTo = '/' + saveTo
-							}
-							if (file.isDirectory) {
-								if (saveTo.endsWith('/')) {
-									var saveTo = saveTo + 'wsc.log'
-								} else {
-									var saveTo = saveTo + '/wsc.log'
-								}
-								
-							}
-							var data = q
-							var data = new TextEncoder('utf-8').encode(data).buffer
-							var parts = saveTo.split('/')
-							var path = parts.slice(0,parts.length-1).join('/')
-							var filename = parts[parts.length-1]
-							app.fs.getByPath(path, function(folder) {
-								folder.getFile(filename, {create:true}, function(entry) {
-									if (entry && entry.isFile) {
-										entry.createWriter(function(writer) {
-											writer.onwrite = writer.onerror = function() {
-												if (WSC.DEBUG) {
-													console.log('saved logs to ' + saveTo)
-												}
-											}
-											writer.write(new Blob([data]))
-										})
-									}
-								})
-							})
-							
-						}
-					})
-				} else {
-					if (WSC.DEBUG) {
-						console.log('no logs to save!')
-					}
-				}
-			}
-		}
-		window.logging = true
-		if (app.opts.optSaveLogs) {
-			var interval = app.opts.optSaveLogsInterval * 60 * 1000
-			setInterval(saveLogs, interval)
-		}
-	}
-	
+    WSC.saveLogs = function() {
+        if (window.logging) {
+            return
+        }
+        function saveLogs() {
+            if (app.opts.optSaveLogs) {
+                if (console.logs.length > 0) {
+                    var a = console.logs
+                    var q = '\n'
+                    console.logs = [ ]
+                    if (a[0][0] == 'background.js') {
+                        var q = q + 'STARTUP: ' + new Date().toString() + '\n\n'
+                    }
+                    for (var i=0; i<a.length; i++) {
+                        if (a[i].length == 1) {
+                            var q = q + a[i][0] + '\n\n'
+                        } else {
+                            var b = ''
+                            for (var t=0; t<a[i].length; t++) {
+                                if (typeof a[i][t] !== 'object') {
+                                    var b = b+ a[i][t] + ' '
+                                } else {
+                                    var b = b + JSON.stringify(a[i][t], null, 2)
+                                }
+                            }
+                            var q = q + b + '\n\n'
+                        }
+                    }
+                    //console.log(app.opts)
+                    var saveTo = app.opts.optSaveLogsFilename
+                    if (! saveTo) {
+                        var saveTo = '/wsc.log'
+                    }
+                    if (! saveTo.startsWith('/')) {
+                        var saveTo = '/' + saveTo
+                    }
+                    app.fs.getByPath(saveTo, function(file) {
+                        if (file && ! file.error && file.isFile) {
+                            file.file(function(file) {
+                                var reader = new FileReader()
+                                reader.onload = function(e) {
+                                    var saveTo = app.opts.optSaveLogsFilename
+                                    if (! saveTo) {
+                                        var saveTo = '/wsc.log'
+                                    }
+                                    if (! saveTo.startsWith('/')) {
+                                        var saveTo = '/' + saveTo
+                                    }
+                                    var oldData = e.target.result
+                                    var newData = q
+                                    var data = oldData + newData
+                                    var data = new TextEncoder('utf-8').encode(data).buffer
+                                    var parts = saveTo.split('/')
+                                    var path = parts.slice(0,parts.length-1).join('/')
+                                    var filename = parts[parts.length-1]
+                                    app.fs.getByPath(saveTo, function(entry) {
+                                        entry.remove( function() {
+                                            app.fs.getByPath(path, function(folder) {
+                                                folder.getFile(filename, {create:true}, function(entry) {
+                                                    if (entry && entry.isFile) {
+                                                        entry.createWriter(function(writer) {
+                                                            writer.onwrite = writer.onerror = function() {
+                                                                if (WSC.DEBUG) {
+                                                                    console.log('saved logs to ' + saveTo)
+                                                                }
+                                                            }
+                                                            writer.write(new Blob([data]))
+                                                        })
+                                                    }
+                                                })
+                                            })
+                                        })
+                                    })
+                                }
+                                reader.readAsText(file)
+                            })
+                        } else {
+                            var saveTo = app.opts.optSaveLogsFilename
+                            if (! saveTo) {
+                                var saveTo = '/wsc.log'
+                            }
+                            if (! saveTo.startsWith('/')) {
+                                var saveTo = '/' + saveTo
+                            }
+                            if (file.isDirectory) {
+                                if (saveTo.endsWith('/')) {
+                                    var saveTo = saveTo + 'wsc.log'
+                                } else {
+                                    var saveTo = saveTo + '/wsc.log'
+                                }
+                                
+                            }
+                            var data = q
+                            var data = new TextEncoder('utf-8').encode(data).buffer
+                            var parts = saveTo.split('/')
+                            var path = parts.slice(0,parts.length-1).join('/')
+                            var filename = parts[parts.length-1]
+                            app.fs.getByPath(path, function(folder) {
+                                folder.getFile(filename, {create:true}, function(entry) {
+                                    if (entry && entry.isFile) {
+                                        entry.createWriter(function(writer) {
+                                            writer.onwrite = writer.onerror = function() {
+                                                if (WSC.DEBUG) {
+                                                    console.log('saved logs to ' + saveTo)
+                                                }
+                                            }
+                                            writer.write(new Blob([data]))
+                                        })
+                                    }
+                                })
+                            })
+                            
+                        }
+                    }, true)
+                } else {
+                    if (WSC.DEBUG) {
+                        console.log('no logs to save!')
+                    }
+                }
+            }
+        }
+        window.logging = true
+        if (app.opts.optSaveLogs) {
+            var interval = app.opts.optSaveLogsInterval * 60 * 1000
+            setInterval(saveLogs, interval)
+        }
+    }
+    
 })();
diff --git a/react-ui/js/index.js b/react-ui/js/index.js
index 78b2a682..88ec8d2a 100644
--- a/react-ui/js/index.js
+++ b/react-ui/js/index.js
@@ -56,7 +56,7 @@ const functions = {
   optBackground: function(app, k, val) {
     const {webapp, bg} = app;
     console.log('background setting changed',val)
-		webapp.updateOption('optBackground',val)
+        webapp.updateOption('optBackground',val)
     // appOptions.set('optBackground', val)
     bg.backgroundSettingChange({'optBackground':val})
   },
@@ -68,24 +68,24 @@ const functions = {
   },
   optAutoStart: function(app, k, val) {
     const {bg, webapp} = app;
-		if (val) {
-			chrome.permissions.request({permissions:['background']}, function(result) {
-				console.log('request perm bg',result)
-				if (result) {
-					success()
-				}
-			})
-		} else {
-			chrome.permissions.remove({permissions:['background']}, function(result) {
-				console.log('drop perm bg',result)
-				success()
-			})
-		}
-		function success() {
-			console.log('persist setting start in background',val)
-			webapp.opts.optBackground = val
-			bg.backgroundSettingChange({'optBackground':val})
-		}
+        if (val) {
+            chrome.permissions.request({permissions:['background']}, function(result) {
+                console.log('request perm bg',result)
+                if (result) {
+                    success()
+                }
+            })
+        } else {
+            chrome.permissions.remove({permissions:['background']}, function(result) {
+                console.log('drop perm bg',result)
+                success()
+            })
+        }
+        function success() {
+            console.log('persist setting start in background',val)
+            webapp.opts.optBackground = val
+            bg.backgroundSettingChange({'optBackground':val})
+        }
   },
   optCacheControlValue: (app, k, val) => {
     console.assert(typeof val === 'string')
@@ -128,7 +128,7 @@ const functions = {
     app.webapp.updateOption('optSaveLogsFilename', val);
   },
   optSaveLogs: (app, k, val) => {
-	app.webapp.updateLogging()
+    app.webapp.updateLogging()
     app.webapp.updateOption('optSaveLogs', val);
   },
   optSaveLogsInterval: (app, k, val) => {
@@ -149,10 +149,10 @@ const functions = {
     console.log("useHttps", val);
     app.webapp.updateOption('optUseHttps', val);
     if (app.webapp.started) {
-	  // we must call the start function as a callback
+      // we must call the start function as a callback
       app.webapp.stop('https option changed', function() {
-		  app.webapp.start()
-	  });
+          app.webapp.start()
+      });
     }
   }
 };
@@ -250,9 +250,9 @@ class App extends React.Component {
     })
   }
   gen_crypto() {
-  	let reasonStr = this.webapp.opts.optPrivateKey ? "private key" :
-  	                   this.webapp.opts.optCertificate ? "certificate" : "";
-  	if (reasonStr) {
+      let reasonStr = this.webapp.opts.optPrivateKey ? "private key" :
+                         this.webapp.opts.optCertificate ? "certificate" : "";
+      if (reasonStr) {
       console.warn("Would overwrite existing " + reasonStr + ", erase it first\nMake sure to save a copy first");
       return;
     }
@@ -286,14 +286,14 @@ class App extends React.Component {
     else this.webapp.stop()
   }
   onChange(k, v) {
-		console.log('update and save',k,v)
-		this.webapp.updateOption(k,v) // also set on webapp.opts ?
+        console.log('update and save',k,v)
+        this.webapp.updateOption(k,v) // also set on webapp.opts ?
     // certain options require special manual handling (e.g. port has to set this.webapp.opts.port)
     if (functions[k]) {
       console.log('special handling for', k);
       functions[k](this, k, v)
     }
-		this.appOptions.set(k,v)
+        this.appOptions.set(k,v)
     this.setState({[k]:v})
   }
   render() {
@@ -314,18 +314,18 @@ class App extends React.Component {
       optStatic: null,
       optUpload: null,
     };
-	const optUploadOptions = {
-	  optAllowReplaceFile: ['optUpload']
-	};
-	const optLogMain = {
+    const optUploadOptions = {
+      optAllowReplaceFile: ['optUpload']
+    };
+    const optLogMain = {
       optDelete: null,
       optVerbose: null,
       optSaveLogs: null
-	};
-	const optLogOptions = {
+    };
+    const optLogOptions = {
       optSaveLogsFilename: ['optSaveLogs'],
       optSaveLogsInterval: ['optSaveLogs']
-	};
+    };
     const optnodothtmlMain = {
       optExcludeDotHtml: null
     };
@@ -360,19 +360,19 @@ class App extends React.Component {
     const optCustom401Info = {
       optCustom401location: ['optCustom401']
     };
-	const optAuthMain = {
-	  optUsebasicauth: null
-	};
-	const optAuthOptions = {
-	  optAuthUsername: ['optUsebasicauth'],
-	  optAuthPassword: ['optUsebasicauth']
-	};
-	const optCacheMain = {
-	  optCacheControl: null
-	};
-	const optCacheOptions = {
-	  optCacheControlValue: ['optCacheControl']
-	};
+    const optAuthMain = {
+      optUsebasicauth: null
+    };
+    const optAuthOptions = {
+      optAuthUsername: ['optUsebasicauth'],
+      optAuthPassword: ['optUsebasicauth']
+    };
+    const optCacheMain = {
+      optCacheControl: null
+    };
+    const optCacheOptions = {
+      optCacheControlValue: ['optCacheControl']
+    };
     const optHtaccess = {
       optScanForHtaccess: null
     };
@@ -433,27 +433,27 @@ class App extends React.Component {
     const authMain = renderOpts(optAuthMain)
     const cacheMain = renderOpts(optCacheMain)
     const nodothtmlMain = renderOpts(optnodothtmlMain)
-	const logMain = renderOpts(optLogMain)
-	
+    const logMain = renderOpts(optLogMain)
+    
     const HtaccessInfo = (() => {
       let disablezero = (!this.webapp || !this.webapp.opts.optScanForHtaccess);
       const htaccesstextbox = renderOpts(optHtaccessOptions)
       return [(<div style={{paddingLeft: 20}}>{!disablezero && htaccesstextbox}
         {!disablezero && <Alert severity="info">For more info on how to use wsc.htaccess files, go <a href="https://github.com/ethanaobrien/web-server-chrome/blob/master/howTo/HTACCESS.md" target="_blank">here</a></Alert>}
-	  </div>)];
+      </div>)];
     })();
 
-	const logInfo = (() => {
-		let disablelogasd = (!this.webapp || !this.webapp.opts.optSaveLogs);
-		const logsadge = renderOpts(optLogOptions)
-		return [(<div>{!disablelogasd && logsadge}</div>)];
-	})();
+    const logInfo = (() => {
+        let disablelogasd = (!this.webapp || !this.webapp.opts.optSaveLogs);
+        const logsadge = renderOpts(optLogOptions)
+        return [(<div>{!disablelogasd && logsadge}</div>)];
+    })();
 
-	const UploadOption = (() => {
-		let disableoneasd = (!this.webapp || !this.webapp.opts.optUpload);
-		const uploadasd = renderOpts(optUploadOptions)
-		return [(<div>{!disableoneasd && uploadasd}</div>)];
-	})();
+    const UploadOption = (() => {
+        let disableoneasd = (!this.webapp || !this.webapp.opts.optUpload);
+        const uploadasd = renderOpts(optUploadOptions)
+        return [(<div>{!disableoneasd && uploadasd}</div>)];
+    })();
 
     const Custom403Options = (() => {
       let disableone = (!this.webapp || !this.webapp.opts.optCustom403);
@@ -516,19 +516,19 @@ class App extends React.Component {
       return [(<div style={{paddingLeft: 20}}>{!disable && textBoxes}
         {hasCrypto && !disable && <Alert severity="info">To regenerate, remove key and cert. Be sure to take a copy first, for possible later use!</Alert>}
         {!disable && <Button variant="contained" key="crytobtn" disabled={hasCrypto  ? true : false} onClick={e => {
-				  e.preventDefault();
-				  this.gen_crypto();
-				}}>Generate crypto</Button>}
-	  </div>)];
+                  e.preventDefault();
+                  this.gen_crypto();
+                }}>Generate crypto</Button>}
+      </div>)];
+    })();
+    
+    const POSTFeatureInfo = (() => {
+        return [(<div>
+                    {<Alert severity="info">Server Side POST requests are now supported. Go <a href="https://github.com/ethanaobrien/web-server-chrome/blob/master/howTo/post.md" target="_blank">here</a> to learn how to use this feature</Alert>}
+                </div>)];
+        
+        
     })();
-	
-	const POSTFeatureInfo = (() => {
-		return [(<div>
-					{<Alert severity="info">Server Side POST requests are now supported. Go <a href="https://github.com/ethanaobrien/web-server-chrome/blob/master/howTo/post.md" target="_blank">here</a> to learn how to use this feature</Alert>}
-				</div>)];
-		
-		
-	})();
 
     const {state} = this;
     return (<div>
diff --git a/utils.js b/utils.js
index 874f0ada..8946fe06 100644
--- a/utils.js
+++ b/utils.js
@@ -1,113 +1,113 @@
 (function() {
-	WSC.utils = {
-		humanFileSize: function(bytes, si=false, dp=1) {
-				//from https://stackoverflow.com/questions/10420352/converting-file-size-in-bytes-to-human-readable-string/10420404
-				const thresh = si ? 1000 : 1024;
-				if (Math.abs(bytes) < thresh) {
-				  return bytes + ' B';
-				}
-				const units = si 
-				  ? ['kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'] 
-				  : ['KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];
-				let u = -1;
-				const r = 10**dp;
-				do {
-				  bytes /= thresh;
-				  ++u;
-				} while (Math.round(Math.abs(bytes) * r) / r >= thresh && u < units.length - 1);
-				return bytes.toFixed(dp) + ' ' + units[u];
-		},
-		lastModified: function(modificationTime) {
-			var lastModifiedMonth = modificationTime.getMonth() + 1
-			var lastModifiedDay = modificationTime.getDate()
-			var lastModifiedYear = modificationTime.getFullYear().toString().substring(2, 4)
-			var lastModifiedHours = modificationTime.getHours()
-			var lastModifiedMinutes = modificationTime.getMinutes()
-			var lastModifiedSeconds = modificationTime.getSeconds()
-			var lastModified = lastModifiedMonth+
-							   lastModifiedDay+
-							   lastModifiedYear+
-							   lastModifiedHours+
-							   lastModifiedMinutes+
-							   lastModifiedSeconds
-			return lastModified
-		},
-		lastModifiedStr: function(modificationTime) {
-			var lastModifiedMonth = modificationTime.getMonth() + 1
-			var lastModifiedDay = modificationTime.getDate()
-			var lastModifiedYear = modificationTime.getFullYear().toString().substring(2, 4)
-			var lastModifiedHours = modificationTime.getHours()
-			var lastModifiedMinutes = modificationTime.getMinutes()
-			var lastModifiedSeconds = modificationTime.getSeconds()
-			if (lastModifiedSeconds.toString().length != 2) {
-				var lastModifiedSeconds = '0' + lastModifiedSeconds
-			}
-			if (lastModifiedMinutes.toString().length != 2) {
-				var lastModifiedMinutes = '0' + lastModifiedMinutes
-			}
-			if (lastModifiedDay.toString().length != 2) {
-				var lastModifiedDay = '0' + lastModifiedDay
-			}
-			if (lastModifiedHours >= 12) {
-				var lastModifiedAmPm = 'PM'
-				if (lastModifiedHours > 12) {
-					var lastModifiedHours = lastModifiedHours - 12
-				}
-			} else {
-				var lastModifiedAmPm = 'AM'
-			}
-			var lastModifiedStr = lastModifiedMonth+'/'+
-								  lastModifiedDay+'/'+
-								  lastModifiedYear+', '+
-								  lastModifiedHours+':'+
-								  lastModifiedMinutes+':'+
-								  lastModifiedSeconds +' '+
-								  lastModifiedAmPm
-			return lastModifiedStr
-		},
-		htaccessFileRequested: function(filerequested) {
-			if (filerequested == 'index.html' ||
-				filerequested == 'index.htm' ||
-				filerequested == 'index' ||
-				filerequested == 'index.xhtm' ||
-				filerequested == 'index.xhtml' ||
-				filerequested == '') {
-				var filerequested = ''
-				return filerequested
-			} else {
-				return filerequested
-			}
-		},
-		relativePath: function(reqPath, curPath) {
-			var split1 = curPath.split('/')
-			var split2 = reqPath.split('/')
-			for (var w=0; w<split2.length; w++) {
-				if (split2[w] == '' || split2[w] == '.') {
-					// . means current directory. Leave this here for spacing
-				} else if (split2[w] == '..') {
-					if (split1.length > 0) {
-						var split1 = split1.splice(-1,1)
-					}
-				} else {
-					split1.push(split2[w])
-				}
-			}
-			var newPath = split1.join('/')
-			if (! newPath.startsWith('/')) {
-				var newPath = '/' + newPath
-			}
-			return newPath
-		},
-		stripOffFile: function(origpath) {
-			var fullrequestpath = origpath
-			var finpath = fullrequestpath.split('/').pop()
-			var finalpath = fullrequestpath.substring(0, fullrequestpath.length - finpath.length)
-			if (origpath == '/') {
-				return '/'
-			} else {
-				return finalpath
-			}
-			
-		}
-	}
+    WSC.utils = {
+        humanFileSize: function(bytes, si=false, dp=1) {
+                //from https://stackoverflow.com/questions/10420352/converting-file-size-in-bytes-to-human-readable-string/10420404
+                const thresh = si ? 1000 : 1024;
+                if (Math.abs(bytes) < thresh) {
+                  return bytes + ' B';
+                }
+                const units = si 
+                  ? ['kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'] 
+                  : ['KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];
+                let u = -1;
+                const r = 10**dp;
+                do {
+                  bytes /= thresh;
+                  ++u;
+                } while (Math.round(Math.abs(bytes) * r) / r >= thresh && u < units.length - 1);
+                return bytes.toFixed(dp) + ' ' + units[u];
+        },
+        lastModified: function(modificationTime) {
+            var lastModifiedMonth = modificationTime.getMonth() + 1
+            var lastModifiedDay = modificationTime.getDate()
+            var lastModifiedYear = modificationTime.getFullYear().toString().substring(2, 4)
+            var lastModifiedHours = modificationTime.getHours()
+            var lastModifiedMinutes = modificationTime.getMinutes()
+            var lastModifiedSeconds = modificationTime.getSeconds()
+            var lastModified = lastModifiedMonth+
+                               lastModifiedDay+
+                               lastModifiedYear+
+                               lastModifiedHours+
+                               lastModifiedMinutes+
+                               lastModifiedSeconds
+            return lastModified
+        },
+        lastModifiedStr: function(modificationTime) {
+            var lastModifiedMonth = modificationTime.getMonth() + 1
+            var lastModifiedDay = modificationTime.getDate()
+            var lastModifiedYear = modificationTime.getFullYear().toString().substring(2, 4)
+            var lastModifiedHours = modificationTime.getHours()
+            var lastModifiedMinutes = modificationTime.getMinutes()
+            var lastModifiedSeconds = modificationTime.getSeconds()
+            if (lastModifiedSeconds.toString().length != 2) {
+                var lastModifiedSeconds = '0' + lastModifiedSeconds
+            }
+            if (lastModifiedMinutes.toString().length != 2) {
+                var lastModifiedMinutes = '0' + lastModifiedMinutes
+            }
+            if (lastModifiedDay.toString().length != 2) {
+                var lastModifiedDay = '0' + lastModifiedDay
+            }
+            if (lastModifiedHours >= 12) {
+                var lastModifiedAmPm = 'PM'
+                if (lastModifiedHours > 12) {
+                    var lastModifiedHours = lastModifiedHours - 12
+                }
+            } else {
+                var lastModifiedAmPm = 'AM'
+            }
+            var lastModifiedStr = lastModifiedMonth+'/'+
+                                  lastModifiedDay+'/'+
+                                  lastModifiedYear+', '+
+                                  lastModifiedHours+':'+
+                                  lastModifiedMinutes+':'+
+                                  lastModifiedSeconds +' '+
+                                  lastModifiedAmPm
+            return lastModifiedStr
+        },
+        htaccessFileRequested: function(filerequested) {
+            if (filerequested == 'index.html' ||
+                filerequested == 'index.htm' ||
+                filerequested == 'index' ||
+                filerequested == 'index.xhtm' ||
+                filerequested == 'index.xhtml' ||
+                filerequested == '') {
+                var filerequested = ''
+                return filerequested
+            } else {
+                return filerequested
+            }
+        },
+        relativePath: function(reqPath, curPath) {
+            var split1 = curPath.split('/')
+            var split2 = reqPath.split('/')
+            for (var w=0; w<split2.length; w++) {
+                if (split2[w] == '' || split2[w] == '.') {
+                    // . means current directory. Leave this here for spacing
+                } else if (split2[w] == '..') {
+                    if (split1.length > 0) {
+                        var split1 = split1.splice(-1,1)
+                    }
+                } else {
+                    split1.push(split2[w])
+                }
+            }
+            var newPath = split1.join('/')
+            if (! newPath.startsWith('/')) {
+                var newPath = '/' + newPath
+            }
+            return newPath
+        },
+        stripOffFile: function(origpath) {
+            var fullrequestpath = origpath
+            var finpath = fullrequestpath.split('/').pop()
+            var finalpath = fullrequestpath.substring(0, fullrequestpath.length - finpath.length)
+            if (origpath == '/') {
+                return '/'
+            } else {
+                return finalpath
+            }
+            
+        }
+    }
 })();
diff --git a/webapp.js b/webapp.js
index a6f8745c..02a9e19a 100644
--- a/webapp.js
+++ b/webapp.js
@@ -82,10 +82,10 @@
                 break
             }
         },
-		updateLogging: function() {
-			window.logging = false
-			WSC.saveLogs()
-		},
+        updateLogging: function() {
+            window.logging = false
+            WSC.saveLogs()
+        },
         get_info: function() {
             return {
                 interfaces: this.interfaces,
@@ -192,8 +192,8 @@
             if (true || this.opts.optPreventSleep) {
                 if (WSC.VERBOSE)
                     console.log('trying release keep awake')
-				if (chrome.power)
-					chrome.power.releaseKeepAwake()
+                if (chrome.power)
+                    chrome.power.releaseKeepAwake()
             }
             // TODO: remove hidden.html ensureFirewallOpen
             // also - support multiple instances.
@@ -286,7 +286,7 @@
             this.stopped = false
             this.starting = true
             this.change()
-			WSC.saveLogs()
+            WSC.saveLogs()
 
             // need to setup some things
             if (this.interfaces.length == 0 && this.opts.optAllInterfaces) {
@@ -318,13 +318,13 @@
         onPortmapResult: function(result) {
             var gateway = this.upnp.validGateway
             console.log('portmap result',result,gateway)
-			if (result && ! result.error) {
-				if (gateway.device && gateway.device.externalIP) {
-					var extIP = gateway.device.externalIP
-					let prot = this.opts.optUseHttps ? 'https' : 'http';
-					this.extra_urls = [{url:prot+'://'+extIP+':' + this.port}]
-				}
-			}
+            if (result && ! result.error) {
+                if (gateway.device && gateway.device.externalIP) {
+                    var extIP = gateway.device.externalIP
+                    let prot = this.opts.optUseHttps ? 'https' : 'http';
+                    this.extra_urls = [{url:prot+'://'+extIP+':' + this.port}]
+                }
+            }
             this.onReady()
         },
         onReady: function() {
@@ -340,7 +340,7 @@
         },
         init_urls: function() {
             this.urls = [].concat(this.extra_urls)
-			let prot = this.opts.optUseHttps ? 'https' : 'http';
+            let prot = this.opts.optUseHttps ? 'https' : 'http';
             this.urls.push({url:prot+'://127.0.0.1:' + this.port})
             for (var i=0; i<this.interfaces.length; i++) {
                 var iface = this.interfaces[i]
@@ -367,14 +367,14 @@
                         this.sockInfo = m
                         this.port = m.localPort
                         callback({port:m.localPort})
-						return
+                        return
                     }
-					this.doTryListenOnPort(state, callback)
+                    this.doTryListenOnPort(state, callback)
                 }
             }.bind(this))
         },
         doTryListenOnPort: function(state, callback) {
-			var opts = this.opts.optBackground ? {name:"WSCListenSocket", persistent:true} : {}
+            var opts = this.opts.optBackground ? {name:"WSCListenSocket", persistent:true} : {}
             chrome.sockets.tcpServer.create(opts, this.onServerSocket.bind(this,state,callback))
         },
         onServerSocket: function(state,callback,sockInfo) {
@@ -504,14 +504,14 @@
             var filename = request.path.split('/').pop()
             if (filename == 'wsc.htaccess') {
                 if ((request.method == 'GET' && ! this.opts.optGETHtaccess) ||
-					(request.method == 'HEAD' && ! this.opts.optGETHtaccess) ||
+                    (request.method == 'HEAD' && ! this.opts.optGETHtaccess) ||
                     (request.method == 'PUT' && ! this.opts.optPUTPOSTHtaccess) ||
                     (request.method == 'POST' && ! this.opts.optPUTPOSTHtaccess) ||
                     (request.method == 'DELETE' && ! this.opts.optDELETEHtaccess)) {
-					var handler = new WSC.BaseHandler(request)
-					handler.app = this
-					handler.request = request
-					handler.error('<h1>400 - Bad Request</h1>', 400)
+                    var handler = new WSC.BaseHandler(request)
+                    handler.app = this
+                    handler.request = request
+                    handler.error('<h1>400 - Bad Request</h1>', 400)
                     return
                 }
             }
@@ -531,10 +531,10 @@
                 }
 
                 if (! validAuth) {
-					var handler = new WSC.BaseHandler(request)
-					handler.app = this
-					handler.request = request
-					handler.error("<h1>401 - Unauthorized</h1>", 401)
+                    var handler = new WSC.BaseHandler(request)
+                    handler.app = this
+                    handler.request = request
+                    handler.error("<h1>401 - Unauthorized</h1>", 401)
                     return
                 }
             }
@@ -614,62 +614,62 @@
             }
         },
         error: function(defaultMsg, httpCode) {
-			if (this.request.method == "HEAD") {
+            if (this.request.method == "HEAD") {
                 this.responseLength = 0
                 this.writeHeaders(httpCode)
                 this.finish()
-				return
+                return
             } else {
-				// We set the request.path to a .html file to override the mimetype of the requested file
-				this.setHeader('content-type','text/html; charset=utf-8')
-				if (this.app.opts['optCustom'+httpCode]) {
-					this.fs.getByPath(this.app.opts['optCustom'+httpCode+'location'], (file) => {
-						if (! file.error && file.isFile) {
-							file.file( function(file) {
-								var reader = new FileReader()
-								reader.onload = function(e) {
-									var data = e.target.result
-									if (httpCode == 404) {
-										if (this.app.opts.optCustom404usevar) {
-											if (this.app.opts.optCustom404usevarvar.replace(' ', '') != '') {
-												var data = '<script>var '+this.app.opts.optCustom404usevarvar+' = "'+this.request.uri+'";</script>\n' + data
-											} else {
-												this.write('javascript location variable is blank', 500)
-												this.finish()
-												return
-											}
-										}
-									}
-									if (httpCode == 401) {
-										this.setHeader("WWW-Authenticate", "Basic")
-									}
-									this.write(data, httpCode)
-									this.finish()
-								}.bind(this)
-								reader.readAsText(file)
-							}.bind(this))
-						} else {
-							if ([400,401,403,404].includes(httpCode)) {
-								this.write('Path of Custom '+httpCode+' html was not found. Custom '+httpCode+' is set to '+this.app.opts['optCustom'+httpCode+'location'], 500)
-								this.finish()
-							} else {
-								if (httpCode == 401) {
-									this.setHeader("WWW-Authenticate", "Basic")
-								}
-								this.write(defaultMsg, httpCode)
-								this.finish()
-							}
-						}
-					})
-				} else {
-					if (httpCode == 401) {
-						this.setHeader("WWW-Authenticate", "Basic")
-					}
-					this.write(defaultMsg, httpCode)
-					this.finish()
-				}
-			}
-		},
+                // We set the request.path to a .html file to override the mimetype of the requested file
+                this.setHeader('content-type','text/html; charset=utf-8')
+                if (this.app.opts['optCustom'+httpCode]) {
+                    this.fs.getByPath(this.app.opts['optCustom'+httpCode+'location'], (file) => {
+                        if (! file.error && file.isFile) {
+                            file.file( function(file) {
+                                var reader = new FileReader()
+                                reader.onload = function(e) {
+                                    var data = e.target.result
+                                    if (httpCode == 404) {
+                                        if (this.app.opts.optCustom404usevar) {
+                                            if (this.app.opts.optCustom404usevarvar.replace(' ', '') != '') {
+                                                var data = '<script>var '+this.app.opts.optCustom404usevarvar+' = "'+this.request.uri+'";</script>\n' + data
+                                            } else {
+                                                this.write('javascript location variable is blank', 500)
+                                                this.finish()
+                                                return
+                                            }
+                                        }
+                                    }
+                                    if (httpCode == 401) {
+                                        this.setHeader("WWW-Authenticate", "Basic")
+                                    }
+                                    this.write(data, httpCode)
+                                    this.finish()
+                                }.bind(this)
+                                reader.readAsText(file)
+                            }.bind(this))
+                        } else {
+                            if ([400,401,403,404].includes(httpCode)) {
+                                this.write('Path of Custom '+httpCode+' html was not found. Custom '+httpCode+' is set to '+this.app.opts['optCustom'+httpCode+'location'], 500)
+                                this.finish()
+                            } else {
+                                if (httpCode == 401) {
+                                    this.setHeader("WWW-Authenticate", "Basic")
+                                }
+                                this.write(defaultMsg, httpCode)
+                                this.finish()
+                            }
+                        }
+                    })
+                } else {
+                    if (httpCode == 401) {
+                        this.setHeader("WWW-Authenticate", "Basic")
+                    }
+                    this.write(defaultMsg, httpCode)
+                    this.finish()
+                }
+            }
+        },
         setCORS: function() {
             this.setHeader('access-control-allow-origin','*')
             this.setHeader('access-control-allow-methods','GET, POST, PUT, DELETE')
@@ -686,7 +686,7 @@
             return this.request.headers[k] || defaultvalue
         },
         setHeader: function(k,v) {
-			this.responseHeaders[k] = v
+            this.responseHeaders[k] = v
         },
         set_status: function(code) {
             console.assert(! this.headersWritten)
@@ -713,7 +713,7 @@
             }
 
             var p = this.request.path.split('.')
-			
+            
             if (p.length > 1 && ! this.isDirectoryListing && ! this.responseHeaders['content-type']) {
                 var ext = p[p.length-1].toLowerCase()
                 var type = WSC.MIMETYPES[ext]

From f7c7be350107abc3abe3d88ed126eeab0b0a1eaf Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Wed, 30 Jun 2021 11:02:38 -0500
Subject: [PATCH 121/154] Chunked Encoding

---
 handlers.js   | 31 ++++++++++++++++++-------------
 howTo/post.md | 30 +++++++++++++++++++++++-------
 webapp.js     |  7 +++++++
 3 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/handlers.js b/handlers.js
index 0886ec7f..2a0638e0 100644
--- a/handlers.js
+++ b/handlers.js
@@ -235,21 +235,26 @@
                                         file.file(function(file) {
                                             var reader = new FileReader()
                                             reader.onload = function(e) {
-                                                var contents = e.target.result.split('\r\n')
+                                                var contents = e.target.result.split('\n')
                                                 var validFile = false
                                                 for (var i=0; i<contents.length; i++) {
-                                                    if (contents[i].startsWith('\t')) {
-                                                        contents[i] = contents[i].substring(1, contents[i].length)
-                                                    }
-                                                    // check multiple times ?
-                                                    if (contents[i].startsWith('\t')) {
-                                                        contents[i] = contents[i].substring(1, contents[i].length)
-                                                    }
-                                                    if (contents[i].startsWith('postKey')) {
-                                                        var postkey = contents[i].split('=').pop().replace(' ', '').replace('"', '\'').replace('\'', '').replace('\'', '')
-                                                        if (postkey == data.key) {
-                                                            var validFile = true
-                                                            break
+                                                    if (contents[i].replaceAll) { // replaceAll requires chrome 85 or newer - But is more efficent
+                                                        contents[i] = contents[i].replaceAll('\t', '').replaceAll('\n', '')
+                                                        if (contents[i].startsWith('postKey')) {
+                                                            var postkey = contents[i].split('=').pop().replaceAll(' ', '').replaceAll('"', '\'').replaceAll('\'', '')
+                                                            if (postkey == data.key) {
+                                                                var validFile = true
+                                                                break
+                                                            }
+                                                        }
+                                                    } else {
+                                                        contents[i] = contents[i].replace('\t', ' ').replace('\t', ' ').replace('\t', ' ')
+                                                        if (contents[i].startsWith('postKey')) {
+                                                            var postkey = contents[i].split('=').pop().replace(' ', '').replace(' ', '').replace(' ', '').replace('"', '\'').replace('"', '\'').replace('"', '\'').replace('\'', '').replace('\'', '').replace('\'', '')
+                                                            if (postkey == data.key) {
+                                                                var validFile = true
+                                                                break
+                                                            }
                                                         }
                                                     }
                                                 }
diff --git a/howTo/post.md b/howTo/post.md
index f402bd56..64d1446e 100644
--- a/howTo/post.md
+++ b/howTo/post.md
@@ -7,10 +7,11 @@
 <br>
 <p>As a security feature, you must have the request path and a key programed in a wsc.htaccess file and in the js file.</p>
 <p>You do not need to have htaccess enabled, this does not enable htaccess. It is just easier to keep everything in 1 place</p>
+<p>It is recommended to have the log to file function on, so it is easier to see if something goes wrong</p>
 <br><br>
 <h2>Writing the htaccess file</h2>
 <p>The file needs to be in the same path as the requested file</p>
-<p>The file name should be wsc.htaccess (case sensitive)
+<p>The file name should be wsc.htaccess (case sensitive)</p>
 <p>Example:</p>
 
 ```
@@ -18,7 +19,7 @@
     {
         "type": "POSTkey",
         "request_path": "index.js",
-		"key": "wa4e76yhefy54t4a"
+        "key": "wa4e76yhefy54t4a"
     }
 ]
 ```
@@ -43,13 +44,13 @@ Indenting this line may cause for the server to not find this line and in result
 
 Example:
 ```
-res.contentType('text/plain')
-res.write('test')
-res.end()
+res.contentType('text/plain') // ALWAYS set the headers first
+res.write('test') // THEN send the data
+res.end() // THEN end the request
 ```
 res contains all the functions to respond, while req contains all the request information
 
-res Commands
+<h1>res Commands</h1>
 
 `res.end()`: function
 This function MUST be called at the end of the file. If called before finished processing, the server will cut off your script
@@ -94,8 +95,23 @@ callback: function will be excecuted to tell you if there was an error or it wil
 `res.httpCode(httpCode)`: function
 Call this to respond with no message. Dont forget to finish with `res.end()`
 
+<h2>Chunked encoding</h2>
 
-req Commands
+`res.writeChunk`: function
+
+Example:
+
+```
+res.setHeader('transfer-encoding','chunked')
+res.contentType('text/html; charset=utf-8')
+res.writeHeaders(200) // 
+res.writeChunk('This is Chunk number 1')
+res.writeChunk('\n\nAnd this is chunk number 2')
+res.writeChunk('\n\nAnd this is the last chunk')
+res.end() // VERY IMPORTANT (as always)
+```
+
+<h1>req Commands</h1>
 
 `req.body`: ArrayBuffer
 This is an array buffer of the request body, if there is no request body, the value will be null.
diff --git a/webapp.js b/webapp.js
index 02a9e19a..782a6168 100644
--- a/webapp.js
+++ b/webapp.js
@@ -754,6 +754,9 @@ Changes with nginx 0.7.9                                         12 Aug 2008
             this.request.connection.write(headerstr, callback)
         },
         writeChunk: function(data) {
+            if (typeof data == "string") {
+                data = new TextEncoder('utf-8').encode(data).buffer
+            }
             console.assert( data.byteLength !== undefined )
             var chunkheader = data.byteLength.toString(16) + '\r\n'
             //console.log('write chunk',[chunkheader])
@@ -789,6 +792,10 @@ Changes with nginx 0.7.9                                         12 Aug 2008
                 this.responseLength = 0
                 this.writeHeaders()
             }
+			if (this.responseHeaders['transfer-encoding'] == 'chunked') {
+                // chunked encoding needs this to work
+			    this.request.connection.write(WSC.str2ab('0\r\n\r\n'))
+			}
             if (this.beforefinish) { this.beforefinish() }
             this.request.connection.curRequest = null
             if (this.request.isKeepAlive() && ! this.request.connection.stream.remoteclosed) {

From e16515c1292e9dae48c1ea21c89fe5d7a4335cfb Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Wed, 30 Jun 2021 11:05:20 -0500
Subject: [PATCH 122/154] Forgot to fix this

---
 handlers.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/handlers.js b/handlers.js
index 2a0638e0..e987b545 100644
--- a/handlers.js
+++ b/handlers.js
@@ -239,7 +239,7 @@
                                                 var validFile = false
                                                 for (var i=0; i<contents.length; i++) {
                                                     if (contents[i].replaceAll) { // replaceAll requires chrome 85 or newer - But is more efficent
-                                                        contents[i] = contents[i].replaceAll('\t', '').replaceAll('\n', '')
+                                                        contents[i] = contents[i].replaceAll('\t', '').replaceAll('\n', '').replaceAll('\r', '')
                                                         if (contents[i].startsWith('postKey')) {
                                                             var postkey = contents[i].split('=').pop().replaceAll(' ', '').replaceAll('"', '\'').replaceAll('\'', '')
                                                             if (postkey == data.key) {
@@ -248,7 +248,7 @@
                                                             }
                                                         }
                                                     } else {
-                                                        contents[i] = contents[i].replace('\t', ' ').replace('\t', ' ').replace('\t', ' ')
+                                                        contents[i] = contents[i].replace('\t', ' ').replace('\t', ' ').replace('\t', ' ').replace('\r', '').replace('\r', '').replace('\r', '').replace('\n', '').replace('\n', '').replace('\n', '')
                                                         if (contents[i].startsWith('postKey')) {
                                                             var postkey = contents[i].split('=').pop().replace(' ', '').replace(' ', '').replace(' ', '').replace('"', '\'').replace('"', '\'').replace('"', '\'').replace('\'', '').replace('\'', '').replace('\'', '')
                                                             if (postkey == data.key) {

From 85c73e26b1c1ebd640e40e0d9f9b6577d48ef2ba Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Wed, 30 Jun 2021 11:11:56 -0500
Subject: [PATCH 123/154] Fix syntax/description

---
 howTo/post.md | 5 ++++-
 webapp.js     | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/howTo/post.md b/howTo/post.md
index 64d1446e..7cf9fc15 100644
--- a/howTo/post.md
+++ b/howTo/post.md
@@ -98,13 +98,16 @@ Call this to respond with no message. Dont forget to finish with `res.end()`
 <h2>Chunked encoding</h2>
 
 `res.writeChunk`: function
+This feature will send the data in chunks, instead of all at once.
+To enable, you must set the transfer-encoding header to chunked
+Like this: `res.setHeader('transfer-encoding','chunked')`
 
 Example:
 
 ```
 res.setHeader('transfer-encoding','chunked')
 res.contentType('text/html; charset=utf-8')
-res.writeHeaders(200) // 
+res.writeHeaders(200)
 res.writeChunk('This is Chunk number 1')
 res.writeChunk('\n\nAnd this is chunk number 2')
 res.writeChunk('\n\nAnd this is the last chunk')
diff --git a/webapp.js b/webapp.js
index 782a6168..7bfd6347 100644
--- a/webapp.js
+++ b/webapp.js
@@ -792,10 +792,10 @@ Changes with nginx 0.7.9                                         12 Aug 2008
                 this.responseLength = 0
                 this.writeHeaders()
             }
-			if (this.responseHeaders['transfer-encoding'] == 'chunked') {
+            if (this.responseHeaders['transfer-encoding'] == 'chunked') {
                 // chunked encoding needs this to work
-			    this.request.connection.write(WSC.str2ab('0\r\n\r\n'))
-			}
+                this.request.connection.write(WSC.str2ab('0\r\n\r\n'))
+            }
             if (this.beforefinish) { this.beforefinish() }
             this.request.connection.curRequest = null
             if (this.request.isKeepAlive() && ! this.request.connection.stream.remoteclosed) {

From 07268afd2877a48f58c80171c77c15604cc5feba Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Wed, 30 Jun 2021 17:51:54 -0500
Subject: [PATCH 124/154] Bug fix

---
 log-full.js          | 16 ++--------------
 react-ui/js/index.js |  2 ++
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/log-full.js b/log-full.js
index 4ae5baba..6c45bce9 100644
--- a/log-full.js
+++ b/log-full.js
@@ -106,11 +106,7 @@
                                                 folder.getFile(filename, {create:true}, function(entry) {
                                                     if (entry && entry.isFile) {
                                                         entry.createWriter(function(writer) {
-                                                            writer.onwrite = writer.onerror = function() {
-                                                                if (WSC.DEBUG) {
-                                                                    console.log('saved logs to ' + saveTo)
-                                                                }
-                                                            }
+                                                            writer.onwrite = writer.onerror = function() { }
                                                             writer.write(new Blob([data]))
                                                         })
                                                     }
@@ -146,11 +142,7 @@
                                 folder.getFile(filename, {create:true}, function(entry) {
                                     if (entry && entry.isFile) {
                                         entry.createWriter(function(writer) {
-                                            writer.onwrite = writer.onerror = function() {
-                                                if (WSC.DEBUG) {
-                                                    console.log('saved logs to ' + saveTo)
-                                                }
-                                            }
+                                            writer.onwrite = writer.onerror = function() { }
                                             writer.write(new Blob([data]))
                                         })
                                     }
@@ -159,10 +151,6 @@
                             
                         }
                     }, true)
-                } else {
-                    if (WSC.DEBUG) {
-                        console.log('no logs to save!')
-                    }
                 }
             }
         }
diff --git a/react-ui/js/index.js b/react-ui/js/index.js
index 88ec8d2a..e858b1e1 100644
--- a/react-ui/js/index.js
+++ b/react-ui/js/index.js
@@ -125,6 +125,7 @@ const functions = {
   },
   optSaveLogsFilename: (app, k, val) => {
     console.assert(typeof val === 'string')
+    app.webapp.updateLogging()
     app.webapp.updateOption('optSaveLogsFilename', val);
   },
   optSaveLogs: (app, k, val) => {
@@ -133,6 +134,7 @@ const functions = {
   },
   optSaveLogsInterval: (app, k, val) => {
     console.assert(typeof val === 'string')
+    app.webapp.updateLogging()
     app.webapp.updateOption('optSaveLogsInterval', val);
   },
   optPrivateKey: (app, k, val) => {

From 60e3602474a455faad5abf6a8d1b235e941c9d25 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Tue, 6 Jul 2021 12:43:14 -0500
Subject: [PATCH 125/154] Added security for server side post and get requests,
 added older devices support, added server side GET request feature.

---
 handlers.js       | 465 +++++++++++++++++++++++++---------------------
 howTo/HTACCESS.md |  23 ++-
 howTo/post.md     |  17 ++
 utils.js          |  15 ++
 4 files changed, 309 insertions(+), 211 deletions(-)

diff --git a/handlers.js b/handlers.js
index e987b545..1bd85d30 100644
--- a/handlers.js
+++ b/handlers.js
@@ -133,6 +133,11 @@
                                         this.htaccessError.bind(this)('missing request path')
                                         return
                                     }
+                                    if ((origdata[i].request_path == filerequested && origdata[i].type == 'POSTkey') ||
+                                        (origdata[i].request_path == filerequested && origdata[i].type == 'serverSideJavaScript')) {
+                                        this.error('bad request', 403)
+                                        return
+                                    }
                                     if ((origdata[i].type == allow && origdata[i].request_path == filerequested) ||
                                         (origdata[i].type == allow && origdata[i].request_path == 'all files') ||
                                         (origdata[i].type == deny && origdata[i].request_path == filerequested) ||
@@ -238,30 +243,20 @@
                                                 var contents = e.target.result.split('\n')
                                                 var validFile = false
                                                 for (var i=0; i<contents.length; i++) {
-                                                    if (contents[i].replaceAll) { // replaceAll requires chrome 85 or newer - But is more efficent
-                                                        contents[i] = contents[i].replaceAll('\t', '').replaceAll('\n', '').replaceAll('\r', '')
-                                                        if (contents[i].startsWith('postKey')) {
-                                                            var postkey = contents[i].split('=').pop().replaceAll(' ', '').replaceAll('"', '\'').replaceAll('\'', '')
-                                                            if (postkey == data.key) {
-                                                                var validFile = true
-                                                                break
-                                                            }
-                                                        }
-                                                    } else {
-                                                        contents[i] = contents[i].replace('\t', ' ').replace('\t', ' ').replace('\t', ' ').replace('\r', '').replace('\r', '').replace('\r', '').replace('\n', '').replace('\n', '').replace('\n', '')
-                                                        if (contents[i].startsWith('postKey')) {
-                                                            var postkey = contents[i].split('=').pop().replace(' ', '').replace(' ', '').replace(' ', '').replace('"', '\'').replace('"', '\'').replace('"', '\'').replace('\'', '').replace('\'', '').replace('\'', '')
-                                                            if (postkey == data.key) {
-                                                                var validFile = true
-                                                                break
-                                                            }
+                                                    contents[i] = contents[i].replaceAll('\t', '').replaceAll('\n', '').replaceAll('\r', '')
+                                                    if (contents[i].startsWith('postKey')) {
+                                                        var postkey = contents[i].split('=').pop().replaceAll(' ', '').replaceAll('"', '').replaceAll('\'', '')
+                                                        if (postkey == data.key) {
+                                                            var validFile = true
+                                                            break
                                                         }
                                                     }
                                                 }
                                                 if (validFile) {
                                                     window.req = this.request
                                                     window.res = this
-                                                    this.postRequestID = Math.round(Math.random()*100)
+                                                    window.httpRequest = WSC.ChromeSocketXMLHttpRequest
+                                                    this.postRequestID = Math.random().toString()
                                                     res.end = function() {
                                                         // We need to cleanup - Which is why we don't want the user to directly call res.finish()
                                                         if (document.getElementById('tempPOSThandler' + this.postRequestID)) {
@@ -270,6 +265,7 @@
                                                         delete this.postRequest
                                                         delete window.res
                                                         delete window.req
+                                                        delete window.httpRequest
                                                         if (window.postKey) {
                                                             delete window.postKey
                                                         }
@@ -291,13 +287,13 @@
                                     }
                                 }.bind(this))
                             } else {
-                            this.put()
+                                this.write('file not found', 404)
                             }
                         }.bind(this)
                         reader.readAsText(file)
                     }.bind(this))
                 } else {
-                    this.put()
+                    this.write('file not found', 404)
                 }
             }.bind(this))
         },
@@ -633,7 +629,8 @@
                                             origdata[i].type != 401 &&
                                             origdata[i].type != 'directory listing' &&
                                             origdata[i].type != 'additional header' &&
-                                            origdata[i].type != 'send directory contents') {
+                                            origdata[i].type != 'send directory contents' &&
+                                            origdata[i].type != 'POSTkey') {
                                                 var data = origdata[i]
                                                 //console.log(data)
                                                 var filefound = true
@@ -690,222 +687,273 @@
 
                                                 this.getDirContents(entry, finished.bind(this))
 
-                                                } else if (data.type == 'send directory contents') {
-                                                    if (! data.dir_to_send || data.dir_to_send.replace(' ', '') == '') {
-                                                        data.dir_to_send = './'
-                                                    }
-                                                    function finished(results) {
-                                                        var fullrequestpath = this.request.origpath
-                                                        var finpath = fullrequestpath.split('/').pop();
-                                                        var finalpath = fullrequestpath.substring(0, fullrequestpath.length - finpath.length) + data.original_request_path
-                                                        //console.log(filepath)
-                                                        this.fs.getByPath(finalpath, (file) => {
-                                                            if (! file.error && file.isFile) {
-                                                                file.file( function(file) {
-                                                                    var reader = new FileReader();
-                                                                    reader.onload = function(e){
-                                                                        function finish() {
-                                                                            var data = html.join('\n')
-                                                                            this.setHeader('content-type','text/html; charset=utf-8')
-                                                                            this.write(data, 200)
-                                                                            this.finish()
-                                                                        }
-                                                                        function sendFile() {
-                                                                            results[i].getMetadata(function(filee) {
-                                                                                var rawname = results[i].name
-                                                                                var name = encodeURIComponent(results[i].name)
-                                                                                var isdirectory = results[i].isDirectory
-                                                                                var filesize = filee.size
-                                                                                var modified = WSC.utils.lastModified(filee.modificationTime)
-                                                                                var filesizestr = WSC.utils.humanFileSize(filee.size)
-                                                                                var modifiedstr = WSC.utils.lastModifiedStr(filee.modificationTime)
-                                                                                if (rawname != 'wsc.htaccess') {
-                                                                                    html.push('<script>addRow("'+rawname+'", "'+name+'", '+isdirectory+', '+filesize+', "'+filesizestr+'", '+modified+', "'+modifiedstr+'")</script>')
-                                                                                }
-                                                                                if (i != results.length - 1) {
-                                                                                    i++
-                                                                                    sendFile.bind(this, results)()
-                                                                                } else {
-                                                                                    finish.bind(this, results)()
-                                                                                }
-                                                                            }.bind(this), function(error) {
-                                                                                console.error('error reading metadata '+error)
-                                                                                if (i != results.length - 1) {
-                                                                                    i++
-                                                                                    sendFileList.bind(this, results)()
-                                                                                } else {
-                                                                                    DirRenderFinish.bind(this, results)()
-                                                                                }
-                                                                            }.bind(this))
-                                                                        }
-                                                                        var html = [e.target.result]
-                                                                        var i = 0
-                                                                        sendFile.bind(this, results)()
-                                                                    }.bind(this)
-                                                                    reader.readAsText(file)
-                                                                }.bind(this))
-                                                            } else {
-                                                                this.write('An unexpected error occured. Please check your wsc.htaccess file for any configuration errors.\nPlease remember, the send directory listing feature CANNOT use "all files", you must specify each file separately.\nPlease check your settings. If everything seems to be in place, please report an issue on github.\n\nhttps://github.com/kzahel/web-server-chrome\n\nPlease copy and paste the following information.\n\n\nfilepath: '+filepath+'\nrequestURI: '+this.request.uri+'\nrequested file (according to htaccess): '+data.original_request_path+'\nrequested file (according to requestURI): '+data.filerequested, 500)
-                                                                this.finish()
-                                                            }
-                                                        })
-                                                    }
-                                                    var path2Send = data.dir_to_send
+                                            } else if (data.type == 'send directory contents') {
+                                                if (! data.dir_to_send || data.dir_to_send.replace(' ', '') == '') {
+                                                    data.dir_to_send = './'
+                                                }
+                                                function finished(results) {
                                                     var fullrequestpath = this.request.origpath
                                                     var finpath = fullrequestpath.split('/').pop();
-                                                    var finalpath = fullrequestpath.substring(0, fullrequestpath.length - finpath.length);
-                                                    if (this.request.path == '') {
-                                                        var finalpath = '/'
-                                                    }
-                                                    var split1 = finalpath.split('/')
-                                                    var split2 = path2Send.split('/')
-                                                    
-                                                    if (! path2Send.startsWith('/')) {
-                                                        for (var w=0; w<split2.length; w++) {
-                                                            if (split2[w] == '' || split2[w] == '.') {
-                                                                // . means current directory. Leave this here for spacing
-                                                            } else if (split2[w] == '..') {
-                                                                if (split1.length > 0) {
-                                                                    var split1 = split1.splice(-1,1)
-                                                                }
-                                                            } else {
-                                                                split1.push(split2[w])
-                                                            }
-                                                        }
-                                                        var path2Send = split1.join('/')
-                                                        if (! path2Send.startsWith('/')) {
-                                                            var path2Send = '/' + path2Send
+                                                    var finalpath = fullrequestpath.substring(0, fullrequestpath.length - finpath.length) + data.original_request_path
+                                                    //console.log(filepath)
+                                                    this.fs.getByPath(finalpath, (file) => {
+                                                        if (! file.error && file.isFile) {
+                                                            file.file( function(file) {
+                                                                var reader = new FileReader();
+                                                                reader.onload = function(e){
+                                                                    function finish() {
+                                                                        var data = html.join('\n')
+                                                                        this.setHeader('content-type','text/html; charset=utf-8')
+                                                                        this.write(data, 200)
+                                                                        this.finish()
+                                                                    }
+                                                                    function sendFile() {
+                                                                        results[i].getMetadata(function(filee) {
+                                                                            var rawname = results[i].name
+                                                                            var name = encodeURIComponent(results[i].name)
+                                                                            var isdirectory = results[i].isDirectory
+                                                                            var filesize = filee.size
+                                                                            var modified = WSC.utils.lastModified(filee.modificationTime)
+                                                                            var filesizestr = WSC.utils.humanFileSize(filee.size)
+                                                                            var modifiedstr = WSC.utils.lastModifiedStr(filee.modificationTime)
+                                                                            if (rawname != 'wsc.htaccess') {
+                                                                                html.push('<script>addRow("'+rawname+'", "'+name+'", '+isdirectory+', '+filesize+', "'+filesizestr+'", '+modified+', "'+modifiedstr+'")</script>')
+                                                                            }
+                                                                            if (i != results.length - 1) {
+                                                                                i++
+                                                                                sendFile.bind(this, results)()
+                                                                            } else {
+                                                                                finish.bind(this, results)()
+                                                                            }
+                                                                        }.bind(this), function(error) {
+                                                                            console.error('error reading metadata '+error)
+                                                                            if (i != results.length - 1) {
+                                                                                i++
+                                                                                sendFileList.bind(this, results)()
+                                                                            } else {
+                                                                                DirRenderFinish.bind(this, results)()
+                                                                            }
+                                                                        }.bind(this))
+                                                                    }
+                                                                    var html = [e.target.result]
+                                                                    var i = 0
+                                                                    sendFile.bind(this, results)()
+                                                                }.bind(this)
+                                                                reader.readAsText(file)
+                                                            }.bind(this))
+                                                        } else {
+                                                            this.write('An unexpected error occured. Please check your wsc.htaccess file for any configuration errors.\nPlease remember, the send directory listing feature CANNOT use "all files", you must specify each file separately.\nPlease check your settings. If everything seems to be in place, please report an issue on github.\n\nhttps://github.com/kzahel/web-server-chrome\n\nPlease copy and paste the following information.\n\n\nfilepath: '+filepath+'\nrequestURI: '+this.request.uri+'\nrequested file (according to htaccess): '+data.original_request_path+'\nrequested file (according to requestURI): '+data.filerequested, 500)
+                                                            this.finish()
                                                         }
-                                                    }
-                                                    
-                                                    //console.log(finalpath)
-                                                    //console.log(data)
-                                                    this.fs.getByPath(path2Send, function(entryy) {
-                                                        if (! entry.error) {
-                                                            this.getDirContents(entryy, finished.bind(this))
+                                                    })
+                                                }
+                                                var path2Send = data.dir_to_send
+                                                var fullrequestpath = this.request.origpath
+                                                var finpath = fullrequestpath.split('/').pop();
+                                                var finalpath = fullrequestpath.substring(0, fullrequestpath.length - finpath.length);
+                                                if (this.request.path == '') {
+                                                    var finalpath = '/'
+                                                }
+                                                var split1 = finalpath.split('/')
+                                                var split2 = path2Send.split('/')
+                                                
+                                                if (! path2Send.startsWith('/')) {
+                                                    for (var w=0; w<split2.length; w++) {
+                                                        if (split2[w] == '' || split2[w] == '.') {
+                                                            // . means current directory. Leave this here for spacing
+                                                        } else if (split2[w] == '..') {
+                                                            if (split1.length > 0) {
+                                                                var split1 = split1.splice(-1,1)
+                                                            }
                                                         } else {
-                                                            this.htaccessError.bind(this)('invalid path to send dir contents')
+                                                            split1.push(split2[w])
                                                         }
-                                                    }.bind(this))
-                                                } else if (data.type == 'versioning') {
-                                                    //console.log('versioning')
-                                                    if (! data.version_data || data.version_data.length == 0) {
-                                                        this.htaccessError.bind(this)('missing version data')
-                                                        return
                                                     }
-                                                    if (! data.variable) {
-                                                        this.htaccessError.bind(this)('missing variable')
-                                                        return
-                                                    }
-                                                    if (! data.default) {
-                                                        this.htaccessError.bind(this)('missing default file selection')
-                                                        return
-                                                    }
-                                                    var versionData = data.version_data
-                                                    var vdata4 = this.request.arguments[data.variable]
-                                                    if ( ! versionData[vdata4]) {
-                                                        vdata4 = data.default
+                                                    var path2Send = split1.join('/')
+                                                    if (! path2Send.startsWith('/')) {
+                                                        var path2Send = '/' + path2Send
                                                     }
-                                                    var vdataa = versionData[vdata4]
-                                                    var fullrequestpath = this.request.origpath
-                                                    var finpath = fullrequestpath.split('/').pop();
-                                                    var finalpath = fullrequestpath.substring(0, fullrequestpath.length - finpath.length);
-                                                    if (this.request.path == '') {
-                                                        var finalpath = '/'
+                                                }
+                                                
+                                                //console.log(finalpath)
+                                                //console.log(data)
+                                                this.fs.getByPath(path2Send, function(entryy) {
+                                                    if (! entry.error) {
+                                                        this.getDirContents(entryy, finished.bind(this))
+                                                    } else {
+                                                        this.htaccessError.bind(this)('invalid path to send dir contents')
                                                     }
-                                                    var split1 = finalpath.split('/')
-                                                    var split2 = vdataa.split('/')
-                                                    if (! vdataa.startsWith('/')) {
-                                                        for (var w=0; w<split2.length; w++) {
-                                                            if (split2[w] == '' || split2[w] == '.') {
-                                                                // . means current directory. Leave this here for spacing
-                                                            } else if (split2[w] == '..') {
-                                                                if (split1.length > 0) {
-                                                                    var split1 = split1.splice(-1,1)
-                                                                }
-                                                            } else {
-                                                                split1.push(split2[w])
+                                                }.bind(this))
+                                            } else if (data.type == 'versioning') {
+                                                //console.log('versioning')
+                                                if (! data.version_data || data.version_data.length == 0) {
+                                                    this.htaccessError.bind(this)('missing version data')
+                                                    return
+                                                }
+                                                if (! data.variable) {
+                                                    this.htaccessError.bind(this)('missing variable')
+                                                    return
+                                                }
+                                                if (! data.default) {
+                                                    this.htaccessError.bind(this)('missing default file selection')
+                                                    return
+                                                }
+                                                var versionData = data.version_data
+                                                var vdata4 = this.request.arguments[data.variable]
+                                                if ( ! versionData[vdata4]) {
+                                                    vdata4 = data.default
+                                                }
+                                                var vdataa = versionData[vdata4]
+                                                var fullrequestpath = this.request.origpath
+                                                var finpath = fullrequestpath.split('/').pop();
+                                                var finalpath = fullrequestpath.substring(0, fullrequestpath.length - finpath.length);
+                                                if (this.request.path == '') {
+                                                    var finalpath = '/'
+                                                }
+                                                var split1 = finalpath.split('/')
+                                                var split2 = vdataa.split('/')
+                                                if (! vdataa.startsWith('/')) {
+                                                    for (var w=0; w<split2.length; w++) {
+                                                        if (split2[w] == '' || split2[w] == '.') {
+                                                            // . means current directory. Leave this here for spacing
+                                                        } else if (split2[w] == '..') {
+                                                            if (split1.length > 0) {
+                                                                var split1 = split1.splice(-1,1)
                                                             }
+                                                        } else {
+                                                            split1.push(split2[w])
                                                         }
-                                                        var vdataa = split1.join('/')
-                                                        if (! vdataa.startsWith('/')) {
-                                                            var vdataa = '/' + vdataa
-                                                        }
-                                                        //console.log(vdataa)
+                                                    }
+                                                    var vdataa = split1.join('/')
+                                                    if (! vdataa.startsWith('/')) {
+                                                        var vdataa = '/' + vdataa
                                                     }
                                                     //console.log(vdataa)
-                                                    this.fs.getByPath(vdataa, function(file) {
-                                                        if (file && ! file.error) {
-                                                            this.request.path = vdataa
-                                                            if (file.isFile) {
+                                                }
+                                                //console.log(vdataa)
+                                                this.fs.getByPath(vdataa, function(file) {
+                                                    if (file && ! file.error) {
+                                                        this.request.path = vdataa
+                                                        if (file.isFile) {
+                                                            this.request.origpath = vdataa
+                                                            this.request.uri = vdataa
+                                                        } else {
+                                                            if (vdataa.endsWith("/")) {
                                                                 this.request.origpath = vdataa
                                                                 this.request.uri = vdataa
                                                             } else {
-                                                                if (vdataa.endsWith("/")) {
-                                                                    this.request.origpath = vdataa
-                                                                    this.request.uri = vdataa
-                                                                } else {
-                                                                    this.request.origpath = vdataa+'/'
-                                                                    this.request.uri = vdataa+'/'
-                                                                }
+                                                                this.request.origpath = vdataa+'/'
+                                                                this.request.uri = vdataa+'/'
                                                             }
-                                                            this.request.isVersioning = true
-                                                            this.onEntry(file)
-                                                        } else {
-                                                            this.write('path in htaccess file for version '+vdata4+' is missing or the file does not exist. Please check to make sure you have properly inputed the value', 500)
                                                         }
-                                                    }.bind(this))
-                                                } else {
-                                                    excludedothtmlcheck.bind(this)()
+                                                        this.request.isVersioning = true
+                                                        this.onEntry(file)
+                                                    } else {
+                                                        this.write('path in htaccess file for version '+vdata4+' is missing or the file does not exist. Please check to make sure you have properly inputed the value', 500)
+                                                    }
+                                                }.bind(this))
+                                            } else if (data.type == 'serverSideJavaScript') {
+                                                if (! data.key) {
+                                                    this.htaccessError.bind(this)('missing key')
+                                                    return
                                                 }
+                                                this.fs.getByPath(this.request.path, function(file) {
+                                                    if (file && ! file.error) {
+                                                        file.file(function(file) {
+                                                            var reader = new FileReader()
+                                                            reader.onload = function(e) {
+                                                                var contents = e.target.result.split('\n')
+                                                                var validFile = false
+                                                                for (var i=0; i<contents.length; i++) {
+                                                                    contents[i] = contents[i].replaceAll('\t', '').replaceAll('\n', '').replaceAll('\r', '')
+                                                                    if (contents[i].startsWith('SSJSKey')) {
+                                                                        var SSJSKey = contents[i].split('=').pop().replaceAll(' ', '').replaceAll('"', '').replaceAll('\'', '')
+                                                                        if (SSJSKey == data.key) {
+                                                                            var validFile = true
+                                                                            break
+                                                                        }
+                                                                    }
+                                                                }
+                                                                if (validFile) {
+                                                                    window.req = this.request
+                                                                    window.res = this
+                                                                    window.httpRequest = WSC.ChromeSocketXMLHttpRequest
+                                                                    this.getRequestID = Math.random().toString()
+                                                                    res.end = function() {
+                                                                        // We need to cleanup - Which is why we don't want the user to directly call res.finish()
+                                                                        if (document.getElementById('tempGEThandler' + this.getRequestID)) {
+                                                                            document.getElementById('tempGEThandler' + this.getRequestID).remove()
+                                                                        }
+                                                                        delete this.getRequest
+                                                                        delete window.res
+                                                                        delete window.req
+                                                                        delete window.httpRequest
+                                                                        if (window.SSJSKey) {
+                                                                            delete window.SSJSKey
+                                                                        }
+                                                                        this.finish()
+                                                                    }
+                                                                    var blob = new Blob([file], {type : 'text/javascript'})
+                                                                    this.getRequest = document.createElement("script")
+                                                                    this.getRequest.src = URL.createObjectURL(blob)
+                                                                    this.getRequest.id = 'tempGEThandler' + this.getRequestID
+                                                                    document.body.appendChild(this.getRequest)
+                                                                } else {
+                                                                    this.write('Keys do not match', 403)
+                                                                }
+                                                            }.bind(this)
+                                                            reader.readAsText(file)
+                                                        }.bind(this))
+                                                    } else {
+                                                        this.write('file not found', 404)
+                                                    }
+                                                }.bind(this))
                                             } else {
                                                 excludedothtmlcheck.bind(this)()
                                             }
+                                        } else {
+                                            excludedothtmlcheck.bind(this)()
                                         }
-                                        //console.log(htaccessHeaders)
-                                        if (additionalHeaders) {
-                                            for (var i=0; i<htaccessHeaders.length; i++) {
-                                                this.setHeader(htaccessHeaders[i].headerType, htaccessHeaders[i].headerValue)
-                                            }
+                                    }
+                                    //console.log(htaccessHeaders)
+                                    if (additionalHeaders) {
+                                        for (var i=0; i<htaccessHeaders.length; i++) {
+                                            this.setHeader(htaccessHeaders[i].headerType, htaccessHeaders[i].headerValue)
                                         }
-                                        if (auth && authdata.type == 401) {
-                                             if (! authdata.username) {
-                                                 this.htaccessError.bind(this)('missing Auth Username')
-                                                 return
-                                             }
-                                             if (! authdata.password) {
-                                                 this.htaccessError.bind(this)('missing Auth Password')
-                                                 return
-                                             }
-                                                var validAuth = false
-                                                var auth = this.request.headers['authorization']
-                                                if (auth) {
-                                                    if (auth.slice(0,6).toLowerCase() == 'basic ') {
-                                                        var userpass = atob(auth.slice(6,auth.length)).split(':')
-                                                        if (userpass[0] == authdata.username && userpass[1] == authdata.password) {
-                                                            validAuth = true
-                                                        }
+                                    }
+                                    if (auth && authdata.type == 401) {
+                                         if (! authdata.username) {
+                                             this.htaccessError.bind(this)('missing Auth Username')
+                                             return
+                                         }
+                                         if (! authdata.password) {
+                                             this.htaccessError.bind(this)('missing Auth Password')
+                                             return
+                                         }
+                                            var validAuth = false
+                                            var auth = this.request.headers['authorization']
+                                            if (auth) {
+                                                if (auth.slice(0,6).toLowerCase() == 'basic ') {
+                                                    var userpass = atob(auth.slice(6,auth.length)).split(':')
+                                                    if (userpass[0] == authdata.username && userpass[1] == authdata.password) {
+                                                        validAuth = true
                                                     }
                                                 }
-                                                if (! validAuth) {
-                                                    this.error("<h1>401 - Unauthorized</h1>", 401)
-                                                }
-                                                if (validAuth) {
-                                                    htaccessCheck2.bind(this)()
-                                                }
-                                            } else {
+                                            }
+                                            if (! validAuth) {
+                                                this.error("<h1>401 - Unauthorized</h1>", 401)
+                                            }
+                                            if (validAuth) {
                                                 htaccessCheck2.bind(this)()
                                             }
+                                    } else {
+                                        htaccessCheck2.bind(this)()
+                                    }
                                 }
                                 var filerequest = this.request.origpath
 
                                 if (this.app.opts.optExcludeDotHtml) {
-                                    if (this.app.opts.optExcludeDotHtm) {
-                                        var htmHtml = '.htm'
-                                    } else {
-                                        var htmHtml = '.html'
-                                    }
-                                    var htmHtml = this.app.opts.optExcludeDotHtm ? '.htm' : 'html'
+                                    var htmHtml = this.app.opts.optExcludeDotHtm ? '.htm' : '.html'
                                     this.fs.getByPath(this.request.path+htmHtml, (file) => {
                                         if (! file.error) {
                                             if (this.request.origpath.endsWith("/")) {
@@ -931,7 +979,7 @@
                                             var filerequested = WSC.utils.htaccessFileRequested(filerequested)
                                                 htaccessMain.bind(this)(filerequested)
                                                 return
-                                            }
+                                        }
                                     })
                                 } else {
                                     if (this.entry && this.entry.isDirectory && ! this.request.origpath.endsWith('/')) {
@@ -947,8 +995,7 @@
                                     var filerequested = WSC.utils.htaccessFileRequested(filerequested)
                                     htaccessMain.bind(this)(filerequested)
                                     return
-                                    }
-
+                                }
                             }.bind(this)
                             reader.readAsText(filee)
                         }.bind(this))
diff --git a/howTo/HTACCESS.md b/howTo/HTACCESS.md
index 3e407764..5dcc780d 100644
--- a/howTo/HTACCESS.md
+++ b/howTo/HTACCESS.md
@@ -21,6 +21,7 @@
 <p>send directory contents - Will send the current directory at the end of the file. See the How To for a more advanced description</p>
 <p>additional header - Will set an additional header</p>
 <p>Versioning - relative file hosting</p>
+<p>serverSideJavaScript - Just what it sounds like</p>
 <p>If you want more features - Make an issue!</p>
 <br>
 <h1>Extra Features</h1>
@@ -181,7 +182,7 @@ To use option for all files, the value of request path will be 'all files' It sh
         "request_path": "name of file you want to modify",
         "type": "versioning",
         "default": 4,
-		"variable": "v",
+        "variable": "v",
         "version_data": {"1": "Path to file",
                          "2": "Path to file",
                          "3": "Path to file",
@@ -249,7 +250,7 @@ The end result will be
     {
         "request_path": "name of file you want to modify",
         "type": "send directory contents"
-	"dir_to_send": "../somepath/"
+        "dir_to_send": "../somepath/"
     }
 ]
 ```
@@ -275,6 +276,24 @@ This feature CANNOT use the `all files` value for the `request_path` field. You
 `sizestr`: File size (As a string) Example: `248.1 KiB`
 `date`: Date not in a string format. Example: `142132146`
 `datestr`: Date as a string. Example: `3/11/21, 3:21:46 AM`
+<br>
+<h2>serverSideJavaScript</h2>
+<p>Allows you to process and respond as you wish</p>
+<p>Example:</p>
+
+```
+[
+    {
+        "request_path": "name of file you want to modify",
+        "type": "serverSideJavaScript"
+        "key": "ATonOfRaNdOmNumbersAndLetters"
+    }
+]
+```
+<p>Please refer to the <a href='post.md'>Post Handler</a> To learn how to respond.</p>
+
+The only difference is - DO NOT declare the type as postKey in the htaccess file and instead of using `postKey = 'wa4e76yhefy54t4a'` use `SSJSKey = 'wa4e76yhefy54t4a'`
+
 <br>
 <h1>How to use more than 1 ruleset per file</h1>
 <p>Pay VERY close attention to the syntax. One thing wrong will cause an error!!</p>
diff --git a/howTo/post.md b/howTo/post.md
index 7cf9fc15..95c83b4e 100644
--- a/howTo/post.md
+++ b/howTo/post.md
@@ -6,8 +6,10 @@
 <p>Perform a post request towards a js file, This js file will be checked for a key (Security) and with the correct key, the document will temporarily append the script and will execute the requested script</h2>
 <br>
 <p>As a security feature, you must have the request path and a key programed in a wsc.htaccess file and in the js file.</p>
+<p>The file name does not need to end with .js  The extension can be anything you want as the extension does not matter and will not be checked</p>
 <p>You do not need to have htaccess enabled, this does not enable htaccess. It is just easier to keep everything in 1 place</p>
 <p>It is recommended to have the log to file function on, so it is easier to see if something goes wrong</p>
+<p>WHILE IT IS NOT REQUIRED - IT IS VERY HIGHLY RECOMENDED TO TURN ON THE HTACCESS FEATURE - AS IT WILL BLOCK USERS FROM PERFORMING A GET REQUEST TOWARDS THE FILE</p>
 <br><br>
 <h2>Writing the htaccess file</h2>
 <p>The file needs to be in the same path as the requested file</p>
@@ -137,3 +139,18 @@ This contains the requested file (Will end with / if is directory)
 
 `req.path`: string
 This contains the requested file. (Will NOT end with / if is directory)
+
+
+<h1>Another Useful Tool</h1>
+
+`httpRequest`: constructor
+This will open a http request as if you opened a new tab and went to the website
+Please note: https it not supported
+
+`var request = new httpRequest`
+To set a header: `request.setRequestHeader(headerType, headerValue)`
+To open the request: `request.open("GET", url)`
+Set the onload function: `request.onload = function(e) { }`
+Send the request: `request.send()`
+
+To send data, you can use: `request.send(data)`
diff --git a/utils.js b/utils.js
index 8946fe06..59b074ab 100644
--- a/utils.js
+++ b/utils.js
@@ -1,4 +1,19 @@
 (function() {
+    // We can add more if we need
+    if (String.prototype.replaceAll === undefined) {
+        String.prototype.replaceAll = function(a, b) {
+            return this.split(a).join(b)
+        }
+    }
+    if (String.prototype.startsWith === undefined) {
+        String.prototype.startsWith = function(a) {
+            if (this.substring(0, a.length) == a) {
+                return true
+            } else {
+                return false
+            }
+        }
+    }
     WSC.utils = {
         humanFileSize: function(bytes, si=false, dp=1) {
                 //from https://stackoverflow.com/questions/10420352/converting-file-size-in-bytes-to-human-readable-string/10420404

From 606a9fdce28e831a0afad3b35d4eb90d8476aeac Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Tue, 6 Jul 2021 12:46:55 -0500
Subject: [PATCH 126/154] Forgot that this.error function existed

---
 handlers.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/handlers.js b/handlers.js
index 1bd85d30..15dc0afc 100644
--- a/handlers.js
+++ b/handlers.js
@@ -283,17 +283,17 @@
                                             reader.readAsText(file)
                                         }.bind(this))
                                     } else {
-                                        this.write('file not found', 404)
+                                        this.error('404 - file not found', 404)
                                     }
                                 }.bind(this))
                             } else {
-                                this.write('file not found', 404)
+                                this.error('404 - file not found', 404)
                             }
                         }.bind(this)
                         reader.readAsText(file)
                     }.bind(this))
                 } else {
-                    this.write('file not found', 404)
+                    this.error('404 - file not found', 404)
                 }
             }.bind(this))
         },
@@ -905,7 +905,7 @@
                                                             reader.readAsText(file)
                                                         }.bind(this))
                                                     } else {
-                                                        this.write('file not found', 404)
+                                                        this.error('404 - file not found', 404)
                                                     }
                                                 }.bind(this))
                                             } else {

From 4a15bbc99dd4e695e65d355f69c3a1dfe7149496 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Tue, 6 Jul 2021 15:45:12 -0500
Subject: [PATCH 127/154] IP Blocking

---
 connection.js          |  37 ++++++-----
 handlers.js            |   7 +++
 howTo/ipBlocking.md    |  24 +++++++
 react-ui/js/index.js   |  37 ++++++++++-
 react-ui/js/options.js | 104 ++++++++++++++++--------------
 stream.js              | 140 ++++++++++++++++++++---------------------
 webapp.js              |  44 ++++++++++++-
 7 files changed, 255 insertions(+), 138 deletions(-)
 create mode 100644 howTo/ipBlocking.md

diff --git a/connection.js b/connection.js
index 8fee877e..f131d44f 100644
--- a/connection.js
+++ b/connection.js
@@ -52,25 +52,28 @@
             if (_DEBUG) {
                 this.log(this.curRequest.uri)
             }
-            if (headers['content-length']) {
-                var clen = parseInt(headers['content-length'])
-                // TODO -- handle 100 continue..
-                if (clen > 0) {
-                    console.log('request had content length',clen)
-                    this.stream.readBytes(clen, this.onRequestBody.bind(this))
-                } else {
-                    console.log('request had an empty body')
-                    this.curRequest.body = new Uint8Array(0)
-                    this.onRequestBody(this.curRequest.body)
+            chrome.sockets.tcp.getInfo(this.stream.sockId, function(e) {
+                this.curRequest.ip = e.peerAddress
+                if (headers['content-length']) {
+                    var clen = parseInt(headers['content-length'])
+                    // TODO -- handle 100 continue..
+                    if (clen > 0) {
+                        console.log('request had content length',clen)
+                        this.stream.readBytes(clen, this.onRequestBody.bind(this))
+                    } else {
+                        console.log('request had an empty body')
+                        this.curRequest.body = new Uint8Array(0)
+                        this.onRequestBody(this.curRequest.body)
+                    }
+                    return
                 }
-                return
-            }
 
-            if (['GET','HEAD','PUT','POST','DELETE','OPTIONS'].includes(method)) {
-                this.onRequest(this.curRequest)
-            } else {
-                console.error('how to handle',this.curRequest)
-            }
+                if (['GET','HEAD','PUT','POST','DELETE','OPTIONS'].includes(method)) {
+                    this.onRequest(this.curRequest)
+                } else {
+                    console.error('how to handle',this.curRequest)
+                }
+            }.bind(this))
         },
         onRequestBody: function(body) {
             var req = this.curRequest
diff --git a/handlers.js b/handlers.js
index 15dc0afc..f9c7c2c7 100644
--- a/handlers.js
+++ b/handlers.js
@@ -461,6 +461,13 @@
         onEntry: function(entry) {
             this.entry = entry
 
+            if (this.opts.optIpBlocking) {
+                if (window.ipBlockList.includes(this.request.ip)) {
+                    this.error('<h1>403 - Forbidden</h1>', 403)
+                    return
+                }
+            }
+
             function onEntryMain() {
                 
                 if (this.entry && this.entry.isFile && this.request.origpath.endsWith('/')) {
diff --git a/howTo/ipBlocking.md b/howTo/ipBlocking.md
new file mode 100644
index 00000000..d9c7f921
--- /dev/null
+++ b/howTo/ipBlocking.md
@@ -0,0 +1,24 @@
+
+<h1>How to use IP Blocking</h1>
+
+<p>IP Blocking is VERY simple</p>
+<p>The ip block list file is a json string</p>
+
+It is VERY IMPORTANT that you use `[` and `]` instead of `{` and `}`
+
+```
+[
+    1.1.1.1,
+    2.2.2.2,
+    3.3.3.3,
+    4.4.4.4,
+    5.5.5.5,
+    6.6.6.6,
+    7.7.7.7,
+    8.8.8.8,
+    9.9.9.9
+]
+```
+
+
+Just place all the IPs you would like to block in 1 file like this
diff --git a/react-ui/js/index.js b/react-ui/js/index.js
index e858b1e1..31d06c3e 100644
--- a/react-ui/js/index.js
+++ b/react-ui/js/index.js
@@ -17,12 +17,12 @@ const {
 
 const {Alert} = MaterialUILab;
 
-const {createMuiTheme, colors, withStyles} = MaterialUI;
+const {createTheme, colors, withStyles} = MaterialUI;
 const styles = {
   card: {margin: '10px'},
   appicon: {marginRight: '10px'}
 };
-const theme = createMuiTheme({
+const theme = createTheme({
   palette: {
     primary: {
       main: '#3f51b5',
@@ -132,11 +132,27 @@ const functions = {
     app.webapp.updateLogging()
     app.webapp.updateOption('optSaveLogs', val);
   },
+  optDoPortMapping: (app, k, val) => {
+    app.webapp.updateOption('optDoPortMapping', val);
+    app.webapp.stop('Port mapping option changed', function() {
+        app.webapp.start()
+    });
+  },
+  optAllInterfaces: (app, k, val) => {
+    app.webapp.updateOption('optAllInterfaces', val);
+    app.webapp.stop('All interfaces option changed', function() {
+        app.webapp.start()
+    });
+  },
   optSaveLogsInterval: (app, k, val) => {
     console.assert(typeof val === 'string')
     app.webapp.updateLogging()
     app.webapp.updateOption('optSaveLogsInterval', val);
   },
+  optIpBlockList: (app, k, val) => {
+    console.assert(typeof val === 'string')
+    app.webapp.updateOption('optIpBlockList', val);
+  },
   optPrivateKey: (app, k, val) => {
     //console.log('privateKey')
     console.assert(typeof val === 'string')
@@ -319,6 +335,12 @@ class App extends React.Component {
     const optUploadOptions = {
       optAllowReplaceFile: ['optUpload']
     };
+    const optIp = {
+      optIpBlocking: null
+    };
+    const optIpOptions = {
+      optIpBlockList: null
+    }
     const optLogMain = {
       optDelete: null,
       optVerbose: null,
@@ -451,6 +473,15 @@ class App extends React.Component {
         return [(<div>{!disablelogasd && logsadge}</div>)];
     })();
 
+    const Ip = (() => {
+        const ipBoolean = renderOpts(optIp)
+        const ipTextBox = renderOpts(optIpOptions)
+        let disableip = (!this.webapp || !this.webapp.opts.optIpBlocking);
+        return [(<div><div>{ipBoolean}</div>
+        <div style={{paddingLeft: 20}}>{!disableip && ipTextBox}{!disableip && <Alert severity="info">For more info on how to use IP blocking, go <a href="https://github.com/ethanaobrien/web-server-chrome/blob/master/howTo/ipBlocking.md" target="_blank">here</a></Alert>}
+      </div></div>)];
+    })();
+
     const UploadOption = (() => {
         let disableoneasd = (!this.webapp || !this.webapp.opts.optUpload);
         const uploadasd = renderOpts(optUploadOptions)
@@ -595,7 +626,7 @@ class App extends React.Component {
           {options}
 
           {advancedButton}
-          {state.showAdvanced && <div>{advOptions}{UploadOption}{logMain}{logInfo}{nodothtmlMain}{nodothtmlOptions}{Custom400Main}{Custom400Options}{Custom401Main}{Custom401Options}{Custom403Main}{Custom403Options}{Custom404Main}{Custom404Options}{Custom404OptionsPt2}{authMain}{authOptions}{HtaccessMain}{HtaccessInfo}{cacheMain}{cacheOptions}{rewriteMain}{rewriteOptions}{httpsMain}{httpsOptions}{POSTFeatureInfo}</div> }
+          {state.showAdvanced && <div>{advOptions}{Ip}{UploadOption}{logMain}{logInfo}{nodothtmlMain}{nodothtmlOptions}{Custom400Main}{Custom400Options}{Custom401Main}{Custom401Options}{Custom403Main}{Custom403Options}{Custom404Main}{Custom404Options}{Custom404OptionsPt2}{authMain}{authOptions}{HtaccessMain}{HtaccessInfo}{cacheMain}{cacheOptions}{rewriteMain}{rewriteOptions}{httpsMain}{httpsOptions}{POSTFeatureInfo}</div> }
         </CardContent>
       </Card>
 
diff --git a/react-ui/js/options.js b/react-ui/js/options.js
index 545b6e91..c3e1f84e 100644
--- a/react-ui/js/options.js
+++ b/react-ui/js/options.js
@@ -146,10 +146,10 @@ const options = {
     default: true
   },
   optUsebasicauth: {
-	label: 'Use basic auth',
-	help: 'Webserver will require auth to access',
-	type: Boolean,
-	default: false
+    label: 'Use basic auth',
+    help: 'Webserver will require auth to access',
+    type: Boolean,
+    default: false
   },
   optAuthUsername: {
     label: 'Username',
@@ -284,6 +284,18 @@ const options = {
     type: Boolean,
     default: false
   },
+  optIpBlocking: {
+    label: 'Search for IP block list',
+    help: 'Search for IP block list',
+    type: Boolean,
+    default: false
+  },
+  optIpBlockList: {
+    label: 'Location of ip block list',
+    help: 'Path to the ip block list',
+    type: String,
+    default: '/ipBlock.list'
+  },
   optModRewriteEnable: {
     label: 'Enable mod-rewrite (for SPA)',
     help: 'For SPA (single page apps) that support HTML5 history location',
@@ -351,64 +363,64 @@ const options = {
     default: false
   },
   optPrivateKey: {
-  	label: 'Private key string',
-  	help: "String containg private key, used in pair with certificate string.\nEdit them in pairs",
-  	type: String
+      label: 'Private key string',
+      help: "String containg private key, used in pair with certificate string.\nEdit them in pairs",
+      type: String
   },
   optCertificate: {
-  	label: 'Certificate string',
-  	help: "String containg certificate, used in pair with private key string.\nEdit them in pairs",
-  	type: String 
+      label: 'Certificate string',
+      help: "String containg certificate, used in pair with private key string.\nEdit them in pairs",
+      type: String 
   },
   optSaveLogs: {
-	label: 'Save Logs To File',
-	help: 'All logs will be saved to a file',
+    label: 'Save Logs To File',
+    help: 'All logs will be saved to a file',
     type: Boolean,
     default: false
   },
   optSaveLogsInterval: {
-	label: 'Save Logs Every _ minutes',
-	help: "Save Logs Every _ minutes. The higher, the less likely an error will happen",
-	type: Number,
-	default: 10
+    label: 'Save Logs Every _ minutes',
+    help: "Save Logs Every _ minutes. The higher, the less likely an error will happen",
+    type: Number,
+    default: 10
   },
   optSaveLogsFilename: {
-	label: 'Path to save log file',
-	help: "Where to save log file",
-	type: String,
-	default: '/wsc.log'
+    label: 'Path to save log file',
+    help: "Where to save log file",
+    type: String,
+    default: '/wsc.log'
   }
 }
 
 export class AppOptions {
   constructor(callback) {
-	  this.meta = options
-	  this.options = null
+      this.meta = options
+      this.options = null
 
-	  chrome.storage.local.get(null, function(d) {
-		  this.options = d
-		  // update options with default options
-		  callback()
-	  }.bind(this))
+      chrome.storage.local.get(null, function(d) {
+          this.options = d
+          // update options with default options
+          callback()
+      }.bind(this))
   }
   get(k) {
-		if (this.options[k] !== undefined) return this.options[k]
-		return this.meta[k].default
-	}
-	getAll() {
-		var d = {}
-		Object.assign(d, this.options)
-		for (var key in this.meta) {
-			if (d[key] === undefined && this.meta[key].default !== undefined) {
-				d[key] = this.meta[key].default
-			}
-		}
-		return d
-	}
-	set(k,v) {
-		this.options[k] = v
-		var d = {}
-		d[k] = v
-		chrome.storage.local.set(d, function(){})
-	}
+        if (this.options[k] !== undefined) return this.options[k]
+        return this.meta[k].default
+    }
+    getAll() {
+        var d = {}
+        Object.assign(d, this.options)
+        for (var key in this.meta) {
+            if (d[key] === undefined && this.meta[key].default !== undefined) {
+                d[key] = this.meta[key].default
+            }
+        }
+        return d
+    }
+    set(k,v) {
+        this.options[k] = v
+        var d = {}
+        d[k] = v
+        chrome.storage.local.set(d, function(){})
+    }
 }
diff --git a/stream.js b/stream.js
index 098b727d..a990f11f 100644
--- a/stream.js
+++ b/stream.js
@@ -38,12 +38,12 @@
     }
 
     IOStream.prototype = {
-		set_close_callback: function(fn) {
-			this._close_callbacks = [fn]
-		},
-		set_nodelay: function() {
-			chrome.sockets.tcp.setNoDelay(this.sockId, true, function(){})
-		},
+        set_close_callback: function(fn) {
+            this._close_callbacks = [fn]
+        },
+        set_nodelay: function() {
+            chrome.sockets.tcp.setNoDelay(this.sockId, true, function(){})
+        },
         removeHandler: function() {
             delete peerSockMap[this.sockId]
         },
@@ -95,10 +95,10 @@
             //console.log(this.sockId,'tcp.send',WSC.ui82str(new Uint8Array(data)))
             this._writeToTcp(data, this.onWrite.bind(this, callback));
         },
-		write: function(data) {
-			this.writeBuffer.add(data)
-			this.tryWrite()
-		},
+        write: function(data) {
+            this.writeBuffer.add(data)
+            this.tryWrite()
+        },
         // may be overridden by StreamTls
         _writeToTcp: function(data, cb) {
             chrome.sockets.tcp.send( this.sockId, data, cb);
@@ -159,9 +159,9 @@
             this.checkBuffer()
         },
         log: function(msg,msg2,msg3) {
-			if (WSC.VERBOSE) {
-				console.log(this.sockId,msg,msg2,msg3)
-			}
+            if (WSC.VERBOSE) {
+                console.log(this.sockId,msg,msg2,msg3)
+            }
         },
         checkBuffer: function() {
             //console.log('checkBuffer')
@@ -187,7 +187,7 @@
             }
         },
         close: function(reason) {
-			if ( this.closed) { return }
+            if ( this.closed) { return }
             this.connected = false
             this.closed = true
             this.runCloseCallbacks()
@@ -236,13 +236,13 @@
 
 
      var arrayBuffer2String = function(buf) {
-		var bufView = new Uint8Array(buf);
-		var chunkSize = 65536;
-		var result = '';
-		for (var i = 0; i < bufView.length; i += chunkSize) {
-		  result += String.fromCharCode.apply(null, bufView.subarray(i, Math.min(i + chunkSize, bufView.length)));
-		}
-		return result;
+        var bufView = new Uint8Array(buf);
+        var chunkSize = 65536;
+        var result = '';
+        for (var i = 0; i < bufView.length; i += chunkSize) {
+          result += String.fromCharCode.apply(null, bufView.subarray(i, Math.min(i + chunkSize, bufView.length)));
+        }
+        return result;
      }
 
 
@@ -251,67 +251,67 @@
         this.readCallbacks = [];
         var _t = this;
 
-		this.tlsServer = forge.tls.createConnection({
-		  server: true,
-		  sessionCache: {},
-		  // supported cipher suites in order of preference
-		  cipherSuites: [
-			forge.tls.CipherSuites.TLS_RSA_WITH_AES_128_CBC_SHA,
-			forge.tls.CipherSuites.TLS_RSA_WITH_AES_256_CBC_SHA],
-		  connected: function(c) {
-			//console.log('Server connected');
-			//c.prepareHeartbeatRequest('heartbeat');
-		  },
-		  verifyClient: false,
-		  getCertificate: function(c, hint) {
-			//console.log('Server getting certificate for \"' + hint[0] + '\"...');
-			return serverCert; //WSC.Tls.data.server.cert;
-		  },
-		  getPrivateKey: function(c, cert) {
-			//console.log('Server getting privateKey for \"' + cert + '\"...');
-			return privateKey;//WSC.Tls.data.server.privateKey;
-		  },
-		  tlsDataReady: function(c) {
-			// send TLS data to client
-			var cb = _t.writeCallbacks.pop() || function(){};
-			let str = c.tlsData.getBytes();
-			var b = WSC.str2ab(str);
-			//console.log('encrypt to client: ' + str);
-			if (this.connected)
+        this.tlsServer = forge.tls.createConnection({
+          server: true,
+          sessionCache: {},
+          // supported cipher suites in order of preference
+          cipherSuites: [
+            forge.tls.CipherSuites.TLS_RSA_WITH_AES_128_CBC_SHA,
+            forge.tls.CipherSuites.TLS_RSA_WITH_AES_256_CBC_SHA],
+          connected: function(c) {
+            //console.log('Server connected');
+            //c.prepareHeartbeatRequest('heartbeat');
+          },
+          verifyClient: false,
+          getCertificate: function(c, hint) {
+            //console.log('Server getting certificate for \"' + hint[0] + '\"...');
+            return serverCert; //WSC.Tls.data.server.cert;
+          },
+          getPrivateKey: function(c, cert) {
+            //console.log('Server getting privateKey for \"' + cert + '\"...');
+            return privateKey;//WSC.Tls.data.server.privateKey;
+          },
+          tlsDataReady: function(c) {
+            // send TLS data to client
+            var cb = _t.writeCallbacks.pop() || function(){};
+            let str = c.tlsData.getBytes();
+            var b = WSC.str2ab(str);
+            //console.log('encrypt to client: ' + str);
+            if (this.connected)
                 chrome.sockets.tcp.send( _t.sockId, b, cb);
             else
                 _t.error("tlsData on closed socket");
           },
-		  dataReady: function(c) {
-		  	// decrypted data from client
-		  	let str = c.data.getBytes();
-			//console.log('client sent \"' + str + '\"');
-			_t.readBuffer.add(WSC.str2ab(str));
+          dataReady: function(c) {
+              // decrypted data from client
+              let str = c.data.getBytes();
+            //console.log('client sent \"' + str + '\"');
+            _t.readBuffer.add(WSC.str2ab(str));
             if (_t.onread) { _t.onread() }
             _t.checkBuffer()
-		  },
-		  heartbeatReceived: function(c, payload) {
-			//console.log('Server received heartbeat: ' + payload.getBytes());
-		  },
-		  closed: function(c) {
-			console.log('Server disconnected.');
-		  },
-		  error: function(c, error) {
-			console.log(error.origin + ' error: ' + error.message + ' at level:' + error.alert.level + ' desc:' + error.alert.description);
-		  }
-		});
+          },
+          heartbeatReceived: function(c, payload) {
+            //console.log('Server received heartbeat: ' + payload.getBytes());
+          },
+          closed: function(c) {
+            console.log('Server disconnected.');
+          },
+          error: function(c, error) {
+            console.log(error.origin + ' error: ' + error.message + ' at level:' + error.alert.level + ' desc:' + error.alert.description);
+          }
+        });
 
-    	IOStream.apply(this, arguments);
+        IOStream.apply(this, arguments);
     }
     IOStreamTls.prototype = {
         _writeToTcp: function(data, cb) {
-        	let s = WSC.ui82str(new Uint8Array(data));
-        	this.writeCallbacks.push(cb);
-        	this.tlsServer.prepare(s);
+            let s = WSC.ui82str(new Uint8Array(data));
+            this.writeCallbacks.push(cb);
+            this.tlsServer.prepare(s);
         },
         _fillReadBuffer: function(data) {
-        	let str = arrayBuffer2String(data);
-        	let n = this.tlsServer.process(str);
+            let str = arrayBuffer2String(data);
+            let n = this.tlsServer.process(str);
         }
     };
     IOStreamTls.prototype.__proto__ = IOStream.prototype;
diff --git a/webapp.js b/webapp.js
index 7bfd6347..8f9e8795 100644
--- a/webapp.js
+++ b/webapp.js
@@ -82,6 +82,32 @@
                 break
             }
         },
+        updateIpBlockList: function() {
+            if (! this.opts.optIpBlocking) {
+                return
+            }
+            if (! this.fs) {
+                return
+            }
+            this.fs.getByPath(this.opts.optIpBlockList, function(file) {
+                if (file && file.isFile && ! file.error) {
+                    file.file(function(file) {
+                        var reader = new FileReader()
+                        reader.onload = function(e) {
+                            var data = e.target.result
+                            try {
+                                window.ipBlockList = JSON.parse(data)
+                            } catch(e) {
+                                console.error('Failed to parse Ip block list')
+                            }
+                        }.bind(this)
+                        reader.readAsText(file)
+                    }.bind(this))
+                } else {
+                    console.error('Location of Ip block list was not found')
+                }
+            }.bind(this))
+        },
         updateLogging: function() {
             window.logging = false
             WSC.saveLogs()
@@ -282,6 +308,7 @@
                 console.error("already starting or started")
                 return
             }
+            this.updateIpBlockList()
             this.start_callback = callback
             this.stopped = false
             this.starting = true
@@ -475,6 +502,10 @@
             // set unpaused, etc
         },
         onAccept: function(acceptInfo) {
+            if (! window.ipBlockList) {
+                window.ipBlockList = [ ]
+            }
+            this.updateIpBlockList()
             //console.log('onAccept',acceptInfo,this.sockInfo)
             if (acceptInfo.socketId != this.sockInfo.socketId) { return }
             if (acceptInfo.socketId) {
@@ -498,7 +529,17 @@
             connection.tryRead()
         },
         onRequest: function(stream, connection, request) {
-            console.log('Request',request.method, request.uri)
+            console.log(request.ip + ':', 'Request',request.method, request.uri)
+            
+            if (this.opts.optIpBlocking) {
+                if (window.ipBlockList.includes(request.ip)) {
+                    var handler = new WSC.BaseHandler(request)
+                    handler.app = this
+                    handler.request = request
+                    handler.error('<h1>403 - Forbidden</h1>', 403)
+                    return
+                }
+            }
 
             //console.log(request)
             var filename = request.path.split('/').pop()
@@ -516,7 +557,6 @@
                 }
             }
 
-
             if (this.opts.optUsebasicauth) {
                 var validAuth = false
                 var auth = request.headers['authorization']

From d18565056814e4f9bd2c2ab6d9aed259badd2776 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Tue, 6 Jul 2021 15:52:42 -0500
Subject: [PATCH 128/154] bug fix

---
 handlers.js          | 3 +--
 react-ui/js/index.js | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/handlers.js b/handlers.js
index f9c7c2c7..3bd00fb1 100644
--- a/handlers.js
+++ b/handlers.js
@@ -461,7 +461,7 @@
         onEntry: function(entry) {
             this.entry = entry
 
-            if (this.opts.optIpBlocking) {
+            if (this.app.opts.optIpBlocking) {
                 if (window.ipBlockList.includes(this.request.ip)) {
                     this.error('<h1>403 - Forbidden</h1>', 403)
                     return
@@ -469,7 +469,6 @@
             }
 
             function onEntryMain() {
-                
                 if (this.entry && this.entry.isFile && this.request.origpath.endsWith('/')) {
                     this.setHeader('location', this.request.path)
                     this.writeHeaders(301)
diff --git a/react-ui/js/index.js b/react-ui/js/index.js
index 31d06c3e..796710e6 100644
--- a/react-ui/js/index.js
+++ b/react-ui/js/index.js
@@ -626,7 +626,7 @@ class App extends React.Component {
           {options}
 
           {advancedButton}
-          {state.showAdvanced && <div>{advOptions}{Ip}{UploadOption}{logMain}{logInfo}{nodothtmlMain}{nodothtmlOptions}{Custom400Main}{Custom400Options}{Custom401Main}{Custom401Options}{Custom403Main}{Custom403Options}{Custom404Main}{Custom404Options}{Custom404OptionsPt2}{authMain}{authOptions}{HtaccessMain}{HtaccessInfo}{cacheMain}{cacheOptions}{rewriteMain}{rewriteOptions}{httpsMain}{httpsOptions}{POSTFeatureInfo}</div> }
+          {state.showAdvanced && <div>{advOptions}{UploadOption}{Ip}{logMain}{logInfo}{nodothtmlMain}{nodothtmlOptions}{Custom400Main}{Custom400Options}{Custom401Main}{Custom401Options}{Custom403Main}{Custom403Options}{Custom404Main}{Custom404Options}{Custom404OptionsPt2}{authMain}{authOptions}{HtaccessMain}{HtaccessInfo}{cacheMain}{cacheOptions}{rewriteMain}{rewriteOptions}{httpsMain}{httpsOptions}{POSTFeatureInfo}</div> }
         </CardContent>
       </Card>
 

From 5b95b850c8ddaaac03d20a8860eeaac10462ffc1 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Wed, 7 Jul 2021 10:47:17 -0500
Subject: [PATCH 129/154] Security & feature

---
 handlers.js   | 15 +++++++++++++++
 howTo/post.md |  8 +++++++-
 webapp.js     | 10 ++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/handlers.js b/handlers.js
index 3bd00fb1..b640a3ae 100644
--- a/handlers.js
+++ b/handlers.js
@@ -1310,6 +1310,21 @@
                 
             }, true)
         },
+        deleteFile: function(path, callback) {
+            if (! path.startsWith('/')) {
+                var path = WSC.utils.relativePath(path, WSC.utils.stripOffFile(this.request.origpath))
+            }
+            if (! callback) {
+                var callback = function(file) { }
+            }
+            this.fs.getByPath(path, function(file) {
+                if (file && ! file.error) {
+                    entry.remove(callback)
+                } else {
+                    callback({error: 'File not found')
+                }
+            })
+        },
         httpCode: function(code) {
             if (! code) {
                 code = 200
diff --git a/howTo/post.md b/howTo/post.md
index 95c83b4e..aabaa3bc 100644
--- a/howTo/post.md
+++ b/howTo/post.md
@@ -87,13 +87,19 @@ Example:
 `res.contentType(type)`: function
 This function will set the content type to respond with, you could also use the `res.setHeader()` function
 
-`res.writeFile(path, data, allowReplaceFile, callback)`
+`res.writeFile(path, data, allowReplaceFile, callback)`: function
 This function will save a file
 path: the path of the file
+If the path contains a non existent folder, the folder will be created
 data: string/arrayBuffer of the file. DO NOT SEND OTHER TYPES OF DATA - THIS COULD BREAK THE APP (Just refresh it)
 allowReplaceFile: if file exists and you want to replace the file, set this to true
 callback: function will be excecuted to tell you if there was an error or it will callback the file
 
+`res.deleteFile(path, callback)`: function
+This function will delete
+path: the path of the file
+callback: function will be excecuted to tell you if there was an error or success
+
 `res.httpCode(httpCode)`: function
 Call this to respond with no message. Dont forget to finish with `res.end()`
 
diff --git a/webapp.js b/webapp.js
index 8f9e8795..94e2d8ef 100644
--- a/webapp.js
+++ b/webapp.js
@@ -537,9 +537,19 @@
                     handler.app = this
                     handler.request = request
                     handler.error('<h1>403 - Forbidden</h1>', 403)
+                    console.log('Blocked Request From ' + request.ip)
                     return
                 }
             }
+            
+            if (request.path == this.opts.optIpBlockList) {
+                var handler = new WSC.BaseHandler(request)
+                handler.app = this
+                handler.request = request
+                handler.error('<h1>403 - Forbidden</h1>', 403)
+                return
+            }
+            
 
             //console.log(request)
             var filename = request.path.split('/').pop()

From c30ae1fa3175682c54aabe72d9696434b54cd65f Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Wed, 7 Jul 2021 10:52:36 -0500
Subject: [PATCH 130/154] Syntax fix

---
 handlers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/handlers.js b/handlers.js
index b640a3ae..e37bda89 100644
--- a/handlers.js
+++ b/handlers.js
@@ -1321,7 +1321,7 @@
                 if (file && ! file.error) {
                     entry.remove(callback)
                 } else {
-                    callback({error: 'File not found')
+                    callback({error: 'File not found'})
                 }
             })
         },

From 3663ad1373c86622b2575f466633aed94234e8c9 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 8 Jul 2021 14:02:09 -0500
Subject: [PATCH 131/154] Server clean up on method not supported

---
 connection.js        |  3 +++
 handlers.js          |  5 +++--
 react-ui/js/index.js | 12 ------------
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/connection.js b/connection.js
index f131d44f..dc7ef913 100644
--- a/connection.js
+++ b/connection.js
@@ -72,6 +72,9 @@
                     this.onRequest(this.curRequest)
                 } else {
                     console.error('how to handle',this.curRequest)
+                    // leaving the connection open will slow the server
+                    this.curRequest.connection.write('HTTP/1.1 501 Not Implemented\r\ncontent-length: 0\r\n\r\n')
+                    this.curRequest.connection.stream.close()
                 }
             }.bind(this))
         },
diff --git a/handlers.js b/handlers.js
index e37bda89..8d6e3884 100644
--- a/handlers.js
+++ b/handlers.js
@@ -271,13 +271,14 @@
                                                         }
                                                         this.finish()
                                                     }
+                                                    // Mount the file using a blob. Chrome's content security policy will not allow eval()
                                                     var blob = new Blob([file], {type : 'text/javascript'})
                                                     this.postRequest = document.createElement("script")
                                                     this.postRequest.src = URL.createObjectURL(blob)
                                                     this.postRequest.id = 'tempPOSThandler' + this.postRequestID
                                                     document.body.appendChild(this.postRequest)
                                                 } else {
-                                                    this.write('Keys do not match', 403)
+                                                    this.write('The keys do not match or were not found', 403)
                                                 }
                                             }.bind(this)
                                             reader.readAsText(file)
@@ -905,7 +906,7 @@
                                                                     this.getRequest.id = 'tempGEThandler' + this.getRequestID
                                                                     document.body.appendChild(this.getRequest)
                                                                 } else {
-                                                                    this.write('Keys do not match', 403)
+                                                                    this.write('The keys do not match or were not found', 403)
                                                                 }
                                                             }.bind(this)
                                                             reader.readAsText(file)
diff --git a/react-ui/js/index.js b/react-ui/js/index.js
index 796710e6..72a1a6bf 100644
--- a/react-ui/js/index.js
+++ b/react-ui/js/index.js
@@ -132,18 +132,6 @@ const functions = {
     app.webapp.updateLogging()
     app.webapp.updateOption('optSaveLogs', val);
   },
-  optDoPortMapping: (app, k, val) => {
-    app.webapp.updateOption('optDoPortMapping', val);
-    app.webapp.stop('Port mapping option changed', function() {
-        app.webapp.start()
-    });
-  },
-  optAllInterfaces: (app, k, val) => {
-    app.webapp.updateOption('optAllInterfaces', val);
-    app.webapp.stop('All interfaces option changed', function() {
-        app.webapp.start()
-    });
-  },
   optSaveLogsInterval: (app, k, val) => {
     console.assert(typeof val === 'string')
     app.webapp.updateLogging()

From d743270849901d2b09085c348f835c4a84a5ec9d Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Fri, 9 Jul 2021 18:31:54 -0500
Subject: [PATCH 132/154] Last minute changes

---
 handlers.js   | 78 +++++++++++++++++++++++++++++++++++++++++++++++----
 howTo/post.md |  5 +++-
 2 files changed, 77 insertions(+), 6 deletions(-)

diff --git a/handlers.js b/handlers.js
index 8d6e3884..562a1af9 100644
--- a/handlers.js
+++ b/handlers.js
@@ -120,6 +120,7 @@
                                 }
                                 var filerequested = this.request.origpath.split('/').pop();
                                 var filefound = false
+                                var auth = false
                                 if (origdata.length == 0 || ! origdata.length) {
                                     callback()
                                     return
@@ -138,16 +139,45 @@
                                         this.error('bad request', 403)
                                         return
                                     }
+                                    if (origdata[i].type == 401 &&
+                                        ! auth &&
+                                        (origdata[i].request_path == filerequested || origdata[i].request_path == 'all files')) {
+                                        var authdata = origdata[i]
+                                        var auth = true
+                                    }
                                     if ((origdata[i].type == allow && origdata[i].request_path == filerequested) ||
                                         (origdata[i].type == allow && origdata[i].request_path == 'all files') ||
                                         (origdata[i].type == deny && origdata[i].request_path == filerequested) ||
-                                        (origdata[i].type == deny && origdata[i].request_path == 'all files')) {
+                                        (origdata[i].type == deny && origdata[i].request_path == 'all files') && ! filefound) {
                                         var data = origdata[i]
                                         var filefound = true
-                                        break
                                     }
                                 }
                                 //console.log(filefound)
+                                if (auth) {
+                                    if (! authdata.username) {
+                                        this.htaccessError.bind(this)('missing Auth Username')
+                                        return
+                                    }
+                                    if (! authdata.password) {
+                                        this.htaccessError.bind(this)('missing Auth Password')
+                                        return
+                                    }
+                                    var validAuth = false
+                                    var auth = this.request.headers['authorization']
+                                    if (auth) {
+                                        if (auth.slice(0,6).toLowerCase() == 'basic ') {
+                                            var userpass = atob(auth.slice(6,auth.length)).split(':')
+                                            if (userpass[0] == authdata.username && userpass[1] == authdata.password) {
+                                                validAuth = true
+                                            }
+                                        }
+                                    }
+                                    if (! validAuth) {
+                                        this.error("<h1>401 - Unauthorized</h1>", 401)
+                                        return
+                                    }
+                                }
                                 if (filefound) {
                                     if (data.type == allow) {
                                         callbackSkip()
@@ -214,6 +244,7 @@
                             }
                             var filerequested = this.request.origpath.split('/').pop()
                             var filefound = false
+                            var auth = false
                             for (var i=0; i<origdata.length; i++) {
                                 if (! origdata[i].type) {
                                     this.htaccessError.bind(this)('missing type')
@@ -223,13 +254,42 @@
                                     this.htaccessError.bind(this)('missing request path')
                                     return
                                 }
+                                if (origdata[i].type == 401 &&
+                                    ! auth &&
+                                    (origdata[i].request_path == filerequested || origdata[i].request_path == 'all files')) {
+                                    var authdata = origdata[i]
+                                    var auth = true
+                                }
                                 if (origdata[i].request_path == filerequested && origdata[i].type == 'POSTkey' && ! filefound) {
                                     var data = origdata[i]
                                     var filefound = true
-                                    break
                                 }
                             }
                             // Still need to validate POST key
+                            if (auth) {
+                                if (! authdata.username) {
+                                    this.htaccessError.bind(this)('missing Auth Username')
+                                    return
+                                }
+                                if (! authdata.password) {
+                                    this.htaccessError.bind(this)('missing Auth Password')
+                                    return
+                                }
+                                var validAuth = false
+                                var auth = this.request.headers['authorization']
+                                if (auth) {
+                                    if (auth.slice(0,6).toLowerCase() == 'basic ') {
+                                        var userpass = atob(auth.slice(6,auth.length)).split(':')
+                                        if (userpass[0] == authdata.username && userpass[1] == authdata.password) {
+                                            validAuth = true
+                                        }
+                                    }
+                                }
+                                if (! validAuth) {
+                                    this.error("<h1>401 - Unauthorized</h1>", 401)
+                                    return
+                                }
+                            }
                             if (filefound) {
                                 if (! data.key) {
                                     this.htaccessError.bind(this)('missing post key')
@@ -255,6 +315,7 @@
                                                 if (validFile) {
                                                     window.req = this.request
                                                     window.res = this
+                                                    window.tempData = { }
                                                     window.httpRequest = WSC.ChromeSocketXMLHttpRequest
                                                     this.postRequestID = Math.random().toString()
                                                     res.end = function() {
@@ -269,6 +330,9 @@
                                                         if (window.postKey) {
                                                             delete window.postKey
                                                         }
+                                                        if (window.tempData) {
+                                                            delete window.tempData
+                                                        }
                                                         this.finish()
                                                     }
                                                     // Mount the file using a blob. Chrome's content security policy will not allow eval()
@@ -884,6 +948,7 @@
                                                                 if (validFile) {
                                                                     window.req = this.request
                                                                     window.res = this
+                                                                    window.tempData = { }
                                                                     window.httpRequest = WSC.ChromeSocketXMLHttpRequest
                                                                     this.getRequestID = Math.random().toString()
                                                                     res.end = function() {
@@ -898,6 +963,9 @@
                                                                         if (window.SSJSKey) {
                                                                             delete window.SSJSKey
                                                                         }
+                                                                        if (window.tempData) {
+                                                                            delete window.tempData
+                                                                        }
                                                                         this.finish()
                                                                     }
                                                                     var blob = new Blob([file], {type : 'text/javascript'})
@@ -1105,7 +1173,7 @@
             }
             function DirRenderFinish() {
                 this.setHeader('content-type','text/html; charset=utf-8')
-                this.write(html.join('\n'))
+                this.write(new TextEncoder('utf-8').encode(html.join('\n')).buffer)
                 this.finish()
             }
             function sendFileList() {
@@ -1172,7 +1240,7 @@
             }
             html.push('</ul></html>')
             this.setHeader('content-type','text/html; charset=utf-8')
-            this.write(html.join('\n'))
+            this.write(new TextEncoder('utf-8').encode(html.join('\n')).buffer)
         },
         onReadEntry: function(evt) {
             if (evt.type == 'error') {
diff --git a/howTo/post.md b/howTo/post.md
index aabaa3bc..010b887f 100644
--- a/howTo/post.md
+++ b/howTo/post.md
@@ -1,4 +1,4 @@
-
+.
 <h1>How to use Server Side POST</h1>
 <br>
 <h2>How it works</h2>
@@ -160,3 +160,6 @@ Set the onload function: `request.onload = function(e) { }`
 Send the request: `request.send()`
 
 To send data, you can use: `request.send(data)`
+
+`window.tempData`: json
+This window variable is a place that you can store data if you need. It will be cleared after the end of the response.
\ No newline at end of file

From e2eab3d5d4158136169da7716ee2b430922df763 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Sun, 11 Jul 2021 17:27:33 -0500
Subject: [PATCH 133/154] Minor fixes

---
 handlers.js   | 11 +++++++----
 howTo/post.md |  7 ++++++-
 webapp.js     |  3 +++
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/handlers.js b/handlers.js
index 562a1af9..0e440186 100644
--- a/handlers.js
+++ b/handlers.js
@@ -656,6 +656,7 @@
                                     var data = false
                                     var htaccessHeaders = [ ]
                                     var additionalHeaders = false
+                                    var hasPost = false
                                     if (origdata.length == 0 || ! origdata.length) {
                                         excludedothtmlcheck.bind(this)()
                                         return
@@ -707,9 +708,7 @@
                                                 var filefound = true
                                         }
                                         if (origdata[i].request_path == filerequested && origdata[i].type == 'POSTkey') {
-                                            var filefound = false
-                                            this.error('<h1>403 - Forbidden</h1>')
-                                            break
+                                            var hasPost = true
                                         }
                                         //console.log(origdata[i].request_path == filerequested)
                                         if ((origdata[i].request_path == filerequested || origdata[i].request_path == 'all files') &&
@@ -723,6 +722,10 @@
                                     //console.log(data)
                                     //console.log(authdata)
                                     //console.log(filefound)
+                                    if (hasPost && data.type != 'serverSideJavaScript') {
+                                        this.error('bad request', 403)
+                                        return
+                                    }
                                     function htaccessCheck2() {
                                         if (filefound) {
                                             if (data.type == 301 || data.type == 302 || data.type == 307) {
@@ -1394,7 +1397,7 @@
                 }
             })
         },
-        httpCode: function(code) {
+        writeCode: function(code) {
             if (! code) {
                 code = 200
             }
diff --git a/howTo/post.md b/howTo/post.md
index 010b887f..85c8f955 100644
--- a/howTo/post.md
+++ b/howTo/post.md
@@ -100,7 +100,7 @@ This function will delete
 path: the path of the file
 callback: function will be excecuted to tell you if there was an error or success
 
-`res.httpCode(httpCode)`: function
+`res.writeCode(httpCode)`: function
 Call this to respond with no message. Dont forget to finish with `res.end()`
 
 <h2>Chunked encoding</h2>
@@ -154,11 +154,16 @@ This will open a http request as if you opened a new tab and went to the website
 Please note: https it not supported
 
 `var request = new httpRequest`
+
 To set a header: `request.setRequestHeader(headerType, headerValue)`
+
 To open the request: `request.open("GET", url)`
+
 Set the onload function: `request.onload = function(e) { }`
+
 Send the request: `request.send()`
 
+
 To send data, you can use: `request.send(data)`
 
 `window.tempData`: json
diff --git a/webapp.js b/webapp.js
index 94e2d8ef..7805197c 100644
--- a/webapp.js
+++ b/webapp.js
@@ -808,6 +808,9 @@ Changes with nginx 0.7.9                                         12 Aug 2008
                 data = new TextEncoder('utf-8').encode(data).buffer
             }
             console.assert( data.byteLength !== undefined )
+            if (! this.headersWritten) {
+                this.writeHeaders()
+            }
             var chunkheader = data.byteLength.toString(16) + '\r\n'
             //console.log('write chunk',[chunkheader])
             this.request.connection.write( WSC.str2ab(chunkheader) )

From 78a63c6ab4c207eb46cc70978c4398b7a1705ed0 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Mon, 12 Jul 2021 09:59:28 -0500
Subject: [PATCH 134/154] Chunked Encoding Bug Fix

---
 chromesocketxhr.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/chromesocketxhr.js b/chromesocketxhr.js
index add57e24..884ea23b 100644
--- a/chromesocketxhr.js
+++ b/chromesocketxhr.js
@@ -196,6 +196,7 @@
 
             if (response.headers['transfer-encoding'] &&
                 response.headers['transfer-encoding'] == 'chunked') {
+                console.log('a')
                 this.chunks = new WSC.Buffer
                 //console.log('looking for an \\r\\n')
                 this.stream.readUntil("\r\n", this.getNewChunk.bind(this))
@@ -210,6 +211,7 @@
             }
         },
         onChunkDone: function(data) {
+            var data = data.slice(0, data.byteLength - 2) // For some reason, the \r\n gets put into the arraybuffer
             this.chunks.add(data)
             this.stream.readUntil("\r\n", this.getNewChunk.bind(this))
         },
@@ -222,7 +224,7 @@
             }
             //console.log('looking for new chunk of len',len)
             if (len == 0) {
-                //console.log('got all chunks',this.chunks)
+                console.log('got all chunks',this.chunks)
                 var body = this.chunks.flatten()
                 this.onBody(body)
             } else {

From 3f5acf36984322c0a82e061a7b914f32860953ce Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Mon, 12 Jul 2021 10:00:31 -0500
Subject: [PATCH 135/154] Chunked Encoding Bug Fix

---
 chromesocketxhr.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/chromesocketxhr.js b/chromesocketxhr.js
index 884ea23b..8d209653 100644
--- a/chromesocketxhr.js
+++ b/chromesocketxhr.js
@@ -196,7 +196,6 @@
 
             if (response.headers['transfer-encoding'] &&
                 response.headers['transfer-encoding'] == 'chunked') {
-                console.log('a')
                 this.chunks = new WSC.Buffer
                 //console.log('looking for an \\r\\n')
                 this.stream.readUntil("\r\n", this.getNewChunk.bind(this))
@@ -224,7 +223,7 @@
             }
             //console.log('looking for new chunk of len',len)
             if (len == 0) {
-                console.log('got all chunks',this.chunks)
+                //console.log('got all chunks',this.chunks)
                 var body = this.chunks.flatten()
                 this.onBody(body)
             } else {

From 0fc514c304e23546a3c6c595117ad31753e3f4e2 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Mon, 12 Jul 2021 10:36:50 -0500
Subject: [PATCH 136/154] Bug Fix

---
 handlers.js | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/handlers.js b/handlers.js
index 0e440186..a17f4d1c 100644
--- a/handlers.js
+++ b/handlers.js
@@ -313,12 +313,12 @@
                                                     }
                                                 }
                                                 if (validFile) {
-                                                    window.req = this.request
-                                                    window.res = this
+                                                    this.postRequestID = Math.random().toString().split('.').pop()
+                                                    window['req' + this.postRequestID] = this.request
+                                                    window['res' + this.postRequestID] = this
                                                     window.tempData = { }
                                                     window.httpRequest = WSC.ChromeSocketXMLHttpRequest
-                                                    this.postRequestID = Math.random().toString()
-                                                    res.end = function() {
+                                                    window['res' + this.postRequestID].end = function() {
                                                         // We need to cleanup - Which is why we don't want the user to directly call res.finish()
                                                         if (document.getElementById('tempPOSThandler' + this.postRequestID)) {
                                                             document.getElementById('tempPOSThandler' + this.postRequestID).remove()
@@ -330,13 +330,12 @@
                                                         if (window.postKey) {
                                                             delete window.postKey
                                                         }
-                                                        if (window.tempData) {
-                                                            delete window.tempData
-                                                        }
                                                         this.finish()
                                                     }
                                                     // Mount the file using a blob. Chrome's content security policy will not allow eval()
-                                                    var blob = new Blob([file], {type : 'text/javascript'})
+                                                    var contents = '(function() {\nvar handler = function(req, res, httpRequest) {\n' + e.target.result + '\n};\nhandler(window.req' + this.postRequestID + ', window.res' + this.postRequestID + ', window.httpRequest)\n})();'
+                                                    var contents = new TextEncoder('utf-8').encode(contents)
+                                                    var blob = new Blob([contents], {type : 'text/javascript'})
                                                     this.postRequest = document.createElement("script")
                                                     this.postRequest.src = URL.createObjectURL(blob)
                                                     this.postRequest.id = 'tempPOSThandler' + this.postRequestID
@@ -932,7 +931,7 @@
                                                     return
                                                 }
                                                 this.fs.getByPath(this.request.path, function(file) {
-                                                    if (file && ! file.error) {
+                                                    if (file && ! file.error && file.isFile) {
                                                         file.file(function(file) {
                                                             var reader = new FileReader()
                                                             reader.onload = function(e) {
@@ -949,12 +948,12 @@
                                                                     }
                                                                 }
                                                                 if (validFile) {
-                                                                    window.req = this.request
-                                                                    window.res = this
+                                                                    this.getRequestID = Math.random().toString().split('.').pop()
+                                                                    window['req' + this.getRequestID] = this.request
+                                                                    window['res' + this.getRequestID] = this
                                                                     window.tempData = { }
                                                                     window.httpRequest = WSC.ChromeSocketXMLHttpRequest
-                                                                    this.getRequestID = Math.random().toString()
-                                                                    res.end = function() {
+                                                                    window['res' + this.getRequestID].end = function() {
                                                                         // We need to cleanup - Which is why we don't want the user to directly call res.finish()
                                                                         if (document.getElementById('tempGEThandler' + this.getRequestID)) {
                                                                             document.getElementById('tempGEThandler' + this.getRequestID).remove()
@@ -963,15 +962,15 @@
                                                                         delete window.res
                                                                         delete window.req
                                                                         delete window.httpRequest
-                                                                        if (window.SSJSKey) {
-                                                                            delete window.SSJSKey
-                                                                        }
-                                                                        if (window.tempData) {
-                                                                            delete window.tempData
+                                                                        if (window.postKey) {
+                                                                            delete window.postKey
                                                                         }
                                                                         this.finish()
                                                                     }
-                                                                    var blob = new Blob([file], {type : 'text/javascript'})
+                                                                    // Mount the file using a blob. Chrome's content security policy will not allow eval()
+                                                                    var contents = '(function() {\nvar handler = function(req, res, httpRequest) {\n' + e.target.result + '\n};\nhandler(window.req' + this.getRequestID + ', window.res' + this.getRequestID + ', window.httpRequest)\n})();'
+                                                                    var contents = new TextEncoder('utf-8').encode(contents)
+                                                                    var blob = new Blob([contents], {type : 'text/javascript'})
                                                                     this.getRequest = document.createElement("script")
                                                                     this.getRequest.src = URL.createObjectURL(blob)
                                                                     this.getRequest.id = 'tempGEThandler' + this.getRequestID
@@ -983,7 +982,7 @@
                                                             reader.readAsText(file)
                                                         }.bind(this))
                                                     } else {
-                                                        this.error('404 - file not found', 404)
+                                                        excludedothtmlcheck.bind(this)()
                                                     }
                                                 }.bind(this))
                                             } else {

From d59a8e4946be6b26e649562522c808bc5ebeac92 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Mon, 12 Jul 2021 10:39:47 -0500
Subject: [PATCH 137/154] Update Description

---
 howTo/post.md | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/howTo/post.md b/howTo/post.md
index 85c8f955..a53fde9c 100644
--- a/howTo/post.md
+++ b/howTo/post.md
@@ -41,6 +41,8 @@ The start of the line (`postKey = `) MUST STAY THE SAME (case sensitive). The se
 THIS LINE MUST BE ITS OWN LINE!! You CANNOT combine multiple lines of code with `;`
 Indenting this line may cause for the server to not find this line and in result, the code will not be executed
 
+the res and req variables ARE NOT WINDOW VARIABLES. DO NOT USE THEM AS SUCH
+
 <br>
 <h2>Writing the code inside the file</h2>
 
@@ -52,6 +54,21 @@ res.end() // THEN end the request
 ```
 res contains all the functions to respond, while req contains all the request information
 
+*NOTE* - You can use BOTH server side javascript and Server Side POST in the same file! Just declare 2 seperate keys in the htaccess and in the file!
+
+IMPORTANT INFORMATION - When writing the file, DO NOT surround the file in a function as you would normally do
+Do not do:
+```
+(function() {
+awefioeeai.somecode()
+
+})();
+```
+If you need to use browserify on your file, just remove the `(function() {` at the beggining and the `})();` at the end.
+
+DO NOT WORRY. This is to prevent problems with the res and req variables. Your script will be excecuted inside a function, so all return statements will work correctly
+
+
 <h1>res Commands</h1>
 
 `res.end()`: function
@@ -167,4 +184,4 @@ Send the request: `request.send()`
 To send data, you can use: `request.send(data)`
 
 `window.tempData`: json
-This window variable is a place that you can store data if you need. It will be cleared after the end of the response.
\ No newline at end of file
+This window variable is a place that you can store data if you need. It will NOT be cleared after the end of the response.

From 508e74c602635a4527299e72fb58890e8efc4753 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Mon, 12 Jul 2021 10:40:43 -0500
Subject: [PATCH 138/154] Bug fix

---
 handlers.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/handlers.js b/handlers.js
index a17f4d1c..ed868f44 100644
--- a/handlers.js
+++ b/handlers.js
@@ -962,8 +962,8 @@
                                                                         delete window.res
                                                                         delete window.req
                                                                         delete window.httpRequest
-                                                                        if (window.postKey) {
-                                                                            delete window.postKey
+                                                                        if (window.SSJSKey) {
+                                                                            delete window.SSJSKey
                                                                         }
                                                                         this.finish()
                                                                     }

From 4f4d5ce784488e59292805465857978502a8e109 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Tue, 13 Jul 2021 12:32:52 -0500
Subject: [PATCH 139/154] Fixed .html extension on SSJS bug

---
 handlers.js | 45 ++++++++++++++++++++++++++++-----------------
 log-full.js |  6 ++++++
 2 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/handlers.js b/handlers.js
index ed868f44..7f4ac010 100644
--- a/handlers.js
+++ b/handlers.js
@@ -295,7 +295,7 @@
                                     this.htaccessError.bind(this)('missing post key')
                                     return
                                 }
-                                this.fs.getByPath(this.request.path, function(file) {
+                                this.fs.getByPath(WSC.utils.stripOffFile(this.request.origpath) + data.original_request_path, function(file) {
                                     if (file && ! file.error) {
                                         file.file(function(file) {
                                             var reader = new FileReader()
@@ -316,24 +316,25 @@
                                                     this.postRequestID = Math.random().toString().split('.').pop()
                                                     window['req' + this.postRequestID] = this.request
                                                     window['res' + this.postRequestID] = this
-                                                    window.tempData = { }
-                                                    window.httpRequest = WSC.ChromeSocketXMLHttpRequest
+                                                    if (! window.tempData) {
+                                                        window.tempData = { }
+                                                    }
                                                     window['res' + this.postRequestID].end = function() {
                                                         // We need to cleanup - Which is why we don't want the user to directly call res.finish()
                                                         if (document.getElementById('tempPOSThandler' + this.postRequestID)) {
                                                             document.getElementById('tempPOSThandler' + this.postRequestID).remove()
                                                         }
+                                                        delete window['req' + this.postRequestID]
+                                                        delete window['res' + this.postRequestID]
                                                         delete this.postRequest
-                                                        delete window.res
-                                                        delete window.req
-                                                        delete window.httpRequest
+                                                        delete this.postRequestID
                                                         if (window.postKey) {
                                                             delete window.postKey
                                                         }
                                                         this.finish()
                                                     }
                                                     // Mount the file using a blob. Chrome's content security policy will not allow eval()
-                                                    var contents = '(function() {\nvar handler = function(req, res, httpRequest) {\n' + e.target.result + '\n};\nhandler(window.req' + this.postRequestID + ', window.res' + this.postRequestID + ', window.httpRequest)\n})();'
+                                                    var contents = '(function() {\nvar handler = function(req, res, httpRequest) {\n' + e.target.result + '\n};\nhandler(window.req' + this.postRequestID + ', window.res' + this.postRequestID + ', WSC.ChromeSocketXMLHttpRequest)\n})();'
                                                     var contents = new TextEncoder('utf-8').encode(contents)
                                                     var blob = new Blob([contents], {type : 'text/javascript'})
                                                     this.postRequest = document.createElement("script")
@@ -691,6 +692,12 @@
                                                 var filefound = true
                                             }
                                         }
+                                        if (origdata[i].type == 'serverSideJavaScript' && ! filefound) {
+                                            if (this.request.origpath.split('/').pop() == origdata[i].original_request_path || (origdata[i].original_request_path.split('.').pop() == 'html' && origdata[i].original_request_path.split('/').pop().split('.')[0] == this.request.origpath.split('/').pop())) {
+                                                var data = origdata[i]
+                                                var filefound = true
+                                            }
+                                        }
                                         if ((origdata[i].request_path == filerequested || origdata[i].request_path == 'all files') &&
                                             ! filefound &&
                                             origdata[i].type != 'allow delete' &&
@@ -701,12 +708,13 @@
                                             origdata[i].type != 'directory listing' &&
                                             origdata[i].type != 'additional header' &&
                                             origdata[i].type != 'send directory contents' &&
-                                            origdata[i].type != 'POSTkey') {
+                                            origdata[i].type != 'POSTkey' &&
+                                            origdata[i].type != 'serverSideJavaScript') {
                                                 var data = origdata[i]
                                                 //console.log(data)
                                                 var filefound = true
                                         }
-                                        if (origdata[i].request_path == filerequested && origdata[i].type == 'POSTkey') {
+                                        if (this.request.origpath.split('/').pop() == origdata[i].original_request_path && origdata[i].type == 'POSTkey') {
                                             var hasPost = true
                                         }
                                         //console.log(origdata[i].request_path == filerequested)
@@ -930,7 +938,7 @@
                                                     this.htaccessError.bind(this)('missing key')
                                                     return
                                                 }
-                                                this.fs.getByPath(this.request.path, function(file) {
+                                                this.fs.getByPath(WSC.utils.stripOffFile(this.request.origpath) + data.original_request_path, function(file) {
                                                     if (file && ! file.error && file.isFile) {
                                                         file.file(function(file) {
                                                             var reader = new FileReader()
@@ -951,24 +959,25 @@
                                                                     this.getRequestID = Math.random().toString().split('.').pop()
                                                                     window['req' + this.getRequestID] = this.request
                                                                     window['res' + this.getRequestID] = this
-                                                                    window.tempData = { }
-                                                                    window.httpRequest = WSC.ChromeSocketXMLHttpRequest
+                                                                    if (! window.tempData) {
+                                                                        window.tempData = { }
+                                                                    }
                                                                     window['res' + this.getRequestID].end = function() {
                                                                         // We need to cleanup - Which is why we don't want the user to directly call res.finish()
                                                                         if (document.getElementById('tempGEThandler' + this.getRequestID)) {
                                                                             document.getElementById('tempGEThandler' + this.getRequestID).remove()
                                                                         }
+                                                                        delete window['req' + this.getRequestID]
+                                                                        delete window['res' + this.getRequestID]
                                                                         delete this.getRequest
-                                                                        delete window.res
-                                                                        delete window.req
-                                                                        delete window.httpRequest
+                                                                        delete this.getRequestID
                                                                         if (window.SSJSKey) {
                                                                             delete window.SSJSKey
                                                                         }
                                                                         this.finish()
                                                                     }
                                                                     // Mount the file using a blob. Chrome's content security policy will not allow eval()
-                                                                    var contents = '(function() {\nvar handler = function(req, res, httpRequest) {\n' + e.target.result + '\n};\nhandler(window.req' + this.getRequestID + ', window.res' + this.getRequestID + ', window.httpRequest)\n})();'
+                                                                    var contents = '(function() {\nvar handler = function(req, res, httpRequest) {\n' + e.target.result + '\n};\nhandler(window.req' + this.getRequestID + ', window.res' + this.getRequestID + ', WSC.ChromeSocketXMLHttpRequest)\n})();'
                                                                     var contents = new TextEncoder('utf-8').encode(contents)
                                                                     var blob = new Blob([contents], {type : 'text/javascript'})
                                                                     this.getRequest = document.createElement("script")
@@ -981,8 +990,10 @@
                                                             }.bind(this)
                                                             reader.readAsText(file)
                                                         }.bind(this))
+                                                    } else if (file.isDirectory) {
+                                                        this.error('SSJS cannot be performed on a directory', 500)
                                                     } else {
-                                                        excludedothtmlcheck.bind(this)()
+                                                        this.error('<h1>404 - File not found</h1>', 404)
                                                     }
                                                 }.bind(this))
                                             } else {
diff --git a/log-full.js b/log-full.js
index 6c45bce9..523294ce 100644
--- a/log-full.js
+++ b/log-full.js
@@ -50,6 +50,12 @@
             return
         }
         function saveLogs() {
+            if (! app) {
+                return
+            }
+            if (! app.fs) {
+                return
+            }
             if (app.opts.optSaveLogs) {
                 if (console.logs.length > 0) {
                     var a = console.logs

From cb514a60d036e683db24ac35dfff72ea12091b49 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 15 Jul 2021 21:21:16 -0500
Subject: [PATCH 140/154] Add some things

---
 handlers.js            | 30 +++++++++++++++++++++---------
 react-ui/js/index.js   |  6 ++++--
 react-ui/js/options.js | 12 ++++++++++++
 3 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/handlers.js b/handlers.js
index 7f4ac010..ed7f255d 100644
--- a/handlers.js
+++ b/handlers.js
@@ -797,9 +797,13 @@
                                                                             var modified = WSC.utils.lastModified(filee.modificationTime)
                                                                             var filesizestr = WSC.utils.humanFileSize(filee.size)
                                                                             var modifiedstr = WSC.utils.lastModifiedStr(filee.modificationTime)
-                                                                            if (rawname != 'wsc.htaccess') {
-                                                                                html.push('<script>addRow("'+rawname+'", "'+name+'", '+isdirectory+', '+filesize+', "'+filesizestr+'", '+modified+', "'+modifiedstr+'")</script>')
-                                                                            }
+																			if (! results[w].name.startsWith('.')) {
+																				if (rawname != 'wsc.htaccess' || this.app.opts.optDirListingHtaccess) {
+																					html.push('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+',"'+filesize+'","'+filesizestr+'","'+modified+'","'+modifiedstr+'");</script>')
+																				}
+																			} else if (this.app.opts.optDotFilesDirListing) {
+																				html.push('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+',"'+filesize+'","'+filesizestr+'","'+modified+'","'+modifiedstr+'");</script>')
+																			}
                                                                             if (i != results.length - 1) {
                                                                                 i++
                                                                                 sendFile.bind(this, results)()
@@ -1201,9 +1205,13 @@
                     var filesizestr = WSC.utils.humanFileSize(file.size)
                     var modifiedstr = WSC.utils.lastModifiedStr(file.modificationTime)
                     // raw, urlencoded, isdirectory, size, size as string, date modified, date modified as string
-                    if (rawname != 'wsc.htaccess') {
-                        html.push('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+',"'+filesize+'","'+filesizestr+'","'+modified+'","'+modifiedstr+'");</script>')
-                    }
+					if (! results[w].name.startsWith('.')) {
+						if (rawname != 'wsc.htaccess' || this.app.opts.optDirListingHtaccess) {
+							html.push('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+',"'+filesize+'","'+filesizestr+'","'+modified+'","'+modifiedstr+'");</script>')
+						}
+					} else if (this.app.opts.optDotFilesDirListing) {
+						html.push('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+',"'+filesize+'","'+filesizestr+'","'+modified+'","'+modifiedstr+'");</script>')
+					}
                     if (w != results.length - 1) {
                         w++
                         sendFileList.bind(this, results)()
@@ -1246,9 +1254,13 @@
                 if (results[i].isDirectory) {
                     html.push('<li class="directory"><a href="' + name + '/?static=1">' + name + '</a></li>')
                 } else {
-                    if (name != 'wsc.htaccess') {
-                        html.push('<li><a href="' + name + '?static=1">' + name + '</a></li>')
-                    }
+					if (! results[i].name.startsWith('.')) {
+						if (name != 'wsc.htaccess' || this.app.opts.optDirListingHtaccess) {
+							html.push('<li><a href="' + name + '?static=1">' + name + '</a></li>')
+						}
+					} else if (this.app.opts.optDotFilesDirListing) {
+						html.push('<li><a href="' + name + '?static=1">' + name + '</a></li>')
+					}
                 }
             }
             html.push('</ul></html>')
diff --git a/react-ui/js/index.js b/react-ui/js/index.js
index 72a1a6bf..4f6a775a 100644
--- a/react-ui/js/index.js
+++ b/react-ui/js/index.js
@@ -318,7 +318,8 @@ class App extends React.Component {
       optCORS: null,
       optIPV6: null,
       optStatic: null,
-      optUpload: null,
+	  optDotFilesDirListing: null,
+      optUpload: null
     };
     const optUploadOptions = {
       optAllowReplaceFile: ['optUpload']
@@ -391,7 +392,8 @@ class App extends React.Component {
     const optHtaccessOptions = {
       optGETHtaccess: ['optScanForHtaccess'],
       optPUTPOSTHtaccess: ['optScanForHtaccess'],
-      optDELETEHtaccess: ['optScanForHtaccess']
+      optDELETEHtaccess: ['optScanForHtaccess'],
+	  optDirListingHtaccess: ['optScanForHtaccess']
     };
     const optRewrite = {
       optModRewriteEnable: null
diff --git a/react-ui/js/options.js b/react-ui/js/options.js
index c3e1f84e..b8c11f39 100644
--- a/react-ui/js/options.js
+++ b/react-ui/js/options.js
@@ -356,6 +356,18 @@ const options = {
     type: Boolean,
     default: false
   },
+  optDirListingHtaccess: {
+    label: 'Show in directory listing',
+    help: 'Htaccess files will show in directory listing',
+    type: Boolean,
+    default: false
+  },
+  optDotFilesDirListing: {
+    label: 'Show dot files in directory listing',
+    help: 'Show/hide files starting with dot',
+    type: Boolean,
+    default: false
+  },
   optUseHttps: {
     label: 'Use https://',
     help: 'Serve pages through https://',

From e5b454619ea5d3370313a36133a6ff4c828a0c01 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Fri, 16 Jul 2021 15:47:54 -0500
Subject: [PATCH 141/154] Bug Fixes

---
 handlers.js            | 73 +++++++++++++++++++++++++++---------------
 react-ui/js/index.js   |  7 ++--
 react-ui/js/options.js |  6 ++++
 webapp.js              |  9 +++++-
 4 files changed, 66 insertions(+), 29 deletions(-)

diff --git a/handlers.js b/handlers.js
index ed7f255d..c40df74c 100644
--- a/handlers.js
+++ b/handlers.js
@@ -254,15 +254,29 @@
                                     this.htaccessError.bind(this)('missing request path')
                                     return
                                 }
+                                origdata[i].original_request_path = origdata[i].request_path
+                                origdata[i].filerequested = filerequested
+                                origdata[i].request_path = WSC.utils.htaccessFileRequested(origdata[i].request_path)
                                 if (origdata[i].type == 401 &&
                                     ! auth &&
                                     (origdata[i].request_path == filerequested || origdata[i].request_path == 'all files')) {
                                     var authdata = origdata[i]
                                     var auth = true
                                 }
-                                if (origdata[i].request_path == filerequested && origdata[i].type == 'POSTkey' && ! filefound) {
-                                    var data = origdata[i]
-                                    var filefound = true
+                                if (origdata[i].type == 'POSTkey' && ! filefound) {
+                                    if (this.request.origpath.split('/').pop() == origdata[i].original_request_path || 
+                                            (origdata[i].original_request_path.split('.').pop() == 'html' && 
+                                            origdata[i].original_request_path.split('/').pop().split('.')[0] == this.request.origpath.split('/').pop() &&
+                                            this.app.opts.optExcludeDotHtml) ||
+                                            (origdata[i].original_request_path.split('/').pop() == 'index.html' && 
+                                            this.request.origpath.endsWith('/') &&
+                                            this.app.opts.optRenderIndex) ||
+                                            (origdata[i].original_request_path.split('.').pop() == 'htm' && 
+                                            origdata[i].original_request_path.split('/').pop().split('.')[0] == this.request.origpath.split('/').pop()) && 
+                                            this.app.opts.optExcludeDotHtml && this.app.opts.optExcludeDotHtm) {
+                                        var data = origdata[i]
+                                        var filefound = true
+                                    }
                                 }
                             }
                             // Still need to validate POST key
@@ -693,7 +707,16 @@
                                             }
                                         }
                                         if (origdata[i].type == 'serverSideJavaScript' && ! filefound) {
-                                            if (this.request.origpath.split('/').pop() == origdata[i].original_request_path || (origdata[i].original_request_path.split('.').pop() == 'html' && origdata[i].original_request_path.split('/').pop().split('.')[0] == this.request.origpath.split('/').pop())) {
+                                            if (this.request.origpath.split('/').pop() == origdata[i].original_request_path || 
+                                                    (origdata[i].original_request_path.split('.').pop() == 'html' && 
+                                                    origdata[i].original_request_path.split('/').pop().split('.')[0] == this.request.origpath.split('/').pop() &&
+                                                    this.app.opts.optExcludeDotHtml) ||
+                                                    (origdata[i].original_request_path.split('/').pop() == 'index.html' && 
+                                                    this.request.origpath.endsWith('/') &&
+                                                    this.app.opts.optRenderIndex) ||
+                                                    (origdata[i].original_request_path.split('.').pop() == 'htm' && 
+                                                    origdata[i].original_request_path.split('/').pop().split('.')[0] == this.request.origpath.split('/').pop() && 
+                                                    this.app.opts.optExcludeDotHtml && this.app.opts.optExcludeDotHtm)) {
                                                 var data = origdata[i]
                                                 var filefound = true
                                             }
@@ -797,13 +820,13 @@
                                                                             var modified = WSC.utils.lastModified(filee.modificationTime)
                                                                             var filesizestr = WSC.utils.humanFileSize(filee.size)
                                                                             var modifiedstr = WSC.utils.lastModifiedStr(filee.modificationTime)
-																			if (! results[w].name.startsWith('.')) {
-																				if (rawname != 'wsc.htaccess' || this.app.opts.optDirListingHtaccess) {
-																					html.push('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+',"'+filesize+'","'+filesizestr+'","'+modified+'","'+modifiedstr+'");</script>')
-																				}
-																			} else if (this.app.opts.optDotFilesDirListing) {
-																				html.push('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+',"'+filesize+'","'+filesizestr+'","'+modified+'","'+modifiedstr+'");</script>')
-																			}
+                                                                            if (! results[w].name.startsWith('.')) {
+                                                                                if (rawname != 'wsc.htaccess' || this.app.opts.optDirListingHtaccess) {
+                                                                                    html.push('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+',"'+filesize+'","'+filesizestr+'","'+modified+'","'+modifiedstr+'");</script>')
+                                                                                }
+                                                                            } else if (this.app.opts.optDotFilesDirListing) {
+                                                                                html.push('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+',"'+filesize+'","'+filesizestr+'","'+modified+'","'+modifiedstr+'");</script>')
+                                                                            }
                                                                             if (i != results.length - 1) {
                                                                                 i++
                                                                                 sendFile.bind(this, results)()
@@ -1205,13 +1228,13 @@
                     var filesizestr = WSC.utils.humanFileSize(file.size)
                     var modifiedstr = WSC.utils.lastModifiedStr(file.modificationTime)
                     // raw, urlencoded, isdirectory, size, size as string, date modified, date modified as string
-					if (! results[w].name.startsWith('.')) {
-						if (rawname != 'wsc.htaccess' || this.app.opts.optDirListingHtaccess) {
-							html.push('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+',"'+filesize+'","'+filesizestr+'","'+modified+'","'+modifiedstr+'");</script>')
-						}
-					} else if (this.app.opts.optDotFilesDirListing) {
-						html.push('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+',"'+filesize+'","'+filesizestr+'","'+modified+'","'+modifiedstr+'");</script>')
-					}
+                    if (! results[w].name.startsWith('.')) {
+                        if (rawname != 'wsc.htaccess' || this.app.opts.optDirListingHtaccess) {
+                            html.push('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+',"'+filesize+'","'+filesizestr+'","'+modified+'","'+modifiedstr+'");</script>')
+                        }
+                    } else if (this.app.opts.optDotFilesDirListing) {
+                        html.push('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+',"'+filesize+'","'+filesizestr+'","'+modified+'","'+modifiedstr+'");</script>')
+                    }
                     if (w != results.length - 1) {
                         w++
                         sendFileList.bind(this, results)()
@@ -1254,13 +1277,13 @@
                 if (results[i].isDirectory) {
                     html.push('<li class="directory"><a href="' + name + '/?static=1">' + name + '</a></li>')
                 } else {
-					if (! results[i].name.startsWith('.')) {
-						if (name != 'wsc.htaccess' || this.app.opts.optDirListingHtaccess) {
-							html.push('<li><a href="' + name + '?static=1">' + name + '</a></li>')
-						}
-					} else if (this.app.opts.optDotFilesDirListing) {
-						html.push('<li><a href="' + name + '?static=1">' + name + '</a></li>')
-					}
+                    if (! results[i].name.startsWith('.')) {
+                        if (name != 'wsc.htaccess' || this.app.opts.optDirListingHtaccess) {
+                            html.push('<li><a href="' + name + '?static=1">' + name + '</a></li>')
+                        }
+                    } else if (this.app.opts.optDotFilesDirListing) {
+                        html.push('<li><a href="' + name + '?static=1">' + name + '</a></li>')
+                    }
                 }
             }
             html.push('</ul></html>')
diff --git a/react-ui/js/index.js b/react-ui/js/index.js
index 4f6a775a..c80a16b6 100644
--- a/react-ui/js/index.js
+++ b/react-ui/js/index.js
@@ -318,7 +318,7 @@ class App extends React.Component {
       optCORS: null,
       optIPV6: null,
       optStatic: null,
-	  optDotFilesDirListing: null,
+      optDotFilesDirListing: null,
       optUpload: null
     };
     const optUploadOptions = {
@@ -328,7 +328,8 @@ class App extends React.Component {
       optIpBlocking: null
     };
     const optIpOptions = {
-      optIpBlockList: null
+      optIpBlockList: null,
+      optIpBlockUndefined: null
     }
     const optLogMain = {
       optDelete: null,
@@ -393,7 +394,7 @@ class App extends React.Component {
       optGETHtaccess: ['optScanForHtaccess'],
       optPUTPOSTHtaccess: ['optScanForHtaccess'],
       optDELETEHtaccess: ['optScanForHtaccess'],
-	  optDirListingHtaccess: ['optScanForHtaccess']
+      optDirListingHtaccess: ['optScanForHtaccess']
     };
     const optRewrite = {
       optModRewriteEnable: null
diff --git a/react-ui/js/options.js b/react-ui/js/options.js
index b8c11f39..b276a999 100644
--- a/react-ui/js/options.js
+++ b/react-ui/js/options.js
@@ -296,6 +296,12 @@ const options = {
     type: String,
     default: '/ipBlock.list'
   },
+  optIpBlockUndefined: {
+    label: 'Block requests with an undefined ip',
+    help: 'When the request has no ip address, terminate the connection',
+    type: Boolean,
+    default: false
+  },
   optModRewriteEnable: {
     label: 'Enable mod-rewrite (for SPA)',
     help: 'For SPA (single page apps) that support HTML5 history location',
diff --git a/webapp.js b/webapp.js
index 7805197c..93d9f6e0 100644
--- a/webapp.js
+++ b/webapp.js
@@ -541,7 +541,14 @@
                     return
                 }
             }
-            
+            if (this.opts.optIpBlockUndefined && request.ip == 'undefined') {
+                var handler = new WSC.BaseHandler(request)
+                handler.app = this
+                handler.request = request
+                handler.error('<h1>403 - Forbidden</h1>', 403)
+                console.log('Blocked Request with an undefined ip address')
+                return
+            }
             if (request.path == this.opts.optIpBlockList) {
                 var handler = new WSC.BaseHandler(request)
                 handler.app = this

From 8147e4df28c09d32258e3abe08bde0ee7917eb04 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Fri, 16 Jul 2021 16:08:46 -0500
Subject: [PATCH 142/154] Update htaccess and post

---
 handlers.js       | 19 +++++++++++--------
 howTo/HTACCESS.md | 23 ++++++++++++++++++-----
 howTo/post.md     | 44 ++++++++++++++++++++++++++++++++------------
 3 files changed, 61 insertions(+), 25 deletions(-)

diff --git a/handlers.js b/handlers.js
index c40df74c..02b480a6 100644
--- a/handlers.js
+++ b/handlers.js
@@ -134,6 +134,10 @@
                                         this.htaccessError.bind(this)('missing request path')
                                         return
                                     }
+                                    if (origdata[i].type == 403 && origdata[i].request_path == filerequested) {
+                                        this.error('<h1>403 - Forbidden</h1>', 403)
+                                        return
+                                    }
                                     if ((origdata[i].request_path == filerequested && origdata[i].type == 'POSTkey') ||
                                         (origdata[i].request_path == filerequested && origdata[i].type == 'serverSideJavaScript')) {
                                         this.error('bad request', 403)
@@ -263,6 +267,10 @@
                                     var authdata = origdata[i]
                                     var auth = true
                                 }
+                                if (origdata[i].type == 403 && origdata[i].request_path == filerequested) {
+                                    this.error('<h1>403 - Forbidden</h1>', 403)
+                                    return
+                                }
                                 if (origdata[i].type == 'POSTkey' && ! filefound) {
                                     if (this.request.origpath.split('/').pop() == origdata[i].original_request_path || 
                                             (origdata[i].original_request_path.split('.').pop() == 'html' && 
@@ -767,7 +775,7 @@
                                                 this.responseLength = 0
                                                 this.writeHeaders(data.type)
                                                 this.finish()
-                                            } else if (data.type == 403) {
+                                            } else if (data.type == 'denyDirectAccess') {
                                                 var method = this.request.headers['sec-fetch-dest']
                                                 //console.log(method)
                                                 if (method == "document") {
@@ -775,6 +783,8 @@
                                                 } else {
                                                     excludedothtmlcheck.bind(this)()
                                                 }
+                                            } else if (data.type == 403) {
+                                                this.error('<h1>403 - Forbidden</h1>', 403)
                                             } else if (data.type == 'directory listing') {
                                                 function finished(results) {
                                                     if (this.request.arguments.json == '1' ||
@@ -788,9 +798,7 @@
                                                         this.renderDirectoryListingTemplate(results)
                                                     }
                                                 }
-
                                                 this.getDirContents(entry, finished.bind(this))
-
                                             } else if (data.type == 'send directory contents') {
                                                 if (! data.dir_to_send || data.dir_to_send.replace(' ', '') == '') {
                                                     data.dir_to_send = './'
@@ -1344,14 +1352,9 @@
                         results.isFile = false
                         callback(results)
                     })
-                } else if (file && ! file.error) {
-                    file.file(function(file) {
-                        callback(file)
-                    })
                 } else {
                     callback(file)
                 }
-                
             }.bind(this))
         },
         writeFile: function(path, data, allowReplaceFile, callback) {
diff --git a/howTo/HTACCESS.md b/howTo/HTACCESS.md
index 5dcc780d..ae9d03f0 100644
--- a/howTo/HTACCESS.md
+++ b/howTo/HTACCESS.md
@@ -12,7 +12,8 @@
 <p>302 - Found. Tells the server that when chosen file is requested to move to a different directory or file. Not cached by the browser</p>
 <p>307 - Temporary Redirect. Tells the server that when chosen file is requested to move to a different directory or file. Not cached by the browser.</p>
 <p>401 - Unauthorized. The page will require login. For some reason, I cannot find how to clear the cache of the authorization header, which means that once you type it in, the browser will not ask for a login, unless you have multiple password protected pages with different passwords, The authentication header will change whenever you enter a different password.</p>
-<p>403 - Forbidden. This will deny direct access to image/video/audio files. This option only works if https is enabled or if the user is on a localhost address.</p>
+<p>403 - blocks any request to the file</p>
+<p>denyDirectAccess - This will deny direct access to image/video/audio files. This option only works if https is enabled or if the user is on a localhost address.</p>
 <p>Render Directory Listing - Ignores the value of 404 instead of directory listing and renders the directory listing</p>
 <p>Deny deleting for a specific file or directory - Ignores value of delete option and will deny delete to requested file</p>
 <p>Allow deleting for certian file - Ignores value of delete option and will allow deleting requested file</p>
@@ -102,14 +103,14 @@ To use option for all files, the value of request path will be 'all files' It sh
 ]
 ```
 <br>
-<h2>403 Example</h2>
+<h2>denyDirectAccess Example</h2>
 <p>This will deny direct access to image/video/audio files. This option only works if https is enabled or if the user is on a localhost address.</p>
 
 ```
 [
     {
         "request_path": "name of file you want to modify",
-        "type": 403
+        "type": "denyDirectAccess"
     }
 ]
 ```
@@ -173,6 +174,18 @@ To use option for all files, the value of request path will be 'all files' It sh
 ]
 ```
 <br>
+<h2>403 - Block File</h2>
+<p>Just blocks the file</p>
+
+```
+[
+    {
+        "request_path": "name of file you want to modify",
+        "type": 403
+    }
+]
+```
+<br>
 <h2>Versioning</h2>
 <p>Versions of a file</p>
 
@@ -249,7 +262,7 @@ The end result will be
 [
     {
         "request_path": "name of file you want to modify",
-        "type": "send directory contents"
+        "type": "send directory contents",
         "dir_to_send": "../somepath/"
     }
 ]
@@ -285,7 +298,7 @@ This feature CANNOT use the `all files` value for the `request_path` field. You
 [
     {
         "request_path": "name of file you want to modify",
-        "type": "serverSideJavaScript"
+        "type": "serverSideJavaScript",
         "key": "ATonOfRaNdOmNumbersAndLetters"
     }
 ]
diff --git a/howTo/post.md b/howTo/post.md
index a53fde9c..fc31f16d 100644
--- a/howTo/post.md
+++ b/howTo/post.md
@@ -1,4 +1,4 @@
-.
+
 <h1>How to use Server Side POST</h1>
 <br>
 <h2>How it works</h2>
@@ -85,20 +85,25 @@ Instead of `Cookie: name=value`, you would put `res.setHeader('Cookie', 'name=va
 
 `res.getFile(path, callback)`: function
 This function will read a file. Relative urls are supported.
-If the requested path is a directory, the callback function will be called with a listing of all the files in a directory. If you would like to use a file from there you must use the file.file() function.
+If the requested path is a directory, the callback function will be called with a listing of all the files in a directory.
+To call the file use the `file.file()` function
 Example: 
 ```
 `res.getFile('../test.txt', function(file) {
-	if (file.isFile) {
-		//if the file is a file, you can read and do whatever. You will need to use a FileReader to read the file.
-	}
-	if (file.isDirectory) {
-		// This will return an array of all of the files in the directory. To use a file (as you do with file.isFile) you must use file.file() as shown below
-		file[5].file(function(file) {
-			console.log(file)
-		})
-	}
-}
+    if (file.error) {
+        console.log('error')
+    } else if (file.isFile) {
+        file.file(function(file) { // you must use the file.file() function to call the file.
+            
+            //if the file is a file, you can read and do whatever. You will need to use a FileReader to read the file.
+        })
+    } else if (file.isDirectory) {
+        // This will return an array of all of the files in the directory. To use a file you must use file.file() as shown below
+        file[2].file(function(file) {
+            console.log(file)
+        })
+    }
+})
 ```
 
 `res.contentType(type)`: function
@@ -120,6 +125,21 @@ callback: function will be excecuted to tell you if there was an error or succes
 `res.writeCode(httpCode)`: function
 Call this to respond with no message. Dont forget to finish with `res.end()`
 
+`res.renderFileContents`: function
+Once you have called the file with `res.getFile()` (DO NOT use the `file.file()` function) use `res.renderFileContents()` to render the file
+Example:
+```
+`res.getFile('../somefile.html', function(file) {
+    if (file.error) {
+        console.log('error')
+    } else if (file.isFile) {
+        res.renderFileContents(file)
+    } else if (file.isDirectory) {
+        res.renderFileContents(file[2])
+    }
+})
+```
+
 <h2>Chunked encoding</h2>
 
 `res.writeChunk`: function

From a7a003c28cd061089ab78c8b2059f889424ec749 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Tue, 20 Jul 2021 13:32:44 -0500
Subject: [PATCH 143/154] Bug Fix

---
 react-ui/js/index.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/react-ui/js/index.js b/react-ui/js/index.js
index c80a16b6..c10ad067 100644
--- a/react-ui/js/index.js
+++ b/react-ui/js/index.js
@@ -111,10 +111,6 @@ const functions = {
     console.assert(typeof val === 'string')
     app.webapp.updateOption('optCustom404usevarvar', val);
   },
-  optUsebasicauth: (app, k, val) => {
-    console.assert(typeof val === 'string')
-    app.webapp.updateOption('optUsebasicauth', val);
-  },
   optAuthUsername: (app, k, val) => {
     console.assert(typeof val === 'string')
     app.webapp.updateOption('optAuthUsername', val);

From 502a09ec8346b8ff2ebaf782eabb218fcf3b2d7c Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Tue, 20 Jul 2021 13:45:45 -0500
Subject: [PATCH 144/154] Bug fix

---
 handlers.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/handlers.js b/handlers.js
index 02b480a6..a443ca5b 100644
--- a/handlers.js
+++ b/handlers.js
@@ -729,6 +729,10 @@
                                                 var filefound = true
                                             }
                                         }
+										if ((origdata[i].request_path == filerequested || origdata[i].request_path == 'all files') && origdata[i].type == 'versioning' && ! filefound && && ! this.request.isVersioning) {
+											var data = origdata[i]
+											var filefound = true
+										}
                                         if ((origdata[i].request_path == filerequested || origdata[i].request_path == 'all files') &&
                                             ! filefound &&
                                             origdata[i].type != 'allow delete' &&
@@ -740,7 +744,8 @@
                                             origdata[i].type != 'additional header' &&
                                             origdata[i].type != 'send directory contents' &&
                                             origdata[i].type != 'POSTkey' &&
-                                            origdata[i].type != 'serverSideJavaScript') {
+                                            origdata[i].type != 'serverSideJavaScript' &&
+											origdata[i].type != 'versioning') {
                                                 var data = origdata[i]
                                                 //console.log(data)
                                                 var filefound = true

From a6308e5466b226957373a75b7bcdf102e3bcf7ee Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Tue, 20 Jul 2021 13:46:13 -0500
Subject: [PATCH 145/154] Replace tabs with spaces

---
 handlers.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/handlers.js b/handlers.js
index a443ca5b..565fc34a 100644
--- a/handlers.js
+++ b/handlers.js
@@ -729,10 +729,10 @@
                                                 var filefound = true
                                             }
                                         }
-										if ((origdata[i].request_path == filerequested || origdata[i].request_path == 'all files') && origdata[i].type == 'versioning' && ! filefound && && ! this.request.isVersioning) {
-											var data = origdata[i]
-											var filefound = true
-										}
+                                        if ((origdata[i].request_path == filerequested || origdata[i].request_path == 'all files') && origdata[i].type == 'versioning' && ! filefound && && ! this.request.isVersioning) {
+                                            var data = origdata[i]
+                                            var filefound = true
+                                        }
                                         if ((origdata[i].request_path == filerequested || origdata[i].request_path == 'all files') &&
                                             ! filefound &&
                                             origdata[i].type != 'allow delete' &&
@@ -745,7 +745,7 @@
                                             origdata[i].type != 'send directory contents' &&
                                             origdata[i].type != 'POSTkey' &&
                                             origdata[i].type != 'serverSideJavaScript' &&
-											origdata[i].type != 'versioning') {
+                                            origdata[i].type != 'versioning') {
                                                 var data = origdata[i]
                                                 //console.log(data)
                                                 var filefound = true

From 0802c0b808f82d2065ccc217dbe3d85e778cf52c Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Tue, 20 Jul 2021 13:47:56 -0500
Subject: [PATCH 146/154] bug fix

---
 handlers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/handlers.js b/handlers.js
index 565fc34a..28011346 100644
--- a/handlers.js
+++ b/handlers.js
@@ -729,7 +729,7 @@
                                                 var filefound = true
                                             }
                                         }
-                                        if ((origdata[i].request_path == filerequested || origdata[i].request_path == 'all files') && origdata[i].type == 'versioning' && ! filefound && && ! this.request.isVersioning) {
+                                        if ((origdata[i].request_path == filerequested || origdata[i].request_path == 'all files') && origdata[i].type == 'versioning' && ! filefound && ! this.request.isVersioning) {
                                             var data = origdata[i]
                                             var filefound = true
                                         }

From d016613301ee3997803b43d7d548a57e4f218a60 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Tue, 20 Jul 2021 13:51:09 -0500
Subject: [PATCH 147/154] bug fix

---
 handlers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/handlers.js b/handlers.js
index 28011346..40bf4940 100644
--- a/handlers.js
+++ b/handlers.js
@@ -452,7 +452,7 @@
                 this.write("error: need to select a directory to serve",500)
                 return
             }
-            this.request.isVersioning == false
+            this.request.isVersioning = false
             //var path = decodeURI(this.request.path)
 
             if (this.app.opts.optCacheControl) {

From 87155a8e8bd732cb7fd314272e3465cf0ea07a99 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Sat, 24 Jul 2021 20:06:45 -0500
Subject: [PATCH 148/154] Last change

---
 react-ui/js/index.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/react-ui/js/index.js b/react-ui/js/index.js
index c10ad067..9908fd5d 100644
--- a/react-ui/js/index.js
+++ b/react-ui/js/index.js
@@ -573,6 +573,12 @@ class App extends React.Component {
         </CardContent>
       </Card>
 
+      <Card className={this.classes.card}>
+        <CardContent>
+          <p>Chrome Apps are going away. As a result, this app has been translated to a standalone app. <a target="_blank" href="https://github.com/terreng/web-server/releases/">Download here!</a></p>
+        </CardContent>
+      </Card>
+
       <Card className={this.classes.card}>
         <CardContent>
 

From 420df8ca43152417f77fa23cf67597615dcf3e61 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 29 Jul 2021 15:04:26 -0500
Subject: [PATCH 149/154] Compatibility Support

---
 handlers.js   | 4 ++--
 howTo/post.md | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/handlers.js b/handlers.js
index 40bf4940..705f63ee 100644
--- a/handlers.js
+++ b/handlers.js
@@ -356,7 +356,7 @@
                                                         this.finish()
                                                     }
                                                     // Mount the file using a blob. Chrome's content security policy will not allow eval()
-                                                    var contents = '(function() {\nvar handler = function(req, res, httpRequest) {\n' + e.target.result + '\n};\nhandler(window.req' + this.postRequestID + ', window.res' + this.postRequestID + ', WSC.ChromeSocketXMLHttpRequest)\n})();'
+                                                    var contents = '(function() {\nvar handler = function(req, res, httpRequest, appInfo) {\n' + e.target.result + '\n};\nhandler(window.req' + this.postRequestID + ', window.res' + this.postRequestID + ', WSC.ChromeSocketXMLHttpRequest, {"server": "Web Server for Chrome"})\n})();'
                                                     var contents = new TextEncoder('utf-8').encode(contents)
                                                     var blob = new Blob([contents], {type : 'text/javascript'})
                                                     this.postRequest = document.createElement("script")
@@ -1017,7 +1017,7 @@
                                                                         this.finish()
                                                                     }
                                                                     // Mount the file using a blob. Chrome's content security policy will not allow eval()
-                                                                    var contents = '(function() {\nvar handler = function(req, res, httpRequest) {\n' + e.target.result + '\n};\nhandler(window.req' + this.getRequestID + ', window.res' + this.getRequestID + ', WSC.ChromeSocketXMLHttpRequest)\n})();'
+                                                                    var contents = '(function() {\nvar handler = function(req, res, httpRequest, appInfo) {\n' + e.target.result + '\n};\nhandler(window.req' + this.getRequestID + ', window.res' + this.getRequestID + ', WSC.ChromeSocketXMLHttpRequest, {"server": "Web Server for Chrome"})\n})();'
                                                                     var contents = new TextEncoder('utf-8').encode(contents)
                                                                     var blob = new Blob([contents], {type : 'text/javascript'})
                                                                     this.getRequest = document.createElement("script")
diff --git a/howTo/post.md b/howTo/post.md
index fc31f16d..6396e5ab 100644
--- a/howTo/post.md
+++ b/howTo/post.md
@@ -205,3 +205,9 @@ To send data, you can use: `request.send(data)`
 
 `window.tempData`: json
 This window variable is a place that you can store data if you need. It will NOT be cleared after the end of the response.
+
+
+<p>Want to create a script compatible between Web Server for Chrome and <a href="https://github.com/terreng/web-server">this server</a>?</p>
+
+The `appInfo` variable will tell you which server you are using
+

From 0d1a5d08312efbda6b99eaf6471a6e1beb9c0e66 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Sun, 1 Aug 2021 19:05:26 -0500
Subject: [PATCH 150/154] Update simple-web-server links

---
 howTo/post.md        | 2 +-
 react-ui/js/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/howTo/post.md b/howTo/post.md
index 6396e5ab..f71c70a4 100644
--- a/howTo/post.md
+++ b/howTo/post.md
@@ -207,7 +207,7 @@ To send data, you can use: `request.send(data)`
 This window variable is a place that you can store data if you need. It will NOT be cleared after the end of the response.
 
 
-<p>Want to create a script compatible between Web Server for Chrome and <a href="https://github.com/terreng/web-server">this server</a>?</p>
+<p>Want to create a script compatible between Web Server for Chrome and <a href="https://github.com/terreng/simple-web-server">this server</a>?</p>
 
 The `appInfo` variable will tell you which server you are using
 
diff --git a/react-ui/js/index.js b/react-ui/js/index.js
index 9908fd5d..744e808f 100644
--- a/react-ui/js/index.js
+++ b/react-ui/js/index.js
@@ -575,7 +575,7 @@ class App extends React.Component {
 
       <Card className={this.classes.card}>
         <CardContent>
-          <p>Chrome Apps are going away. As a result, this app has been translated to a standalone app. <a target="_blank" href="https://github.com/terreng/web-server/releases/">Download here!</a></p>
+          <p>Chrome Apps are going away. As a result, this app has been translated to a standalone app. <a target="_blank" href="https://github.com/terreng/simple-web-server/releases/">Download here!</a></p>
         </CardContent>
       </Card>
 

From c4c7f9e931b5b6f5a26a094281e8e205a57c4fbc Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Fri, 13 Aug 2021 14:48:01 -0500
Subject: [PATCH 151/154] Bug fix

---
 handlers.js   |  4 ++--
 howTo/post.md | 12 ------------
 utils.js      |  2 +-
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/handlers.js b/handlers.js
index 705f63ee..bce835f1 100644
--- a/handlers.js
+++ b/handlers.js
@@ -884,7 +884,7 @@
                                                             // . means current directory. Leave this here for spacing
                                                         } else if (split2[w] == '..') {
                                                             if (split1.length > 0) {
-                                                                var split1 = split1.splice(-1,1)
+                                                                var split1 = WSC.utils.stripOffFile(split1.join('/')).split('/')
                                                             }
                                                         } else {
                                                             split1.push(split2[w])
@@ -939,7 +939,7 @@
                                                             // . means current directory. Leave this here for spacing
                                                         } else if (split2[w] == '..') {
                                                             if (split1.length > 0) {
-                                                                var split1 = split1.splice(-1,1)
+                                                                var split1 = WSC.utils.stripOffFile(split1.join('/')).split('/')
                                                             }
                                                         } else {
                                                             split1.push(split2[w])
diff --git a/howTo/post.md b/howTo/post.md
index f71c70a4..2858af4e 100644
--- a/howTo/post.md
+++ b/howTo/post.md
@@ -56,18 +56,6 @@ res contains all the functions to respond, while req contains all the request in
 
 *NOTE* - You can use BOTH server side javascript and Server Side POST in the same file! Just declare 2 seperate keys in the htaccess and in the file!
 
-IMPORTANT INFORMATION - When writing the file, DO NOT surround the file in a function as you would normally do
-Do not do:
-```
-(function() {
-awefioeeai.somecode()
-
-})();
-```
-If you need to use browserify on your file, just remove the `(function() {` at the beggining and the `})();` at the end.
-
-DO NOT WORRY. This is to prevent problems with the res and req variables. Your script will be excecuted inside a function, so all return statements will work correctly
-
 
 <h1>res Commands</h1>
 
diff --git a/utils.js b/utils.js
index 59b074ab..5932ca9f 100644
--- a/utils.js
+++ b/utils.js
@@ -101,7 +101,7 @@
                     // . means current directory. Leave this here for spacing
                 } else if (split2[w] == '..') {
                     if (split1.length > 0) {
-                        var split1 = split1.splice(-1,1)
+                        var split1 = WSC.utils.stripOffFile(split1.join('/')).split('/')
                     }
                 } else {
                     split1.push(split2[w])

From 812f21c838b3a157422e925a49c19bd98c9e0a19 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Fri, 20 Aug 2021 22:11:19 -0500
Subject: [PATCH 152/154] Bug Fix

---
 connection.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/connection.js b/connection.js
index dc7ef913..691855e9 100644
--- a/connection.js
+++ b/connection.js
@@ -101,11 +101,18 @@
                         var kv = items[i].replace(/\+/g, ' ').split('=')
                         bodyparams[ decodeURIComponent(kv[0]) ] = decodeURIComponent(kv[1])
                     }
-                    req.bodyparams = bodyparams
+                    this.curRequest.bodyparams = bodyparams
                 }
             }
             this.curRequest.body = body
-            this.onRequest(this.curRequest)
+            if (['GET','HEAD','PUT','POST','DELETE','OPTIONS'].includes(method)) {
+                this.onRequest(this.curRequest)
+            } else {
+                console.error('how to handle',this.curRequest)
+                // leaving the connection open will slow the server
+                this.curRequest.connection.write('HTTP/1.1 501 Not Implemented\r\ncontent-length: 0\r\n\r\n')
+                this.curRequest.connection.stream.close()
+            }
         },
         onRequest: function(request) {
             this.onRequestCallback(request)

From 04abbb6c3aac438e236007722ef9ac379d7e6a7a Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Thu, 26 Aug 2021 08:33:50 -0500
Subject: [PATCH 153/154] Fix a not smart thingy I did

---
 background.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/background.js b/background.js
index 742342ef..274d72a9 100644
--- a/background.js
+++ b/background.js
@@ -131,7 +131,7 @@ function triggerKeepAwake() {
     // HACK: make an XHR to cause onSuspendCanceled event
     console.log('triggerKeepAwake')
     var xhr = new XMLHttpRequest
-    let prot = this.opts.optUseHttps ? 'https' : 'http';
+    let prot = app.opts.optUseHttps ? 'https' : 'http';
     xhr.open("GET",prot+"://127.0.0.1:" + (localOptions.port || 8887) + '/dummyUrlPing')
     function onload(evt) {
         console.log('triggerKeepAwake XHR loaded',evt)

From 70a0f9306916062b098f6252f3042d81b0e2f3a2 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <ethan.a.obrien@gmail.com>
Date: Fri, 25 Feb 2022 15:54:06 -0600
Subject: [PATCH 154/154] Some work

---
 handlers.js | 93 ++++++++++++++++-------------------------------------
 1 file changed, 27 insertions(+), 66 deletions(-)

diff --git a/handlers.js b/handlers.js
index bce835f1..5b283784 100644
--- a/handlers.js
+++ b/handlers.js
@@ -322,17 +322,10 @@
                                         file.file(function(file) {
                                             var reader = new FileReader()
                                             reader.onload = function(e) {
-                                                var contents = e.target.result.split('\n')
                                                 var validFile = false
-                                                for (var i=0; i<contents.length; i++) {
-                                                    contents[i] = contents[i].replaceAll('\t', '').replaceAll('\n', '').replaceAll('\r', '')
-                                                    if (contents[i].startsWith('postKey')) {
-                                                        var postkey = contents[i].split('=').pop().replaceAll(' ', '').replaceAll('"', '').replaceAll('\'', '')
-                                                        if (postkey == data.key) {
-                                                            var validFile = true
-                                                            break
-                                                        }
-                                                    }
+                                                var key = e.target.result.split('postKey')
+                                                if (key.length > 1 && key[1].replaceAll(' ', '').replaceAll('"', '\'').substring(2).split("'")[0] === data.key.replaceAll(' ', '')) {
+                                                    validFile = true
                                                 }
                                                 if (validFile) {
                                                     this.postRequestID = Math.random().toString().split('.').pop()
@@ -983,17 +976,10 @@
                                                         file.file(function(file) {
                                                             var reader = new FileReader()
                                                             reader.onload = function(e) {
-                                                                var contents = e.target.result.split('\n')
                                                                 var validFile = false
-                                                                for (var i=0; i<contents.length; i++) {
-                                                                    contents[i] = contents[i].replaceAll('\t', '').replaceAll('\n', '').replaceAll('\r', '')
-                                                                    if (contents[i].startsWith('SSJSKey')) {
-                                                                        var SSJSKey = contents[i].split('=').pop().replaceAll(' ', '').replaceAll('"', '').replaceAll('\'', '')
-                                                                        if (SSJSKey == data.key) {
-                                                                            var validFile = true
-                                                                            break
-                                                                        }
-                                                                    }
+                                                                var key = e.target.result.split('SSJSKey')
+                                                                if (key.length > 1 && key[1].replaceAll(' ', '').replaceAll('"', '\'').substring(2).split("'")[0] === data.key.replaceAll(' ', '')) {
+                                                                    validFile = true
                                                                 }
                                                                 if (validFile) {
                                                                     this.getRequestID = Math.random().toString().split('.').pop()
@@ -1220,61 +1206,36 @@
                                                                          isDirectory:f.isDirectory }
                                                               }), null, 2))
         },
-        renderDirectoryListingTemplate: function(results) {
+        renderDirectoryListingTemplate: async function(results) {
             if (! WSC.template_data) {
                 return this.renderDirectoryListing(results)
             }
-            function DirRenderFinish() {
-                this.setHeader('content-type','text/html; charset=utf-8')
-                this.write(new TextEncoder('utf-8').encode(html.join('\n')).buffer)
-                this.finish()
-            }
-            function sendFileList() {
-                results[w].getMetadata(function(file) {
-                    //console.log(file)
-                    var rawname = results[w].name
-                    var name = encodeURIComponent(results[w].name)
-                    var isdirectory = results[w].isDirectory
-                    //var modified = '4/27/21, 10:38:40 AM'
-                    var modified = WSC.utils.lastModified(file.modificationTime)
-                    var filesize = file.size
-                    var filesizestr = WSC.utils.humanFileSize(file.size)
-                    var modifiedstr = WSC.utils.lastModifiedStr(file.modificationTime)
-                    // raw, urlencoded, isdirectory, size, size as string, date modified, date modified as string
-                    if (! results[w].name.startsWith('.')) {
-                        if (rawname != 'wsc.htaccess' || this.app.opts.optDirListingHtaccess) {
-                            html.push('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+',"'+filesize+'","'+filesizestr+'","'+modified+'","'+modifiedstr+'");</script>')
-                        }
-                    } else if (this.app.opts.optDotFilesDirListing) {
-                        html.push('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+',"'+filesize+'","'+filesizestr+'","'+modified+'","'+modifiedstr+'");</script>')
-                    }
-                    if (w != results.length - 1) {
-                        w++
-                        sendFileList.bind(this, results)()
-                    } else {
-                        DirRenderFinish.bind(this, results)()
-                    }
-                }.bind(this), function(error) {
-                    console.error('error reading metadata '+error)
-                    if (w != results.length - 1) {
-                        w++
-                        sendFileList.bind(this, results)()
-                    } else {
-                        DirRenderFinish.bind(this, results)()
-                    }
-                }.bind(this))
-            }
             var html = [WSC.template_data]
             html.push('<script>start("'+this.request.origpath+'")</script>')
             if (this.request.origpath != '/') {
                 html.push('<script>onHasParentDirectory();</script>')
             }
-            var w = 0
-            if (results.length == 0) {
-                DirRenderFinish.bind(this)()
-                return
+            for (var i=0; i<results.length; i++) {
+                html.push(await new Promise(function(resolve, reject) {
+                    results[i].getMetadata(function(file) {
+                        var rawname = results[w].name
+                        var name = encodeURIComponent(results[w].name)
+                        var isdirectory = results[w].isDirectory
+                        //var modified = '4/27/21, 10:38:40 AM'
+                        var modified = WSC.utils.lastModified(file.modificationTime)
+                        var filesize = file.size
+                        var filesizestr = WSC.utils.humanFileSize(file.size)
+                        var modifiedstr = WSC.utils.lastModifiedStr(file.modificationTime)
+                        // raw, urlencoded, isdirectory, size, size as string, date modified, date modified as string
+                        if ((! results[w].name.startsWith('.') || this.app.opts.optDotFilesDirListing) && (rawname !== 'wsc.htaccess' || this.app.opts.optDirListingHtaccess)) {
+                            resolve('<script>addRow("'+rawname+'","'+name+'",'+isdirectory+',"'+filesize+'","'+filesizestr+'","'+modified+'","'+modifiedstr+'");</script>')
+                        }
+                    })
+                }))
             }
-            sendFileList.bind(this, results)()
+            this.setHeader('content-type','text/html; charset=utf-8')
+            this.write(new TextEncoder('utf-8').encode(html.join('\n')).buffer)
+            this.finish()
         },
         renderDirectoryListing: function(results) {
             var html = ['<html>']