From 6b74f56381cdf1c58c9cb0fc468896a535dc3071 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 22 Feb 2021 10:01:19 -0800
Subject: [PATCH] Safer set remote server

---
 bookwyrm/models/user.py | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index a65317fa3..5e77b9e1c 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -9,7 +9,7 @@ from django.db import models
 from django.utils import timezone
 
 from bookwyrm import activitypub
-from bookwyrm.connectors import get_data
+from bookwyrm.connectors import get_data, ConnectorException
 from bookwyrm.models.shelf import Shelf
 from bookwyrm.models.status import Status, Review
 from bookwyrm.settings import DOMAIN
@@ -333,19 +333,24 @@ def get_or_create_remote_server(domain):
     except FederatedServer.DoesNotExist:
         pass
 
-    data = get_data('https://%s/.well-known/nodeinfo' % domain)
-
     try:
-        nodeinfo_url = data.get('links')[0].get('href')
-    except (TypeError, KeyError):
-        return None
+        data = get_data('https://%s/.well-known/nodeinfo' % domain)
+        try:
+            nodeinfo_url = data.get('links')[0].get('href')
+        except (TypeError, KeyError):
+            return None
+
+        data = get_data(nodeinfo_url)
+        application_type = data.get('software', {}).get('name')
+        application_type = data.get('software', {}).get('version')
+    except ConnectorException:
+        application_type = application_version = None
 
-    data = get_data(nodeinfo_url)
 
     server = FederatedServer.objects.create(
         server_name=domain,
-        application_type=data['software']['name'],
-        application_version=data['software']['version'],
+        application_type=application_type,
+        application_version=application_version,
     )
     return server