[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#64089: 30.0.50; `ldap-search' errors out with `wrong-type-argument l
From: |
Stefan Monnier |
Subject: |
bug#64089: 30.0.50; `ldap-search' errors out with `wrong-type-argument listp' when called WITHDN == t) |
Date: |
Fri, 16 Jun 2023 11:12:10 -0400 |
User-agent: |
Gnus/5.13 (Gnus v5.13) |
>>
>> (ldap-search "(uid=<uid>)"
>> "ldap://<host>"
>> '("mail")
>> nil
>> t)
>> => ((("dn" "cn=<NAME>,L=<REGION>,DC=<DOMAIN>,DC=COM") ("mail"
>> "<name>@<domain>.com")))
>>
>> I tried to make the patch as conservative as possible and intentionally
>> do not check syntax of the dn line if its parsing is not required.
>
>> @@ -703,7 +703,17 @@ ldap-search-internal
>> (while (progn
>> (skip-chars-forward " \t\n")
>> (not (eobp)))
>> - (setq dn (buffer-substring (point) (line-end-position)))
>> + ;; Ignore first (dn) line if WITHDN equals nil. If WITHDN
>> + ;; is non-nil, check syntax of the line and split it into a
>> + ;; pair as expected by `ldap-decode-attribute' (Bug#64089).
>> + ;; If the syntax is wrong, better throw an error here, since
>> + ;; otherwise `ldap-decode-attribute' would throw a much less
>> + ;; comprehensible error later.
>> + (cond ((not withdn))
>> + ((looking-at "^dn[=:\t ]+\\(.*\\)$")
>> + (setq dn (list "dn" (match-string 1))))
>> + (t (error "Incorrect dn line \"%s\" in ldapsearch result"
>> + (buffer-substring (point) (line-end-position)))))
>> (forward-line 1)
>> (while (looking-at "^\\([A-Za-z][-A-Za-z0-9]*\
>> \\|[0-9]+\\(?:\\.[0-9]+\\)*\\)\\(;[-A-Za-z0-9]+\\)*[=:\t ]+\
>
> Stefan, any comments?
I've no practical experience with LDAP and am not very knowledgeable
about `ldap.el`, so take my opinion with a large grain of MSG.
> I think this is okay for emacs-29; do you agree?
This looks fine to me, indeed. Just one thing: the regexp doesn't need
the `^`, right?
Stefan
- bug#64089: 30.0.50; `ldap-search' errors out with `wrong-type-argument listp' when called WITHDN == t, Jens Schmidt, 2023/06/15
- bug#64089: 30.0.50; `ldap-search' errors out with `wrong-type-argument listp' when called WITHDN == t, Filipp Gunbin, 2023/06/16
- bug#64089: 30.0.50; `ldap-search' errors out with `wrong-type-argument listp' when called WITHDN == t, Eli Zaretskii, 2023/06/17
- bug#64089: 30.0.50; `ldap-search' errors out with `wrong-type-argument listp' when called WITHDN == t, Eli Zaretskii, 2023/06/17
- bug#64089: 30.0.50; `ldap-search' errors out with `wrong-type-argument listp' when called WITHDN == t, Eli Zaretskii, 2023/06/17
- bug#64089: 30.0.50; `ldap-search' errors out with `wrong-type-argument listp' when called WITHDN == t, Filipp Gunbin, 2023/06/17
- bug#64089: 30.0.50; `ldap-search' errors out with `wrong-type-argument listp' when called WITHDN == t, Eli Zaretskii, 2023/06/18
- bug#64089: 30.0.50; `ldap-search' errors out with `wrong-type-argument listp' when called WITHDN == t, Filipp Gunbin, 2023/06/19
- bug#64089: 30.0.50; `ldap-search' errors out with `wrong-type-argument listp' when called WITHDN == t, Eli Zaretskii, 2023/06/19