add setup script to only replace values in template html once

tobycm · tobycm · commit e55fd05d090a · 2023-02-24T10:15:21.000-08:00
diff --git a/main.py b/main.py
@@ -39,11 +39,6 @@ class CApp(FastAPI):
 
 LETTERS_AND_DIGITS = ascii_letters + digits
 
-VSCODE_DOMAIN = os.getenv("VSCODE_DOMAIN")
-if VSCODE_DOMAIN is None:
-    exit("VSCODE_DOMAIN is not set")
-
-ROOT_DOMAIN = f".{VSCODE_DOMAIN.split('.')[-2]}.{VSCODE_DOMAIN.split('.')[-1]}"
 EXPIRE_TIME = int(os.getenv("EXPIRE_TIME", "30"))
 
 SOCKET_FOLDER = os.getenv("SOCKET_FOLDER", "/run/code_server_sockets")
@@ -131,11 +126,7 @@ async def callback(code: str):
         await routes.write(json.dumps(socket_paths))
 
     # redirect user to code-server
-    return HTMLResponse(
-        TEMPLATE_HTML.replace("%pls-replace-me%", session_id)
-        .replace("%root_domain%", ROOT_DOMAIN)
-        .replace("%vscode_domain%", VSCODE_DOMAIN)
-    )
+    return HTMLResponse(TEMPLATE_HTML.replace("%pls-replace-me%", session_id))
 
 
 @app.get("/oauth2/callback/reset_session")
diff --git a/modules/server_starter.py b/modules/server_starter.py
@@ -23,6 +23,8 @@ async def start_code_server(user: str, expire_time: int):
 
     socket_path = f"{SOCKET_FOLDER}/{user}_code_server.sock"
 
+    Popen(["sudo", "rm", "-f", socket_path])
+
     Popen(["sudo", "runuser", "-l", user, "-c", f"code-server --socket {socket_path}"])
 
     while True:
diff --git a/response.html b/response.html
@@ -1,20 +1,22 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta id="session_id" content="%pls-replace-me%">
     <title>Intermission</title>
 </head>
+
 <body onload="load()">
     <script>
         function setCookie() {
             const session_id = document.getElementById("session_id").getAttribute("content");
             const date = new Date();
             const expire_days = 2;
             date.setTime(date.getTime() + (expire_days * 24 * 60 * 60 * 1000));
-            let expires = "expires="+ date.toUTCString();
+            const expires = "expires=" + date.toUTCString();
             document.cookie = "session_id=" + session_id + ";" + expires + ";domain=%root_domain%;path=/";
         }
 
@@ -27,6 +29,7 @@
             redirectUser();
         }
     </script>
-    
+
 </body>
-</html>
+
+</html>
diff --git a/setup.py b/setup.py
@@ -0,0 +1,11 @@
+with open("response.html", "r+", encoding="utf8") as template_file:
+    root_domain = "." + input("Enter your root domain (ex: tobycm.ga): ")
+    vscode_domain = input(f"Enter your VS Code domain (default: vscode{root_domain}): ")
+    if vscode_domain == "":
+        vscode_domain = f"vscode{root_domain}"
+
+    template_file.write(
+        template_file.read()
+        .replace("%root_domain%", root_domain)
+        .replace("%vscode_domain%", vscode_domain)
+    )
