Fix dynamic route

This commit is contained in:
2023-09-27 17:31:34 +03:00
parent 659be123f6
commit ac9604fb98

30
main.py
View File

@ -188,21 +188,23 @@ def del_client():
@app.route('/dynamic/<server_name>/<client_id>', methods=['GET']) @app.route('/dynamic/<server_name>/<client_id>', methods=['GET'])
def dynamic(server_name, client_id): def dynamic(server_name, client_id):
client = next((keys for client, keys in CLIENTS.items() if client == client_id), None) try:
server = next((item for item in SERVERS if item.info()["name"] == server_name), None) client = next((keys for client, keys in CLIENTS.items() if client == client_id), None)
key = next((item for item in server.data["keys"] if item.name == client["name"]), None) server = next((item for item in SERVERS if item.info()["name"] == server_name), None)
if server and client and key: key = next((item for item in server.data["keys"] if item.name == client["name"]), None)
if server.data["server_id"] in client["servers"]: if server and client and key:
log.info("Dynamic config for %s requested by '%s'", server.data["name"], client["name"]) if server.data["server_id"] in client["servers"]:
log.info("Dynamic config for %s requested by '%s'", server.data["name"], client["name"])
return { return {
"server": server.data["hostname_for_access_keys"], "server": server.data["hostname_for_access_keys"],
"server_port": key.port, "server_port": key.port,
"password": key.password, "password": key.password,
"method": key.method, "method": key.method,
"info": "Managed by OutFleet [github.com/house-of-vanity/OutFleet/]" "info": "Managed by OutFleet [github.com/house-of-vanity/OutFleet/]"
} }
return "Hey buddy, i think you got the wrong door the leather-club is two blocks down" except:
return "Hey buddy, i think you got the wrong door the leather-club is two blocks down"
if __name__ == '__main__': if __name__ == '__main__':
update_state() update_state()