yul
/
bookwyrm-mastodon
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes generating new key paris for user 

and the broadcast test
This commit is contained in:
Mouse Reeve 2020-11-30 19:33:50 -08:00
parent eb6206252d
commit fee5846aa8
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bookwyrm/broadcast.py
View File

@ -65,7 +65,7 @@ def sign_and_send(sender, data, destination):
''' crpyto whatever and http junk ''' ''' crpyto whatever and http junk '''
now = http_date() now = http_date()
if not sender.private_key: if not sender.key_pair.private_key:
# this shouldn't happen. it would be bad if it happened. # this shouldn't happen. it would be bad if it happened.
raise ValueError('No private key found for sender') raise ValueError('No private key found for sender')

8
bookwyrm/incoming.py
View File

@ -98,15 +98,15 @@ def has_valid_signature(request, activity):
remote_user = activitypub.resolve_remote_id(models.User, key_actor) remote_user = activitypub.resolve_remote_id(models.User, key_actor)
try: try:
signature.verify(remote_user.public_key, request) signature.verify(remote_user.key_pair.public_key, request)
except ValueError: except ValueError:
old_key = remote_user.public_key old_key = remote_user.key_pair.public_key
activitypub.resolve_remote_id( activitypub.resolve_remote_id(
models.User, remote_user, refresh=True models.User, remote_user, refresh=True
) )
if remote_user.public_key == old_key: if remote_user.key_pair.public_key == old_key:
raise # Key unchanged. raise # Key unchanged.
signature.verify(remote_user.public_key, request) signature.verify(remote_user.key_pair.public_key, request)
except (ValueError, requests.exceptions.HTTPError): except (ValueError, requests.exceptions.HTTPError):
return False return False
return True return True

5
bookwyrm/models/user.py
View File

@ -155,8 +155,6 @@ class User(OrderedCollectionPageMixin, AbstractUser):
self.inbox = '%s/inbox' % self.remote_id self.inbox = '%s/inbox' % self.remote_id
self.shared_inbox = 'https://%s/inbox' % DOMAIN self.shared_inbox = 'https://%s/inbox' % DOMAIN
self.outbox = '%s/outbox' % self.remote_id self.outbox = '%s/outbox' % self.remote_id
if not self.key_pair:
self.key_pair = KeyPair.objects.create()
return super().save(*args, **kwargs) return super().save(*args, **kwargs)
@ -197,6 +195,9 @@ def execute_after_save(sender, instance, created, *args, **kwargs):
if not instance.local: if not instance.local:
set_remote_server.delay(instance.id) set_remote_server.delay(instance.id)
instance.key_pair = KeyPair.objects.create(
remote_id='%s/#main-key' % instance.remote_id)
shelves = [{ shelves = [{
'name': 'To Read', 'name': 'To Read',
'identifier': 'to-read', 'identifier': 'to-read',

4
bookwyrm/tests/models/test_user_model.py
View File

@ -19,8 +19,8 @@ class User(TestCase):
self.assertEqual(self.user.shared_inbox, 'https://%s/inbox' % DOMAIN) self.assertEqual(self.user.shared_inbox, 'https://%s/inbox' % DOMAIN)
self.assertEqual(self.user.inbox, '%s/inbox' % expected_id) self.assertEqual(self.user.inbox, '%s/inbox' % expected_id)
self.assertEqual(self.user.outbox, '%s/outbox' % expected_id) self.assertEqual(self.user.outbox, '%s/outbox' % expected_id)
self.assertIsNotNone(self.user.private_key) self.assertIsNotNone(self.user.key_pair.private_key)
self.assertIsNotNone(self.user.public_key) self.assertIsNotNone(self.user.key_pair.public_key)
def test_user_shelves(self): def test_user_shelves(self):

5
bookwyrm/tests/test_broadcast.py
View File

@ -6,12 +6,11 @@ from bookwyrm import models, broadcast
class Book(TestCase): class Book(TestCase):
def setUp(self): def setUp(self):
with patch('bookwyrm.models.user.get_remote_reviews.delay'):
self.user = models.User.objects.create_user( self.user = models.User.objects.create_user(
'mouse', 'mouse@mouse.mouse', 'mouseword') 'mouse', 'mouse@mouse.mouse', 'mouseword', local=True)
local_follower = models.User.objects.create_user( local_follower = models.User.objects.create_user(
'joe', 'joe@mouse.mouse', 'jeoword') 'joe', 'joe@mouse.mouse', 'jeoword', local=True)
self.user.followers.add(local_follower) self.user.followers.add(local_follower)
with patch('bookwyrm.models.user.set_remote_server.delay'): with patch('bookwyrm.models.user.set_remote_server.delay'):