Skip to content
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

Include project code into project authentication token #802

Merged
merged 11 commits into from
Oct 10, 2021
Merged

Include project code into project authentication token #802

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
57525fc
Include project code into project authentication token
Glandos Jul 14, 2021
d9a4389
API BREAKING CHANGE the authenticate token now need project_id= param…
Glandos Jul 17, 2021
bbcc233
format code
Glandos Jul 17, 2021
4f0a616
project_id can be None in verify_token, don't make a DB request
Glandos Jul 17, 2021
0ff0b03
format
Glandos Jul 17, 2021
0a33007
be sure that project_id was not modified by verify_token
Glandos Jul 25, 2021
832a054
rename test to match test case
Glandos Jul 25, 2021
89c2756
comment code
Glandos Jul 25, 2021
e25d5db
extract function to extract HTML link
Glandos Jul 25, 2021
6c0d0e2
simplify the token
Glandos Aug 1, 2021
a67ac62
unused import
Glandos Sep 16, 2021
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
Prev Previous commit
Next Next commit
simplify the token 
Keep it in a list, for forward compatibillity
  • Loading branch information
@Glandos
Glandos committed Sep 16, 2021
commit 6c0d0e22b084f94f0a0df1e5e1ec5b61ea72df7c
6 changes: 3 additions & 3 deletions ihatemoney/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,12 +350,12 @@ def generate_token(self, token_type="auth"):
serializer = URLSafeTimedSerializer(
current_app.config["SECRET_KEY"], salt=token_type
)
token = serializer.dumps({"project_id": self.id})
token = serializer.dumps([self.id])
else:
serializer = URLSafeSerializer(
current_app.config["SECRET_KEY"] + self.password, salt=token_type
)
token = serializer.dumps({"project_id": self.id})
token = serializer.dumps([self.id])

return token

Expand Down Expand Up @@ -390,7 +390,7 @@ def verify_token(token, token_type="auth", project_id=None, max_age=3600):
except BadSignature:
return None

data_project = data.get("project_id")
data_project = data[0] if isinstance(data, list) else None
return (
data_project if project_id is None or data_project == project_id else None
)
Expand Down