.gitea/workflows/build.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - '*'
-      - '*/*'
     tags-ignore:
       - '*'
 

README.md

@@ -47,7 +47,7 @@ General commands (as anyone)
 Docker is the easiest way to install the master server.
 
 ```sh
-docker run -d -p 5000:5000 -e LICENCE_KEY=your-api-key -e WORKER_KEY=your-api-key -e ADMIN_KEY=admin-key --name hnshosting-master git.woodburn.au/nathanwoodburn/hnshosting-master:latest -v ./data:/data
+docker run -d -p 5000:5000 -e LICENCE-API=your-api-key -e WORKER_KEY=your-api-key --name hnshosting-master git.woodburn.au/nathanwoodburn/hnshosting-master:latest -v ./data:/data
 ```
 You can also mount a docker volume to /data to store the files instead of mounting a host directory.
 

master/main.py

@@ -1,4 +1,4 @@
-from flask import Flask, make_response, redirect, request, jsonify
+from flask import Flask, request, jsonify
 import dotenv
 import os
 import requests
@@ -10,14 +10,12 @@ dotenv.load_dotenv()
 
 app = Flask(__name__)
 
-logins = []
-
 # API add license key (requires API key in header)
 @app.route('/add-licence', methods=['POST'])
 def add_license():
     # Get API header
     api_key = request.headers.get('key')
-    if api_key != os.getenv('LICENCE_KEY'):
+    if api_key != os.getenv('LICENCE-API'):
         return jsonify({'error': 'Invalid API key', 'success': 'false'})
 
     # Generate licence key
@@ -182,22 +180,17 @@ def list_workers():
             continue
 
         online=True
-        try:
+        resp=requests.get("http://"+worker.split(':')[1].strip('\n') + ":5000/status",timeout=2)
-            resp=requests.get("http://"+worker.split(':')[1].strip('\n') + ":5000/status",timeout=2)
+        if (resp.status_code != 200):
-
+            online=False
-            if (resp.status_code != 200):
+            worker_list.append({'worker': worker.split(':')[0],'ip': worker.split(':')[2].strip('\n'), 'online': online, 'sites': 0, 'status': 'offline'})
-                online=False
-                worker_list.append({'worker': worker.split(':')[0],'ip': worker.split(':')[2].strip('\n'), 'online': online, 'sites': 0, 'status': 'offline'})
-                continue
-            sites = resp.json()['num_sites']
-            availability = resp.json()['availability']
-            if availability == True:
-                worker_list.append({'worker': worker.split(':')[0],'ip': worker.split(':')[2].strip('\n'), 'online': online, 'sites': sites, 'status': 'ready'})
-            else:
-                worker_list.append({'worker': worker.split(':')[0],'ip': worker.split(':')[2].strip('\n'), 'online': online, 'sites': sites, 'status': 'full'})
-        except:
-            worker_list.append({'worker': worker.split(':')[0],'ip': worker.split(':')[2].strip('\n'), 'online': 'False', 'sites': 0, 'status': 'offline'})
             continue
+        sites = resp.json()['num_sites']
+        availability = resp.json()['availability']
+        if availability == True:
+            worker_list.append({'worker': worker.split(':')[0],'ip': worker.split(':')[2].strip('\n'), 'online': online, 'sites': sites, 'status': 'ready'})
+        else:
+            worker_list.append({'worker': worker.split(':')[0],'ip': worker.split(':')[2].strip('\n'), 'online': online, 'sites': sites, 'status': 'full'})
     
     if len(worker_list) == 0:
         return jsonify({'error': 'No workers available', 'success': 'false'})
@@ -233,35 +226,6 @@ def site_status():
         return jsonify({'success': 'false', 'domain': domain, 'ip': publicIP, 'tlsa': 'none','error': 'No TLSA record found'})
 
 
