X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_http_client.cpp;h=7e1b94f11f04f36eb784931bc6583cfa0dc5a19f;hb=df4f0dc888a2a24e7f8b42a1c21670679e633506;hp=7e929a8c5440da4536a258bf0b20c4ec04e40dec;hpb=bcdacaac9b1c345acb0b93039c34d3ab29a278a4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_http_client.cpp b/src/modules/m_http_client.cpp index 7e929a8c5..7e1b94f11 100644 --- a/src/modules/m_http_client.cpp +++ b/src/modules/m_http_client.cpp @@ -2,20 +2,15 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -/* Written by Special (john@yarbbles.com) */ - #include "inspircd.h" #include "httpclient.h" @@ -59,18 +54,16 @@ class HTTPResolver : public Resolver public: HTTPResolver(HTTPSocket *socket, InspIRCd *Instance, const string &hostname, bool &cached, Module* me) : Resolver(Instance, hostname, DNS_QUERY_FORWARD, cached, me), socket(socket) { - ServerInstance->Log(DEBUG,"Resolving "+hostname); } - void OnLookupComplete(const string &result, unsigned int ttl, bool cached) + void OnLookupComplete(const string &result, unsigned int ttl, bool cached, int resultnum = 0) { - ServerInstance->Log(DEBUG,"Resolver done"); - socket->Connect(result); + if (!resultnum) + socket->Connect(result); } void OnError(ResolverError e, const string &errmsg) { - ServerInstance->Log(DEBUG,"Resolver error"); delete socket; } }; @@ -83,7 +76,7 @@ class ModuleHTTPClient : public Module HTTPList sockets; ModuleHTTPClient(InspIRCd *Me) - : Module::Module(Me) + : Module(Me) { } @@ -145,18 +138,19 @@ bool HTTPSocket::DoRequest(HTTPClientRequest *req) */ this->req = *req; - Instance->Log(DEBUG,"Request in progress"); - if (!ParseURL(this->req.GetURL())) - { - Instance->Log(DEBUG,"Parse failed"); return false; - } this->port = url.port; strlcpy(this->host, url.domain.c_str(), MAXBUF); - if (insp_aton(this->host, &this->addy) < 1) + in_addr addy1; +#ifdef IPV6 + in6_addr addy2; + if ((inet_aton(this->host, &addy1) > 0) || (inet_pton(AF_INET6, this->host, &addy2) > 0)) +#else + if (inet_aton(this->host, &addy1) > 0) +#endif { bool cached; HTTPResolver* r = new HTTPResolver(this, Server, url.domain, cached, (Module*)Mod); @@ -175,65 +169,79 @@ bool HTTPSocket::ParseURL(const std::string &iurl) { url.url = iurl; url.port = 80; + url.protocol = "http"; - Instance->Log(DEBUG,"Parse: "+iurl); + irc::sepstream tokenizer(iurl, '/'); - // Tokenize by slashes (protocol:, blank, domain, request..) - int pos = 0, pstart = 0, pend = 0; - - for (;;) + for (int p = 0;; p++) { - pend = url.url.find('/', pstart); - string part = url.url.substr(pstart, pend); - - switch (pos) + std::string part = tokenizer.GetToken(); + if (part.empty() && tokenizer.StreamEnd()) + break; + + if ((p == 0) && (part[part.length() - 1] == ':')) { - case 0: - Instance->Log(DEBUG,"PART 0: "+part); - // Protocol - if (part[part.length()-1] != ':') - return false; - url.protocol = part.substr(0, part.length() - 1); - break; - case 1: - // Empty, skip - break; - case 2: - Instance->Log(DEBUG,"PART 2: "+part); - // User and password (user:pass@) - string::size_type aend = part.find('@', 0); - if (aend != string::npos) + // Protocol ('http:') + url.protocol = part.substr(0, part.length() - 1); + } + else if ((p == 1) && (part.empty())) + { + continue; + } + else if (url.domain.empty()) + { + // Domain part: [user[:pass]@]domain[:port] + std::string::size_type usrpos = part.find('@'); + if (usrpos != std::string::npos) + { + // Have a user (and possibly password) part + std::string::size_type ppos = part.find(':'); + if ((ppos != std::string::npos) && (ppos < usrpos)) { - // Technically, it is valid to not have a password (username@domain) - string::size_type usrend = part.find(':', 0); - - if ((usrend != string::npos) && (usrend < aend)) - url.password = part.substr(usrend + 1, aend); - else - usrend = aend; - - url.username = part.substr(0, usrend); + // Have password too + url.password = part.substr(ppos + 1, usrpos - ppos - 1); + url.username = part.substr(0, ppos); } else - aend = 0; - - // Port (:port) - string::size_type dend = part.find(':', aend); - if (dend != string::npos) - url.port = atoi(part.substr(dend + 1).c_str()); - - // Domain - url.domain = part.substr(aend + 1, dend); + { + url.username = part.substr(0, usrpos); + } - // The rest of the string is the request - url.request = url.url.substr(pend); - break; + part = part.substr(usrpos + 1); + } + + std::string::size_type popos = part.rfind(':'); + if (popos != std::string::npos) + { + url.port = atoi(part.substr(popos + 1).c_str()); + url.domain = part.substr(0, popos); + } + else + { + url.domain = part; + } } - - if (pos++ == 2) - break; + else + { + // Request (part of it).. + url.request.append("/"); + url.request.append(part); + } + } + + if (url.request.empty()) + url.request = "/"; - pstart = pend + 1; + if ((url.domain.empty()) || (!url.port) || (url.protocol.empty())) + { + Instance->Log(DEFAULT, "Invalid URL (%s): Missing required value", iurl.c_str()); + return false; + } + + if (url.protocol != "http") + { + Instance->Log(DEFAULT, "Invalid URL (%s): Unsupported protocol '%s'", iurl.c_str(), url.protocol.c_str()); + return false; } return true; @@ -295,13 +303,10 @@ bool HTTPSocket::OnDataReady() { this->status = HTTP_DATA; this->data += this->buffer; - this->buffer = ""; + this->buffer.clear(); break; } -// while ((line = buffer.sstrstr(data, "\r\n")) != NULL) -// { -// if (strncmp(data, "\r\n", 2) == 0) - + if (this->status == HTTP_REQSENT) { // HTTP reply (HTTP/1.1 200 msg) @@ -314,22 +319,16 @@ bool HTTPSocket::OnDataReady() if ((pos = line.find(':')) != std::string::npos) { - -// char *hdata = strchr(data, ':'); - -// if (!hdata) -// continue; - -// *hdata = '\0'; - -// response->AddHeader(data, hdata + 2); response->AddHeader(line.substr(0, pos), line.substr(pos + 1)); - -// data = lend + 2; - } else + } + else + { continue; + } } - } else { + } + else + { this->data += data; } return true; @@ -345,24 +344,4 @@ void HTTPSocket::OnClose() delete response; } -class ModuleHTTPClientFactory : public ModuleFactory -{ - public: - ModuleHTTPClientFactory() - { - } - - ~ModuleHTTPClientFactory() - { - } - - Module *CreateModule(InspIRCd* Me) - { - return new ModuleHTTPClient(Me); - } -}; - -extern "C" void *init_module(void) -{ - return new ModuleHTTPClientFactory; -} +MODULE_INIT(ModuleHTTPClient)