matthias/liederwahl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: matthias:oauth-by-caddy
Branches Tags
matthias:main matthias:choriosity-ci matthias:oauth-by-traefik matthias:oauth-by-caddy
matthias:1.3.4 matthias:1.3.3 matthias:1.3.2 matthias:1.3.1 matthias:1.3.0 matthias:1.2.1 matthias:1.2.0 matthias:1.1.0 matthias:1.0.1 matthias:1.0.0
...
pull from: matthias:oauth-by-traefik
Branches Tags
matthias:main matthias:choriosity-ci matthias:oauth-by-traefik matthias:oauth-by-caddy
matthias:1.3.4 matthias:1.3.3 matthias:1.3.2 matthias:1.3.1 matthias:1.3.0 matthias:1.2.1 matthias:1.2.0 matthias:1.1.0 matthias:1.0.1 matthias:1.0.0

3 Commits
oauth-by-c ... oauth-by-t

Author SHA1 Message Date
matthias@matsewe.de
ff92ff3020 Fix voting if ajax request fails 2024-06-27 21:18:01 +02:00
matthias@matsewe.de
78d964455c fix 2024-06-25 13:20:55 +02:00
matthias@matsewe.de
6cd1064f1d Adapt for oauth by traefik 2024-06-25 11:46:31 +02:00
2 changed files with 52 additions and 45 deletions
Expand all files Collapse all files

16
app/security.py
View File

@@ -1,6 +1,6 @@
from typing import Annotated
from fastapi import HTTPException, Cookie, status
from fastapi import HTTPException, Cookie, status, Request
from fastapi.security import SecurityScopes
from jose import JWTError, jwt
from pydantic import ValidationError
@@ -10,9 +10,6 @@ import os
# to get a string like this run:
# openssl rand -hex 32
ALGORITHM = "HS512"
SECRET_KEY = os.environ['SECRET_KEY']
scopes_db = {
os.environ['ADMIN_EMAIL'] : ["admin"]
}
@@ -23,18 +20,17 @@ credentials_exception = HTTPException(
)
async def get_current_user(
security_scopes: SecurityScopes, access_token: Annotated[str, Cookie()] = ""
security_scopes: SecurityScopes, request: Request
):
try:
payload = jwt.decode(access_token, SECRET_KEY, algorithms=[ALGORITHM])
username: str = payload.get("sub") # type: ignore
username: str = request.headers.get("x-auth-request-user") # type: ignore
if username is None:
raise credentials_exception
email: str = payload.get("email") # type: ignore
email: str = request.headers.get("x-auth-request-email") # type: ignore
except (JWTError, ValidationError):
raise credentials_exception
scopes = scopes_db.get(email)
scopes = scopes_db.get(email, [])
for scope in security_scopes.scopes:
if scope not in scopes:
raise credentials_exception
return payload | {"internal_scopes" : scopes}
return {"sub" : username, "email" : email, "internal_scopes" : scopes}

23
templates/voting.html
View File

@@ -19,6 +19,7 @@
border-radius: 0.2em;
padding: 0.1em;
}
.not_singable {
background-color: color-mix(in srgb, #e1412f 30%, #f0f0f0);
}
@@ -124,6 +125,12 @@
}
function vote(song_id, vote) {
$.ajax({
url: "/songs/" + song_id + "/vote?" + $.param({ session_id: session_id, vote: vote }),
method: "POST",
success: function (data, textStatus) {
no_button = $("#song-" + song_id).find(".button-no")
yes_button = $("#song-" + song_id).find(".button-yes")
neutral_button = $("#song-" + song_id).find(".button-neutral")
@@ -155,10 +162,12 @@
break;
}
$.ajax({
url: "/songs/" + song_id + "/vote?" + $.param({ session_id: session_id, vote: vote }),
method: "POST"
})
}
});
}
{% if veto_mode %}
@@ -176,7 +185,8 @@
<body>
{% if veto_mode %}
<h1>Vorschau Modus</h1>
<div class="text">Du kannst ungeeignete Vorschläge durch eine Nein-Stimme markieren und Kommentare zu allen Liedern abgeben.
<div class="text">Du kannst ungeeignete Vorschläge durch eine Nein-Stimme markieren und Kommentare zu allen Liedern
abgeben.
</div>
{% else %}
<h1>Hallo :)</h1>
@@ -222,7 +232,8 @@
{% if veto_mode %}
<input type="text" class="comment"
value="{% if song.vote_comment %}{{ song.vote_comment }}{% else %}{% endif %}"
placeholder="{% if song.comment %}{{ song.comment }}{% else %}Kommentar{% endif %}" onchange="updateComment({{ song.id }}, this);">
placeholder="{% if song.comment %}{{ song.comment }}{% else %}Kommentar{% endif %}"
onchange="updateComment({{ song.id }}, this);">
{% endif %}
</div>
{% endfor %}