-@app.route('/info')
-def site_status_human():
-    domain = request.args.get('domain')
-    if domain == None:
-        return "<h1>Invalid domain</h1>"
-    
-    # Check if domain exists
-    if not site_exists(domain):
-        return "<h1>Domain does not exist</h1>"
-    
-    # Get worker
-    worker = site_worker(domain)
-    if worker == None:
-        return "<h1>Domain does not exist</h1>"
-    
-    # Get worker ip
-    ip = workerIP_PRIV(worker)
-
-    # Get TLSA record
-    resp=requests.get("http://"+ip + ":5000/tlsa?domain=" + domain,timeout=2)
-    json = resp.json()
-    publicIP = workerIP(worker)
-
-    if "tlsa" in json:
-        tlsa = json['tlsa']
-        return "<h1>Domain: " + domain + "</h1><br><p>IP: " + publicIP + "</p><br><p>TLSA: " + tlsa + "</p><br><p>Make sure to add the TLSA record to `_443._tcp." + domain + "` or `*." + domain + "`</p>"
-    else:
-        return "<h1>Domain: " + domain + "</h1><br><p>IP: " + publicIP + "</p><br><p>TLSA: none</p><br><p>No TLSA record found</p>"
-
 @app.route('/tlsa', methods=['GET'])
 def tlsa():
     domain = request.args.get('domain')
@@ -426,364 +390,6 @@ def workerIP(worker):
     return ip
         
 
