Merge pull request #88 from jocxfin/85-environment-variable-for-domain-subpaths

85 environment variable for domain subpaths

Author: jocxfin

app.py

@@ -5,28 +5,28 @@
 import config
 import string
 import secrets
-from utils.password_utils import (calculate_entropy, check_password_pwned,generate_passphrase, get_random_separator, filter_homoglyphs)
+from utils.password_utils import (calculate_entropy, check_password_pwned, generate_passphrase, get_random_separator, filter_homoglyphs)
 from handlers.request_handler import handle_generate_password_request
 
-app = Flask(__name__)
+app = Flask(__name__, static_url_path=config.BASE_PATH + 'static')  
 cache = Cache(app, config={'CACHE_TYPE': config.CACHE_TYPE})
 
-@app.route('/')
+@app.route(config.BASE_PATH + '/')  
 def index():
     no_api_check = config.NO_API_CHECK
     multi_gen = config.MULTI_GEN
     no_lang = config.PP_HIDE_LANG
     generate_pp = config.GENERATE_PP
     google_site_verification = config.GOOGLE_SITE_VERIFICATION
-    
+
     pw_settings = {
         'length': config.PW_LENGTH,
         'include_uppercase': config.PW_INCLUDE_UPPERCASE,
         'include_digits': config.PW_INCLUDE_DIGITS,
         'include_special': config.PW_INCLUDE_SPECIAL,
         'exclude_homoglyphs': config.PW_EXCLUDE_HOMOGLYPHS
     }
-    
+
     pp_settings = {
         'word_count': config.PP_WORD_COUNT,
         'capitalize': config.PP_CAPITALIZE,
@@ -38,10 +38,12 @@ def index():
         'language': config.PP_LANGUAGE,
         'languageCustom': config.PP_LANGUAGE_CUSTOM
     }
-    
-    return render_template('index.html', no_api_check=no_api_check, pw_settings=pw_settings, pp_settings=pp_settings, multi_gen=multi_gen, no_lang=no_lang, generate_pp=generate_pp, google_site_verification=google_site_verification)
 
-@app.route('/generate-password', methods=['POST'])
+    return render_template('index.html', no_api_check=no_api_check, pw_settings=pw_settings, pp_settings=pp_settings,
+                           multi_gen=multi_gen, no_lang=no_lang, generate_pp=generate_pp,
+                           google_site_verification=google_site_verification, base_path=config.BASE_PATH)
+
+@app.route(config.BASE_PATH + '/generate-password', methods=['POST'])  
 async def generate_password_route():
     if config.MULTI_GEN:
         passwords = [await handle_generate_password_request(request.form) for _ in range(5)]
@@ -50,7 +52,7 @@ async def generate_password_route():
         response_data = await handle_generate_password_request(request.form)
     return jsonify(response_data)
 
-@app.route('/robots.txt')
+@app.route(config.BASE_PATH + '/robots.txt')  
 def robots():
     if not config.ROBOTS_ALLOW:
         content = """
@@ -64,19 +66,12 @@ def robots():
         """
     return Response(content, mimetype='text/plain')
 
-@app.route('/manifest.json')
-async def serve_manifest():
-    cache_key = 'manifest.json'
-    cached_content = cache.get(cache_key)
-    if cached_content is None:
-        with open('manifest.json', 'r') as file:
-            content = file.read()
-            cache.set(cache_key, content, timeout=3600)
-            cached_content = content
-    return Response(cached_content, mimetype='application/manifest+json')
+@app.route(config.BASE_PATH + '/manifest.json')  
+def serve_manifest():
+    return send_file('manifest.json', mimetype='application/manifest+json')
 
-@app.route('/service-worker.js')
-async def serve_sw():
+@app.route(config.BASE_PATH + '/service-worker.js')  
+def serve_sw():
     return send_file('service-worker.js', mimetype='application/javascript')
 
-app_asgi = WsgiToAsgi(app)
+app_asgi = WsgiToAsgi(app)

config.py

@@ -22,6 +22,7 @@
 PP_HIDE_LANG = os.getenv('PP_HIDE_LANG', 'false').lower() == 'true'
 GENERATE_PP = os.getenv('GENERATE_PP', 'false').lower() == 'true'
 DISABLE_URL_CHECK = os.getenv('DISABLE_URL_CHECK', 'false').lower() == 'true'
+BASE_PATH = os.getenv('BASE_PATH', '/')
 
 special_characters = "!£$%^&*(){},./;:#*-+"
 
@@ -35,4 +36,4 @@
 with open('wordlist_fi.txt', 'r') as file:
     word_list_fi = [line.strip() for line in file.readlines() if len(line.strip()) <= 12]
 
