fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-10-04 21:29:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pass the typed download filter as an argument, not command text

Browse Source 
A pattern containing '}' closed the match command early and ran the rest as commands.
This commit is contained in:
xirvik
2026-09-19 02:41:26 +00:00
committed by Jari Sundell
parent 7916e6022f
commit 3652329e2d
5 changed files with 115 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/Makefile.am
+2
View File
@@ -69,6 +69,8 @@ rtorrent_Test_Src_SOURCES = $(rtorrent_Test_Common) \
src/test_command_string.h \
src/test_setup.cc \
src/test_setup.h \
src/test_ui_download_list.cc \
src/test_ui_download_list.h \
src/test_watch_ready_queue.cc \
src/test_watch_ready_queue.h
test/src/test_ui_download_list.cc
+52
View File
@@ -0,0 +1,52 @@
#include "config.h"
#include "test/src/test_ui_download_list.h"
#include "ui/download_list.h"
CPPUNIT_TEST_SUITE_REGISTRATION(TestUiDownloadList);
void
TestUiDownloadList::test_filter_pattern() {
CPPUNIT_ASSERT_EQUAL(std::string(""), ui::create_filter_pattern(""));
CPPUNIT_ASSERT_EQUAL(std::string(".*linux.*"), ui::create_filter_pattern("linux"));
CPPUNIT_ASSERT_EQUAL(std::string("^linux.*"), ui::create_filter_pattern("^linux"));
CPPUNIT_ASSERT_EQUAL(std::string(".*linux$"), ui::create_filter_pattern("linux$"));
CPPUNIT_ASSERT_EQUAL(std::string(".*linux.*"), ui::create_filter_pattern("LiNuX"));
}
void
TestUiDownloadList::test_filter_command() {
torrent::Object command = ui::create_filter_command(".*linux.*");
CPPUNIT_ASSERT(command.is_dict_key());
CPPUNIT_ASSERT_EQUAL(std::string("match"), command.as_dict_key());
const torrent::Object::list_type& args = command.as_dict_obj().as_list();
CPPUNIT_ASSERT_EQUAL((size_t)2, args.size());
CPPUNIT_ASSERT(args.front().is_dict_key());
CPPUNIT_ASSERT_EQUAL(std::string("d.name"), args.front().as_dict_key());
CPPUNIT_ASSERT(args.back().is_string());
CPPUNIT_ASSERT_EQUAL(std::string(".*linux.*"), args.back().as_string());
}
// A pattern that closes the 'match' argument early and appends a second
// command must stay a single inert string argument.
void
TestUiDownloadList::test_filter_command_does_not_inject() {
const std::string pattern = ui::create_filter_pattern("zzz},$d.custom1.set={pwned");
CPPUNIT_ASSERT_EQUAL(std::string(".*zzz},$d.custom1.set={pwned.*"), pattern);
torrent::Object command = ui::create_filter_command(pattern);
CPPUNIT_ASSERT(command.is_dict_key());
CPPUNIT_ASSERT_EQUAL(std::string("match"), command.as_dict_key());
const torrent::Object::list_type& args = command.as_dict_obj().as_list();
CPPUNIT_ASSERT_EQUAL((size_t)2, args.size());
CPPUNIT_ASSERT(args.back().is_string());
CPPUNIT_ASSERT_EQUAL(pattern, args.back().as_string());
}
test/src/test_ui_download_list.h
+16
View File
@@ -0,0 +1,16 @@
#include "test/helpers/test_fixture.h"
class TestUiDownloadList : public test_fixture {
CPPUNIT_TEST_SUITE(TestUiDownloadList);
CPPUNIT_TEST(test_filter_pattern);
CPPUNIT_TEST(test_filter_command);
CPPUNIT_TEST(test_filter_command_does_not_inject);
CPPUNIT_TEST_SUITE_END();
public:
void test_filter_pattern();
void test_filter_command();
void test_filter_command_does_not_inject();
};