From e500d32b155058ef69ef737a4cc6112051e8f2b2 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 4 Jul 2019 18:56:25 +0100
Subject: [PATCH] Reserved usernames

---
 daemon.py | 6 +++---
 inbox.py  | 1 -
 person.py | 3 +++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/daemon.py b/daemon.py
index 912dd8f1d..3b42a4a91 100644
--- a/daemon.py
+++ b/daemon.py
@@ -147,7 +147,7 @@ class PubServer(BaseHTTPRequestHandler):
 
     def do_GET(self):
         if self.server.debug:
-            print('DEBUG: GET from '+self.server.baseDir+' path: '+self.path)
+            print('DEBUG: GET from '+self.server.baseDir+' path: '+self.path+' busy: '+str(self.server.GETbusy))
         if self.server.GETbusy:
             currTimeGET=int(time.time())
             if currTimeGET-self.server.lastGET<10:
@@ -159,8 +159,6 @@ class PubServer(BaseHTTPRequestHandler):
             self.server.lastGET=currTimeGET
         self.server.GETbusy=True
 
-        if self.server.debug:
-            print('DEBUG: GET _permittedDir')
         if not self._permittedDir(self.path):
             if self.server.debug:
                 print('DEBUG: GET Not permitted')
@@ -258,6 +256,8 @@ class PubServer(BaseHTTPRequestHandler):
         self._set_headers('application/json')
 
     def do_POST(self):
+        if self.server.debug:
+            print('DEBUG: POST to from '+self.server.baseDir+' path: '+self.path+' busy: '+str(self.server.POSTbusy))
         if self.server.POSTbusy:
             currTimePOST=int(time.time())
             if currTimePOST-self.server.lastPOST<10:
diff --git a/inbox.py b/inbox.py
index b7d79dab7..a920a44a3 100644
--- a/inbox.py
+++ b/inbox.py
@@ -141,7 +141,6 @@ def runInboxQueue(baseDir: str,httpPrefix: str,personCache: {},queue: [],domain:
                     continue
 
                 pubKey=getPersonPubKey(session,keyId,personCache,debug)
-                print('********* pubkey7825 '+str(pubKey))
                 if pubKey:
                     print('DEBUG: public key: '+str(pubKey))
                     break
diff --git a/person.py b/person.py
index 55fab8d58..f116bebe1 100644
--- a/person.py
+++ b/person.py
@@ -26,6 +26,9 @@ def createPerson(baseDir: str,nickname: str,domain: str,port: int, \
                  httpPrefix: str, saveToFile: bool,password=None) -> (str,str,{},{}):
     """Returns the private key, public key, actor and webfinger endpoint
     """
+    reservedNames=['inbox','outbox','followers','following','sharedInbox','publicKey']
+    if nickname in reservedNames:
+       return None,None,None,None
     privateKeyPem,publicKeyPem=generateRSAKey()
     webfingerEndpoint= \
         createWebfingerEndpoint(nickname,domain,port,httpPrefix,publicKeyPem)