It looks like your webui installation is broken.
" + "Run the following command to (re)install it:
" + "./i2pd --install /path/to/webui" + "
The webui folder should come with the binaries.
" + "" + ); + } + SendReply(); +} - std::string uri = m_Request.getUri(); - if(uri == "/") - uri = "index.html"; +std::string HTTPConnection::GetFileContents(const std::string& filename, bool preprocess) const +{ + boost::system::error_code e; - // Use canonical to avoid .. or . in path + // Use canonical to avoid .. or . in path const boost::filesystem::path address = boost::filesystem::canonical( - i2p::util::filesystem::GetWebuiDataDir() / uri, e + i2p::util::filesystem::GetWebuiDataDir() / filename, e ); const std::string address_str = address.string(); std::ifstream ifs(address_str); - if(e || !ifs || !isAllowed(address_str)) { - m_Reply = i2p::util::http::Response(404, ""); - return SendReply(); - } + if(e || !ifs || !isAllowed(address_str)) + throw std::runtime_error("Cannot load " + address_str + "."); std::string str; ifs.seekg(0, ifs.end); @@ -122,11 +137,27 @@ void HTTPConnection::HandleRequest() ifs.read(&str[0], str.size()); ifs.close(); - str = i2p::util::http::preprocessContent(str, address.parent_path().string()); - m_Reply = i2p::util::http::Response(200, str); + if(preprocess) + return i2p::util::http::preprocessContent(str, address.parent_path().string()); + else + return str; +} - m_Reply.setHeader("Content-Type", i2p::util::http::getMimeType(address_str)); - SendReply(); +void HTTPConnection::HandleRequest() +{ + + std::string uri = m_Request.getUri(); + if(uri == "/") + uri = "index.html"; + + try { + m_Reply = i2p::util::http::Response(200, GetFileContents(uri, true)); + m_Reply.setHeader("Content-Type", i2p::util::http::getMimeType(uri)); + SendReply(); + } catch(const std::runtime_error&) { + // Cannot open the file for some reason, send 404 + Send404Reply(); + } } void HTTPConnection::HandleI2PControlRequest() @@ -138,7 +169,7 @@ void HTTPConnection::HandleI2PControlRequest() SendReply(); } -bool HTTPConnection::isAllowed(const std::string& address) +bool HTTPConnection::isAllowed(const std::string& address) const { const std::size_t pos_dot = address.find_last_of('.'); const std::size_t pos_slash = address.find_last_of('/'); diff --git a/client/HTTPServer.h b/client/HTTPServer.h index d47cd700..a4209e2d 100644 --- a/client/HTTPServer.h +++ b/client/HTTPServer.h @@ -32,11 +32,18 @@ private: void HandleWriteReply(const boost::system::error_code& ecode); void SendReply(); + void Send404Reply(); + + /* + * @throw std::runtime_error when the file is not accessible + */ + std::string GetFileContents(const std::string& filename, bool preprocess) const; + void HandleRequest(); void HandleI2PControlRequest(); void ExtractParams(const std::string& str, std::map