psyc-mirrors
/
psyced
mirror of git://git.psyced.org/git/psyced
1
0
Fork 0
Code Issues 2 Releases Wiki Activity

cert name checks were buggy

This commit is contained in:
psyc://psyced.org/~lynX 2010-12-11 11:16:23 +01:00
parent c0f78670f7
commit f4e0f14b19
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
world/net/jabber/common.c
View File

@ -400,6 +400,7 @@ certificate_check_jabbername(name, cert) {
* id-on-xmppAddr/CN * id-on-xmppAddr/CN
* API Note: name MUST be an utf8 string * API Note: name MUST be an utf8 string
*/ */
unless(name) return 0;
name = NAMEPREP(name); name = NAMEPREP(name);
unless(cert && mappingp(cert)) return 0; unless(cert && mappingp(cert)) return 0;
if ((t = cert["2.5.29.17:1.3.6.1.5.5.7.8.5"])) { // id-on-xmppAddr if ((t = cert["2.5.29.17:1.3.6.1.5.5.7.8.5"])) { // id-on-xmppAddr
@ -408,7 +409,7 @@ certificate_check_jabbername(name, cert) {
D0( log_file("XMPP_AUTH", "\n%O try SASL external with id-on-xmppAddr", ME); ) D0( log_file("XMPP_AUTH", "\n%O try SASL external with id-on-xmppAddr", ME); )
# endif # endif
if (pointerp(t)) { if (pointerp(t)) {
if (member(t, name)) return 1; if (member(t, name) != -1) return 1;
foreach(string cn : t) { foreach(string cn : t) {
if (NAMEPREP(cn) == name) return 1; if (NAMEPREP(cn) == name) return 1;
} }
@ -439,7 +440,7 @@ certificate_check_jabbername(name, cert) {
D0( log_file("XMPP_AUTH", "\n%O try SASL external with CN", ME); ) D0( log_file("XMPP_AUTH", "\n%O try SASL external with CN", ME); )
# endif # endif
if (pointerp(t)) { // does that happen?! if (pointerp(t)) { // does that happen?!
if (member(t, name)) return 1; if (member(t, name) != -1) return 1;
foreach(string cn : t) { foreach(string cn : t) {
idn = NAMEPREP(idna_to_unicode(cn)); idn = NAMEPREP(idna_to_unicode(cn));
if (idn == name) return 1; if (idn == name) return 1;