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

Handle mixed Accept headers

master
Bob Mottram 2019-08-24 12:23:12 +01:00
parent 4eaaa186a1
commit fe6e7f900b
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
daemon.py
View File

@ -142,6 +142,13 @@ def readFollowList(filename: str):
class PubServer(BaseHTTPRequestHandler): class PubServer(BaseHTTPRequestHandler):
protocol_version = 'HTTP/1.1' protocol_version = 'HTTP/1.1'
def _requestHTTP(self) -> bool:
"""Should a http response be given?
"""
if 'json' in self.headers['Accept']:
return False
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)
@ -490,7 +497,7 @@ class PubServer(BaseHTTPRequestHandler):
# is this a html request? # is this a html request?
htmlGET=False htmlGET=False
if self.headers.get('Accept'): if self.headers.get('Accept'):
if 'text/html' in self.headers['Accept']: if self._requestHTTP():
htmlGET=True htmlGET=True
# replace https://domain/@nick with https://domain/users/nick # replace https://domain/@nick with https://domain/users/nick
@ -1122,7 +1129,7 @@ class PubServer(BaseHTTPRequestHandler):
if not authorized: if not authorized:
if postJsonObject.get('likes'): if postJsonObject.get('likes'):
postJsonObject['likes']={} postJsonObject['likes']={}
if 'text/html' in self.headers['Accept']: if self._requestHTTP():
msg= \ msg= \
htmlIndividualPost(self.server.session, \ htmlIndividualPost(self.server.session, \
self.server.cachedWebfingers,self.server.personCache, \ self.server.cachedWebfingers,self.server.personCache, \
@ -1168,7 +1175,7 @@ class PubServer(BaseHTTPRequestHandler):
'last': self.server.httpPrefix+'://'+self.server.domainFull+'/users/'+nickname+'/statuses/'+statusNumber+'/replies?page=true', 'last': self.server.httpPrefix+'://'+self.server.domainFull+'/users/'+nickname+'/statuses/'+statusNumber+'/replies?page=true',
'totalItems': 0, 'totalItems': 0,
'type': 'OrderedCollection'} 'type': 'OrderedCollection'}
if 'text/html' in self.headers['Accept']: if self._requestHTTP():
if not self.server.session: if not self.server.session:
if self.server.debug: if self.server.debug:
print('DEBUG: creating new session') print('DEBUG: creating new session')
@ -1213,7 +1220,7 @@ class PubServer(BaseHTTPRequestHandler):
repliesJson) repliesJson)
# send the replies json # send the replies json
if 'text/html' in self.headers['Accept']: if self._requestHTTP():
if not self.server.session: if not self.server.session:
if self.server.debug: if self.server.debug:
print('DEBUG: creating new session') print('DEBUG: creating new session')
@ -1248,7 +1255,7 @@ class PubServer(BaseHTTPRequestHandler):
with open(actorFilename, 'r') as fp: with open(actorFilename, 'r') as fp:
actorJson=commentjson.load(fp) actorJson=commentjson.load(fp)
if actorJson.get('roles'): if actorJson.get('roles'):
if 'text/html' in self.headers['Accept']: if self._requestHTTP():
getPerson = \ getPerson = \
personLookup(self.server.domain,self.path.replace('/roles',''), \ personLookup(self.server.domain,self.path.replace('/roles',''), \
self.server.baseDir) self.server.baseDir)
@ -1282,7 +1289,7 @@ class PubServer(BaseHTTPRequestHandler):
with open(actorFilename, 'r') as fp: with open(actorFilename, 'r') as fp:
actorJson=commentjson.load(fp) actorJson=commentjson.load(fp)
if actorJson.get('skills'): if actorJson.get('skills'):
if 'text/html' in self.headers['Accept']: if self._requestHTTP():
getPerson = \ getPerson = \
personLookup(self.server.domain,self.path.replace('/skills',''), \ personLookup(self.server.domain,self.path.replace('/skills',''), \
self.server.baseDir) self.server.baseDir)
@ -1327,7 +1334,7 @@ class PubServer(BaseHTTPRequestHandler):
if not authorized: if not authorized:
if postJsonObject.get('likes'): if postJsonObject.get('likes'):
postJsonObject['likes']={} postJsonObject['likes']={}
if 'text/html' in self.headers['Accept']: if self._requestHTTP():
msg=htmlIndividualPost(self.server.baseDir, \ msg=htmlIndividualPost(self.server.baseDir, \
self.server.session, \ self.server.session, \
self.server.cachedWebfingers,self.server.personCache, \ self.server.cachedWebfingers,self.server.personCache, \
@ -1360,7 +1367,7 @@ class PubServer(BaseHTTPRequestHandler):
maxPostsInFeed, 'inbox', \ maxPostsInFeed, 'inbox', \
True,self.server.ocapAlways) True,self.server.ocapAlways)
if inboxFeed: if inboxFeed:
if 'text/html' in self.headers['Accept']: if self._requestHTTP():
nickname=self.path.replace('/users/','').replace('/inbox','') nickname=self.path.replace('/users/','').replace('/inbox','')
pageNumber=1 pageNumber=1
if '?page=' in nickname: if '?page=' in nickname:
@ -1421,7 +1428,7 @@ class PubServer(BaseHTTPRequestHandler):
authorized, \ authorized, \
self.server.ocapAlways) self.server.ocapAlways)
if outboxFeed: if outboxFeed:
if 'text/html' in self.headers['Accept']: if self._requestHTTP():
nickname=self.path.replace('/users/','').replace('/outbox','') nickname=self.path.replace('/users/','').replace('/outbox','')
pageNumber=1 pageNumber=1
if '?page=' in nickname: if '?page=' in nickname:
@ -1473,7 +1480,7 @@ class PubServer(BaseHTTPRequestHandler):
maxPostsInFeed, 'moderation', \ maxPostsInFeed, 'moderation', \
True,self.server.ocapAlways) True,self.server.ocapAlways)
if moderationFeed: if moderationFeed:
if 'text/html' in self.headers['Accept']: if self._requestHTTP():
nickname=self.path.replace('/users/','').replace('/moderation','') nickname=self.path.replace('/users/','').replace('/moderation','')
pageNumber=1 pageNumber=1
if '?page=' in nickname: if '?page=' in nickname:
@ -1531,7 +1538,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.httpPrefix, \ self.server.httpPrefix, \
sharesPerPage) sharesPerPage)
if shares: if shares:
if 'text/html' in self.headers['Accept']: if self._requestHTTP():
if 'page=' not in self.path: if 'page=' not in self.path:
# get a page of shares, not the summary # get a page of shares, not the summary
shares=getSharesFeedForPerson(self.server.baseDir,self.server.domain, \ shares=getSharesFeedForPerson(self.server.baseDir,self.server.domain, \
@ -1572,7 +1579,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.httpPrefix, \ self.server.httpPrefix, \
authorized,followsPerPage) authorized,followsPerPage)
if following: if following:
if 'text/html' in self.headers['Accept']: if self._requestHTTP():
if 'page=' not in self.path: if 'page=' not in self.path:
# get a page of following, not the summary # get a page of following, not the summary
following=getFollowingFeed(self.server.baseDir,self.server.domain, \ following=getFollowingFeed(self.server.baseDir,self.server.domain, \
@ -1613,7 +1620,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.httpPrefix, \ self.server.httpPrefix, \
authorized,followsPerPage,'followers') authorized,followsPerPage,'followers')
if followers: if followers:
if 'text/html' in self.headers['Accept']: if self._requestHTTP():
if 'page=' not in self.path: if 'page=' not in self.path:
# get a page of followers, not the summary # get a page of followers, not the summary
followers=getFollowingFeed(self.server.baseDir,self.server.domain, \ followers=getFollowingFeed(self.server.baseDir,self.server.domain, \
@ -1652,7 +1659,7 @@ class PubServer(BaseHTTPRequestHandler):
getPerson = personLookup(self.server.domain,self.path, \ getPerson = personLookup(self.server.domain,self.path, \
self.server.baseDir) self.server.baseDir)
if getPerson: if getPerson:
if 'text/html' in self.headers['Accept']: if self._requestHTTP():
if not self.server.session: if not self.server.session:
if self.server.debug: if self.server.debug:
print('DEBUG: creating new session') print('DEBUG: creating new session')

3
epicyon.py
View File

@ -806,6 +806,9 @@ if args.actor:
if '/@' in args.actor or '/users/' in args.actor or args.actor.startswith('http') or args.actor.startswith('dat'): if '/@' in args.actor or '/users/' in args.actor or args.actor.startswith('http') or args.actor.startswith('dat'):
# format: https://domain/@nick # format: https://domain/@nick
args.actor=args.actor.replace('https://','').replace('http://','').replace('dat://','').replace('/@','/users/') args.actor=args.actor.replace('https://','').replace('http://','').replace('dat://','').replace('/@','/users/')
if '/users/' not in args.actor:
print('Expected actor format: https://domain/@nick or https://domain/users/nick')
sys.exit()
nickname=args.actor.split('/users/')[1].replace('\n','') nickname=args.actor.split('/users/')[1].replace('\n','')
domain=args.actor.split('/users/')[0] domain=args.actor.split('/users/')[0]
else: else: