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

Session parameters not needed

main
Bob Mottram 2019-11-13 10:50:16 +00:00
parent 4cfb33befe
commit 21b99f2d61
6 changed files with 54 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
daemon.py
View File

@ -225,8 +225,7 @@ 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= \ self.server.session= \
createSession(self.server.domain,self.server.port, \ createSession(self.server.useTor)
self.server.useTor)
# 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, \
@ -499,7 +498,7 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.debug: if self.server.debug:
print('DEBUG: creating new session for c2s') print('DEBUG: creating new session for c2s')
self.server.session= \ self.server.session= \
createSession(self.server.domain,self.server.port,self.server.useTor) createSession(self.server.useTor)
if self.server.debug: if self.server.debug:
print('DEBUG: sending c2s post to followers') print('DEBUG: sending c2s post to followers')
# remove inactive threads # remove inactive threads
@ -771,8 +770,7 @@ class PubServer(BaseHTTPRequestHandler):
if not self.server.session: if not self.server.session:
self.server.session= \ self.server.session= \
createSession(self.server.domain, \ createSession(self.server.useTor)
self.server.port,self.server.useTor)
# is this a html request? # is this a html request?
htmlGET=False htmlGET=False
@ -1279,8 +1277,7 @@ class PubServer(BaseHTTPRequestHandler):
return return
if not self.server.session: if not self.server.session:
self.server.session= \ self.server.session= \
createSession(self.server.domain, \ createSession(self.server.useTor)
self.server.port,self.server.useTor)
announceJson= \ announceJson= \
createAnnounce(self.server.session, \ createAnnounce(self.server.session, \
self.server.baseDir, \ self.server.baseDir, \
@ -1330,8 +1327,7 @@ class PubServer(BaseHTTPRequestHandler):
return return
if not self.server.session: if not self.server.session:
self.server.session= \ self.server.session= \
createSession(self.server.domain,self.server.port, \ createSession(self.server.useTor)
self.server.useTor)
undoAnnounceActor= \ undoAnnounceActor= \
self.server.httpPrefix+'://'+self.server.domainFull+ \ self.server.httpPrefix+'://'+self.server.domainFull+ \
'/users/'+self.postToNickname '/users/'+self.postToNickname
@ -1364,8 +1360,7 @@ class PubServer(BaseHTTPRequestHandler):
if '@' in followingHandle: if '@' in followingHandle:
if not self.server.session: if not self.server.session:
self.server.session= \ self.server.session= \
createSession(self.server.domain,self.server.port, \ createSession(self.server.useTor)
self.server.useTor)
manualApproveFollowRequest(self.server.session, \ manualApproveFollowRequest(self.server.session, \
self.server.baseDir, \ self.server.baseDir, \
self.server.httpPrefix, \ self.server.httpPrefix, \
@ -1438,8 +1433,7 @@ class PubServer(BaseHTTPRequestHandler):
return return
if not self.server.session: if not self.server.session:
self.server.session= \ self.server.session= \
createSession(self.server.domain,self.server.port, \ createSession(self.server.useTor)
self.server.useTor)
likeActor= \ likeActor= \
self.server.httpPrefix+'://'+ \ self.server.httpPrefix+'://'+ \
self.server.domainFull+'/users/'+self.postToNickname self.server.domainFull+'/users/'+self.postToNickname
@ -1483,9 +1477,7 @@ class PubServer(BaseHTTPRequestHandler):
return return
if not self.server.session: if not self.server.session:
self.server.session= \ self.server.session= \
createSession(self.server.domain, \ createSession(self.server.useTor)
self.server.port, \
self.server.useTor)
undoActor= \ undoActor= \
self.server.httpPrefix+'://'+ \ self.server.httpPrefix+'://'+ \
self.server.domainFull+'/users/'+self.postToNickname self.server.domainFull+'/users/'+self.postToNickname
@ -1539,8 +1531,7 @@ class PubServer(BaseHTTPRequestHandler):
return return
if not self.server.session: if not self.server.session:
self.server.session= \ self.server.session= \
createSession(self.server.domain,self.server.port, \ createSession(self.server.useTor)
self.server.useTor)
deleteStr= \ deleteStr= \
htmlDeletePost(self.server.translate,pageNumber, \ htmlDeletePost(self.server.translate,pageNumber, \
@ -1747,9 +1738,7 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.debug: if self.server.debug:
print('DEBUG: creating new session') print('DEBUG: creating new session')
self.server.session= \ self.server.session= \
createSession(self.server.domain, \ createSession(self.server.useTor)
self.server.port, \
self.server.useTor)
msg=htmlPostReplies(self.server.translate, \ msg=htmlPostReplies(self.server.translate, \
self.server.baseDir, \ self.server.baseDir, \
self.server.session, \ self.server.session, \
@ -1798,9 +1787,7 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.debug: if self.server.debug:
print('DEBUG: creating new session') print('DEBUG: creating new session')
self.server.session= \ self.server.session= \
createSession(self.server.domain, \ createSession(self.server.useTor)
self.server.port, \
self.server.useTor)
msg=htmlPostReplies(self.server.translate, \ msg=htmlPostReplies(self.server.translate, \
self.server.baseDir, \ self.server.baseDir, \
self.server.session, \ self.server.session, \
@ -2453,9 +2440,7 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.debug: if self.server.debug:
print('DEBUG: creating new session') print('DEBUG: creating new session')
self.server.session= \ self.server.session= \
createSession(self.server.domain, \ createSession(self.server.useTor)
self.server.port, \
self.server.useTor)
msg=htmlProfile(self.server.translate, \ msg=htmlProfile(self.server.translate, \
self.server.projectVersion, \ self.server.projectVersion, \
self.server.baseDir, \ self.server.baseDir, \
@ -2508,9 +2493,7 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.debug: if self.server.debug:
print('DEBUG: creating new session') print('DEBUG: creating new session')
self.server.session= \ self.server.session= \
createSession(self.server.domain, \ createSession(self.server.useTor)
self.server.port, \
self.server.useTor)
msg=htmlProfile(self.server.translate, \ msg=htmlProfile(self.server.translate, \
self.server.projectVersion, \ self.server.projectVersion, \
@ -2565,8 +2548,7 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.debug: if self.server.debug:
print('DEBUG: creating new session') print('DEBUG: creating new session')
self.server.session= \ self.server.session= \
createSession(self.server.domain, \ createSession(self.server.useTor)
self.server.port,self.server.useTor)
msg=htmlProfile(self.server.translate, \ msg=htmlProfile(self.server.translate, \
self.server.projectVersion, \ self.server.projectVersion, \
self.server.baseDir, \ self.server.baseDir, \
@ -2601,8 +2583,7 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.debug: if self.server.debug:
print('DEBUG: creating new session') print('DEBUG: creating new session')
self.server.session= \ self.server.session= \
createSession(self.server.domain, \ createSession(self.server.useTor)
self.server.port,self.server.useTor)
msg=htmlProfile(self.server.translate, \ msg=htmlProfile(self.server.translate, \
self.server.projectVersion, \ self.server.projectVersion, \
self.server.baseDir, \ self.server.baseDir, \
@ -2981,8 +2962,7 @@ class PubServer(BaseHTTPRequestHandler):
def do_POST(self): def do_POST(self):
if not self.server.session: if not self.server.session:
self.server.session= \ self.server.session= \
createSession(self.server.domain,self.server.port, \ createSession(self.server.useTor)
self.server.useTor)
if self.server.debug: if self.server.debug:
print('DEBUG: POST to '+self.server.baseDir+ \ print('DEBUG: POST to '+self.server.baseDir+ \
@ -3629,9 +3609,7 @@ class PubServer(BaseHTTPRequestHandler):
nickname=getNicknameFromActor(self.path) nickname=getNicknameFromActor(self.path)
if not self.server.session: if not self.server.session:
self.server.session= \ self.server.session= \
createSession(self.server.domain, \ createSession(self.server.useTor)
self.server.port, \
self.server.useTor)
profileStr= \ profileStr= \
htmlProfileAfterSearch(self.server.translate, \ htmlProfileAfterSearch(self.server.translate, \
self.server.baseDir, \ self.server.baseDir, \

50
epicyon.py
View File

@ -345,6 +345,13 @@ if args.postsraw:
__version__) __version__)
sys.exit() sys.exit()
if args.json:
session = createSession(False)
asHeader = {'Accept': 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'}
testJson = getJson(session,args.json,asHeader,None,__version__,httpPrefix,None)
pprint(testJson)
sys.exit()
# create cache for actors # create cache for actors
if not os.path.isdir(baseDir+'/cache'): if not os.path.isdir(baseDir+'/cache'):
os.mkdir(baseDir+'/cache') os.mkdir(baseDir+'/cache')
@ -465,7 +472,7 @@ if args.approve:
if '@' not in args.approve: if '@' not in args.approve:
print('syntax: --approve nick@domain') print('syntax: --approve nick@domain')
sys.exit() sys.exit()
session = createSession(domain,port,useTor) session = createSession(useTor)
sendThreads=[] sendThreads=[]
postLog=[] postLog=[]
cachedWebfingers={} cachedWebfingers={}
@ -489,7 +496,7 @@ if args.deny:
if '@' not in args.deny: if '@' not in args.deny:
print('syntax: --deny nick@domain') print('syntax: --deny nick@domain')
sys.exit() sys.exit()
session = createSession(domain,port,useTor) session = createSession(useTor)
sendThreads=[] sendThreads=[]
postLog=[] postLog=[]
cachedWebfingers={} cachedWebfingers={}
@ -531,7 +538,7 @@ if args.message:
print('Specify a password with the --password option') print('Specify a password with the --password option')
sys.exit() sys.exit()
session = createSession(domain,port,useTor) session = createSession(useTor)
if not args.sendto: if not args.sendto:
print('Specify an account to sent to: --sendto [nickname@domain]') print('Specify an account to sent to: --sendto [nickname@domain]')
sys.exit() sys.exit()
@ -602,7 +609,7 @@ if args.announce:
print('Specify a password with the --password option') print('Specify a password with the --password option')
sys.exit() sys.exit()
session = createSession(domain,port,useTor) session = createSession(useTor)
personCache={} personCache={}
cachedWebfingers={} cachedWebfingers={}
print('Sending announce/repeat of '+args.announce) print('Sending announce/repeat of '+args.announce)
@ -646,7 +653,7 @@ if args.itemName:
print('Specify a duration to share the object with the --duration option') print('Specify a duration to share the object with the --duration option')
sys.exit() sys.exit()
session = createSession(domain,port,useTor) session = createSession(useTor)
personCache={} personCache={}
cachedWebfingers={} cachedWebfingers={}
print('Sending shared item: '+args.itemName) print('Sending shared item: '+args.itemName)
@ -678,7 +685,7 @@ if args.undoItemName:
print('Specify a nickname with the --nickname option') print('Specify a nickname with the --nickname option')
sys.exit() sys.exit()
session = createSession(domain,port,useTor) session = createSession(useTor)
personCache={} personCache={}
cachedWebfingers={} cachedWebfingers={}
print('Sending undo of shared item: '+args.undoItemName) print('Sending undo of shared item: '+args.undoItemName)
@ -704,7 +711,7 @@ if args.like:
print('Specify a password with the --password option') print('Specify a password with the --password option')
sys.exit() sys.exit()
session = createSession(domain,port,useTor) session = createSession(useTor)
personCache={} personCache={}
cachedWebfingers={} cachedWebfingers={}
print('Sending like of '+args.like) print('Sending like of '+args.like)
@ -729,7 +736,7 @@ if args.undolike:
print('Specify a password with the --password option') print('Specify a password with the --password option')
sys.exit() sys.exit()
session = createSession(domain,port,useTor) session = createSession(useTor)
personCache={} personCache={}
cachedWebfingers={} cachedWebfingers={}
print('Sending undo like of '+args.undolike) print('Sending undo like of '+args.undolike)
@ -754,7 +761,7 @@ if args.delete:
print('Specify a password with the --password option') print('Specify a password with the --password option')
sys.exit() sys.exit()
session = createSession(domain,port,useTor) session = createSession(useTor)
personCache={} personCache={}
cachedWebfingers={} cachedWebfingers={}
print('Sending delete request of '+args.delete) print('Sending delete request of '+args.delete)
@ -788,7 +795,7 @@ if args.follow:
sys.exit() sys.exit()
followDomain,followPort=getDomainFromActor(args.follow) followDomain,followPort=getDomainFromActor(args.follow)
session = createSession(domain,port,useTor) session = createSession(useTor)
personCache={} personCache={}
cachedWebfingers={} cachedWebfingers={}
followHttpPrefix=httpPrefix followHttpPrefix=httpPrefix
@ -826,7 +833,7 @@ if args.unfollow:
sys.exit() sys.exit()
followDomain,followPort=getDomainFromActor(args.unfollow) followDomain,followPort=getDomainFromActor(args.unfollow)
session = createSession(domain,port,useTor) session = createSession(useTor)
personCache={} personCache={}
cachedWebfingers={} cachedWebfingers={}
followHttpPrefix=httpPrefix followHttpPrefix=httpPrefix
@ -900,7 +907,7 @@ if args.actor:
else: else:
httpPrefix='https' httpPrefix='https'
port=443 port=443
session=createSession(domain,port,useTor) session=createSession(useTor)
if nickname=='inbox': if nickname=='inbox':
nickname=domain nickname=domain
@ -940,13 +947,6 @@ if args.actor:
print('Failed to get '+personUrl) print('Failed to get '+personUrl)
sys.exit() sys.exit()
if args.json:
session = createSession(domain,port,False)
asHeader = {'Accept': 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'}
testJson = getJson(session,args.json,asHeader,None,__version__,httpPrefix,None)
pprint(testJson)
sys.exit()
if args.addaccount: if args.addaccount:
if '@' in args.addaccount: if '@' in args.addaccount:
nickname=args.addaccount.split('@')[0] nickname=args.addaccount.split('@')[0]
@ -1166,7 +1166,7 @@ if args.skill:
print('Skill level should be a percentage in the range 0-100') print('Skill level should be a percentage in the range 0-100')
sys.exit() sys.exit()
session = createSession(domain,port,useTor) session = createSession(useTor)
personCache={} personCache={}
cachedWebfingers={} cachedWebfingers={}
print('Sending '+args.skill+' skill level '+str(args.skillLevelPercent)+' for '+nickname) print('Sending '+args.skill+' skill level '+str(args.skillLevelPercent)+' for '+nickname)
@ -1192,7 +1192,7 @@ if args.availability:
print('Specify a password with the --password option') print('Specify a password with the --password option')
sys.exit() sys.exit()
session = createSession(domain,port,useTor) session = createSession(useTor)
personCache={} personCache={}
cachedWebfingers={} cachedWebfingers={}
print('Sending availability status of '+nickname+' as '+args.availability) print('Sending availability status of '+nickname+' as '+args.availability)
@ -1237,7 +1237,7 @@ if args.block:
print(args.block+' does not look like an actor url') print(args.block+' does not look like an actor url')
sys.exit() sys.exit()
session = createSession(domain,port,useTor) session = createSession(useTor)
personCache={} personCache={}
cachedWebfingers={} cachedWebfingers={}
print('Sending block of '+args.block) print('Sending block of '+args.block)
@ -1273,7 +1273,7 @@ if args.delegate:
delegatedNickname=args.delegate.split('@')[0] delegatedNickname=args.delegate.split('@')[0]
args.delegate=blockedActor args.delegate=blockedActor
session = createSession(domain,port,useTor) session = createSession(useTor)
personCache={} personCache={}
cachedWebfingers={} cachedWebfingers={}
print('Sending delegation for '+args.delegate+' with role '+args.role+' in project '+args.project) print('Sending delegation for '+args.delegate+' with role '+args.role+' in project '+args.project)
@ -1307,7 +1307,7 @@ if args.undelegate:
delegatedNickname=args.undelegate.split('@')[0] delegatedNickname=args.undelegate.split('@')[0]
args.undelegate=blockedActor args.undelegate=blockedActor
session = createSession(domain,port,useTor) session = createSession(useTor)
personCache={} personCache={}
cachedWebfingers={} cachedWebfingers={}
print('Sending delegation removal for '+args.undelegate+' from role '+args.role+' in project '+args.project) print('Sending delegation removal for '+args.undelegate+' from role '+args.role+' in project '+args.project)
@ -1343,7 +1343,7 @@ if args.unblock:
print(args.unblock+' does not look like an actor url') print(args.unblock+' does not look like an actor url')
sys.exit() sys.exit()
session = createSession(domain,port,useTor) session = createSession(useTor)
personCache={} personCache={}
cachedWebfingers={} cachedWebfingers={}
print('Sending undo block of '+args.unblock) print('Sending undo block of '+args.unblock)

4
inbox.py
View File

@ -1679,7 +1679,7 @@ def runInboxQueue(projectVersion: str, \
""" """
currSessionTime=int(time.time()) currSessionTime=int(time.time())
sessionLastUpdate=currSessionTime sessionLastUpdate=currSessionTime
session=createSession(domain,port,useTor) session=createSession(useTor)
inboxHandle='inbox@'+domain inboxHandle='inbox@'+domain
if debug: if debug:
print('DEBUG: Inbox queue running') print('DEBUG: Inbox queue running')
@ -1724,7 +1724,7 @@ def runInboxQueue(projectVersion: str, \
# recreate the session periodically # recreate the session periodically
if not session or currTime-sessionLastUpdate>1200: if not session or currTime-sessionLastUpdate>1200:
print('Creating inbox session') print('Creating inbox session')
session=createSession(domain,port,useTor) session=createSession(useTor)
sessionLastUpdate=currTime sessionLastUpdate=currTime
# oldest item first # oldest item first

2
posts.py
View File

@ -2354,7 +2354,7 @@ def getPublicPostsOfPerson(baseDir: str,nickname: str,domain: str, \
debug: bool,projectVersion: str) -> None: debug: bool,projectVersion: str) -> None:
""" This is really just for test purposes """ This is really just for test purposes
""" """
session = createSession(domain,port,useTor) session = createSession(useTor)
personCache={} personCache={}
cachedWebfingers={} cachedWebfingers={}
federationList=[] federationList=[]

5
session.py
View File

@ -14,11 +14,8 @@ import json
baseDirectory=None baseDirectory=None
def createSession(domain: str, port: int, onionRoute: bool): def createSession(onionRoute: bool):
session = requests.session() session = requests.session()
#if domain.startswith('127.') or domain.startswith('192.') or domain.startswith('10.'):
# session.mount('http://', SourceAddressAdapter(domain))
#session.mount('http://', SourceAddressAdapter((domain, port)))
if onionRoute: if onionRoute:
session.proxies = {} session.proxies = {}
session.proxies['http'] = 'socks5h://localhost:9050' session.proxies['http'] = 'socks5h://localhost:9050'

16
tests.py
View File

@ -376,7 +376,7 @@ def testPostMessageBetweenServers():
print('\n\n*******************************************************') print('\n\n*******************************************************')
print('Alice sends to Bob') print('Alice sends to Bob')
os.chdir(aliceDir) os.chdir(aliceDir)
sessionAlice = createSession(aliceDomain,alicePort,useTor) sessionAlice = createSession(useTor)
inReplyTo=None inReplyTo=None
inReplyToAtomUri=None inReplyToAtomUri=None
subject=None subject=None
@ -449,7 +449,7 @@ def testPostMessageBetweenServers():
followPerson(aliceDir,'alice',aliceDomain,'bob', \ followPerson(aliceDir,'alice',aliceDomain,'bob', \
bobDomain+':'+str(bobPort),federationList,False) bobDomain+':'+str(bobPort),federationList,False)
sessionBob = createSession(bobDomain,bobPort,useTor) sessionBob = createSession(useTor)
bobPostLog = [] bobPostLog = []
bobPersonCache={} bobPersonCache={}
bobCachedWebfingers={} bobCachedWebfingers={}
@ -599,7 +599,7 @@ def testFollowBetweenServersWithCapabilities():
print('Alice sends a follow request to Bob') print('Alice sends a follow request to Bob')
print('Both are strictly enforcing object capabilities') print('Both are strictly enforcing object capabilities')
os.chdir(aliceDir) os.chdir(aliceDir)
sessionAlice = createSession(aliceDomain,alicePort,useTor) sessionAlice = createSession(useTor)
inReplyTo=None inReplyTo=None
inReplyToAtomUri=None inReplyToAtomUri=None
subject=None subject=None
@ -643,7 +643,7 @@ def testFollowBetweenServersWithCapabilities():
print('\n\n*********************************************************') print('\n\n*********************************************************')
print('Eve tries to send to Bob') print('Eve tries to send to Bob')
sessionEve = createSession(eveDomain,evePort,useTor) sessionEve = createSession(useTor)
evePostLog = [] evePostLog = []
evePersonCache={} evePersonCache={}
eveCachedWebfingers={} eveCachedWebfingers={}
@ -714,7 +714,7 @@ def testFollowBetweenServersWithCapabilities():
aliceCapsFilename= \ aliceCapsFilename= \
aliceDir+'/accounts/alice@'+aliceDomain+'/ocap/granted/'+ \ aliceDir+'/accounts/alice@'+aliceDomain+'/ocap/granted/'+ \
httpPrefix+':##'+bobDomain+':'+str(bobPort)+'#users#bob.json' httpPrefix+':##'+bobDomain+':'+str(bobPort)+'#users#bob.json'
sessionBob = createSession(bobDomain,bobPort,useTor) sessionBob = createSession(useTor)
bobPostLog = [] bobPostLog = []
bobPersonCache={} bobPersonCache={}
bobCachedWebfingers={} bobCachedWebfingers={}
@ -863,7 +863,7 @@ def testFollowBetweenServers():
print('*********************************************************') print('*********************************************************')
print('Alice sends a follow request to Bob') print('Alice sends a follow request to Bob')
os.chdir(aliceDir) os.chdir(aliceDir)
sessionAlice = createSession(aliceDomain,alicePort,useTor) sessionAlice = createSession(useTor)
inReplyTo=None inReplyTo=None
inReplyToAtomUri=None inReplyToAtomUri=None
subject=None subject=None
@ -1309,7 +1309,7 @@ def testClientToServer():
print('\n\n*******************************************************') print('\n\n*******************************************************')
print('Alice sends to Bob via c2s') print('Alice sends to Bob via c2s')
sessionAlice = createSession(aliceDomain,alicePort,useTor) sessionAlice = createSession(useTor)
followersOnly=False followersOnly=False
attachedImageFilename=baseDir+'/img/logo.png' attachedImageFilename=baseDir+'/img/logo.png'
mediaType=getAttachmentMediaType(attachedImageFilename) mediaType=getAttachmentMediaType(attachedImageFilename)
@ -1415,7 +1415,7 @@ def testClientToServer():
print('\n\nBob likes the post') print('\n\nBob likes the post')
sessionBob = createSession(bobDomain,bobPort,useTor) sessionBob = createSession(useTor)
password='bobpass' password='bobpass'
outboxPath=bobDir+'/accounts/bob@'+bobDomain+'/outbox' outboxPath=bobDir+'/accounts/bob@'+bobDomain+'/outbox'
inboxPath=aliceDir+'/accounts/alice@'+aliceDomain+'/inbox' inboxPath=aliceDir+'/accounts/alice@'+aliceDomain+'/inbox'