2009-01-26 19:21:29 +00:00
|
|
|
#include <net.h> // vim syntax=lpc
|
2011-08-02 15:43:05 +00:00
|
|
|
#include <proto.h>
|
|
|
|
#include <sys/tls.h>
|
|
|
|
|
2009-01-26 19:21:29 +00:00
|
|
|
mapping tls_certificate(object who, int longnames) {
|
|
|
|
mixed *extra, extensions;
|
|
|
|
mapping cert;
|
|
|
|
int i, j;
|
|
|
|
|
|
|
|
cert = ([ ]);
|
|
|
|
#if __EFUN_DEFINED__(tls_check_certificate)
|
|
|
|
# ifdef WANT_S2S_SASL
|
|
|
|
# ifdef __psyclpc__
|
|
|
|
# if __EFUN_DEFINED__(enable_binary) // happens to be committed at the same time
|
|
|
|
extra = tls_check_certificate(who, 2);
|
|
|
|
# else
|
|
|
|
extra = tls_check_certificate(who, 1);
|
|
|
|
# endif
|
|
|
|
# else
|
|
|
|
extra = tls_check_certificate(who);
|
|
|
|
# endif
|
|
|
|
unless (extra && sizeof(extra) > 2) return 0;
|
|
|
|
cert[0] = extra[0];
|
|
|
|
if (sizeof(extra) >= 4)
|
|
|
|
cert[1] = extra[3];
|
|
|
|
|
|
|
|
extensions = extra[2];
|
|
|
|
extra = extra[1];
|
|
|
|
|
|
|
|
for (i = 0; i < sizeof(extra); i += 3) {
|
|
|
|
mixed t;
|
|
|
|
|
|
|
|
t = cert[extra[i]];
|
|
|
|
// THIS IS ALWAYS TRUE FOR DRIVER >= 3.3.712
|
|
|
|
// OTHERWISE YOU SHOULD NOT ENABLE S2S SASL. PERIOD.
|
|
|
|
if (sizeof(extra) > i+2) {
|
|
|
|
unless (t) {
|
|
|
|
cert[extra[i]] = extra[i+2];
|
|
|
|
} else if (stringp(t)) {
|
|
|
|
cert[extra[i]] = ({ t, extra[i+2] });
|
|
|
|
} else if (pointerp(t)) {
|
|
|
|
cert[extra[i]] += ({ extra[i+2] });
|
|
|
|
} else {
|
|
|
|
PT(("fippo says this should not happen but you know it always does! %O\n", ME))
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
PT(("fippo says this should not happen(2) but you know it always does! %O\n", ME))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (longnames) {
|
|
|
|
// set up short/long names
|
|
|
|
for (i = 0; i < sizeof(extra); i +=3) {
|
|
|
|
cert[extra[i+1]] = cert[extra[i]];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for (i = 0; i < sizeof(extensions); i += 3) {
|
|
|
|
string key, mkey;
|
|
|
|
mixed *val;
|
|
|
|
|
|
|
|
unless(extensions[i]) continue;
|
|
|
|
key = extensions[i];
|
|
|
|
val = extensions[i+2];
|
|
|
|
for (j = 0; j < sizeof(val); j += 3) {
|
|
|
|
mixed t;
|
|
|
|
|
|
|
|
mkey = key + ":" + val[j];
|
|
|
|
t = cert[mkey];
|
|
|
|
unless (t) {
|
|
|
|
cert[mkey] = val[j+2];
|
|
|
|
} else if (stringp(t)) {
|
|
|
|
cert[mkey] = ({ t, val[j+2] });
|
|
|
|
} else if (pointerp(t)) {
|
|
|
|
cert[mkey] += ({ val[j+2] });
|
|
|
|
} else {
|
|
|
|
// should not happen
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
# else
|
|
|
|
# echo No WANT_S2S_SASL ? You even have the right driver for it!
|
|
|
|
# endif
|
|
|
|
#else
|
|
|
|
# echo No tls_check_certificate available with this driver.
|
|
|
|
#endif
|
|
|
|
P2(("cert is %O\n", cert))
|
|
|
|
return cert;
|
|
|
|
}
|
2011-08-01 08:22:52 +00:00
|
|
|
|
|
|
|
// generalized variant of the old certificate_check_jabbername
|
|
|
|
// RFC 6125 describes the process in more detail
|
2011-08-03 11:38:00 +00:00
|
|
|
int tls_check_service_identity(string name, mixed cert, string scheme) {
|
2011-08-01 08:22:52 +00:00
|
|
|
mixed t;
|
|
|
|
string idn;
|
|
|
|
// FIXME: should probably be more careful about internationalized
|
|
|
|
// domain names - need testcases
|
|
|
|
#define WILDCARD_MATCH(thing) (strlen(thing) > 2 && thing[0] == '*' && thing[1] == '.' && trail(thing[2..], name))
|
|
|
|
/* this does not support wildcards if there is more than one
|
|
|
|
* id-on-xmppAddr/CN
|
|
|
|
* API Note: name MUST be an utf8 string
|
|
|
|
*/
|
|
|
|
unless(name && cert && mappingp(cert)) return 0;
|
|
|
|
|
|
|
|
name = NAMEPREP(name);
|
|
|
|
|
|
|
|
// subjectAlternativeName - dNSName
|
|
|
|
if ((t = cert["2.5.29.17:dNSName"])) {
|
|
|
|
if (stringp(t)) t = ({ t });
|
|
|
|
foreach(string t2 : t) {
|
|
|
|
t2 = NAMEPREP(t2);
|
|
|
|
if (name == t2 || WILDCARD_MATCH(t2))
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// subjectAlternativeName - SRV ID - FIXME
|
|
|
|
// unfortunately, the only ones I have encountered so far were ... unusable
|
2011-08-02 14:51:47 +00:00
|
|
|
// what they should like is "_psyc.name" - i.e. "_" + scheme + "." + name
|
|
|
|
// no wildcards probably
|
2011-08-01 08:22:52 +00:00
|
|
|
if ((t = cert["2.5.29.17:1.3.6.1.5.5.7.8.7"])) {
|
|
|
|
P2(("encountered SRVName, please tell fippo: %O\n", t))
|
|
|
|
}
|
|
|
|
|
|
|
|
// URI ID - FIXME
|
|
|
|
// not seen yet
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
// id-on-xmppAddr - have not seen them issued by anyone but
|
|
|
|
// startcom and those usually include dnsname, too
|
2011-08-03 11:38:00 +00:00
|
|
|
// utf8-encoded
|
2011-08-01 08:22:52 +00:00
|
|
|
if ((t = cert["2.5.29.17:1.3.6.1.5.5.7.8.5"])) {
|
|
|
|
if (pointerp(t)) {
|
|
|
|
if (member(t, name) != -1) return 1;
|
|
|
|
foreach(string cn : t) {
|
|
|
|
if (NAMEPREP(cn) == name) return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (name == NAMEPREP(t))
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
// commonName - deprecated to put the host here but...
|
|
|
|
// this is only to be checked if no subjectAlternativeName is present
|
|
|
|
if (!cert["2.5.29.17"] && (t = cert["2.5.4.3"])) { // common name
|
|
|
|
if (pointerp(t)) { // does that happen?! I don't think so...
|
|
|
|
// fast way - works for traditional hostnames
|
|
|
|
if (member(t, name) != -1) return 1;
|
|
|
|
|
|
|
|
// look for idn encoded stuff
|
|
|
|
foreach(string cn : t) {
|
2011-08-03 11:38:00 +00:00
|
|
|
#ifdef __IDNA__
|
2011-08-01 08:22:52 +00:00
|
|
|
idn = NAMEPREP(idna_to_unicode(cn));
|
2011-08-03 11:38:00 +00:00
|
|
|
#else
|
|
|
|
idn = NAMEPREP(cn);
|
|
|
|
#endif
|
2011-08-01 08:22:52 +00:00
|
|
|
if (idn == name) return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#ifdef __IDNA__
|
|
|
|
idn = NAMEPREP(idna_to_unicode(t));
|
|
|
|
#else
|
|
|
|
idn = NAMEPREP(t);
|
|
|
|
#endif
|
|
|
|
if (idn == name || WILDCARD_MATCH(idn))
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2011-08-02 15:43:05 +00:00
|
|
|
|
|
|
|
int tls_check_cipher(object sock, string scheme) {
|
|
|
|
string t;
|
|
|
|
mixed m = tls_query_connection_info(sock);
|
|
|
|
|
|
|
|
P3(("%O is using the %O cipher.\n", sock, m[TLS_CIPHER]))
|
|
|
|
// shouldn't our negotiation have ensured we have PFS?
|
|
|
|
|
|
|
|
if (stringp(t = m[TLS_CIPHER]) &&! abbrev("DHE", t)) {
|
|
|
|
monitor_report("_warning_circuit_encryption_cipher_details",
|
|
|
|
object_name(sock) +" · using "+ t +" cipher");
|
|
|
|
// we can't expect that degree of privacy from jabber, for now
|
|
|
|
if (scheme != "xmpp") return 0;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|