forked from monero-project/monero
Merge pull request #1744
release-v0.11.0.0a5a0a3c8
core: updates can now be downloaded (and SHA256 hash checked) (moneromooo-monero)216f062e
util: add a SHA256 function (moneromooo-monero)4bf78492
mlog: only silence errors for net by default, not net.* (moneromooo-monero)d282cfcc
core: test key images against validity domain (moneromooo-monero)efb72e74
http_client: add a couple consts (moneromooo-monero)f640512c
Optionally query moneropulse DNS records to check for updates (moneromooo-monero)e3cae4ae
core: display any fork warning at startup too (moneromooo-monero)969ad710
dns_utils: fix first checked DNS entry being ignored (moneromooo-monero)08c3f380
util: add a vercmp function to compare version numbers (moneromooo-monero)e8a7525c
dns_utils: factor TXT record loading code from checkpoint code (moneromooo-monero)
commit
d11dbe7dc2
@ -0,0 +1,138 @@
|
||||
// Copyright (c) 2017, The Monero Project
|
||||
//
|
||||
// All rights reserved.
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without modification, are
|
||||
// permitted provided that the following conditions are met:
|
||||
//
|
||||
// 1. Redistributions of source code must retain the above copyright notice, this list of
|
||||
// conditions and the following disclaimer.
|
||||
//
|
||||
// 2. Redistributions in binary form must reproduce the above copyright notice, this list
|
||||
// of conditions and the following disclaimer in the documentation and/or other
|
||||
// materials provided with the distribution.
|
||||
//
|
||||
// 3. Neither the name of the copyright holder nor the names of its contributors may be
|
||||
// used to endorse or promote products derived from this software without specific
|
||||
// prior written permission.
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
|
||||
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
||||
// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
|
||||
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#include <string>
|
||||
#include <boost/filesystem.hpp>
|
||||
#include <boost/asio.hpp>
|
||||
#include <boost/thread/thread.hpp>
|
||||
#include "cryptonote_config.h"
|
||||
#include "include_base_utils.h"
|
||||
#include "net/http_client.h"
|
||||
#include "download.h"
|
||||
|
||||
#undef MONERO_DEFAULT_LOG_CATEGORY
|
||||
#define MONERO_DEFAULT_LOG_CATEGORY "net.dl"
|
||||
|
||||
namespace tools
|
||||
{
|
||||
static bool download_thread(const std::string &path, const std::string &url)
|
||||
{
|
||||
try
|
||||
{
|
||||
MINFO("Downloading " << url << " to " << path);
|
||||
std::ofstream f;
|
||||
f.open(path, std::ios_base::binary | std::ios_base::out | std::ios_base::trunc);
|
||||
if (!f.good()) {
|
||||
MERROR("Failed to open file " << path);
|
||||
return false;
|
||||
}
|
||||
class download_client: public epee::net_utils::http::http_simple_client
|
||||
{
|
||||
public:
|
||||
download_client(std::ofstream &f): f(f) {}
|
||||
virtual ~download_client() { f.close(); }
|
||||
virtual bool handle_target_data(std::string &piece_of_transfer)
|
||||
{
|
||||
try
|
||||
{
|
||||
f << piece_of_transfer;
|
||||
return f.good();
|
||||
}
|
||||
catch (const std::exception &e)
|
||||
{
|
||||
MERROR("Error writing data: " << e.what());
|
||||
return false;
|
||||
}
|
||||
}
|
||||
private:
|
||||
std::ofstream &f;
|
||||
} client(f);
|
||||
epee::net_utils::http::url_content u_c;
|
||||
if (!epee::net_utils::parse_url(url, u_c))
|
||||
{
|
||||
MWARNING("Failed to parse URL " << url);
|
||||
return false;
|
||||
}
|
||||
if (u_c.host.empty())
|
||||
{
|
||||
MWARNING("Failed to determine address from URL " << url);
|
||||
return false;
|
||||
}
|
||||
uint16_t port = u_c.port ? u_c.port : 80;
|
||||
MDEBUG("Connecting to " << u_c.host << ":" << port);
|
||||
client.set_server(u_c.host, std::to_string(port), boost::none);
|
||||
if (!client.connect(std::chrono::seconds(30)))
|
||||
{
|
||||
MERROR("Failed to connect to " << url);
|
||||
return false;
|
||||
}
|
||||
MDEBUG("GETting " << u_c.uri);
|
||||
const epee::net_utils::http::http_response_info *info = NULL;
|
||||
if (!client.invoke_get(u_c.uri, std::chrono::seconds(30), "", &info))
|
||||
{
|
||||
MERROR("Failed to connect to " << url);
|
||||
client.disconnect();
|
||||
return false;
|
||||
}
|
||||
if (!info)
|
||||
{
|
||||
MERROR("Failed invoking GET command to " << url << ", no status info returned");
|
||||
client.disconnect();
|
||||
return false;
|
||||
}
|
||||
MDEBUG("response code: " << info->m_response_code);
|
||||
MDEBUG("response comment: " << info->m_response_comment);
|
||||
MDEBUG("response body: " << info->m_body);
|
||||
for (const auto &f: info->m_additional_fields)
|
||||
MDEBUG("additional field: " << f.first << ": " << f.second);
|
||||
if (info->m_response_code != 200)
|
||||
{
|
||||
MERROR("Status code " << info->m_response_code);
|
||||
client.disconnect();
|
||||
return false;
|
||||
}
|
||||
client.disconnect();
|
||||
f.close();
|
||||
MDEBUG("Download complete");
|
||||
return true;
|
||||
}
|
||||
catch (const std::exception &e)
|
||||
{
|
||||
MERROR("Exception in download thread: " << e.what());
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
bool download(const std::string &path, const std::string &url)
|
||||
{
|
||||
bool success;
|
||||
std::unique_ptr<boost::thread> thread(new boost::thread([&](){ success = download_thread(path, url); }));
|
||||
thread->join();
|
||||
return success;
|
||||
}
|
||||
}
|
@ -0,0 +1,36 @@
|
||||
// Copyright (c) 2017, The Monero Project
|
||||
//
|
||||
// All rights reserved.
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without modification, are
|
||||
// permitted provided that the following conditions are met:
|
||||
//
|
||||
// 1. Redistributions of source code must retain the above copyright notice, this list of
|
||||
// conditions and the following disclaimer.
|
||||
//
|
||||
// 2. Redistributions in binary form must reproduce the above copyright notice, this list
|
||||
// of conditions and the following disclaimer in the documentation and/or other
|
||||
// materials provided with the distribution.
|
||||
//
|
||||
// 3. Neither the name of the copyright holder nor the names of its contributors may be
|
||||
// used to endorse or promote products derived from this software without specific
|
||||
// prior written permission.
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
|
||||
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
||||
// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
|
||||
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
|
||||
namespace tools
|
||||
{
|
||||
bool download(const std::string &path, const std::string &url);
|
||||
}
|
@ -0,0 +1,114 @@
|
||||
// Copyright (c) 2017, The Monero Project
|
||||
//
|
||||
// All rights reserved.
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without modification, are
|
||||
// permitted provided that the following conditions are met:
|
||||
//
|
||||
// 1. Redistributions of source code must retain the above copyright notice, this list of
|
||||
// conditions and the following disclaimer.
|
||||
//
|
||||
// 2. Redistributions in binary form must reproduce the above copyright notice, this list
|
||||
// of conditions and the following disclaimer in the documentation and/or other
|
||||
// materials provided with the distribution.
|
||||
//
|
||||
// 3. Neither the name of the copyright holder nor the names of its contributors may be
|
||||
// used to endorse or promote products derived from this software without specific
|
||||
// prior written permission.
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
|
||||
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
||||
// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
|
||||
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#include "util.h"
|
||||
#include "dns_utils.h"
|
||||
#include "updates.h"
|
||||
|
||||
#undef MONERO_DEFAULT_LOG_CATEGORY
|
||||
#define MONERO_DEFAULT_LOG_CATEGORY "updates"
|
||||
|
||||
namespace tools
|
||||
{
|
||||
bool check_updates(const std::string &software, const std::string &buildtag, bool testnet, std::string &version, std::string &hash)
|
||||
{
|
||||
std::vector<std::string> records;
|
||||
bool found = false;
|
||||
|
||||
MDEBUG("Checking updates for " << buildtag << " " << software);
|
||||
|
||||
// All four MoneroPulse domains have DNSSEC on and valid
|
||||
static const std::vector<std::string> dns_urls = {
|
||||
};
|
||||
|
||||
static const std::vector<std::string> testnet_dns_urls = { "testver.moneropulse.net"
|
||||
};
|
||||
|
||||
if (!tools::dns_utils::load_txt_records_from_dns(records, testnet ? testnet_dns_urls : dns_urls))
|
||||
return false;
|
||||
|
||||
for (const auto& record : records)
|
||||
{
|
||||
std::vector<std::string> fields;
|
||||
boost::split(fields, record, boost::is_any_of(":"));
|
||||
if (fields.size() != 4)
|
||||
{
|
||||
MWARNING("Updates record does not have 4 fields: " << record);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (software != fields[0] || buildtag != fields[1])
|
||||
continue;
|
||||
|
||||
bool alnum = true;
|
||||
for (auto c: hash)
|
||||
if (!isalnum(c))
|
||||
alnum = false;
|
||||
if (hash.size() != 64 && !alnum)
|
||||
{
|
||||
MWARNING("Invalid hash: " << hash);
|
||||
continue;
|
||||
}
|
||||
|
||||
// use highest version
|
||||
if (found)
|
||||
{
|
||||
int cmp = vercmp(version.c_str(), fields[2].c_str());
|
||||
if (cmp > 0)
|
||||
continue;
|
||||
if (cmp == 0 && hash != fields[3])
|
||||
MWARNING("Two matches found for " << software << " version " << version << " on " << buildtag);
|
||||
}
|
||||
|
||||
version = fields[2];
|
||||
hash = fields[3];
|
||||
|
||||
MINFO("Found new version " << version << " with hash " << hash);
|
||||
found = true;
|
||||
}
|
||||
return found;
|
||||
}
|
||||
|
||||
std::string get_update_url(const std::string &software, const std::string &subdir, const std::string &buildtag, const std::string &version)
|
||||
{
|
||||
static const char base[] = "https://downloads.getmonero.org/";
|
||||
#ifdef _WIN32
|
||||
static const char extension[] = ".zip";
|
||||
#else
|
||||
static const char extension[] = ".tar.bz2";
|
||||
#endif
|
||||
|
||||
std::string url;
|
||||
|
||||
url = base;
|
||||
if (!subdir.empty())
|
||||
url += subdir + "/";
|
||||
url = url + software + "-" + buildtag + "-v" + version + extension;
|
||||
return url;
|
||||
}
|
||||
}
|
@ -0,0 +1,37 @@
|
||||
// Copyright (c) 2017, The Monero Project
|
||||
//
|
||||
// All rights reserved.
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without modification, are
|
||||
// permitted provided that the following conditions are met:
|
||||
//
|
||||
// 1. Redistributions of source code must retain the above copyright notice, this list of
|
||||
// conditions and the following disclaimer.
|
||||
//
|
||||
// 2. Redistributions in binary form must reproduce the above copyright notice, this list
|
||||
// of conditions and the following disclaimer in the documentation and/or other
|
||||
// materials provided with the distribution.
|
||||
//
|
||||
// 3. Neither the name of the copyright holder nor the names of its contributors may be
|
||||
// used to endorse or promote products derived from this software without specific
|
||||
// prior written permission.
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
|
||||
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
||||
// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
|
||||
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
|
||||
namespace tools
|
||||
{
|
||||
bool check_updates(const std::string &software, const std::string &buildtag, bool bestnet, std::string &version, std::string &hash);
|
||||
std::string get_update_url(const std::string &software, const std::string &subdir, const std::string &buildtag, const std::string &version);
|
||||
}
|
@ -0,0 +1,43 @@
|
||||
// Copyright (c) 2017, The Monero Project
|
||||
//
|
||||
// All rights reserved.
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without modification, are
|
||||
// permitted provided that the following conditions are met:
|
||||
//
|
||||
// 1. Redistributions of source code must retain the above copyright notice, this list of
|
||||
// conditions and the following disclaimer.
|
||||
//
|
||||
// 2. Redistributions in binary form must reproduce the above copyright notice, this list
|
||||
// of conditions and the following disclaimer in the documentation and/or other
|
||||
// materials provided with the distribution.
|
||||
//
|
||||
// 3. Neither the name of the copyright holder nor the names of its contributors may be
|
||||
// used to endorse or promote products derived from this software without specific
|
||||
// prior written permission.
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
|
||||
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
||||
// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
|
||||
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#include "gtest/gtest.h"
|
||||
|
||||
#include "common/util.h"
|
||||
|
||||
TEST(vercmp, empty) { ASSERT_TRUE(tools::vercmp("", "") == 0); }
|
||||
TEST(vercmp, empty0) { ASSERT_TRUE(tools::vercmp("", "0") == 0); }
|
||||
TEST(vercmp, empty1) { ASSERT_TRUE(tools::vercmp("0", "") == 0); }
|
||||
TEST(vercmp, zero_zero) { ASSERT_TRUE(tools::vercmp("0", "0") == 0); }
|
||||
TEST(vercmp, one_one) { ASSERT_TRUE(tools::vercmp("1", "1") == 0); }
|
||||
TEST(vercmp, one_two) { ASSERT_TRUE(tools::vercmp("1", "2") < 0); }
|
||||
TEST(vercmp, two_one) { ASSERT_TRUE(tools::vercmp("2", "1") > 0); }
|
||||
TEST(vercmp, ten_nine) { ASSERT_TRUE(tools::vercmp("10", "9") > 0); }
|
||||
TEST(vercmp, one_dot_ten_one_dot_nine) { ASSERT_TRUE(tools::vercmp("1.10", "1.9") > 0); }
|
||||
TEST(vercmp, one_one_dot_nine) { ASSERT_TRUE(tools::vercmp("1", "1.9") < 0); }
|
||||
|
Loading…
Reference in new issue