gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-12-13 12:12:42 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Allow username updates for Update Actor

Browse Source
This commit is contained in:
Angus McLeod 2024-05-23 18:44:30 +02:00
parent eb18e5df29
commit 24ac1c1204
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/activitypub/activity/update.rb
View File

@ -20,7 +20,7 @@ class ActivityPub::Activity::Update < ActivityPub::Activity
def update_account def update_account
return reject_payload! if @account.uri != object_uri return reject_payload! if @account.uri != object_uri
ActivityPub::ProcessAccountService.new.call(@account.username, @account.domain, @object, signed_with_known_key: true, request_id: @options[:request_id]) ActivityPub::ProcessAccountService.new.call(@account.username, @account.domain, @object, signed_with_known_key: true, request_id: @options[:request_id], allow_username_update: true)
end end
def update_status def update_status

7
app/services/activitypub/process_account_service.rb
View File

@ -27,7 +27,7 @@ class ActivityPub::ProcessAccountService < BaseService
@options[:request_id] ||= "#{Time.now.utc.to_i}-#{username}@#{domain}" @options[:request_id] ||= "#{Time.now.utc.to_i}-#{username}@#{domain}"
with_redis_lock("process_account:#{@uri}") do with_redis_lock("process_account:#{@uri}") do
@account = Account.remote.find_by(uri: @uri) if @options[:only_key] @account = Account.remote.find_by(uri: @uri) if find_remote_account_by_uri?
@account ||= Account.find_remote(@username, @domain) @account ||= Account.find_remote(@username, @domain)
@old_public_key = @account&.public_key @old_public_key = @account&.public_key
@old_protocol = @account&.protocol @old_protocol = @account&.protocol
@ -69,6 +69,10 @@ class ActivityPub::ProcessAccountService < BaseService
private private
def find_remote_account_by_uri?
@options[:only_key] || @options[:allow_username_update]
end
def create_account def create_account
@account = Account.new @account = Account.new
@account.protocol = :activitypub @account.protocol = :activitypub
@ -131,6 +135,7 @@ class ActivityPub::ProcessAccountService < BaseService
@account.indexable = @json['indexable'] || false @account.indexable = @json['indexable'] || false
@account.memorial = @json['memorial'] || false @account.memorial = @json['memorial'] || false
@account.attribution_domains = as_array(@json['attributionDomains'] || []).map { |item| value_or_id(item) } @account.attribution_domains = as_array(@json['attributionDomains'] || []).map { |item| value_or_id(item) }
@account.username = @json['preferredUsername'] if @options[:allow_username_update]
end end
def set_fetchable_key! def set_fetchable_key!

4
spec/requests/activitypub/inboxes_controller_spec.rb
View File

@ -178,10 +178,10 @@ RSpec.describe ActivityPub::InboxesController, :sidekiq_inline do
end.to(not_change { Account.count }) end.to(not_change { Account.count })
end end
it 'does not update the remote actors username' do it 'updates the remote actors username' do
post "/users/#{local_actor.username}/inbox", params: json.to_json, headers: headers post "/users/#{local_actor.username}/inbox", params: json.to_json, headers: headers
expect(response).to have_http_status(202) expect(response).to have_http_status(202)
expect(remote_actor.reload.username).to eq(remote_actor_original_username) expect(remote_actor.reload.username).to eq(remote_actor_new_username)
end end
end end
end end