mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

quieten some debug

master
Bob Mottram 2019-08-23 11:57:27 +01:00
parent 9c137b0560
commit d05a416998
3 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
epicyon.py
View File

@ -821,22 +821,18 @@ if args.actor:
domain,__version__) domain,__version__)
else: else:
wfRequest={ wfRequest={
"aliases": [ 'aliases': [httpPrefix+'://'+domain+'/@inbox',
httpPrefix+'://'+domain+'/users/inbox' httpPrefix+'://'+domain+'/users/inbox'],
], 'links': [{'href': httpPrefix+'://'+domain+'/users/inbox',
"links": [ 'rel': 'self',
{ 'type': 'application/activity+json'}],
"href": httpPrefix+'://'+domain+'/users/inbox', 'subject': 'acct:inbox@'+domain
"rel": "self", }
"type": "application/activity+json"
}
],
"subject": 'acct:inbox@'+domain
}
if not wfRequest: if not wfRequest:
print('Unable to webfinger '+nickname+'@'+domain) print('Unable to webfinger '+nickname+'@'+domain)
sys.exit() sys.exit()
asHeader = {'Accept': 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'} asHeader = {'Accept': 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'}
personUrl = getUserUrl(wfRequest) personUrl = getUserUrl(wfRequest)
personJson = getJson(session,personUrl,asHeader,None,__version__,httpPrefix,domain) personJson = getJson(session,personUrl,asHeader,None,__version__,httpPrefix,domain)

20
httpsig.py
View File

@ -142,8 +142,8 @@ def verifyPostHeaders(httpPrefix: str,publicKeyPem: str,headers: dict, \
k: v[1:-1] k: v[1:-1]
for k, v in [i.split('=', 1) for i in signatureHeader.split(',')] for k, v in [i.split('=', 1) for i in signatureHeader.split(',')]
} }
print('********************signatureHeader: '+str(signatureHeader)) #print('********************signatureHeader: '+str(signatureHeader))
print('********************signatureDict: '+str(signatureDict)) #print('********************signatureDict: '+str(signatureDict))
# Unpack the signed headers and set values based on current headers and # Unpack the signed headers and set values based on current headers and
# body (if a digest was included) # body (if a digest was included)
@ -152,32 +152,32 @@ def verifyPostHeaders(httpPrefix: str,publicKeyPem: str,headers: dict, \
if signedHeader == '(request-target)': if signedHeader == '(request-target)':
signedHeaderList.append( signedHeaderList.append(
f'(request-target): {method.lower()} {path}') f'(request-target): {method.lower()} {path}')
print('***************************Verify (request-target): '+method.lower()+' '+path) #print('***************************Verify (request-target): '+method.lower()+' '+path)
elif signedHeader == 'digest': elif signedHeader == 'digest':
if messageBodyDigest: if messageBodyDigest:
bodyDigest=messageBodyDigest bodyDigest=messageBodyDigest
else: else:
bodyDigest = messageContentDigest(messageBodyJsonStr) bodyDigest = messageContentDigest(messageBodyJsonStr)
signedHeaderList.append(f'digest: SHA-256={bodyDigest}') signedHeaderList.append(f'digest: SHA-256={bodyDigest}')
print('***************************Verify digest: SHA-256='+bodyDigest) #print('***************************Verify digest: SHA-256='+bodyDigest)
print('***************************Verify messageBodyJsonStr: '+messageBodyJsonStr) #print('***************************Verify messageBodyJsonStr: '+messageBodyJsonStr)
else: else:
if headers.get(signedHeader): if headers.get(signedHeader):
print('***************************Verify '+signedHeader+': '+headers[signedHeader]) #print('***************************Verify '+signedHeader+': '+headers[signedHeader])
signedHeaderList.append( signedHeaderList.append(
f'{signedHeader}: {headers[signedHeader]}') f'{signedHeader}: {headers[signedHeader]}')
else: else:
signedHeaderCap=signedHeader.capitalize() signedHeaderCap=signedHeader.capitalize()
print('***************************Verify '+signedHeaderCap+': '+headers[signedHeaderCap]) #print('***************************Verify '+signedHeaderCap+': '+headers[signedHeaderCap])
if headers.get(signedHeaderCap): if headers.get(signedHeaderCap):
signedHeaderList.append( signedHeaderList.append(
f'{signedHeader}: {headers[signedHeaderCap]}') f'{signedHeader}: {headers[signedHeaderCap]}')
print('***********************signedHeaderList: ') #print('***********************signedHeaderList: ')
pprint(signedHeaderList) #pprint(signedHeaderList)
# Now we have our header data digest # Now we have our header data digest
signedHeaderText = '\n'.join(signedHeaderList) signedHeaderText = '\n'.join(signedHeaderList)
print('***********************Verify: signedHeaderText: '+signedHeaderText) #print('***********************Verify: signedHeaderText: '+signedHeaderText)
headerDigest = SHA256.new(signedHeaderText.encode('ascii')) headerDigest = SHA256.new(signedHeaderText.encode('ascii'))
# Get the signature, verify with public key, return result # Get the signature, verify with public key, return result

4
posts.py
View File

@ -1194,11 +1194,11 @@ def sendSignedJson(postJsonObject: {},session,baseDir: str, \
else: else:
wfRequest={ wfRequest={
"aliases": [ "aliases": [
httpPrefix+'://'+toDomain+'/inbox' httpPrefix+'://'+toDomain+'/users/inbox'
], ],
"links": [ "links": [
{ {
"href": httpPrefix+'://'+toDomain+'/inbox', "href": httpPrefix+'://'+toDomain+'/users/inbox',
"rel": "self", "rel": "self",
"type": "application/activity+json" "type": "application/activity+json"
} }