indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Set last-modified header on avatar and media images

merge-requests/30/head
Bob Mottram 2021-08-11 19:21:19 +01:00
parent 5577877f63
commit 80162ec2cb
1 changed files with 47 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
daemon.py
View File

@ -718,7 +718,7 @@ class PubServer(BaseHTTPRequestHandler):
def _set_headers_etag(self, mediaFilename: str, fileFormat: str, def _set_headers_etag(self, mediaFilename: str, fileFormat: str,
data, cookie: str, callingDomain: str, data, cookie: str, callingDomain: str,
permissive: bool) -> None: permissive: bool, lastModified: str) -> None:
datalen = len(data) datalen = len(data)
self._set_headers_base(fileFormat, datalen, cookie, callingDomain, self._set_headers_base(fileFormat, datalen, cookie, callingDomain,
permissive) permissive)
@ -739,6 +739,8 @@ class PubServer(BaseHTTPRequestHandler):
pass pass
if etag: if etag:
self.send_header('ETag', etag) self.send_header('ETag', etag)
if lastModified:
self.send_header('last-modified', lastModified)
self.end_headers() self.end_headers()
def _etag_exists(self, mediaFilename: str) -> bool: def _etag_exists(self, mediaFilename: str) -> bool:
@ -5741,7 +5743,8 @@ class PubServer(BaseHTTPRequestHandler):
self._set_headers_etag(faviconFilename, self._set_headers_etag(faviconFilename,
favType, favType,
favBinary, None, favBinary, None,
self.server.domainFull, False) self.server.domainFull,
False, None)
self._write(favBinary) self._write(favBinary)
if debug: if debug:
print('Sent favicon from cache: ' + callingDomain) print('Sent favicon from cache: ' + callingDomain)
@ -5753,7 +5756,8 @@ class PubServer(BaseHTTPRequestHandler):
self._set_headers_etag(faviconFilename, self._set_headers_etag(faviconFilename,
favType, favType,
favBinary, None, favBinary, None,
self.server.domainFull, False) self.server.domainFull,
False, None)
self._write(favBinary) self._write(favBinary)
self.server.iconsCache[favFilename] = favBinary self.server.iconsCache[favFilename] = favBinary
if self.server.debug: if self.server.debug:
@ -5798,7 +5802,7 @@ class PubServer(BaseHTTPRequestHandler):
exportType = 'application/zip' exportType = 'application/zip'
self._set_headers_etag(filename, exportType, self._set_headers_etag(filename, exportType,
exportBinary, None, exportBinary, None,
domainFull, False) domainFull, False, None)
self._write(exportBinary) self._write(exportBinary)
self._404() self._404()
@ -5831,7 +5835,7 @@ class PubServer(BaseHTTPRequestHandler):
self._set_headers_etag(fontFilename, self._set_headers_etag(fontFilename,
fontType, fontType,
fontBinary, None, fontBinary, None,
self.server.domainFull, False) self.server.domainFull, False, None)
self._write(fontBinary) self._write(fontBinary)
if debug: if debug:
print('font sent from cache: ' + print('font sent from cache: ' +
@ -5848,7 +5852,7 @@ class PubServer(BaseHTTPRequestHandler):
fontType, fontType,
fontBinary, None, fontBinary, None,
self.server.domainFull, self.server.domainFull,
False) False, None)
self._write(fontBinary) self._write(fontBinary)
self.server.fontsCache[fontStr] = fontBinary self.server.fontsCache[fontStr] = fontBinary
if debug: if debug:
@ -6251,11 +6255,17 @@ class PubServer(BaseHTTPRequestHandler):
mediaFileType = mediaFileMimeType(mediaFilename) mediaFileType = mediaFileMimeType(mediaFilename)
t = os.path.getmtime(mediaFilename)
lastModifiedTime = datetime.datetime.fromtimestamp(t)
lastModifiedTimeStr = \
lastModifiedTime.strftime('%a, %d %b %Y %H:%M:%S GMT')
with open(mediaFilename, 'rb') as avFile: with open(mediaFilename, 'rb') as avFile:
mediaBinary = avFile.read() mediaBinary = avFile.read()
self._set_headers_etag(mediaFilename, mediaFileType, self._set_headers_etag(mediaFilename, mediaFileType,
mediaBinary, None, mediaBinary, None,
callingDomain, True) callingDomain, True,
lastModifiedTimeStr)
self._write(mediaBinary) self._write(mediaBinary)
self._benchmarkGETtimings(GETstartTime, GETtimings, self._benchmarkGETtimings(GETstartTime, GETtimings,
'show emoji done', 'show emoji done',
@ -6283,7 +6293,8 @@ class PubServer(BaseHTTPRequestHandler):
self._set_headers_etag(emojiFilename, self._set_headers_etag(emojiFilename,
mediaImageType, mediaImageType,
mediaBinary, None, mediaBinary, None,
self.server.domainFull, False) self.server.domainFull,
False, None)
self._write(mediaBinary) self._write(mediaBinary)
self._benchmarkGETtimings(GETstartTime, GETtimings, self._benchmarkGETtimings(GETstartTime, GETtimings,
'background shown done', 'background shown done',
@ -6319,7 +6330,8 @@ class PubServer(BaseHTTPRequestHandler):
self._set_headers_etag(mediaFilename, self._set_headers_etag(mediaFilename,
mimeTypeStr, mimeTypeStr,
mediaBinary, None, mediaBinary, None,
self.server.domainFull, False) self.server.domainFull,
False, None)
self._write(mediaBinary) self._write(mediaBinary)
return return
else: else:
@ -6330,7 +6342,8 @@ class PubServer(BaseHTTPRequestHandler):
self._set_headers_etag(mediaFilename, self._set_headers_etag(mediaFilename,
mimeType, mimeType,
mediaBinary, None, mediaBinary, None,
self.server.domainFull, False) self.server.domainFull,
False, None)
self._write(mediaBinary) self._write(mediaBinary)
self.server.iconsCache[mediaStr] = mediaBinary self.server.iconsCache[mediaStr] = mediaBinary
self._benchmarkGETtimings(GETstartTime, GETtimings, self._benchmarkGETtimings(GETstartTime, GETtimings,
@ -6373,7 +6386,8 @@ class PubServer(BaseHTTPRequestHandler):
self._set_headers_etag(mediaFilename, self._set_headers_etag(mediaFilename,
mimeType, mimeType,
mediaBinary, None, mediaBinary, None,
self.server.domainFull, False) self.server.domainFull,
False, None)
self._write(mediaBinary) self._write(mediaBinary)
self._benchmarkGETtimings(GETstartTime, GETtimings, self._benchmarkGETtimings(GETstartTime, GETtimings,
'show files done', 'show files done',
@ -6398,7 +6412,8 @@ class PubServer(BaseHTTPRequestHandler):
self._set_headers_etag(mediaFilename, self._set_headers_etag(mediaFilename,
mimeType, mimeType,
mediaBinary, None, mediaBinary, None,
self.server.domainFull, False) self.server.domainFull,
False, None)
self._write(mediaBinary) self._write(mediaBinary)
self._benchmarkGETtimings(GETstartTime, GETtimings, self._benchmarkGETtimings(GETstartTime, GETtimings,
'icon shown done', 'icon shown done',
@ -10328,7 +10343,8 @@ class PubServer(BaseHTTPRequestHandler):
mimeType = mediaFileMimeType(qrFilename) mimeType = mediaFileMimeType(qrFilename)
self._set_headers_etag(qrFilename, mimeType, self._set_headers_etag(qrFilename, mimeType,
mediaBinary, None, mediaBinary, None,
self.server.domainFull, False) self.server.domainFull,
False, None)
self._write(mediaBinary) self._write(mediaBinary)
self._benchmarkGETtimings(GETstartTime, GETtimings, self._benchmarkGETtimings(GETstartTime, GETtimings,
'login screen logo done', 'login screen logo done',
@ -10367,7 +10383,8 @@ class PubServer(BaseHTTPRequestHandler):
mimeType = mediaFileMimeType(bannerFilename) mimeType = mediaFileMimeType(bannerFilename)
self._set_headers_etag(bannerFilename, mimeType, self._set_headers_etag(bannerFilename, mimeType,
mediaBinary, None, mediaBinary, None,
self.server.domainFull, False) self.server.domainFull,
False, None)
self._write(mediaBinary) self._write(mediaBinary)
self._benchmarkGETtimings(GETstartTime, GETtimings, self._benchmarkGETtimings(GETstartTime, GETtimings,
'account qrcode done', 'account qrcode done',
@ -10408,7 +10425,8 @@ class PubServer(BaseHTTPRequestHandler):
mimeType = mediaFileMimeType(bannerFilename) mimeType = mediaFileMimeType(bannerFilename)
self._set_headers_etag(bannerFilename, mimeType, self._set_headers_etag(bannerFilename, mimeType,
mediaBinary, None, mediaBinary, None,
self.server.domainFull, False) self.server.domainFull,
False, None)
self._write(mediaBinary) self._write(mediaBinary)
self._benchmarkGETtimings(GETstartTime, GETtimings, self._benchmarkGETtimings(GETstartTime, GETtimings,
'account qrcode done', 'account qrcode done',
@ -10455,7 +10473,7 @@ class PubServer(BaseHTTPRequestHandler):
'image/' + ext, 'image/' + ext,
bgBinary, None, bgBinary, None,
self.server.domainFull, self.server.domainFull,
False) False, None)
self._write(bgBinary) self._write(bgBinary)
self._benchmarkGETtimings(GETstartTime, self._benchmarkGETtimings(GETstartTime,
GETtimings, GETtimings,
@ -10492,7 +10510,8 @@ class PubServer(BaseHTTPRequestHandler):
self._set_headers_etag(mediaFilename, self._set_headers_etag(mediaFilename,
mediaFileType, mediaFileType,
mediaBinary, None, mediaBinary, None,
self.server.domainFull, False) self.server.domainFull,
False, None)
self._write(mediaBinary) self._write(mediaBinary)
self._benchmarkGETtimings(GETstartTime, GETtimings, self._benchmarkGETtimings(GETstartTime, GETtimings,
'show media done', 'show media done',
@ -10542,16 +10561,19 @@ class PubServer(BaseHTTPRequestHandler):
# The file has not changed # The file has not changed
self._304() self._304()
return True return True
t = os.path.getmtime(avatarFilename) t = os.path.getmtime(avatarFilename)
lastModifiedTime = datetime.datetime.fromtimestamp(t) lastModifiedTime = datetime.datetime.fromtimestamp(t)
lastModifiedTimeStr = lastModifiedTime.strftime("%Y-%m-%dT%H:%M:%SZ") lastModifiedTimeStr = \
lastModifiedTime.strftime('%a, %d %b %Y %H:%M:%S GMT')
mediaImageType = getImageMimeType(avatarFile) mediaImageType = getImageMimeType(avatarFile)
with open(avatarFilename, 'rb') as avFile: with open(avatarFilename, 'rb') as avFile:
mediaBinary = avFile.read() mediaBinary = avFile.read()
self._set_headers_etag(avatarFilename, mediaImageType, self._set_headers_etag(avatarFilename, mediaImageType,
mediaBinary, None, mediaBinary, None,
callingDomain, True) callingDomain, True,
lastModifiedTimeStr)
self._write(mediaBinary) self._write(mediaBinary)
self._benchmarkGETtimings(GETstartTime, GETtimings, self._benchmarkGETtimings(GETstartTime, GETtimings,
'icon shown done', 'icon shown done',
@ -12030,7 +12052,8 @@ class PubServer(BaseHTTPRequestHandler):
mimeType = mediaFileMimeType(mediaFilename) mimeType = mediaFileMimeType(mediaFilename)
self._set_headers_etag(mediaFilename, mimeType, self._set_headers_etag(mediaFilename, mimeType,
mediaBinary, cookie, mediaBinary, cookie,
self.server.domainFull, False) self.server.domainFull,
False, None)
self._write(mediaBinary) self._write(mediaBinary)
self._benchmarkGETtimings(GETstartTime, GETtimings, self._benchmarkGETtimings(GETstartTime, GETtimings,
'profile.css done', 'profile.css done',
@ -12071,7 +12094,8 @@ class PubServer(BaseHTTPRequestHandler):
mimeType = mediaFileMimeType(screenFilename) mimeType = mediaFileMimeType(screenFilename)
self._set_headers_etag(screenFilename, mimeType, self._set_headers_etag(screenFilename, mimeType,
mediaBinary, cookie, mediaBinary, cookie,
self.server.domainFull, False) self.server.domainFull,
False, None)
self._write(mediaBinary) self._write(mediaBinary)
self._benchmarkGETtimings(GETstartTime, GETtimings, self._benchmarkGETtimings(GETstartTime, GETtimings,
'manifest logo done', 'manifest logo done',
@ -12113,7 +12137,8 @@ class PubServer(BaseHTTPRequestHandler):
self._set_headers_etag(iconFilename, self._set_headers_etag(iconFilename,
mimeTypeStr, mimeTypeStr,
mediaBinary, cookie, mediaBinary, cookie,
self.server.domainFull, False) self.server.domainFull,
False, None)
self._write(mediaBinary) self._write(mediaBinary)
self._benchmarkGETtimings(GETstartTime, GETtimings, self._benchmarkGETtimings(GETstartTime, GETtimings,
'show screenshot done', 'show screenshot done',