Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

fix(gateway): parse push relay hosts as binaries (#2989)

Hampus30ba55bd4d2d
diff --git a/fluxer_gateway/src/gateway/fluxer_gateway_config.erl b/fluxer_gateway/src/gateway/fluxer_gateway_config.erl
index 8fc2e34aa..cc55862f2 100644
--- a/fluxer_gateway/src/gateway/fluxer_gateway_config.erl
+++ b/fluxer_gateway/src/gateway/fluxer_gateway_config.erl
@@ -605,21 +605,18 @@ to_binary(_, Default) -> Default.
-spec parse_host_list(binary()) -> [binary()].
parse_host_list(Bin) ->
- parse_host_list(string:lexemes(binary_to_list(Bin), ", \t"), []).
-
--spec parse_host_list([string()], [binary()]) -> [binary()].
-parse_host_list([], Acc) ->
- lists:reverse(Acc);
-parse_host_list([Host | Rest], Acc) ->
- parse_host_list(Rest, [list_to_binary(lower_string(Host)) | Acc]).
-
--spec lower_string(string()) -> string().
-lower_string(Value) ->
- [lower_char(Char) || Char <- Value].
-
--spec lower_char(char()) -> char().
-lower_char(Char) when Char >= $A, Char =< $Z -> Char + 32;
-lower_char(Char) -> Char.
+ [
+ lower_ascii(Host)
+ || Host <- binary:split(Bin, [<<",">>, <<" ">>, <<"\t">>], [global, trim_all])
+ ].
+
+-spec lower_ascii(binary()) -> binary().
+lower_ascii(Bin) ->
+ <<<<(lower_byte(Byte))>> || <<Byte>> <= Bin>>.
+
+-spec lower_byte(byte()) -> byte().
+lower_byte(Byte) when Byte >= $A, Byte =< $Z -> Byte + 32;
+lower_byte(Byte) -> Byte.
-spec parse_node_list(binary() | undefined) -> [node()].
parse_node_list(undefined) ->