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

Timeout on post

merge-requests/30/head
Bob Mottram 2021-03-10 19:24:52 +00:00
parent 63b7aa6d94
commit d6efc44fe2
10 changed files with 53 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
announce.py
View File

@ -256,7 +256,8 @@ def sendAnnounceViaServer(baseDir: str, session,
'Content-type': 'application/json', 'Content-type': 'application/json',
'Authorization': authHeader 'Authorization': authHeader
} }
postResult = postJson(session, newAnnounceJson, [], inboxUrl, headers) postResult = postJson(session, newAnnounceJson, [], inboxUrl,
headers, 30, True)
if not postResult: if not postResult:
print('WARN: Announce not posted') print('WARN: Announce not posted')

2
availability.py
View File

@ -142,7 +142,7 @@ def sendAvailabilityViaServer(baseDir: str, session,
'Authorization': authHeader 'Authorization': authHeader
} }
postResult = postJson(session, newAvailabilityJson, [], postResult = postJson(session, newAvailabilityJson, [],
inboxUrl, headers) inboxUrl, headers, 30, True)
if not postResult: if not postResult:
print('WARN: failed to post availability') print('WARN: failed to post availability')

2
delete.py
View File

@ -91,7 +91,7 @@ def sendDeleteViaServer(baseDir: str, session,
'Authorization': authHeader 'Authorization': authHeader
} }
postResult = \ postResult = \
postJson(session, newDeleteJson, [], inboxUrl, headers) postJson(session, newDeleteJson, [], inboxUrl, headers, 30, True)
if not postResult: if not postResult:
if debug: if debug:
print('DEBUG: POST announce failed for c2s to ' + inboxUrl) print('DEBUG: POST announce failed for c2s to ' + inboxUrl)

4
follow.py
View File

@ -1004,7 +1004,7 @@ def sendFollowRequestViaServer(baseDir: str, session,
'Authorization': authHeader 'Authorization': authHeader
} }
postResult = \ postResult = \
postJson(session, newFollowJson, [], inboxUrl, headers) postJson(session, newFollowJson, [], inboxUrl, headers, 30, True)
if not postResult: if not postResult:
if debug: if debug:
print('DEBUG: POST announce failed for c2s to ' + inboxUrl) print('DEBUG: POST announce failed for c2s to ' + inboxUrl)
@ -1096,7 +1096,7 @@ def sendUnfollowRequestViaServer(baseDir: str, session,
'Authorization': authHeader 'Authorization': authHeader
} }
postResult = \ postResult = \
postJson(session, unfollowJson, [], inboxUrl, headers) postJson(session, unfollowJson, [], inboxUrl, headers, 30, True)
if not postResult: if not postResult:
if debug: if debug:
print('DEBUG: POST announce failed for c2s to ' + inboxUrl) print('DEBUG: POST announce failed for c2s to ' + inboxUrl)

6
like.py
View File

@ -203,7 +203,8 @@ def sendLikeViaServer(baseDir: str, session,
'Content-type': 'application/json', 'Content-type': 'application/json',
'Authorization': authHeader 'Authorization': authHeader
} }
postResult = postJson(session, newLikeJson, [], inboxUrl, headers, 30) postResult = postJson(session, newLikeJson, [], inboxUrl,
headers, 30, True)
if not postResult: if not postResult:
print('WARN: POST announce failed for c2s to ' + inboxUrl) print('WARN: POST announce failed for c2s to ' + inboxUrl)
return 5 return 5
@ -282,7 +283,8 @@ def sendUndoLikeViaServer(baseDir: str, session,
'Content-type': 'application/json', 'Content-type': 'application/json',
'Authorization': authHeader 'Authorization': authHeader
} }
postResult = postJson(session, newUndoLikeJson, [], inboxUrl, headers) postResult = postJson(session, newUndoLikeJson, [], inboxUrl,
headers, 30, True)
if not postResult: if not postResult:
print('WARN: POST announce failed for c2s to ' + inboxUrl) print('WARN: POST announce failed for c2s to ' + inboxUrl)
return 5 return 5

8
posts.py
View File

