summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--authentication/__init__.py0
-rw-r--r--authentication/utils.py15
-rw-r--r--db/migrations/versions/202607021719-115caa5a76d0_added_user_model.py (renamed from db/migrations/versions/202607012255-6ebaa6ab0f48_.py)11
-rw-r--r--db/migrations/versions/202607021740-fc6608d3f9cc_added_oauth_models.py104
-rw-r--r--db/migrations/versions/202607021803-ac4fbf1fea31_added_password.py (renamed from db/migrations/versions/202607012255-40e20fbf63c9_.py)18
-rw-r--r--db/models.py28
-rw-r--r--db/session.py9
-rw-r--r--pyproject.toml3
-rw-r--r--uv.lock183
9 files changed, 348 insertions, 23 deletions
diff --git a/authentication/__init__.py b/authentication/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/authentication/__init__.py
diff --git a/authentication/utils.py b/authentication/utils.py
new file mode 100644
index 0000000..f383969
--- /dev/null
+++ b/authentication/utils.py
@@ -0,0 +1,15 @@
1import base64
2import hashlib
3import bcrypt
4
5
6def bcrypt_sha256_hash(password: str) -> str:
7 digest = hashlib.sha256(password.encode("utf-8")).digest()
8 encoded = base64.b64encode(digest)
9 return bcrypt.hashpw(encoded, bcrypt.gensalt()).decode("utf-8")
10
11
12def bcrypt_sha256_verify(password: str, hashed: str) -> bool:
13 digest = hashlib.sha256(password.encode("utf-8")).digest()
14 encoded = base64.b64encode(digest)
15 return bcrypt.checkpw(encoded, hashed.encode('utf-8'))
diff --git a/db/migrations/versions/202607012255-6ebaa6ab0f48_.py b/db/migrations/versions/202607021719-115caa5a76d0_added_user_model.py
index 9d4daa2..3ccb92d 100644
--- a/db/migrations/versions/202607012255-6ebaa6ab0f48_.py
+++ b/db/migrations/versions/202607021719-115caa5a76d0_added_user_model.py
@@ -1,8 +1,8 @@
1"""empty message 1"""Added user model
2 2
3Revision ID: 6ebaa6ab0f48 3Revision ID: 115caa5a76d0
4Revises: 4Revises:
5Create Date: 2026-07-01 22:55:14.146711 5Create Date: 2026-07-02 17:19:07.082841
6 6
7""" 7"""
8from typing import Sequence, Union 8from typing import Sequence, Union
@@ -13,7 +13,7 @@ import sqlmodel
13 13
14 14
15# revision identifiers, used by Alembic. 15# revision identifiers, used by Alembic.
16revision: str = '6ebaa6ab0f48' 16revision: str = '115caa5a76d0'
17down_revision: Union[str, Sequence[str], None] = None 17down_revision: Union[str, Sequence[str], None] = None
18branch_labels: Union[str, Sequence[str], None] = None 18branch_labels: Union[str, Sequence[str], None] = None
19depends_on: Union[str, Sequence[str], None] = None 19depends_on: Union[str, Sequence[str], None] = None
@@ -23,8 +23,9 @@ def upgrade() -> None:
23 """Upgrade schema.""" 23 """Upgrade schema."""
24 # ### commands auto generated by Alembic - please adjust! ### 24 # ### commands auto generated by Alembic - please adjust! ###
25 op.create_table('user', 25 op.create_table('user',
26 sa.Column('id', sa.Integer(), nullable=False), 26 sa.Column('id', sa.Uuid(), nullable=False),
27 sa.Column('username', sqlmodel.sql.sqltypes.AutoString(), nullable=False), 27 sa.Column('username', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
28 sa.Column('email', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
28 sa.PrimaryKeyConstraint('id') 29 sa.PrimaryKeyConstraint('id')
29 ) 30 )
30 op.create_index(op.f('ix_user_username'), 'user', ['username'], unique=True) 31 op.create_index(op.f('ix_user_username'), 'user', ['username'], unique=True)
diff --git a/db/migrations/versions/202607021740-fc6608d3f9cc_added_oauth_models.py b/db/migrations/versions/202607021740-fc6608d3f9cc_added_oauth_models.py
new file mode 100644
index 0000000..5498291
--- /dev/null
+++ b/db/migrations/versions/202607021740-fc6608d3f9cc_added_oauth_models.py
@@ -0,0 +1,104 @@
1"""Added oauth models
2
3Revision ID: fc6608d3f9cc
4Revises: 115caa5a76d0
5Create Date: 2026-07-02 17:40:58.968553
6
7"""
8import json
9import os
10from datetime import datetime, UTC
11from secrets import token_hex
12from random import randbytes
13from typing import Sequence, Union
14from uuid import uuid4, uuid7
15
16from alembic import op
17import sqlalchemy as sa
18import sqlmodel
19from authlib.integrations.sqla_oauth2 import OAuth2ClientMixin
20
21# revision identifiers, used by Alembic.
22revision: str = 'fc6608d3f9cc'
23down_revision: Union[str, Sequence[str], None] = '115caa5a76d0'
24branch_labels: Union[str, Sequence[str], None] = None
25depends_on: Union[str, Sequence[str], None] = None
26
27
28def upgrade() -> None:
29 """Upgrade schema."""
30 # ### commands auto generated by Alembic - please adjust! ###
31 client_application = op.create_table('clientapplication',
32 sa.Column('id', sa.Uuid(), nullable=False),
33 sa.Column('name', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
34 sa.Column('client_id', sa.String(length=48), nullable=True),
35 sa.Column('client_secret', sa.String(length=120), nullable=True),
36 sa.Column('client_id_issued_at', sa.Integer(), nullable=False),
37 sa.Column('client_secret_expires_at', sa.Integer(), nullable=False),
38 sa.Column('client_metadata', sa.Text(), nullable=True),
39 sa.PrimaryKeyConstraint('id')
40 )
41 op.create_index(op.f('ix_clientapplication_client_id'), 'clientapplication', ['client_id'], unique=False)
42 op.create_table('authcode',
43 sa.Column('id', sa.Uuid(), nullable=False),
44 sa.Column('user_id', sa.Uuid(), nullable=False),
45 sa.Column('code', sa.String(length=120), nullable=False),
46 sa.Column('client_id', sa.String(length=48), nullable=True),
47 sa.Column('redirect_uri', sa.Text(), nullable=True),
48 sa.Column('response_type', sa.Text(), nullable=True),
49 sa.Column('scope', sa.Text(), nullable=True),
50 sa.Column('nonce', sa.Text(), nullable=True),
51 sa.Column('auth_time', sa.Integer(), nullable=False),
52 sa.Column('acr', sa.Text(), nullable=True),
53 sa.Column('amr', sa.Text(), nullable=True),
54 sa.Column('code_challenge', sa.Text(), nullable=True),
55 sa.Column('code_challenge_method', sa.String(length=48), nullable=True),
56 sa.ForeignKeyConstraint(['user_id'], ['user.id'], ondelete='CASCADE'),
57 sa.PrimaryKeyConstraint('id'),
58 sa.UniqueConstraint('code')
59 )
60 op.create_table('authtoken',
61 sa.Column('id', sa.Uuid(), nullable=False),
62 sa.Column('user_id', sa.Uuid(), nullable=False),
63 sa.Column('client_id', sa.String(length=48), nullable=True),
64 sa.Column('token_type', sa.String(length=40), nullable=True),
65 sa.Column('access_token', sa.String(length=255), nullable=False),
66 sa.Column('refresh_token', sa.String(length=255), nullable=True),
67 sa.Column('scope', sa.Text(), nullable=True),
68 sa.Column('issued_at', sa.Integer(), nullable=False),
69 sa.Column('access_token_revoked_at', sa.Integer(), nullable=False),
70 sa.Column('refresh_token_revoked_at', sa.Integer(), nullable=False),
71 sa.Column('expires_in', sa.Integer(), nullable=False),
72 sa.ForeignKeyConstraint(['user_id'], ['user.id'], ondelete='CASCADE'),
73 sa.PrimaryKeyConstraint('id'),
74 sa.UniqueConstraint('access_token')
75 )
76 op.create_index(op.f('ix_authtoken_refresh_token'), 'authtoken', ['refresh_token'], unique=False)
77
78 op.bulk_insert(client_application, [
79 {
80 'id': uuid7(),
81 'name': 'TTUN',
82 'client_id': uuid4().hex,
83 'client_secret': token_hex(32),
84 'client_id_issued_at': datetime.now(tz=UTC).timestamp(),
85 'client_secret_expires_at': datetime.now(tz=UTC).timestamp() + 3600,
86 'client_metadata': json.dumps({
87 'redirect_uris': [
88 f'//{os.environ['TUNNEL_DOMAIN']}/oauth/callback'
89 ],
90 })
91 }
92 ])
93 # ### end Alembic commands ###
94
95
96def downgrade() -> None:
97 """Downgrade schema."""
98 # ### commands auto generated by Alembic - please adjust! ###
99 op.drop_index(op.f('ix_authtoken_refresh_token'), table_name='authtoken')
100 op.drop_table('authtoken')
101 op.drop_table('authcode')
102 op.drop_index(op.f('ix_clientapplication_client_id'), table_name='clientapplication')
103 op.drop_table('clientapplication')
104 # ### end Alembic commands ###
diff --git a/db/migrations/versions/202607012255-40e20fbf63c9_.py b/db/migrations/versions/202607021803-ac4fbf1fea31_added_password.py
index a32131a..116d27e 100644
--- a/db/migrations/versions/202607012255-40e20fbf63c9_.py
+++ b/db/migrations/versions/202607021803-ac4fbf1fea31_added_password.py
@@ -1,8 +1,8 @@
1"""empty message 1"""Added password
2 2
3Revision ID: 40e20fbf63c9 3Revision ID: ac4fbf1fea31
4Revises: 6ebaa6ab0f48 4Revises: fc6608d3f9cc
5Create Date: 2026-07-01 22:55:55.017591 5Create Date: 2026-07-02 18:03:17.190700
6 6
7""" 7"""
8from typing import Sequence, Union 8from typing import Sequence, Union
@@ -13,8 +13,8 @@ import sqlmodel
13 13
14 14
15# revision identifiers, used by Alembic. 15# revision identifiers, used by Alembic.
16revision: str = '40e20fbf63c9' 16revision: str = 'ac4fbf1fea31'
17down_revision: Union[str, Sequence[str], None] = '6ebaa6ab0f48' 17down_revision: Union[str, Sequence[str], None] = 'fc6608d3f9cc'
18branch_labels: Union[str, Sequence[str], None] = None 18branch_labels: Union[str, Sequence[str], None] = None
19depends_on: Union[str, Sequence[str], None] = None 19depends_on: Union[str, Sequence[str], None] = None