Synced with origin

radicale/web/__init__.py

@@ -1,4 +1,4 @@
-# This file is part of Radicale Server - Calendar Server
+# This file is part of Radicale - CalDAV and CardDAV server
 # Copyright © 2017-2018 Unrud <unrud@outlook.com>
 #
 # This library is free software: you can redistribute it and/or modify
@@ -21,18 +21,24 @@ Take a look at the class ``BaseWeb`` if you want to implement your own.
 
 """
 
-from radicale import utils
+from typing import Sequence
 
-INTERNAL_TYPES = ("none", "internal")
+from radicale import config, httputils, types, utils
+
+INTERNAL_TYPES: Sequence[str] = ("none", "internal")
 
 
-def load(configuration):
+def load(configuration: "config.Configuration") -> "BaseWeb":
     """Load the web module chosen in configuration."""
-    return utils.load_plugin(INTERNAL_TYPES, "web", "Web", configuration)
+    return utils.load_plugin(INTERNAL_TYPES, "web", "Web", BaseWeb,
+                             configuration)
 
 
 class BaseWeb:
-    def __init__(self, configuration):
+
+    configuration: "config.Configuration"
+
+    def __init__(self, configuration: "config.Configuration") -> None:
         """Initialize BaseWeb.
 
         ``configuration`` see ``radicale.config`` module.
@@ -42,7 +48,8 @@ class BaseWeb:
         """
         self.configuration = configuration
 
-    def get(self, environ, base_prefix, path, user):
+    def get(self, environ: types.WSGIEnviron, base_prefix: str, path: str,
+            user: str) -> types.WSGIResponse:
         """GET request.
 
         ``base_prefix`` is sanitized and never ends with "/".
@@ -52,4 +59,20 @@ class BaseWeb:
         ``user`` is empty for anonymous users.
 
         """
-        raise NotImplementedError
+        return httputils.METHOD_NOT_ALLOWED
+
+    def post(self, environ: types.WSGIEnviron, base_prefix: str, path: str,
+             user: str) -> types.WSGIResponse:
+        """POST request.
+
+        ``base_prefix`` is sanitized and never ends with "/".
+
+        ``path`` is sanitized and always starts with "/.web"
+
+        ``user`` is empty for anonymous users.
+
+        Use ``httputils.read*_request_body(self.configuration, environ)`` to
+        read the body.
+
+        """
+        return httputils.METHOD_NOT_ALLOWED

radicale/web/internal.py

@@ -1,4 +1,4 @@
-# This file is part of Radicale Server - Calendar Server
+# This file is part of Radicale - CalDAV and CardDAV server
 # Copyright © 2017-2018 Unrud <unrud@outlook.com>
 #
 # This library is free software: you can redistribute it and/or modify
@@ -25,67 +25,15 @@ Features:
 
 """
 
+from radicale import httputils, types, web
 
-import os
-import posixpath
-import time
-from http import client
-
-import pkg_resources
-
-from radicale import httputils, pathutils, web
-from radicale.log import logger
-
-MIMETYPES = {
-    ".css": "text/css",
-    ".eot": "application/vnd.ms-fontobject",
-    ".gif": "image/gif",
-    ".html": "text/html",
-    ".js": "application/javascript",
-    ".manifest": "text/cache-manifest",
-    ".png": "image/png",
-    ".svg": "image/svg+xml",
-    ".ttf": "application/font-sfnt",
-    ".txt": "text/plain",
-    ".woff": "application/font-woff",
-    ".woff2": "font/woff2",
-    ".xml": "text/xml"}
-FALLBACK_MIMETYPE = "application/octet-stream"
+MIMETYPES = httputils.MIMETYPES  # deprecated
+FALLBACK_MIMETYPE = httputils.FALLBACK_MIMETYPE  # deprecated
 
 
 class Web(web.BaseWeb):
-    def __init__(self, configuration):
-        super().__init__(configuration)
-        self.folder = pkg_resources.resource_filename(__name__,
-                                                      "internal_data")
 
-    def get(self, environ, base_prefix, path, user):
-        assert path == "/.web" or path.startswith("/.web/")
-        assert pathutils.sanitize_path(path) == path
-        try:
-            filesystem_path = pathutils.path_to_filesystem(
-                self.folder, path[len("/.web"):].strip("/"))
-        except ValueError as e:
-            logger.debug("Web content with unsafe path %r requested: %s",
-                         path, e, exc_info=True)
-            return httputils.NOT_FOUND
-        if os.path.isdir(filesystem_path) and not path.endswith("/"):
-            location = posixpath.basename(path) + "/"
-            return (client.FOUND,
-                    {"Location": location, "Content-Type": "text/plain"},
-                    "Redirected to %s" % location)
-        if os.path.isdir(filesystem_path):
-            filesystem_path = os.path.join(filesystem_path, "index.html")
-        if not os.path.isfile(filesystem_path):
-            return httputils.NOT_FOUND
-        content_type = MIMETYPES.get(
-            os.path.splitext(filesystem_path)[1].lower(), FALLBACK_MIMETYPE)
-        with open(filesystem_path, "rb") as f:
-            answer = f.read()
-            last_modified = time.strftime(
-                "%a, %d %b %Y %H:%M:%S GMT",
-                time.gmtime(os.fstat(f.fileno()).st_mtime))
-        headers = {
-            "Content-Type": content_type,
-            "Last-Modified": last_modified}
-        return client.OK, headers, answer
+    def get(self, environ: types.WSGIEnviron, base_prefix: str, path: str,
+            user: str) -> types.WSGIResponse:
+        return httputils.serve_resource("radicale.web", "internal_data",
+                                        base_prefix, path)

radicale/web/internal_data/fn.js

@@ -21,15 +21,14 @@
  * @const
  * @type {string}
  */
-const SERVER = (location.protocol + '//' + location.hostname +
-                (location.port ? ':' + location.port : ''));
+const SERVER = location.origin;
 
 /**
  * Path of the root collection on the server (must end with /)
  * @const
  * @type {string}
  */
-const ROOT_PATH = location.pathname.replace(new RegExp("/+[^/]+/*(/index\\.html?)?$"), "") + '/';
+const ROOT_PATH = (new URL("..", location.href)).pathname;
 
 /**
  * Regex to match and normalize color

radicale/web/none.py

@@ -1,4 +1,4 @@
-# This file is part of Radicale Server - Calendar Server
+# This file is part of Radicale - CalDAV and CardDAV server
 # Copyright © 2017-2018 Unrud <unrud@outlook.com>
 #
 # This library is free software: you can redistribute it and/or modify
@@ -21,13 +21,15 @@ A dummy web backend that shows a simple message.
 
 from http import client
 
-from radicale import httputils, pathutils, web
+from radicale import httputils, pathutils, types, web
 
 
 class Web(web.BaseWeb):
-    def get(self, environ, base_prefix, path, user):
+
+    def get(self, environ: types.WSGIEnviron, base_prefix: str, path: str,
+            user: str) -> types.WSGIResponse:
         assert path == "/.web" or path.startswith("/.web/")
         assert pathutils.sanitize_path(path) == path
         if path != "/.web":
-            return httputils.NOT_FOUND
+            return httputils.redirect(base_prefix + "/.web")
         return client.OK, {"Content-Type": "text/plain"}, "Radicale works!"