diff options
| -rw-r--r-- | src/modules/extra/m_ssl_gnutls.cpp | 6 | ||||
| -rw-r--r-- | src/modules/extra/m_ssl_openssl.cpp | 105 |
2 files changed, 50 insertions, 61 deletions
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 7b4b68694..5d8ae98d7 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -41,7 +41,7 @@ enum issl_status { ISSL_NONE, ISSL_HANDSHAKING_READ, ISSL_HANDSHAKING_WRITE, ISSL_HANDSHAKEN, ISSL_CLOSING, ISSL_CLOSED }; -bool isin(std::string hostandport, const std::vector<std::string> &portlist) +bool isin(const std::string &hostandport, const std::vector<std::string> &portlist) { return std::find(portlist.begin(), portlist.end(), hostandport) != portlist.end(); } @@ -181,6 +181,9 @@ class ModuleSSLGnuTLS : public Module } } + if (!sslports.empty()) + sslports.erase(sslports.end() - 1); + if(param != "ssl") { delete Conf; @@ -316,7 +319,6 @@ class ModuleSSLGnuTLS : public Module virtual void OnHookUserIO(User* user, const std::string &targetip) { - ServerInstance->Logs->Log("m_ssl_gnutls", DEBUG, "*** OnHookUserIO, target IP = %s", targetip.c_str()); if (!user->io && isin(targetip+":"+ConvToStr(user->GetPort()),listenports)) { /* Hook the user with our module */ diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp index ba32c4013..45b88b4c4 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -46,13 +46,9 @@ enum issl_io_status { ISSL_WRITE, ISSL_READ }; static bool SelfSigned = false; -bool isin(int port, const std::vector<int> &portlist) +bool isin(const std::string &hostandport, const std::vector<std::string> &portlist) { - for(unsigned int i = 0; i < portlist.size(); i++) - if(portlist[i] == port) - return true; - - return false; + return std::find(portlist.begin(), portlist.end(), hostandport) != portlist.end(); } char* get_error() @@ -102,7 +98,7 @@ static int OnVerify(int preverify_ok, X509_STORE_CTX *ctx) class ModuleSSLOpenSSL : public Module { - std::vector<int> listenports; + std::vector<std::string> listenports; int inbufsize; issl_session sessions[MAX_DESCRIPTORS]; @@ -154,9 +150,9 @@ class ModuleSSLOpenSSL : public Module ServerInstance->Modules->Attach(eventlist, this, 16); } - virtual void OnHookUserIO(User* user) + virtual void OnHookUserIO(User* user, const std::string &targetip) { - if (!user->io && isin(user->GetPort(), listenports)) + if (!user->io && isin(targetip + ":" + ConvToStr(user->GetPort()), listenports)) { /* Hook the user with our module */ user->io = this; @@ -167,51 +163,43 @@ class ModuleSSLOpenSSL : public Module { ConfigReader Conf(ServerInstance); - for (unsigned int i = 0; i < listenports.size(); i++) - { - ServerInstance->Config->DelIOHook(listenports[i]); - } - - listenports.clear(); - clientactive = 0; - sslports.clear(); - - for (int index = 0; index < Conf.Enumerate("bind"); index++) - { - // For each <bind> tag - std::string x = Conf.ReadValue("bind", "type", index); - if (((x.empty()) || (x == "clients")) && (Conf.ReadValue("bind", "ssl", index) == "openssl")) - { - // Get the port we're meant to be listening on with SSL - std::string port = Conf.ReadValue("bind", "port", index); - irc::portparser portrange(port, false); - long portno = -1; - while ((portno = portrange.GetToken())) - { - clientactive++; - try - { - if (ServerInstance->Config->AddIOHook(portno, this)) - { - listenports.push_back(portno); - for (size_t i = 0; i < ServerInstance->Config->ports.size(); i++) - if (ServerInstance->Config->ports[i]->GetPort() == portno) - ServerInstance->Config->ports[i]->SetDescription("ssl"); - ServerInstance->Logs->Log("m_ssl_openssl",DEFAULT, "m_ssl_openssl.so: Enabling SSL for port %d", portno); - sslports.append("*:").append(ConvToStr(portno)).append(";"); - } - else - { - ServerInstance->Logs->Log("m_ssl_openssl",DEFAULT, "m_ssl_openssl.so: FAILED to enable SSL on port %d, maybe you have another ssl or similar module loaded?", portno); - } - } - catch (ModuleException &e) - { - ServerInstance->Logs->Log("m_ssl_openssl",DEFAULT, "m_ssl_openssl.so: FAILED to enable SSL on port %d: %s. Maybe it's already hooked by the same port on a different IP, or you have another SSL or similar module loaded?", portno, e.GetReason()); - } - } - } - } + listenports.clear(); + clientactive = 0; + sslports.clear(); + + for(int index = 0; index < Conf.Enumerate("bind"); index++) + { + // For each <bind> tag + std::string x = Conf.ReadValue("bind", "type", index); + if(((x.empty()) || (x == "clients")) && (Conf.ReadValue("bind", "ssl", index) == "openssl")) + { + // Get the port we're meant to be listening on with SSL + std::string port = Conf.ReadValue("bind", "port", index); + std::string addr = Conf.ReadValue("bind", "address", index); + + irc::portparser portrange(port, false); + long portno = -1; + while ((portno = portrange.GetToken())) + { + clientactive++; + try + { + listenports.push_back(addr + ":" + ConvToStr(portno)); + + for (size_t i = 0; i < ServerInstance->Config->ports.size(); i++) + if ((ServerInstance->Config->ports[i]->GetPort() == portno) && (ServerInstance->Config->ports[i]->GetIP() == addr)) + ServerInstance->Config->ports[i]->SetDescription("ssl"); + ServerInstance->Logs->Log("m_ssl_openssl",DEFAULT, "m_ssl_gnutls.so: Enabling SSL for port %d", portno); + + sslports.append((addr.empty() ? "*" : addr)).append(":").append(ConvToStr(portno)).append(";"); + } + catch (ModuleException &e) + { + ServerInstance->Logs->Log("m_ssl_openssl",DEFAULT, "m_ssl_gnutls.so: FAILED to enable SSL on port %d: %s. Maybe it's already hooked by the same port on a different IP, or you have an other SSL or similar module loaded?", portno, e.GetReason()); + } + } + } + } if (!sslports.empty()) sslports.erase(sslports.end() - 1); @@ -316,13 +304,13 @@ class ModuleSSLOpenSSL : public Module { User* user = (User*)item; - if (user->GetExt("ssl", dummy) && IS_LOCAL(user) && isin(user->GetPort(), listenports)) + if (user->GetExt("ssl", dummy) && IS_LOCAL(user) && user->io == this) { // User is using SSL, they're a local user, and they're using one of *our* SSL ports. // Potentially there could be multiple SSL modules loaded at once on different ports. User::QuitUser(ServerInstance, user, "SSL module unloading"); } - if (user->GetExt("ssl_cert", dummy) && isin(user->GetPort(), listenports)) + if (user->GetExt("ssl_cert", dummy)) { ssl_cert* tofree; user->GetExt("ssl_cert", tofree); @@ -340,9 +328,8 @@ class ModuleSSLOpenSSL : public Module { for(unsigned int i = 0; i < listenports.size(); i++) { - ServerInstance->Config->DelIOHook(listenports[i]); for (size_t j = 0; j < ServerInstance->Config->ports.size(); j++) - if (ServerInstance->Config->ports[j]->GetPort() == listenports[i]) + if (listenports[i] == (ServerInstance->Config->ports[j]->GetIP()+":"+ConvToStr(ServerInstance->Config->ports[j]->GetPort()))) ServerInstance->Config->ports[j]->SetDescription("plaintext"); } } @@ -684,7 +671,7 @@ class ModuleSSLOpenSSL : public Module return; // Bugfix, only send this numeric for *our* SSL users - if (dest->GetExt("ssl", dummy) || (IS_LOCAL(dest) && isin(dest->GetPort(), listenports))) + if (dest->GetExt("ssl", dummy) || ((IS_LOCAL(dest) && dest->io == this))) { ServerInstance->SendWhoisLine(source, dest, 320, "%s %s :is using a secure connection", source->nick, dest->nick); } |