Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-10-01 01:35:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make last_modified and if_date timezone-aware

Browse Source 
Fix #1398
This commit is contained in:
Fushan Wen 2021-08-22 16:27:51 +08:00
parent 02254b13bb
commit f4b35f25d3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cli/onionshare_cli/web/share_mode.py
View File

@ -25,7 +25,7 @@ import sys
import tempfile import tempfile
import zipfile import zipfile
import mimetypes import mimetypes
from datetime import datetime from datetime import datetime, timezone
from flask import Response, request, render_template, make_response, abort from flask import Response, request, render_template, make_response, abort
from unidecode import unidecode from unidecode import unidecode
from werkzeug.http import parse_date, http_date from werkzeug.http import parse_date, http_date
@ -127,7 +127,7 @@ class ShareModeWeb(SendBaseModeWeb):
self.download_etag = None self.download_etag = None
self.gzip_etag = None self.gzip_etag = None
self.last_modified = datetime.utcnow() self.last_modified = datetime.now(tz=timezone.utc)
def define_routes(self): def define_routes(self):
""" """
@ -288,6 +288,8 @@ class ShareModeWeb(SendBaseModeWeb):
if_unmod = request.headers.get("If-Unmodified-Since") if_unmod = request.headers.get("If-Unmodified-Since")
if if_unmod: if if_unmod:
if_date = parse_date(if_unmod) if_date = parse_date(if_unmod)
if if_date and not if_date.tzinfo:
if_date = if_date.replace(tzinfo=timezone.utc) # Compatible with Flask < 2.0.0
if if_date and if_date > last_modified: if if_date and if_date > last_modified:
abort(412) abort(412)
elif range_header is None: elif range_header is None: