Accounts should now support requiring moderator approval. Also dropped pydantic dep.

This commit is contained in:
Zergling_man 2024-05-12 17:36:50 +10:00
parent 10586b480a
commit 2fcd9be1b0
3 changed files with 22 additions and 21 deletions

11
main.py
View File

@ -1,11 +0,0 @@
from importlib import import_module
from . import utils, models
from .config import config
globals()['backend']=import_module('.backends.'+config['backend']['type'],'auth')
backend.config=config['backend']['options']
backend.utils=utils
backend.models=models
models.utils=utils
models.backend=backend
backend.init()

View File

@ -1,6 +1,6 @@
from dataclasses import dataclass
from pydantic.v1 import validate_arguments
from datetime import datetime
from enum import Enum
import uuid
class AbstractUser():
@ -29,9 +29,11 @@ class Token():
class InviteToken(Token):
_uses: int=0
_max_uses: int=-1
expires: datetime=None
@validate_arguments
expires: datetime|None=None
def __init__(self,value,owner,uses:int,maxuses:int,expiry:datetime|None):
uses=int(uses); maxuses=int(maxuses);
if expiry!='None': expiry=datetime(expiry)
else: expiry=None
self.uses,self.max_uses,self.expires=uses,maxuses,expiry
return super().__init__(value,owner)
@property
@ -62,6 +64,7 @@ class User(AbstractUser):
salt: str
_invited_by: AbstractUser|str # Root node will just reference itself
email: str=''
state: str='pending'
def _load_invite(self):
if self._invited_by==self.username: return self # Sanity-check to prevent infinite recursion.
return backend.load_user(self._invited_by)
@ -72,8 +75,11 @@ class User(AbstractUser):
return self._invited_by
@property
def serialise(self):
return ','.join([self.username,self.password_hash,str(self.salt),self.invited_by.username,self.email or ''])
upstream=self.invited_by
upstream=upstream.username if upstream else 'None'
return ','.join([self.username,self.password_hash,str(self.salt),upstream,self.email or '',self.state])
def create_inv_token(self,*args,**kwargs):
""" All arguments are passed directly to InviteToken's constructor, with self added at the beginning """
tok=InviteToken(self,*args,**kwargs)
backend.save_invite(tok)
return tok
@ -97,12 +103,18 @@ class User(AbstractUser):
return a
raise Exception("Incorrect password")
@classmethod
def register(cls,username:str,password:str,invite:InviteToken,email:str=''):
def register(cls,username:str,password:str,invite:InviteToken=None,email:str=''):
if set([chr(n) for n in range(32)]+[','])&set(username): raise Exception('Invalid username')
u=backend.load_user(username)
if u is not None: raise Exception("User already exists")
u=User(username,*utils.phash(password),invite.owner,email)
if invite:
owner=invite.owner
else:
owner=None
u=User(username,*utils.phash(password),owner,email)
if invite:
user.state='approved' # Invited users don't need approval
invite.uses+=1
backend.save_invite(invite)
u.save()
invite.uses+=1
backend.save_invite(invite)
return u