X-Git-Url: https://git.mar77i.info/?a=blobdiff_plain;f=hub%2Futils.py;h=d888f1588a19b74a65559a6869b54c3162762b7c;hb=f591748910835b1a11c3765723d9d30193a5bd26;hp=c9d955cfa107e1e6cc01f5d7a7ea1b3d1e9a23d1;hpb=c0e574584af0d45070e5fa81fcbcd1dccc2c5a42;p=hublib

diff --git a/hub/utils.py b/hub/utils.py
index c9d955c..d888f15 100644
--- a/hub/utils.py
+++ b/hub/utils.py
@@ -1,18 +1,47 @@
-from base64 import urlsafe_b64encode
-from hashlib import sha3_512
+from jinja2_simple_tags import StandaloneTag
 
+from .static import StaticTemplateFile, TreeFileApp
 
-def scramble(secret, value):
-    h = sha3_512()
-    h.update(f"{secret}{value}".encode())
-    return urlsafe_b64encode(h.digest()).rstrip(b"=").decode("ascii")
+class StaticTag(StandaloneTag):
+    tags = {"static"}
 
+    @staticmethod
+    def get_hubapp(
+        static_file: StaticTemplateFile, hubapp: str | TreeFileApp | None
+    ) -> TreeFileApp:
+        h = static_file.hubapp
+        if hubapp == "root":
+            return h.root
+        elif isinstance(hubapp, str):
+            return h.root.hubapps[hubapp]
+        elif isinstance(hubapp, TreeFileApp):
+            return hubapp
+        return static_file.hubapp
 
-def get_redis_pass(redis_conf):
+    def render(
+        self, filename: str = "", hubapp: str | TreeFileApp | None = None
+    ) -> str:
+        """
+        If filename starts with '/', interpret the path as relative to hubapp.base_dir,
+        otherwise assume the path is relative to the current file.
+        """
+        static_file = self.context["static_file"]
+        hubapp = self.get_hubapp(static_file, hubapp)
+        if filename.startswith("/") or hubapp != static_file.hubapp:
+            path = hubapp.base_dir / filename.lstrip("/")
+        else:
+            path = static_file.path.parent / filename
+        return hubapp.uri(path)
+
+
+def get_redis_pass(redis_conf: str) -> str:
+    """
+    Poor man's redis credentials: read the password from redis_conf.
+    Requires redis being configured with a `requirepass` password set.
+    """
     prefix = "requirepass "
     with open(redis_conf, "rt") as fh:
         for line in fh:
-            if not line.startswith(prefix):
-                continue
-            return line[len(prefix) :].rstrip()
-    return None
+            if line.startswith(prefix):
+                return line[len(prefix) :].rstrip()
+    raise ValueError("No redis password found")