mirrors/dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2025-05-10 18:05:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix(VersionMonitor): improper version update to older version (#1577)

Browse source 
Add correct version comparison between VersionMonitor and the dfly server
This commit is contained in:
Kostas Kyrimis 2023-07-24 15:08:24 +03:00 • committed by GitHub
parent a5204b4bbf
commit 3bea87e36f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/server/dfly_main.cc
View file

@ -3,6 +3,7 @@
// See LICENSE for licensing terms.
//
#include "absl/strings/numbers.h"
#ifdef NDEBUG
#include <mimalloc-new-delete.h>
#endif
@ -161,9 +162,41 @@ struct VersionMonitor {
}
private:
bool IsVersionOutdated(std::string_view remote, std::string_view current) const;
void RunTask(SSL_CTX* ssl_ctx);
};
bool VersionMonitor::IsVersionOutdated(const std::string_view remote,
const std::string_view current) const {
const std::vector<absl::string_view> remote_xyz = absl::StrSplit(remote, ".");
const std::vector<absl::string_view> current_xyz = absl::StrSplit(current, ".");
if (remote_xyz.size() != current_xyz.size()) {
LOG(WARNING) << "Can't compare Dragonfly version " << current << " to latest version "
<< remote;
return false;
}
const auto print_to_log = [](const std::string_view version, const absl::string_view part) {
LOG(WARNING) << "Can't parse " << version << " part of version " << part << " as a number";
};
for (size_t i = 0; i < remote_xyz.size(); ++i) {
size_t remote_x = 0;
if (!absl::SimpleAtoi(remote_xyz[i], &remote_x)) {
print_to_log(remote, remote_xyz[i]);
return false;
}
size_t current_x = 0;
if (!absl::SimpleAtoi(current_xyz[i], &current_x)) {
print_to_log(current, current_xyz[i]);
return false;
}
if (remote_x > current_x) {
return true;
}
}
return false;
}
void VersionMonitor::Run(ProactorPool* proactor_pool) {
// Avoid running dev environments.
bool is_dev_env = false;
@ -205,8 +238,8 @@ void VersionMonitor::RunTask(SSL_CTX* ssl_ctx) {
const std::optional<std::string> remote_version =
GetRemoteVersion(my_pb, ssl_ctx, host_name, port, resource, version_header);
if (remote_version) {
const std::string rv = remote_version.value();
if (rv != current_version) {
const std::string_view rv = remote_version.value();
if (IsVersionOutdated(rv, current_version)) {
LOG_FIRST_N(INFO, 1) << "Your current version '" << current_version
<< "' is not the latest version. A newer version '" << rv
<< "' is now available. Please consider an update.";