Merge pull request #4331 from esl/fix-ldap-dialyzer

Fix ldap dialyzer warnings on Erlang 27
esl · Jul 25, 2024 · 08dc34c · 08dc34c
2 parents 7dbbbdb + 2ce02e3
commit 08dc34c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/src/eldap_filter_yecc.yrl b/src/eldap_filter_yecc.yrl
@@ -54,7 +54,7 @@ Erlang code.
 
 'and'(Value)                -> eldap:'and'(eldap_utils:maybe_b2list(Value)).
 'or'(Value)                 -> eldap:'or'(eldap_utils:maybe_b2list(Value)).
-'not'(Value)                -> eldap:'not'(eldap_utils:maybe_b2list(Value)).
+'not'(Value)                -> eldap:'not'(Value).
 equal(Desc, Value)          -> eldap:equalityMatch(Desc, eldap_utils:maybe_b2list(Value)).
 approx(Desc, Value)         -> eldap:approxMatch(Desc, eldap_utils:maybe_b2list(Value)).
 greater(Desc, Value)        -> eldap:greaterOrEqual(Desc, eldap_utils:maybe_b2list(Value)).
@@ -68,4 +68,4 @@ final(Value)                -> {final, eldap_utils:maybe_b2list(Value)}.
 xattr(Value)                -> {type, eldap_utils:maybe_b2list(Value)}.
 matchingrule(Value)         -> {matchingRule, eldap_utils:maybe_b2list(Value)}.
 value_of(Token)             -> iolist_to_binary(element(3, Token)).
-flatten(List)               -> lists:flatten(List).
+flatten(List)               -> lists:flatten(List).
diff --git a/src/eldap_utils.erl b/src/eldap_utils.erl
@@ -191,7 +191,7 @@ match_filter_name({<<"%u">>, [Value | _]}, NewUIDs) when Value /= <<"">> ->
   end;
 match_filter_name({Name, [Value | _]}, _NewUIDs) when Value /= <<"">> ->
   case binary:match(Value, <<"*">>) of
-    nomatch -> [eldap:equalityMatch(Name, Value)];
+    nomatch -> [eldap:equalityMatch(maybe_b2list(Name), maybe_b2list(Value))];
     _ -> [eldap:substrings(maybe_b2list(Name),
       generate_substring_list(Value))]
   end;

diff --git a/src/mongoose_ldap_worker.erl b/src/mongoose_ldap_worker.erl
@@ -72,18 +72,23 @@ call_eldap(Request, State) ->
             {Result, State}
     end.
 
+connect_opts(State = #{port := Port,
+                       root_dn := RootDN,
+                       password := Password}) ->
+    AnonAuth = RootDN =:= <<>> andalso Password =:= <<>>,
+    SSLConfig = case State of
+                    #{tls := TLSOptions} -> [{sslopts, just_tls:make_ssl_opts(TLSOptions)}];
+                    #{} -> []
+                end,
+    [{port, Port}, {anon_auth, AnonAuth}] ++ SSLConfig.
+
 connect(State = #{handle := none,
                   servers := Servers,
                   port := Port,
                   root_dn := RootDN,
                   password := Password,
                   connect_interval := ConnectInterval}) ->
-    AnonAuth = RootDN =:= <<>> andalso Password =:= <<>>,
-    SSLConfig = case State of
-                    #{tls := TLSOptions} -> [{sslopts, just_tls:make_ssl_opts(TLSOptions)}];
-                    #{} -> []
-                end,
-    case eldap:open(Servers, [{port, Port}, {anon_auth, AnonAuth}] ++ SSLConfig) of
+    case eldap:open(Servers, connect_opts(State)) of
         {ok, Handle} ->
             case eldap:simple_bind(Handle, RootDN, Password) of
                 ok ->