shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2024-12-22 13:34:04 +03:00
Code Issues Releases Wiki Activity

fixed udslink for django 4.x

Browse Source
This commit is contained in:
Adolfo Gómez García 2023-05-17 19:26:23 +02:00
parent 57d7b442f6
commit 4f6a7b44ab
No known key found for this signature in database
GPG Key ID: DD1ABF20724CDA23
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/src/uds/core/util/html.py
View File

@ -43,12 +43,14 @@ logger = logging.getLogger(__name__)
def udsLink(request: 'HttpRequest', ticket: str, scrambler: str) -> str:
if request.is_secure():
proto = 'udss'
else:
proto = 'uds'
# Removed http support, so only udss:// links are generated
return f'{proto}://{request.build_absolute_uri("/")}{ticket}/{scrambler}'
# If we have a scheme, remove it
rels = request.build_absolute_uri("/").split("://", maxsplit=1)
rel = rels[1] if len(rels) > 1 else rels[0]
# Ensure that build_absolute_uri returns a valid url without scheme
return f'udss://{rel}{ticket}/{scrambler}'
def udsAccessLink(
@ -67,10 +69,7 @@ def parseDate(dateToParse) -> datetime.date:
date_format = '%d/%m/%Y'
else:
date_format = (
formats.get_format('SHORT_DATE_FORMAT')
.replace('Y', '%Y')
.replace('m', '%m')
.replace('d', '%d')
formats.get_format('SHORT_DATE_FORMAT').replace('Y', '%Y').replace('m', '%m').replace('d', '%d')
) # pylint: disable=maybe-no-member
return datetime.datetime.strptime(dateToParse, date_format).date()