From e4492c41aa82d934746aec9682b5f4fd6c301faa Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Wed, 18 Dec 2019 21:24:39 +0100
Subject: [PATCH] configurator: Fix and enforce secure base path (#906)

* configurator: Fix typo in ENFORCE_BASEPATH option

* configurator: Enforce base path by default

* configurator: Bump version to 4.1
---
 configurator/CHANGELOG.md | 5 +++++
 configurator/config.json  | 4 ++--
 configurator/data/run.sh  | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/configurator/CHANGELOG.md b/configurator/CHANGELOG.md
index da1b06c..eadcfca 100644
--- a/configurator/CHANGELOG.md
+++ b/configurator/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 4.1
+
+- Fixes an issue with the enforce base path option
+- Enforce secure base path by default
+
 ## 4.0
 
 - Removed direct access from the add-on, making the add-on Ingress only
diff --git a/configurator/config.json b/configurator/config.json
index 6c2a984..feb50f3 100644
--- a/configurator/config.json
+++ b/configurator/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Configurator",
-  "version": "4.0",
+  "version": "4.1",
   "slug": "configurator",
   "description": "Browser-based configuration file editor for Home Assistant",
   "url": "https://github.com/home-assistant/hassio-addons/tree/master/configurator",
@@ -14,7 +14,7 @@
   "map": ["backup:rw", "config:rw", "share:rw", "ssl:rw"],
   "options": {
     "dirsfirst": false,
-    "enforce_basepath": false,
+    "enforce_basepath": true,
     "ignore_pattern": ["__pycache__", ".cloud", ".storage", "deps"],
     "ssh_keys": []
   },
diff --git a/configurator/data/run.sh b/configurator/data/run.sh
index e3d0467..9942d84 100755
--- a/configurator/data/run.sh
+++ b/configurator/data/run.sh
@@ -32,7 +32,7 @@ fi
 # Setup and run configurator
 export HC_HASS_API_PASSWORD="${HASSIO_TOKEN}"
 export HC_DIRFIRST="${DIRSFIRST}"
-export HC_ENFORECE_BASEPATH="${ENFORCE_BASEPATH}"
+export HC_ENFORCE_BASEPATH="${ENFORCE_BASEPATH}"
 export HC_IGNORE_PATTERN="${IGNORE_PATTERN}"
 
 exec hass-configurator /etc/configurator.conf