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

Fix opposite addresses

main
Bob Mottram 2020-02-19 13:16:38 +00:00
parent 7e8d59e85c
commit 55dcdd546d
3 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
daemon.py
View File

@ -147,7 +147,6 @@ from shares import outboxUndoShareUpload
from shares import addShare
from shares import removeShare
from shares import expireShares
from utils import isPortInUse
from utils import removeAvatarFromCache
from utils import locatePost
from utils import getCachedPostFilename
@ -5483,13 +5482,13 @@ def runDaemon(mediaInstance: bool,maxRecentPosts: int, \
else:
pubHandler = partial(PubServer)
if isPortInUse(proxyPort):
print('Process is already running on port '+str(proxyPort))
return False
try:
httpd = ThreadingHTTPServer(serverAddress, pubHandler)
except Exception as e:
if e.errno==98:
print('ERROR: HTTP Server address is already in use. '+str(serverAddress))
return False
print('ERROR: HTTP Server failed to start. '+str(e))
return False

71
tests.py
View File

@ -189,7 +189,7 @@ def testThreads():
thr.join()
assert thr.isAlive()==False
def createServerAlice(path: str,domain: str,port: int,federationList: [], \
def createServerAlice(path: str,domain: str,port: int,bobAddress: str,federationList: [], \
hasFollows: bool,hasPosts :bool,ocapAlways: bool,sendThreads: []):
print('Creating test server: Alice on port '+str(port))
if os.path.isdir(path):
@ -217,9 +217,9 @@ def createServerAlice(path: str,domain: str,port: int,federationList: [], \
assert setSkillLevel(path,nickname,domain,'hacking',90)
assert setRole(path,nickname,domain,'someproject','guru')
if hasFollows:
followPerson(path,nickname,domain,'bob','127.0.0.100:61936', \
followPerson(path,nickname,domain,'bob',bobAddress, \
federationList,False)
followerOfPerson(path,nickname,domain,'bob','127.0.0.100:61936', \
followerOfPerson(path,nickname,domain,'bob',bobAddress, \
federationList,False)
if hasPosts:
createPublicPost(path,nickname, domain, port,httpPrefix, \
@ -244,7 +244,7 @@ def createServerAlice(path: str,domain: str,port: int,federationList: [], \
domainMaxPostsPerDay,accountMaxPostsPerDay, \
allowDeletion,True,True,False,sendThreads,False)
def createServerBob(path: str,domain: str,port: int,federationList: [], \
def createServerBob(path: str,domain: str,port: int,aliceAddress: str,federationList: [], \
hasFollows: bool,hasPosts :bool,ocapAlways :bool,sendThreads: []):
print('Creating test server: Bob on port '+str(port))
if os.path.isdir(path):
@ -274,9 +274,9 @@ def createServerBob(path: str,domain: str,port: int,federationList: [], \
assert setRole(path,nickname,domain,'bandname','publicist')
if hasFollows:
followPerson(path,nickname,domain, \
'alice','127.0.0.50:61935',federationList,False)
'alice',aliceAddress,federationList,False)
followerOfPerson(path,nickname,domain, \
'alice','127.0.0.50:61935',federationList,False)
'alice',aliceAddress,federationList,False)
if hasPosts:
createPublicPost(path,nickname, domain, port,httpPrefix, \
"It's your life, live it your way.", \
@ -357,12 +357,15 @@ def testPostMessageBetweenServers():
aliceDir=baseDir+'/.tests/alice'
aliceDomain='127.0.0.50'
alicePort=61935
aliceAddress=aliceDomain+':'+str(alicePort)
bobDir=baseDir+'/.tests/bob'
bobDomain='127.0.0.100'
bobPort=61936
federationList=[bobDomain,aliceDomain]
aliceSendThreads=[]
bobSendThreads=[]
bobAddress=bobDomain+':'+str(bobPort)
global thrAlice
if thrAlice:
@ -373,7 +376,7 @@ def testPostMessageBetweenServers():
thrAlice = \
threadWithTrace(target=createServerAlice, \
args=(aliceDir,aliceDomain,alicePort, \
args=(aliceDir,aliceDomain,alicePort,bobAddress, \
federationList,False,False, \
ocapAlways,aliceSendThreads),daemon=True)
@ -386,7 +389,7 @@ def testPostMessageBetweenServers():
thrBob = \
threadWithTrace(target=createServerBob, \
args=(bobDir,bobDomain,bobPort, \
args=(bobDir,bobDomain,bobPort,aliceAddress, \
federationList,False,False, \
ocapAlways,bobSendThreads),daemon=True)
@ -571,9 +574,16 @@ def testFollowBetweenServersWithCapabilities():
# create the servers
aliceDir=baseDir+'/.tests/alice'
aliceDomain='127.0.0.42'
aliceDomain='127.0.0.52'
alicePort=61935
aliceSendThreads=[]
aliceAddress=aliceDomain+':'+str(alicePort)
bobDir=baseDir+'/.tests/bob'
bobDomain='127.0.0.78'
bobPort=61936
bobSendThreads=[]
bobAddress=bobDomain+':'+str(bobPort)
global thrAlice
if thrAlice:
@ -584,15 +594,10 @@ def testFollowBetweenServersWithCapabilities():
thrAlice = \
threadWithTrace(target=createServerAlice, \
args=(aliceDir,aliceDomain,alicePort, \
args=(aliceDir,aliceDomain,alicePort,bobAddress, \
federationList,False,False, \
ocapAlways,aliceSendThreads),daemon=True)
bobDir=baseDir+'/.tests/bob'
bobDomain='127.0.0.64'
bobPort=61936
bobSendThreads=[]
global thrBob
if thrBob:
while thrBob.isAlive():
@ -602,7 +607,7 @@ def testFollowBetweenServersWithCapabilities():
thrBob = \
threadWithTrace(target=createServerBob, \
args=(bobDir,bobDomain,bobPort, \
args=(bobDir,bobDomain,bobPort,aliceAddress, \
federationList,False,False, \
ocapAlways,bobSendThreads),daemon=True)
@ -877,9 +882,16 @@ def testFollowBetweenServers():
# create the servers
aliceDir=baseDir+'/.tests/alice'
aliceDomain='127.0.0.42'
aliceDomain='127.0.0.47'
alicePort=61935
aliceSendThreads=[]
aliceAddress=aliceDomain+':'+str(alicePort)
bobDir=baseDir+'/.tests/bob'
bobDomain='127.0.0.79'
bobPort=61936
bobSendThreads=[]
bobAddress=bobDomain+':'+str(bobPort)
global thrAlice
if thrAlice:
@ -890,15 +902,10 @@ def testFollowBetweenServers():
thrAlice = \
threadWithTrace(target=createServerAlice, \
args=(aliceDir,aliceDomain,alicePort, \
args=(aliceDir,aliceDomain,alicePort,bobAddress, \
federationList,False,False, \
ocapAlways,aliceSendThreads),daemon=True)
bobDir=baseDir+'/.tests/bob'
bobDomain='127.0.0.64'
bobPort=61936
bobSendThreads=[]
global thrBob
if thrBob:
while thrBob.isAlive():
@ -908,7 +915,7 @@ def testFollowBetweenServers():
thrBob = \
threadWithTrace(target=createServerBob, \
args=(bobDir,bobDomain,bobPort, \
args=(bobDir,bobDomain,bobPort,aliceAddress, \
federationList,False,False, \
ocapAlways,bobSendThreads),daemon=True)
@ -1344,6 +1351,13 @@ def testClientToServer():
aliceDomain='127.0.0.42'
alicePort=61935
aliceSendThreads=[]
aliceAddress=aliceDomain+':'+str(alicePort)
bobDir=baseDir+'/.tests/bob'
bobDomain='127.0.0.64'
bobPort=61936
bobSendThreads=[]
bobAddress=bobDomain+':'+str(bobPort)
global thrAlice
if thrAlice:
@ -1354,15 +1368,10 @@ def testClientToServer():
thrAlice = \
threadWithTrace(target=createServerAlice, \
args=(aliceDir,aliceDomain,alicePort, \
args=(aliceDir,aliceDomain,alicePort,bobAddress, \
federationList,False,False, \
ocapAlways,aliceSendThreads),daemon=True)
bobDir=baseDir+'/.tests/bob'
bobDomain='127.0.0.64'
bobPort=61936
bobSendThreads=[]
global thrBob
if thrBob:
while thrBob.isAlive():
@ -1372,7 +1381,7 @@ def testClientToServer():
thrBob = \
threadWithTrace(target=createServerBob, \
args=(bobDir,bobDomain,bobPort, \
args=(bobDir,bobDomain,bobPort,aliceAddress, \
federationList,False,False, \
ocapAlways,bobSendThreads),daemon=True)

7
utils.py
View File

@ -11,13 +11,6 @@ import time
import shutil
import datetime
import json
import socket
def isPortInUse(portNumber: int) -> bool:
"""Returns true if the port is in use
"""
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
return s.connect_ex(('localhost', portNumber)) == 0
def removeAvatarFromCache(baseDir: str,actorStr: str) -> None:
"""Removes any existing avatar entries from the cache