Refactor DN cleaning

lib/ee/gitlab/ldap/sync/proxy.rb

@@ -76,32 +76,32 @@ module EE
                 next
               end
 
-              # If there is more than one key/value set we must have a full DN,
-              # or at least the probability is higher.
-              if parsed_dn.count > 2
-                dn
-              elsif parsed_dn[0] == 'uid'
-                dn_for_uid(parsed_dn[1])
-              else
-                logger.warn { "Found potentially malformed/incomplete DN: '#{dn}'" }
-                dn
-              end
+              final_dn =
+                # If there is more than one key/value set we must have a full DN,
+                # or at least the probability is higher.
+                if parsed_dn.count > 2
+                  dn
+                elsif parsed_dn[0] == 'uid'
+                  dn_for_uid(parsed_dn[1])
+                else
+                  logger.warn { "Found potentially malformed/incomplete DN: '#{dn}'" }
+                  dn
+                end
+
+              clean_encoding(final_dn)
             end
 
             # Remove `nil` values generated by the rescue above.
             dns.compact!
-            clean_encoding(dns)
           end
 
           # net-ldap only returns ASCII-8BIT and does not support UTF-8 out-of-the-box:
           # https://github.com/ruby-ldap/ruby-net-ldap/issues/4
-          def clean_encoding(dns)
-            dns.map do |dn|
-              begin
-                dn.force_encoding('UTF-8')
-              rescue
-                dn
-              end
+          def clean_encoding(dn)
+            begin
+              dn.force_encoding('UTF-8')
+            rescue
+              dn
             end
           end