-haveibeenpwnedapi = 'https://api.pwnedpasswords.com/range/'
+haveibeenpwnedapi = 'https://api.pwnedpasswords.com/range/'

handlers/request_handler.py

@@ -61,4 +61,4 @@ async def handle_generate_password_request(request_form):
             attempt += 1
 
     entropy = calculate_entropy(password)
-    return {"password": password, "entropy": entropy}
+    return {"password": password, "entropy": entropy}

manifest.json

@@ -3,24 +3,24 @@
   "name": "Secure Password Generator",
   "icons": [
     {
-      "src": "/static/favicon.png",
+      "src": "./static/favicon.png",  
       "sizes": "64x64 32x32 24x24 16x16",
       "type": "image/png"
     },
     {
-      "src": "/static/favicon.png",
+      "src": "./static/favicon.png",  
       "type": "image/png",
       "sizes": "192x192"
     },
     {
-      "src": "/static/favicon.png",
+      "src": "./static/favicon.png",  
       "type": "image/png",
       "sizes": "512x512"
     }
   ],
-  "start_url": "/",
-  "scope": "/",
+  "start_url": "./",  
+  "scope": "./",      
   "display": "standalone",
   "theme_color": "#41436A",
   "background_color": "#2A3850"
-}
+}

service-worker.js

@@ -1,9 +1,9 @@
 const CACHE_NAME = 'pwgen-cache-v1';
 const urlsToCache = [
-  '/',
-  '/static/styles.css',
-  '/static/favicon.png',
-  '/manifest.json'
+  './',                     
+  './static/styles.css',    
+  './static/favicon.png',   
+  './manifest.json'         
 ];
 
 self.addEventListener('install', (event) => {

static/index.js

@@ -16,6 +16,7 @@ const includeSpecialChars = document.getElementById('includeSpecialChars');
 const excludeHomoglyphs = document.getElementById('excludeHomoglyphs');
 const refreshpw = document.getElementById('refreshpw');
 const languageSelect = document.getElementById('languageSelect');
+const BASE_PATH = window.BASE_PATH || '';
 
 separator.onchange = () => customSeparator.style.display = separator.value === 'custom' ? 'block' : 'none';
 
@@ -34,7 +35,6 @@ document.querySelectorAll('input, select').forEach(element => {
     }
 });
 
-
 async function generatePassword() {
     const formData = new FormData();
     formData.append('length', lengthSlider.value);
@@ -57,7 +57,7 @@ async function generatePassword() {
         formData.append('languageCustom', customLanguage.value);
     }
 
-    fetch('/generate-password', {
+    fetch(`${BASE_PATH}generate-password`, {
         method: 'POST',
         body: formData
     })
@@ -82,7 +82,6 @@ async function generatePassword() {
     });
 }
 
-
 function scrambleAnimation(finalPassword) {
     let scrambled = Array.from({ length: finalPassword.length }, () => getRandomCharacter());
     passwordInput.value = scrambled.join('');
@@ -116,6 +115,7 @@ wordCountSlider.oninput = function () {
 lengthSlider.oninput = function () {
     lengthValue.innerText = this.value;
 }
+
 function copyPassword(index) {
     let password;
     if (index === 100) {
@@ -177,4 +177,4 @@ function copyPassword(index) {
 
         document.body.removeChild(textArea);
     }
-}
+}

templates/index.html

@@ -11,14 +11,15 @@
     {% if google_site_verification %}
     <meta name="google-site-verification" content="{{ google_site_verification }}" />
     {% endif %}
-    <link rel="stylesheet" href="{{ url_for('static', filename='styles.css') }}">
-    <link rel="icon" href="{{ url_for('static', filename='favicon.png') }}" type="image/png">
-    <link rel="manifest" href="/manifest.json">
+    <link rel="stylesheet" href="{{ base_path }}static/styles.css">  
+    <link rel="icon" href="{{ base_path }}static/favicon.png" type="image/png">  
+    <link rel="manifest" href="{{ base_path }}manifest.json">  
     <meta name="theme-color" content="#2A3850">
     <script>
+        window.BASE_PATH = "{{ base_path }}";
         if ('serviceWorker' in navigator) {
             window.addEventListener('load', () => {
-                navigator.serviceWorker.register('/service-worker.js')
+                navigator.serviceWorker.register(`${window.BASE_PATH}service-worker.js`)
                     .then(reg => console.log('Service Worker registered', reg))
                     .catch(err => console.log('Service Worker registration failed', err));
             });
@@ -223,7 +224,7 @@ <h1 id="header1">Generate a Secure Password</h1>
 
         });
     </script>
-    <script src="{{ url_for('static', filename='index.js') }}"></script>
+     <script src="{{ base_path }}static/index.js"></script>
 </body>
 
-</html>
+</html>