From 1551c20420e160789c279d2ae38f8c6ce3066ec3 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 19 Jul 2019 15:41:32 +0100
Subject: [PATCH] Back to no port number on webfinger acct

---
 daemon.py    |  2 +-
 webfinger.py | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/daemon.py b/daemon.py
index 24e35ff4b..f01fdbf78 100644
--- a/daemon.py
+++ b/daemon.py
@@ -97,7 +97,7 @@ class PubServer(BaseHTTPRequestHandler):
 
         if self.server.debug:
             print('DEBUG: WEBFINGER lookup '+self.path+' '+str(self.server.baseDir))
-        wfResult=webfingerLookup(self.path,self.server.baseDir,self.server.debug)
+        wfResult=webfingerLookup(self.path,self.server.baseDir,self.server.port,self.server.debug)
         if wfResult:
             self._set_headers('application/jrd+json')
             self.wfile.write(json.dumps(wfResult).encode('utf-8'))
diff --git a/webfinger.py b/webfinger.py
index afc2f8bd0..5b112040e 100644
--- a/webfinger.py
+++ b/webfinger.py
@@ -41,14 +41,13 @@ def webfingerHandle(session,handle: str,httpPrefix: str,cachedWebfingers: {}) ->
         return None
 
     nickname, domain = parseHandle(handle)
-    print('wfTest2 '+nickname+' '+domain)
     if not nickname:
         return None
     wfDomain=domain
     if ':' in wfDomain:
-        wfPort=int(wfDomain.split(':')[1])
-        if wfPort==80 or wfPort==443:
-            wfDomain=wfDomain.split(':')[0]
+        #wfPort=int(wfDomain.split(':')[1])
+        #if wfPort==80 or wfPort==443:
+        wfDomain=wfDomain.split(':')[0]
     wf=getWebfingerFromCache(nickname+'@'+wfDomain,cachedWebfingers)
     if wf:
         return wf
@@ -93,6 +92,7 @@ def createWebfingerEndpoint(nickname: str,domain: str,port: int, \
                             httpPrefix: str,publicKeyPem) -> {}:
     """Creates a webfinger endpoint for a user
     """
+    originalDomain=domain
     if port!=80 and port!=443:
         domain=domain+':'+str(port)
 
@@ -130,7 +130,7 @@ def createWebfingerEndpoint(nickname: str,domain: str,port: int, \
                 "template": httpPrefix+"://"+domain+"/authorize_interaction?uri={uri}"
             }
         ],
-        "subject": "acct:"+nickname+"@"+domain
+        "subject": "acct:"+nickname+"@"+originalDomain
     }
     return account
 
@@ -149,7 +149,7 @@ def webfingerMeta() -> str:
         " </Link>" \
         "</XRD>"
 
-def webfingerLookup(path: str,baseDir: str,debug: bool) -> {}:
+def webfingerLookup(path: str,baseDir: str,port: int,debug: bool) -> {}:
     """Lookup the webfinger endpoint for an account
     """
     if not path.startswith('/.well-known/webfinger?'):        
@@ -161,7 +161,7 @@ def webfingerLookup(path: str,baseDir: str,debug: bool) -> {}:
             print('DEBUG: WEBFINGER handle '+handle)
     else:
         if 'resource=acct%3A' in path:
-            handle=path.split('resource=acct%3A')[1].replace('%40','@').replace('%3A',':').strip()
+            handle=path.split('resource=acct%3A')[1].replace('%40','@',1).replace('%3A',':',1).strip()
             if debug:
                 print('DEBUG: WEBFINGER handle '+handle)
     if not handle:
@@ -176,9 +176,12 @@ def webfingerLookup(path: str,baseDir: str,debug: bool) -> {}:
         if debug:
             print('DEBUG: WEBFINGER no @ in handle '+handle)
         return None
+    if port!=80 and port !=443:
+        if ':' not in handle:
+            handle=handle+':'+str(port)
     filename=baseDir+'/wfendpoints/'+handle.lower()+'.json'
     if debug:
-        print('DEBUG: WEBFINGER filename'+filename)
+        print('DEBUG: WEBFINGER filename '+filename)
     if not os.path.isfile(filename):
         if debug:
             print('DEBUG: WEBFINGER filename not found '+filename)