Improve SSL fingerprint on link message

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / utils.cpp

diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index 0b9b8da3bb78834ed8b0ec3c2a01da0afab105f4..ab057570a3a2f32655d3a25fd60882e556d0c48b 100644 (file)
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -29,34 +29,19 @@ ModResult ModuleSpanningTree::OnAcceptConnection(int newsock, ListenSocket* from
        if (from->bind_tag->getString("type") != "servers")
                return MOD_RES_PASSTHRU;
 
-       bool found = false;
-       int port;
-       std::string incomingip;
-       irc::sockets::satoap(*client, incomingip, port);
+       std::string incomingip = client->addr();
 
-       found = (std::find(Utils->ValidIPs.begin(), Utils->ValidIPs.end(), incomingip) != Utils->ValidIPs.end());
-       if (!found)
+       for (std::vector<std::string>::iterator i = Utils->ValidIPs.begin(); i != Utils->ValidIPs.end(); i++)
        {
-               for (std::vector<std::string>::iterator i = Utils->ValidIPs.begin(); i != Utils->ValidIPs.end(); i++)
+               if (*i == "*" || *i == incomingip || irc::sockets::cidr_mask(*i).match(*client))
                {
-                       if (*i == "*" || irc::sockets::MatchCIDR(incomingip, *i))
-                       {
-                               found = true;
-                               break;
-                       }
-               }
-
-               if (!found)
-               {
-                       ServerInstance->SNO->WriteToSnoMask('l', "Server connection from %s denied (no link blocks with that IP address)", incomingip.c_str());
-                       return MOD_RES_DENY;
+                       /* we don't need to do anything with the pointer, creating it stores it in the necessary places */
+                       new TreeSocket(Utils, newsock, from, client, server);
+                       return MOD_RES_ALLOW;
                }
        }
-
-       /* we don't need to do anything with the pointer, creating it stores it in the necessary places */
-
-       new TreeSocket(Utils, newsock, from, client, server);
-       return MOD_RES_ALLOW;
+       ServerInstance->SNO->WriteToSnoMask('l', "Server connection from %s denied (no link blocks with that IP address)", incomingip.c_str());
+       return MOD_RES_DENY;
 }
 
 /** Yay for fast searches!
@@ -147,8 +132,6 @@ SpanningTreeUtilities::SpanningTreeUtilities(ModuleSpanningTree* C) : Creator(C)
        ServerInstance->Logs->Log("m_spanningtree",DEBUG,"***** Using SID for hash: %s *****", ServerInstance->Config->GetSID().c_str());
 
        this->TreeRoot = new TreeServer(this, ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc, ServerInstance->Config->GetSID());
-       ServerUser = new FakeUser(TreeRoot->GetID());
-
        this->ReadConfiguration();
 }
 
@@ -165,9 +148,13 @@ CullResult SpanningTreeUtilities::cull()
                }
        }
 
-       ServerUser->uuid = TreeRoot->GetID();
-       ServerUser->cull();
-       delete ServerUser;
+       for(std::map<TreeSocket*, std::pair<std::string, int> >::iterator i = timeoutlist.begin(); i != timeoutlist.end(); ++i)
+       {
+               TreeSocket* s = i->first;
+               ServerInstance->GlobalCulls.AddItem(s);
+       }
+       TreeRoot->cull();
+
        return classbase::cull();
 }
 
@@ -384,8 +371,8 @@ void SpanningTreeUtilities::ReadConfiguration()
                L->AllowMask = tag->getString("allowmask");
                L->IPAddr = tag->getString("ipaddr");
                L->Port = tag->getInt("port");
-               L->SendPass = tag->getString("sendpass");
-               L->RecvPass = tag->getString("recvpass");
+               L->SendPass = tag->getString("sendpass", tag->getString("password"));
+               L->RecvPass = tag->getString("recvpass", tag->getString("password"));
                L->Fingerprint = tag->getString("fingerprint");
                L->HiddenFromStats = tag->getBool("statshidden");
                L->Timeout = tag->getInt("timeout");
@@ -399,6 +386,15 @@ void SpanningTreeUtilities::ReadConfiguration()
                if (L->Name.length() > 64)
                        throw CoreException("The link name '"+assign(L->Name)+"' is longer than 64 characters!");
 
+               if (L->Fingerprint.find(':') != std::string::npos)
+               {
+                       std::string tmp = L->Fingerprint;
+                       L->Fingerprint.clear();
+                       for(unsigned int j=0; j < tmp.length(); j++)
+                               if (tmp[j] != ':')
+                                       L->Fingerprint.push_back(tmp[j]);
+               }
+
                if ((!L->IPAddr.empty()) && (!L->RecvPass.empty()) && (!L->SendPass.empty()) && (!L->Name.empty()) && (L->Port))
                {
                        ValidIPs.push_back(L->IPAddr);