summaryrefslogtreecommitdiffstats
path: root/users
diff options
context:
space:
mode:
Diffstat (limited to 'users')
-rw-r--r--users/admin.py2
-rw-r--r--users/migrations/0001_initial.py41
-rw-r--r--users/models/domain.py4
-rw-r--r--users/models/follow.py50
-rw-r--r--users/models/identity.py176
-rw-r--r--users/shortcuts.py19
-rw-r--r--users/tasks/__init__.py0
-rw-r--r--users/tasks/follow.py28
-rw-r--r--users/tasks/identity.py11
-rw-r--r--users/tasks/inbox.py36
-rw-r--r--users/views/identity.py59
11 files changed, 287 insertions, 139 deletions
diff --git a/users/admin.py b/users/admin.py
index 5672876..bb07aa1 100644
--- a/users/admin.py
+++ b/users/admin.py
@@ -21,4 +21,4 @@ class UserEventAdmin(admin.ModelAdmin):
@admin.register(Identity)
class IdentityAdmin(admin.ModelAdmin):
- list_display = ["id", "handle", "name", "local"]
+ list_display = ["id", "handle", "actor_uri", "name", "local"]
diff --git a/users/migrations/0001_initial.py b/users/migrations/0001_initial.py
index 364daaa..f5ebf55 100644
--- a/users/migrations/0001_initial.py
+++ b/users/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.1.3 on 2022-11-06 19:58
+# Generated by Django 4.1.3 on 2022-11-07 04:19
import functools
@@ -56,11 +56,17 @@ class Migration(migrations.Migration):
),
(
"service_domain",
- models.CharField(blank=True, max_length=250, null=True),
+ models.CharField(
+ blank=True,
+ db_index=True,
+ max_length=250,
+ null=True,
+ unique=True,
+ ),
),
("local", models.BooleanField()),
("blocked", models.BooleanField(default=False)),
- ("public", models.BooleanField()),
+ ("public", models.BooleanField(default=False)),
("created", models.DateTimeField(auto_now_add=True)),
("updated", models.DateTimeField(auto_now=True)),
(
@@ -118,12 +124,7 @@ class Migration(migrations.Migration):
verbose_name="ID",
),
),
- (
- "actor_uri",
- models.CharField(
- blank=True, max_length=500, null=True, unique=True
- ),
- ),
+ ("actor_uri", models.CharField(max_length=500, unique=True)),
("local", models.BooleanField()),
("username", models.CharField(blank=True, max_length=500, null=True)),
("name", models.CharField(blank=True, max_length=500, null=True)),
@@ -192,7 +193,7 @@ class Migration(migrations.Migration):
},
),
migrations.CreateModel(
- name="Follow",
+ name="Block",
fields=[
(
"id",
@@ -203,6 +204,8 @@ class Migration(migrations.Migration):
verbose_name="ID",
),
),
+ ("mute", models.BooleanField()),
+ ("expires", models.DateTimeField(blank=True, null=True)),
("note", models.TextField(blank=True, null=True)),
("created", models.DateTimeField(auto_now_add=True)),
("updated", models.DateTimeField(auto_now=True)),
@@ -210,7 +213,7 @@ class Migration(migrations.Migration):
"source",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
- related_name="outbound_follows",
+ related_name="outbound_blocks",
to="users.identity",
),
),
@@ -218,14 +221,14 @@ class Migration(migrations.Migration):
"target",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
- related_name="inbound_follows",
+ related_name="inbound_blocks",
to="users.identity",
),
),
],
),
migrations.CreateModel(
- name="Block",
+ name="Follow",
fields=[
(
"id",
@@ -236,16 +239,17 @@ class Migration(migrations.Migration):
verbose_name="ID",
),
),
- ("mute", models.BooleanField()),
- ("expires", models.DateTimeField(blank=True, null=True)),
+ ("uri", models.CharField(blank=True, max_length=500, null=True)),
("note", models.TextField(blank=True, null=True)),
+ ("requested", models.BooleanField(default=False)),
+ ("accepted", models.BooleanField(default=False)),
("created", models.DateTimeField(auto_now_add=True)),
("updated", models.DateTimeField(auto_now=True)),
(
"source",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
- related_name="outbound_blocks",
+ related_name="outbound_follows",
to="users.identity",
),
),
@@ -253,10 +257,13 @@ class Migration(migrations.Migration):
"target",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
- related_name="inbound_blocks",
+ related_name="inbound_follows",
to="users.identity",
),
),
],
+ options={
+ "unique_together": {("source", "target")},
+ },
),
]
diff --git a/users/models/domain.py b/users/models/domain.py
index f503b89..8467ac3 100644
--- a/users/models/domain.py
+++ b/users/models/domain.py
@@ -48,14 +48,14 @@ class Domain(models.Model):
updated = models.DateTimeField(auto_now=True)
@classmethod
- def get_remote_domain(cls, domain) -> "Domain":
+ def get_remote_domain(cls, domain: str) -> "Domain":
try:
return cls.objects.get(domain=domain, local=False)
except cls.DoesNotExist:
return cls.objects.create(domain=domain, local=False)
@classmethod
- def get_local_domain(cls, domain) -> Optional["Domain"]:
+ def get_local_domain(cls, domain: str) -> Optional["Domain"]:
try:
return cls.objects.get(
models.Q(domain=domain) | models.Q(service_domain=domain)
diff --git a/users/models/follow.py b/users/models/follow.py
index 7287900..29d036e 100644
--- a/users/models/follow.py
+++ b/users/models/follow.py
@@ -1,5 +1,9 @@
+from typing import Optional
+
from django.db import models
+from miniq.models import Task
+
class Follow(models.Model):
"""
@@ -17,7 +21,53 @@ class Follow(models.Model):
related_name="inbound_follows",
)
+ uri = models.CharField(blank=True, null=True, max_length=500)
note = models.TextField(blank=True, null=True)
+ requested = models.BooleanField(default=False)
+ accepted = models.BooleanField(default=False)
+
created = models.DateTimeField(auto_now_add=True)
updated = models.DateTimeField(auto_now=True)
+
+ class Meta:
+ unique_together = [("source", "target")]
+
+ @classmethod
+ def maybe_get(cls, source, target) -> Optional["Follow"]:
+ """
+ Returns a follow if it exists between source and target
+ """
+ try:
+ return Follow.objects.get(source=source, target=target)
+ except Follow.DoesNotExist:
+ return None
+
+ @classmethod
+ def create_local(cls, source, target):
+ """
+ Creates a Follow from a local Identity to the target
+ (which can be local or remote).
+ """
+ if not source.local:
+ raise ValueError("You cannot initiate follows on a remote Identity")
+ try:
+ follow = Follow.objects.get(source=source, target=target)
+ except Follow.DoesNotExist:
+ follow = Follow.objects.create(source=source, target=target, uri="")
+ follow.uri = source.actor_uri + f"follow/{follow.pk}/"
+ if target.local:
+ follow.requested = True
+ follow.accepted = True
+ else:
+ Task.submit("follow_request", str(follow.pk))
+ follow.save()
+ return follow
+
+ def undo(self):
+ """
+ Undoes this follow
+ """
+ if not self.target.local:
+ Task.submit("follow_undo", str(self.pk))
+ self.delete()
diff --git a/users/models/identity.py b/users/models/identity.py
index 4939535..1f44e98 100644
--- a/users/models/identity.py
+++ b/users/models/identity.py
@@ -6,12 +6,11 @@ from urllib.parse import urlparse
import httpx
import urlman
-from asgiref.sync import sync_to_async
-from cryptography.hazmat.primitives import hashes, serialization
-from cryptography.hazmat.primitives.asymmetric import padding, rsa
+from asgiref.sync import async_to_sync, sync_to_async
+from cryptography.hazmat.primitives import serialization
+from cryptography.hazmat.primitives.asymmetric import rsa
from django.db import models
from django.utils import timezone
-from django.utils.http import http_date
from OpenSSL import crypto
from core.ld import canonicalise
@@ -34,7 +33,7 @@ class Identity(models.Model):
# The Actor URI is essentially also a PK - we keep the default numeric
# one around as well for making nice URLs etc.
- actor_uri = models.CharField(max_length=500, blank=True, null=True, unique=True)
+ actor_uri = models.CharField(max_length=500, unique=True)
local = models.BooleanField()
users = models.ManyToManyField("users.User", related_name="identities")
@@ -73,10 +72,35 @@ class Identity(models.Model):
fetched = models.DateTimeField(null=True, blank=True)
deleted = models.DateTimeField(null=True, blank=True)
+ ### Model attributes ###
+
class Meta:
verbose_name_plural = "identities"
unique_together = [("username", "domain")]
+ class urls(urlman.Urls):
+ view = "/@{self.username}@{self.domain_id}/"
+ view_short = "/@{self.username}/"
+ action = "{view}action/"
+ actor = "{view}actor/"
+ activate = "{view}activate/"
+ key = "{actor}#main-key"
+ inbox = "{actor}inbox/"
+ outbox = "{actor}outbox/"
+
+ def get_scheme(self, url):
+ return "https"
+
+ def get_hostname(self, url):
+ return self.instance.domain.uri_domain
+
+ def __str__(self):
+ if self.username and self.domain_id:
+ return self.handle
+ return self.actor_uri
+
+ ### Alternate constructors/fetchers ###
+
@classmethod
def by_handle(cls, handle, fetch=False, local=False):
if handle.startswith("@"):
@@ -91,7 +115,15 @@ class Identity(models.Model):
return cls.objects.get(username=username, domain_id=domain)
except cls.DoesNotExist:
if fetch and not local:
- return cls.objects.create(handle=handle, local=False)
+ actor_uri, handle = async_to_sync(cls.fetch_webfinger)(handle)
+ username, domain = handle.split("@")
+ domain = Domain.get_remote_domain(domain)
+ return cls.objects.create(
+ actor_uri=actor_uri,
+ username=username,
+ domain_id=domain,
+ local=False,
+ )
return None
@classmethod
@@ -108,9 +140,17 @@ class Identity(models.Model):
except cls.DoesNotExist:
return cls.objects.create(actor_uri=uri, local=False)
+ ### Dynamic properties ###
+
+ @property
+ def name_or_handle(self):
+ return self.name or self.handle
+
@property
def handle(self):
- return f"{self.username}@{self.domain_id}"
+ if self.domain_id:
+ return f"{self.username}@{self.domain_id}"
+ return f"{self.username}@UNKNOWN-DOMAIN"
@property
def data_age(self) -> float:
@@ -123,23 +163,12 @@ class Identity(models.Model):
return 10000000000
return (timezone.now() - self.fetched).total_seconds()
- def generate_keypair(self):
- if not self.local:
- raise ValueError("Cannot generate keypair for remote user")
- private_key = rsa.generate_private_key(
- public_exponent=65537,
- key_size=2048,
- )
- self.private_key = private_key.private_bytes(
- encoding=serialization.Encoding.PEM,
- format=serialization.PrivateFormat.PKCS8,
- encryption_algorithm=serialization.NoEncryption(),
- )
- self.public_key = private_key.public_key().public_bytes(
- encoding=serialization.Encoding.PEM,
- format=serialization.PublicFormat.SubjectPublicKeyInfo,
- )
- self.save()
+ @property
+ def outdated(self) -> bool:
+ # TODO: Setting
+ return self.data_age > 60 * 24 * 24
+
+ ### Actor/Webfinger fetching ###
@classmethod
async def fetch_webfinger(cls, handle: str) -> Tuple[Optional[str], Optional[str]]:
@@ -189,6 +218,8 @@ class Identity(models.Model):
self.outbox_uri = document.get("outbox")
self.summary = document.get("summary")
self.username = document.get("preferredUsername")
+ if "@value" in self.username:
+ self.username = self.username["@value"]
self.manually_approves_followers = document.get(
"as:manuallyApprovesFollowers"
)
@@ -214,23 +245,42 @@ class Identity(models.Model):
await sync_to_async(self.save)()
return True
- def sign(self, cleartext: str) -> str:
+ ### Cryptography ###
+
+ def generate_keypair(self):
+ if not self.local:
+ raise ValueError("Cannot generate keypair for remote user")
+ private_key = rsa.generate_private_key(
+ public_exponent=65537,
+ key_size=2048,
+ )
+ self.private_key = private_key.private_bytes(
+ encoding=serialization.Encoding.PEM,
+ format=serialization.PrivateFormat.PKCS8,
+ encryption_algorithm=serialization.NoEncryption(),
+ ).decode("ascii")
+ self.public_key = (
+ private_key.public_key()
+ .public_bytes(
+ encoding=serialization.Encoding.PEM,
+ format=serialization.PublicFormat.SubjectPublicKeyInfo,
+ )
+ .decode("ascii")
+ )
+ self.save()
+
+ def sign(self, cleartext: str) -> bytes:
if not self.private_key:
raise ValueError("Cannot sign - no private key")
- private_key = serialization.load_pem_private_key(
+ pkey = crypto.load_privatekey(
+ crypto.FILETYPE_PEM,
self.private_key.encode("ascii"),
- password=None,
)
- return base64.b64encode(
- private_key.sign(
- cleartext.encode("ascii"),
- padding.PSS(
- mgf=padding.MGF1(hashes.SHA256()),
- salt_length=padding.PSS.MAX_LENGTH,
- ),
- hashes.SHA256(),
- )
- ).decode("ascii")
+ return crypto.sign(
+ pkey,
+ cleartext.encode("ascii"),
+ "sha256",
+ )
def verify_signature(self, signature: bytes, cleartext: str) -> bool:
if not self.public_key:
@@ -247,55 +297,3 @@ class Identity(models.Model):
except crypto.Error:
return False
return True
-
- async def signed_request(self, host, method, path, document):
- """
- Delivers the document to the specified host, method, path and signed
- as this user.
- """
- date_string = http_date(timezone.now().timestamp())
- headers = {
- "(request-target)": f"{method} {path}",
- "Host": host,
- "Date": date_string,
- }
- headers_string = " ".join(headers.keys())
- signed_string = "\n".join(f"{name}: {value}" for name, value in headers.items())
- signature = self.sign(signed_string)
- del headers["(request-target)"]
- headers[
- "Signature"
- ] = f'keyId="{self.urls.key.full()}",headers="{headers_string}",signature="{signature}"'
- async with httpx.AsyncClient() as client:
- return await client.request(
- method,
- "https://{host}{path}",
- headers=headers,
- data=document,
- )
-
- def validate_signature(self, request):
- """
- Attempts to validate the signature on an incoming request.
- Returns False if the signature is invalid, None if it cannot be verified
- as we do not have the key locally, or the name of the actor if it is valid.
- """
- pass
-
- def __str__(self):
- return self.handle or self.actor_uri
-
- class urls(urlman.Urls):
- view = "/@{self.username}@{self.domain_id}/"
- view_short = "/@{self.username}/"
- actor = "{view}actor/"
- key = "{actor}#main-key"
- inbox = "{actor}inbox/"
- outbox = "{actor}outbox/"
- activate = "{view}activate/"
-
- def get_scheme(self, url):
- return "https"
-
- def get_hostname(self, url):
- return self.instance.domain.uri_domain
diff --git a/users/shortcuts.py b/users/shortcuts.py
index 167f178..15b864d 100644
--- a/users/shortcuts.py
+++ b/users/shortcuts.py
@@ -1,10 +1,9 @@
from django.http import Http404
-from django.shortcuts import get_object_or_404
from users.models import Domain, Identity
-def by_handle_or_404(request, handle, local=True):
+def by_handle_or_404(request, handle, local=True, fetch=False):
"""
Retrieves an Identity by its long or short handle.
Domain-sensitive, so it will understand short handles on alternate domains.
@@ -19,15 +18,7 @@ def by_handle_or_404(request, handle, local=True):
domain = domain_instance.domain
else:
username, domain = handle.split("@", 1)
- if local:
- return get_object_or_404(
- Identity.objects.filter(local=True),
- username=username,
- domain_id=domain,
- )
- else:
- return get_object_or_404(
- Identity,
- username=username,
- domain_id=domain,
- )
+ identity = Identity.by_handle(handle, local=local, fetch=fetch)
+ if identity is None:
+ raise Http404(f"No identity for handle {handle}")
+ return identity
diff --git a/users/tasks/__init__.py b/users/tasks/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/users/tasks/__init__.py
diff --git a/users/tasks/follow.py b/users/tasks/follow.py
new file mode 100644
index 0000000..3260124
--- /dev/null
+++ b/users/tasks/follow.py
@@ -0,0 +1,28 @@
+from core.ld import canonicalise
+from core.signatures import HttpSignature
+from users.models import Follow
+
+
+async def handle_follow_request(task_handler):
+ """
+ Request a follow from a remote server
+ """
+ follow = await Follow.objects.select_related(
+ "source", "source__domain", "target"
+ ).aget(pk=task_handler.subject)
+ # Construct the request
+ request = canonicalise(
+ {
+ "@context": "https://www.w3.org/ns/activitystreams",
+ "id": follow.uri,
+ "type": "Follow",
+ "actor": follow.source.actor_uri,
+ "object": follow.target.actor_uri,
+ }
+ )
+ # Sign it and send it
+ response = await HttpSignature.signed_request(
+ follow.target.inbox_uri, request, follow.source
+ )
+ print(response)
+ print(response.content)
diff --git a/users/tasks/identity.py b/users/tasks/identity.py
new file mode 100644
index 0000000..f5cd214
--- /dev/null
+++ b/users/tasks/identity.py
@@ -0,0 +1,11 @@
+from asgiref.sync import sync_to_async
+
+from users.models import Identity
+
+
+async def handle_identity_fetch(task_handler):
+ # Get the actor URI via webfinger
+ actor_uri, handle = await Identity.fetch_webfinger(task_handler.subject)
+ # Get or create the identity, then fetch
+ identity = await sync_to_async(Identity.by_actor_uri_with_create)(actor_uri)
+ await identity.fetch_actor()
diff --git a/users/tasks/inbox.py b/users/tasks/inbox.py
new file mode 100644
index 0000000..ab80648
--- /dev/null
+++ b/users/tasks/inbox.py
@@ -0,0 +1,36 @@
+from users.models import Follow, Identity
+
+
+async def handle_inbox_item(task_handler):
+ type = task_handler.payload["type"].lower()
+ if type == "follow":
+ await inbox_follow(task_handler.payload)
+ elif type == "undo":
+ inner_type = task_handler.payload["object"]["type"].lower()
+ if inner_type == "follow":
+ await inbox_unfollow(task_handler.payload["object"])
+ else:
+ raise ValueError("Cannot undo activity of type {inner_type}")
+ else:
+ raise ValueError("Cannot handle activity of type {inner_type}")
+
+
+async def inbox_follow(payload):
+ """
+ Handles an incoming follow request
+ """
+ # TODO: Manually approved follows
+ source = Identity.by_actor_uri_with_create(payload["actor"])
+ target = Identity.by_actor_uri(payload["object"])
+ # See if this follow already exists
+ try:
+ follow = Follow.objects.get(source=source, target=target)
+ except Follow.DoesNotExist:
+ follow = Follow.objects.create(source=source, target=target, uri=payload["id"])
+ # See if we need to acknowledge it
+ if not follow.acknowledged:
+ pass
+
+
+async def inbox_unfollow(payload):
+ pass
diff --git a/users/views/identity.py b/users/views/identity.py
index 7134cf9..7cba43e 100644
--- a/users/views/identity.py
+++ b/users/views/identity.py
@@ -5,9 +5,11 @@ from asgiref.sync import async_to_sync
from django import forms
from django.conf import settings
from django.contrib.auth.decorators import login_required
-from django.http import Http404, HttpResponseBadRequest, JsonResponse
+from django.http import Http404, HttpResponse, HttpResponseBadRequest, JsonResponse
from django.shortcuts import redirect
+from django.utils import timezone
from django.utils.decorators import method_decorator
+from django.utils.http import parse_http_date
from django.views.decorators.csrf import csrf_exempt
from django.views.generic import FormView, TemplateView, View
@@ -15,7 +17,8 @@ from core.forms import FormHelper
from core.ld import canonicalise
from core.signatures import HttpSignature
from miniq.models import Task
-from users.models import Domain, Identity
+from users.decorators import identity_required
+from users.models import Domain, Follow, Identity
from users.shortcuts import by_handle_or_404
@@ -24,16 +27,39 @@ class ViewIdentity(TemplateView):
template_name = "identity/view.html"
def get_context_data(self, handle):
- identity = by_handle_or_404(self.request, handle, local=False)
+ identity = by_handle_or_404(
+ self.request,
+ handle,
+ local=False,
+ fetch=True,
+ )
statuses = identity.statuses.all()[:100]
if identity.data_age > settings.IDENTITY_MAX_AGE:
Task.submit("identity_fetch", identity.handle)
return {
"identity": identity,
"statuses": statuses,
+ "follow": Follow.maybe_get(self.request.identity, identity)
+ if self.request.identity
+ else None,
}
+@method_decorator(identity_required, name="dispatch")
+class ActionIdentity(View):
+ def post(self, request, handle):
+ identity = by_handle_or_404(self.request, handle, local=False)
+ # See what action we should perform
+ action = self.request.POST["action"]
+ if action == "follow":
+ existing_follow = Follow.maybe_get(self.request.identity, identity)
+ if not existing_follow:
+ Follow.create_local(self.request.identity, identity)
+ else:
+ raise ValueError(f"Cannot handle identity action {action}")
+ return redirect(identity.urls.view)
+
+
@method_decorator(login_required, name="dispatch")
class SelectIdentity(TemplateView):
@@ -158,42 +184,43 @@ class Inbox(View):
if "HTTP_DIGEST" in request.META:
expected_digest = HttpSignature.calculate_digest(request.body)
if request.META["HTTP_DIGEST"] != expected_digest:
- print("Bad digest")
- return HttpResponseBadRequest()
+ return HttpResponseBadRequest("Digest is incorrect")
+ # Verify date header
+ if "HTTP_DATE" in request.META:
+ header_date = parse_http_date(request.META["HTTP_DATE"])
+ if abs(timezone.now().timestamp() - header_date) > 60:
+ return HttpResponseBadRequest("Date is too far away")
# Get the signature details
if "HTTP_SIGNATURE" not in request.META:
- print("No signature")
- return HttpResponseBadRequest()
+ return HttpResponseBadRequest("No signature present")
signature_details = HttpSignature.parse_signature(
request.META["HTTP_SIGNATURE"]
)
# Reject unknown algorithms
if signature_details["algorithm"] != "rsa-sha256":
- print("Unknown algorithm")
- return HttpResponseBadRequest()
+ return HttpResponseBadRequest("Unknown signature algorithm")
# Create the signature payload
headers_string = HttpSignature.headers_from_request(
request, signature_details["headers"]
)
# Load the LD
document = canonicalise(json.loads(request.body))
- print(signature_details)
- print(headers_string)
- print(document)
# Find the Identity by the actor on the incoming item
+ # This ensures that the signature used for the headers matches the actor
+ # described in the payload.
identity = Identity.by_actor_uri_with_create(document["actor"])
if not identity.public_key:
# See if we can fetch it right now
async_to_sync(identity.fetch_actor)()
if not identity.public_key:
- print("Cannot retrieve actor")
return HttpResponseBadRequest("Cannot retrieve actor")
if not identity.verify_signature(
signature_details["signature"], headers_string
):
- print("Bad signature")
- # return HttpResponseBadRequest("Bad signature")
- return JsonResponse({"status": "OK"})
+ return HttpResponseBadRequest("Bad signature")
+ # Hand off the item to be processed by the queue
+ Task.submit("inbox_item", subject=identity.actor_uri, payload=document)
+ return HttpResponse(status=202)
class Webfinger(View):
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 11:27:42 +0000