remove public key field

This commit is contained in:
Floatingghost 2024-10-26 05:28:55 +01:00
parent 430b376ded
commit 13215f5f06
4 changed files with 2 additions and 5 deletions

View file

@ -343,6 +343,7 @@ defp get_final_id(final_url, _intial_url) do
final_url final_url
end end
@doc "Do NOT use; only public for use in tests"
def get_object(id) do def get_object(id) do
date = Pleroma.Signature.signed_date() date = Pleroma.Signature.signed_date()

View file

@ -11,7 +11,6 @@ defmodule Pleroma.Signature do
require Logger require Logger
def key_id_to_actor_id(key_id) do def key_id_to_actor_id(key_id) do
# Given the key ID, first attempt to look it up in the signing keys table.
case SigningKey.key_id_to_ap_id(key_id) do case SigningKey.key_id_to_ap_id(key_id) do
nil -> nil ->
# hm, we SHOULD have gotten this in the pipeline before we hit here! # hm, we SHOULD have gotten this in the pipeline before we hit here!

View file

@ -101,7 +101,6 @@ defmodule Pleroma.User do
field(:password, :string, virtual: true) field(:password, :string, virtual: true)
field(:password_confirmation, :string, virtual: true) field(:password_confirmation, :string, virtual: true)
field(:keys, :string) field(:keys, :string)
field(:public_key, :string)
field(:ap_id, :string) field(:ap_id, :string)
field(:avatar, :map, default: %{}) field(:avatar, :map, default: %{})
field(:local, :boolean, default: true) field(:local, :boolean, default: true)
@ -471,7 +470,6 @@ def remote_user_changeset(struct \\ %User{local: false}, params) do
:inbox, :inbox,
:shared_inbox, :shared_inbox,
:nickname, :nickname,
:public_key,
:avatar, :avatar,
:ap_enabled, :ap_enabled,
:banner, :banner,
@ -532,7 +530,6 @@ def update_changeset(struct, params \\ %{}) do
:name, :name,
:emoji, :emoji,
:avatar, :avatar,
:public_key,
:inbox, :inbox,
:shared_inbox, :shared_inbox,
:is_locked, :is_locked,

View file

@ -187,7 +187,7 @@ def get_or_fetch_by_key_id(key_id) do
def fetch_remote_key(key_id) do def fetch_remote_key(key_id) do
Logger.debug("Fetching remote key: #{key_id}") Logger.debug("Fetching remote key: #{key_id}")
# we should probably sign this, just in case # we should probably sign this, just in case
resp = Pleroma.Object.Fetcher.get_object(key_id) resp = Pleroma.Object.Fetcher.fetch_and_contain_remote_object_from_id(key_id)
case resp do case resp do
{:ok, _original_url, body} -> {:ok, _original_url, body} ->