Merge pull request #10 from innonymous/dev

v1.0.0

Author: smthngslv

.gitignore

@@ -1,5 +1,6 @@
 logs
 
+.venv/
 env
 .env
 

innonymous/api/__init__.py

@@ -17,7 +17,7 @@
 settings = APISettings()
 
 app = FastAPI(
-    version='0.0.2', title='InnonymousApi', root_path=settings.root_path or ''
+    version='1.0.0', title='InnonymousApi', root_path=settings.root_path or ''
 )
 app.add_middleware(
     CORSMiddleware,

innonymous/api/schemas/room/create.py

@@ -5,4 +5,4 @@
 
 
 class RoomCreateSchema(BaseModel):
-    name: constr(regex=r'^.{5,32}$')
+    name: constr(regex=r'^[\w0-9][\w0-9\s\-_]{3,30}[\w0-9]$')

innonymous/api/schemas/token/payload/create.py

@@ -8,6 +8,7 @@
 class TokenCreatePayloadSchema(UserCreateSchema):
     uuid: UUID
     captcha: str
+    exp: float
 
     class Config:
         extra = Extra.forbid

innonymous/api/schemas/user/create.py

@@ -5,4 +5,4 @@
 
 
 class UserCreateSchema(BaseModel):
-    name: constr(regex=r'^.{5,32}$')
+    name: constr(regex=r'^[\w0-9][\w0-9\s\-_]{0,30}[\w0-9]$')

innonymous/api/settings.py

@@ -11,6 +11,9 @@ class APISettings(BaseSettings):
     amqp_url: str
     database_url: str
 
+    captcha_ttl: int = 300
+    minimal_delay: float = 0.5
+
     # Root of the api endpoints.
     root_path: Optional[str]
 

innonymous/api/utils/_captcha.py

@@ -1,19 +1,25 @@
 import hmac
-from os import urandom
+from random import choices
+from string import digits, ascii_lowercase
 
 from captcha.image import ImageCaptcha
 
 
 class Captcha:
-    length = 8
+    length = 4
     algorithm = 'SHA256'
 
+    # a-z, 0-9, except similar characters.
+    alphabet = ''.join(
+        set(ascii_lowercase + digits).difference(set('9q0ocda17uv6b'))
+    )
+
     def __init__(self, key: str) -> None:
         self.__key = key.encode()
         self.__image = ImageCaptcha()
 
     def generate(self) -> tuple[str, bytes]:
-        payload = urandom((Captcha.length + 1) // 2).hex()
+        payload = ''.join(choices(Captcha.alphabet, k=Captcha.length))
 
         with self.__image.generate(payload, 'jpeg') as buffer:
             captcha = buffer.getvalue()

innonymous/api/views/messages.py

@@ -15,7 +15,8 @@
 from innonymous.api import (
     auth,
     db_engine,
-    mq
+    mq,
+    settings
 )
 from innonymous.api.schemas.message import (
     MessageCreateSchema,
@@ -77,7 +78,7 @@ async def create(
         user: UserModel = Depends(auth.authenticate),
         session: AsyncSession = Depends(db_engine.session)
 ) -> None:
-    if inactivity_interval(user).total_seconds() < 0.5:
+    if inactivity_interval(user).total_seconds() < settings.minimal_delay:
         await update_active(user, session)
 
         raise HTTPException(
@@ -101,7 +102,6 @@ async def create(
     session.add(message)
 
     await session.commit()
-    await update_active(room, session)
     await update_active(user, session)
 
     await mq.publish(MessageInfoSchema.from_orm(message))

innonymous/api/views/rooms.py

@@ -10,8 +10,11 @@
 
 from innonymous.api import (
     auth,
-    db_engine
+    db_engine,
+    settings,
+    mq
 )
+from innonymous.api.schemas.message import MessageInfoSchema
 from innonymous.api.schemas.room import (
     RoomCreateSchema,
     RoomInfoSchema,
@@ -23,7 +26,9 @@
 )
 from innonymous.database.models import (
     RoomModel,
-    UserModel
+    UserModel,
+    MessageModel,
+    MessageType
 )
 from innonymous.database.utils import get_all, get_by
 
@@ -64,7 +69,7 @@ async def create(
         user: UserModel = Depends(auth.authenticate),
         session: AsyncSession = Depends(db_engine.session)
 ) -> RoomInfoSchema:
-    if inactivity_interval(user).total_seconds() < 0.5:
+    if inactivity_interval(user).total_seconds() < settings.minimal_delay:
         await update_active(user, session)
 
         raise HTTPException(
@@ -79,4 +84,12 @@ async def create(
     await session.refresh(room)
     await update_active(user, session)
 
+    message = MessageModel(
+        type=MessageType.text, data=b'Room created.', user=user, room=room
+    )
+
+    session.add(message)
+    await session.commit()
+    await mq.publish(MessageInfoSchema.from_orm(message))
+
     return RoomInfoSchema.from_orm(room)

innonymous/api/views/users.py

@@ -1,4 +1,5 @@
 from base64 import b64encode
+import time
 from uuid import (
     UUID,
     uuid4
@@ -15,7 +16,8 @@
 from innonymous.api import (
     auth,
     captcha,
-    db_engine
+    db_engine,
+    settings
 )
 from innonymous.api.schemas.token import TokenInfoSchema
 from innonymous.api.schemas.token.payload import (
@@ -54,7 +56,10 @@ async def create(user: UserCreateSchema) -> UserConfirmSchema:
 
     # noinspection Pydantic
     payload = TokenCreatePayloadSchema(
-        uuid=uuid4(), captcha=_hash, **user.dict()
+        uuid=uuid4(), 
+        captcha=_hash,
+        exp=time.time() + settings.captcha_ttl,
+        **user.dict(),
     )
 
     return UserConfirmSchema(