From 41c6d2e286fc9178b65526c956e59517239182b2 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 12 Sep 2021 17:04:45 +0100
Subject: [PATCH] Check for users path

---
 daemon.py | 18 ++++++++++++------
 utils.py  |  3 ++-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/daemon.py b/daemon.py
index cee254aa8..bab4bb40c 100644
--- a/daemon.py
+++ b/daemon.py
@@ -6481,7 +6481,10 @@ class PubServer(BaseHTTPRequestHandler):
         """Returns an ontology file
         """
         if '.owl' in path or '.rdf' in path or '.json' in path:
-            ontologyStr = path.split('/ontologies/')[1].replace('#', '')
+            if '/ontologies/' in path:
+                ontologyStr = path.split('/ontologies/')[1].replace('#', '')
+            else:
+                ontologyStr = path.split('/data/')[1].replace('#', '')
             ontologyFilename = None
             ontologyFileType = 'application/rdf+xml'
             if ontologyStr.startswith('DFC_'):
@@ -10908,6 +10911,7 @@ class PubServer(BaseHTTPRequestHandler):
         divertToLoginScreen = False
         if '/media/' not in path and \
            '/ontologies/' not in path and \
+           '/data/' not in path and \
            '/sharefiles/' not in path and \
            '/statuses/' not in path and \
            '/emoji/' not in path and \
@@ -13035,11 +13039,13 @@ class PubServer(BaseHTTPRequestHandler):
                             GETstartTime, GETtimings)
             return
 
-        if '/ontologies/' in self.path:
-            self._getOntology(callingDomain,
-                              self.path, self.server.baseDir,
-                              GETstartTime, GETtimings)
-            return
+        if '/ontologies/' in self.path or \
+           '/data/' in self.path:
+            if not hasUsersPath(self.path):
+                self._getOntology(callingDomain,
+                                  self.path, self.server.baseDir,
+                                  GETstartTime, GETtimings)
+                return
 
         self._benchmarkGETtimings(GETstartTime, GETtimings,
                                   'show emoji done',
diff --git a/utils.py b/utils.py
index f81aafea1..eef09fcc2 100644
--- a/utils.py
+++ b/utils.py
@@ -1790,7 +1790,8 @@ def _getReservedWords() -> str:
             'ignores', 'linksmobile', 'newswiremobile',
             'minimal', 'search', 'eventdelete',
             'searchemoji', 'catalog', 'conversationId',
-            'mention', 'http', 'https')
+            'mention', 'http', 'https',
+            'ontologies', 'data')
 
 
 def getNicknameValidationPattern() -> str: