From 56c7fcd617752f8041c63377565eaf5be36c4453 Mon Sep 17 00:00:00 2001
From: Nathan Woodburn <github@nathan.woodburn.au>
Date: Wed, 20 Sep 2023 22:26:34 +1000
Subject: [PATCH] main: Use the success page for info page

---
 master/main.py | 38 +++++---------------------------------
 1 file changed, 5 insertions(+), 33 deletions(-)

diff --git a/master/main.py b/master/main.py
index 49608e7..ede59ba 100644
--- a/master/main.py
+++ b/master/main.py
@@ -233,37 +233,6 @@ def site_status():
     else:
         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')
-    domain = domain.lower()
-    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')
@@ -561,7 +530,10 @@ def success():
     elif request.args.get('status') == 'creating':
         return render_template('success.html')
     
-    
+@app.route('/info')
+def info():
+    success()
+
 @app.route('/site-count')
 def site_count_route():
     return str(get_sites_count())
@@ -648,7 +620,7 @@ def admin():
         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 += "<p>Domain: <a href='https://"+ domain + "'>" + domain + "</a> | Worker: " + site.split(':')[1].strip('\n') + " | <a href='/status?domain=" + domain + "'>Info</a></p>"
 
     html += "<br><br>"
     # Form to add worker