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

Tidying of daemon globals

master
Bob Mottram 2019-06-30 21:03:23 +01:00
parent 78a3e96434
commit 15c787ce83
1 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
daemon.py
View File

@ -25,12 +25,6 @@ from threads import testThreads
import os import os
import sys import sys
# domain name of this server
thisDomain=''
# List of domains to federate with
federationList=[]
# Avoid giant messages # Avoid giant messages
maxMessageLength=5000 maxMessageLength=5000
@ -40,12 +34,6 @@ maxPostsInFeed=20
# number of follows/followers per page # number of follows/followers per page
followsPerPage=12 followsPerPage=12
# Whether to use https
useHttps=True
# port number to use
usePort=80
def readFollowList(filename: str): def readFollowList(filename: str):
"""Returns a list of ActivityPub addresses to follow """Returns a list of ActivityPub addresses to follow
""" """
@ -108,6 +96,7 @@ class PubServer(BaseHTTPRequestHandler):
except: except:
pass pass
self.GETbusy=True self.GETbusy=True
if not self._permittedDir(self.path): if not self._permittedDir(self.path):
self._404() self._404()
self.GETbusy=False self.GETbusy=False
@ -117,32 +106,32 @@ class PubServer(BaseHTTPRequestHandler):
self.GETbusy=False self.GETbusy=False
return return
# get outbox feed for a person # get outbox feed for a person
outboxFeed=personOutboxJson(thisDomain,usePort,self.path,useHttps,maxPostsInFeed) outboxFeed=personOutboxJson(self.server.domain,self.server.port,self.path,self.server.https,maxPostsInFeed)
if outboxFeed: if outboxFeed:
self._set_headers('application/json') self._set_headers('application/json')
self.wfile.write(json.dumps(outboxFeed).encode('utf-8')) self.wfile.write(json.dumps(outboxFeed).encode('utf-8'))
self.GETbusy=False self.GETbusy=False
return return
following=getFollowingFeed(thisDomain,usePort,self.path,useHttps,followsPerPage) following=getFollowingFeed(self.server.domain,self.server.port,self.path,self.server.https,followsPerPage)
if following: if following:
self._set_headers('application/json') self._set_headers('application/json')
self.wfile.write(json.dumps(following).encode('utf-8')) self.wfile.write(json.dumps(following).encode('utf-8'))
self.GETbusy=False self.GETbusy=False
return return
followers=getFollowingFeed(thisDomain,usePort,self.path,useHttps,followsPerPage,'followers') followers=getFollowingFeed(self.server.domain,self.server.port,self.path,self.server.https,followsPerPage,'followers')
if followers: if followers:
self._set_headers('application/json') self._set_headers('application/json')
self.wfile.write(json.dumps(followers).encode('utf-8')) self.wfile.write(json.dumps(followers).encode('utf-8'))
self.GETbusy=False self.GETbusy=False
return return
# look up a person # look up a person
getPerson = personLookup(thisDomain,self.path) getPerson = personLookup(self.server.domain,self.path)
if getPerson: if getPerson:
self._set_headers('application/json') self._set_headers('application/json')
self.wfile.write(json.dumps(getPerson).encode('utf-8')) self.wfile.write(json.dumps(getPerson).encode('utf-8'))
self.GETbusy=False self.GETbusy=False
return return
personKey = personKeyLookup(thisDomain,self.path) personKey = personKeyLookup(self.server.domain,self.path)
if personKey: if personKey:
self._set_headers('text/html; charset=utf-8') self._set_headers('text/html; charset=utf-8')
self.wfile.write(personKey.encode('utf-8')) self.wfile.write(personKey.encode('utf-8'))
@ -196,7 +185,7 @@ class PubServer(BaseHTTPRequestHandler):
return return
message = json.loads(self.rfile.read(length)) message = json.loads(self.rfile.read(length))
if not inboxPermittedMessage(message,federationList): if not inboxPermittedMessage(message,self.server.federationList):
self.send_response(403) self.send_response(403)
self.end_headers() self.end_headers()
else: else:
@ -209,15 +198,6 @@ class PubServer(BaseHTTPRequestHandler):
self.POSTbusy=False self.POSTbusy=False
def runDaemon(domain: str,port=80,https=True,fedList=[],useTor=False) -> None: def runDaemon(domain: str,port=80,https=True,fedList=[],useTor=False) -> None:
global thisDomain
global federationList
global usePort
global useHttps
thisDomain=domain
usePort=port
useHttps=https
federationList=fedList.copy()
if len(domain)==0: if len(domain)==0:
domain='127.0.0.1' domain='127.0.0.1'
if '.' not in domain: if '.' not in domain:
@ -233,5 +213,9 @@ def runDaemon(domain: str,port=80,https=True,fedList=[],useTor=False) -> None:
serverAddress = ('', port) serverAddress = ('', port)
httpd = HTTPServer(serverAddress, PubServer) httpd = HTTPServer(serverAddress, PubServer)
print('Running ActivityPub daemon on ' + thisDomain + ' port ' + str(port)) httpd.domain=domain
httpd.port=port
httpd.https=https
httpd.federationList=fedList.copy()
print('Running ActivityPub daemon on ' + domain + ' port ' + str(port))
httpd.serve_forever() httpd.serve_forever()