revi-archive/xygt
1
0
Fork 0
mirror of https://github.com/jackeilles/xygt.git synced 2024-11-08 07:52:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix cli auth

Browse source
This commit is contained in:
Jack Eilles 2024-03-26 15:01:06 +00:00
parent 39c084ea00
commit 8edf94b725
2 changed files with 27 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
app/routes.py
View file

@ -65,42 +65,46 @@ def index():
ip = 0 ip = 0
# Now check the userid and idpass against the db # Now check the userid and idpass against the db
print(Config.users.find({"userid": request.form.get('userid')})) try:
print(Config.users.find({"userid": request.form.get('idpass')})) if Config.users.find_one({"userid": request.form.get("userid")})["userid"] == request.form["userid"] and bcrypt.check_password_hash(Config.users.find_one({"userid": request.form.get("userid")})["idpass"], request.form.get("idpass")):
if Config.users.find({"userid": request.form["userid"]})["userid"] == request.form["userid"] and Config.users.find({"userid": request.form["userid"]})["idpass"] == request.form["idpass"]:
# Init variables before they're passed # Init variables before they're passed
userid = request.form.get("userid") if request.form.get("userid") else None userid = request.form.get("userid") if request.form.get("userid") else None
filename = request.form.get("filename") if request.form.get("filename") else None filename = request.form.get("filename") if request.form.get("filename") else None
retention = int(request.form.get("retention")) if request.form.get("retention") else None retention = int(request.form.get("retention")) if request.form.get("retention") else None
id = request.form.get("filename") if Config.files.find_one({"id": filename}) is None else None id = request.form.get("filename") if Config.files.find_one({"id": filename}) is None else None
# We got a file or a url? # We got a file or a url?
if 'file' in request.files: if 'file' in request.files:
# Grab the file and store it, this is a FileStorage object # Grab the file and store it, this is a FileStorage object
file = request.files['file'] file = request.files['file']
# Call the function to upload the file, this will return either HTTP Status codes or a 200 with a URL. # Call the function to upload the file, this will return either HTTP Status codes or a 200 with a URL.
result, status = worker.uploadFile(file, ip, userid, filename, id, retention) result, status = worker.uploadFile(file, ip, userid, filename, id, retention)
return result, status return result, status
elif 'file' in request.form: elif 'file' in request.form:
file = FileStorage(stream=BytesIO(request.form['file'].encode("utf-8")), filename=id, content_type="text/plain") file = FileStorage(stream=BytesIO(request.form['file'].encode("utf-8")), filename=id, content_type="text/plain")
result, status = worker.uploadFile(file, ip, userid, filename, id, retention) result, status = worker.uploadFile(file, ip, userid, filename, id, retention)
return result, status return result, status
elif 'url' in request.form: elif 'url' in request.form:
url = request.form['url'] url = request.form['url']
result, status = worker.shortenURL(url, ip, userid, id, retention) result, status = worker.shortenURL(url, ip, userid, id, retention)
return result, status return result, status
else:
return "Invalid userID or IDpass."
except Exception as e:
print(e)
return "Invalid userID or IDPass."
@app.route('/about') @app.route('/about')
def about(): def about():

16
install.sh
View file

@ -1,16 +0,0 @@
# Might dockerise this stuff sooner or later, not now tho.
if [ $EUID -ne 0 ]; then
echo "This script must be run as root."
exit 1
fi
apt install mongodb-org python3-pip python3-venv
systemctl enable --now mongod
python3 -m venv .venv
source .venv/bin/activate
pip install -r requirements.txt
echo "Installation complete, launch xygt with ./run.py (in the venv)"