@ -2141,7 +2141,7 @@ def sendPostViaServer(projectVersion: str,
postDumps = json.dumps(postJsonObject) postDumps = json.dumps(postJsonObject)
postResult = \ postResult = \
postJsonString(session, postDumps, [], postJsonString(session, postDumps, [],
inboxUrl, headers, debug, 60) inboxUrl, headers, debug, 60, True)
if not postResult: if not postResult:
if debug: if debug:
print('DEBUG: POST failed for c2s to '+inboxUrl) print('DEBUG: POST failed for c2s to '+inboxUrl)
@ -4184,7 +4184,8 @@ def sendBlockViaServer(baseDir: str, session,
'Content-type': 'application/json', 'Content-type': 'application/json',
'Authorization': authHeader 'Authorization': authHeader
} }
postResult = postJson(session, newBlockJson, [], inboxUrl, headers) postResult = postJson(session, newBlockJson, [], inboxUrl,
headers, 30, True)
if not postResult: if not postResult:
print('WARN: Unable to post block') print('WARN: Unable to post block')
@ -4266,7 +4267,8 @@ def sendUndoBlockViaServer(baseDir: str, session,
'Content-type': 'application/json', 'Content-type': 'application/json',
'Authorization': authHeader 'Authorization': authHeader
} }
postResult = postJson(session, newBlockJson, [], inboxUrl, headers) postResult = postJson(session, newBlockJson, [], inboxUrl,
headers, 30, True)
if not postResult: if not postResult:
print('WARN: Unable to post block') print('WARN: Unable to post block')

2
roles.py
View File

@ -349,7 +349,7 @@ def sendRoleViaServer(baseDir: str, session,
'Authorization': authHeader 'Authorization': authHeader
} }
postResult = \ postResult = \
postJson(session, newRoleJson, [], inboxUrl, headers) postJson(session, newRoleJson, [], inboxUrl, headers, 30, True)
if not postResult: if not postResult:
if debug: if debug:
print('DEBUG: POST announce failed for c2s to '+inboxUrl) print('DEBUG: POST announce failed for c2s to '+inboxUrl)

20
session.py
View File

