Browse Source

activitypub: switch to using x509 representation for public keys instead of pkcs#1

tags/v0.9.9
William Pitcock 6 years ago
parent
commit
8546551257
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      lib/pleroma/web/activity_pub/views/user_view.ex
  2. +1
    -1
      test/web/activity_pub/views/user_view_test.exs

+ 1
- 1
lib/pleroma/web/activity_pub/views/user_view.ex View File

@@ -12,7 +12,7 @@ defmodule Pleroma.Web.ActivityPub.UserView do
def render("user.json", %{user: user}) do
{:ok, user} = WebFinger.ensure_keys_present(user)
{:ok, _, public_key} = Salmon.keys_from_pem(user.info["keys"])
public_key = :public_key.pem_entry_encode(:RSAPublicKey, public_key)
public_key = :public_key.pem_entry_encode(:SubjectPublicKeyInfo, public_key)
public_key = :public_key.pem_encode([public_key])

%{


+ 1
- 1
test/web/activity_pub/views/user_view_test.exs View File

@@ -13,6 +13,6 @@ defmodule Pleroma.Web.ActivityPub.UserViewTest do
assert result["id"] == user.ap_id
assert result["preferredUsername"] == user.nickname

assert String.contains?(result["publicKey"]["publicKeyPem"], "BEGIN RSA PUBLIC KEY")
assert String.contains?(result["publicKey"]["publicKeyPem"], "BEGIN PUBLIC KEY")
end
end

Loading…
Cancel
Save