fix: Manifest should use host automatically
This commit is contained in:
parent
1b017d919a
commit
5d95307ae2
32
server.py
32
server.py
@ -25,6 +25,11 @@ if os.path.isfile('data/sites.json'):
|
|||||||
with open('data/sites.json') as file:
|
with open('data/sites.json') as file:
|
||||||
sites = json.load(file)
|
sites = json.load(file)
|
||||||
|
|
||||||
|
def getAddress():
|
||||||
|
global address
|
||||||
|
if address == '':
|
||||||
|
address = 'hs1qv3uu4amv87g7p7h49xez2pmzwjf92am0wzpnh4'
|
||||||
|
return address
|
||||||
|
|
||||||
#Assets routes
|
#Assets routes
|
||||||
@app.route('/assets/<path:path>')
|
@app.route('/assets/<path:path>')
|
||||||
@ -120,14 +125,10 @@ def index():
|
|||||||
return render_template('podcast.html')
|
return render_template('podcast.html')
|
||||||
|
|
||||||
loaded = False
|
loaded = False
|
||||||
# Check if referrer is from handshake
|
|
||||||
if request.referrer:
|
if request.referrer:
|
||||||
print(request.referrer,flush=True)
|
|
||||||
# Check if referrer includes nathan.woodburn.au
|
# Check if referrer includes nathan.woodburn.au
|
||||||
if "nathan.woodburn.au" in request.referrer:
|
if "nathan.woodburn.au" in request.referrer:
|
||||||
loaded = True
|
loaded = True
|
||||||
else:
|
|
||||||
print("No referrer",flush=True)
|
|
||||||
|
|
||||||
|
|
||||||
# Check if cookie is set
|
# Check if cookie is set
|
||||||
@ -172,7 +173,9 @@ def index():
|
|||||||
handshake_scripts = ""
|
handshake_scripts = ""
|
||||||
|
|
||||||
if request.cookies.get('HNS'):
|
if request.cookies.get('HNS'):
|
||||||
return render_template('index.html', handshake_scripts=handshake_scripts, HNS=request.cookies.get('HNS'), repo=repo, repo_description=repo_description, custom=custom,sites=sites)
|
resp = make_response(render_template('index.html', handshake_scripts=handshake_scripts, HNS=request.cookies.get('HNS'), repo=repo, repo_description=repo_description, custom=custom,sites=sites), 200, {'Content-Type': 'text/html'})
|
||||||
|
resp.set_cookie('loaded', 'true', max_age=604800)
|
||||||
|
return resp
|
||||||
|
|
||||||
if address == '':
|
if address == '':
|
||||||
address = getAddress()
|
address = getAddress()
|
||||||
@ -413,12 +416,18 @@ def catch_all(path):
|
|||||||
|
|
||||||
return render_template('404.html'), 404
|
return render_template('404.html'), 404
|
||||||
|
|
||||||
def getAddress():
|
@app.route('/manifest.json')
|
||||||
global address
|
def manifest():
|
||||||
if address == '':
|
host = request.host
|
||||||
address = 'hs1qv3uu4amv87g7p7h49xez2pmzwjf92am0wzpnh4'
|
if host == 'nathan.woodburn.au':
|
||||||
return address
|
return send_from_directory('templates', 'manifest.json')
|
||||||
|
|
||||||
|
# Read as json
|
||||||
|
with open('templates/manifest.json') as file:
|
||||||
|
manifest = json.load(file)
|
||||||
|
scheme = request.scheme
|
||||||
|
manifest['start_url'] = f'{scheme}://{host}/'
|
||||||
|
return jsonify(manifest)
|
||||||
|
|
||||||
@app.route('/hnsdoh-acme', methods=['POST'])
|
@app.route('/hnsdoh-acme', methods=['POST'])
|
||||||
def hnsdoh_acme():
|
def hnsdoh_acme():
|
||||||
@ -466,7 +475,6 @@ def ID1_slash():
|
|||||||
@app.route('/ID1/<path:path>')
|
@app.route('/ID1/<path:path>')
|
||||||
def ID1_path(path):
|
def ID1_path(path):
|
||||||
# Proxy to ID1 url
|
# Proxy to ID1 url
|
||||||
print('https://id1.woodburn.au/ID1/' + path)
|
|
||||||
req = requests.get('https://id1.woodburn.au/ID1/' + path)
|
req = requests.get('https://id1.woodburn.au/ID1/' + path)
|
||||||
return make_response(req.content, 200, {'Content-Type': req.headers['Content-Type']})
|
return make_response(req.content, 200, {'Content-Type': req.headers['Content-Type']})
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user