From 927f84dceaed0f3edfcdf2a5e47242961cf5be3b Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Tue, 21 Dec 2021 01:55:59 +0200
Subject: [PATCH] fdsfsd

---
 docker-compose.yml |  1 -
 env                |  1 -
 files/__main__.py  | 11 ++++++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 496cf97a3..cb8253dd8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,6 @@ services:
       - DOMAIN=localhost
       - SITE_NAME=Drama
       - GIPHY_KEY=3435tdfsdudebussylmaoxxt43
-      - FORCE_HTTPS=0
       - DISCORD_SERVER_ID=3435tdfsdudebussylmaoxxt43
       - DISCORD_CLIENT_ID=3435tdfsdudebussylmaoxxt43
       - DISCORD_CLIENT_SECRET=3435tdfsdudebussylmaoxxt43
diff --git a/env b/env
index a3f4b83fb..f96bfbb8d 100644
--- a/env
+++ b/env
@@ -3,7 +3,6 @@ export MASTER_KEY="XuxGqp5NyygJrM24b5gt3YgyvFVGdQnwVDwLzLwpu3eQwY"
 export DOMAIN="localhost"
 export SITE_NAME="Drama"
 export GIPHY_KEY="3435tdfsdudebussylmaoxxt43"
-export FORCE_HTTPS="0"
 export DISCORD_SERVER_ID="3435tdfsdudebussylmaoxxt43"
 export DISCORD_CLIENT_ID="3435tdfsdudebussylmaoxxt43"
 export DISCORD_CLIENT_SECRET="3435tdfsdudebussylmaoxxt43"
diff --git a/files/__main__.py b/files/__main__.py
index cbd4e811d..d0e715658 100644
--- a/files/__main__.py
+++ b/files/__main__.py
@@ -27,6 +27,7 @@ app.jinja_env.cache = {}
 app.jinja_env.auto_reload = True
 import faulthandler
 faulthandler.enable()
+	
 
 app.config["SITE_NAME"]=environ.get("SITE_NAME").strip()
 app.config["COINS_NAME"]=environ.get("COINS_NAME").strip()
@@ -39,14 +40,14 @@ app.config['SEND_FILE_MAX_AGE_DEFAULT'] = 86400
 app.config["SESSION_COOKIE_NAME"] = f'session_{environ.get("DOMAIN")}'.strip().lower()
 app.config["VERSION"] = "1.0.0"
 app.config['MAX_CONTENT_LENGTH'] = 8 * 1024 * 1024
-app.config["SESSION_COOKIE_SECURE"] = bool(int(environ.get("FORCE_HTTPS", 1)))
+app.config["SESSION_COOKIE_SECURE"] = True
 app.config["SESSION_COOKIE_SAMESITE"] = "Lax"
 app.config["PERMANENT_SESSION_LIFETIME"] = 60 * 60 * 24 * 365
 app.config["SESSION_REFRESH_EACH_REQUEST"] = True
 app.config["SLOGAN"] = environ.get("SLOGAN", "").strip()
 app.config["DEFAULT_COLOR"] = environ.get("DEFAULT_COLOR", "ff0000").strip()
 app.config["DEFAULT_THEME"] = environ.get("DEFAULT_THEME", "midnight").strip()
-app.config["FORCE_HTTPS"] = int(environ.get("FORCE_HTTPS", 1)) if ("localhost" not in app.config["SERVER_NAME"] and "localhost" not in app.config["SERVER_NAME"]) else 0
+app.config["FORCE_HTTPS"] = True
 app.config["UserAgent"] = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.107 Safari/537.36"
 app.config["HCAPTCHA_SITEKEY"] = environ.get("HCAPTCHA_SITEKEY","").strip()
 app.config["HCAPTCHA_SECRET"] = environ.get("HCAPTCHA_SECRET","").strip()
@@ -71,6 +72,10 @@ app.config['MAIL_USE_TLS'] = True
 app.config['MAIL_USERNAME'] = environ.get("MAIL_USERNAME", "").strip()
 app.config['MAIL_PASSWORD'] = environ.get("MAIL_PASSWORD", "").strip()
 
+app.config["SESSION_USE_SIGNER"] = True
+app.config["SESSION_COOKIE_DOMAIN"] = app.config["SERVER_NAME"]
+
+
 r=redis.Redis(host=environ.get("REDIS_URL", "redis://localhost"),  decode_responses=True, ssl_cert_reqs=None)
 
 limiter = Limiter(
@@ -106,7 +111,7 @@ def before_request():
 		session.permanent = True
 		if not session.get("session_id"): session["session_id"] = secrets.token_hex(16)
 
-	if app.config["FORCE_HTTPS"] and request.url.startswith("http://") and "localhost" not in app.config["SERVER_NAME"]:
+	if request.url.startswith("http://") and "localhost" not in app.config["SERVER_NAME"]:
 		url = request.url.replace("http://", "https://", 1)
 		return redirect(url, code=301)