check if text returned is correct

Author: jruehlow

checker/src/checker.py

@@ -25,7 +25,7 @@
     MumbleException,
 )
 from utils import (Connection, encode_replay, decode_replay,
-                   gen_random_str, is_valid_uuid4)
+                   gen_random_str, is_valid_uuid4, get_text)
 from enochecker3.utils import assert_equals, assert_in
 from urllib.parse import urlparse
 
@@ -63,16 +63,30 @@ async def putflag_replay(
 
     con.log_debug('Get Text')
     era = random.choice(['Ancient', 'Medieval', 'Victorian', 'Future'])
-    # TODO: check if text / source / book / paragraph are correct
     try:
-        text = await con.client.get(f'/text?era={era}')
-        text.raise_for_status()
-        source = text.json().get('source')
-        book = text.json().get('book')
-        paragraph = text.json().get('paragraph')
+        rs = await con.client.get(f'/text?era={era}')
+        rs.raise_for_status()
+        text = rs.json().get('text')
+        source = rs.json().get('source')
+        book = int(rs.json().get('book'))
+        paragraph = int(rs.json().get('paragraph'))
+
+        loop = asyncio.get_running_loop()
+        text_db = await loop.run_in_executor(
+            None, lambda: get_text(era, source, book, paragraph)
+        )
+
     except Exception as e:
         con.log_error('Failed to get text', e)
 
+    if text_db is None:
+        con.log_debug('Text from DB returned None')
+        raise MumbleException("Failed to get text")
+    if text_db != text:
+        con.log_debug(f"Text from DB doesn't match. DB: {
+                      text_db} | Actual: {text}")
+        raise MumbleException("Failed to get text")
+
     time = random.choice([15, 30, 60, 120])
     end_time = datetime.now(timezone.utc)
     start_time = end_time - timedelta(seconds=time)
@@ -852,17 +866,29 @@ async def putnoise_profile(task: PutnoiseCheckerTaskMessage, db: ChainDB, logger
 
     con.log_debug('Get Text')
     era = random.choice(['Ancient', 'Medieval', 'Victorian', 'Future'])
-    # TODO: check if text / source / book / paragraph are correct
     try:
         res1 = await con.client.get(f'/text?era={era}')
         res1.raise_for_status()
         source = res1.json().get('source')
-        book = res1.json().get('book')
-        paragraph = res1.json().get('paragraph')
+        book = int(res1.json().get('book'))
+        paragraph = int(res1.json().get('paragraph'))
         text = res1.json().get('text')
+
+        loop = asyncio.get_running_loop()
+        text_db = await loop.run_in_executor(
+            None, lambda: get_text(era, source, book, paragraph)
+        )
     except Exception as e:
         con.log_error('Failed to get text', e)
 
+    if text_db is None:
+        con.log_debug('Text from DB returned None')
+        raise MumbleException("Failed to get text")
+    if text_db != text:
+        con.log_debug(f"Text from DB doesn't match. DB: {
+                      text_db} | Actual: {text}")
+        raise MumbleException("Failed to get text")
+
     mode = random.choice(["time", "word"])
     amount_words = random.choice([15, 25, 50, 100])
     if mode == "time":
@@ -1332,7 +1358,6 @@ async def receive_messages():
 """
 
 
-# TODO: widen the scope of this?
 @checker.havoc(0)
 async def havoc_text(task: HavocCheckerTaskMessage, logger: LoggerAdapter, client: AsyncClient):
     logger.info(f"Havoc 0 (text) {client.base_url}")

checker/src/texts.db

@@ -1,12 +1,14 @@
 from logging import LoggerAdapter
 from enochecker3 import MumbleException, OfflineException
-from httpx import AsyncClient, ConnectTimeout, NetworkError, PoolTimeout, HTTPStatusError, RequestError, ReadTimeout
+from httpx import AsyncClient, ConnectTimeout, NetworkError, PoolTimeout, HTTPStatusError, ReadTimeout
 from bs4 import BeautifulSoup
 import string
 import uuid
 import secrets
 import random
 import base64
+import sqlite3
+from typing import Optional
 
 
 def gen_random_str(length):
@@ -77,6 +79,27 @@ def is_valid_uuid4(u: str) -> bool:
     return str(val) == u
 
 
+def get_text(
+    era: str,
+    source: str,
+    book: int,
+    paragraph: int
+) -> Optional[str]:
+    conn = sqlite3.connect('texts.db')
+    cursor = conn.cursor()
+    query = """
+    SELECT text FROM texts
+    WHERE era = ?
+      AND source = ?
+      AND book = ?
+      AND paragraph = ?
+    """
+    cursor.execute(query, (era, source, book, paragraph))
+    row = cursor.fetchone()
+    conn.close()
+    return row[0] if row else None
+
+
 class Connection:
     def __init__(
             self,