From d0f8f07f777408cc2d6f2ca12f61fefab41ca041 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Fri, 7 Jan 2022 13:15:33 +0100 Subject: [PATCH 1/2] Add sudo where sudo is needed --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 488ce96..6505de2 100644 --- a/README.md +++ b/README.md @@ -72,11 +72,11 @@ git checkout develop ## 3.4. Prerequisites and dependencies Before first time building you need to install dependencies and prerequisites ``` -apt install build-essential libcurl4-openssl-dev libboost-dev +sudo apt install build-essential libcurl4-openssl-dev libboost-dev ``` If you are going to build with gpsd support, also install libgps-dev ``` -apt install libgps-dev +sudo apt install libgps-dev ``` ## 3.5. Building Regular building From 54deb908fad7633124d15e43640a79eadf6de950 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Fri, 7 Jan 2022 14:18:02 +0100 Subject: [PATCH 2/2] Do not rely on strtok for key/value parsing fixes #14 --- Config.cpp | 26 +++++------------ Config.h | 2 +- README.md | 1 + Tests/Config/getValue.cpp | 57 ++++++++++++++++++++++++++++++++++++ Tests/Config/load.cpp | 61 +++++++++++++++++++++++++++++++++++++++ Tests/Config/test.cfg | 4 +++ 6 files changed, 131 insertions(+), 20 deletions(-) create mode 100644 Tests/Config/getValue.cpp create mode 100644 Tests/Config/load.cpp create mode 100644 Tests/Config/test.cfg diff --git a/Config.cpp b/Config.cpp index c421da2..ffe8468 100644 --- a/Config.cpp +++ b/Config.cpp @@ -43,7 +43,7 @@ bool CConfig::load() std::ifstream file; file.open(m_filename, std::ios::in); if(!file.is_open()) { - CLog::logError("Failed to open configuration file %s", m_filename); + CLog::logError("Failed to open configuration file %s", m_filename.c_str()); return false; } @@ -93,28 +93,16 @@ void CConfig::stripComment(std::string& s) const free(sdup);// could we use delete sdup here? } -TConfigValue * CConfig::readKeyAndValue(const std::string s) const +TConfigValue * CConfig::readKeyAndValue(const std::string& s) const { TConfigValue* res = nullptr; - - char * sdup = strdup(boost::trim_copy(s).c_str()); - - char * keyPtr = strtok(sdup, "="); - std::string key(keyPtr != nullptr ? keyPtr : ""); - - boost::trim(key); - - if(!key.empty()) { - char * valuePtr = strtok(nullptr, "="); - std::string value(valuePtr != nullptr? valuePtr : ""); - + auto sCopy = boost::trim_copy(s); + auto equalPos = sCopy.find_first_of('='); + if(equalPos != std::string::npos) { res = new TConfigValue; - res->m_key = key; - res->m_value = boost::trim_copy(value); + res->m_key.assign(sCopy.substr(0, equalPos)); + res->m_value.assign(sCopy.substr(equalPos + 1)); } - - free(sdup);// could we use delete sdup here? - return res; } diff --git a/Config.h b/Config.h index d25bca6..aabf432 100644 --- a/Config.h +++ b/Config.h @@ -106,7 +106,7 @@ public: private: void stripComment(std::string& s) const; - TConfigValue * readKeyAndValue(const std::string s) const; + TConfigValue * readKeyAndValue(const std::string& s) const; TConfigValue * lookupValue(const std::string& section, const std::string& key) const; std::string m_filename; diff --git a/README.md b/README.md index 6505de2..fe31074 100644 --- a/README.md +++ b/README.md @@ -117,6 +117,7 @@ the testing framwrok used is Google Test. # 5. Version History ## 5.1. Version 0.5 +- [Bugfix] Failed to download XLX Hosts when URL contains a = sign ([#14](https://github.com/F4FXL/DStarGateway/issues/14)) - [Bugfix] Remote control connection failed ([#13](https://github.com/F4FXL/DStarGateway/issues/13)) - [Bugfix] Trying to connect to ghost ircDDB when no ircDDB is configured ## 5.2. Version 0.4 diff --git a/Tests/Config/getValue.cpp b/Tests/Config/getValue.cpp new file mode 100644 index 0000000..5df3883 --- /dev/null +++ b/Tests/Config/getValue.cpp @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2021-2022 by Geoffrey Merck F4FXL / KC3FRA + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include + +#include "../../Config.h" + +namespace ConfigTests +{ + + class Config_getValue : public ::testing::Test + { + protected: + std::string m_configPath; + + void SetUp() override + { + char buf[2048]; + auto size = ::readlink("/proc/self/exe", buf, 2048); + if(size > 0) { + m_configPath.assign(buf, size); + auto lastSlashPos = m_configPath.find_last_of('/'); + m_configPath.resize(lastSlashPos); + m_configPath.append("/Config/test.cfg"); + } + } + }; + + TEST_F(Config_getValue, getURL) + { + CConfig config(m_configPath); + + bool ret = config.load(); + std::string value; + config.getValue("[XLX]", "hostfileUrl", value, 0U, 2048U, "http://www.f4fxl.org?src=github"); + + EXPECT_TRUE(ret); + EXPECT_STREQ(value.c_str(), "http://xlxapi.rlx.lu/api.php?do=GetXLXDMRMaster"); + } +} \ No newline at end of file diff --git a/Tests/Config/load.cpp b/Tests/Config/load.cpp new file mode 100644 index 0000000..e03cea6 --- /dev/null +++ b/Tests/Config/load.cpp @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2021-2022 by Geoffrey Merck F4FXL / KC3FRA + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include + +#include "../../Config.h" + +namespace ConfigTests +{ + + class Config_load : public ::testing::Test + { + protected: + std::string m_configPath; + + void SetUp() override + { + char buf[2048]; + auto size = ::readlink("/proc/self/exe", buf, 2048); + if(size > 0) { + m_configPath.assign(buf, size); + auto lastSlashPos = m_configPath.find_last_of('/'); + m_configPath.resize(lastSlashPos); + m_configPath.append("/Config/test.cfg"); + } + } + }; + + TEST_F(Config_load, fileExist) + { + CConfig config(m_configPath); + + bool ret = config.load(); + EXPECT_TRUE(ret); + } + + TEST_F(Config_load, fileDoesNotExist) + { + CConfig config("/this/file/does/not/exist/and/if/exists/we/have/a/serious/issue"); + + bool ret = config.load(); + EXPECT_FALSE(ret); + } +} \ No newline at end of file diff --git a/Tests/Config/test.cfg b/Tests/Config/test.cfg new file mode 100644 index 0000000..c7b9920 --- /dev/null +++ b/Tests/Config/test.cfg @@ -0,0 +1,4 @@ +[XLX] +hostfileUrl=http://xlxapi.rlx.lu/api.php?do=GetXLXDMRMaster + +