From 735bad69e7393ff875295a53bef58e2773e0e448 Mon Sep 17 00:00:00 2001
From: Trenton Broughton <trenton42@users.noreply.github.com>
Date: Tue, 28 Aug 2018 05:32:30 -0400
Subject: [PATCH] PR #2345: Update escaping

The Ruby library provides a method to escape eq: `equals`

https://github.com/ruby-ldap/ruby-net-ldap/blob/d78dc1ed51480f52117fd8be431de4fe8790b70f/lib/net/ldap/filter.rb#L148-L150

No need to copy the escape method from that library here.

Also change the `get_groups` filter from a string literal to a `Net::LDAP::Filter`
---
 src/authm_mad/remotes/ldap/ldap_auth.rb | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/src/authm_mad/remotes/ldap/ldap_auth.rb b/src/authm_mad/remotes/ldap/ldap_auth.rb
index df5fe71dd0..6197f5bcca 100644
--- a/src/authm_mad/remotes/ldap/ldap_auth.rb
+++ b/src/authm_mad/remotes/ldap/ldap_auth.rb
@@ -131,7 +131,7 @@ class OpenNebula::LdapAuth
     end
 
     def find_user(name)
-        filter = Net::LDAP::Filter.eq(@options[:user_field], escape(name))
+        filter = Net::LDAP::Filter.equals(@options[:user_field], name)
 
         result = @ldap.search(
             :base       => @options[:base],
@@ -194,7 +194,7 @@ class OpenNebula::LdapAuth
                 end
             end
         else
-            filter = "(#{@options[:group_field]}=#{@user[@options[:user_group_field]].first})"
+            filter = Net::LDAP::Filter.equals(@options[:group_field], @user[@options[:user_group_field]].first)
             @ldap.search(
                 :base       => @options[:base],
                 :attributes => [ "dn" ],
@@ -209,23 +209,3 @@ class OpenNebula::LdapAuth
         groups.delete(false)
         groups.compact.uniq
     end
-
-private
-
-    # The escapes code has been copied from <net-ldap>/lib/net/ldap/filter.rb
-    FILTER_ESCAPES = {
-      "\0" => '00',
-      '*'  => '2A',
-      '('  => '28',
-      ')'  => '29',
-      '\\' => '5C',
-      '?'  => '3F',
-      '='  => '3D'
-    }
-
-    FILTER_ESCAPE_RE = Regexp.new("[" + FILTER_ESCAPES.keys.map { |e| Regexp.escape(e) }.join + "]")
-
-    def escape(string)
-      string.gsub(FILTER_ESCAPE_RE) { |char| "\\" + FILTER_ESCAPES[char] }
-    end
-end