From 5e507d7b4176276947c28fad6899c606c3242153 Mon Sep 17 00:00:00 2001 From: Mawoka Date: Tue, 12 Apr 2022 13:10:59 +0200 Subject: [PATCH] :bug: Fixed regex --- classquiz/routers/quiz.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/classquiz/routers/quiz.py b/classquiz/routers/quiz.py index bf41b9e..4ba7a51 100644 --- a/classquiz/routers/quiz.py +++ b/classquiz/routers/quiz.py @@ -27,7 +27,7 @@ async def create_quiz_lol(quiz_input: QuizInput, user: User = Depends(get_curren if question.image == "": question.image = None if question.image is not None: - if not re.match(imgur_regex, question.image) or not re.match(server_regex, question.image): + if not re.match(imgur_regex, question.image) and not re.match(server_regex, question.image): raise HTTPException(status_code=400, detail="image url is not valid") quiz = Quiz(**quiz_input.dict(), user_id=user.id, id=uuid.uuid4()) await redis.delete("global_quiz_count") @@ -94,12 +94,13 @@ async def get_quiz_list(user: User = Depends(get_current_user)): @router.put("/update/{quiz_id}") async def update_quiz(quiz_id: str, quiz_input: QuizInput, user: User = Depends(get_current_user)): imgur_regex = r"^https://i\.imgur\.com\/.{7}.(jpg|png|gif)$" - server_regex = rf"^{settings.root_address}/api/v1/storage/download/.{36}--.{36}$" + server_regex = rf"^{settings.root_address}/api/v1/storage/download/.{{36}}--.{{36}}$" for question in quiz_input.questions: if question.image == "": question.image = None if question.image is not None: - if not re.match(imgur_regex, question.image) or not re.match(server_regex, question.image): + if not bool(re.match(server_regex, question.image)) and not bool(re.match(imgur_regex, question.image)): + print("not valid", question.image) raise HTTPException(status_code=400, detail="image url is not valid") try: quiz_id = uuid.UUID(quiz_id)