merge-requests/30/head
Bob Mottram 2021-09-20 17:51:53 +01:00
parent 2074fe5235
commit 3761a3185e
3 changed files with 4 additions and 5 deletions

View File

@ -2759,8 +2759,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.sendThreads, self.server.sendThreads,
self.server.postLog, self.server.postLog,
self.server.cachedWebfingers, self.server.cachedWebfingers,
self.server.personCache, self.server.personCache, debug,
debug,
self.server.projectVersion, self.server.projectVersion,
self.server.signingPrivateKeyPem) self.server.signingPrivateKeyPem)
if callingDomain.endswith('.onion') and onionDomain: if callingDomain.endswith('.onion') and onionDomain:

View File

@ -301,7 +301,6 @@ def _getPersonBoxActor(session, baseDir: str, actor: str,
personJson = \ personJson = \
getPersonFromCache(baseDir, actor, personCache, True) getPersonFromCache(baseDir, actor, personCache, True)
if personJson: if personJson:
print('_getPersonBoxActor unable to get actor ' + actor)
return personJson return personJson
if '/channel/' in actor or '/accounts/' in actor: if '/channel/' in actor or '/accounts/' in actor:

View File

@ -142,6 +142,7 @@ def _getJsonSigned(session, url: str, domainFull: str, sessionHeaders: {},
print('No sending domain for signed GET') print('No sending domain for signed GET')
return None return None
if '://' not in url: if '://' not in url:
print('Invalid url: ' + url)
return None return None
httpPrefix = url.split('://')[0] httpPrefix = url.split('://')[0]
toDomainFull = url.split('://')[1] toDomainFull = url.split('://')[1]
@ -194,8 +195,8 @@ def _getJsonSigned(session, url: str, domainFull: str, sessionHeaders: {},
sessionHeaders['Accept'] = signatureHeaderJson['accept'] sessionHeaders['Accept'] = signatureHeaderJson['accept']
sessionHeaders['Signature'] = signatureHeaderJson['signature'] sessionHeaders['Signature'] = signatureHeaderJson['signature']
sessionHeaders['Content-Length'] = '0' sessionHeaders['Content-Length'] = '0'
if debug: # if debug:
print('Signed GET sessionHeaders ' + str(sessionHeaders)) print('Signed GET sessionHeaders ' + str(sessionHeaders))
return _getJsonRequest(session, url, domainFull, sessionHeaders, return _getJsonRequest(session, url, domainFull, sessionHeaders,
sessionParams, timeoutSec, None, quiet, debug) sessionParams, timeoutSec, None, quiet, debug)