[core] Check if Regex input is valid
This commit is contained in:
parent
ec1c8f7cad
commit
3f5f5106e0
kibicara/webapi/hoods
|
@ -8,6 +8,7 @@ from kibicara.model import BadWord
|
||||||
from kibicara.webapi.hoods import get_hood
|
from kibicara.webapi.hoods import get_hood
|
||||||
from ormantic.exceptions import NoMatch
|
from ormantic.exceptions import NoMatch
|
||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
|
from re import compile as regex_compile, error as RegexError
|
||||||
from sqlite3 import IntegrityError
|
from sqlite3 import IntegrityError
|
||||||
|
|
||||||
|
|
||||||
|
@ -35,11 +36,14 @@ async def badword_create(
|
||||||
values: BodyBadWord, response: Response, hood=Depends(get_hood)
|
values: BodyBadWord, response: Response, hood=Depends(get_hood)
|
||||||
):
|
):
|
||||||
try:
|
try:
|
||||||
|
regex_compile(values.pattern)
|
||||||
badword = await BadWord.objects.create(hood=hood, **values.__dict__)
|
badword = await BadWord.objects.create(hood=hood, **values.__dict__)
|
||||||
response.headers['Location'] = '%d' % badword.id
|
response.headers['Location'] = '%d' % badword.id
|
||||||
return badword
|
return badword
|
||||||
except IntegrityError:
|
except IntegrityError:
|
||||||
raise HTTPException(status_code=status.HTTP_409_CONFLICT)
|
raise HTTPException(status_code=status.HTTP_409_CONFLICT)
|
||||||
|
except RegexError:
|
||||||
|
raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY)
|
||||||
|
|
||||||
|
|
||||||
@router.get('/{badword_id}')
|
@router.get('/{badword_id}')
|
||||||
|
|
|
@ -8,6 +8,7 @@ from kibicara.model import Trigger
|
||||||
from kibicara.webapi.hoods import get_hood
|
from kibicara.webapi.hoods import get_hood
|
||||||
from ormantic.exceptions import NoMatch
|
from ormantic.exceptions import NoMatch
|
||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
|
from re import compile as regex_compile, error as RegexError
|
||||||
from sqlite3 import IntegrityError
|
from sqlite3 import IntegrityError
|
||||||
|
|
||||||
|
|
||||||
|
@ -35,11 +36,14 @@ async def trigger_create(
|
||||||
values: BodyTrigger, response: Response, hood=Depends(get_hood)
|
values: BodyTrigger, response: Response, hood=Depends(get_hood)
|
||||||
):
|
):
|
||||||
try:
|
try:
|
||||||
|
regex_compile(values.pattern)
|
||||||
trigger = await Trigger.objects.create(hood=hood, **values.__dict__)
|
trigger = await Trigger.objects.create(hood=hood, **values.__dict__)
|
||||||
response.headers['Location'] = '%d' % trigger.id
|
response.headers['Location'] = '%d' % trigger.id
|
||||||
return trigger
|
return trigger
|
||||||
except IntegrityError:
|
except IntegrityError:
|
||||||
raise HTTPException(status_code=status.HTTP_409_CONFLICT)
|
raise HTTPException(status_code=status.HTTP_409_CONFLICT)
|
||||||
|
except RegexError:
|
||||||
|
raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY)
|
||||||
|
|
||||||
|
|
||||||
@router.get('/{trigger_id}')
|
@router.get('/{trigger_id}')
|
||||||
|
|
Loading…
Reference in a new issue