indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Handle port number in webfinger acct

master
Bob Mottram 2019-07-19 15:03:34 +01:00
parent 5e8e73f47b
commit 369d8cee7c
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
person.py
View File

@ -114,7 +114,7 @@ def createPersonBase(baseDir: str,nickname: str,domain: str,port: int, \
webfingerEndpoint= \ webfingerEndpoint= \
createWebfingerEndpoint(nickname,domain,port,httpPrefix,publicKeyPem) createWebfingerEndpoint(nickname,domain,port,httpPrefix,publicKeyPem)
if saveToFile: if saveToFile:
storeWebfingerEndpoint(nickname,domain,baseDir,webfingerEndpoint) storeWebfingerEndpoint(nickname,domain,port,baseDir,webfingerEndpoint)
handle=nickname.lower()+'@'+domain.lower() handle=nickname.lower()+'@'+domain.lower()
if port!=80 and port!=443: if port!=80 and port!=443:

17
webfinger.py
View File

@ -46,9 +46,9 @@ def webfingerHandle(session,handle: str,httpPrefix: str,cachedWebfingers: {}) ->
return None return None
wfDomain=domain wfDomain=domain
if ':' in wfDomain: if ':' in wfDomain:
#wfPort=int(wfDomain.split(':')[1]) wfPort=int(wfDomain.split(':')[1])
#if wfPort==80 or wfPort==443: if wfPort==80 or wfPort==443:
wfDomain=wfDomain.split(':')[0] wfDomain=wfDomain.split(':')[0]
wf=getWebfingerFromCache(nickname+'@'+wfDomain,cachedWebfingers) wf=getWebfingerFromCache(nickname+'@'+wfDomain,cachedWebfingers)
if wf: if wf:
return wf return wf
@ -74,10 +74,12 @@ def generateMagicKey(publicKeyPem) -> str:
pubexp = base64.urlsafe_b64encode(number.long_to_bytes(privkey.e)).decode("utf-8") pubexp = base64.urlsafe_b64encode(number.long_to_bytes(privkey.e)).decode("utf-8")
return f"data:application/magic-public-key,RSA.{mod}.{pubexp}" return f"data:application/magic-public-key,RSA.{mod}.{pubexp}"
def storeWebfingerEndpoint(nickname: str,domain: str,baseDir: str, \ def storeWebfingerEndpoint(nickname: str,domain: str,port: int,baseDir: str, \
wfJson: {}) -> bool: wfJson: {}) -> bool:
"""Stores webfinger endpoint for a user to a file """Stores webfinger endpoint for a user to a file
""" """
if port!=80 and port!=443:
domain=domain+':'+str(port)
handle=nickname+'@'+domain handle=nickname+'@'+domain
wfSubdir='/wfendpoints' wfSubdir='/wfendpoints'
if not os.path.isdir(baseDir+wfSubdir): if not os.path.isdir(baseDir+wfSubdir):
@ -91,7 +93,6 @@ def createWebfingerEndpoint(nickname: str,domain: str,port: int, \
httpPrefix: str,publicKeyPem) -> {}: httpPrefix: str,publicKeyPem) -> {}:
"""Creates a webfinger endpoint for a user """Creates a webfinger endpoint for a user
""" """
originalDomain=domain
if port!=80 and port!=443: if port!=80 and port!=443:
domain=domain+':'+str(port) domain=domain+':'+str(port)
@ -129,7 +130,7 @@ def createWebfingerEndpoint(nickname: str,domain: str,port: int, \
"template": httpPrefix+"://"+domain+"/authorize_interaction?uri={uri}" "template": httpPrefix+"://"+domain+"/authorize_interaction?uri={uri}"
} }
], ],
"subject": "acct:"+nickname+"@"+originalDomain "subject": "acct:"+nickname+"@"+domain
} }
return account return account
@ -158,7 +159,9 @@ def webfingerLookup(path: str,baseDir: str) -> {}:
handle=path.split('resource=acct:')[1].strip() handle=path.split('resource=acct:')[1].strip()
else: else:
if 'resource=acct%3A' in path: if 'resource=acct%3A' in path:
handle=path.split('resource=acct%3A')[1].replace('%40','@').strip() handle=path.split('resource=acct%3A')[1].replace('%40','@').replace('%3A',':').strip()
print("======== "+path)
print("======== "+handle)
if not handle: if not handle:
return None return None
if '&' in handle: if '&' in handle: