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

Tidying

master
Bob Mottram 2019-07-12 12:05:43 +01:00
parent 0e474769d4
commit 0d96aaacb7
1 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
daemon.py
View File

@ -174,6 +174,14 @@ class PubServer(BaseHTTPRequestHandler):
return True return True
return False return False
def _isAuthorized(self) -> bool:
if self.headers.get('Authorization'):
if authorize(self.server.baseDir,self.path, \
self.headers['Authorization'], \
self.server.debug):
return True
return False
def do_GET(self): def do_GET(self):
if self.server.debug: if self.server.debug:
print('DEBUG: GET from '+self.server.baseDir+ \ print('DEBUG: GET from '+self.server.baseDir+ \
@ -257,10 +265,7 @@ class PubServer(BaseHTTPRequestHandler):
# get the inbox for a given person # get the inbox for a given person
if self.path.endswith('/inbox'): if self.path.endswith('/inbox'):
if '/users/' in self.path: if '/users/' in self.path:
if self.headers.get('Authorization'): if self._isAuthorized():
if authorize(self.server.baseDir,self.path, \
self.headers['Authorization'], \
self.server.debug):
inboxFeed=personBoxJson(self.server.baseDir, \ inboxFeed=personBoxJson(self.server.baseDir, \
self.server.domain, \ self.server.domain, \
self.server.port, \ self.server.port, \
@ -380,10 +385,7 @@ class PubServer(BaseHTTPRequestHandler):
if self.path.endswith('/outbox'): if self.path.endswith('/outbox'):
if '/users/' in self.path: if '/users/' in self.path:
if self.headers.get('Authorization'): if self._isAuthorized():
if authorize(self.server.baseDir,self.path, \
self.headers['Authorization'], \
self.server.debug):
self.outboxAuthenticated=True self.outboxAuthenticated=True
pathUsersSection=path.split('/users/')[1] pathUsersSection=path.split('/users/')[1]
self.postToNickname=pathUsersSection.split('/')[0] self.postToNickname=pathUsersSection.split('/')[0]