Merge e74e2f7bb7 into f6f15d3979

Bumps traefik from 2.10.1 to 2.10.5.

---
updated-dependencies:
- dependency-name: traefik
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

.env.example

@@ -6,3 +6,6 @@ USE_DOCKER=no
 EMAIL_HOST=127.0.0.1
 EMAIL_PORT=1025
 SENTRY_DSN=
+EMAIL_PASSWORD=
+EMAIL_USER=
+EMAIL_USE_SSL=false

akarpov/music/api/urls.py

@@ -10,8 +10,18 @@
 app_name = "music"
 
 urlpatterns = [
-    path("playlists/", ListCreatePlaylistAPIView.as_view()),
-    path("playlists/<str:slug>", RetrieveUpdateDestroyPlaylistAPIView.as_view()),
-    path("song/", ListCreateSongAPIView.as_view()),
-    path("song/<str:slug>", RetrieveUpdateDestroySongAPIView.as_view()),
+    path(
+        "playlists/", ListCreatePlaylistAPIView.as_view(), name="list_create_playlist"
+    ),
+    path(
+        "playlists/<str:slug>",
+        RetrieveUpdateDestroyPlaylistAPIView.as_view(),
+        name="retrieve_update_delete_playlist",
+    ),
+    path("song/", ListCreateSongAPIView.as_view(), name="list_create_song"),
+    path(
+        "song/<str:slug>",
+        RetrieveUpdateDestroySongAPIView.as_view(),
+        name="retrieve_update_delete_song",
+    ),
 ]

akarpov/tools/api/serializers.py

@@ -0,0 +1,6 @@
+from rest_framework import serializers
+
+
+class URLPathSerializer(serializers.Serializer):
+    path = serializers.URLField()
+    kwargs = serializers.DictField(help_text="{'slug': 'str', 'pk': 'int'}")

akarpov/tools/api/services.py

@@ -0,0 +1,68 @@
+from functools import lru_cache
+
+from config import urls as urls_conf
+
+urls = None
+
+
+def get_urls(urllist, name="") -> (list, list):
+    res = []
+    res_short = []
+    for entry in urllist:
+        if hasattr(entry, "url_patterns"):
+            if entry.namespace != "admin":
+                rres, rres_short = get_urls(
+                    entry.url_patterns,
+                    name + entry.namespace + ":" if entry.namespace else name,
+                )
+                res += rres
+                res_short += rres_short
+        else:
+            res.append(
+                (
+                    name + entry.pattern.name if entry.pattern.name else "",
+                    str(entry.pattern),
+                )
+            )
+            res_short.append(
+                (
+                    entry.pattern.name,
+                    str(entry.pattern),
+                )
+            )
+    return res, res_short
+
+
+@lru_cache
+def urlpattern_to_js(pattern: str) -> (str, dict):
+    if pattern.startswith("^"):
+        return pattern
+    res = ""
+    kwargs = {}
+    for p in pattern.split("<"):
+        if ">" in p:
+            rec = ""
+            pn = p.split(">")
+            k = pn[0].split(":")
+            if len(k) == 1:
+                rec = "{" + k[0] + "}"
+                kwargs[k[0]] = "any"
+            elif len(k) == 2:
+                rec = "{" + k[1] + "}"
+                kwargs[k[1]] = k[0]
+            res += rec + pn[-1]
+        else:
+            res += p
+
+    return res, kwargs
+
+
+def get_api_path_by_url(name: str) -> tuple[str, dict] | None:
+    global urls
+    if not urls:
+        urls, urls_short = get_urls(urls_conf.urlpatterns)
+        urls = dict(urls_short) | dict(urls)
+
+    if name in urls:
+        return urlpattern_to_js(urls[name])
+    return None

akarpov/tools/api/urls.py

@@ -1,7 +1,10 @@
 from django.urls import include, path
 
+from akarpov.tools.api.views import RetrieveAPIUrlAPIView
+
 app_name = "tools"
 
 urlpatterns = [
+    path("<str:path>", RetrieveAPIUrlAPIView.as_view(), name="path"),
     path("qr/", include("akarpov.tools.qr.api.urls", namespace="qr")),
 ]

akarpov/tools/api/views.py

@@ -0,0 +1,18 @@
+from rest_framework import generics
+from rest_framework.exceptions import NotFound
+from rest_framework.permissions import AllowAny
+from rest_framework.response import Response
+
+from akarpov.tools.api.serializers import URLPathSerializer
+from akarpov.tools.api.services import get_api_path_by_url
+
+
+class RetrieveAPIUrlAPIView(generics.GenericAPIView):
+    serializer_class = URLPathSerializer
+    permission_classes = [AllowAny]
+
+    def get(self, request, *args, **kwargs):
+        path, k_args = get_api_path_by_url(self.kwargs["path"])
+        if not path:
+            raise NotFound
+        return Response(data={"path": path, "kwargs": k_args})

compose/production/traefik/traefik.yml

@@ -11,10 +11,6 @@ entryPoints:
         entryPoint:
           to: web-secure
 
-  web-secure:
-    # https
-    address: ":443"
-
   flower:
     address: ":5555"
 
@@ -29,27 +25,6 @@ certificatesResolvers:
         entryPoint: web
 
 http:
-  routers:
-    web-secure-router:
-      rule: "Host(`akarpov.ru`) || Host(`www.akarpov.ru`)"
-      entryPoints:
-        - web-secure
-      middlewares:
-        - csrf
-      service: django
-      tls:
-        # https://docs.traefik.io/master/routing/routers/#certresolver
-        certResolver: letsencrypt
-
-    flower-secure-router:
-      rule: "Host(`akarpov.ru`)"
-      entryPoints:
-        - flower
-      service: flower
-      tls:
-        # https://docs.traefik.io/master/routing/routers/#certresolver
-        certResolver: letsencrypt
-
   middlewares:
     csrf:
       # https://docs.traefik.io/master/middlewares/headers/#hostsproxyheaders

config/settings/base.py

@@ -307,6 +307,18 @@
 )
 # https://docs.djangoproject.com/en/dev/ref/settings/#email-timeout
 EMAIL_TIMEOUT = 5
+EMAIL_HOST_PASSWORD = env(
+    "EMAIL_PASSWORD",
+    default="",
+)
+EMAIL_HOST_USER = env(
+    "EMAIL_USER",
+    default="",
+)
+EMAIL_USE_SSL = env(
+    "EMAIL_USE_SSL",
+    default=False,
+)
 
 # ADMIN
 # ------------------------------------------------------------------------------