From cb4319bee0de3666a0dbeb1274ddcb4652338fe0 Mon Sep 17 00:00:00 2001
From: Yann Stepienik <azukaar@gmail.com>
Date: Tue, 4 Jul 2023 11:52:38 +0100
Subject: [PATCH] [release] v0.9.0-unstable10

---
 client/src/pages/config/routes/newRoute.jsx   |  2 +-
 client/src/pages/config/users/restart.jsx     | 49 +++++++++++++------
 .../pages/servapps/containers/newService.jsx  |  2 +-
 client/src/pages/servapps/servapps.jsx        |  2 +-
 package.json                                  |  2 +-
 src/utils/middleware.go                       |  2 +-
 6 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/client/src/pages/config/routes/newRoute.jsx b/client/src/pages/config/routes/newRoute.jsx
index 802c6a7..9fda288 100644
--- a/client/src/pages/config/routes/newRoute.jsx
+++ b/client/src/pages/config/routes/newRoute.jsx
@@ -30,7 +30,7 @@ const NewRouteCreate = ({ openNewModal, setOpenNewModal, config }) => {
   const routes = config.HTTPConfig.ProxyConfig.Routes || [];
 
   return <>
-  <RestartModal openModal={openRestartModal} setOpenModal={setOpenRestartModal} config={config} />
+  <RestartModal openModal={openRestartModal} setOpenModal={setOpenRestartModal} config={config} newRoute />
   <Dialog open={openNewModal} onClose={() => setOpenNewModal(false)}>
     <DialogTitle>New URL</DialogTitle>
         {openNewModal && <>
diff --git a/client/src/pages/config/users/restart.jsx b/client/src/pages/config/users/restart.jsx
index 6a843f5..8f15e66 100644
--- a/client/src/pages/config/users/restart.jsx
+++ b/client/src/pages/config/users/restart.jsx
@@ -34,27 +34,46 @@ function checkIsOnline() {
     });
 }
 
-const RestartModal = ({openModal, setOpenModal, config}) => {
+const RestartModal = ({openModal, setOpenModal, config, newRoute }) => {
     const [isRestarting, setIsRestarting] = useState(false);
     const [warn, setWarn] = useState(false);
     const needsRefresh = config && (config.HTTPConfig.HTTPSCertificateMode == "SELFSIGNED" ||
         !isDomain(config.HTTPConfig.Hostname))
     const isNotDomain = config && !isDomain(config.HTTPConfig.Hostname);
+    const newRouteWarning = config.HTTPConfig.HTTPSCertificateMode == "LETSENCRYPT" && newRoute && 
+        !config.HTTPConfig.DNSChallengeProvider;
 
-    return config ? (needsRefresh && <>
-        <Dialog open={openModal} onClose={() => setOpenModal(false)}>
-            <DialogTitle>Refresh Page</DialogTitle>
-            <DialogContent>
-                <DialogContentText>
-                    You need to refresh the page because you are using a self-signed certificate, in case you have to accept any new certificates. To avoid it in the future, please use Let's Encrypt. {isNotDomain && 'You are also not using a domain name, the server might go offline for a few seconds to remap your docker ports.'}
-                </DialogContentText>
-            </DialogContent>
-            <DialogActions>
-                <Button onClick={() => {
-                    window.location.reload(true);                
-                }}>Refresh</Button>
-            </DialogActions>
-        </Dialog>
+    return config ? (<>
+        {needsRefresh && <>
+            <Dialog open={openModal} onClose={() => setOpenModal(false)}>
+                <DialogTitle>Refresh Page</DialogTitle>
+                <DialogContent>
+                    <DialogContentText>
+                        You need to refresh the page because you are using a self-signed certificate, in case you have to accept any new certificates. To avoid it in the future, please use Let's Encrypt. {isNotDomain && 'You are also not using a domain name, the server might go offline for a few seconds to remap your docker ports.'}
+                    </DialogContentText>
+                </DialogContent>
+                <DialogActions>
+                    <Button onClick={() => {
+                        window.location.reload(true);                
+                    }}>Refresh</Button>
+                </DialogActions>
+            </Dialog>
+        </>}
+        {newRouteWarning && <>
+            <Dialog open={openModal} onClose={() => setOpenModal(false)}>
+                <DialogTitle>Certificate Renewal</DialogTitle>
+                <DialogContent>
+                    <DialogContentText>
+                        You are using Let's Encrypt but you are not using the DNS Challenge. This means the server has to renew the certificate everytime you add a new hostname, causing a few seconds of downtime. To avoid it in the future, please use the DNS Challenge.
+                    </DialogContentText>
+                </DialogContent>
+                <DialogActions>
+                    <Button onClick={() => {
+                        setOpenModal(false);             
+                    }}>OK</Button>
+                </DialogActions>
+            </Dialog>
+        </>}
     </>)
     :(<>
         <Dialog open={openModal} onClose={() => setOpenModal(false)}>
diff --git a/client/src/pages/servapps/containers/newService.jsx b/client/src/pages/servapps/containers/newService.jsx
index 7c77b3b..4c0b69f 100644
--- a/client/src/pages/servapps/containers/newService.jsx
+++ b/client/src/pages/servapps/containers/newService.jsx
@@ -96,7 +96,7 @@ const NewDockerService = ({service, refresh}) => {
 
   return   <div style={{ maxWidth: '1000px', width: '100%', margin: '', position: 'relative' }}>
     <MainCard title="Create Service">
-    <RestartModal openModal={openModal} setOpenModal={setOpenModal} config={config} />
+    <RestartModal openModal={openModal} setOpenModal={setOpenModal} config={config} newRoute />
     <Stack spacing={1}>
       {!isDone && <LoadingButton 
         onClick={create}
diff --git a/client/src/pages/servapps/servapps.jsx b/client/src/pages/servapps/servapps.jsx
index 9f24dce..5234be0 100644
--- a/client/src/pages/servapps/servapps.jsx
+++ b/client/src/pages/servapps/servapps.jsx
@@ -127,7 +127,7 @@ const ServApps = () => {
   }
 
   return <div>
-    <RestartModal openModal={openRestartModal} setOpenModal={setOpenRestartModal} config={config} />
+    <RestartModal openModal={openRestartModal} setOpenModal={setOpenRestartModal} config={config} newRoute />
     <ExposeModal
       openModal={openModal} 
       setOpenModal={setOpenModal}
diff --git a/package.json b/package.json
index 3f9bb10..4cab252 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cosmos-server",
-  "version": "0.9.0-unstable9",
+  "version": "0.9.0-unstable10",
   "description": "",
   "main": "test-server.js",
   "bugs": {
diff --git a/src/utils/middleware.go b/src/utils/middleware.go
index 8759f19..8f70473 100644
--- a/src/utils/middleware.go
+++ b/src/utils/middleware.go
@@ -196,7 +196,7 @@ func EnsureHostname(next http.Handler) http.Handler {
 		if !isOk {
 			Error("Invalid Hostname " + r.Host + " for request. Expecting one of " + fmt.Sprintf("%v", hostnames), nil)
 			w.WriteHeader(http.StatusBadRequest)
-			http.Error(w, "Bad Request: Invalid hostname.", http.StatusBadRequest)
+			http.Error(w, "Bad Request: Invalid hostname. Use your domain instead of your IP to access your server. Check logs if more details are needed.", http.StatusBadRequest)
 			return
 		}