@ -137,11 +137,12 @@ def getJson(session, url: str, headers: {}, params: {},
def postJson(session, postJsonObject: {}, federationList: [], def postJson(session, postJsonObject: {}, federationList: [],
inboxUrl: str, headers: {}, timeoutSec=60) -> str: inboxUrl: str, headers: {}, timeoutSec=60, quiet=False) -> str:
"""Post a json message to the inbox of another person """Post a json message to the inbox of another person
""" """
# check that we are posting to a permitted domain # check that we are posting to a permitted domain
if not urlPermitted(inboxUrl, federationList): if not urlPermitted(inboxUrl, federationList):
if not quiet:
print('postJson: ' + inboxUrl + ' not permitted') print('postJson: ' + inboxUrl + ' not permitted')
return None return None
@ -151,15 +152,17 @@ def postJson(session, postJsonObject: {}, federationList: [],
data=json.dumps(postJsonObject), data=json.dumps(postJsonObject),
headers=headers, timeout=timeoutSec) headers=headers, timeout=timeoutSec)
except requests.exceptions.RequestException as e: except requests.exceptions.RequestException as e:
if not quiet:
print('ERROR: postJson requests failed ' + inboxUrl + ' ' + print('ERROR: postJson requests failed ' + inboxUrl + ' ' +
json.dumps(postJsonObject) + ' ' + str(headers)) json.dumps(postJsonObject) + ' ' + str(headers))
print(e) print(e)
return None return None
except SocketError as e: except SocketError as e:
if e.errno == errno.ECONNRESET: if not quiet and e.errno == errno.ECONNRESET:
print('WARN: connection was reset during postJson') print('WARN: connection was reset during postJson')
return None return None
except ValueError as e: except ValueError as e:
if not quiet:
print('ERROR: postJson failed ' + inboxUrl + ' ' + print('ERROR: postJson failed ' + inboxUrl + ' ' +
json.dumps(postJsonObject) + ' ' + str(headers)) json.dumps(postJsonObject) + ' ' + str(headers))
print(e) print(e)
@ -174,7 +177,8 @@ def postJsonString(session, postJsonStr: str,
inboxUrl: str, inboxUrl: str,
headers: {}, headers: {},
debug: bool, debug: bool,
timeoutSec=30) -> (bool, bool): timeoutSec=30,
quiet=False) -> (bool, bool):
"""Post a json message string to the inbox of another person """Post a json message string to the inbox of another person
The second boolean returned is true if the send is unauthorized The second boolean returned is true if the send is unauthorized
NOTE: Here we post a string rather than the original json so that NOTE: Here we post a string rather than the original json so that
@ -186,16 +190,19 @@ def postJsonString(session, postJsonStr: str,
session.post(url=inboxUrl, data=postJsonStr, session.post(url=inboxUrl, data=postJsonStr,
headers=headers, timeout=timeoutSec) headers=headers, timeout=timeoutSec)
except requests.exceptions.RequestException as e: except requests.exceptions.RequestException as e:
if not quiet:
print('WARN: error during postJsonString requests') print('WARN: error during postJsonString requests')
print(e) print(e)
return None, None return None, None
except SocketError as e: except SocketError as e:
if e.errno == errno.ECONNRESET: if not quiet and e.errno == errno.ECONNRESET:
print('WARN: connection was reset during postJsonString') print('WARN: connection was reset during postJsonString')
if not quiet:
print('ERROR: postJsonString failed ' + inboxUrl + ' ' + print('ERROR: postJsonString failed ' + inboxUrl + ' ' +
postJsonStr + ' ' + str(headers)) postJsonStr + ' ' + str(headers))
return None, None return None, None
except ValueError as e: except ValueError as e:
if not quiet:
print('WARN: error during postJsonString') print('WARN: error during postJsonString')
print(e) print(e)
return None, None return None, None
@ -203,10 +210,13 @@ def postJsonString(session, postJsonStr: str,
if postResult.status_code >= 400 and \ if postResult.status_code >= 400 and \
postResult.status_code <= 405 and \ postResult.status_code <= 405 and \
postResult.status_code != 404: postResult.status_code != 404:
print('WARN: Post to ' + inboxUrl + ' is unauthorized. Code ' + if not quiet:
print('WARN: Post to ' + inboxUrl +
' is unauthorized. Code ' +
str(postResult.status_code)) str(postResult.status_code))
return False, True return False, True
else: else:
if not quiet:
print('WARN: Failed to post to ' + inboxUrl + print('WARN: Failed to post to ' + inboxUrl +
' with headers ' + str(headers)) ' with headers ' + str(headers))
print('status code ' + str(postResult.status_code)) print('status code ' + str(postResult.status_code))

5
shares.py
View File

@ -406,7 +406,7 @@ def sendShareViaServer(baseDir, session,
'Authorization': authHeader 'Authorization': authHeader
} }
postResult = \ postResult = \
postJson(session, newShareJson, [], inboxUrl, headers) postJson(session, newShareJson, [], inboxUrl, headers, 30, True)
if not postResult: if not postResult:
if debug: if debug:
print('DEBUG: POST announce failed for c2s to ' + inboxUrl) print('DEBUG: POST announce failed for c2s to ' + inboxUrl)
@ -495,7 +495,8 @@ def sendUndoShareViaServer(baseDir: str, session,
'Authorization': authHeader 'Authorization': authHeader
} }
postResult = \ postResult = \
postJson(session, undoShareJson, [], inboxUrl, headers) postJson(session, undoShareJson, [], inboxUrl,
headers, 30, True)
if not postResult: if not postResult:
if debug: if debug:
print('DEBUG: POST announce failed for c2s to ' + inboxUrl) print('DEBUG: POST announce failed for c2s to ' + inboxUrl)

3
skills.py
View File

@ -160,7 +160,8 @@ def sendSkillViaServer(baseDir: str, session, nickname: str, password: str,
'Authorization': authHeader 'Authorization': authHeader
} }
postResult = \ postResult = \
postJson(session, newSkillJson, [], inboxUrl, headers) postJson(session, newSkillJson, [], inboxUrl,
headers, 30, True)
if not postResult: if not postResult:
if debug: if debug:
print('DEBUG: POST announce failed for c2s to ' + inboxUrl) print('DEBUG: POST announce failed for c2s to ' + inboxUrl)