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

Start of authenticated fetch support

main2
Bob Mottram 2019-09-25 10:22:10 +01:00
parent 23cf6f724a
commit de5e6d449a
3 changed files with 116 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

157
daemon.py
View File

@ -166,7 +166,15 @@ class PubServer(BaseHTTPRequestHandler):
if 'json' in self.headers['Accept']: if 'json' in self.headers['Accept']:
return False return False
return True return True
def _fetchAuthenticated(self) -> bool:
"""http authentication of GET requests for json
"""
if not self.server.authenticatedFetch:
return True
# TODO
return True
def _login_headers(self,fileFormat: str,length: int) -> None: def _login_headers(self,fileFormat: str,length: int) -> None:
self.send_response(200) self.send_response(200)
self.send_header('Content-type', fileFormat) self.send_header('Content-type', fileFormat)
@ -1378,7 +1386,7 @@ class PubServer(BaseHTTPRequestHandler):
if len(postSections)==2: if len(postSections)==2:
nickname=postSections[0] nickname=postSections[0]
statusNumber=postSections[1] statusNumber=postSections[1]
if len(statusNumber)>10 and statusNumber.isdigit(): if len(statusNumber)>10 and statusNumber.isdigit():
postFilename= \ postFilename= \
self.server.baseDir+'/accounts/'+nickname+'@'+self.server.domain+'/outbox/'+ \ self.server.baseDir+'/accounts/'+nickname+'@'+self.server.domain+'/outbox/'+ \
self.server.httpPrefix+':##'+self.server.domainFull+'#users#'+nickname+'#statuses#'+statusNumber+'.json' self.server.httpPrefix+':##'+self.server.domainFull+'#users#'+nickname+'#statuses#'+statusNumber+'.json'
@ -1409,9 +1417,12 @@ class PubServer(BaseHTTPRequestHandler):
self._set_headers('text/html',len(msg),cookie) self._set_headers('text/html',len(msg),cookie)
self.wfile.write(msg) self.wfile.write(msg)
else: else:
msg=json.dumps(postJsonObject).encode('utf-8') if self._fetchAuthenticated():
self._set_headers('application/json',len(msg),None) msg=json.dumps(postJsonObject).encode('utf-8')
self.wfile.write(msg) self._set_headers('application/json',len(msg),None)
self.wfile.write(msg)
else:
self._404()
self.server.GETbusy=False self.server.GETbusy=False
return return
else: else:
@ -1466,9 +1477,12 @@ class PubServer(BaseHTTPRequestHandler):
pprint(repliesJson) pprint(repliesJson)
self.wfile.write(msg) self.wfile.write(msg)
else: else:
msg=json.dumps(repliesJson).encode('utf-8') if self._fetchAuthenticated():
self._set_headers('application/json',len(msg),None) msg=json.dumps(repliesJson).encode('utf-8')
self.wfile.write(msg) self._set_headers('application/json',len(msg),None)
self.wfile.write(msg)
else:
self._404()
self.server.GETbusy=False self.server.GETbusy=False
return return
else: else:
@ -1510,9 +1524,12 @@ class PubServer(BaseHTTPRequestHandler):
self._set_headers('text/html',len(msg),cookie) self._set_headers('text/html',len(msg),cookie)
self.wfile.write(msg) self.wfile.write(msg)
else: else:
msg=json.dumps(repliesJson).encode('utf-8') if self._fetchAuthenticated():
self._set_headers('application/json',len(msg),None) msg=json.dumps(repliesJson).encode('utf-8')
self.wfile.write(msg) self._set_headers('application/json',len(msg),None)
self.wfile.write(msg)
else:
self._404()
self.server.GETbusy=False self.server.GETbusy=False
return return
@ -1552,9 +1569,12 @@ class PubServer(BaseHTTPRequestHandler):
self._set_headers('text/html',len(msg),cookie) self._set_headers('text/html',len(msg),cookie)
self.wfile.write(msg) self.wfile.write(msg)
else: else:
msg=json.dumps(actorJson['roles']).encode('utf-8') if self._fetchAuthenticated():
self._set_headers('application/json',len(msg),None) msg=json.dumps(actorJson['roles']).encode('utf-8')
self.wfile.write(msg) self._set_headers('application/json',len(msg),None)
self.wfile.write(msg)
else:
self._404()
self.server.GETbusy=False self.server.GETbusy=False
return return
@ -1595,9 +1615,12 @@ class PubServer(BaseHTTPRequestHandler):
self._set_headers('text/html',len(msg),cookie) self._set_headers('text/html',len(msg),cookie)
self.wfile.write(msg) self.wfile.write(msg)
else: else:
msg=json.dumps(actorJson['skills']).encode('utf-8') if self._fetchAuthenticated():
self._set_headers('application/json',len(msg),None) msg=json.dumps(actorJson['skills']).encode('utf-8')
self.wfile.write(msg) self._set_headers('application/json',len(msg),None)
self.wfile.write(msg)
else:
self._404()
self.server.GETbusy=False self.server.GETbusy=False
return return
actor=self.path.replace('/skills','') actor=self.path.replace('/skills','')
@ -1649,9 +1672,12 @@ class PubServer(BaseHTTPRequestHandler):
self._set_headers('text/html',len(msg),cookie) self._set_headers('text/html',len(msg),cookie)
self.wfile.write(msg) self.wfile.write(msg)
else: else:
msg=json.dumps(postJsonObject).encode('utf-8') if self._fetchAuthenticated():
self._set_headers('application/json',len(msg),None) msg=json.dumps(postJsonObject).encode('utf-8')
self.wfile.write(msg) self._set_headers('application/json',len(msg),None)
self.wfile.write(msg)
else:
self._404()
self.server.GETbusy=False self.server.GETbusy=False
return return
else: else:
@ -1706,9 +1732,12 @@ class PubServer(BaseHTTPRequestHandler):
self._set_headers('text/html',len(msg),cookie) self._set_headers('text/html',len(msg),cookie)
self.wfile.write(msg) self.wfile.write(msg)
else: else:
msg=json.dumps(inboxFeed).encode('utf-8') if self._fetchAuthenticated():
self._set_headers('application/json',len(msg),None) msg=json.dumps(inboxFeed).encode('utf-8')
self.wfile.write(msg) self._set_headers('application/json',len(msg),None)
self.wfile.write(msg)
else:
self._404()
self.server.GETbusy=False self.server.GETbusy=False
return return
else: else:
@ -1772,9 +1801,12 @@ class PubServer(BaseHTTPRequestHandler):
self._set_headers('text/html',len(msg),cookie) self._set_headers('text/html',len(msg),cookie)
self.wfile.write(msg) self.wfile.write(msg)
else: else:
msg=json.dumps(inboxDMFeed).encode('utf-8') if self._fetchAuthenticated():
self._set_headers('application/json',len(msg),None) msg=json.dumps(inboxDMFeed).encode('utf-8')
self.wfile.write(msg) self._set_headers('application/json',len(msg),None)
self.wfile.write(msg)
else:
self._404()
self.server.GETbusy=False self.server.GETbusy=False
return return
else: else:
@ -1841,9 +1873,12 @@ class PubServer(BaseHTTPRequestHandler):
self._set_headers('text/html',len(msg),cookie) self._set_headers('text/html',len(msg),cookie)
self.wfile.write(msg) self.wfile.write(msg)
else: else:
msg=json.dumps(inboxRepliesFeed).encode('utf-8') if self._fetchAuthenticated():
self._set_headers('application/json',len(msg),None) msg=json.dumps(inboxRepliesFeed).encode('utf-8')
self.wfile.write(msg) self._set_headers('application/json',len(msg),None)
self.wfile.write(msg)
else:
self._404()
self.server.GETbusy=False self.server.GETbusy=False
return return
else: else:
@ -1902,9 +1937,12 @@ class PubServer(BaseHTTPRequestHandler):
self._set_headers('text/html',len(msg),cookie) self._set_headers('text/html',len(msg),cookie)
self.wfile.write(msg) self.wfile.write(msg)
else: else:
msg=json.dumps(outboxFeed).encode('utf-8') if self._fetchAuthenticated():
self._set_headers('application/json',len(msg),None) msg=json.dumps(outboxFeed).encode('utf-8')
self.wfile.write(msg) self._set_headers('application/json',len(msg),None)
self.wfile.write(msg)
else:
self._404()
self.server.GETbusy=False self.server.GETbusy=False
return return
@ -1957,9 +1995,12 @@ class PubServer(BaseHTTPRequestHandler):
self._set_headers('text/html',len(msg),cookie) self._set_headers('text/html',len(msg),cookie)
self.wfile.write(msg) self.wfile.write(msg)
else: else:
msg=json.dumps(moderationFeed).encode('utf-8') if self._fetchAuthenticated():
self._set_headers('application/json',len(msg),None) msg=json.dumps(moderationFeed).encode('utf-8')
self.wfile.write(msg) self._set_headers('application/json',len(msg),None)
self.wfile.write(msg)
else:
self._404()
self.server.GETbusy=False self.server.GETbusy=False
return return
else: else:
@ -2019,9 +2060,12 @@ class PubServer(BaseHTTPRequestHandler):
self.server.GETbusy=False self.server.GETbusy=False
return return
else: else:
msg=json.dumps(shares).encode('utf-8') if self._fetchAuthenticated():
self._set_headers('application/json',len(msg),None) msg=json.dumps(shares).encode('utf-8')
self.wfile.write(msg) self._set_headers('application/json',len(msg),None)
self.wfile.write(msg)
else:
self._404()
self.server.GETbusy=False self.server.GETbusy=False
return return
@ -2070,9 +2114,12 @@ class PubServer(BaseHTTPRequestHandler):
self.server.GETbusy=False self.server.GETbusy=False
return return
else: else:
msg=json.dumps(following).encode('utf-8') if self._fetchAuthenticated():
self._set_headers('application/json',len(msg),None) msg=json.dumps(following).encode('utf-8')
self.wfile.write(msg) self._set_headers('application/json',len(msg),None)
self.wfile.write(msg)
else:
self._404()
self.server.GETbusy=False self.server.GETbusy=False
return return
followers=getFollowingFeed(self.server.baseDir,self.server.domain, \ followers=getFollowingFeed(self.server.baseDir,self.server.domain, \
@ -2119,9 +2166,12 @@ class PubServer(BaseHTTPRequestHandler):
self.server.GETbusy=False self.server.GETbusy=False
return return
else: else:
msg=json.dumps(followers).encode('utf-8') if self._fetchAuthenticated():
self._set_headers('application/json',len(msg),None) msg=json.dumps(followers).encode('utf-8')
self.wfile.write(msg) self._set_headers('application/json',len(msg),None)
self.wfile.write(msg)
else:
self._404()
self.server.GETbusy=False self.server.GETbusy=False
return return
# look up a person # look up a person
@ -2148,9 +2198,12 @@ class PubServer(BaseHTTPRequestHandler):
self._set_headers('text/html',len(msg),cookie) self._set_headers('text/html',len(msg),cookie)
self.wfile.write(msg) self.wfile.write(msg)
else: else:
msg=json.dumps(getPerson).encode('utf-8') if self._fetchAuthenticated():
self._set_headers('application/json',len(msg),None) msg=json.dumps(getPerson).encode('utf-8')
self.wfile.write(msg) self._set_headers('application/json',len(msg),None)
self.wfile.write(msg)
else:
self._404()
self.server.GETbusy=False self.server.GETbusy=False
return return
# check that a json file was requested # check that a json file was requested
@ -2160,6 +2213,12 @@ class PubServer(BaseHTTPRequestHandler):
self._404() self._404()
self.server.GETbusy=False self.server.GETbusy=False
return return
if not self._fetchAuthenticated():
if self.server.debug:
print('WARN: Unauthenticated GET')
self._404()
# check that the file exists # check that the file exists
filename=self.server.baseDir+self.path filename=self.server.baseDir+self.path
if os.path.isfile(filename): if os.path.isfile(filename):
@ -3711,7 +3770,8 @@ def runDaemon(projectVersion, \
instanceId,clientToServer: bool, \ instanceId,clientToServer: bool, \
baseDir: str,domain: str, \ baseDir: str,domain: str, \
port=80,proxyPort=80,httpPrefix='https', \ port=80,proxyPort=80,httpPrefix='https', \
fedList=[],noreply=False,nolike=False,nopics=False, \ fedList=[],authenticatedFetch=False, \
noreply=False,nolike=False,nopics=False, \
noannounce=False,cw=False,ocapAlways=False, \ noannounce=False,cw=False,ocapAlways=False, \
useTor=False,maxReplies=64, \ useTor=False,maxReplies=64, \
domainMaxPostsPerDay=8640,accountMaxPostsPerDay=8640, \ domainMaxPostsPerDay=8640,accountMaxPostsPerDay=8640, \
@ -3756,6 +3816,7 @@ def runDaemon(projectVersion, \
httpd.outboxThread={} httpd.outboxThread={}
httpd.projectVersion=projectVersion httpd.projectVersion=projectVersion
httpd.authenticatedFetch=authenticatedFetch
# max POST size of 30M # max POST size of 30M
httpd.maxPostLength=1024*1024*30 httpd.maxPostLength=1024*1024*30
httpd.maxMediaSize=httpd.maxPostLength httpd.maxMediaSize=httpd.maxPostLength

5
epicyon.py
View File

@ -130,6 +130,9 @@ parser.add_argument('-f','--federate', nargs='+',dest='federationList', \
parser.add_argument("--debug", type=str2bool, nargs='?', \ parser.add_argument("--debug", type=str2bool, nargs='?', \
const=True, default=False, \ const=True, default=False, \
help="Show debug messages") help="Show debug messages")
parser.add_argument("--authenticatedFetch", type=str2bool, nargs='?', \
const=True, default=False, \
help="Enable authentication on GET requests for json (authenticated fetch)")
parser.add_argument("--instanceOnlySkillsSearch", type=str2bool, nargs='?', \ parser.add_argument("--instanceOnlySkillsSearch", type=str2bool, nargs='?', \
const=True, default=False, \ const=True, default=False, \
help="Skills searches only return results from this instance") help="Skills searches only return results from this instance")
@ -1335,7 +1338,7 @@ if args.testdata:
runDaemon(__version__, \ runDaemon(__version__, \
instanceId,args.client,baseDir, \ instanceId,args.client,baseDir, \
domain,port,proxyPort,httpPrefix, \ domain,port,proxyPort,httpPrefix, \
federationList, \ federationList,args.authenticatedFetch, \
args.noreply,args.nolike,args.nopics, \ args.noreply,args.nolike,args.nopics, \
args.noannounce,args.cw,ocapAlways, \ args.noannounce,args.cw,ocapAlways, \
useTor,args.maxReplies, \ useTor,args.maxReplies, \

6
tests.py
View File

@ -215,7 +215,7 @@ def createServerAlice(path: str,domain: str,port: int,federationList: [], \
testServerAliceRunning = True testServerAliceRunning = True
print('Server running: Alice') print('Server running: Alice')
runDaemon(__version__,"instanceId",False,path,domain,port,port, \ runDaemon(__version__,"instanceId",False,path,domain,port,port, \
httpPrefix,federationList, \ httpPrefix,federationList,False, \
noreply,nolike,nopics,noannounce,cw,ocapAlways, \ noreply,nolike,nopics,noannounce,cw,ocapAlways, \
useTor,maxReplies, \ useTor,maxReplies, \
domainMaxPostsPerDay,accountMaxPostsPerDay, \ domainMaxPostsPerDay,accountMaxPostsPerDay, \
@ -268,7 +268,7 @@ def createServerBob(path: str,domain: str,port: int,federationList: [], \
testServerBobRunning = True testServerBobRunning = True
print('Server running: Bob') print('Server running: Bob')
runDaemon(__version__,"instanceId",False,path,domain,port,port, \ runDaemon(__version__,"instanceId",False,path,domain,port,port, \
httpPrefix,federationList, \ httpPrefix,federationList,False, \
noreply,nolike,nopics,noannounce,cw,ocapAlways, \ noreply,nolike,nopics,noannounce,cw,ocapAlways, \
useTor,maxReplies, \ useTor,maxReplies, \
domainMaxPostsPerDay,accountMaxPostsPerDay, \ domainMaxPostsPerDay,accountMaxPostsPerDay, \
@ -301,7 +301,7 @@ def createServerEve(path: str,domain: str,port: int,federationList: [], \
testServerEveRunning = True testServerEveRunning = True
print('Server running: Eve') print('Server running: Eve')
runDaemon(__version__,"instanceId",False,path,domain,port,port, \ runDaemon(__version__,"instanceId",False,path,domain,port,port, \
httpPrefix,federationList, \ httpPrefix,federationList,False, \
noreply,nolike,nopics,noannounce,cw,ocapAlways, \ noreply,nolike,nopics,noannounce,cw,ocapAlways, \
useTor,maxReplies,allowDeletion,True,True,False) useTor,maxReplies,allowDeletion,True,True,False)