Fix excessive snomask sending on fitler add/removal

[user/henk/code/inspircd.git] / src / modules / extra / m_ssl_openssl.cpp

diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index f2f2801b4bd8c4053510f38b2fa5e05ff6ce10eb..b38b5c96f35b1da5b541344764562ee351b8f5d2 100644 (file)
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -773,12 +773,13 @@ class ModuleSSLOpenSSL : public Module
                // protocol module has propagated the NICK message.
                if ((user->GetIOHook() == this) && (IS_LOCAL(user)))
                {
-                       // Tell whatever protocol module we're using that we need to inform other servers of this metadata NOW.
-                       ServerInstance->PI->SendMetaData(user, TYPE_USER, "ssl", "on");
-
-                       VerifyCertificate(&sessions[user->GetFd()], user);
+                       ssl_cert* certdata = VerifyCertificate(&sessions[user->GetFd()], user);
                        if (sessions[user->GetFd()].sess)
                                user->WriteServ("NOTICE %s :*** You are connected using SSL cipher \"%s\"", user->nick.c_str(), SSL_get_cipher(sessions[user->GetFd()].sess));
+
+                       ServerInstance->PI->SendMetaData(user, TYPE_USER, "ssl", "ON");
+                       if (certdata)
+                               ServerInstance->PI->SendMetaData(user, TYPE_USER, "ssl_cert", certdata->GetMetaLine().c_str());
                }
        }
 
@@ -822,10 +823,10 @@ class ModuleSSLOpenSSL : public Module
                errno = EIO;
        }
 
-       void VerifyCertificate(issl_session* session, Extensible* user)
+       ssl_cert* VerifyCertificate(issl_session* session, Extensible* user)
        {
                if (!session->sess || !user)
-                       return;
+                       return NULL;
 
                X509* cert;
                ssl_cert* certinfo = new ssl_cert;
@@ -839,41 +840,42 @@ class ModuleSSLOpenSSL : public Module
 
                if (!cert)
                {
-                       certinfo->data.insert(std::make_pair("error","Could not get peer certificate: "+std::string(get_error())));
-                       return;
+                       certinfo->error = "Could not get peer certificate: "+std::string(get_error());
+                       return certinfo;
                }
 
-               certinfo->data.insert(std::make_pair("invalid", SSL_get_verify_result(session->sess) != X509_V_OK ? ConvToStr(1) : ConvToStr(0)));
+               certinfo->invalid = (SSL_get_verify_result(session->sess) != X509_V_OK);
 
                if (SelfSigned)
                {
-                       certinfo->data.insert(std::make_pair("unknownsigner",ConvToStr(0)));
-                       certinfo->data.insert(std::make_pair("trusted",ConvToStr(1)));
+                       certinfo->unknownsigner = false;
+                       certinfo->trusted = true;
                }
                else
                {
-                       certinfo->data.insert(std::make_pair("unknownsigner",ConvToStr(1)));
-                       certinfo->data.insert(std::make_pair("trusted",ConvToStr(0)));
+                       certinfo->unknownsigner = true;
+                       certinfo->trusted = false;
                }
 
-               certinfo->data.insert(std::make_pair("dn",std::string(X509_NAME_oneline(X509_get_subject_name(cert),0,0))));
-               certinfo->data.insert(std::make_pair("issuer",std::string(X509_NAME_oneline(X509_get_issuer_name(cert),0,0))));
+               certinfo->dn = X509_NAME_oneline(X509_get_subject_name(cert),0,0);
+               certinfo->issuer = X509_NAME_oneline(X509_get_issuer_name(cert),0,0);
 
                if (!X509_digest(cert, digest, md, &n))
                {
-                       certinfo->data.insert(std::make_pair("error","Out of memory generating fingerprint"));
+                       certinfo->error = "Out of memory generating fingerprint";
                }
                else
                {
-                       certinfo->data.insert(std::make_pair("fingerprint",irc::hex(md, n)));
+                       certinfo->fingerprint = irc::hex(md, n);
                }
 
                if ((ASN1_UTCTIME_cmp_time_t(X509_get_notAfter(cert), ServerInstance->Time()) == -1) || (ASN1_UTCTIME_cmp_time_t(X509_get_notBefore(cert), ServerInstance->Time()) == 0))
                {
-                       certinfo->data.insert(std::make_pair("error","Not activated, or expired certificate"));
+                       certinfo->error = "Not activated, or expired certificate";
                }
 
                X509_free(cert);
+               return certinfo;
        }
 
        void Prioritize()