kopia lustrzana https://gitlab.com/jaywink/federation
Strip ending slash from NodeInfo2 base_url parsing
rodzic
6c4c61938b
commit
00b3fba440
|
@ -143,7 +143,7 @@ def parse_nodeinfo2_document(doc, host):
|
|||
result['platform'] = doc.get('server', {}).get('software', 'unknown').lower()
|
||||
result['version'] = doc.get('server', {}).get('version', '') or ''
|
||||
# Ensure baseUrl is reported as the host we called
|
||||
base_url = doc.get('server', {}).get('baseUrl', '')
|
||||
base_url = doc.get('server', {}).get('baseUrl', '').rstrip('/')
|
||||
cleaned_base_url = re.sub(r'https?://', '', base_url)
|
||||
if cleaned_base_url.startswith(host):
|
||||
result['host'] = cleaned_base_url
|
||||
|
|
|
@ -69,7 +69,7 @@ NODEINFO2_10_DOC = """
|
|||
{
|
||||
"version": "1.0",
|
||||
"server": {
|
||||
"baseUrl": "https://example.com",
|
||||
"baseUrl": "https://example.com/",
|
||||
"name": "Example server",
|
||||
"software": "example",
|
||||
"version": "0.5.0"
|
||||
|
|
Ładowanie…
Reference in New Issue