diff --git a/daemon.py b/daemon.py
index 5202e73e4..0f5b65e4a 100644
--- a/daemon.py
+++ b/daemon.py
@@ -16701,7 +16701,20 @@ class PubServer(BaseHTTPRequestHandler):
             return True
         return False
 
+    def _check_bad_path(self):
+        path_lower = self.path.lower()
+        if '..' in path_lower or \
+           '%2e%2e' in path_lower or \
+           '%252e%252e' in path_lower:
+            print('WARN: bad path ' + self.path)
+            self._400()
+            return True
+        return False
+
     def do_GET(self):
+        if self._check_bad_path():
+            return
+
         calling_domain = self.server.domain_full
 
         if self.headers.get('Host'):
@@ -20439,18 +20452,33 @@ class PubServer(BaseHTTPRequestHandler):
         self._200()
 
     def do_PROPFIND(self):
+        if self._check_bad_path():
+            return
+
         self._dav_handler('propfind', self.server.debug)
 
     def do_PUT(self):
+        if self._check_bad_path():
+            return
+
         self._dav_handler('put', self.server.debug)
 
     def do_REPORT(self):
+        if self._check_bad_path():
+            return
+
         self._dav_handler('report', self.server.debug)
 
     def do_DELETE(self):
+        if self._check_bad_path():
+            return
+
         self._dav_handler('delete', self.server.debug)
 
     def do_HEAD(self):
+        if self._check_bad_path():
+            return
+
         calling_domain = self.server.domain_full
         if self.headers.get('Host'):
             calling_domain = decoded_host(self.headers['Host'])
@@ -22081,6 +22109,9 @@ class PubServer(BaseHTTPRequestHandler):
             self._400()
 
     def do_POST(self):
+        if self._check_bad_path():
+            return
+
         proxy_type = self.server.proxy_type
         postreq_start_time = time.time()