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

Handle errors when creating session

main
Bob Mottram 2020-06-08 18:10:53 +01:00
parent ba38e6c995
commit 48f0f81a9f
2 changed files with 97 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
daemon.py
View File

@ -399,6 +399,9 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.debug: if self.server.debug:
print('DEBUG: creating new session during authenticated fetch') print('DEBUG: creating new session during authenticated fetch')
self.server.session = createSession(self.server.useTor) self.server.session = createSession(self.server.useTor)
if not self.server.session:
print('ERROR: GET failed to create session 1')
return False
# obtain the public key # obtain the public key
pubKey = \ pubKey = \
getPersonPubKey(self.server.baseDir, self.server.session, keyId, getPersonPubKey(self.server.baseDir, self.server.session, keyId,
@ -1175,6 +1178,10 @@ class PubServer(BaseHTTPRequestHandler):
if not self.server.session: if not self.server.session:
print('Starting new session') print('Starting new session')
self.server.session = createSession(self.server.useTor) self.server.session = createSession(self.server.useTor)
if not self.server.session:
print('ERROR: GET failed to create session 2')
self._404()
return
self._benchmarkGETtimings(GETstartTime, GETtimings, 6) self._benchmarkGETtimings(GETstartTime, GETtimings, 6)
@ -1271,6 +1278,11 @@ class PubServer(BaseHTTPRequestHandler):
if not self.server.session: if not self.server.session:
self.server.session = \ self.server.session = \
createSession(self.server.useTor) createSession(self.server.useTor)
if not self.server.session:
print('ERROR: GET failed to create session 3')
self._404()
return
msg = \ msg = \
htmlBlogPageRSS2(authorized, htmlBlogPageRSS2(authorized,
self.server.session, self.server.session,
@ -1303,6 +1315,10 @@ class PubServer(BaseHTTPRequestHandler):
if not self.server.session: if not self.server.session:
self.server.session = \ self.server.session = \
createSession(self.server.useTor) createSession(self.server.useTor)
if not self.server.session:
print('ERROR: GET failed to create session 4')
self._404()
return
msg = \ msg = \
htmlBlogPageRSS3(authorized, htmlBlogPageRSS3(authorized,
self.server.session, self.server.session,
@ -1331,6 +1347,10 @@ class PubServer(BaseHTTPRequestHandler):
if not self.server.session: if not self.server.session:
self.server.session = \ self.server.session = \
createSession(self.server.useTor) createSession(self.server.useTor)
if not self.server.session:
print('ERROR: GET failed to create session 5')
self._404()
return
msg = htmlBlogView(authorized, msg = htmlBlogView(authorized,
self.server.session, self.server.session,
self.server.baseDir, self.server.baseDir,
@ -1373,6 +1393,10 @@ class PubServer(BaseHTTPRequestHandler):
if not self.server.session: if not self.server.session:
self.server.session = \ self.server.session = \
createSession(self.server.useTor) createSession(self.server.useTor)
if not self.server.session:
print('ERROR: GET failed to create session 6')
self._404()
return
msg = htmlBlogPage(authorized, msg = htmlBlogPage(authorized,
self.server.session, self.server.session,
self.server.baseDir, self.server.baseDir,
@ -2257,6 +2281,10 @@ class PubServer(BaseHTTPRequestHandler):
return return
if not self.server.session: if not self.server.session:
self.server.session = createSession(self.server.useTor) self.server.session = createSession(self.server.useTor)
if not self.server.session:
print('ERROR: GET failed to create session 7')
self._404()
return
self.server.actorRepeat = self.path.split('?actor=')[1] self.server.actorRepeat = self.path.split('?actor=')[1]
announceToStr = \ announceToStr = \
self.server.httpPrefix + '://' + \ self.server.httpPrefix + '://' + \
@ -2347,6 +2375,10 @@ class PubServer(BaseHTTPRequestHandler):
return return
if not self.server.session: if not self.server.session:
self.server.session = createSession(self.server.useTor) self.server.session = createSession(self.server.useTor)
if not self.server.session:
print('ERROR: GET failed to create session 8')
self._404()
return
undoAnnounceActor = \ undoAnnounceActor = \
self.server.httpPrefix + '://' + self.server.domainFull + \ self.server.httpPrefix + '://' + self.server.domainFull + \
'/users/' + self.postToNickname '/users/' + self.postToNickname
@ -2392,6 +2424,10 @@ class PubServer(BaseHTTPRequestHandler):
if '@' in followingHandle: if '@' in followingHandle:
if not self.server.session: if not self.server.session:
self.server.session = createSession(self.server.useTor) self.server.session = createSession(self.server.useTor)
if not self.server.session:
print('ERROR: GET failed to create session 9')
self._404()
return
manualApproveFollowRequest(self.server.session, manualApproveFollowRequest(self.server.session,
self.server.baseDir, self.server.baseDir,
self.server.httpPrefix, self.server.httpPrefix,
@ -2511,6 +2547,10 @@ class PubServer(BaseHTTPRequestHandler):
return return
if not self.server.session: if not self.server.session:
self.server.session = createSession(self.server.useTor) self.server.session = createSession(self.server.useTor)
if not self.server.session:
print('ERROR: GET failed to create session 10')
self._404()
return
likeActor = \ likeActor = \
self.server.httpPrefix + '://' + \ self.server.httpPrefix + '://' + \
self.server.domainFull + '/users/' + self.postToNickname self.server.domainFull + '/users/' + self.postToNickname
@ -2605,6 +2645,10 @@ class PubServer(BaseHTTPRequestHandler):
return return
if not self.server.session: if not self.server.session:
self.server.session = createSession(self.server.useTor) self.server.session = createSession(self.server.useTor)
if not self.server.session:
print('ERROR: GET failed to create session 11')
self._404()
return
undoActor = \ undoActor = \
self.server.httpPrefix + '://' + \ self.server.httpPrefix + '://' + \
self.server.domainFull + '/users/' + self.postToNickname self.server.domainFull + '/users/' + self.postToNickname
@ -2701,6 +2745,10 @@ class PubServer(BaseHTTPRequestHandler):
return return
if not self.server.session: if not self.server.session:
self.server.session = createSession(self.server.useTor) self.server.session = createSession(self.server.useTor)
if not self.server.session:
print('ERROR: GET failed to create session 12')
self._404()
return
bookmarkActor = \ bookmarkActor = \
self.server.httpPrefix + '://' + \ self.server.httpPrefix + '://' + \
self.server.domainFull + '/users/' + self.postToNickname self.server.domainFull + '/users/' + self.postToNickname
@ -2783,6 +2831,10 @@ class PubServer(BaseHTTPRequestHandler):
return return
if not self.server.session: if not self.server.session:
self.server.session = createSession(self.server.useTor) self.server.session = createSession(self.server.useTor)
if not self.server.session:
print('ERROR: GET failed to create session 13')
self._404()
return
undoActor = \ undoActor = \
self.server.httpPrefix + '://' + \ self.server.httpPrefix + '://' + \
self.server.domainFull + '/users/' + self.postToNickname self.server.domainFull + '/users/' + self.postToNickname
@ -2875,6 +2927,10 @@ class PubServer(BaseHTTPRequestHandler):
return return
if not self.server.session: if not self.server.session:
self.server.session = createSession(self.server.useTor) self.server.session = createSession(self.server.useTor)
if not self.server.session:
print('ERROR: GET failed to create session 14')
self._404()
return
deleteStr = \ deleteStr = \
htmlDeletePost(self.server.recentPostsCache, htmlDeletePost(self.server.recentPostsCache,
@ -3304,6 +3360,11 @@ class PubServer(BaseHTTPRequestHandler):
self.server.useTor self.server.useTor
self.server.session = \ self.server.session = \
createSession(useTor) createSession(useTor)
if not self.server.session:
print('ERROR: GET failed to ' +
'create session 15')
self._404()
return
recentPostsCache = \ recentPostsCache = \
self.server.recentPostsCache self.server.recentPostsCache
maxRecentPosts = \ maxRecentPosts = \
@ -3398,6 +3459,11 @@ class PubServer(BaseHTTPRequestHandler):
useTor = self.server.useTor useTor = self.server.useTor
self.server.session = \ self.server.session = \
createSession(useTor) createSession(useTor)
if not self.server.session:
print('ERROR: GET failed to ' +
'create session 16')
self._404()
return
recentPostsCache = \ recentPostsCache = \
self.server.recentPostsCache self.server.recentPostsCache
maxRecentPosts = \ maxRecentPosts = \
@ -4472,6 +4538,10 @@ class PubServer(BaseHTTPRequestHandler):
print('DEBUG: creating new session') print('DEBUG: creating new session')
self.server.session = \ self.server.session = \
createSession(self.server.useTor) createSession(self.server.useTor)
if not self.server.session:
print('ERROR: GET failed to create session 17')
self._404()
return
msg = \ msg = \
htmlProfile(self.server.defaultTimeline, htmlProfile(self.server.defaultTimeline,
self.server.recentPostsCache, self.server.recentPostsCache,
@ -4546,6 +4616,10 @@ class PubServer(BaseHTTPRequestHandler):
print('DEBUG: creating new session') print('DEBUG: creating new session')
self.server.session = \ self.server.session = \
createSession(self.server.useTor) createSession(self.server.useTor)
if not self.server.session:
print('ERROR: GET failed to create session 18')
self._404()
return
msg = \ msg = \
htmlProfile(self.server.defaultTimeline, htmlProfile(self.server.defaultTimeline,
@ -4620,6 +4694,10 @@ class PubServer(BaseHTTPRequestHandler):
print('DEBUG: creating new session') print('DEBUG: creating new session')
self.server.session = \ self.server.session = \
createSession(self.server.useTor) createSession(self.server.useTor)
if not self.server.session:
print('ERROR: GET failed to create session 19')
self._404()
return
msg = \ msg = \
htmlProfile(self.server.defaultTimeline, htmlProfile(self.server.defaultTimeline,
self.server.recentPostsCache, self.server.recentPostsCache,
@ -4669,6 +4747,10 @@ class PubServer(BaseHTTPRequestHandler):
print('DEBUG: creating new session') print('DEBUG: creating new session')
self.server.session = \ self.server.session = \
createSession(self.server.useTor) createSession(self.server.useTor)
if not self.server.session:
print('ERROR: GET failed to create session 20')
self._404()
return
msg = \ msg = \
htmlProfile(self.server.defaultTimeline, htmlProfile(self.server.defaultTimeline,
self.server.recentPostsCache, self.server.recentPostsCache,
@ -5366,6 +5448,10 @@ class PubServer(BaseHTTPRequestHandler):
print('Starting new session from POST') print('Starting new session from POST')
self.server.session = \ self.server.session = \
createSession(self.server.useTor) createSession(self.server.useTor)
if not self.server.session:
print('ERROR: POST failed to create session 1')
self._404()
return
if self.server.debug: if self.server.debug:
print('DEBUG: POST to ' + self.server.baseDir + print('DEBUG: POST to ' + self.server.baseDir +
@ -6517,6 +6603,10 @@ class PubServer(BaseHTTPRequestHandler):
if not self.server.session: if not self.server.session:
self.server.session = \ self.server.session = \
createSession(self.server.useTor) createSession(self.server.useTor)
if not self.server.session:
print('ERROR: POST failed to create session 2')
self._404()
return
profilePathStr = self.path.replace('/searchhandle', '') profilePathStr = self.path.replace('/searchhandle', '')
profileStr = \ profileStr = \
htmlProfileAfterSearch(self.server.recentPostsCache, htmlProfileAfterSearch(self.server.recentPostsCache,

9
session.py
View File

@ -15,8 +15,13 @@ baseDirectory = None
def createSession(onionRoute: bool): def createSession(onionRoute: bool):
session = requests.session() session = None
if onionRoute: try:
session = requests.session()
except BaseException:
print('ERROR: session request failed')
return None
if session and onionRoute:
session.proxies = {} session.proxies = {}
session.proxies['http'] = 'socks5h://localhost:9050' session.proxies['http'] = 'socks5h://localhost:9050'
session.proxies['https'] = 'socks5h://localhost:9050' session.proxies['https'] = 'socks5h://localhost:9050'