Skip to content

Update Dev #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 19, 2025
Merged

Update Dev #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eaaa583
fixed indentation
CodeShellDev Jun 19, 2025
4afec6b
Merge pull request #2 from CodeShellDev/dev
CodeShellDev Jun 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def fillInVars(obj):
for i in range(len(obj)):
obj[i] = fillInVars(obj[i])
elif isinstance(obj, str):
matches = re.findall(r"\${(.*?)}", obj)
matches = re.findall(r"\${(.*?)}", obj)
for match in matches:
if match in VARIABLES:
value = VARIABLES[match]
Expand Down Expand Up @@ -79,17 +79,17 @@ def middlewares():
token = auth_header.split(" ", 1)[1]

token = unquote(token)
if token != API_TOKEN:
if token != API_TOKEN:
infoLog(f"Client failed Bearer Auth [token: {token}]")
return UnauthorizedResponse()
elif auth_header.startswith("Basic "):
try:
decoded = base64.b64decode(auth_header.split(" ", 1)[1]).decode()
username, password = decoded.split(":", 1)
return UnauthorizedResponse()
elif auth_header.startswith("Basic "):
try:
decoded = base64.b64decode(auth_header.split(" ", 1)[1]).decode()
username, password = decoded.split(":", 1)

username = unquote(username)
password = unquote(password)
if username != "api" or password != API_TOKEN:
if username != "api" or password != API_TOKEN:
infoLog(f"Client failed Basic Auth [user: {username}, pw:{password}]")
return UnauthorizedResponse()
except Exception as error:
Expand Down