Only assign NewServices once the duplicate check is done.

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

diff --git a/src/modules/extra/m_ssl_mbedtls.cpp b/src/modules/extra/m_ssl_mbedtls.cpp
index 628230d295ff88dd9e21780efd572edbce46153f..ecf4e660abe7a44b32ad6338df27f0f105935b27 100644 (file)
--- a/src/modules/extra/m_ssl_mbedtls.cpp
+++ b/src/modules/extra/m_ssl_mbedtls.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
+ *   Copyright (C) 2020 Matt Schatz <genius3000@g3k.solutions>
  *   Copyright (C) 2016-2020 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2016-2017 Attila Molnar <attilamolnar@hush.com>
  *
@@ -874,7 +874,7 @@ class ModuleSSLmbedTLS : public Module
                        // No <sslprofile> tags found, create a profile named "mbedtls" from settings in the <mbedtls> block
                        const std::string defname = "mbedtls";
                        ConfigTag* tag = ServerInstance->Config->ConfValue(defname);
-                       ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "No <sslprofile> tags found; using settings from the <mbedtls> tag");
+                       ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "No <sslprofile> tags found; using settings from the deprecated <mbedtls> tag");
 
                        try
                        {
@@ -886,32 +886,38 @@ class ModuleSSLmbedTLS : public Module
                                throw ModuleException("Error while initializing the default TLS (SSL) profile - " + ex.GetReason());
                        }
                }
-
-               for (ConfigIter i = tags.first; i != tags.second; ++i)
+               else
                {
-                       ConfigTag* tag = i->second;
-                       if (!stdalgo::string::equalsci(tag->getString("provider"), "mbedtls"))
-                               continue;
-
-                       std::string name = tag->getString("name");
-                       if (name.empty())
+                       ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "You have defined an <sslprofile> tag; you should use this in place of \"mbedtls\" when configuring TLS (SSL) connections in <bind:ssl> or <link:ssl>");
+                       for (ConfigIter i = tags.first; i != tags.second; ++i)
                        {
-                               ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Ignoring <sslprofile> tag without name at " + tag->getTagLocation());
-                               continue;
-                       }
+                               ConfigTag* tag = i->second;
+                               if (!stdalgo::string::equalsci(tag->getString("provider"), "mbedtls"))
+                               {
+                                       ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Ignoring non-mbedTLS <sslprofile> tag at " + tag->getTagLocation());
+                                       continue;
+                               }
 
-                       reference<mbedTLSIOHookProvider> prov;
-                       try
-                       {
-                               mbedTLS::Profile::Config profileconfig(name, tag, ctr_drbg);
-                               prov = new mbedTLSIOHookProvider(this, profileconfig);
-                       }
-                       catch (CoreException& ex)
-                       {
-                               throw ModuleException("Error while initializing TLS (SSL) profile \"" + name + "\" at " + tag->getTagLocation() + " - " + ex.GetReason());
-                       }
+                               std::string name = tag->getString("name");
+                               if (name.empty())
+                               {
+                                       ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Ignoring <sslprofile> tag without name at " + tag->getTagLocation());
+                                       continue;
+                               }
+
+                               reference<mbedTLSIOHookProvider> prov;
+                               try
+                               {
+                                       mbedTLS::Profile::Config profileconfig(name, tag, ctr_drbg);
+                                       prov = new mbedTLSIOHookProvider(this, profileconfig);
+                               }
+                               catch (CoreException& ex)
+                               {
+                                       throw ModuleException("Error while initializing TLS (SSL) profile \"" + name + "\" at " + tag->getTagLocation() + " - " + ex.GetReason());
+                               }
 
-                       newprofiles.push_back(prov);
+                               newprofiles.push_back(prov);
+                       }
                }
 
                // New profiles are ok, begin using them
@@ -939,7 +945,7 @@ class ModuleSSLmbedTLS : public Module
 
        void OnModuleRehash(User* user, const std::string &param) CXX11_OVERRIDE
        {
-               if (!irc::equals(param, "ssl"))
+               if (!irc::equals(param, "tls") && !irc::equals(param, "ssl"))
                        return;
 
                try