Ideen.md

@@ -1,5 +1,6 @@
 # MUSS
 
+- api: admin Login case sensitivity (username "admin" == "AdMiN")
 - api: Config-Liste von Extra-Türchen (kein Buchstabe, nur manuelles Bild)
 - api: Config-Option "Überspringe leere Türchen" (standard ja)
 
@@ -7,6 +8,7 @@
 
 - api/ui: Türchen mit Tag "0" einem zufälligen Tag zuweisen
 - api/?: Option "custom Zuordnung Buchstaben" (standard leer)
+- api: `config.solution` - whitespace="IGNORE"->"REMOVE" umbenennen, +Sonderzeichen
 - ui: `confirm` durch bulma Komponente(n) ersetzen
 
 # Erledigt
@@ -18,5 +20,3 @@
 - Option "Leerzeichen ignorieren" (standard ja)
 - Nach einigen Sekunden: Meldung "Türchen anzeigen?"
 - `alert` durch bulma Komponente(n) ersetzen
-- api: admin Login case sensitivity (username "admin" == "AdMiN")
-- api: `config.solution` - whitespace="IGNORE"->"REMOVE" umbenennen, +Sonderzeichen

api/advent22_api/core/config.py

@@ -23,18 +23,10 @@ class TransformedString(BaseModel):
         # Leerzeichen an Anfang und Ende entfernen
         STRIP = "STRIP"
 
-        # whitespace durch Leerzeichen ersetzen
-        SPACE = "SPACE"
-
         # whitespace entfernen
-        REMOVE = "REMOVE"
+        IGNORE = "IGNORE"
 
-    class __SpecialChars(str, Enum):
+    # special chars
-        # unverändert
-        KEEP = "KEEP"
-
-        # Sonderzeichen entfernen
-        REMOVE = "REMOVE"
 
     class __Case(str, Enum):
         # unverändert
@@ -51,8 +43,7 @@ class TransformedString(BaseModel):
 
     value: str
 
-    whitespace: __Whitespace = __Whitespace.REMOVE
+    whitespace: __Whitespace = __Whitespace.IGNORE
-    special_chars: __SpecialChars = __SpecialChars.REMOVE
     case: __Case = __Case.UPPER
 
     @field_validator("whitespace", "case", mode="before")
@@ -63,28 +54,21 @@ class TransformedString(BaseModel):
     def clean(self) -> str:
         result = self.value
 
-        # Whitespace verarbeiten
+        # Whitespace bearbeiten
-        if self.whitespace is TransformedString.__Whitespace.STRIP:
+        if self.whitespace is self.__Whitespace.STRIP:
             result = result.strip()
 
-        elif self.whitespace is TransformedString.__Whitespace.SPACE:
+        elif self.whitespace is self.__Whitespace.IGNORE:
-            result = re.sub(string=result, pattern=r"\s+", repl=" ")
-
-        elif self.whitespace is TransformedString.__Whitespace.REMOVE:
             result = re.sub(string=result, pattern=r"\s+", repl="")
 
-        # Sonderzeichen verarbeiten
-        if self.special_chars is TransformedString.__SpecialChars.REMOVE:
-            result = re.sub(string=result, pattern=r"[^a-zA-Z0-9\s]+", repl="")
-
         # Groß-/Kleinschreibung verarbeiten
-        if self.case is TransformedString.__Case.UPPER:
+        if self.case is self.__Case.UPPER:
             result = result.upper()
 
-        elif self.case is TransformedString.__Case.LOWER:
+        elif self.case is self.__Case.LOWER:
             result = result.lower()
 
-        elif self.case is TransformedString.__Case.RANDOM:
+        elif self.case is self.__Case.RANDOM:
             rnd = Random(self.value)
 
             def randomcase(c: str) -> str:

api/advent22_api/routers/_security.py

@@ -19,14 +19,8 @@ async def user_is_admin(
     True iff der user "admin" ist
     """
 
-    username_correct = secrets.compare_digest(
+    username_correct = secrets.compare_digest(credentials.username, cfg.admin.name)
-        credentials.username.lower(),
+    password_correct = secrets.compare_digest(credentials.password, cfg.admin.password)
-        cfg.admin.name.lower(),
-    )
-    password_correct = secrets.compare_digest(
-        credentials.password,
-        cfg.admin.password,
-    )
 
     return username_correct and password_correct
 

api/advent22_api/routers/admin.py

@@ -31,7 +31,6 @@ class AdminConfigModel(BaseModel):
     class __Solution(BaseModel):
         value: str
         whitespace: str
-        special_chars: str
         case: str
         clean: str
 
@@ -82,7 +81,6 @@ async def get_config_model(
             "solution": {
                 "value": cfg.solution.value,
                 "whitespace": cfg.solution.whitespace,
-                "special_chars": cfg.solution.special_chars,
                 "case": cfg.solution.case,
                 "clean": cfg.solution.clean,
             },

ui/src/components/admin/ConfigView.vue

@@ -27,12 +27,6 @@
                   {{ admin_config_model.solution.whitespace }}
                 </span>
               </dd>
-              <dd>
-                Sonderzeichen:
-                <span class="is-uppercase is-family-monospace">
-                  {{ admin_config_model.solution.special_chars }}
-                </span>
-              </dd>
               <dd>
                 Buchstaben:
                 <span class="is-uppercase is-family-monospace">
@@ -190,7 +184,6 @@ export default class extends Vue {
     solution: {
       value: "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
       whitespace: "KEEP",
-      special_chars: "KEEP",
       case: "KEEP",
       clean: "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
     },

ui/src/lib/api.ts

@@ -2,7 +2,6 @@ export interface AdminConfigModel {
   solution: {
     value: string;
     whitespace: string;
-    special_chars: string;
     case: string;
     clean: string;
   };