mirror of
https://github.com/house-of-vanity/OutFleet.git
synced 2025-12-16 17:37:51 +00:00
Compare commits
3 Commits
dependabot
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
26fd9c3e85 | ||
|
|
eb9f199d57 | ||
|
|
c9c21f1baa |
11
main.py
11
main.py
@@ -321,6 +321,10 @@ def del_client():
|
||||
return redirect(url_for("clients", nt="User has been deleted"))
|
||||
|
||||
|
||||
def append_to_log(log_entry):
|
||||
with open("access_log.log", "a") as log_file:
|
||||
log_file.write(log_entry + "\n")
|
||||
|
||||
@app.route("/dynamic/<path:hash_secret>", methods=["GET"], strict_slashes=False)
|
||||
def dynamic(hash_secret):
|
||||
# Depricated scheme.
|
||||
@@ -329,7 +333,7 @@ def dynamic(hash_secret):
|
||||
log.warning("Deprecated key request")
|
||||
server_name = hash_secret.split('/')[0]
|
||||
client_id = hash_secret.split('/')[1]
|
||||
return dynamic_depticated(server_name, client_id)
|
||||
return dynamic_depticated(server_name, client_id, hash_secret)
|
||||
try:
|
||||
short_hash_server = hash_secret[0:SECRET_LINK_LENGTH]
|
||||
short_hash_client = hash_secret[SECRET_LINK_LENGTH:SECRET_LINK_LENGTH * 2 ]
|
||||
@@ -349,7 +353,7 @@ def dynamic(hash_secret):
|
||||
client = CLIENTS[client_id]
|
||||
|
||||
if server and client:
|
||||
|
||||
append_to_log(f"User: {client["name"]}. Server: {server.data['name']} client secret string: {hash_secret}")
|
||||
client_shadowsocks_key = next(
|
||||
(item for item in server.data["keys"] if item.key_id == client["name"]), None
|
||||
)
|
||||
@@ -380,7 +384,7 @@ def dynamic(hash_secret):
|
||||
return WRONG_DOOR
|
||||
|
||||
|
||||
def dynamic_depticated(server_name, client_id):
|
||||
def dynamic_depticated(server_name, client_id, hash_secret=""):
|
||||
try:
|
||||
client = next(
|
||||
(keys for client, keys in CLIENTS.items() if client == client_id), None
|
||||
@@ -396,6 +400,7 @@ def dynamic_depticated(server_name, client_id):
|
||||
log.info(
|
||||
"Client %s has been requested ssconf for %s", client["name"], server.data["name"]
|
||||
)
|
||||
append_to_log(f"User: {client["name"]}. Server: {server.data['name']} client secret string: {hash_secret}")
|
||||
return {
|
||||
"server": server.data["hostname_for_access_keys"],
|
||||
"server_port": key.port,
|
||||
|
||||
@@ -60,6 +60,13 @@ function Start-SSLocal {
|
||||
# Main loop
|
||||
while ($true) {
|
||||
try {
|
||||
if ($url -notmatch "mode=json") {
|
||||
$delimiter = "?"
|
||||
if ($url -match "\?") {
|
||||
$delimiter = "&"
|
||||
}
|
||||
$url = "$url${delimiter}mode=json"
|
||||
}
|
||||
# Download and parse the JSON
|
||||
$jsonContent = Invoke-WebRequest -Uri $url -UseBasicParsing | Select-Object -ExpandProperty Content
|
||||
$json = $jsonContent | ConvertFrom-Json
|
||||
|
||||
Reference in New Issue
Block a user