diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2018-02-18 11:54:40 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2018-02-18 11:54:40 +0300 |
| commit | 25abf8b63427370c278872de2bd00e74e04e36e7 (patch) | |
| tree | 0ef85eb3bfc8a2a17186c7e7b4216fd3899dae6e | |
| parent | ff06bdf144c089c5ff58207877027d96eb45b515 (diff) | |
Don't inject node name inside "id" attribute
Fixes #2284
| -rw-r--r-- | src/ejabberd_iq.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ejabberd_iq.erl b/src/ejabberd_iq.erl index 282ff7e15..2ac07e72a 100644 --- a/src/ejabberd_iq.erl +++ b/src/ejabberd_iq.erl @@ -144,7 +144,7 @@ noreply(#state{expire = Expire} = State) -> -spec encode_id(non_neg_integer(), binary()) -> binary(). encode_id(Expire, Rnd) -> ExpireBin = integer_to_binary(Expire), - Node = atom_to_binary(node(), utf8), + Node = ejabberd_cluster:node_id(), CheckSum = calc_checksum(<<ExpireBin/binary, Rnd/binary, Node/binary>>), <<"rr-", ExpireBin/binary, $-, Rnd/binary, $-, CheckSum/binary, $-, Node/binary>>. @@ -155,7 +155,7 @@ decode_id(<<"rr-", ID/binary>>) -> [Rnd, Rest] = binary:split(Tail, <<"-">>), [CheckSum, NodeBin] = binary:split(Rest, <<"-">>), CheckSum = calc_checksum(<<ExpireBin/binary, Rnd/binary, NodeBin/binary>>), - Node = erlang:binary_to_existing_atom(NodeBin, utf8), + Node = ejabberd_cluster:get_node_by_id(NodeBin), Expire = binary_to_integer(ExpireBin), {ok, Expire, Rnd, Node} catch _:{badmatch, _} -> |