-# Home page
-@app.route('/')
-def home():
-    # Show stats and info
-    
-    # Get worker info
-    workers = []
-    try:
-        workers_file = open('/data/workers.txt', 'r')
-        workers = workers_file.readlines()
-        workers_file.close()
-    except FileNotFoundError:
-        pass
-
-    # Get site info
-    sites = []
-    try:
-        sites_file = open('/data/sites.txt', 'r')
-        sites = sites_file.readlines()
-        sites_file.close()
-    except FileNotFoundError:
-        pass
-
-    # Get licence info
-    licences = []
-    try:
-        licences_file = open('/data/licence_key.txt', 'r')
-        licences = licences_file.readlines()
-        licences_file.close()
-    except FileNotFoundError:
-        pass
-
-    # Create html page
-    html = "<h1>Welcome</h1><br>"
-    html += "<h2>Create a site</h2>"
-    html += "<form action='/add-site' method='POST'>"
-    html += "<p>Domain: <input type='text' name='domain'></p>"
-    html += "<p>Licence key: <input type='text' name='licence'></p>"
-    html += "<input type='submit' value='Create site'>"
-    html += "</form>"
-
-    html += "<br><h2>Stats</h2><br>"
-    html += "<h2>Workers</h2>"
-    html += "<p>Number of workers: " + str(len(workers)) + "</p>"
-    html += "<p>Workers:</p>"
-    html += "<ul>"
-    for worker in workers:
-        html += "<li>Name: " + worker.split(':')[0] + " | IP " + worker.split(':')[2].strip('\n') + "</li>"
-    html += "</ul>"
-    html += "<h2>Sites</h2>"
-    html += "<p>Number of sites: " + str(len(sites)) + "</p>"
-    html += "<p>Sites:</p>"
-    html += "<ul>"
-    for site in sites:
-        html += "<li>Domain: " + site.split(':')[0] + " | Worker: " + site.split(':')[1].strip('\n') + "</li>"
-    html += "</ul>"
-    html += "<h2>Licences</h2>"
-    html += "<p>Number of licences: " + str(len(licences)) + "</p>"
-
-    html += "<h2><a href='/admin'>Admin</a></h2>"
-    return html
-
-# Admin page
-@app.route('/admin')
-def admin():
-    # Check if logged in
-    login_key = request.cookies.get('login_key')
-
-    if login_key == None:
-        return "<h1>Admin</h1><br><form action='/login' method='POST'><input type='password' name='password'><input type='submit' value='Login'></form>"
-    if login_key not in logins:
-        return "<h1>Admin</h1><br><form action='/login' method='POST'><input type='password' name='password'><input type='submit' value='Login'></form>"
-    
-    # Show some admin stuff
-    licences = []
-    try:
-        licences_file = open('/data/licence_key.txt', 'r')
-        licences = licences_file.readlines()
-        licences_file.close()
-    except FileNotFoundError:
-        pass
-
-    # Create html page
-    html = "<h1>Admin</h1><br>"
-    html += "<h2>Licences</h2>"
-    html += "<p>Number of licences: " + str(len(licences)) + "</p>"
-    html += "<p>Licences:</p>"
-    html += "<ul>"
-    for licence in licences:
-        html += "<li>" + licence.strip('\n') + "</li>"
-    html += "</ul>"
-    html += "<h2>API</h2>"
-    html += "<p>API key: " + os.getenv('LICENCE_KEY') + "</p>"
-    html += "<p>Worker key: " + os.getenv('WORKER_KEY') + "</p>"
-    html += "<h2>Stripe</h2>"
-    # Check if stripe is enabled
-    if os.getenv('STRIPE_SECRET') == None:
-        html += "<p>Stripe is not enabled</p>"
-    else:
-        html += "<p>Stripe is enabled</p>"
-    
-    html += "<br><br><h2>Workers</h2>"
-    workers = []
-    try:
-        workers_file = open('/data/workers.txt', 'r')
-        workers = workers_file.readlines()
-        workers_file.close()
-    except FileNotFoundError:
-        pass
-
-    for worker in workers:
-        if not worker.__contains__(':'):
-            continue
-
-        html += "<p>Name: " + worker.split(':')[0] + " | Public IP " + worker.split(':')[2].strip('\n') + " | Private IP " + worker.split(':')[1]
-        # Check worker status
-        online=True
-        try:
-            resp=requests.get("http://"+worker.split(':')[1].strip('\n') + ":5000/status",timeout=2)
-            if (resp.status_code != 200):
-                html += " | Status: Offline"
-            else:
-                html += " | Status: Online | Sites: " + str(resp.json()['num_sites']) + " | Availability: " + str(resp.json()['availability'])
-        except:
-            html += " | Status: Offline"
-            
-        html += "</p>"
-        
-
-    html += "<h2>Sites</h2>"
-    sites = []
-    try:
-        sites_file = open('/data/sites.txt', 'r')
-        sites = sites_file.readlines()
-        sites_file.close()
-    except FileNotFoundError:
-        pass
-
-    for site in sites:
-        if not site.__contains__(':'):
-            continue
-        domain = site.split(':')[0]
-        html += "<p>Domain: <a href='https://"+ domain + "'>" + domain + "</a> | Worker: " + site.split(':')[1].strip('\n') + " | <a href='/info?domain=" + domain + "'>Info</a></p>"
-
-    html += "<br><br>"
-    # Form to add worker
-    html += "<h2>Add worker</h2>"
-    html += "<form action='/new-worker' method='POST'>"
-    html += "<p>Name: <input type='text' name='name'></p>"
-    html += "<p>Public IP: <input type='text' name='ip'></p>"
-    html += "<p>Private IP: <input type='text' name='priv'></p>"
-    html += "<input type='submit' value='Add worker'>"
-    html += "</form>"
-    
-    html += "<br><h2><a href='/licence'>Add Licence</a></h2><br>"
-    # Form to add site
-    html += "<h2>Add site</h2>"
-    html += "<form action='/add-site' method='POST'>"
-    html += "<p>Domain: <input type='text' name='domain'></p>"
-    html += "<input type='submit' value='Add site'>"
-    html += "</form>"
-    
-
-    html += "<br><a href='/logout'>Logout</a></h2>"
-
-
-    return html
-    
-
-@app.route('/add-site', methods=['POST'])
-def addsite():
-    # Check for licence key
-    if 'licence' not in request.form:
-        # Check cookie
-        login_key = request.cookies.get('login_key')
-        if login_key == None:
-            return redirect('/admin')
-        if login_key not in logins:
-            return redirect('/admin')    
-    else:
-        # Use licence key
-        licence_key = request.form['licence']
-        # Check if licence key is valid
-        key_file = open('/data/licence_key.txt', 'r')
-        valid_key = False
-        for line in key_file.readlines():
-            if licence_key == line.strip('\n'):
-                valid_key = True
-                break
-        key_file.close()
-        if not valid_key:
-            return jsonify({'error': 'Invalid licence', 'success': 'false'})
-        
-        # Delete licence key
-        key_file = open('/data/licence_key.txt', 'r')
-        lines = key_file.readlines()
-        key_file.close()
-        key_file = open('/data/licence_key.txt', 'w')
-        for line in lines:
-            if line.strip("\n") != licence_key:
-                key_file.write(line)
-        key_file.close()
-
-    # Get domain
-    domain = request.form['domain']
-    if domain == None:
-        return jsonify({'error': 'No domain sent', 'success': 'false'})
-    # Check if domain already exists
-    if site_exists(domain):
-        return jsonify({'error': 'Domain already exists', 'success': 'false'})
-    
-    # Check if domain contains http:// or https://
-    if domain.startswith("http://") or domain.startswith("https://"):
-        return jsonify({'error': 'Domain should not contain http:// or https://', 'success': 'false'})
-    
-
-    # Check if worker file exists
-    workers = None
-    try:
-        worker_file = open('/data/workers.txt', 'r')
-        workers = worker_file.readlines()
-        worker_file.close()
-    except FileNotFoundError:
-        return jsonify({'error': 'No workers available', 'success': 'false'})
-    
-    # Get a worker that has available slots
-    worker = None
-    for line in workers:
-        if not line.__contains__(':'):
-            continue
-
-        ip = line.split(':')[1].strip('\n')
-        resp=requests.get("http://"+ip + ":5000/status",timeout=2)
-        if (resp.status_code == 200):
-            if resp.json()['availability'] == True:
-                worker = line
-                break
-    
-    if worker == None:
-        return jsonify({'error': 'No workers available', 'success': 'false'})
-
-
-    # Add domain to file
-    sites_file = open('/data/sites.txt', 'a')
-    sites_file.write(domain + ':' + worker.split(':')[0] + '\n')
-    sites_file.close()
-
-    # Send worker request
-    requests.post("http://"+ worker.split(':')[1].strip('\n') + ":5000/new-site?domain=" + domain)
-
-    html = "<h1>Site creating...</h1><br>"
-    html += "<p>Domain: " + domain + "</p>"
-    html += "<p>Worker: " + worker.split(':')[0] + "</p>"
-    html += "<p>Worker IP: " + worker.split(':')[1].strip('\n') + "</p>"
-    html += "<p><a href='/info?domain=" + domain + "'>Check status</a></p>"
-
-    return html
-    
-
-@app.route('/licence')
-def licence():
-    # Check cookie
-    login_key = request.cookies.get('login_key')
-    if login_key == None:
-        return redirect('/admin')
-    if login_key not in logins:
-        return redirect('/admin')
-    
-    licence_key = os.urandom(16).hex()
-
-    # Add license key to file
-    key_file = open('/data/licence_key.txt', 'a')
-    key_file.write(licence_key + '\n')
-    key_file.close()
-
-    return "<h1>Licence key</h1><br><p>" + licence_key + "</p><br><a href='/admin'>Back</a>"
-    
-
-
-@app.route('/new-worker', methods=['POST'])
-def new_worker():
-    # Check cookie
-    login_key = request.cookies.get('login_key')
-
-    if login_key == None:
-        return redirect('/admin')
-    if login_key not in logins:
-        return redirect('/admin')
-    
-    worker = request.form['name']
-    worker_IP = request.form['ip']
-    worker_PRIV = request.form['priv']
-
-
-    # Check worker file
-    try:
-        workers_file = open('/data/workers.txt', 'r')
-    except FileNotFoundError:
-        workers_file = open('/data/workers.txt', 'w')
-        workers_file.close()
-        workers_file = open('/data/workers.txt', 'r')
-    
-    # Check if worker already exists
-    if worker in workers_file.read():
-        return jsonify({'error': 'Worker already exists', 'success': 'false'})
-    
-    workers_file.close()
-
-    # Add worker to file
-    workers_file = open('/data/workers.txt', 'a')
-    workers_file.write(worker + ":" + worker_PRIV + ":"+ worker_IP + '\n')
-    workers_file.close()
-
-    return redirect('/admin')    
-
-
-@app.route('/logout')
-def logout():
-    login_key = request.cookies.get('login_key')
-    if login_key == None:
-        return redirect('/admin')
-    if login_key not in logins:
-        return redirect('/admin')
-    
-    logins.remove(login_key)
-    return redirect('/admin')
-
-
-@app.route('/login', methods=['POST'])
-def login():
-    # Handle login
-    print('Login attempt', flush=True)
-    # Check if form contains password
-    if 'password' not in request.form:
-        print('Login failed', flush=True)
-        return redirect('/failed-login')
-
-    password = request.form['password']
-    if os.getenv('ADMIN_KEY') == password:
-        print('Login success', flush=True)
-        # Generate login key
-        login_key = os.urandom(32).hex()
-        logins.append(login_key)
-        # Set cookie
-        resp = make_response(redirect('/admin'))
-        resp.set_cookie('login_key', login_key)
-        return resp
-    print('Login failed', flush=True)
-    return redirect('/failed-login')
-
-@app.route('/failed-login')
-def failed_login():
-    return "<h1>Failed login</h1><br><form action='/login' method='POST'><input type='password' name='password'><input type='submit' value='Login'></form>"
-
-
-    
-
-
 # Start the server
 if __name__ == '__main__':
     app.run(debug=False, port=5000, host='0.0.0.0')