mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-23 00:26:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'atom-leaks' into 'develop'

Browse source 
Fix minor atom leaks

See merge request pleroma/pleroma!4065
This commit is contained in:
feld 2024-02-14 23:28:00 +00:00
commit 802c618885
3 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
changelog.d/atom-leak.skip Normal file
View file

2
lib/pleroma/password/pbkdf2.ex
View file

@ -28,7 +28,7 @@ defmodule Pleroma.Password.Pbkdf2 do
iterations = String.to_integer(iterations) iterations = String.to_integer(iterations)
digest = String.to_atom(digest) digest = String.to_existing_atom(digest)
binary_hash = binary_hash =
KeyGenerator.generate(password, salt, digest: digest, iterations: iterations, length: 64) KeyGenerator.generate(password, salt, digest: digest, iterations: iterations, length: 64)

2
lib/pleroma/workers/background_worker.ex
View file

@ -28,7 +28,7 @@ defmodule Pleroma.Workers.BackgroundWorker do
def perform(%Job{args: %{"op" => op, "user_id" => user_id, "identifiers" => identifiers}}) def perform(%Job{args: %{"op" => op, "user_id" => user_id, "identifiers" => identifiers}})
when op in ["blocks_import", "follow_import", "mutes_import"] do when op in ["blocks_import", "follow_import", "mutes_import"] do
user = User.get_cached_by_id(user_id) user = User.get_cached_by_id(user_id)
{:ok, User.Import.perform(String.to_atom(op), user, identifiers)} {:ok, User.Import.perform(String.to_existing_atom(op), user, identifiers)}
end end
def perform(%Job{ def perform(%Job{