From 21b99f2d61a6f462d4d16942f3dca09168a7e986 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 13 Nov 2019 10:50:16 +0000 Subject: [PATCH] Session parameters not needed --- daemon.py | 56 +++++++++++++++++------------------------------------- epicyon.py | 50 ++++++++++++++++++++++++------------------------ inbox.py | 4 ++-- posts.py | 2 +- session.py | 5 +---- tests.py | 16 ++++++++-------- 6 files changed, 54 insertions(+), 79 deletions(-) diff --git a/daemon.py b/daemon.py index 275bf66b..5b0b3d11 100644 --- a/daemon.py +++ b/daemon.py @@ -225,8 +225,7 @@ class PubServer(BaseHTTPRequestHandler): if self.server.debug: print('DEBUG: creating new session during authenticated fetch') self.server.session= \ - createSession(self.server.domain,self.server.port, \ - self.server.useTor) + createSession(self.server.useTor) # obtain the public key pubKey= \ getPersonPubKey(self.server.baseDir,self.server.session,keyId, \ @@ -499,7 +498,7 @@ class PubServer(BaseHTTPRequestHandler): if self.server.debug: print('DEBUG: creating new session for c2s') self.server.session= \ - createSession(self.server.domain,self.server.port,self.server.useTor) + createSession(self.server.useTor) if self.server.debug: print('DEBUG: sending c2s post to followers') # remove inactive threads @@ -771,8 +770,7 @@ class PubServer(BaseHTTPRequestHandler): if not self.server.session: self.server.session= \ - createSession(self.server.domain, \ - self.server.port,self.server.useTor) + createSession(self.server.useTor) # is this a html request? htmlGET=False @@ -1279,8 +1277,7 @@ class PubServer(BaseHTTPRequestHandler): return if not self.server.session: self.server.session= \ - createSession(self.server.domain, \ - self.server.port,self.server.useTor) + createSession(self.server.useTor) announceJson= \ createAnnounce(self.server.session, \ self.server.baseDir, \ @@ -1330,8 +1327,7 @@ class PubServer(BaseHTTPRequestHandler): return if not self.server.session: self.server.session= \ - createSession(self.server.domain,self.server.port, \ - self.server.useTor) + createSession(self.server.useTor) undoAnnounceActor= \ self.server.httpPrefix+'://'+self.server.domainFull+ \ '/users/'+self.postToNickname @@ -1364,8 +1360,7 @@ class PubServer(BaseHTTPRequestHandler): if '@' in followingHandle: if not self.server.session: self.server.session= \ - createSession(self.server.domain,self.server.port, \ - self.server.useTor) + createSession(self.server.useTor) manualApproveFollowRequest(self.server.session, \ self.server.baseDir, \ self.server.httpPrefix, \ @@ -1438,8 +1433,7 @@ class PubServer(BaseHTTPRequestHandler): return if not self.server.session: self.server.session= \ - createSession(self.server.domain,self.server.port, \ - self.server.useTor) + createSession(self.server.useTor) likeActor= \ self.server.httpPrefix+'://'+ \ self.server.domainFull+'/users/'+self.postToNickname @@ -1483,9 +1477,7 @@ class PubServer(BaseHTTPRequestHandler): return if not self.server.session: self.server.session= \ - createSession(self.server.domain, \ - self.server.port, \ - self.server.useTor) + createSession(self.server.useTor) undoActor= \ self.server.httpPrefix+'://'+ \ self.server.domainFull+'/users/'+self.postToNickname @@ -1539,8 +1531,7 @@ class PubServer(BaseHTTPRequestHandler): return if not self.server.session: self.server.session= \ - createSession(self.server.domain,self.server.port, \ - self.server.useTor) + createSession(self.server.useTor) deleteStr= \ htmlDeletePost(self.server.translate,pageNumber, \ @@ -1747,9 +1738,7 @@ class PubServer(BaseHTTPRequestHandler): if self.server.debug: print('DEBUG: creating new session') self.server.session= \ - createSession(self.server.domain, \ - self.server.port, \ - self.server.useTor) + createSession(self.server.useTor) msg=htmlPostReplies(self.server.translate, \ self.server.baseDir, \ self.server.session, \ @@ -1798,9 +1787,7 @@ class PubServer(BaseHTTPRequestHandler): if self.server.debug: print('DEBUG: creating new session') self.server.session= \ - createSession(self.server.domain, \ - self.server.port, \ - self.server.useTor) + createSession(self.server.useTor) msg=htmlPostReplies(self.server.translate, \ self.server.baseDir, \ self.server.session, \ @@ -2453,9 +2440,7 @@ class PubServer(BaseHTTPRequestHandler): if self.server.debug: print('DEBUG: creating new session') self.server.session= \ - createSession(self.server.domain, \ - self.server.port, \ - self.server.useTor) + createSession(self.server.useTor) msg=htmlProfile(self.server.translate, \ self.server.projectVersion, \ self.server.baseDir, \ @@ -2508,9 +2493,7 @@ class PubServer(BaseHTTPRequestHandler): if self.server.debug: print('DEBUG: creating new session') self.server.session= \ - createSession(self.server.domain, \ - self.server.port, \ - self.server.useTor) + createSession(self.server.useTor) msg=htmlProfile(self.server.translate, \ self.server.projectVersion, \ @@ -2565,8 +2548,7 @@ class PubServer(BaseHTTPRequestHandler): if self.server.debug: print('DEBUG: creating new session') self.server.session= \ - createSession(self.server.domain, \ - self.server.port,self.server.useTor) + createSession(self.server.useTor) msg=htmlProfile(self.server.translate, \ self.server.projectVersion, \ self.server.baseDir, \ @@ -2601,8 +2583,7 @@ class PubServer(BaseHTTPRequestHandler): if self.server.debug: print('DEBUG: creating new session') self.server.session= \ - createSession(self.server.domain, \ - self.server.port,self.server.useTor) + createSession(self.server.useTor) msg=htmlProfile(self.server.translate, \ self.server.projectVersion, \ self.server.baseDir, \ @@ -2981,8 +2962,7 @@ class PubServer(BaseHTTPRequestHandler): def do_POST(self): if not self.server.session: self.server.session= \ - createSession(self.server.domain,self.server.port, \ - self.server.useTor) + createSession(self.server.useTor) if self.server.debug: print('DEBUG: POST to '+self.server.baseDir+ \ @@ -3629,9 +3609,7 @@ class PubServer(BaseHTTPRequestHandler): nickname=getNicknameFromActor(self.path) if not self.server.session: self.server.session= \ - createSession(self.server.domain, \ - self.server.port, \ - self.server.useTor) + createSession(self.server.useTor) profileStr= \ htmlProfileAfterSearch(self.server.translate, \ self.server.baseDir, \ diff --git a/epicyon.py b/epicyon.py index 37295d84..8959d19e 100644 --- a/epicyon.py +++ b/epicyon.py @@ -345,6 +345,13 @@ if args.postsraw: __version__) 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 if not os.path.isdir(baseDir+'/cache'): os.mkdir(baseDir+'/cache') @@ -465,7 +472,7 @@ if args.approve: if '@' not in args.approve: print('syntax: --approve nick@domain') sys.exit() - session = createSession(domain,port,useTor) + session = createSession(useTor) sendThreads=[] postLog=[] cachedWebfingers={} @@ -489,7 +496,7 @@ if args.deny: if '@' not in args.deny: print('syntax: --deny nick@domain') sys.exit() - session = createSession(domain,port,useTor) + session = createSession(useTor) sendThreads=[] postLog=[] cachedWebfingers={} @@ -531,7 +538,7 @@ if args.message: print('Specify a password with the --password option') sys.exit() - session = createSession(domain,port,useTor) + session = createSession(useTor) if not args.sendto: print('Specify an account to sent to: --sendto [nickname@domain]') sys.exit() @@ -602,7 +609,7 @@ if args.announce: print('Specify a password with the --password option') sys.exit() - session = createSession(domain,port,useTor) + session = createSession(useTor) personCache={} cachedWebfingers={} 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') sys.exit() - session = createSession(domain,port,useTor) + session = createSession(useTor) personCache={} cachedWebfingers={} print('Sending shared item: '+args.itemName) @@ -678,7 +685,7 @@ if args.undoItemName: print('Specify a nickname with the --nickname option') sys.exit() - session = createSession(domain,port,useTor) + session = createSession(useTor) personCache={} cachedWebfingers={} print('Sending undo of shared item: '+args.undoItemName) @@ -704,7 +711,7 @@ if args.like: print('Specify a password with the --password option') sys.exit() - session = createSession(domain,port,useTor) + session = createSession(useTor) personCache={} cachedWebfingers={} print('Sending like of '+args.like) @@ -729,7 +736,7 @@ if args.undolike: print('Specify a password with the --password option') sys.exit() - session = createSession(domain,port,useTor) + session = createSession(useTor) personCache={} cachedWebfingers={} print('Sending undo like of '+args.undolike) @@ -754,7 +761,7 @@ if args.delete: print('Specify a password with the --password option') sys.exit() - session = createSession(domain,port,useTor) + session = createSession(useTor) personCache={} cachedWebfingers={} print('Sending delete request of '+args.delete) @@ -788,7 +795,7 @@ if args.follow: sys.exit() followDomain,followPort=getDomainFromActor(args.follow) - session = createSession(domain,port,useTor) + session = createSession(useTor) personCache={} cachedWebfingers={} followHttpPrefix=httpPrefix @@ -826,7 +833,7 @@ if args.unfollow: sys.exit() followDomain,followPort=getDomainFromActor(args.unfollow) - session = createSession(domain,port,useTor) + session = createSession(useTor) personCache={} cachedWebfingers={} followHttpPrefix=httpPrefix @@ -900,7 +907,7 @@ if args.actor: else: httpPrefix='https' port=443 - session=createSession(domain,port,useTor) + session=createSession(useTor) if nickname=='inbox': nickname=domain @@ -940,13 +947,6 @@ if args.actor: print('Failed to get '+personUrl) 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 '@' in args.addaccount: nickname=args.addaccount.split('@')[0] @@ -1166,7 +1166,7 @@ if args.skill: print('Skill level should be a percentage in the range 0-100') sys.exit() - session = createSession(domain,port,useTor) + session = createSession(useTor) personCache={} cachedWebfingers={} 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') sys.exit() - session = createSession(domain,port,useTor) + session = createSession(useTor) personCache={} cachedWebfingers={} 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') sys.exit() - session = createSession(domain,port,useTor) + session = createSession(useTor) personCache={} cachedWebfingers={} print('Sending block of '+args.block) @@ -1273,7 +1273,7 @@ if args.delegate: delegatedNickname=args.delegate.split('@')[0] args.delegate=blockedActor - session = createSession(domain,port,useTor) + session = createSession(useTor) personCache={} cachedWebfingers={} 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] args.undelegate=blockedActor - session = createSession(domain,port,useTor) + session = createSession(useTor) personCache={} cachedWebfingers={} 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') sys.exit() - session = createSession(domain,port,useTor) + session = createSession(useTor) personCache={} cachedWebfingers={} print('Sending undo block of '+args.unblock) diff --git a/inbox.py b/inbox.py index df62328e..f7afbb97 100644 --- a/inbox.py +++ b/inbox.py @@ -1679,7 +1679,7 @@ def runInboxQueue(projectVersion: str, \ """ currSessionTime=int(time.time()) sessionLastUpdate=currSessionTime - session=createSession(domain,port,useTor) + session=createSession(useTor) inboxHandle='inbox@'+domain if debug: print('DEBUG: Inbox queue running') @@ -1724,7 +1724,7 @@ def runInboxQueue(projectVersion: str, \ # recreate the session periodically if not session or currTime-sessionLastUpdate>1200: print('Creating inbox session') - session=createSession(domain,port,useTor) + session=createSession(useTor) sessionLastUpdate=currTime # oldest item first diff --git a/posts.py b/posts.py index 6666b20e..64ad264f 100644 --- a/posts.py +++ b/posts.py @@ -2354,7 +2354,7 @@ def getPublicPostsOfPerson(baseDir: str,nickname: str,domain: str, \ debug: bool,projectVersion: str) -> None: """ This is really just for test purposes """ - session = createSession(domain,port,useTor) + session = createSession(useTor) personCache={} cachedWebfingers={} federationList=[] diff --git a/session.py b/session.py index c00b9420..c7830f4d 100644 --- a/session.py +++ b/session.py @@ -14,11 +14,8 @@ import json baseDirectory=None -def createSession(domain: str, port: int, onionRoute: bool): +def createSession(onionRoute: bool): 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: session.proxies = {} session.proxies['http'] = 'socks5h://localhost:9050' diff --git a/tests.py b/tests.py index fdf1b2bd..ac0108bd 100644 --- a/tests.py +++ b/tests.py @@ -376,7 +376,7 @@ def testPostMessageBetweenServers(): print('\n\n*******************************************************') print('Alice sends to Bob') os.chdir(aliceDir) - sessionAlice = createSession(aliceDomain,alicePort,useTor) + sessionAlice = createSession(useTor) inReplyTo=None inReplyToAtomUri=None subject=None @@ -449,7 +449,7 @@ def testPostMessageBetweenServers(): followPerson(aliceDir,'alice',aliceDomain,'bob', \ bobDomain+':'+str(bobPort),federationList,False) - sessionBob = createSession(bobDomain,bobPort,useTor) + sessionBob = createSession(useTor) bobPostLog = [] bobPersonCache={} bobCachedWebfingers={} @@ -599,7 +599,7 @@ def testFollowBetweenServersWithCapabilities(): print('Alice sends a follow request to Bob') print('Both are strictly enforcing object capabilities') os.chdir(aliceDir) - sessionAlice = createSession(aliceDomain,alicePort,useTor) + sessionAlice = createSession(useTor) inReplyTo=None inReplyToAtomUri=None subject=None @@ -643,7 +643,7 @@ def testFollowBetweenServersWithCapabilities(): print('\n\n*********************************************************') print('Eve tries to send to Bob') - sessionEve = createSession(eveDomain,evePort,useTor) + sessionEve = createSession(useTor) evePostLog = [] evePersonCache={} eveCachedWebfingers={} @@ -714,7 +714,7 @@ def testFollowBetweenServersWithCapabilities(): aliceCapsFilename= \ aliceDir+'/accounts/alice@'+aliceDomain+'/ocap/granted/'+ \ httpPrefix+':##'+bobDomain+':'+str(bobPort)+'#users#bob.json' - sessionBob = createSession(bobDomain,bobPort,useTor) + sessionBob = createSession(useTor) bobPostLog = [] bobPersonCache={} bobCachedWebfingers={} @@ -863,7 +863,7 @@ def testFollowBetweenServers(): print('*********************************************************') print('Alice sends a follow request to Bob') os.chdir(aliceDir) - sessionAlice = createSession(aliceDomain,alicePort,useTor) + sessionAlice = createSession(useTor) inReplyTo=None inReplyToAtomUri=None subject=None @@ -1309,7 +1309,7 @@ def testClientToServer(): print('\n\n*******************************************************') print('Alice sends to Bob via c2s') - sessionAlice = createSession(aliceDomain,alicePort,useTor) + sessionAlice = createSession(useTor) followersOnly=False attachedImageFilename=baseDir+'/img/logo.png' mediaType=getAttachmentMediaType(attachedImageFilename) @@ -1415,7 +1415,7 @@ def testClientToServer(): print('\n\nBob likes the post') - sessionBob = createSession(bobDomain,bobPort,useTor) + sessionBob = createSession(useTor) password='bobpass' outboxPath=bobDir+'/accounts/bob@'+bobDomain+'/outbox' inboxPath=aliceDir+'/accounts/alice@'+aliceDomain+'/inbox'