Stuff.

configure.ac

@@ -1,6 +1,6 @@
 m4_pattern_allow([PKG_CHECK_EXISTS])
 
-AC_INIT([rtorrent],[0.16.24],[sundell.software@gmail.com])
+AC_INIT([rtorrent],[0.16.21],[sundell.software@gmail.com])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIRS([scripts])
@@ -14,7 +14,7 @@ AX_CXX_COMPILE_STDCXX(20, noext, mandatory)
 
 PKG_PROG_PKG_CONFIG
 
-AC_DEFINE([API_VERSION], [28], [api version])
+AC_DEFINE([API_VERSION], [26], [api version])
 
 RAK_CHECK_CFLAGS
 RAK_CHECK_CXXFLAGS
@@ -49,7 +49,7 @@ fi
 
 PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"])
 PKG_CHECK_MODULES([ZLIB], [zlib])
-PKG_CHECK_MODULES([DEPENDENCIES], [libtorrent >= 0.16.24])
+PKG_CHECK_MODULES([DEPENDENCIES], [libtorrent >= 0.16.21])
 
 AC_LANG_PUSH(C++)
 TORRENT_WITH_XMLRPC_C

src/Makefile.am

@@ -17,6 +17,7 @@ libsub_root_a_SOURCES = \
 	core/http_queue.h \
 	core/manager.cc \
 	core/manager.h \
+	core/range_map.h \
 	core/view.cc \
 	core/view.h \
 	core/view_manager.cc \
@@ -170,6 +171,7 @@ libsub_root_a_SOURCES = \
 	utils/functional.h \
 	utils/gzip.cc \
 	utils/gzip.h \
+	utils/list_focus.h \
 	utils/lockfile.cc \
 	utils/lockfile.h \
 	utils/waitpid_queue.cc \
@@ -185,6 +187,7 @@ libsub_root_a_SOURCES = \
 	command_helpers.cc \
 	command_helpers.h \
 	command_groups.cc \
+	command_load.cc \
 	command_local.cc \
 	command_logging.cc \
 	command_network.cc \

src/command_download.cc

@@ -402,21 +402,13 @@ p_multicall(core::Download* download, const torrent::Object::list_type& args) {
   auto  resultRaw = torrent::Object::create_list();
   auto& result    = resultRaw.as_list();
 
-  auto*      connection_list = download->connection_list();
-  const auto change_counter  = connection_list->change_counter();
-
-  for (const auto& connection : *connection_list) {
+  for (const auto& connection : *download->connection_list()) {
     torrent::Object::list_type& row = result.insert(result.end(), torrent::Object::create_list())->as_list();
 
     for (auto cItr = ++args.begin(); cItr != args.end(); cItr++) {
       const std::string& cmd = cItr->as_string();
 
       row.push_back(rpc::parse_command(rpc::make_target(connection), cmd.c_str(), cmd.c_str() + cmd.size()).first);
-
-      // Erasing a peer frees it and swaps the last element into its place, so
-      // neither this peer nor the iteration survives a change to the list.
-      if (connection_list->change_counter() != change_counter)
-        throw torrent::input_error("Command changed the connection list during p.multicall.");
     }
   }
 
@@ -439,9 +431,6 @@ p_call_target(const torrent::Object::list_type& args) {
   const std::string& peer_id = itr++->as_string();
   const std::string& command_key = itr++->as_string();
 
-  if (download == nullptr)
-    throw torrent::input_error("invalid parameters: info-hash not found");
-
   torrent::HashString hash;
 
   if (peer_id.size() != 40)

src/command_dynamic.cc

@@ -157,7 +157,7 @@ system_method_insert_object(const torrent::Object::list_type& args, int flags) {
     torrent::Object             valueList     = torrent::Object::create_list();
     torrent::Object::list_type& valueListType = valueList.as_list();
 
-    if (itrArgs != args.end() && (itrArgs)->is_list())
+    if ((itrArgs)->is_list())
       valueListType = (itrArgs)->as_list();
 
     control->object_storage()->insert_str(raw_key, valueList, flags);

src/command_events.cc

@@ -1,25 +1,17 @@
 #include "config.h"
 
-#include <functional>
-#include <cstdio>
-#include <string>
-#include <vector>
-#include <torrent/rate.h>
-#include <torrent/hash_string.h>
+#include <torrent/exceptions.h>
 #include <torrent/utils/log.h>
 #include <torrent/utils/directory_events.h>
 #include <torrent/utils/file_stat.h>
 #include <torrent/utils/string_manip.h>
 
-#include "globals.h"
 #include "control.h"
 #include "command_helpers.h"
 #include "core/download.h"
-#include "core/download_list.h"
 #include "core/manager.h"
 #include "core/view_manager.h"
 #include "rpc/command_scheduler.h"
-#include "rpc/parse.h"
 #include "rpc/parse_commands.h"
 #include "utils/watch_ready_queue.h"
 
@@ -146,24 +138,6 @@ apply_schedule(const torrent::Object::list_type& args, bool if_absent) {
   return torrent::Object();
 }
 
-torrent::Object
-apply_load(const torrent::Object::list_type& args, int flags) {
-  torrent::Object::list_const_iterator argsItr = args.begin();
-
-  if (argsItr == args.end())
-    throw torrent::input_error("Too few arguments.");
-
-  auto& filename = argsItr->as_string();
-  core::Manager::command_list_type commands;
-
-  while (++argsItr != args.end())
-    commands.push_back(argsItr->as_string());
-
-  control->core()->try_create_download_expand(filename, flags, commands);
-
-  return torrent::Object();
-}
-
 void apply_import(const std::string& path)     { if (!rpc::parse_command_file(path)) throw torrent::input_error("Could not open option file: " + path); }
 void apply_try_import(const std::string& path) { if (!rpc::parse_command_file(path)) control->core()->push_log_std("Could not read resource file: " + path); }
 
@@ -368,15 +342,6 @@ initialize_command_events() {
   CMD2_ANY_STRING_V("import",                     [](auto, auto& str) { return apply_import(str); });
   CMD2_ANY_STRING_V("try_import",                 [](auto, auto& str) { return apply_try_import(str); });
 
-  CMD2_ANY_LIST    ("load.normal",                [](auto, auto& args) { return apply_load(args, core::Manager::create_quiet | core::Manager::create_tied); });
-  CMD2_ANY_LIST    ("load.verbose",               [](auto, auto& args) { return apply_load(args, core::Manager::create_tied); });
-  CMD2_ANY_LIST    ("load.start",                 [](auto, auto& args) { return apply_load(args, core::Manager::create_quiet | core::Manager::create_tied | core::Manager::create_start); });
-  CMD2_ANY_LIST    ("load.start_verbose",         [](auto, auto& args) { return apply_load(args, core::Manager::create_tied | core::Manager::create_start); });
-  CMD2_ANY_LIST    ("load.raw",                   [](auto, auto& args) { return apply_load(args, core::Manager::create_quiet | core::Manager::create_raw_data); });
-  CMD2_ANY_LIST    ("load.raw_verbose",           [](auto, auto& args) { return apply_load(args, core::Manager::create_raw_data); });
-  CMD2_ANY_LIST    ("load.raw_start",             [](auto, auto& args) { return apply_load(args, core::Manager::create_quiet | core::Manager::create_start | core::Manager::create_raw_data); });
-  CMD2_ANY_LIST    ("load.raw_start_verbose",     [](auto, auto& args) { return apply_load(args, core::Manager::create_start | core::Manager::create_raw_data); });
-
   CMD2_ANY_VALUE   ("close_low_diskspace",        [](auto, auto& arg) { return apply_close_low_diskspace(arg, 99); });
   CMD2_ANY_VALUE   ("close_low_diskspace.normal", [](auto, auto& arg) { return apply_close_low_diskspace(arg, 3); });
 

src/command_groups.cc

@@ -1,6 +1,5 @@
 #include "config.h"
 
-#include <limits>
 #include <memory>
 
 #include <torrent/download/resource_manager.h>
@@ -233,9 +232,6 @@ apply_cg_max_set(const torrent::Object::list_type& args, bool is_up) {
   int64_t second_arg = 0;
   rpc::parse_whole_value(args.back().as_string().c_str(), &second_arg);
 
-  if (second_arg < -1 || second_arg > std::numeric_limits<uint32_t>::max())
-    throw torrent::input_error("Max unchoked must be between -1 and 4294967295.");
-
   if (is_up)
     cg_get_group(args.front())->up_queue()->set_max_unchoked(second_arg);
   else

src/command_helpers.h

@@ -1,25 +1,12 @@
 #ifndef RTORRENT_UTILS_COMMAND_HELPERS_H
 #define RTORRENT_UTILS_COMMAND_HELPERS_H
 
-#include <cstdint>
-#include <limits>
-#include <string>
-#include <torrent/exceptions.h>
-
 #include "rpc/command.h"
 #include "rpc/parse_commands.h"
 #include "rpc/object_storage.h"
 
 void initialize_commands();
 
-inline uint16_t
-checked_port_value(int64_t value, const char* label) {
-  if (value < 0 || value > std::numeric_limits<uint16_t>::max())
-    throw torrent::input_error(std::string("Invalid ") + label + " port number.");
-
-  return static_cast<uint16_t>(value);
-}
-
 //
 // Aliases with CMD_* for the below
 //

src/command_ip.cc

@@ -131,7 +131,7 @@ ipv4_range_parse(const char* address, uint32_t* address_start, uint32_t* address
   // copy everything up to '#'  to address_copy and work from there
   while(address[address_start_index] != '#' && address[address_start_index] != '\r' &&
         address[address_start_index] != '\n' && address[address_start_index] != '\0' &&
-        address_start_index < 4095 ) {
+        address_start_index < 4096 ) {
 
     address_copy[address_start_index] = address[address_start_index];
     address_start_index++;
@@ -206,9 +206,6 @@ ipv4_range_parse(const char* address, uint32_t* address_start, uint32_t* address
         if (mask_bits == 0) {
           mask = 0;
           end_mask = ~(uint32_t)0;
-        } else if (mask_bits == 32) {
-          mask = ~(uint32_t)0;
-          end_mask = 0;
         } else {
           mask = (~mask) << (32-mask_bits);
           end_mask = (~end_mask) >> mask_bits;
@@ -319,11 +316,6 @@ apply_ipv4_filter_load(const torrent::Object::list_type& args) {
       ipv4_filter_parse(buffer, value);
     }
 
-    if (file.fail() && !file.eof()) {
-      lineNumber++;
-      throw torrent::input_error("Exceeded max line length.");
-    }
-
   } catch (torrent::input_error& e) {
     snprintf(buffer, 2048, "Error in ip filter file: %s:%u: %s", filename.c_str(), lineNumber, e.what());
 
@@ -344,8 +336,8 @@ apply_ipv4_filter_dump() {
   torrent::Object raw_result = torrent::Object::create_list();
   torrent::Object::list_type& result = raw_result.as_list();
 
-  const torrent::ipv4_table::range_map_type& range_map = torrent::PeerList::ipv4_filter()->range_map;
-  torrent::ipv4_table::range_map_type::const_iterator iter = range_map.begin();
+  torrent::ipv4_table::range_map_type range_map = torrent::PeerList::ipv4_filter()->range_map;
+  torrent::ipv4_table::range_map_type::iterator iter = range_map.begin();
 
   while(iter != range_map.end()) {
     char buffer[64];

src/command_load.cc

@@ -0,0 +1,81 @@
+#include "config.h"
+
+#include "command_helpers.h"
+#include "control.h"
+#include "core/manager.h"
+
+torrent::Object
+apply_load_trusted(const torrent::Object::list_type& args, int flags) {
+  auto argsItr = args.begin();
+
+  if (argsItr == args.end())
+    throw torrent::input_error("Too few arguments.");
+
+  auto& filename = argsItr->as_string();
+
+  core::Manager::command_list_type commands;
+
+  while (++argsItr != args.end())
+    commands.push_back(argsItr->as_string());
+
+  control->core()->try_create_download_expand(filename, flags, commands);
+
+  return torrent::Object();
+}
+
+torrent::Object
+apply_load_untrusted(const torrent::Object::list_type& args, int flags) {
+  auto argsItr = args.begin();
+
+  if (argsItr == args.end())
+    throw torrent::input_error("Too few arguments.");
+
+  auto& filename = argsItr->as_string();
+
+  core::Manager::command_list_type commands;
+
+  while (++argsItr != args.end())
+    commands.push_back(argsItr->as_string());
+
+  control->core()->try_create_download_untrusted(filename, flags, commands);
+
+  return torrent::Object();
+}
+
+void
+initialize_command_load() {
+  CMD2_ANY_LIST    ("load.normal",            [](auto, auto& args) { return apply_load_trusted(args, core::Manager::create_quiet | core::Manager::create_tied); });
+  CMD2_ANY_LIST    ("load.verbose",           [](auto, auto& args) { return apply_load_trusted(args, core::Manager::create_tied); });
+  CMD2_ANY_LIST    ("load.start",             [](auto, auto& args) { return apply_load_trusted(args, core::Manager::create_quiet | core::Manager::create_tied | core::Manager::create_start); });
+  CMD2_ANY_LIST    ("load.start_verbose",     [](auto, auto& args) { return apply_load_trusted(args, core::Manager::create_tied | core::Manager::create_start); });
+  CMD2_ANY_LIST    ("load.raw",               [](auto, auto& args) { return apply_load_trusted(args, core::Manager::create_quiet | core::Manager::create_raw_data); });
+  CMD2_ANY_LIST    ("load.raw_verbose",       [](auto, auto& args) { return apply_load_trusted(args, core::Manager::create_raw_data); });
+  CMD2_ANY_LIST    ("load.raw_start",         [](auto, auto& args) { return apply_load_trusted(args, core::Manager::create_quiet | core::Manager::create_start | core::Manager::create_raw_data); });
+  CMD2_ANY_LIST    ("load.raw_start_verbose", [](auto, auto& args) { return apply_load_trusted(args, core::Manager::create_start | core::Manager::create_raw_data); });
+
+  CMD2_ANY_LIST    ("load.untrusted.normal",            [](auto, auto& args) { return apply_load_untrusted(args, core::Manager::create_quiet); });
+  CMD2_ANY_LIST    ("load.untrusted.verbose",           [](auto, auto& args) { return apply_load_untrusted(args, 0); });
+  CMD2_ANY_LIST    ("load.untrusted.start",             [](auto, auto& args) { return apply_load_untrusted(args, core::Manager::create_quiet | core::Manager::create_start); });
+  CMD2_ANY_LIST    ("load.untrusted.start_verbose",     [](auto, auto& args) { return apply_load_untrusted(args, core::Manager::create_start); });
+  CMD2_ANY_LIST    ("load.untrusted.raw",               [](auto, auto& args) { return apply_load_untrusted(args, core::Manager::create_quiet | core::Manager::create_raw_data); });
+  CMD2_ANY_LIST    ("load.untrusted.raw_verbose",       [](auto, auto& args) { return apply_load_untrusted(args, core::Manager::create_raw_data); });
+  CMD2_ANY_LIST    ("load.untrusted.raw_start",         [](auto, auto& args) { return apply_load_untrusted(args, core::Manager::create_quiet | core::Manager::create_start | core::Manager::create_raw_data); });
+  CMD2_ANY_LIST    ("load.untrusted.raw_start_verbose", [](auto, auto& args) { return apply_load_untrusted(args, core::Manager::create_start | core::Manager::create_raw_data); });
+
+  CMD2_ANY_VALUE_V("load.untrusted.mark_safe", [](auto, auto& arg) {
+    if (arg == 0)
+      return;
+
+    // TODO: Add a bool to core::Manager.
+
+    rpc::rpc.mark_safe("load.untrusted.normal");
+    rpc::rpc.mark_safe("load.untrusted.verbose");
+    rpc::rpc.mark_safe("load.untrusted.start");
+    rpc::rpc.mark_safe("load.untrusted.start_verbose");
+    rpc::rpc.mark_safe("load.untrusted.raw");
+    rpc::rpc.mark_safe("load.untrusted.raw_verbose");
+    rpc::rpc.mark_safe("load.untrusted.raw_start");
+    rpc::rpc.mark_safe("load.untrusted.raw_start_verbose");
+  });
+
+}

src/command_local.cc

@@ -77,6 +77,54 @@ group_insert(const torrent::Object::list_type& args) {
   return name;
 }
 
+static const int file_print_use_space = 0x1;
+static const int file_print_delim_space = 0x2;
+
+void
+file_print_list(torrent::Object::list_const_iterator first, torrent::Object::list_const_iterator last, FILE* output, int flags) {
+  while (first != last) {
+    switch (first->type()) {
+    case torrent::Object::TYPE_STRING:
+      fprintf(output, (const char*)" %s" + !(flags & file_print_use_space), first->as_string().c_str());
+      break;
+    case torrent::Object::TYPE_VALUE:
+      fprintf(output, (const char*)" %" PRIi64 + !(flags & file_print_use_space), first->as_value());
+      break;
+    case torrent::Object::TYPE_LIST:
+      file_print_list(first->as_list().begin(), first->as_list().end(), output, 0);
+      break;
+    case torrent::Object::TYPE_NONE:
+      break;
+    default:
+      throw torrent::input_error("Invalid type.");
+    }
+
+    flags |= (flags & file_print_delim_space) >> 1;
+    first++;
+  }
+}
+
+torrent::Object
+cmd_file_append(const torrent::Object::list_type& args) {
+  if (args.empty())
+    throw torrent::input_error("Invalid number of arguments.");
+
+  FILE* output = fopen(args.front().as_string().c_str(), "a");
+
+  if (output == nullptr)
+    throw torrent::input_error("Could not append to file '" + args.front().as_string() + "': " + std::strerror(errno));
+
+  try {
+    file_print_list(++args.begin(), args.end(), output, file_print_delim_space);
+    fprintf(output, "\n");
+  } catch (...) {
+    fclose(output);
+    throw;
+  }
+  fclose(output);
+  return torrent::Object();
+}
+
 void
 initialize_command_local() {
   core::DownloadList* dList = control->core()->download_list();

src/command_logging.cc

@@ -122,10 +122,7 @@ log_vmmap_dump(const std::string& str) {
     fprintf(log_file, "%8p-%8p [%5llxk]\n", all_mapping.ptr, (char*)all_mapping.ptr + all_mapping.length, (long long unsigned int)(all_mapping.length / 1024));
   }
 
-  // The buffered output only reaches the kernel here.
-  if (fclose(log_file) != 0)
-    throw torrent::input_error("Could not write log file: " + str);
-
+  fclose(log_file);
   return torrent::Object();
 }
 

src/command_network.cc

@@ -54,6 +54,14 @@ set_listen_port_range(const std::string& arg) {
   torrent::runtime::client_config()->set_listen_port_range(port_first, port_last);
 }
 
+uint16_t
+checked_local_port_value(int64_t value, const char* label) {
+  if (value < 0 || value > 65535)
+    throw torrent::input_error(std::string("Invalid ") + label + " port number.");
+
+  return static_cast<uint16_t>(value);
+}
+
 torrent::Object
 get_encryption() {
   auto encryption_modes = torrent::runtime::network_config()->encryption_modes();
@@ -317,7 +325,7 @@ initialize_command_network() {
   auto nw_config      = torrent::runtime::network_config();
 
   CMD_ANY         ("network.listen.port",            [](auto, auto)        { return torrent::runtime::network_manager()->listen_port(); });
-  CMD_ANY_VALUE_V ("network.listen.port.set",        [](auto, auto& value) { return torrent::runtime::network_manager()->set_listen_port(checked_port_value(value, "listen")); });
+  CMD_ANY_VALUE_V ("network.listen.port.set",        [](auto, auto& value) { return torrent::runtime::network_manager()->set_listen_port(value); });
   CMD_ANY         ("network.listen.port.random",     [](auto, auto)        { return torrent::runtime::client_config()->listen_port_random(); });
   CMD_ANY_VALUE_V ("network.listen.port.random.set", [](auto, auto& value) { return torrent::runtime::client_config()->set_listen_port_random(value); });
   CMD_ANY         ("network.listen.port.range",      [](auto, auto)        { return listen_port_range(); });
@@ -366,31 +374,25 @@ initialize_command_network() {
   CMD_ANY_STRING  ("network.tos.set",                        [](auto, auto& str)             { return apply_tos(str); });
 
   CMD_ANY         ("network.bind_address",                   [nw_config](auto, auto)         { return nw_config->bind_address_best_match_str(); });
-  CMD_ANY_STRING_V("network.bind_address.set",               [nw_config](auto, auto& str)    { return nw_config->set_bind_address(str); });
+  CMD_ANY_STRING_V("network.bind_address.set",               [nw_config](auto, auto& str)    { return nw_config->set_bind_address_str(str); });
   CMD_ANY         ("network.bind_address.ipv4",              [nw_config](auto, auto)         { return nw_config->bind_inet_address_str(); });
-  CMD_ANY_STRING_V("network.bind_address.ipv4.set",          [nw_config](auto, auto& str)    { return nw_config->set_bind_inet_address(str); });
+  CMD_ANY_STRING_V("network.bind_address.ipv4.set",          [nw_config](auto, auto& str)    { return nw_config->set_bind_inet_address_str(str); });
   CMD_ANY         ("network.bind_address.ipv6",              [nw_config](auto, auto)         { return nw_config->bind_inet6_address_str(); });
-  CMD_ANY_STRING_V("network.bind_address.ipv6.set",          [nw_config](auto, auto& str)    { return nw_config->set_bind_inet6_address(str); });
-
-  CMD_ANY_STRING_V("network.bind_device.set",                [nw_config](auto, auto& str)    { return nw_config->set_bind_device_name(str); });
-  CMD_ANY         ("network.bind_device.ipv4",               [nw_config](auto, auto)         { return nw_config->bind_inet_device_name(); });
-  CMD_ANY_STRING_V("network.bind_device.ipv4.set",           [nw_config](auto, auto& str)    { return nw_config->set_bind_inet_device_name(str); });
-  CMD_ANY         ("network.bind_device.ipv6",               [nw_config](auto, auto)         { return nw_config->bind_inet6_device_name(); });
-  CMD_ANY_STRING_V("network.bind_device.ipv6.set",           [nw_config](auto, auto& str)    { return nw_config->set_bind_inet6_device_name(str); });
+  CMD_ANY_STRING_V("network.bind_address.ipv6.set",          [nw_config](auto, auto& str)    { return nw_config->set_bind_inet6_address_str(str); });
 
   CMD_ANY         ("network.local_address",                  [nw_config](auto, auto)         { return nw_config->local_address_best_match_str(); });
-  CMD_ANY_STRING_V("network.local_address.set",              [nw_config](auto, auto& str)    { return nw_config->set_local_address(str); });
+  CMD_ANY_STRING_V("network.local_address.set",              [nw_config](auto, auto& str)    { return nw_config->set_local_address_str(str); });
   CMD_ANY         ("network.local_address.ipv4",             [nw_config](auto, auto)         { return nw_config->local_inet_address_str(); });
-  CMD_ANY_STRING_V("network.local_address.ipv4.set",         [nw_config](auto, auto& str)    { return nw_config->set_local_inet_address(str); });
+  CMD_ANY_STRING_V("network.local_address.ipv4.set",         [nw_config](auto, auto& str)    { return nw_config->set_local_inet_address_str(str); });
   CMD_ANY         ("network.local_address.ipv6",             [nw_config](auto, auto)         { return nw_config->local_inet6_address_str(); });
-  CMD_ANY_STRING_V("network.local_address.ipv6.set",         [nw_config](auto, auto& str)    { return nw_config->set_local_inet6_address(str); });
+  CMD_ANY_STRING_V("network.local_address.ipv6.set",         [nw_config](auto, auto& str)    { return nw_config->set_local_inet6_address_str(str); });
 
   CMD_ANY         ("network.local_port",                     [nw_config](auto, auto)         { return nw_config->local_port_best_match(); });
-  CMD_ANY_VALUE_V ("network.local_port.set",                 [nw_config](auto, auto& value)  { return nw_config->set_local_port(checked_port_value(value, "local")); });
+  CMD_ANY_VALUE_V ("network.local_port.set",                 [nw_config](auto, auto& value) { return nw_config->set_local_port(checked_local_port_value(value, "local")); });
   CMD_ANY         ("network.local_port.ipv4",                [nw_config](auto, auto)         { return nw_config->local_inet_port(); });
-  CMD_ANY_VALUE_V ("network.local_port.ipv4.set",            [nw_config](auto, auto& value)  { return nw_config->set_local_inet_port(checked_port_value(value, "local ipv4")); });
+  CMD_ANY_VALUE_V ("network.local_port.ipv4.set",            [nw_config](auto, auto& value) { return nw_config->set_local_inet_port(checked_local_port_value(value, "local ipv4")); });
   CMD_ANY         ("network.local_port.ipv6",                [nw_config](auto, auto)         { return nw_config->local_inet6_port(); });
-  CMD_ANY_VALUE_V ("network.local_port.ipv6.set",            [nw_config](auto, auto& value)  { return nw_config->set_local_inet6_port(checked_port_value(value, "local ipv6")); });
+  CMD_ANY_VALUE_V ("network.local_port.ipv6.set",            [nw_config](auto, auto& value) { return nw_config->set_local_inet6_port(checked_local_port_value(value, "local ipv6")); });
 
   CMD_ANY         ("network.proxy.global",                   [](auto, auto)                  { return torrent::runtime::proxy_manager()->proxy_url(); });
   CMD_ANY_STRING_V("network.proxy.global.set",               [](auto, auto& str)             { return torrent::runtime::proxy_manager()->set_proxy_url(str); });

src/command_scheduler.cc

@@ -28,10 +28,9 @@ cmd_scheduler_simple_removed(core::Download* download) {
   control->core()->download_list()->pause(download);
 
   core::View* viewActive = *control->view_manager()->find("active");
-  unsigned int numActive = viewActive->size_visible();
   int64_t maxActive = rpc::call_command("scheduler.max_active", torrent::Object()).as_value();
 
-  if ((int64_t)numActive >= maxActive)
+  if ((int64_t)viewActive->size_visible() >= maxActive)
     return torrent::Object();
 
   // The 'started' view contains all the views we may choose amongst.
@@ -42,9 +41,6 @@ cmd_scheduler_simple_removed(core::Download* download) {
       continue;
 
     control->core()->download_list()->resume(*itr);
-
-    if ((int64_t)++numActive >= maxActive)
-      break;
   }
 
   return torrent::Object();

src/command_system.cc

@@ -167,7 +167,6 @@ initialize_command_system() {
   rpc::rpc.mark_safe("system.time");
   rpc::rpc.mark_safe("system.time_seconds");
   rpc::rpc.mark_safe("system.time_usec");
-  rpc::rpc.mark_safe("system.file.allocate");
   rpc::rpc.mark_safe("system.file.max_size");
   rpc::rpc.mark_safe("system.file.split_size");
   rpc::rpc.mark_safe("system.file.split_suffix");

src/command_throttle.cc

@@ -1,9 +1,10 @@
 #include "config.h"
 
-#include <limits>
+#include <cstdio>
 #include <torrent/throttle.h>
 #include <torrent/rate.h>
 #include <torrent/download/resource_manager.h>
+#include <torrent/net/socket_address.h>
 
 #include "core/manager.h"
 #include "ui/root.h"
@@ -14,6 +15,59 @@
 #include "control.h"
 #include "command_helpers.h"
 
+std::pair<uint32_t, uint32_t>
+parse_address_range(const torrent::Object::list_type& args, torrent::Object::list_type::const_iterator itr) {
+  unsigned int prefixWidth, ret;
+  char dummy;
+  char host[1024];
+  torrent::sa_unique_ptr sa;
+
+  ret = std::sscanf(itr->as_string().c_str(), "%1023[^/]/%d%c", host, &prefixWidth, &dummy);
+
+  if (ret < 1)
+    throw torrent::input_error("Invalid address/prefix.");
+
+  try {
+    sa = torrent::sa_copy(torrent::sa_lookup_address(host, AF_INET).get());
+
+  } catch (torrent::input_error& e) {
+    throw torrent::input_error("Could not resolve host: " + std::string(e.what()));
+  }
+
+  uint32_t begin, end;
+
+  auto sa_addr = htonl(reinterpret_cast<sockaddr_in*>(sa.get())->sin_addr.s_addr);
+
+  begin = end = sa_addr;
+
+  if (ret == 2) {
+    if (++itr != args.end())
+      throw torrent::input_error("Cannot specify both network and range end.");
+
+    uint32_t netmask = std::numeric_limits<uint32_t>::max() << (32 - prefixWidth);
+
+    if (prefixWidth >= 32 || sa_addr & ~netmask)
+      throw torrent::input_error("Invalid address/prefix.");
+
+    end = sa_addr | ~netmask;
+
+  } else if (++itr != args.end()) {
+    try {
+      sa = torrent::sa_copy(torrent::sa_lookup_address(itr->as_string(), AF_INET).get());
+
+    } catch (torrent::input_error& e) {
+      throw torrent::input_error("Could not resolve host: " + std::string(e.what()));
+    }
+
+    sa_addr = htonl(reinterpret_cast<sockaddr_in*>(sa.get())->sin_addr.s_addr);
+    end = sa_addr;
+  }
+
+  // convert to [begin, end) making sure the end doesn't overflow
+  // (this precludes 255.255.255.255 from ever matching, but that's not a real IP anyway)
+  return std::make_pair((uint32_t)begin, (uint32_t)std::max(end, end + 1));
+}
+
 torrent::Object
 apply_throttle(const torrent::Object::list_type& args, bool up) {
   auto arg_itr = args.begin();
@@ -29,16 +83,11 @@ apply_throttle(const torrent::Object::list_type& args, bool up) {
     throw torrent::input_error("Missing throttle rate for '" + name + "'.");
 
   int64_t rate;
-
-  if (!rpc::parse_whole_value_nothrow(arg_itr->as_string().c_str(), &rate))
-    throw torrent::input_error("Invalid throttle rate for '" + name + "'.");
+  rpc::parse_whole_value_nothrow(arg_itr->as_string().c_str(), &rate);
 
   if (rate < 0)
     throw torrent::input_error("Throttle rate must be non-negative.");
 
-  if (rate > (std::numeric_limits<int64_t>::max() >> 10))
-    throw torrent::input_error("Throttle rate is too large.");
-
   auto itr = control->core()->throttles().find(name);
 
   if (itr == control->core()->throttles().end())
@@ -89,24 +138,6 @@ throttle_update(const char* variable, int64_t value) {
   return torrent::Object();
 }
 
-static unsigned int
-throttle_rate_to_kb(int64_t rate) {
-  if (rate < 0 || rate > std::numeric_limits<unsigned int>::max() - 1)
-    throw torrent::input_error("Throttle rate must be between 0 and 4294967294.");
-
-  return static_cast<unsigned int>(rate >> 10);
-}
-
-static void
-set_up_throttle_i64(ui::Root* root, int64_t rate) {
-  root->set_up_throttle(throttle_rate_to_kb(rate));
-}
-
-static void
-set_down_throttle_i64(ui::Root* root, int64_t rate) {
-  root->set_down_throttle(throttle_rate_to_kb(rate));
-}
-
 void
 initialize_command_throttle() {
   CMD2_ANY         ("throttle.unchoked_uploads",       std::bind(&torrent::ResourceManager::currently_upload_unchoked, torrent::resource_manager()));
@@ -143,13 +174,13 @@ initialize_command_throttle() {
   CMD2_ANY         ("throttle.global_up.rate",              std::bind(&torrent::Rate::rate, torrent::up_rate()));
   CMD2_ANY         ("throttle.global_up.total",             std::bind(&torrent::Rate::total, torrent::up_rate()));
   CMD2_ANY         ("throttle.global_up.max_rate",          std::bind(&torrent::Throttle::max_rate, torrent::up_throttle_global()));
-  CMD2_ANY_VALUE_V ("throttle.global_up.max_rate.set",      std::bind(&set_up_throttle_i64, control->ui(), std::placeholders::_2));
-  CMD2_ANY_VALUE_KB("throttle.global_up.max_rate.set_kb",   std::bind(&set_up_throttle_i64, control->ui(), std::placeholders::_2));
+  CMD2_ANY_VALUE_V ("throttle.global_up.max_rate.set",      std::bind(&ui::Root::set_up_throttle_i64, control->ui(), std::placeholders::_2));
+  CMD2_ANY_VALUE_KB("throttle.global_up.max_rate.set_kb",   std::bind(&ui::Root::set_up_throttle_i64, control->ui(), std::placeholders::_2));
   CMD2_ANY         ("throttle.global_down.rate",            std::bind(&torrent::Rate::rate, torrent::down_rate()));
   CMD2_ANY         ("throttle.global_down.total",           std::bind(&torrent::Rate::total, torrent::down_rate()));
   CMD2_ANY         ("throttle.global_down.max_rate",        std::bind(&torrent::Throttle::max_rate, torrent::down_throttle_global()));
-  CMD2_ANY_VALUE_V ("throttle.global_down.max_rate.set",    std::bind(&set_down_throttle_i64, control->ui(), std::placeholders::_2));
-  CMD2_ANY_VALUE_KB("throttle.global_down.max_rate.set_kb", std::bind(&set_down_throttle_i64, control->ui(), std::placeholders::_2));
+  CMD2_ANY_VALUE_V ("throttle.global_down.max_rate.set",    std::bind(&ui::Root::set_down_throttle_i64, control->ui(), std::placeholders::_2));
+  CMD2_ANY_VALUE_KB("throttle.global_down.max_rate.set_kb", std::bind(&ui::Root::set_down_throttle_i64, control->ui(), std::placeholders::_2));
 
   // Temporary names, need to change this to accept real rates rather
   // than kB.

src/command_tracker.cc

@@ -142,7 +142,7 @@ initialize_command_tracker() {
       lt_log_print(torrent::LOG_DHT_ERROR, "dht.port.set is no longer supported, use dht.override_port.set", 0);
     });
   CMD2_ANY            ("dht.override_port",     [](auto, auto)        { return torrent::runtime::network_config()->override_dht_port(); });
-  CMD2_ANY_VALUE_V    ("dht.override_port.set", [](auto, auto& value) { return torrent::runtime::network_manager()->set_dht_port(checked_port_value(value, "DHT override")); });
+  CMD2_ANY_VALUE_V    ("dht.override_port.set", [](auto, auto& value) { return torrent::runtime::network_manager()->set_dht_port(value); });
 
   CMD2_ANY_STRING     ("dht.add_node",          [](auto, auto& str)   { return apply_dht_add_node(str); });
   CMD2_ANY            ("dht.statistics",        [](auto, auto)        { return control->dht_manager()->dht_statistics(); });

src/command_ui.cc

@@ -2,7 +2,6 @@
 
 #include <sys/types.h>
 
-#include <cerrno>
 #include <ctime>
 #include <limits>
 #include <regex>
@@ -127,20 +126,11 @@ apply_value([[maybe_unused]] rpc::target_type target, const torrent::Object::lis
   if (args.front().is_value()) {
     val = args.front().as_value();
   } else {
-    int64_t base = args.size() > 1 ? args.back().is_value() ?
-                   args.back().as_value() : strtoll(args.back().as_string().c_str(), NULL, 10) : 10;
-
-    if (base != 0 && (base < 2 || base > 36))
-      throw torrent::input_error("'value' base must be 0 or between 2 and 36!");
-
+    int base = args.size() > 1 ? args.back().is_value() ?
+               args.back().as_value() : strtol(args.back().as_string().c_str(), NULL, 10) : 10;
     char* endptr = 0;
-    errno = 0;
 
     val = strtoll(args.front().as_string().c_str(), &endptr, base);
-
-    if (errno == ERANGE)
-      throw torrent::input_error("Number out of range: " + args.front().as_string());
-
     while (*endptr == ' ' || *endptr == '\n') ++endptr;
     if (*endptr)
       throw torrent::input_error("Junk at end of number: " + args.front().as_string());

src/core/dht_manager.cc

@@ -4,7 +4,6 @@
 
 #include <fstream>
 #include <sstream>
-#include <torrent/exceptions.h>
 #include <torrent/object.h>
 #include <torrent/object_stream.h>
 #include <torrent/rate.h>
@@ -63,14 +62,7 @@ DhtManager::load_dht_cache() {
     LT_LOG("could not open cache file (path:%s)", cache_filename.c_str());
   }
 
-  try {
-    torrent::runtime::network_manager()->dht_controller()->initialize(cache);
-
-  } catch (const torrent::base_error& e) {
-    LT_LOG_ERROR("cache file rejected, discarding (path:%s errmsg:%s)", cache_filename.c_str(), e.what());
-
-    torrent::runtime::network_manager()->dht_controller()->initialize(torrent::Object::create_map());
-  }
+  torrent::runtime::network_manager()->dht_controller()->initialize(cache);
 
   if (m_start == dht_on)
     start_dht();
@@ -140,12 +132,11 @@ DhtManager::save_dht_cache() {
   torrent::Object cache = torrent::Object::create_map();
   cache_file << *torrent::runtime::network_manager()->dht_controller()->store_cache(&cache);
 
-  // The data only reaches the kernel here, so this is where a full disk is seen.
-  cache_file.close();
-
   if (!cache_file.good())
     return;
 
+  cache_file.close();
+
   ::rename(filename_tmp.c_str(), filename.c_str());
 }
 

src/core/download.h

@@ -51,14 +51,6 @@ public:
   bool                is_hash_checking() const                 { return m_download.is_hash_checking(); }
 
   bool                is_hash_failed() const                   { return m_hashFailed; }
-
-  // Expires once the download is erased, even if other owners keep the
-  // object alive. Take it before triggering events that may erase.
-  std::weak_ptr<void> lifetime() const                         { return m_lifetime; }
-  void                release_lifetime()                       { m_lifetime.reset(); }
-
-  bool                is_erasing() const                       { return m_erasing; }
-  void                set_erasing()                            { m_erasing = true; }
   void                set_hash_failed(bool v)                  { m_hashFailed = v; }
 
   download_type*       download()                              { return &m_download; }
@@ -111,8 +103,6 @@ private:
   // Store the FileList instance so we can use slots etc on it.
   download_type       m_download;
   bool                m_hashFailed{};
-  bool                m_erasing{};
-  std::shared_ptr<void> m_lifetime{std::make_shared<char>()};
   std::string         m_message;
   uint32_t            m_resumeFlags{default_resume_flags};
   unsigned int        m_group{};

src/core/download_factory.cc

@@ -7,7 +7,6 @@
 #include <functional>
 #include <sstream>
 #include <stdexcept>
-#include <sys/stat.h>
 #include <torrent/utils/log.h>
 #include <torrent/utils/resume.h>
 #include <torrent/object.h>
@@ -28,6 +27,8 @@
 
 namespace core {
 
+static constexpr const char* session_invalid_message = "Session data is invalid, ignoring it";
+
 bool
 is_network_uri(const std::string& uri) {
   return
@@ -36,15 +37,16 @@ is_network_uri(const std::string& uri) {
     std::strncmp(uri.c_str(), "ftp://", 6) == 0;
 }
 
-static constexpr const char* session_invalid_message = "Session data is invalid, ignoring it";
+bool
+is_magnet_uri(const std::string& uri) {
+  return
+    std::strncmp(uri.c_str(), "magnet:?", 8) == 0;
+}
 
-static std::unique_ptr<torrent::Object>
+namespace {
+
+std::unique_ptr<torrent::Object>
 download_factory_load_stream(const char* filename, bool* is_invalid) {
-  struct stat sb;
-
-  if (stat(filename, &sb) != 0 || !S_ISREG(sb.st_mode))
-    return std::unique_ptr<torrent::Object>();
-
   std::fstream stream(filename, std::ios::in | std::ios::binary);
 
   if (!stream.is_open())
@@ -61,17 +63,34 @@ download_factory_load_stream(const char* filename, bool* is_invalid) {
   return obj;
 }
 
-bool
-is_magnet_uri(const std::string& uri) {
-  return
-    std::strncmp(uri.c_str(), "magnet:?", 8) == 0;
+std::unique_ptr<torrent::Object>
+create_untrusted_object(torrent::Object& obj) {
+  auto trusted_object = std::make_unique<torrent::Object>(torrent::Object::create_map());
+
+  if (obj.has_key("info"))
+    trusted_object->insert_key_move("info", obj.get_key("info"));
+
+  if (obj.has_key("announce"))
+    trusted_object->insert_key_move("announce", obj.get_key("announce"));
+
+  if (obj.has_key("announce-list"))
+    trusted_object->insert_key_move("announce-list", obj.get_key("announce-list"));
+
+  if (obj.has_key("creation date"))
+    trusted_object->insert_key_move("creation date", obj.get_key("creation date"));
+
+  if (obj.has_key("created by"))
+    trusted_object->insert_key_move("created by", obj.get_key("created by"));
+
+  return trusted_object;
 }
 
-DownloadFactory::DownloadFactory(Manager* m) :
-    m_manager(m) {
+} // namespace anonymous
 
-  m_task_load.slot() = std::bind(&DownloadFactory::receive_load, this);
-  m_task_commit.slot() = std::bind(&DownloadFactory::receive_commit, this);
+
+DownloadFactory::DownloadFactory(Manager* m, bool trusted)
+  : m_manager(m),
+    m_trusted(trusted) {
 
   // m_variables["connection_leech"] = rpc::call_command("protocol.connection.leech");
   // m_variables["connection_seed"]  = rpc::call_command("protocol.connection.seed");
@@ -84,21 +103,49 @@ DownloadFactory::DownloadFactory(Manager* m) :
 DownloadFactory::~DownloadFactory() {
   torrent::this_thread::scheduler()->erase(&m_task_load);
   torrent::this_thread::scheduler()->erase(&m_task_commit);
-
-  delete m_object;
 }
 
 void
-DownloadFactory::load(const std::string& uri) {
+DownloadFactory::load_trusted(const std::string& uri) {
+  if (!m_trusted)
+    throw torrent::internal_error("DownloadFactory::load_trusted() called on an untrusted object");
+
   m_uri = uri;
+  m_task_load.slot() = [this]() { receive_load_trusted(); };
+
   torrent::this_thread::scheduler()->wait_for(&m_task_load, 0ms);
 }
 
-// This function must be called before DownloadFactory::commit().
 void
-DownloadFactory::load_raw_data(const std::string& input) {
+DownloadFactory::load_untrusted(const std::string& uri) {
+  if (m_trusted)
+    throw torrent::internal_error("DownloadFactory::load_untrusted() called on a trusted object");
+
+  m_uri = uri;
+  m_task_load.slot() = [this]() { receive_load_untrusted(); };
+
+  torrent::this_thread::scheduler()->wait_for(&m_task_load, 0ms);
+}
+
+void
+DownloadFactory::load_raw_data_trusted(const std::string& input) {
+  if (!m_trusted)
+    throw torrent::internal_error("DownloadFactory::load_raw_data_trusted() called on an untrusted object");
+
   if (m_stream)
-    throw torrent::internal_error("DownloadFactory::load*() called on an object with m_stream != NULL");
+    throw torrent::internal_error("DownloadFactory::load_raw_data_trusted() called on an object with m_stream != NULL");
+
+  m_stream.reset(new std::stringstream(input));
+  m_loaded = true;
+}
+
+void
+DownloadFactory::load_raw_data_untrusted(const std::string& input) {
+  if (m_trusted)
+    throw torrent::internal_error("DownloadFactory::load_raw_data_untrusted() called on an trusted object");
+
+  if (m_stream)
+    throw torrent::internal_error("DownloadFactory::load_raw_data_untrusted() called on an object with m_stream != NULL");
 
   m_stream.reset(new std::stringstream(input));
   m_loaded = true;
@@ -106,53 +153,91 @@ DownloadFactory::load_raw_data(const std::string& input) {
 
 void
 DownloadFactory::commit() {
+  if (!m_trusted)
+    throw torrent::internal_error("DownloadFactory::commit() called on an untrusted object");
+
+  m_task_commit.slot() = [this]() { receive_commit(); };
   torrent::this_thread::scheduler()->wait_for(&m_task_commit, 0ms);
 }
 
 void
-DownloadFactory::receive_load() {
-  if (m_stream)
-    throw torrent::internal_error("DownloadFactory::load*() called on an object with m_stream != NULL");
+DownloadFactory::process_load_network_uri() {
+  m_stream.reset(new std::stringstream);
 
-  if (is_network_uri(m_uri)) {
-    m_stream.reset(new std::stringstream);
+  // TODO: Add trusted flag.
 
-    auto done_fn   = [this]() { receive_loaded(); };
-    auto failed_fn = [this](const std::string& error) { receive_failed(error); };
+  auto done_fn   = [this]()                         { receive_loaded(); };
+  auto failed_fn = [this](const std::string& error) { receive_failed(error); };
 
-    m_manager->http_queue()->insert(m_uri, m_stream, done_fn, failed_fn);
+  m_manager->http_queue()->insert(m_uri, m_stream, done_fn, failed_fn);
 
-    m_variables["tied_to_file"] = (int64_t)false;
-    return;
-  }
+  m_variables["tied_to_file"] = (int64_t)false;
+}
 
-  if (is_magnet_uri(m_uri)) {
-    // DEBUG: Use m_object.
-    m_stream.reset(new std::stringstream());
-    *m_stream << "d10:magnet-uri" << m_uri.length() << ":" << m_uri << "e";
+void
+DownloadFactory::process_load_magnet_uri() {
+  m_stream.reset(new std::stringstream());
+  *m_stream << "d10:magnet-uri" << m_uri.length() << ":" << m_uri << "e";
 
-    m_variables["tied_to_file"] = (int64_t)false;
+  m_variables["tied_to_file"] = (int64_t)false;
 
-    receive_loaded();
-    return;
-  }
+  receive_loaded();
+}
 
+void
+DownloadFactory::process_load_file_uri() {
   std::fstream stream(expand_path(m_uri).c_str(), std::ios::in | std::ios::binary);
 
   if (!stream.is_open())
     return receive_failed("Could not open file");
 
-  m_object = new torrent::Object;
+  m_object = std::make_unique<torrent::Object>();
   stream >> *m_object;
 
   if (!stream.good())
     return receive_failed("Reading torrent file failed");
 
-  m_isFile = true;
+  m_is_file = true;
 
   receive_loaded();
 }
 
+void
+DownloadFactory::receive_load_trusted() {
+  if (!m_trusted)
+    throw torrent::internal_error("DownloadFactory::receive_load_trusted() called on an untrusted object");
+
+  if (m_stream)
+    throw torrent::internal_error("DownloadFactory::receive_load_trusted() called on an object with null m_stream");
+
+  if (is_network_uri(m_uri))
+    return process_load_network_uri();
+
+  if (is_magnet_uri(m_uri))
+    return process_load_magnet_uri();
+
+  process_load_file_uri();
+}
+
+void
+DownloadFactory::receive_load_untrusted() {
+  if (m_trusted)
+    throw torrent::internal_error("DownloadFactory::receive_load_untrusted() called on a trusted object");
+
+  if (m_stream)
+    throw torrent::internal_error("DownloadFactory::load*() called on an object with null m_stream");
+
+  if (is_network_uri(m_uri))
+    return process_load_network_uri();
+
+  // TODO: Don't need to handle untrusted commands magnet URIs.
+
+  // if (is_magnet_uri(m_uri))
+  //   return process_load_magnet_uri();
+
+  throw torrent::internal_error("DownloadFactory::receive_load_untrusted() called on a non-network/magnet URI");
+}
+
 void
 DownloadFactory::receive_loaded() {
   m_loaded = true;
@@ -171,38 +256,40 @@ DownloadFactory::receive_commit() {
 
 void
 DownloadFactory::receive_success() {
-  bool session_invalid = false;
+  if (!m_trusted && m_session)
+    throw torrent::internal_error("DownloadFactory::receive_success() called on an untrusted object with m_session == true");
 
-  std::unique_ptr<torrent::Object> rtorrent_object;
-  std::unique_ptr<torrent::Object> libtorrent_resume_object;
+  if (m_session && !m_is_file)
+    throw torrent::internal_error("DownloadFactory::receive_success() called on a non-file object with m_session == true");
+
+  bool     session_invalid = false;
+  uint32_t tracker_key     = tracker_key = random() % (std::numeric_limits<uint32_t>::max() - 1) + 1;
+
+  std::unique_ptr<torrent::Object> rtorrent_object, libtorrent_resume_object;
 
   if (m_session) {
-    if (m_uri.empty())
-      throw torrent::input_error("Session torrent URI is empty.");
+     rtorrent_object          = download_factory_load_stream((expand_path(m_uri) + ".rtorrent").c_str(), &session_invalid);
+     libtorrent_resume_object = download_factory_load_stream((expand_path(m_uri) + ".libtorrent_resume").c_str(), &session_invalid);
 
-    rtorrent_object          = download_factory_load_stream((expand_path(m_uri) + ".rtorrent").c_str(), &session_invalid);
-    libtorrent_resume_object = download_factory_load_stream((expand_path(m_uri) + ".libtorrent_resume").c_str(), &session_invalid);
+     if (session_invalid)
+       lt_log_print(torrent::LOG_ERROR, "%s: %s", session_invalid_message, m_uri.c_str());
 
-    if (session_invalid)
-      lt_log_print(torrent::LOG_ERROR, "%s: %s", session_invalid_message, m_uri.c_str());
+     if (rtorrent_object && rtorrent_object->has_key_value("key"))
+       tracker_key = rtorrent_object->get_key_value("key");
   }
 
-  uint32_t tracker_key;
+  // TODO: This adds the torrent, so untrusted can add brokent torrents.
 
-  if (rtorrent_object && rtorrent_object->has_key_value("key"))
-    tracker_key = rtorrent_object->get_key_value("key");
-  else
-    tracker_key = random() % (std::numeric_limits<uint32_t>::max() - 1) + 1;
+  if (m_stream != nullptr)
+    object_from_stream();
 
-  Download* download = m_stream != nullptr ?
-    m_manager->download_list()->create(m_stream.get(), tracker_key, m_printLog) :
-    m_manager->download_list()->create(m_object, tracker_key, m_printLog);
+  if (m_trusted)
+    m_object = create_untrusted_object(*m_object);
 
-  m_object = NULL;
+  Download* download = m_manager->download_list()->create(std::move(m_object), tracker_key, m_print_log);
 
-  if (download == NULL) {
-    // core::Manager should already have added the error message to
-    // the log.
+  if (download == nullptr) {
+    // core::Manager should already have added the error message to the log.
     m_slot_finished();
     return;
   }
@@ -211,39 +298,49 @@ DownloadFactory::receive_success() {
     download->set_hash_failed(true);
     download->set_message(session_invalid_message);
 
-    if (m_printLog)
+    if (m_print_log)
       m_manager->push_log_std(std::string(session_invalid_message) + ": \"" + m_uri + "\"");
   }
 
   torrent::Object* root = download->bencode();
 
   if (download->download()->info()->is_meta_download()) {
+    if (!m_trusted)
+      throw torrent::internal_error("DownloadFactory::receive_success() called on an untrusted object with a meta download");
+
     torrent::Object& meta = root->insert_key("rtorrent_meta_download", torrent::Object::create_map());
     meta.insert_key("start", m_start);
-    meta.insert_key("print_log", m_printLog);
+    meta.insert_key("print_log", m_print_log);
 
-    torrent::Object::list_type& commands = meta.insert_key("commands", torrent::Object::create_list()).as_list();
+    // TODO: ADD UNTRUSTED!!!
+    auto& commands = meta.insert_key("commands", torrent::Object::create_list()).as_list();
 
     for (auto& m_command : m_commands)
       commands.push_back(m_command);
   }
 
   if (m_session) {
+    if (!m_trusted)
+      throw torrent::internal_error("DownloadFactory::receive_success() called on an untrusted object with m_session == true");
+
     if (rtorrent_object)
       root->insert_key_move("rtorrent", *rtorrent_object);
 
     if (libtorrent_resume_object)
       root->insert_key_move("libtorrent_resume", *libtorrent_resume_object);
 
+  } else if (!m_trusted) {
+    if (root->has_key("rtorrent") || root->has_key("libtorrent_resume"))
+      throw torrent::internal_error("DownloadFactory::receive_success() called on an untrusted object with 'rtorrent' or 'libtorrent_resume' keys");
+
   } else {
-    // We only allow session torrents to keep their
-    // 'rtorrent/libtorrent' sections. The "fast_resume" section
-    // should be safe to keep.
+    // We only allow session torrents to keep their 'rtorrent/libtorrent' sections. The
+    // "fast_resume" section should be safe to keep.
     root->erase_key("rtorrent");
   }
 
-  torrent::Object* rtorrent = &root->insert_preserve_copy("rtorrent", torrent::Object::create_map()).first->second;
-  torrent::Object& resumeObject = root->insert_preserve_copy("libtorrent_resume", torrent::Object::create_map()).first->second;
+  auto* rtorrent     = &root->insert_preserve_copy("rtorrent", torrent::Object::create_map()).first->second;
+  auto& resumeObject = root->insert_preserve_copy("libtorrent_resume", torrent::Object::create_map()).first->second;
 
   rtorrent->insert_key("key", download->tracker_controller().key());
 
@@ -273,7 +370,7 @@ DownloadFactory::receive_success() {
   }
 
   // Skip forcing trackers to scrape when rtorrent starts
-  if (m_initLoad && rpc::call_command_value("trackers.delay_scrape"))
+  if (m_init_load && rpc::call_command_value("trackers.delay_scrape"))
     download->set_resume_flags(torrent::Download::start_skip_tracker);
 
   // Check first if we already have these values set in the session
@@ -315,7 +412,7 @@ DownloadFactory::receive_success() {
 
     lt_log_print(torrent::LOG_ERROR, "%s: %s", msg.c_str(), m_uri.c_str());
 
-    if (m_printLog)
+    if (m_print_log)
       m_manager->push_log_std(msg + ": \"" + m_uri + "\"");
 
     download->set_hash_failed(true);
@@ -339,8 +436,13 @@ DownloadFactory::receive_success() {
     if (torrent::log_groups[torrent::LOG_TORRENT_DEBUG].valid())
       log_created(download, rtorrent);
 
-    for (const auto& command : m_commands)
-      rpc::parse_command_multiple_std(command, rpc::make_target(download));
+    if (m_trusted) {
+      for (const auto& command : m_commands)
+        rpc::parse_command_multiple_std(command, rpc::make_target(download));
+
+    } else {
+      // TODO: CALL UNTRUSTED COMMANDS
+    }
 
     if (m_manager->download_list()->find(infohash) == m_manager->download_list()->end())
       throw torrent::input_error("The newly created download was removed.");
@@ -354,7 +456,7 @@ DownloadFactory::receive_success() {
   } catch (torrent::input_error& e) {
     std::string msg = "Command on torrent creation failed: " + std::string(e.what());
 
-    if (m_printLog)
+    if (m_print_log)
       m_manager->push_log_std(msg);
 
     if (m_manager->download_list()->find(infohash) != m_manager->download_list()->end()) {
@@ -368,6 +470,18 @@ DownloadFactory::receive_success() {
   m_slot_finished();
 }
 
+void
+DownloadFactory::receive_failed(const std::string& msg) {
+  if (m_print_log) {
+    if (m_trusted)
+      m_manager->push_log_std("Failed to load torrent: " + msg + ": \"" + m_uri + "\"");
+    else
+      m_manager->push_log_std("Failed to load untrusted torrent: " + msg);
+  }
+
+  m_slot_finished();
+}
+
 void
 DownloadFactory::log_created(Download* download, torrent::Object* rtorrent) {
   std::stringstream dump;
@@ -394,15 +508,6 @@ DownloadFactory::log_created(Download* download, torrent::Object* rtorrent) {
   lt_log_print_dump(torrent::LOG_TORRENT_DEBUG, dump_str.c_str(), dump_str.size(), "Creating new download:");
 }
 
-void
-DownloadFactory::receive_failed(const std::string& msg) {
-  // Add message to log.
-  if (m_printLog)
-    m_manager->push_log_std(msg + ": \"" + m_uri + "\"");
-
-  m_slot_finished();
-}
-
 void
 DownloadFactory::initialize_rtorrent(Download* download, torrent::Object* rtorrent) {
   auto cached_seconds = torrent::this_thread::cached_seconds().count();
@@ -426,7 +531,7 @@ DownloadFactory::initialize_rtorrent(Download* download, torrent::Object* rtorre
   rtorrent->insert_preserve_copy("timestamp.finished", (int64_t)0);
 
   rtorrent->insert_preserve_copy("tied_to_file", "");
-  rtorrent->insert_key("loaded_file", m_isFile ? m_uri : std::string());
+  rtorrent->insert_key("loaded_file", m_is_file ? m_uri : std::string());
 
   if (rtorrent->has_key_value("priority"))
     rpc::call_command("d.priority.set", rtorrent->get_key_value("priority") % 4, rpc::make_target(download));
@@ -458,4 +563,18 @@ DownloadFactory::initialize_rtorrent(Download* download, torrent::Object* rtorre
   rtorrent->insert_preserve_copy("choke_heuristics.down.seed",  std::string());
 }
 
+void
+DownloadFactory::object_from_stream() {
+  m_object = std::make_unique<torrent::Object>();
+
+  *m_stream >> *m_object;
+
+  if (!m_stream->good() || !m_object->is_map()) {
+    if (m_print_log)
+      lt_log_print(torrent::LOG_TORRENT_ERROR, "Could not create download, stream is not a valid torrent.");
+
+    throw torrent::input_error("Invalid torrent data");
+  }
+}
+
 }

src/core/download_factory.h

@@ -24,14 +24,18 @@ public:
   typedef std::vector<std::string> command_list_type;
 
   // Do not destroy this object while it is in a HttpQueue.
-  DownloadFactory(Manager* m);
+  DownloadFactory(Manager* m, bool trusted);
   ~DownloadFactory();
 
   // Calling of receive_load() is delayed so you can change whatever
   // you want without fear of the slots being triggered as you call
   // load() or commit().
-  void                load(const std::string& uri);
-  void                load_raw_data(const std::string& input);
+  void                load_trusted(const std::string& uri);
+  void                load_untrusted(const std::string& uri);
+
+  void                load_raw_data_trusted(const std::string& input);
+  void                load_raw_data_untrusted(const std::string& input);
+
   void                commit();
 
   command_list_type&         commands()     { return m_commands; }
@@ -43,16 +47,21 @@ public:
   bool                get_start() const     { return m_start; }
   void                set_start(bool v)     { m_start = v; }
 
-  bool                get_init_load() const { return m_initLoad; }
-  void                set_init_load(bool v) { m_initLoad = v; }
+  bool                get_init_load() const { return m_init_load; }
+  void                set_init_load(bool v) { m_init_load = v; }
 
-  bool                print_log() const     { return m_printLog; }
-  void                set_print_log(bool v) { m_printLog = v; }
+  bool                print_log() const     { return m_print_log; }
+  void                set_print_log(bool v) { m_print_log = v; }
 
   void                slot_finished(slot_void s) { m_slot_finished = s; }
 
 private:
-  void                receive_load();
+  void                process_load_network_uri();
+  void                process_load_magnet_uri();
+  void                process_load_file_uri();
+
+  void                receive_load_trusted();
+  void                receive_load_untrusted();
   void                receive_loaded();
   void                receive_commit();
   void                receive_success();
@@ -62,19 +71,23 @@ private:
 
   void                initialize_rtorrent(Download* download, torrent::Object* rtorrent);
 
-  Manager*                       m_manager;
-  std::shared_ptr<std::iostream> m_stream;
-  torrent::Object*               m_object{};
+  void                object_from_stream();
 
+  Manager*            m_manager;
+
+  std::shared_ptr<std::iostream>   m_stream;
+  std::unique_ptr<torrent::Object> m_object{};
+
+  bool                m_trusted{};
   bool                m_commited{};
   bool                m_loaded{};
 
   std::string         m_uri;
   bool                m_session{};
   bool                m_start{};
-  bool                m_printLog{true};
-  bool                m_isFile{};
-  bool                m_initLoad{};
+  bool                m_print_log{true};
+  bool                m_is_file{};
+  bool                m_init_load{};
 
   command_list_type         m_commands;
   torrent::Object::map_type m_variables;

src/core/download_list.cc

@@ -82,7 +82,7 @@ DownloadList::find(const torrent::HashString& hash) {
 
 DownloadList::iterator
 DownloadList::find_hex(const char* hash) {
-  if (strlen(hash) != 40)
+  if (strlen(hash) < 40)
     return end();
 
   torrent::HashString key;
@@ -101,49 +101,17 @@ DownloadList::find_hex_ptr(const char* hash) {
 }
 
 Download*
-DownloadList::create(torrent::Object* obj, uint32_t tracker_key, bool printLog) {
+DownloadList::create(std::unique_ptr<torrent::Object> obj, uint32_t tracker_key, bool printLog) {
   torrent::Download download;
 
-  try {
-    download = torrent::download_add(obj, tracker_key);
-
-  } catch (torrent::local_error& e) {
-    if (printLog)
-      lt_log_print(torrent::LOG_TORRENT_ERROR, "Could not create download: %s", e.what());
-
-    delete obj;
-
-    return NULL;
-  }
-
-  // There's no non-critical exceptions that should be throwable by
-  // the ctor, so don't catch.
-  return new Download(download);
-}
-
-Download*
-DownloadList::create(std::istream* str, uint32_t tracker_key, bool printLog) {
-  torrent::Object* object = new torrent::Object;
-  torrent::Download download;
+  auto obj_ptr = obj.get();
 
   try {
-    *str >> *object;
-
-    // Don't throw input_error from here as gcc-3.3.5 produces bad
-    // code.
-    if (str->fail()) {
-      delete object;
-
-      if (printLog)
-        lt_log_print(torrent::LOG_TORRENT_ERROR, "Could not create download, the input is not a valid torrent.");
-
-      return NULL;
-    }
-
-    download = torrent::download_add(object, tracker_key);
+    download = torrent::download_add(obj.release(), tracker_key);
 
   } catch (torrent::local_error& e) {
-    delete object;
+    // TODO: Fix download_add so it takes the unique_ptr.
+    delete obj_ptr;
 
     if (printLog)
       lt_log_print(torrent::LOG_TORRENT_ERROR, "Could not create download: %s", e.what());
@@ -194,12 +162,6 @@ DownloadList::erase(iterator itr) {
   if (itr == end())
     throw torrent::internal_error("DownloadList::erase(...) could not find download.");
 
-  // An event handler below may erase the same download again.
-  if ((*itr)->is_erasing())
-    return std::next(itr);
-
-  (*itr)->set_erasing();
-
   lt_log_print_info(torrent::LOG_TORRENT_INFO, (*itr)->info(), "download_list", "Erasing download.");
 
   // Makes sure close doesn't restart hashing of this download.
@@ -213,7 +175,6 @@ DownloadList::erase(iterator itr) {
   for (auto v : *control->view_manager())
     v->erase(itr->get());
 
-  (*itr)->release_lifetime();
   torrent::download_remove(*(*itr)->download());
 
   return base_type::erase(itr);
@@ -282,7 +243,6 @@ void
 DownloadList::close_directly(Download* download) {
   lt_log_print_info(torrent::LOG_TORRENT_INFO, download->info(), "download_list", "Closing download directly.");
 
-  auto lifetime   = download->lifetime();
   bool was_active = download->download()->info()->is_active();
   bool was_open   = download->download()->info()->is_open();
 
@@ -291,19 +251,11 @@ DownloadList::close_directly(Download* download) {
 
   if (was_active) {
     DL_TRIGGER_EVENT(download, "event.download.paused");
-
-    if (lifetime.expired())
-      return;
-
     update_paused_state(download);
   }
 
   if (was_open) {
     DL_TRIGGER_EVENT(download, "event.download.hash_removed");
-
-    if (lifetime.expired())
-      return;
-
     DL_TRIGGER_EVENT(download, "event.download.closed");
   }
 }
@@ -317,7 +269,7 @@ DownloadList::set_state_stopped(Download* download) {
 void
 DownloadList::update_paused_state(Download* download) {
   rpc::call_command("d.state_changed.set", torrent::this_thread::cached_seconds().count(), rpc::make_target(download));
-  rpc::call_command("d.state_counter.set", rpc::call_command_value("d.state_counter", rpc::make_target(download)) + 1, rpc::make_target(download));
+  rpc::call_command("d.state_counter.set", rpc::call_command_value("d.state_counter", rpc::make_target(download)), rpc::make_target(download));
 
   // If initial seeding is complete, don't try it again when restarting.
   if (download->is_done() &&
@@ -346,13 +298,8 @@ DownloadList::close_throw(Download* download) {
   // When pause gets called it will clear the initial hash check state
   // and set hash failed. This should ensure hashing doesn't restart
   // until resume gets called.
-  auto lifetime = download->lifetime();
-
   pause(download);
 
-  if (lifetime.expired())
-    return;
-
   // Check for is_open after pause due to hashing.
   if (!download->is_open())
     return;
@@ -372,10 +319,6 @@ DownloadList::close_throw(Download* download) {
     throw torrent::internal_error("DownloadList::close_throw(...) called but we're going into a hashing loop.");
 
   DL_TRIGGER_EVENT(download, "event.download.hash_removed");
-
-  if (lifetime.expired())
-    return;
-
   DL_TRIGGER_EVENT(download, "event.download.closed");
 }
 
@@ -482,8 +425,6 @@ DownloadList::pause(Download* download, int flags) {
 
   lt_log_print_info(torrent::LOG_TORRENT_INFO, download->info(), "download_list", "Pausing download: flags:%0x.", flags);
 
-  auto lifetime = download->lifetime();
-
   try {
 
     download->set_resume_flags(Download::default_resume_flags);
@@ -497,9 +438,6 @@ DownloadList::pause(Download* download, int flags) {
       rpc::call_command_set_value("d.hashing.set", Download::variable_hashing_stopped, rpc::make_target(download));
 
       DL_TRIGGER_EVENT(download, "event.download.hash_removed");
-
-      if (lifetime.expired())
-        return;
     }
 
     if (!download->download()->info()->is_active())
@@ -513,9 +451,6 @@ DownloadList::pause(Download* download, int flags) {
     // view.
     DL_TRIGGER_EVENT(download, "event.download.paused");
 
-    if (lifetime.expired())
-      return;
-
     update_paused_state(download);
 
     // Save the state after all the slots, etc have been called so we
@@ -596,15 +531,9 @@ DownloadList::hash_done(Download* download) {
     rpc::call_command("d.complete.set", (int64_t)download->is_done(), rpc::make_target(download));
     torrent::resume_save_progress(*download->download(), download->download()->bencode()->get_key("libtorrent_resume"));
 
-    if (rpc::call_command_value("d.state", rpc::make_target(download)) == 1) {
-      auto lifetime = download->lifetime();
-
+    if (rpc::call_command_value("d.state", rpc::make_target(download)) == 1)
       resume(download, download->resume_flags());
 
-      if (lifetime.expired())
-        return;
-    }
-
     break;
 
   case Download::variable_hashing_last:
@@ -641,24 +570,11 @@ DownloadList::hash_queue(Download* download, int type) {
 
   // HACK
   if (download->is_open()) {
-    auto lifetime = download->lifetime();
-
     pause(download, torrent::Download::stop_skip_tracker);
-
-    if (lifetime.expired())
-      return;
-
     download->download()->close();
 
     DL_TRIGGER_EVENT(download, "event.download.hash_removed");
-
-    if (lifetime.expired())
-      return;
-
     DL_TRIGGER_EVENT(download, "event.download.closed");
-
-    if (lifetime.expired())
-      return;
   }
 
   torrent::resume_clear_progress(*download->download(), download->download()->bencode()->get_key("libtorrent_resume"));
@@ -709,10 +625,6 @@ DownloadList::confirm_finished(Download* download) {
   if (choke_up.is_string_empty())     choke_up     = rpc::call_command("protocol.choke_heuristics.up.seed", torrent::Object(), rpc::make_target(download));
   if (choke_down.is_string_empty())   choke_down   = rpc::call_command("protocol.choke_heuristics.down.seed", torrent::Object(), rpc::make_target(download));
 
-  // libtorrent refuses initial seeding on an active download.
-  if (download->is_active() && conn_current.as_string() == "initial_seed")
-    conn_current = "seed";
-
   rpc::call_command("d.connection_current.set",    conn_current, rpc::make_target(download));
   rpc::call_command("d.up.choke_heuristics.set",   choke_up, rpc::make_target(download));
   rpc::call_command("d.down.choke_heuristics.set", choke_down, rpc::make_target(download));
@@ -738,12 +650,12 @@ DownloadList::confirm_finished(Download* download) {
   // up/downloaded baseline.
   download->download()->send_completed();
 
-  // The finished event may erase the download.
-  auto lifetime = download->lifetime();
+  // Save the hash in case the finished event erases it.
+  torrent::HashString infohash = download->info()->hash();
 
   DL_TRIGGER_EVENT(download, "event.download.finished");
 
-  if (lifetime.expired())
+  if (find(infohash) == end())
     return;
 
 //   if (download->resume_flags() != Download::default_resume_flags)
@@ -782,10 +694,11 @@ DownloadList::process_meta_download(Download* download) {
     return;
   }
 
-  auto bencode = std::make_unique<torrent::Object>(torrent::Object::create_map());
+  torrent::Object* bencode = new torrent::Object(torrent::Object::create_map());
   file >> bencode->insert_key("info", torrent::Object());
 
   if (file.fail()) {
+    delete bencode;
     lt_log_print(torrent::LOG_TORRENT_ERROR, "Could not create download, the input is not a valid torrent.");
     return;
   }
@@ -801,7 +714,7 @@ DownloadList::process_meta_download(Download* download) {
 
   erase_ptr(download);
 
-  control->core()->try_create_download_from_meta_download(std::move(bencode), metafile);
+  control->core()->try_create_download_from_meta_download(bencode, metafile);
 }
 
 }

src/core/download_list.h

@@ -52,8 +52,7 @@ public:
   Download*           find_hex_ptr(const char* hash);
 
   // Might move this to DownloadFactory.
-  Download*           create(std::istream* str, uint32_t tracker_key, bool printLog);
-  Download*           create(torrent::Object* obj, uint32_t tracker_key, bool printLog);
+  Download*           create(std::unique_ptr<torrent::Object> obj, uint32_t tracker_key, bool printLog);
 
   iterator            insert(Download* d);
 

src/core/manager.cc

@@ -37,6 +37,8 @@
 
 namespace core {
 
+void path_expand(std::vector<std::string>* paths, const std::string& pattern);
+
 const int Manager::create_start;
 const int Manager::create_tied;
 const int Manager::create_quiet;
@@ -195,41 +197,61 @@ Manager::try_create_download(const std::string& uri, int flags, const command_li
     return;
 
   // Adding download.
-  auto f = std::make_unique<DownloadFactory>(this);
+  DownloadFactory* f = new DownloadFactory(this, true);
 
   f->variables()["tied_to_file"] = (int64_t)(bool)(flags & create_tied);
   f->commands().insert(f->commands().end(), commands.begin(), commands.end());
 
   f->set_start(flags & create_start);
   f->set_print_log(!(flags & create_quiet));
-  f->slot_finished([factory = f.get()]() { delete factory; });
+  f->slot_finished([f]() { delete f; });
 
-  if (is_data_uri(uri)) {
+  if (flags & create_raw_data) {
+    f->load_raw_data_trusted(uri);
+
+  } else if (is_data_uri(uri)) {
     // Allow the use of data URIs, primarily for JSON-RPC which
     // doesn't have a defined mechanism for binary data
-    f->load_raw_data(decode_data_uri(uri));
+    f->load_raw_data_trusted(decode_data_uri(uri));
     f->variables()["tied_to_file"] = (int64_t)false;
-  } else if (flags & create_raw_data) {
-    f->load_raw_data(uri);
+
   } else {
-    f->load(uri);
+    f->load_trusted(uri);
   }
 
   f->commit();
-
-  // From here the finished slot deletes it.
-  f.release();
 }
 
 void
-Manager::try_create_download_from_meta_download(std::unique_ptr<torrent::Object> bencode, const std::string& metafile) {
-  DownloadFactory* f = new DownloadFactory(this);
+Manager::try_create_download_expand(const std::string& uri, int flags, command_list_type commands) {
+  if (flags & create_raw_data) {
+    try_create_download(uri, flags, commands);
+    return;
+  }
+
+  std::vector<std::string> paths;
+  paths.reserve(256);
+
+  path_expand(&paths, uri);
+
+  if (!paths.empty())
+    for (auto& path : paths)
+      try_create_download(path, flags, commands);
+
+  else
+    try_create_download(uri, flags, commands);
+}
+
+void
+Manager::try_create_download_from_meta_download(torrent::Object* bencode, const std::string& metafile) {
+  DownloadFactory* f = new DownloadFactory(this, true);
 
   f->variables()["tied_to_file"] = (int64_t)true;
-  f->variables()["tied_file"] = metafile;
+  f->variables()["tied_file"]    = metafile;
 
   torrent::Object& meta = bencode->get_key("rtorrent_meta_download");
   torrent::Object::list_type& commands = meta.get_key_list("commands");
+
   for (const auto& command : commands)
     f->commands().insert(f->commands().end(), command.as_string());
 
@@ -242,13 +264,46 @@ Manager::try_create_download_from_meta_download(std::unique_ptr<torrent::Object>
   std::stringstream s;
   s.imbue(std::locale::classic());
   s << *bencode;
-  f->load_raw_data(s.str());
+
+  f->load_raw_data_trusted(s.str());
   f->commit();
 }
 
-utils::Directory
-path_expand_transform(std::string path, const utils::directory_entry& entry) {
-  return path + entry.s_name;
+void
+Manager::try_create_download_untrusted(const std::string& uri, int flags, const command_list_type& commands) {
+  // TODO: Need to check if we are allowed, also rate limit.
+
+  if (!(flags & create_raw_data) &&
+      !is_network_uri(uri) &&
+      !is_magnet_uri(uri) &&
+      !is_data_uri(uri)) {
+    push_log_std("URI type not allowed for untrusted loads.");
+    return;
+  }
+
+  DownloadFactory* f = new DownloadFactory(this, false);
+
+  f->commands().insert(f->commands().end(), commands.begin(), commands.end());
+
+  f->set_start(flags & create_start);
+  f->set_print_log(!(flags & create_quiet));
+  f->slot_finished([f]() { delete f; });
+
+  if (flags & create_raw_data) {
+    f->load_raw_data_untrusted(uri);
+
+  } else if (is_data_uri(uri)) {
+    // Allow the use of data URIs, primarily for JSON-RPC which
+    // doesn't have a defined mechanism for binary data
+    f->load_raw_data_untrusted(decode_data_uri(uri));
+    f->variables()["tied_to_file"] = (int64_t)false;
+
+  } else {
+    // f->load_untrusted(uri);
+    throw torrent::internal_error("Manager::try_create_download_untrusted() unimplemented.");
+  }
+
+  f->commit();
 }
 
 namespace {
@@ -307,6 +362,11 @@ split_iterator(const Sequence&) {
 
 }
 
+utils::Directory
+path_expand_transform(std::string path, const utils::directory_entry& entry) {
+  return path + entry.s_name;
+}
+
 // Move this somewhere better.
 void
 path_expand(std::vector<std::string>* paths, const std::string& pattern) {
@@ -363,26 +423,6 @@ manager_equal_tied(const std::string& path, Download* download) {
   return path == rpc::call_command_string("d.tied_to_file", rpc::make_target(download));
 }
 
-void
-Manager::try_create_download_expand(const std::string& uri, int flags, command_list_type commands) {
-  if (flags & create_raw_data) {
-    try_create_download(uri, flags, commands);
-    return;
-  }
-
-  std::vector<std::string> paths;
-  paths.reserve(256);
-
-  path_expand(&paths, uri);
-
-  if (!paths.empty())
-    for (auto& path : paths)
-      try_create_download(path, flags, commands);
-
-  else
-    try_create_download(uri, flags, commands);
-}
-
 // DownloadList's hashing related functions don't actually start the
 // hashing, it only reacts to events. This functions checks the
 // hashing view and starts hashing if nessesary.

src/core/manager.h

@@ -8,6 +8,7 @@
 #include <torrent/object.h>
 
 #include "download_list.h"
+#include "range_map.h"
 
 namespace torrent {
   class Bencode;
@@ -75,7 +76,9 @@ public:
   // Temporary, find a better place for this.
   void                try_create_download(const std::string& uri, int flags, const command_list_type& commands);
   void                try_create_download_expand(const std::string& uri, int flags, command_list_type commands = command_list_type());
-  void                try_create_download_from_meta_download(std::unique_ptr<torrent::Object> bencode, const std::string& metafile);
+  void                try_create_download_from_meta_download(torrent::Object* bencode, const std::string& metafile);
+
+  void                try_create_download_untrusted(const std::string& uri, int flags, const command_list_type& commands);
 
 private:
   void                create_http(const std::string& uri);

src/core/range_map.h

@@ -0,0 +1,199 @@
+// rTorrent - BitTorrent client
+// Copyright (C) 2005-2008, Jari Sundell
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// In addition, as a special exception, the copyright holders give
+// permission to link the code of portions of this program with the
+// OpenSSL library under certain conditions as described in each
+// individual source file, and distribute linked combinations
+// including the two.
+//
+// You must obey the GNU General Public License in all respects for
+// all of the code used other than OpenSSL.  If you modify file(s)
+// with this exception, you may extend this exception to your version
+// of the file(s), but you are not obligated to do so.  If you do not
+// wish to do so, delete this exception statement from your version.
+// If you delete this exception statement from all source files in the
+// program, then also delete it here.
+//
+// Contact:  Jari Sundell <sundell.software@gmail.com>
+
+
+#ifndef RTORRENT_CORE_RANGE_MAP_H
+#define RTORRENT_CORE_RANGE_MAP_H
+
+#include <map>
+#include <stdexcept>
+
+namespace core {
+
+// Associate values with a range of keys, and retrieve for any key in the range.
+
+// The template arguments have the same semantics as std::map.
+// Exception: if set_merge is used, the value type must have a defined operator ==.
+template<typename Key, typename T, typename Compare = std::less<Key>,
+         typename Alloc = std::allocator<std::pair<const Key, T> > >
+class RangeMap : private std::map<Key, std::pair<Key, T>, Compare,
+                                 typename std::allocator_traits<Alloc>::template rebind_alloc<std::pair<const Key, std::pair<Key, T>>>> {
+
+  typedef std::map<Key, std::pair<Key, T>, Compare,
+                   typename std::allocator_traits<Alloc>::template rebind_alloc<std::pair<const Key, std::pair<Key, T>>>> base_type;
+
+  //std::allocator_traits<Alloc>::template rebind_alloc<std::pair<const Key, std::pair<Key, T>>>
+
+public:
+  RangeMap() = default;
+  RangeMap(const Compare& c) : base_type(c) {}
+
+  typedef typename base_type::iterator iterator;
+  typedef typename base_type::reverse_iterator reverse_iterator;
+  typedef typename base_type::const_iterator const_iterator;
+  typedef typename base_type::const_reverse_iterator const_reverse_iterator;
+
+  // using typename base_type::const_iterator;
+  // using typename base_type::const_reverse_iterator;
+
+  using base_type::clear;
+  using base_type::swap;
+
+  using base_type::size;
+  using base_type::empty;
+
+  using base_type::begin;
+  using base_type::end;
+  using base_type::rbegin;
+  using base_type::rend;
+
+  using base_type::key_comp;
+  using base_type::value_comp;
+
+  // Store a value for the range [begin, end). Returns iterator for the range.
+  const_iterator   set_range(const Key& begin, const Key& end, const T& value);
+
+  // Same, but merge adjacent ranges having the same value. Returns iterator for the merged range.
+  const_iterator   set_merge(Key begin, const Key& end, const T& value);
+
+  // Find range containing the given key, or end().
+  const_iterator   find(const Key& key) const;
+
+  // Retrieve value for key in a range, throw std::out_of_range if range does not exist.
+  const T&         get(const Key& key) const;
+
+  // Retrieve value for key in a range, return def if range does not exist.
+  T                get(const Key& key, T def) const;
+
+private:
+  iterator         crop_overlap(const Key& begin, const Key& end);
+};
+
+// Semantics of an entry:
+// .first          End of range (exclusive), map key.
+// .second.first   Beginning of range.
+// .second.second  Value.
+
+template<typename Key, typename T, typename C, typename A>
+inline typename RangeMap<Key,T,C,A>::iterator
+RangeMap<Key,T,C,A>::crop_overlap(const Key& _begin, const Key& _end) {
+  typename RangeMap::iterator itr = base_type::upper_bound(_begin);
+
+  while (itr != end() && key_comp()(itr->second.first, _end)) {
+    // There's a subrange before the new begin: need new entry (new range end means new key).
+    if (key_comp()(itr->second.first, _begin))
+      base_type::insert(itr, typename RangeMap::value_type(_begin, itr->second));
+
+    // Old end is within our range: erase entry.
+    if (!key_comp()(_end, itr->first)) {
+      base_type::erase(itr++);
+
+    // Otherwise simply set the new begin of the old range.
+    } else {
+      itr->second.first = _end;
+      ++itr;
+    }
+  }
+
+  return itr;
+}
+
+template<typename Key, typename T, typename C, typename A>
+inline typename RangeMap<Key,T,C,A>::const_iterator
+RangeMap<Key,T,C,A>::set_merge(Key _begin, const Key& _end, const T& value) {
+  if (!key_comp()(_begin, _end))
+    return end();
+
+  // Crop overlapping ranges and return iterator to first range after the one we're inserting.
+  typename RangeMap::iterator itr = crop_overlap(_begin, _end);
+
+  // Check if range before new one is adjacent and has same value: if so erase it and use its beginning.
+  if (itr != begin()) {
+    typename RangeMap::iterator prev = itr;
+    if (!key_comp()((--prev)->first, _begin) && prev->second.second == value) {
+      _begin = prev->second.first;
+      base_type::erase(prev);
+    }
+  }
+
+  // Range after new one is adjacent and has same value: set new beginning.
+  if (itr != end() && !key_comp()(_end, itr->second.first) && itr->second.second == value) {
+    itr->second.first = _begin;
+    return itr;
+  }
+
+  // Otherwise, this range isn't mergeable, make new entry.
+  return base_type::insert(itr, typename RangeMap::value_type(_end, typename RangeMap::mapped_type(_begin, value)));
+}
+
+template<typename Key, typename T, typename C, typename A>
+inline typename RangeMap<Key,T,C,A>::const_iterator
+RangeMap<Key,T,C,A>::set_range(const Key& _begin, const Key& _end, const T& value) {
+  if (!key_comp()(_begin, _end))
+    return end();
+
+  return base_type::insert(crop_overlap(_begin, _end), typename RangeMap::value_type(_end, typename RangeMap::mapped_type(_begin, value)));
+}
+
+template<typename Key, typename T, typename C, typename A>
+inline typename RangeMap<Key,T,C,A>::const_iterator
+RangeMap<Key,T,C,A>::find(const Key& key) const {
+  typename RangeMap::const_iterator itr = base_type::upper_bound(key);
+
+  if (itr != end() && key_comp()(key, itr->second.first))
+    itr = end();
+
+  return itr;
+}
+
+template<typename Key, typename T, typename C, typename A>
+inline const T&
+RangeMap<Key,T,C,A>::get(const Key& key) const {
+  typename RangeMap::const_iterator itr = find(key);
+
+  if (itr == end())
+    throw std::out_of_range("RangeMap::get");
+
+  return itr->second.second;
+}
+
+template<typename Key, typename T, typename C, typename A>
+inline T
+RangeMap<Key,T,C,A>::get(const Key& key, T def) const {
+  typename RangeMap::const_iterator itr = find(key);
+  return (itr == end() ? def : itr->second.second);
+}
+
+}
+
+#endif

src/core/view.cc

@@ -216,7 +216,7 @@ View::set_not_visible(Download* download) {
 
 void
 View::next_focus(unsigned int i) {
-  if (empty_visible())
+  if (empty())
     return;
 
   // If at the boundary, roll over
@@ -239,7 +239,7 @@ View::next_focus(unsigned int i) {
 
 void
 View::prev_focus(unsigned int i) {
-  if (empty_visible())
+  if (empty())
     return;
 
   // If at the boundary, roll over
@@ -301,7 +301,7 @@ View::filter() {
     std::for_each(changed.begin(), splitChanged, [this](const auto& d) { rpc::call_object_d_nothrow(m_event_removed, d.get()); });
 
   if (!m_event_added.is_empty())
-    std::for_each(splitChanged, changed.end(), [this](const auto& d) { rpc::call_object_d_nothrow(m_event_added, d.get()); });
+    std::for_each(changed.begin(), splitChanged, [this](const auto& d) { rpc::call_object_d_nothrow(m_event_added, d.get()); });
 
   emit_changed();
 }

src/display/utils.h

@@ -16,12 +16,15 @@ namespace utils {
 
 namespace torrent {
   class ClientInfo;
+  class Entry;
 }
 
 class Control;
 
 namespace display {
 
+char*       print_string(char* first, char* last, char* str);
+
 char*       print_hhmmss(char* first, char* last, time_t t);
 char*       print_hhmmss_local(char* first, char* last, time_t t);
 char*       print_ddhhmm(char* first, char* last, time_t t);
@@ -39,6 +42,9 @@ char*       print_download_percentage_done(char* first, char* last, core::Downlo
 
 char*       print_client_version(char* first, char* last, const torrent::ClientInfo& clientInfo);
 
+char*       print_entry_tags(char* first, char* last);
+char*       print_entry_file(char* first, char* last, const torrent::Entry& entry);
+
 char*       print_status_throttle_limit(char* first, char* last, bool up, const std::vector<std::string>& throttle_names);
 char*       print_status_throttle_rate(char* first, char* last, bool up, const std::vector<std::string>& throttle_names, const double& global_rate);
 

src/display/window_download_chunks_seen.cc

@@ -57,8 +57,7 @@ WindowDownloadChunksSeen::redraw() {
   const torrent::TransferList* transfers = m_download->download()->transfer_list();
   std::vector<torrent::BlockList*> transferChunks(transfers->begin(), transfers->end());
 
-  std::sort(transferChunks.begin(), transferChunks.end(),
-            [](const auto& left, const auto& right) { return left->index() < right->index(); });
+  std::sort(transferChunks.begin(), transferChunks.end());
 
   std::vector<torrent::BlockList*>::const_iterator itrTransfer = transferChunks.begin();
 

src/display/window_file_list.cc

@@ -25,10 +25,7 @@ WindowFileList::WindowFileList(const ui::ElementFileList* element) :
 // Convert std::string to std::wstring of given width (in screen positions),
 // taking into account that some characters may be occupying two screen positions.
 std::wstring
-wstring_width(const std::string& i_str, int width) {
-  if (width < 0)
-    width = 0;
-
+wstring_width(const std::string& i_str, [[maybe_unused]] int width) {
   std::wstring result(width + 1, L' ');
   size_t length = std::mbstowcs(result.data(), i_str.c_str(), width);
 

src/display/window_log.cc

@@ -1,8 +1,6 @@
 #include "config.h"
 
 #include <ctime>
-#include <mutex>
-#include <vector>
 #include <torrent/torrent.h>
 #include <torrent/system/callbacks.h>
 #include <torrent/system/thread.h>
@@ -43,20 +41,13 @@ WindowLog::redraw() {
 
   int pos = m_canvas->height();
 
-  std::vector<torrent::log_entry> entries;
+  for (iterator itr = m_log->end(), last = find_older(); itr != last && pos > 0; --pos) {
+    itr--;
 
-  {
-    std::lock_guard<torrent::log_buffer> guard(*m_log);
-
-    for (iterator itr = m_log->end(), last = find_older(); itr != last && entries.size() < static_cast<size_t>(pos); )
-      entries.push_back(*--itr);
-  }
-
-  for (const auto& entry : entries) {
     char buffer[16];
-    print_hhmmss_local(buffer, buffer + 16, static_cast<time_t>(entry.timestamp));
+    print_hhmmss_local(buffer, buffer + 16, static_cast<time_t>(itr->timestamp));
 
-    m_canvas->print(0, --pos, "(%s) %s", buffer, entry.message.c_str());
+    m_canvas->print(0, pos - 1, "(%s) %s", buffer, itr->message.c_str());
   }
 }
 
@@ -69,13 +60,8 @@ WindowLog::receive_update() {
   if (!is_active())
     return;
 
-  std::iterator_traits<iterator>::difference_type height;
-
-  {
-    std::lock_guard<torrent::log_buffer> guard(*m_log);
-
-    height = std::min(std::distance(find_older(), (iterator)m_log->end()), (std::iterator_traits<iterator>::difference_type)10);
-  }
+  auto itr    = find_older();
+  auto height = std::min(std::distance(itr, (iterator)m_log->end()), (std::iterator_traits<iterator>::difference_type)10);
 
   if (height != m_max_height) {
     m_min_height = height != 0 ? 1 : 0;

src/display/window_log_complete.cc

@@ -1,8 +1,6 @@
 #include "config.h"
 
 #include <ctime>
-#include <mutex>
-#include <vector>
 
 #include "canvas.h"
 #include "utils.h"
@@ -31,34 +29,24 @@ WindowLogComplete::redraw() {
 
   int pos = m_canvas->height();
 
-  std::vector<torrent::log_entry> entries;
-
-  {
-    std::lock_guard<torrent::log_buffer> guard(*m_log);
-
-    for (iterator itr = m_log->end(), last = m_log->begin(); itr != last && entries.size() < static_cast<size_t>(pos); )
-      entries.push_back(*--itr);
-  }
-
-  for (const auto& entry : entries) {
-    if (pos <= 0)
-      break;
+  for (iterator itr = m_log->end(), last = m_log->begin(); itr != last && pos > 0; ) {
+    itr--;
 
     char buffer[16];
 
     // Use an arbitrary min width of 60 for allowing multiple
     // lines. This should ensure we don't mess up the display when the
     // screen is shrunk too much.
-    unsigned int timeWidth = 3 + print_hhmmss_local(buffer, buffer + 16, static_cast<time_t>(entry.timestamp)) - buffer;
+    unsigned int timeWidth = 3 + print_hhmmss_local(buffer, buffer + 16, static_cast<time_t>(itr->timestamp)) - buffer;
 
     unsigned int logWidth  = m_canvas->width() > 60 ? (m_canvas->width() - timeWidth) : (60 - timeWidth);
-    unsigned int logHeight = (entry.message.size() + logWidth - 1) / logWidth;
+    unsigned int logHeight = (itr->message.size() + logWidth - 1) / logWidth;
 
     for (unsigned int j = logHeight; j > 0 && pos > 0; --j, --pos)
       if (j == 1)
-        m_canvas->print(0, pos - 1, "(%s) %s", buffer, entry.message.substr(0, m_canvas->width() - timeWidth).c_str());
+        m_canvas->print(0, pos - 1, "(%s) %s", buffer, itr->message.substr(0, m_canvas->width() - timeWidth).c_str());
       else
-        m_canvas->print(timeWidth, pos - 1, "%s", entry.message.substr(logWidth * (j - 1), m_canvas->width() - timeWidth).c_str());
+        m_canvas->print(timeWidth, pos - 1, "%s", itr->message.substr(logWidth * (j - 1), m_canvas->width() - timeWidth).c_str());
   }
 }
 

src/input/bindings.h

@@ -69,6 +69,8 @@ public:
 
   bool                pressed(int key);
 
+  void                ignore(int key)     { (*this)[key] = slot_void(); }
+
 private:
   bool m_enabled{true};
 };

src/input/path_input.cc

@@ -100,7 +100,7 @@ PathInput::receive_do_complete() {
       entry.s_name += '/';
   }
 
-  range_type r = find_incomplete(dir, str().substr(dirEnd, get_pos() - dirEnd));
+  range_type r = find_incomplete(dir, str().substr(dirEnd, get_pos()));
 
   if (r.first == r.second)
     return; // Show some nice colors here.

src/main.cc

@@ -492,8 +492,7 @@ main(int argc, char** argv) {
     control->cleanup();
 
   } catch (torrent::internal_error& e) {
-    if (control != nullptr)
-      control->cleanup_exception();
+    control->cleanup_exception();
 
     std::cout << "rtorrent: caught torrent::internal_error: "
               << e.what() << std::endl
@@ -506,8 +505,7 @@ main(int argc, char** argv) {
     return -1;
 
   } catch (std::exception& e) {
-    if (control != nullptr)
-      control->cleanup_exception();
+    control->cleanup_exception();
 
     std::cout << "rtorrent: caught" << typeid(e).name() << " : " << e.what() << std::endl;
 
@@ -552,6 +550,8 @@ handle_sigbus(int signum, siginfo_t* sa, [[maybe_unused]] void* ptr) {
 #else
   output << "Stack dump not enabled." << std::endl;
 #endif
+  output << std::endl << "Error: " << std::strerror(sa->si_errno) << std::endl;
+
   const char* signal_reason;
 
   switch (sa->si_code) {

src/rpc/command_scheduler.cc

@@ -61,20 +61,14 @@ CommandScheduler::call_item(value_type item) {
   // Remove the item before calling the command if it should be
   // removed.
 
-  std::string key = item->key();
-
   try {
     rpc::call_object(item->command());
 
   } catch (torrent::input_error& e) {
     if (m_slotErrorMessage)
-      m_slotErrorMessage("Scheduled command failed: " + key + ": " + e.what());
+      m_slotErrorMessage("Scheduled command failed: " + item->key() + ": " + e.what());
   }
 
-  // The command is allowed to erase or replace this item, which deletes it.
-  if (std::find(begin(), end(), item) == end())
-    return;
-
   // Still schedule if we caught a torrrent::input_error?
   auto next = item->next_time_scheduled();
 

src/rpc/jsonrpc.cc

@@ -2,10 +2,8 @@
 
 #include "rpc/jsonrpc.h"
 
-#include <cstddef>
 #include <cstdint>
 #include <string>
-#include <utility>
 #include <torrent/common.h>
 #include <torrent/torrent.h>
 #include <torrent/utils/string_manip.h>
@@ -15,7 +13,6 @@
 #include "rpc/command_map.h"
 #include "rpc/nlohmann/json.h"
 #include "rpc/parse_commands.h"
-#include "rpc/scgi_task.h"
 #include "torrent/exceptions.h"
 #include "torrent/object.h"
 #include "utils/functional.h"
@@ -225,49 +222,13 @@ handle_notification(const json& request) noexcept {
   }
 }
 
-namespace {
-
-using json_input_adapter = decltype(nlohmann::detail::input_adapter(std::declval<const char*>(), std::declval<const char*>()));
-using json_dom_parser    = nlohmann::detail::json_sax_dom_parser<json, json_input_adapter>;
-
-class json_depth_limited_parser : public json_dom_parser {
-public:
-  explicit json_depth_limited_parser(json& root) : json_dom_parser(root) {}
-
-  bool start_object(std::size_t length) { return enter() && json_dom_parser::start_object(length); }
-  bool start_array(std::size_t length) { return enter() && json_dom_parser::start_array(length); }
-
-  bool end_object() { m_depth--; return json_dom_parser::end_object(); }
-  bool end_array() { m_depth--; return json_dom_parser::end_array(); }
-
-private:
-  bool enter() { return ++m_depth <= max_json_depth; }
-
-  uint32_t m_depth{0};
-};
-
-} // namespace
-
 bool
 JsonRpc::process(const char* in_buffer, uint32_t length, slot_write callback) {
   json response;
   json body;
 
-  if (length > m_size_limit) {
-    auto err_str = json_error(JSONRPC_INVALID_REQUEST_ERROR, "content size exceeds maximum RPC limit", nullptr).dump();
-
-    return callback(err_str.c_str(), err_str.size());
-  }
-
   try {
-    json_depth_limited_parser handler(body);
-
-    if (!json::sax_parse(in_buffer, in_buffer + length, &handler)) {
-      auto err_str = json_error(JSONRPC_INVALID_REQUEST_ERROR, "maximum nesting depth exceeded", nullptr).dump();
-
-      return callback(err_str.c_str(), err_str.size());
-    }
-
+    body = json::parse(in_buffer, in_buffer + length);
     switch (body.type()) {
     case json::value_t::object: {
       if (!body.contains("id")) {
@@ -303,13 +264,6 @@ JsonRpc::process(const char* in_buffer, uint32_t length, slot_write callback) {
 
     std::string response_str = response.dump();
 
-    if (response_str.size() > SCgiTask::max_response_size) {
-      const auto& id = response.is_object() && response.contains("id") ? response["id"] : json(nullptr);
-      auto err_str = json_error(JSONRPC_INTERNAL_ERROR, "response size exceeds maximum RPC limit", id).dump();
-
-      return callback(err_str.c_str(), err_str.size());
-    }
-
     return callback(response_str.c_str(), response_str.size());
 
   } catch (json::exception& e) {

src/rpc/jsonrpc.h

@@ -5,8 +5,6 @@
 
 #include <cstdint>
 
-#include "rpc/scgi_task.h"
-
 namespace rpc {
 
 class JsonRpc {
@@ -19,11 +17,6 @@ public:
   bool process(const char* in_buffer, uint32_t length, slot_write callback);
 
   void insert_command(const char* name, const char* parm, const char* doc) {};
-
-  void set_size_limit(uint64_t size) { m_size_limit = size; }
-
-private:
-  uint64_t m_size_limit{SCgiTask::max_content_size};
 };
 
 } // namespace rpc

src/rpc/lua.cc

@@ -394,10 +394,6 @@ execute_lua(LuaEngine* engine, rpc::target_type target_type, torrent::Object con
   switch (raw_args.type()) {
   case torrent::Object::TYPE_LIST: {
     const torrent::Object::list_type& args = raw_args.as_list();
-
-    if (args.empty())
-      throw torrent::input_error("Too few arguments.");
-
     if (flags & LuaEngine::flag_string) {
       check_lua_status(l_state, luaL_loadstring(l_state, args.begin()->as_string().c_str()));
     } else {

src/rpc/object_storage.cc

@@ -26,7 +26,10 @@ const size_t object_storage::key_size;
 
 object_storage::iterator
 object_storage::find_raw_string(const torrent::raw_string& key) {
-  return find(key_type::from_raw_string(key));
+  fixed_key_type<64> k;
+  k.set_c_str(key.data());
+
+  return find(k);
 }
 
 object_storage::iterator
@@ -61,12 +64,8 @@ object_storage::insert(const char* key_data, uint32_t key_size, const torrent::O
   if (std::find(key_data, key_data + key_size, '\0') != key_data + key_size)
     throw torrent::input_error("Found nul-char in string.");
 
-  // key_type turns a key this long into the empty key.
-  if (key_size >= object_storage::key_size)
-    throw torrent::input_error("Key is too long.");
-
-  if (key_size == 0)
-    throw torrent::input_error("Key is empty.");
+  // Check for size > key_size.
+  // Check for empty string.
 
   bool use_raw = false;
   torrent::Object object;

src/rpc/object_storage.h

@@ -158,7 +158,14 @@ fixed_key_type<MaxSize>::set_data(const value_type* src_data, size_type src_size
 
 template <size_t MaxSize> inline void
 fixed_key_type<MaxSize>::set_c_str(const value_type* src_data) {
-  set_c_str(src_data, std::strlen(src_data));
+  value_type* itr = m_data;
+  const value_type* last = m_data + max_size;
+
+  while (itr != last && *src_data != '\0')
+    *itr++ = *src_data++;
+
+  *itr = '\0';
+  m_size = std::distance(m_data, itr);
 }
 
 template <size_t MaxSize> inline void

src/rpc/parse.cc

@@ -1,7 +1,5 @@
 #include "config.h"
 
-#include <cctype>
-#include <charconv>
 #include <cstring>
 #include <cstdio>
 #include <limits>
@@ -115,37 +113,13 @@ parse_value_nothrow(const char* src, int64_t* value, int base, int unit) {
   if (unit <= 0)
     throw torrent::input_error("Command::string_to_value_unit(...) received unit <= 0.");
 
-  if (base != 0 && base != 8 && base != 10 && base != 16)
-    throw torrent::input_error("Command::string_to_value_unit(...) received invalid base.");
-
-  while (parse_is_space(*src))
-    src++;
-
-  if (src[0] == '+')
-    return src;
-
-  if (src[0] == '-') {
-    if (base == 8 || base == 16)
-      return src;
-
-    if (src[1] == '0')
-      return src;
-  }
-
-  char* last{};
-
-  errno  = 0;
+  char* last;
   *value = strtoll(src, &last, base);
 
-  if (errno == ERANGE)
-    return src;
-
   if (last == src) {
-    *value = 0;
-
-    if (strcasecmp(src, "no") == 0)    { *value = 0; return src + strlen("no"); }
-    if (strcasecmp(src, "yes") == 0)   { *value = 1; return src + strlen("yes"); }
-    if (strcasecmp(src, "true") == 0)  { *value = 1; return src + strlen("true"); }
+    if (strcasecmp(src, "no") == 0) { *value = 0; return src + strlen("no"); }
+    if (strcasecmp(src, "yes") == 0) { *value = 1; return src + strlen("yes"); }
+    if (strcasecmp(src, "true") == 0) { *value = 1; return src + strlen("true"); }
     if (strcasecmp(src, "false") == 0) { *value = 0; return src + strlen("false"); }
 
     return src;
@@ -187,7 +161,7 @@ parse_object(const char* first, const char* last, torrent::Object* dest, bool (*
   if (++depth >= max_parse_depth)
     throw torrent::input_error("Max parse depth reached.");
 
-  if (first != last && *first == '{') {
+  if (*first == '{') {
     *dest = torrent::Object::create_list();
     first = parse_list(first + 1, last, dest, &parse_is_delim_block, depth);
     first = parse_skip_wspace(first, last);
@@ -197,7 +171,7 @@ parse_object(const char* first, const char* last, torrent::Object* dest, bool (*
 
     return ++first;
 
-  } else if (first != last && *first == '(') {
+  } else if (*first == '(') {
     int32_t parentheses = 1;
 
     while (first + 1 != last && *(first + 1) == '(') {
@@ -419,7 +393,7 @@ convert_to_value_nothrow(const torrent::Object& src, int64_t* value, int base, i
       == unpacked.as_string().c_str() + unpacked.as_string().size();
 
   case torrent::Object::TYPE_RAW_STRING: {
-    const torrent::raw_string& str = unpacked.as_raw_string();
+    const torrent::raw_string& str = src.as_raw_string();
 
     auto buffer = std::make_unique<char[]>(str.size() + 1);
     std::memcpy(buffer.get(), str.data(), str.size());

src/rpc/parse.h

@@ -1,3 +1,37 @@
+// rTorrent - BitTorrent client
+// Copyright (C) 2005-2011, Jari Sundell
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// In addition, as a special exception, the copyright holders give
+// permission to link the code of portions of this program with the
+// OpenSSL library under certain conditions as described in each
+// individual source file, and distribute linked combinations
+// including the two.
+//
+// You must obey the GNU General Public License in all respects for
+// all of the code used other than OpenSSL.  If you modify file(s)
+// with this exception, you may extend this exception to your version
+// of the file(s), but you are not obligated to do so.  If you do not
+// wish to do so, delete this exception statement from your version.
+// If you delete this exception statement from all source files in the
+// program, then also delete it here.
+//
+// Contact:  Jari Sundell <sundell.software@gmail.com>
+
+
 #ifndef RTORRENT_RPC_PARSE_H
 #define RTORRENT_RPC_PARSE_H
 

src/rpc/parse_commands.cc

@@ -181,11 +181,6 @@ parse_command_file(const std::string& path) {
       getCount = 0;
     }
 
-    if (file.fail() && !file.eof()) {
-      lineNumber++;
-      throw torrent::input_error("Exceeded max line length.");
-    }
-
   } catch (torrent::input_error& e) {
     snprintf(buffer, 2048, "Error in option file: %s:%u: %s", path.c_str(), lineNumber, e.what());
 

src/rpc/rpc_manager.cc

@@ -172,11 +172,7 @@ RpcManager::set_size_limit(uint64_t size) {
   if (size > SCgiTask::max_content_size)
     throw torrent::input_error("XMLRPC size limit cannot exceed the SCGI content size limit.");
 
-  if (size < min_size_limit)
-    throw torrent::input_error("XMLRPC size limit is too small to hold a request.");
-
   m_xmlrpc.set_size_limit(size);
-  m_jsonrpc.set_size_limit(size);
 }
 
 void

src/rpc/rpc_manager.h

@@ -53,10 +53,6 @@ public:
   enum RPCType { XML,
                  JSON };
 
-  // A limit below the shortest useful request rejects every request, the one
-  // that would raise it again included.
-  static constexpr uint64_t min_size_limit = 1024;
-
   RpcManager()  = default;
   ~RpcManager() = default;
 

src/rpc/scgi_task.cc

@@ -93,8 +93,7 @@ SCgiTask::close() {
   // The callbacks are guaranteed to be finished/canceled at this point.
   auto lock = std::lock_guard<std::mutex>(m_result_mutex);
 
-  // clear() would keep the capacity, and the task is pooled for the lifetime of the process.
-  std::vector<char>().swap(m_buffer);
+  m_buffer.clear();
 }
 
 void
@@ -405,7 +404,7 @@ void
 SCgiTask::receive_write(const char* buffer, uint32_t length) {
   assert(torrent::this_thread::thread() == torrent::main_thread::thread());
 
-  if (buffer == nullptr || length > max_response_size)
+  if (buffer == nullptr || length > (100 << 20))
     throw torrent::internal_error("SCgiTask::receive_write(...) received bad input.");
 
   // Main thread callback already locked this mutex.

src/rpc/scgi_task.h

@@ -2,7 +2,6 @@
 #define RTORRENT_RPC_SCGI_TASK_H
 
 #include <chrono>
-#include <cstdint>
 #include <memory>
 #include <mutex>
 #include <vector>
@@ -17,9 +16,7 @@ class SCgiTask : public torrent::system::Event {
 public:
   static constexpr int default_buffer_size = 8191;
   static constexpr int max_header_size     = 2000;
-  static constexpr int max_content_size    = (1 << 26);
-
-  static constexpr uint32_t max_response_size = (100 << 20);
+  static constexpr int max_content_size    = (2 << 23);
 
   static constexpr auto timeout_request = std::chrono::seconds(60);
 

src/rpc/xmlrpc_c.cc

@@ -27,11 +27,11 @@ public:
   virtual ~xmlrpc_error_c() throw() {}
 
   virtual int         type() const throw() { return m_type; }
-  virtual const char* what() const throw() { return m_msg.c_str(); }
+  virtual const char* what() const throw() { return m_msg; }
 
 private:
   int                 m_type;
-  std::string         m_msg;
+  const char*         m_msg;
 };
 
 torrent::Object xmlrpc_to_object(xmlrpc_env* env, xmlrpc_value* value, int call_type = 0, rpc::target_type* target = NULL, std::function<void()>* deleter = NULL);
@@ -44,9 +44,10 @@ xmlrpc_list_entry_to_object(xmlrpc_env* env, xmlrpc_value* src, int index) {
   if (env->fault_occurred)
     throw xmlrpc_error_c(env);
 
-  utils::scope_guard guard([tmp]() { xmlrpc_DECREF(tmp); });
+  torrent::Object obj = xmlrpc_to_object(env, tmp);
+  xmlrpc_DECREF(tmp);
 
-  return xmlrpc_to_object(env, tmp);
+  return obj;
 }
 
 int64_t
@@ -76,18 +77,16 @@ xmlrpc_list_entry_to_value(xmlrpc_env* env, xmlrpc_value* src, int index) {
   {
     const char* str;
     xmlrpc_read_string(env, tmp, &str);
-    xmlrpc_DECREF(tmp);
 
     if (env->fault_occurred)
       throw xmlrpc_error_c(env);
 
     const char* end = str;
     int64_t v3 = ::strtoll(str, (char**)&end, 0);
-    bool invalid = *str == '\0' || *end != '\0';
 
     ::free((void*)str);
 
-    if (invalid)
+    if (*str == '\0' || *end != '\0')
       throw xmlrpc_error_c(XMLRPC_TYPE_ERROR, "Invalid index.");
 
     return v3;
@@ -212,11 +211,11 @@ xmlrpc_to_object(xmlrpc_env* env, xmlrpc_value* value, int call_type, rpc::targe
       if (env->fault_occurred)
         throw xmlrpc_error_c(env);
 
-      utils::scope_guard guard([tmp]() { xmlrpc_DECREF(tmp); });
-
       if (target != nullptr)
         std::tie(*target, *deleter) = xmlrpc_to_target(env, tmp, call_type);
 
+      xmlrpc_DECREF(tmp);
+
       if (env->fault_occurred)
         throw xmlrpc_error_c(env);
 
@@ -440,8 +439,6 @@ XmlRpc::cleanup() {
   xmlrpc_registry_free((xmlrpc_registry*)m_registry);
   xmlrpc_env_clean((xmlrpc_env*)m_env);
   delete (xmlrpc_env*)m_env;
-  m_env = nullptr;
-  m_registry = nullptr;
 }
 
 bool

src/rpc/xmlrpc_tinyxml2.cc

@@ -19,7 +19,6 @@
 #include "rpc/tinyxml2/tinyxml2.h"
 #include "rpc/rpc_manager.h"
 #include "utils/base64.h"
-#include "utils/functional.h"
 #include "xmlrpc.h"
 
 namespace rpc {
@@ -259,8 +258,6 @@ execute_command(std::string method_name, const tinyxml2::XMLElement* params_elem
   torrent::Object             params_raw = torrent::Object::create_list();
   torrent::Object::list_type& params     = params_raw.as_list();
   rpc::target_type            target     = rpc::make_target();
-  std::function<void()>       deleter    = []() {};
-  utils::scope_guard          guard([&deleter]() { deleter(); });
 
   if (params_element != nullptr) {
     if (std::strncmp(params_element->Name(), "params", sizeof("params")) == 0) {
@@ -268,6 +265,8 @@ execute_command(std::string method_name, const tinyxml2::XMLElement* params_elem
       const auto* child = params_element->FirstChildElement("param");
 
       if (child != nullptr) {
+        std::function<void()> deleter = []() {};
+
         RpcManager::object_to_target(xml_value_to_object(child->FirstChildElement("value")), cmd_itr->second.m_flags, &target, &deleter);
         child = child->NextSiblingElement("param");
 
@@ -283,6 +282,8 @@ execute_command(std::string method_name, const tinyxml2::XMLElement* params_elem
       const auto* child = params_element->FirstChildElement("data")->FirstChildElement("value");
 
       if (child != nullptr) {
+        std::function<void()> deleter = []() {};
+
         RpcManager::object_to_target(xml_value_to_object(child), cmd_itr->second.m_flags, &target, &deleter);
         child = child->NextSiblingElement("value");
 
@@ -326,20 +327,15 @@ process_document(const tinyxml2::XMLDocument* doc, tinyxml2::XMLPrinter* printer
     auto& result_list     = result.as_list();
     auto  parent_elements = element_access(doc->RootElement(), {"params", "param", "value", "array", "data"});
     for (auto child = parent_elements->FirstChildElement("value"); child; child = child->NextSiblingElement("value")) {
-      auto method_name_member = element_access(child, {"struct", "member"});
-      auto member_name        = method_name_member->FirstChildElement("name");
-
-      if (member_name == nullptr || member_name->GetText() == nullptr ||
-          std::strncmp(member_name->GetText(), "methodName", sizeof("methodName")) != 0)
-        throw rpc_error(XMLRPC_PARSE_ERROR, "multicall struct's first member must be methodName");
-
-      auto sub_method_name = element_access(method_name_member, {"value", "string"})->GetText();
+      auto sub_method_name = element_access(child, {"struct", "member", "value", "string"})->GetText();
 
       if (sub_method_name == nullptr)
         throw rpc_error(XMLRPC_PARSE_ERROR, "multicall methodName element is empty");
       // If sub_params ends up a nullptr at the end of this if-chian,
       // execute_command will turn it into an empty list
-      auto sub_params = method_name_member->NextSiblingElement("member");
+      auto sub_params = element_access(child, {"struct", "member"});
+      if (sub_params != nullptr)
+        sub_params = sub_params->NextSiblingElement("member");
       if (sub_params != nullptr)
         sub_params = sub_params->FirstChildElement("value");
       if (sub_params != nullptr)
@@ -430,14 +426,6 @@ XmlRpc::process(const char* inBuffer, uint32_t length, slot_write slotWrite) {
     // remains.
     tinyxml2::XMLPrinter printer(nullptr, true, 0);
     process_document(&doc, &printer);
-
-    if (printer.CStrSize() - 1 > static_cast<int>(SCgiTask::max_response_size)) {
-      tinyxml2::XMLPrinter fault_printer(nullptr, true, 0);
-      print_xmlrpc_fault(XMLRPC_LIMIT_EXCEEDED_ERROR, "Response size exceeds maximum XML-RPC limit", &fault_printer);
-
-      return slotWrite(fault_printer.CStr(), fault_printer.CStrSize() - 1);
-    }
-
     return slotWrite(printer.CStr(), printer.CStrSize() - 1);
   } catch (rpc_error& e) {
     tinyxml2::XMLPrinter printer(nullptr, true, 0);

src/session/download_storer.cc

@@ -2,7 +2,6 @@
 
 #include "download_storer.h"
 
-#include <cerrno>
 #include <fcntl.h>
 #include <fstream>
 #include <unistd.h>
@@ -17,13 +16,6 @@
 #include "core/download.h"
 #include "utils/directory.h"
 
-// O_DIRECTORY makes the open refuse anything that is not a directory. A
-// platform that does not define it still gets the read-only directory
-// handle fsync needs, so fall back to no extra flag.
-#ifndef O_DIRECTORY
-#define O_DIRECTORY 0
-#endif
-
 namespace session {
 
 DownloadStorer::DownloadStorer(core::Download* download)
@@ -124,73 +116,34 @@ is_correct_format(const std::string& f) {
 
 void
 save_stream(const std::string& path, bool use_fsyncdisk, const std::stringstream& stream) {
-  // Remove any leftover temporary file first so that O_EXCL only ever fails on
-  // an entry that appeared after the unlink, and O_NOFOLLOW keeps a symlink
-  // planted in the session directory from redirecting the write.
-  if (::unlink(path.c_str()) == -1 && errno != ENOENT)
-    throw torrent::storage_error("failed to remove stale file : " + path);
+  std::fstream output(path.c_str(), std::ios::out | std::ios::trunc);
 
   // TODO: If we cannot open more files, wait for some to finish and try again.
-  int fd = ::open(path.c_str(), O_WRONLY | O_CREAT | O_EXCL | O_NOFOLLOW, 0600);
-
-  if (fd < 0)
+  if (!output.is_open())
     throw torrent::storage_error("failed to open file for writing : " + path);
 
-  const auto  data      = stream.view();
-  std::size_t remaining = data.size();
-  const char* cursor    = data.data();
+  output << stream.rdbuf();
 
-  while (remaining != 0) {
-    ssize_t result = ::write(fd, cursor, remaining);
+  if (!output.good())
+    throw torrent::storage_error("failed to write stream to file : " + path);
 
-    if (result == -1) {
-      if (errno == EINTR)
-        continue;
+  output.close();
 
-      ::close(fd);
-      throw torrent::storage_error("failed to write stream to file : " + path);
-    }
+  // Ensure that the new file is actually written to the disk
+  int fd = ::open(path.c_str(), O_WRONLY);
 
-    cursor    += result;
-    remaining -= result;
-  }
+  if (fd < 0)
+    throw torrent::storage_error("failed to open file descriptor for fsync : " + path);
 
   if (use_fsyncdisk) {
 #ifdef __APPLE__
-    int sync_result = ::fsync(fd);
+    ::fsync(fd);
 #else
-    int sync_result = ::fdatasync(fd);
+    ::fdatasync(fd);
 #endif
-
-    if (sync_result == -1) {
-      ::close(fd);
-      throw torrent::storage_error("failed to sync file to disk : " + path);
-    }
   }
 
-  // A full disk may only be seen when the descriptor is closed.
-  if (::close(fd) == -1)
-    throw torrent::storage_error("failed to close file descriptor : " + path);
-}
-
-void
-sync_directory_of(const std::string& path) {
-  auto separator = path.rfind('/');
-  auto directory = separator == std::string::npos ? std::string(".") :
-                   separator == 0                 ? std::string("/") : path.substr(0, separator);
-
-  int fd = ::open(directory.c_str(), O_RDONLY | O_DIRECTORY);
-
-  if (fd < 0)
-    throw torrent::storage_error("failed to open session directory for sync : " + directory);
-
-  if (::fsync(fd) == -1) {
-    ::close(fd);
-    throw torrent::storage_error("failed to sync session directory : " + directory);
-  }
-
-  if (::close(fd) == -1)
-    throw torrent::storage_error("failed to close session directory : " + directory);
+  ::close(fd);
 }
 
 } // namespace anonymous
@@ -220,11 +173,6 @@ DownloadStorer::save_and_move_streams(const std::string& path, bool use_fsyncdis
 
   if (::rename((rtorrent_path + ".new").c_str(), rtorrent_path.c_str()) == -1)
     throw torrent::storage_error("failed to rename rtorrent resume file : " + rtorrent_path);
-
-  // Syncing the files themselves does not persist the renames; the directory
-  // holding them has to be synced for the new names to survive a crash.
-  if (use_fsyncdisk)
-    sync_directory_of(path);
 }
 
 utils::Directory

src/session/session_manager.cc

@@ -75,6 +75,7 @@ SessionManager::save_resume_download(core::Download* download) {
   {
     std::unique_lock<std::mutex> lock(m_pending_builds_mutex);
 
+    // TODO: This is under the wrong lock.
     if (!m_active)
       throw torrent::internal_error("SessionManager::save_resume_download() called while not active.");
 

src/session/session_manager.h

@@ -1,7 +1,6 @@
 #ifndef RTORRENT_SESSION_SESSION_MANAGER_H
 #define RTORRENT_SESSION_SESSION_MANAGER_H
 
-#include <atomic>
 #include <condition_variable>
 #include <deque>
 #include <future>
@@ -100,13 +99,9 @@ private:
   bool                         m_use_fsyncdisk{true};
   bool                         m_use_lock{true};
 
-  align_cacheline
+  align_cacheline std::mutex   m_mutex;
 
-  std::atomic<bool>            m_active{};
-
-  align_cacheline
-
-  std::mutex                   m_mutex;
+  bool                         m_active{};
 
   std::deque<SaveRequest>      m_save_requests;
   std::atomic<size_t>          m_save_request_counter{};

src/setup.cc

@@ -86,13 +86,9 @@ config_comment_log(const std::string& command, const std::string& raw_args) {
     pos = next_pos + 1;
   }
 
-  if (command == "log.add_output") {
-    if (args.size() != 2)
-      throw torrent::input_error("Invalid number of arguments.");
-
+  if (command == "log.add_output")
     log_add_group_output_str(args[0], args[1]);
-
-  } else if (command == "log.open_file")
+  else if (command == "log.open_file")
     apply_log_open_str(0, args);
   else if (command == "log.open_file.flush")
     apply_log_open_str(log_flag_flush, args);
@@ -161,12 +157,12 @@ load_session_torrents(const std::string& path) {
     if (!entry.is_file())
       continue;
 
-    auto* f = new core::DownloadFactory(control->core());
+    auto* f = new core::DownloadFactory(control->core(), true);
 
     f->set_session(true);
     f->set_init_load(true);
     f->slot_finished([f](){ delete f; });
-    f->load(entries.path() + entry.s_name);
+    f->load_trusted(entries.path() + entry.s_name);
     f->commit();
   }
 }
@@ -174,12 +170,12 @@ load_session_torrents(const std::string& path) {
 void
 load_arg_torrents(char** first, char** last) {
   for (; first != last; ++first) {
-    auto* f = new core::DownloadFactory(control->core());
+    auto* f = new core::DownloadFactory(control->core(), true);
 
     f->set_start(true);
     f->set_init_load(true);
     f->slot_finished([f](){ delete f; });
-    f->load(*first);
+    f->load_trusted(*first);
     f->commit();
   }
 }

src/setup.h

@@ -3,7 +3,6 @@
 
 #include <functional>
 #include <string>
-#include <vector>
 
 int  parse_main_options(int argc, char** argv);
 void parse_config_file(int argc, char** argv, std::function<void (const std::string&)> parse_fn);

src/signal_handler.cc

@@ -63,10 +63,8 @@ SignalHandler::set_block(unsigned int signum) {
   sigemptyset(&mask);
   sigaddset(&mask, signum);
 
-  int result = pthread_sigmask(SIG_BLOCK, &mask, NULL);
-
-  if (result != 0)
-    throw std::logic_error("Could not block signal: " + std::string(std::strerror(result)));
+  if (pthread_sigmask(SIG_BLOCK, &mask, NULL) == -1)
+    throw std::logic_error("Could not block signal: " + std::string(std::strerror(errno)));
 }
 
 void
@@ -79,10 +77,8 @@ SignalHandler::set_unblock(unsigned int signum) {
   sigemptyset(&mask);
   sigaddset(&mask, signum);
 
-  int result = pthread_sigmask(SIG_UNBLOCK, &mask, NULL);
-
-  if (result != 0)
-    throw std::logic_error("Could not unblock signal: " + std::string(std::strerror(result)));
+  if (pthread_sigmask(SIG_UNBLOCK, &mask, NULL) == -1)
+    throw std::logic_error("Could not unblock signal: " + std::string(std::strerror(errno)));
 }
 
 void

src/ui/download.h

@@ -6,6 +6,7 @@
 #include <torrent/peer/peer.h>
 
 #include "display/manager.h"
+#include "utils/list_focus.h"
 
 #include "element_base.h"
 

src/ui/download_list.cc

@@ -30,38 +30,6 @@
 
 namespace ui {
 
-std::string
-create_filter_pattern(const std::string& input) {
-  std::string pattern = input;
-
-  if (pattern.empty())
-    return pattern;
-
-  if (pattern.back() != '$')
-    pattern = pattern + ".*";
-  if (pattern.front() != '^')
-    pattern = ".*" + pattern;
-
-  std::transform(pattern.begin(), pattern.end(), pattern.begin(), ::tolower);
-  return pattern;
-}
-
-torrent::Object
-create_filter_command(const std::string& pattern) {
-  torrent::Object name = torrent::Object::create_dict_key();
-  name.as_dict_key() = "d.name";
-
-  torrent::Object args = torrent::Object::create_list();
-  args.as_list().push_back(name);
-  args.as_list().push_back(torrent::Object(pattern));
-
-  torrent::Object command = torrent::Object::create_dict_key();
-  command.as_dict_key() = "match";
-  command.as_dict_obj() = args;
-
-  return command;
-}
-
 DownloadList::DownloadList() {
   m_uiArray[DISPLAY_DOWNLOAD]      = NULL;
   m_uiArray[DISPLAY_DOWNLOAD_LIST] = new ElementDownloadList();
@@ -351,12 +319,16 @@ DownloadList::receive_exit_input(Input type) {
         current_view()->filter();
         current_view()->sort();
       } else {
-        std::string pattern = create_filter_pattern(input->str());
-
+        std::string pattern = input->str();
+        if (pattern.back() != '$')
+          pattern = pattern + ".*";
+        if (pattern.front() != '^')
+          pattern = ".*" + pattern;
+        std::transform(pattern.begin(), pattern.end(), pattern.begin(), ::tolower);
+        std::string temp_filter = "match={d.name=," + pattern + "}";
         if (rpc::call_command_value("view.filter.temp.log"))
           control->core()->push_log_std("Temporary filter on '" + current_view()->name() + "' view: " + pattern);
-
-        current_view()->set_filter_temp(create_filter_command(pattern));
+        current_view()->set_filter_temp(temp_filter);
         current_view()->filter();
       }
       break;

src/ui/download_list.h

@@ -1,9 +1,6 @@
 #ifndef RTORRENT_UI_DOWNLOAD_LIST_H
 #define RTORRENT_UI_DOWNLOAD_LIST_H
 
-#include <string>
-#include <torrent/object.h>
-
 #include "element_base.h"
 #include "globals.h"
 #include "display/manager.h"
@@ -32,12 +29,6 @@ namespace ui {
 
 class Download;
 
-// Wrap a user-typed download name pattern in the anchors 'match' expects.
-std::string     create_filter_pattern(const std::string& input);
-
-// Build the 'match' command the temporary view filter runs against d.name.
-torrent::Object create_filter_command(const std::string& pattern);
-
 class DownloadList : public ElementBase {
 public:
   typedef display::WindowDownloadList              WList;

src/ui/element_menu.cc

@@ -179,7 +179,7 @@ ElementMenu::set_entry(size_type idx, bool triggerSlot) {
   m_entry = idx;
   focus_entry(m_entry);
 
-  if (triggerSlot && m_entry < size())
+  if (triggerSlot)
     base_type::operator[](m_entry).m_slotFocus();
 
   m_window->mark_dirty();

src/ui/root.cc

@@ -467,9 +467,6 @@ Root::save_input_history() {
         history_file << entry << "|" + category.at((pitr->second + i) % m_input_history_length) + "\n";
   }
 
-  // The data only reaches the kernel here, so this is where a full disk is seen.
-  history_file.close();
-
   if (!history_file.good()) {
     lt_log_print(torrent::LOG_DEBUG, "input history file corrupted during writing, discarding (path:%s)", history_filename.c_str());
     return;
@@ -477,6 +474,8 @@ Root::save_input_history() {
     lt_log_print(torrent::LOG_DEBUG, "input history file written (path:%s)", history_filename.c_str());
   }
 
+  history_file.close();
+
   std::rename(history_filename_tmp.c_str(), history_filename.c_str());
 }
 

src/ui/root.h

@@ -70,6 +70,10 @@ public:
   void                set_down_throttle(unsigned int throttle);
   void                set_up_throttle(unsigned int throttle);
 
+  // Rename to raw or something, make base function.
+  void                set_down_throttle_i64(int64_t throttle) { set_down_throttle(throttle >> 10); }
+  void                set_up_throttle_i64(int64_t throttle)   { set_up_throttle(throttle >> 10); }
+
   void                adjust_down_throttle(int throttle);
   void                adjust_up_throttle(int throttle);
 

src/utils/directory.cc

@@ -5,7 +5,6 @@
 #include <algorithm>
 #include <cstdlib>
 #include <dirent.h>
-#include <fcntl.h>
 #include <functional>
 #include <sys/stat.h>
 #include <torrent/exceptions.h>
@@ -14,24 +13,6 @@
 
 namespace utils {
 
-namespace {
-
-uint8_t
-entry_type_from_mode(mode_t mode) {
-  if (S_ISREG(mode))
-    return DT_REG;
-
-  if (S_ISDIR(mode))
-    return DT_DIR;
-
-  if (S_ISLNK(mode))
-    return DT_LNK;
-
-  return DT_UNKNOWN;
-}
-
-} // namespace
-
 // Keep this?
 bool
 Directory::is_valid() const {
@@ -57,6 +38,9 @@ Directory::update(int flags) {
     return false;
 
   struct dirent* entry;
+#ifdef __sun__
+  struct stat s;
+#endif
 
   while ((entry = readdir(d)) != NULL) {
     if ((flags & update_hide_dot) && entry->d_name[0] == '.')
@@ -65,22 +49,16 @@ Directory::update(int flags) {
     iterator itr = base_type::insert(end(), value_type());
 
 #ifdef __sun__
+    stat(entry->d_name, &s);
     itr->s_fileno = entry->d_ino;
     itr->s_reclen = 0;
-    itr->s_type   = DT_UNKNOWN;
+    itr->s_type = s.st_mode;
 #else
     itr->s_fileno = entry->d_fileno;
     itr->s_reclen = entry->d_reclen;
     itr->s_type   = entry->d_type;
 #endif
 
-    if (itr->s_type == DT_UNKNOWN) {
-      struct stat st;
-
-      if (fstatat(dirfd(d), entry->d_name, &st, AT_SYMLINK_NOFOLLOW) == 0)
-        itr->s_type = entry_type_from_mode(st.st_mode);
-    }
-
 #ifdef DIRENT_NAMLEN_EXISTS_FOOBAR
     itr->s_name   = std::string(entry->d_name, entry->d_name + entry->d_namlen);
 #else

src/utils/directory.h

@@ -2,14 +2,14 @@
 #define RTORRENT_UTILS_DIRECTORY_H
 
 #include <cstdint>
-#include <dirent.h>
 #include <string>
 #include <vector>
 
 namespace utils {
 
 struct directory_entry {
-  bool is_file() const { return s_type == DT_REG; }
+  // Fix.
+  bool is_file() const { return true; }
 
   // The name and types should match POSIX.
   uint32_t            s_fileno;

src/utils/gzip.cc

@@ -5,8 +5,6 @@
 #include <zlib.h>
 #include <torrent/exceptions.h>
 
-#include "utils/functional.h"
-
 namespace utils {
 
 void
@@ -23,8 +21,6 @@ gzip_compress_to_vector(const char* buffer, unsigned int length, std::vector<cha
   if (deflateInit2(&zs, Z_DEFAULT_COMPRESSION, Z_DEFLATED, window_bits | gzip_encoding, gzip_level, Z_DEFAULT_STRATEGY) != Z_OK)
     throw torrent::internal_error("gzip_compress_to_vector(...) could not initialize gzip deflate.");
 
-  scope_guard guard([&zs]() { deflateEnd(&zs); });
-
   auto max_response_size = deflateBound(&zs, length);
 
   output.resize(offset + max_response_size);

src/utils/gzip.h

@@ -2,7 +2,6 @@
 #define RTORRENT_UTILS_GZIP_H
 
 #include <functional>
-#include <vector>
 
 namespace utils {
 

src/utils/list_focus.h

@@ -0,0 +1,158 @@
+// rTorrent - BitTorrent client
+// Copyright (C) 2005-2011, Jari Sundell
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// In addition, as a special exception, the copyright holders give
+// permission to link the code of portions of this program with the
+// OpenSSL library under certain conditions as described in each
+// individual source file, and distribute linked combinations
+// including the two.
+//
+// You must obey the GNU General Public License in all respects for
+// all of the code used other than OpenSSL.  If you modify file(s)
+// with this exception, you may extend this exception to your version
+// of the file(s), but you are not obligated to do so.  If you do not
+// wish to do so, delete this exception statement from your version.
+// If you delete this exception statement from all source files in the
+// program, then also delete it here.
+//
+// Contact:  Jari Sundell <sundell.software@gmail.com>
+
+
+#ifndef RTORRENT_UTILS_LIST_FOCUS_H
+#define RTORRENT_UTILS_LIST_FOCUS_H
+
+#include <functional>
+#include <list>
+
+namespace utils {
+
+// Can't make this class inherit privately due to gcc PR 14258.
+
+template <typename Base>
+class ListFocus {
+public:
+  typedef Base                        base_type;
+  typedef std::function<void ()> slot_void;
+  typedef std::list<slot_void>        signal_void;
+
+  typedef typename base_type::iterator               iterator;
+  typedef typename base_type::const_iterator         const_iterator;
+  typedef typename base_type::reverse_iterator       reverse_iterator;
+  typedef typename base_type::const_reverse_iterator const_reverse_iterator;
+
+  typedef typename base_type::value_type             value_type;
+
+  ListFocus(base_type* b = nullptr) : m_base(b) { if (b) m_focus = b->end(); }
+
+  // Convinience functions, would have added more through using, but
+  // can't.
+  iterator            begin()                       { return m_base->begin(); }
+  iterator            end()                         { return m_base->end(); }
+  reverse_iterator    rbegin()                      { return m_base->rbegin(); }
+  reverse_iterator    rend()                        { return m_base->rend(); }
+
+  // Don't do erase on this object without making sure focus is right.
+  base_type&          base()                        { return *m_base; }
+
+  iterator            get_focus()                   { return m_focus; }
+  void                set_focus(iterator itr);
+
+  // These are looping increment/decrements.
+  iterator            inc_focus();
+  iterator            dec_focus();
+
+  iterator            erase(iterator itr);
+  void                remove(const value_type& v);
+
+  // Be careful with copying signals.
+  signal_void&        signal_changed()              { return m_signal_changed; }
+
+private:
+  void                emit_changed();
+
+  base_type*          m_base;
+  iterator            m_focus;
+
+  signal_void         m_signal_changed;
+};
+
+template <typename Base>
+void
+ListFocus<Base>::set_focus(iterator itr) {
+  m_focus = itr;
+  emit_changed();
+}
+
+template <typename Base>
+typename ListFocus<Base>::iterator
+ListFocus<Base>::inc_focus() {
+  if (m_focus != end())
+    ++m_focus;
+  else
+    m_focus = begin();
+
+  emit_changed();
+  return m_focus;
+}
+
+template <typename Base>
+typename ListFocus<Base>::iterator
+ListFocus<Base>::dec_focus() {
+  if (m_focus != begin())
+    --m_focus;
+  else
+    m_focus = end();
+
+  emit_changed();
+  return m_focus;
+}
+
+template <typename Base>
+typename ListFocus<Base>::iterator
+ListFocus<Base>::erase(iterator itr) {
+  if (itr == m_focus) {
+    m_focus = m_base->erase(itr);
+    emit_changed();
+    return m_focus;
+  }
+
+  return m_base->erase(itr);
+}
+
+template <typename Base>
+void
+ListFocus<Base>::remove(const value_type& v) {
+  iterator first = begin();
+  iterator last = end();
+
+  while (first != last)
+    if (*first == v)
+      first = erase(first);
+    else
+      ++first;
+}
+
+template <typename Base>
+void
+ListFocus<Base>::emit_changed() {
+  for (const auto& itr : m_signal_changed)
+    itr();
+}
+
+}
+
+#endif

test/Makefile.am

@@ -1,5 +1,4 @@
 TESTS = \
-	rtorrent_Test_Core \
 	rtorrent_Test_Rpc \
 	rtorrent_Test_Src
 
@@ -8,7 +7,6 @@ check_PROGRAMS = $(TESTS)
 rtorrent_Test_LDADD = \
 	../src/libsub_root.a
 
-rtorrent_Test_Core_LDADD = $(rtorrent_Test_LDADD)
 rtorrent_Test_Rpc_LDADD = $(rtorrent_Test_LDADD)
 rtorrent_Test_Src_LDADD = $(rtorrent_Test_LDADD)
 
@@ -32,10 +30,6 @@ rtorrent_Test_Common = \
 	helpers/test_utils.h \
 	helpers/utils.h
 
-rtorrent_Test_Core_SOURCES = $(rtorrent_Test_Common) \
-	core/test_view.cc \
-	core/test_view.h
-
 rtorrent_Test_Rpc_SOURCES = $(rtorrent_Test_Common) \
 	rpc/test_command.cc \
 	rpc/test_command.h \
@@ -51,39 +45,21 @@ rtorrent_Test_Rpc_SOURCES = $(rtorrent_Test_Common) \
 	rpc/test_command_slot.h \
 	rpc/test_object_storage.cc \
 	rpc/test_object_storage.h \
-	rpc/test_parse.cc \
-	rpc/test_parse.h \
 	rpc/test_parse_options.cc \
-	rpc/test_parse_options.h \
-	rpc/test_rpc_manager.cc \
-	rpc/test_rpc_manager.h
+	rpc/test_parse_options.h
 
 rtorrent_Test_Src_SOURCES = $(rtorrent_Test_Common) \
 	src/test_command_dynamic.cc \
 	src/test_command_dynamic.h \
-	src/test_command_groups.cc \
-	src/test_command_groups.h \
-	src/test_command_ip.cc \
-	src/test_command_ip.h \
 	src/test_command_system.cc \
 	src/test_command_system.h \
 	src/test_command_path.cc \
 	src/test_command_path.h \
 	src/test_command_string.cc \
 	src/test_command_string.h \
-	src/test_command_tracker.cc \
-	src/test_command_tracker.h \
-	src/test_download_list.cc \
-	src/test_download_list.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
 
-rtorrent_Test_Core_CXXFLAGS = $(CPPUNIT_CFLAGS)
-rtorrent_Test_Core_LDFLAGS = $(CPPUNIT_LIBS) -ldl
 rtorrent_Test_Rpc_CXXFLAGS = $(CPPUNIT_CFLAGS)
 rtorrent_Test_Rpc_LDFLAGS = $(CPPUNIT_LIBS) -ldl
 rtorrent_Test_Src_CXXFLAGS = $(CPPUNIT_CFLAGS)

test/core/test_view.cc

@@ -1,158 +0,0 @@
-#include "config.h"
-
-#include "test/core/test_view.h"
-
-#include <algorithm>
-#include <cstddef>
-#include <deque>
-#include <memory>
-#include <set>
-#include <string>
-#include <vector>
-
-#include "command_helpers.h"
-#include "control.h"
-#include "core/download.h"
-#include "core/view.h"
-#include "globals.h"
-#include "rpc/parse_commands.h"
-
-CPPUNIT_TEST_SUITE_REGISTRATION(TestView);
-
-namespace {
-
-const char* filter_command  = "test.view.filter";
-const char* added_command   = "test.view.event_added";
-const char* removed_command = "test.view.event_removed";
-
-// View only stores these and hands them to the command layer as RPC targets,
-// which casts the pointer without reading through it.
-struct download_stub {
-  alignas(core::Download) std::byte storage[sizeof(core::Download)];
-};
-
-std::deque<download_stub>    stub_storage;
-std::vector<core::Download*> stub_downloads;
-
-std::set<core::Download*>    matches_filter;
-std::vector<core::Download*> added_events;
-std::vector<core::Download*> removed_events;
-
-std::shared_ptr<core::Download>
-make_stub_download() {
-  auto download = reinterpret_cast<core::Download*>(&stub_storage.emplace_back());
-
-  stub_downloads.push_back(download);
-
-  return std::shared_ptr<core::Download>(download, [](core::Download*) {});
-}
-
-// Renders a dispatch list as "d0,d2" so a failure names the downloads the
-// handler saw, not just how many there were.
-std::string
-describe(const std::vector<core::Download*>& downloads) {
-  std::string result;
-
-  for (const auto& download : downloads) {
-    auto itr = std::find(stub_downloads.begin(), stub_downloads.end(), download);
-
-    if (!result.empty())
-      result += ',';
-
-    result += 'd' + std::to_string(std::distance(stub_downloads.begin(), itr));
-  }
-
-  return result;
-}
-
-torrent::Object
-cmd_filter(core::Download* download, const torrent::Object&) {
-  return torrent::Object(static_cast<int64_t>(matches_filter.count(download)));
-}
-
-torrent::Object
-cmd_event_added(core::Download* download, const torrent::Object&) {
-  added_events.push_back(download);
-  return torrent::Object();
-}
-
-torrent::Object
-cmd_event_removed(core::Download* download, const torrent::Object&) {
-  removed_events.push_back(download);
-  return torrent::Object();
-}
-
-torrent::Object
-command_object(const char* command) {
-  return torrent::Object(std::string(command) + "=");
-}
-
-} // namespace
-
-void
-TestView::setUp() {
-  TestFixtureWithMainThread::setUp();
-
-  if (control == nullptr)
-    control = new Control;
-
-  if (!rpc::commands.has(filter_command)) {
-    CMD2_DL(filter_command, &cmd_filter);
-    CMD2_DL(added_command, &cmd_event_added);
-    CMD2_DL(removed_command, &cmd_event_removed);
-  }
-
-  stub_storage.clear();
-  stub_downloads.clear();
-  matches_filter.clear();
-  added_events.clear();
-  removed_events.clear();
-}
-
-void
-TestView::tearDown() {
-  TestFixtureWithMainThread::tearDown();
-}
-
-// d0 and d1 start visible and stop matching, d2 and d3 start filtered out and
-// start matching. The two halves are the same size on purpose: a test that
-// only counted the dispatches would pass even if both events were sent over
-// the same half of the changed range.
-void
-TestView::test_filter_dispatches_events_to_the_right_downloads() {
-  core::View view;
-  view.initialize("test_view");
-
-  auto d0 = make_stub_download();
-  auto d1 = make_stub_download();
-  auto d2 = make_stub_download();
-  auto d3 = make_stub_download();
-
-  view.insert(d0);
-  view.insert(d1);
-  view.insert(d2);
-  view.insert(d3);
-
-  view.set_visible(d0.get());
-  view.set_visible(d1.get());
-
-  CPPUNIT_ASSERT_EQUAL(core::View::size_type(2), view.size_visible());
-
-  matches_filter = {d2.get(), d3.get()};
-
-  view.set_filter(command_object(filter_command));
-  view.set_event_added(command_object(added_command));
-  view.set_event_removed(command_object(removed_command));
-
-  added_events.clear();
-  removed_events.clear();
-
-  view.filter();
-
-  CPPUNIT_ASSERT_EQUAL(std::string("d2,d3"), describe(added_events));
-  CPPUNIT_ASSERT_EQUAL(std::string("d0,d1"), describe(removed_events));
-
-  CPPUNIT_ASSERT_EQUAL(core::View::size_type(2), view.size_visible());
-  CPPUNIT_ASSERT(*view.begin_visible() == d2);
-  CPPUNIT_ASSERT(*(view.begin_visible() + 1) == d3);
-}

test/core/test_view.h

@@ -1,15 +0,0 @@
-#include "test/helpers/test_main_thread.h"
-
-class TestView : public TestFixtureWithMainThread {
-  CPPUNIT_TEST_SUITE(TestView);
-
-  CPPUNIT_TEST(test_filter_dispatches_events_to_the_right_downloads);
-
-  CPPUNIT_TEST_SUITE_END();
-
-public:
-  void setUp();
-  void tearDown();
-
-  void test_filter_dispatches_events_to_the_right_downloads();
-};

test/rpc/test_jsonrpc.cc

@@ -8,18 +8,12 @@
 #include "globals.h"
 #include "command_helpers.h"
 #include "rpc/command_map.h"
-#include "rpc/scgi_task.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION(TestJsonrpc);
 
 torrent::Object
 jsonrpc_cmd_test_reflect([[maybe_unused]] rpc::target_type t, const torrent::Object& obj) { return obj; }
 
-torrent::Object
-jsonrpc_cmd_test_oversized([[maybe_unused]] rpc::target_type t, [[maybe_unused]] const torrent::Object& obj) {
-  return torrent::Object(std::string(rpc::SCgiTask::max_response_size + (1 << 20), 'a'));
-}
-
 void initialize_command_dynamic();
 
 // Name, Request, Expected response
@@ -136,10 +130,6 @@ TestJsonrpc::setUp() {
   if (rpc::commands.find("jsonrpc_reflect") == rpc::commands.end()) {
     CMD2_ANY("jsonrpc_reflect", &jsonrpc_cmd_test_reflect);
   }
-
-  if (rpc::commands.find("jsonrpc_oversized") == rpc::commands.end()) {
-    CMD2_ANY("jsonrpc_oversized", &jsonrpc_cmd_test_oversized);
-  }
 }
 
 void
@@ -155,100 +145,3 @@ TestJsonrpc::test_basics() {
     CPPUNIT_ASSERT_EQUAL_MESSAGE(std::get<0>(test), std::get<2>(test), output);
   }
 }
-
-// A command whose result does not fit in the SCGI response buffer must be
-// answered with a fault, not handed to the writer. SCgiTask::receive_write
-// treats an oversized body as an internal_error, which is not caught by any
-// RPC handler and terminates the process.
-void
-TestJsonrpc::test_response_size_limit() {
-  const std::string request = R"({"jsonrpc": "2.0", "method": "jsonrpc_oversized", "params": [""], "id": 1})";
-  const std::string expected = R"({"error":{"code":-32000,"message":"response size exceeds maximum RPC limit"},"id":1,"jsonrpc":"2.0"})";
-
-  std::string output;
-  m_jsonrpc.process(request.c_str(), request.size(), [&output](const char* c, uint32_t l) { output.append(c, l); return true; });
-
-  CPPUNIT_ASSERT_MESSAGE("response handed to the writer is " + std::to_string(output.size()) +
-                         " bytes, over the " + std::to_string(rpc::SCgiTask::max_response_size) + " byte SCGI limit",
-                         output.size() <= rpc::SCgiTask::max_response_size);
-  CPPUNIT_ASSERT_EQUAL(expected, output);
-}
-
-// The bound is applied while the document is parsed: json_to_object only ever
-// walks "params", and by the time it runs the whole tree already exists.
-void
-TestJsonrpc::test_depth_limit() {
-  // A JSON string holding a quote and brackets that must not be counted.
-  const std::string tricky = R"("\"[[[")";
-
-  std::vector<std::tuple<std::string, std::string, std::string>> requests = {
-    std::make_tuple("Nesting under the limit is accepted",
-                    R"({"jsonrpc": "2.0", "method": "jsonrpc_reflect", "params": ["", )" +
-                      std::string(1000, '[') + std::string(1000, ']') + R"(], "id": 1})",
-                    R"({"id":1,"jsonrpc":"2.0","result":[)" +
-                      std::string(1000, '[') + std::string(1000, ']') + R"(]})"),
-
-    // Nesting outside "params" is never converted, so json_to_object's own
-    // bound never sees it.
-    std::make_tuple("Nesting outside params is rejected",
-                    R"({"jsonrpc": "2.0", "method": "jsonrpc_reflect", "params": [""], "id": 1, "x": )" +
-                      std::string(2000, '[') + std::string(2000, ']') + R"(})",
-                    R"({"error":{"code":-32600,"message":"maximum nesting depth exceeded"},"id":null,"jsonrpc":"2.0"})"),
-
-    std::make_tuple("Nesting over the limit is rejected",
-                    R"({"jsonrpc": "2.0", "method": "jsonrpc_reflect", "params": ["", )" +
-                      std::string(2000, '[') + std::string(2000, ']') + R"(], "id": 1})",
-                    R"({"error":{"code":-32600,"message":"maximum nesting depth exceeded"},"id":null,"jsonrpc":"2.0"})"),
-
-    std::make_tuple("Brackets inside a string are not nesting",
-                    R"({"jsonrpc": "2.0", "method": "jsonrpc_reflect", "params": ["", ")" +
-                      std::string(2000, '[') + R"("], "id": 1})",
-                    R"({"id":1,"jsonrpc":"2.0","result":[")" +
-                      std::string(2000, '[') + R"("]})"),
-
-    std::make_tuple("An escaped quote does not end a string",
-                    R"({"jsonrpc": "2.0", "method": "jsonrpc_reflect", "params": ["", )" + tricky + R"(, ")" +
-                      std::string(2000, '[') + R"("], "id": 1})",
-                    R"({"id":1,"jsonrpc":"2.0","result":[)" + tricky + R"(,")" +
-                      std::string(2000, '[') + R"("]})"),
-
-    // The bound is on the whole document, so the outer object and the params
-    // array are two of the 1024 containers and 1022 are left for the payload.
-    std::make_tuple("Nesting one below the limit is accepted",
-                    R"({"jsonrpc": "2.0", "method": "jsonrpc_reflect", "params": ["", )" +
-                      std::string(1021, '[') + std::string(1021, ']') + R"(], "id": 1})",
-                    R"({"id":1,"jsonrpc":"2.0","result":[)" +
-                      std::string(1021, '[') + std::string(1021, ']') + R"(]})"),
-
-    std::make_tuple("Nesting at the limit is accepted",
-                    R"({"jsonrpc": "2.0", "method": "jsonrpc_reflect", "params": ["", )" +
-                      std::string(1022, '[') + std::string(1022, ']') + R"(], "id": 1})",
-                    R"({"id":1,"jsonrpc":"2.0","result":[)" +
-                      std::string(1022, '[') + std::string(1022, ']') + R"(]})"),
-
-    std::make_tuple("Nesting one over the limit is rejected",
-                    R"({"jsonrpc": "2.0", "method": "jsonrpc_reflect", "params": ["", )" +
-                      std::string(1023, '[') + std::string(1023, ']') + R"(], "id": 1})",
-                    R"({"error":{"code":-32600,"message":"maximum nesting depth exceeded"},"id":null,"jsonrpc":"2.0"})"),
-  };
-
-  for (auto& test : requests) {
-    std::string output;
-    m_jsonrpc.process(std::get<1>(test).c_str(), std::get<1>(test).size(), [&output](const char* c, uint32_t l) { output.append(c, l); return true; });
-    CPPUNIT_ASSERT_EQUAL_MESSAGE(std::get<0>(test), std::get<2>(test), output);
-  }
-}
-
-// network.xmlrpc.size_limit is the only knob bounding how much input a single
-// request may spend memory on, and it has to bound the JSON path too.
-void
-TestJsonrpc::test_size_limit() {
-  const std::string request = R"({"jsonrpc": "2.0", "method": "jsonrpc_reflect", "params": [""], "id": 1})";
-  const std::string expected = R"({"error":{"code":-32600,"message":"content size exceeds maximum RPC limit"},"id":null,"jsonrpc":"2.0"})";
-
-  std::string output;
-  m_jsonrpc.set_size_limit(1);
-  m_jsonrpc.process(request.c_str(), request.size(), [&output](const char* c, uint32_t l) { output.append(c, l); return true; });
-
-  CPPUNIT_ASSERT_EQUAL(expected, output);
-}

test/rpc/test_jsonrpc.h

@@ -8,9 +8,6 @@ class TestJsonrpc : public test_fixture {
   CPPUNIT_TEST_SUITE(TestJsonrpc);
 
   CPPUNIT_TEST(test_basics);
-  CPPUNIT_TEST(test_response_size_limit);
-  CPPUNIT_TEST(test_depth_limit);
-  CPPUNIT_TEST(test_size_limit);
 
   CPPUNIT_TEST_SUITE_END();
 
@@ -19,9 +16,6 @@ public:
   void tearDown();
 
   void test_basics();
-  void test_response_size_limit();
-  void test_depth_limit();
-  void test_size_limit();
 
 private:
   std::unique_ptr<TestMainThread> m_test_main_thread;

test/rpc/test_object_storage.cc

@@ -49,34 +49,6 @@ TestObjectStorage::test_validate_keys() {
   torrent::raw_string raw_string_4("test_4\0foo", 10);
 
   ASSERT_CATCH_INPUT_ERROR( { m_storage.insert(raw_string_4, torrent::Object("a"), rpc::object_storage::flag_string_type); } );
-  ASSERT_CATCH_INPUT_ERROR( { m_storage.insert_str("", torrent::Object("a"), rpc::object_storage::flag_string_type); } );
-
-  std::string key_max(rpc::object_storage::key_size - 1, 'k');
-
-  CPPUNIT_ASSERT(m_storage.insert_str(key_max, torrent::Object("a"), rpc::object_storage::flag_string_type)->first == key_max);
-  ASSERT_CATCH_INPUT_ERROR( { m_storage.insert_str(key_max + 'k', torrent::Object("a"), rpc::object_storage::flag_string_type); } );
-
-  // The over-long key must not have been stored as the empty key.
-  CPPUNIT_ASSERT(m_storage.find_raw_string(torrent::raw_string::from_c_str("")) == m_storage.end());
-
-  // An over-long key must not be truncated into a match either.
-  CPPUNIT_ASSERT(m_storage.find_raw_string(torrent::raw_string::from_string(key_max + 'k')) == m_storage.end());
-
-  // set_c_str puts the terminating nul at m_data[size()], so size() has to
-  // stay below max_size for that write to land inside the array.
-  rpc::object_storage::key_type key_long;
-  key_long.set_c_str(std::string(rpc::object_storage::key_size + 1, 'k').c_str());
-
-  CPPUNIT_ASSERT(key_long.size() < rpc::object_storage::key_size);
-
-  m_storage.clear();
-  m_storage.insert_str("test_5", torrent::Object("a"), rpc::object_storage::flag_string_type);
-
-  // insert rejects a key holding a nul-char, so a lookup must not match past one.
-  CPPUNIT_ASSERT(m_storage.find_raw_string(torrent::raw_string("test_5\0x", 8)) == m_storage.end());
-  CPPUNIT_ASSERT(m_storage.find_raw_string(torrent::raw_string::from_c_str("test_5")) != m_storage.end());
-
-  m_storage.clear();
 }
 
 // And test many other bad/good string combos.

test/rpc/test_parse.cc

@@ -1,95 +0,0 @@
-#include "config.h"
-
-#include "test/rpc/test_parse.h"
-
-#include <cstdint>
-#include <limits>
-
-#include "rpc/parse.h"
-
-CPPUNIT_TEST_SUITE_REGISTRATION(TestParse);
-
-void
-TestParse::test_whole_value_in_range() {
-  int64_t value = 0;
-
-  CPPUNIT_ASSERT(rpc::parse_whole_value_nothrow("9223372036854775807", &value));
-  CPPUNIT_ASSERT_EQUAL(std::numeric_limits<int64_t>::max(), value);
-
-  CPPUNIT_ASSERT(rpc::parse_whole_value_nothrow("-9223372036854775808", &value));
-  CPPUNIT_ASSERT_EQUAL(std::numeric_limits<int64_t>::min(), value);
-}
-
-void
-TestParse::test_whole_value_out_of_range() {
-  int64_t value = 0;
-
-  CPPUNIT_ASSERT(!rpc::parse_whole_value_nothrow("9223372036854775808", &value));
-  CPPUNIT_ASSERT(!rpc::parse_whole_value_nothrow("-9223372036854775809", &value));
-  CPPUNIT_ASSERT(!rpc::parse_whole_value_nothrow("99999999999999999999999999", &value));
-}
-
-void
-TestParse::test_whole_value_bases() {
-  int64_t value = 0;
-
-  CPPUNIT_ASSERT(rpc::parse_whole_value_nothrow("0x1f", &value));
-  CPPUNIT_ASSERT_EQUAL(int64_t{31}, value);
-
-  CPPUNIT_ASSERT(rpc::parse_whole_value_nothrow("0X1F", &value));
-  CPPUNIT_ASSERT_EQUAL(int64_t{31}, value);
-
-  CPPUNIT_ASSERT(!rpc::parse_whole_value_nothrow("-0x1f", &value));
-
-  CPPUNIT_ASSERT(rpc::parse_whole_value_nothrow("0022", &value));
-  CPPUNIT_ASSERT_EQUAL(int64_t{022}, value);
-
-  CPPUNIT_ASSERT(!rpc::parse_whole_value_nothrow("0028", &value));
-  CPPUNIT_ASSERT(!rpc::parse_whole_value_nothrow("+022", &value));
-  CPPUNIT_ASSERT(!rpc::parse_whole_value_nothrow("-022", &value));
-
-  CPPUNIT_ASSERT(rpc::parse_whole_value_nothrow("22", &value));
-  CPPUNIT_ASSERT_EQUAL(int64_t{22}, value);
-
-  CPPUNIT_ASSERT(rpc::parse_whole_value_nothrow("1f", &value, 16));
-  CPPUNIT_ASSERT_EQUAL(int64_t{31}, value);
-
-  CPPUNIT_ASSERT(rpc::parse_whole_value_nothrow("0x1f", &value, 16));
-  CPPUNIT_ASSERT_EQUAL(int64_t{31}, value);
-
-  CPPUNIT_ASSERT(rpc::parse_whole_value_nothrow("22", &value, 8));
-  CPPUNIT_ASSERT_EQUAL(int64_t{022}, value);
-
-  CPPUNIT_ASSERT(rpc::parse_whole_value_nothrow("022", &value, 8));
-  CPPUNIT_ASSERT_EQUAL(int64_t{022}, value);
-
-  const char* no_digits = "0x";
-  CPPUNIT_ASSERT(!rpc::parse_whole_value_nothrow(no_digits, &value));
-  CPPUNIT_ASSERT_EQUAL(no_digits + 1, rpc::parse_value_nothrow(no_digits, &value));
-
-  const char* bad_digits = "0xzz";
-  CPPUNIT_ASSERT(!rpc::parse_whole_value_nothrow(bad_digits, &value));
-  CPPUNIT_ASSERT_EQUAL(bad_digits + 1, rpc::parse_value_nothrow(bad_digits, &value));
-}
-
-void
-TestParse::test_whole_value_prefixes() {
-  int64_t value = 0;
-
-  CPPUNIT_ASSERT(!rpc::parse_whole_value_nothrow("+5", &value));
-
-  CPPUNIT_ASSERT(rpc::parse_whole_value_nothrow("  5  ", &value));
-  CPPUNIT_ASSERT_EQUAL(int64_t{5}, value);
-
-  CPPUNIT_ASSERT(rpc::parse_whole_value_nothrow("5k", &value));
-  CPPUNIT_ASSERT_EQUAL(int64_t{5120}, value);
-
-  CPPUNIT_ASSERT(rpc::parse_whole_value_nothrow("yes", &value));
-  CPPUNIT_ASSERT_EQUAL(int64_t{1}, value);
-
-  CPPUNIT_ASSERT(rpc::parse_whole_value_nothrow("false", &value));
-  CPPUNIT_ASSERT_EQUAL(int64_t{0}, value);
-
-  CPPUNIT_ASSERT(!rpc::parse_whole_value_nothrow("junk", &value));
-  CPPUNIT_ASSERT(!rpc::parse_whole_value_nothrow("", &value));
-}

test/rpc/test_parse.h

@@ -1,18 +0,0 @@
-#include "test/helpers/test_fixture.h"
-
-class TestParse : public test_fixture {
-  CPPUNIT_TEST_SUITE(TestParse);
-
-  CPPUNIT_TEST(test_whole_value_in_range);
-  CPPUNIT_TEST(test_whole_value_out_of_range);
-  CPPUNIT_TEST(test_whole_value_bases);
-  CPPUNIT_TEST(test_whole_value_prefixes);
-
-  CPPUNIT_TEST_SUITE_END();
-
-public:
-  void test_whole_value_in_range();
-  void test_whole_value_out_of_range();
-  void test_whole_value_bases();
-  void test_whole_value_prefixes();
-};

test/rpc/test_rpc_manager.cc

@@ -1,21 +0,0 @@
-#include "config.h"
-
-#include "test/rpc/test_rpc_manager.h"
-
-#include <torrent/exceptions.h>
-
-#include "rpc/scgi_task.h"
-
-CPPUNIT_TEST_SUITE_REGISTRATION(TestRpcManager);
-
-// A size limit too small to hold any request rejects every request, including
-// the one that would put it back, so it can only be undone by a restart.
-void
-TestRpcManager::test_size_limit_bounds() {
-  CPPUNIT_ASSERT_THROW(m_rpc_manager.set_size_limit(0), torrent::input_error);
-  CPPUNIT_ASSERT_THROW(m_rpc_manager.set_size_limit(rpc::RpcManager::min_size_limit - 1), torrent::input_error);
-  CPPUNIT_ASSERT_THROW(m_rpc_manager.set_size_limit(rpc::SCgiTask::max_content_size + 1), torrent::input_error);
-
-  CPPUNIT_ASSERT_NO_THROW(m_rpc_manager.set_size_limit(rpc::RpcManager::min_size_limit));
-  CPPUNIT_ASSERT_NO_THROW(m_rpc_manager.set_size_limit(rpc::SCgiTask::max_content_size));
-}

test/rpc/test_rpc_manager.h

@@ -1,17 +0,0 @@
-#include "test/helpers/test_fixture.h"
-
-#include "rpc/rpc_manager.h"
-
-class TestRpcManager : public test_fixture {
-  CPPUNIT_TEST_SUITE(TestRpcManager);
-
-  CPPUNIT_TEST(test_size_limit_bounds);
-
-  CPPUNIT_TEST_SUITE_END();
-
-public:
-  void test_size_limit_bounds();
-
-private:
-  rpc::RpcManager m_rpc_manager;
-};

test/rpc/test_xmlrpc.cc

@@ -8,7 +8,6 @@
 #include "globals.h"
 #include "command_helpers.h"
 #include "rpc/command_map.h"
-#include "rpc/scgi_task.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION(TestXmlrpc);
 
@@ -22,11 +21,6 @@ xmlrpc_cmd_test_reflect_string([[maybe_unused]] rpc::target_type t, const std::s
   return obj;
 }
 
-torrent::Object
-xmlrpc_cmd_test_oversized([[maybe_unused]] rpc::target_type t, [[maybe_unused]] const torrent::Object& obj) {
-  return torrent::Object(std::string(rpc::SCgiTask::max_response_size + (1 << 20), 'a'));
-}
-
 void initialize_command_dynamic();
 
 #if defined(HAVE_XMLRPC_TINYXML2) && !defined(HAVE_XMLRPC_C)
@@ -133,9 +127,6 @@ TestXmlrpc::setUp() {
 
   if (rpc::commands.find("xmlrpc_reflect_string") == rpc::commands.end())
     CMD2_ANY_STRING("xmlrpc_reflect_string", &xmlrpc_cmd_test_reflect_string);
-
-  if (rpc::commands.find("xmlrpc_oversized") == rpc::commands.end())
-    CMD2_ANY("xmlrpc_oversized", &xmlrpc_cmd_test_oversized);
 }
 
 void
@@ -174,72 +165,11 @@ TestXmlrpc::test_size_limit() {
   CPPUNIT_ASSERT_EQUAL(expected, output);
 }
 
-// A command whose result does not fit in the SCGI response buffer must be
-// answered with a fault, not handed to the writer. SCgiTask::receive_write
-// treats an oversized body as an internal_error, which is not caught by any
-// RPC handler and terminates the process.
-void
-TestXmlrpc::test_response_size_limit() {
-  std::string input = "<?xml version=\"1.0\"?><methodCall><methodName>xmlrpc_oversized</methodName><params><param><value><string></string></value></param></params></methodCall>";
-  std::string expected = "<?xml version=\"1.0\"?><methodResponse><fault><value><struct><member><name>faultCode</name><value><i8>-509</i8></value></member><member><name>faultString</name><value><string>Response size exceeds maximum XML-RPC limit</string></value></member></struct></value></fault></methodResponse>";
-  std::string output;
-
-  m_xmlrpc.process(input.c_str(), input.size(), [&output](const char* c, uint32_t l){ output.append(c, l); return true;});
-
-  CPPUNIT_ASSERT_MESSAGE("response handed to the writer is " + std::to_string(output.size()) +
-                         " bytes, over the " + std::to_string(rpc::SCgiTask::max_response_size) + " byte SCGI limit",
-                         output.size() <= rpc::SCgiTask::max_response_size);
-  CPPUNIT_ASSERT_EQUAL(expected, output);
-}
-
-namespace {
-
-const std::string multicall_method_name =
-  "<member><name>methodName</name><value><string>xmlrpc_reflect</string></value></member>";
-const std::string multicall_params =
-  "<member><name>params</name><value><array><data>"
-  "<value><string></string></value><value><string>a</string></value>"
-  "</data></array></value></member>";
-
-std::string
-multicall_request(const std::string& members) {
-  return "<?xml version=\"1.0\"?><methodCall><methodName>system.multicall</methodName>"
-         "<params><param><value><array><data><value><struct>" + members +
-         "</struct></value></data></array></value></param></params></methodCall>";
-}
-
-}
-
-void
-TestXmlrpc::test_multicall_member_order() {
-  auto call = [this](const std::string& input) {
-    std::string output;
-    m_xmlrpc.process(input.c_str(), input.size(), [&output](const char* c, uint32_t l){ output.append(c, l); return true;});
-    return output;
-  };
-
-  // methodName first is the only order accepted; the positive control proves
-  // the harness drives the real code path rather than a stub.
-  std::string ordered = call(multicall_request(multicall_method_name + multicall_params));
-  CPPUNIT_ASSERT(ordered.find("faultCode") == std::string::npos);
-
-  // params before methodName is rejected with a clear top-level fault,
-  // instead of the "could not find expected element string" of a positional read.
-  std::string expected_fault =
-    "<?xml version=\"1.0\"?><methodResponse><fault><value><struct>"
-    "<member><name>faultCode</name><value><i8>-503</i8></value></member>"
-    "<member><name>faultString</name><value><string>multicall struct's first member must be methodName</string></value></member>"
-    "</struct></value></fault></methodResponse>";
-  CPPUNIT_ASSERT_EQUAL(expected_fault, call(multicall_request(multicall_params + multicall_method_name)));
-}
-
 #else
 
 void TestXmlrpc::test_invalid_utf8() {}
 void TestXmlrpc::test_basics() {}
 void TestXmlrpc::test_size_limit() {}
-void TestXmlrpc::test_response_size_limit() {}
-void TestXmlrpc::test_multicall_member_order() {}
 void TestXmlrpc::setUp() {}
 void TestXmlrpc::tearDown() {}
 

test/rpc/test_xmlrpc.h

@@ -10,8 +10,6 @@ class TestXmlrpc : public test_fixture {
   CPPUNIT_TEST(test_basics);
   CPPUNIT_TEST(test_invalid_utf8);
   CPPUNIT_TEST(test_size_limit);
-  CPPUNIT_TEST(test_response_size_limit);
-  CPPUNIT_TEST(test_multicall_member_order);
 
   CPPUNIT_TEST_SUITE_END();
 
@@ -24,8 +22,6 @@ public:
   void test_basics();
   void test_invalid_utf8();
   void test_size_limit();
-  void test_response_size_limit();
-  void test_multicall_member_order();
 
 private:
   std::unique_ptr<TestMainThread> m_test_main_thread;

test/src/test_command_dynamic.cc

@@ -2,8 +2,6 @@
 
 #include "test/src/test_command_dynamic.h"
 
-#include "helpers/assert.h"
-
 #include "control.h"
 #include "globals.h"
 #include "rpc/parse_commands.h"
@@ -63,51 +61,3 @@ TestCommandDynamic::test_old_style() {
   rpc::commands.call_command("method.insert", rpc::create_object_list("test_old_style.4", "simple", "cat=test.3"));
   CPPUNIT_ASSERT(rpc::commands.call_command("test_old_style.4", torrent::Object()).as_string() == "test.3");
 }
-
-void
-TestCommandDynamic::test_insert_list() {
-  torrent::Object key_only = torrent::Object::create_list();
-  key_only.as_list().push_back("test_insert_list.1");
-
-  rpc::commands.call_command("method.insert.list", key_only);
-
-  torrent::Object result = rpc::commands.call_command("test_insert_list.1", torrent::Object());
-
-  CPPUNIT_ASSERT(result.is_list());
-  CPPUNIT_ASSERT(result.as_list().empty());
-
-  rpc::commands.call_command("method.insert.list",
-                             rpc::create_object_list("test_insert_list.2", rpc::create_object_list("a", "b")));
-
-  torrent::Object filled = rpc::commands.call_command("test_insert_list.2", torrent::Object());
-
-  CPPUNIT_ASSERT(filled.is_list());
-  CPPUNIT_ASSERT_EQUAL((size_t)2, filled.as_list().size());
-}
-
-void
-TestCommandDynamic::test_value_base() {
-  auto value = [](std::initializer_list<torrent::Object> objects) {
-    auto args = torrent::Object::create_list();
-
-    for (const auto& object : objects)
-      args.as_list().push_back(object);
-
-    return rpc::commands.call_command("value", args).as_value();
-  };
-
-  CPPUNIT_ASSERT_EQUAL(int64_t(10), value({"10"}));
-  CPPUNIT_ASSERT_EQUAL(int64_t(255), value({"ff", int64_t(16)}));
-
-  // strtoll only defines base 0 and base 2 through 36.
-  ASSERT_CATCH_INPUT_ERROR( { value({"10", int64_t(1)}); } );
-  ASSERT_CATCH_INPUT_ERROR( { value({"10", int64_t(37)}); } );
-  ASSERT_CATCH_INPUT_ERROR( { value({"10", int64_t(-1)}); } );
-
-  // An out-of-range base must not be narrowed into a valid one.
-  ASSERT_CATCH_INPUT_ERROR( { value({"10", int64_t(1) << 40}); } );
-  ASSERT_CATCH_INPUT_ERROR( { value({"ff", (int64_t(1) << 32) + 16}); } );
-
-  // A number too large for the result must be rejected, not clamped.
-  ASSERT_CATCH_INPUT_ERROR( { value({"99999999999999999999999"}); } );
-}

test/src/test_command_dynamic.h

@@ -7,8 +7,6 @@ class TestCommandDynamic : public test_fixture {
   CPPUNIT_TEST(test_basics);
   CPPUNIT_TEST(test_get_set);
   CPPUNIT_TEST(test_old_style);
-  CPPUNIT_TEST(test_insert_list);
-  CPPUNIT_TEST(test_value_base);
 
   CPPUNIT_TEST_SUITE_END();
 
@@ -20,8 +18,6 @@ public:
   void test_get_set();
 
   void test_old_style();
-  void test_insert_list();
-  void test_value_base();
 
 private:
   std::unique_ptr<TestMainThread> m_test_main_thread;

test/src/test_command_groups.cc

@@ -1,65 +0,0 @@
-#include "config.h"
-
-#include "test/src/test_command_groups.h"
-
-#include <torrent/torrent.h>
-
-#include "control.h"
-#include "globals.h"
-#include "rpc/parse_commands.h"
-
-CPPUNIT_TEST_SUITE_REGISTRATION(TestCommandGroups);
-
-void initialize_command_groups();
-
-static void
-call_set(const char* value) {
-  torrent::Object::list_type args;
-  args.push_back(torrent::Object(int64_t{0}));
-  args.push_back(torrent::Object(std::string(value)));
-
-  rpc::commands.call_command("choke_group.up.max.set", torrent::Object::create_list_range(args.begin(), args.end()));
-}
-
-static int64_t
-call_get(const char* key) {
-  return rpc::commands.call_command(key, torrent::Object(int64_t{0})).as_value();
-}
-
-void
-TestCommandGroups::setUp() {
-  torrent::initialize_main_thread();
-  torrent::initialize();
-
-  if (control == nullptr)
-    control = new Control;
-
-  if (!rpc::commands.has("choke_group.up.max.set"))
-    initialize_command_groups();
-}
-
-void
-TestCommandGroups::tearDown() {
-  torrent::cleanup();
-}
-
-void
-TestCommandGroups::test_max_unchoked_in_range() {
-  call_set("50");
-  CPPUNIT_ASSERT_EQUAL(int64_t{50}, call_get("choke_group.up.max"));
-  CPPUNIT_ASSERT_EQUAL(int64_t{0}, call_get("choke_group.up.max.unlimited"));
-
-  call_set("-1");
-  CPPUNIT_ASSERT_EQUAL(int64_t{1}, call_get("choke_group.up.max.unlimited"));
-}
-
-void
-TestCommandGroups::test_max_unchoked_out_of_range() {
-  call_set("50");
-
-  CPPUNIT_ASSERT_THROW(call_set("4294967296"), torrent::input_error);
-  CPPUNIT_ASSERT_EQUAL(int64_t{50}, call_get("choke_group.up.max"));
-
-  CPPUNIT_ASSERT_THROW(call_set("-2"), torrent::input_error);
-  CPPUNIT_ASSERT_EQUAL(int64_t{50}, call_get("choke_group.up.max"));
-}

test/src/test_command_groups.h

@@ -1,17 +0,0 @@
-#include "test/helpers/test_fixture.h"
-
-class TestCommandGroups : public test_fixture {
-  CPPUNIT_TEST_SUITE(TestCommandGroups);
-
-  CPPUNIT_TEST(test_max_unchoked_in_range);
-  CPPUNIT_TEST(test_max_unchoked_out_of_range);
-
-  CPPUNIT_TEST_SUITE_END();
-
-public:
-  void setUp();
-  void tearDown();
-
-  void test_max_unchoked_in_range();
-  void test_max_unchoked_out_of_range();
-};

test/src/test_command_ip.cc

@@ -1,55 +0,0 @@
-#include "config.h"
-
-#include "test/src/test_command_ip.h"
-
-#include <cstdint>
-
-CPPUNIT_TEST_SUITE_REGISTRATION(TestCommandIp);
-
-bool ipv4_range_parse(const char* address, uint32_t* address_start, uint32_t* address_end);
-
-static uint32_t
-ipv4(uint32_t a, uint32_t b, uint32_t c, uint32_t d) {
-  return (a << 24) | (b << 16) | (c << 8) | d;
-}
-
-#define RANGE_ASSERT(address, expected_start, expected_end)             \
-  {                                                                     \
-    uint32_t start = 0;                                                 \
-    uint32_t end = 0;                                                   \
-                                                                        \
-    CPPUNIT_ASSERT(ipv4_range_parse(address, &start, &end));            \
-    CPPUNIT_ASSERT_EQUAL(expected_start, start);                        \
-    CPPUNIT_ASSERT_EQUAL(expected_end, end);                            \
-  }
-
-void
-TestCommandIp::test_single_address() {
-  RANGE_ASSERT("10.1.2.3", ipv4(10, 1, 2, 3), ipv4(10, 1, 2, 3));
-}
-
-void
-TestCommandIp::test_explicit_range() {
-  RANGE_ASSERT("10.1.2.3-10.1.2.9", ipv4(10, 1, 2, 3), ipv4(10, 1, 2, 9));
-}
-
-void
-TestCommandIp::test_cidr() {
-  RANGE_ASSERT("10.0.0.0/8", ipv4(10, 0, 0, 0), ipv4(10, 255, 255, 255));
-  RANGE_ASSERT("10.1.2.0/24", ipv4(10, 1, 2, 0), ipv4(10, 1, 2, 255));
-  RANGE_ASSERT("10.1.2.128/25", ipv4(10, 1, 2, 128), ipv4(10, 1, 2, 255));
-  RANGE_ASSERT("10.1.2.3/31", ipv4(10, 1, 2, 2), ipv4(10, 1, 2, 3));
-}
-
-void
-TestCommandIp::test_cidr_zero_mask() {
-  RANGE_ASSERT("0.0.0.0/0", ipv4(0, 0, 0, 0), ipv4(255, 255, 255, 255));
-  RANGE_ASSERT("10.1.2.3/0", ipv4(0, 0, 0, 0), ipv4(255, 255, 255, 255));
-}
-
-void
-TestCommandIp::test_cidr_full_mask() {
-  RANGE_ASSERT("10.1.2.3/32", ipv4(10, 1, 2, 3), ipv4(10, 1, 2, 3));
-  RANGE_ASSERT("0.0.0.0/32", ipv4(0, 0, 0, 0), ipv4(0, 0, 0, 0));
-  RANGE_ASSERT("255.255.255.255/32", ipv4(255, 255, 255, 255), ipv4(255, 255, 255, 255));
-}

test/src/test_command_ip.h

@@ -1,25 +0,0 @@
-#include <cppunit/TestFixture.h>
-#include <cppunit/extensions/HelperMacros.h>
-
-// ipv4_range_parse is a pure function, so this does not use test_fixture and
-// the mock and logging setup that comes with it.
-class TestCommandIp : public CppUnit::TestFixture {
-  CPPUNIT_TEST_SUITE(TestCommandIp);
-
-  CPPUNIT_TEST(test_single_address);
-  CPPUNIT_TEST(test_explicit_range);
-
-  CPPUNIT_TEST(test_cidr);
-  CPPUNIT_TEST(test_cidr_zero_mask);
-  CPPUNIT_TEST(test_cidr_full_mask);
-
-  CPPUNIT_TEST_SUITE_END();
-
-public:
-  void test_single_address();
-  void test_explicit_range();
-
-  void test_cidr();
-  void test_cidr_zero_mask();
-  void test_cidr_full_mask();
-};

test/src/test_command_throttle.cc

@@ -1,102 +0,0 @@
-#include "config.h"
-
-#include "test/src/test_command_throttle.h"
-
-#include <torrent/throttle.h>
-#include <torrent/torrent.h>
-
-#include "core/manager.h"
-#include "control.h"
-#include "globals.h"
-#include "rpc/parse_commands.h"
-
-CPPUNIT_TEST_SUITE_REGISTRATION(TestCommandThrottle);
-
-void initialize_command_throttle();
-
-static void
-call_set(const char* key, const char* value) {
-  rpc::commands.call_command(key, torrent::Object(std::string(value)));
-}
-
-static void
-call_named(const char* key, const char* name, const char* value) {
-  torrent::Object::list_type args;
-  args.push_back(torrent::Object(std::string(name)));
-  args.push_back(torrent::Object(std::string(value)));
-
-  rpc::commands.call_command(key, torrent::Object::create_list_range(args.begin(), args.end()));
-}
-
-static uint64_t
-down_rate() {
-  return torrent::down_throttle_global()->max_rate();
-}
-
-void
-TestCommandThrottle::setUp() {
-  torrent::initialize_main_thread();
-  torrent::initialize();
-
-  if (control == nullptr)
-    control = new Control;
-
-  if (!rpc::commands.has("throttle.global_down.max_rate.set_kb"))
-    initialize_command_throttle();
-}
-
-void
-TestCommandThrottle::tearDown() {
-  torrent::cleanup();
-}
-
-void
-TestCommandThrottle::test_global_rate_in_range() {
-  call_set("throttle.global_down.max_rate.set_kb", "1024");
-  CPPUNIT_ASSERT_EQUAL(uint64_t{1048576}, down_rate());
-
-  call_set("throttle.global_down.max_rate.set_kb", "4194303");
-  CPPUNIT_ASSERT_EQUAL(uint64_t{4294966272}, down_rate());
-
-  call_set("throttle.global_down.max_rate.set", "4294966272");
-  CPPUNIT_ASSERT_EQUAL(uint64_t{4294966272}, down_rate());
-}
-
-void
-TestCommandThrottle::test_global_rate_kb_out_of_range() {
-  call_set("throttle.global_down.max_rate.set_kb", "1024");
-
-  CPPUNIT_ASSERT_THROW(call_set("throttle.global_down.max_rate.set_kb", "4194304"), torrent::input_error);
-  CPPUNIT_ASSERT_EQUAL(uint64_t{1048576}, down_rate());
-}
-
-void
-TestCommandThrottle::test_global_rate_bytes_out_of_range() {
-  call_set("throttle.global_down.max_rate.set", "1048576");
-
-  CPPUNIT_ASSERT_THROW(call_set("throttle.global_down.max_rate.set", "4294967296"), torrent::input_error);
-  CPPUNIT_ASSERT_EQUAL(uint64_t{1048576}, down_rate());
-}
-
-void
-TestCommandThrottle::test_global_rate_negative() {
-  call_set("throttle.global_down.max_rate.set", "1048576");
-
-  CPPUNIT_ASSERT_THROW(call_set("throttle.global_down.max_rate.set", "-1"), torrent::input_error);
-  CPPUNIT_ASSERT_EQUAL(uint64_t{1048576}, down_rate());
-}
-
-void
-TestCommandThrottle::test_named_rate_in_range() {
-  call_named("throttle.down", "test_named_in_range", "1024");
-
-  auto itr = control->core()->throttles().find("test_named_in_range");
-
-  CPPUNIT_ASSERT(itr != control->core()->throttles().end());
-  CPPUNIT_ASSERT_EQUAL(uint64_t{1048576}, itr->second.second->max_rate());
-}
-
-void
-TestCommandThrottle::test_named_rate_out_of_range() {
-  CPPUNIT_ASSERT_THROW(call_named("throttle.down", "test_named_out_of_range", "18014398509481984"), torrent::input_error);
-}

test/src/test_command_throttle.h

@@ -1,25 +0,0 @@
-#include "test/helpers/test_fixture.h"
-
-class TestCommandThrottle : public test_fixture {
-  CPPUNIT_TEST_SUITE(TestCommandThrottle);
-
-  CPPUNIT_TEST(test_global_rate_in_range);
-  CPPUNIT_TEST(test_global_rate_kb_out_of_range);
-  CPPUNIT_TEST(test_global_rate_bytes_out_of_range);
-  CPPUNIT_TEST(test_global_rate_negative);
-  CPPUNIT_TEST(test_named_rate_in_range);
-  CPPUNIT_TEST(test_named_rate_out_of_range);
-
-  CPPUNIT_TEST_SUITE_END();
-
-public:
-  void setUp();
-  void tearDown();
-
-  void test_global_rate_in_range();
-  void test_global_rate_kb_out_of_range();
-  void test_global_rate_bytes_out_of_range();
-  void test_global_rate_negative();
-  void test_named_rate_in_range();
-  void test_named_rate_out_of_range();
-};

test/src/test_command_tracker.cc

@@ -1,73 +0,0 @@
-#include "config.h"
-
-#include "test/src/test_command_tracker.h"
-
-#include <torrent/runtime/network_config.h>
-#include <torrent/torrent.h>
-
-#include "control.h"
-#include "globals.h"
-#include "command_helpers.h"
-#include "rpc/parse_commands.h"
-
-CPPUNIT_TEST_SUITE_REGISTRATION(TestCommandTracker);
-
-void initialize_command_tracker();
-
-static void
-call_set(const char* value) {
-  rpc::commands.call_command("dht.override_port.set", torrent::Object(std::string(value)));
-}
-
-static uint16_t
-override_port() {
-  return torrent::runtime::network_config()->override_dht_port();
-}
-
-void
-TestCommandTracker::setUp() {
-  torrent::initialize_main_thread();
-  torrent::initialize();
-
-  if (control == nullptr)
-    control = new Control;
-
-  if (!rpc::commands.has("dht.override_port.set"))
-    initialize_command_tracker();
-}
-
-void
-TestCommandTracker::tearDown() {
-  torrent::cleanup();
-}
-
-void
-TestCommandTracker::test_dht_override_port_in_range() {
-  call_set("6881");
-  CPPUNIT_ASSERT_EQUAL(uint16_t{6881}, override_port());
-
-  call_set("65535");
-  CPPUNIT_ASSERT_EQUAL(uint16_t{65535}, override_port());
-}
-
-void
-TestCommandTracker::test_dht_override_port_out_of_range() {
-  call_set("6881");
-
-  CPPUNIT_ASSERT_THROW(call_set("70000"), torrent::input_error);
-  CPPUNIT_ASSERT_EQUAL(uint16_t{6881}, override_port());
-
-  CPPUNIT_ASSERT_THROW(call_set("-1"), torrent::input_error);
-  CPPUNIT_ASSERT_EQUAL(uint16_t{6881}, override_port());
-}
-
-void
-TestCommandTracker::test_checked_port_value() {
-  CPPUNIT_ASSERT_EQUAL(uint16_t{0}, checked_port_value(0, "test"));
-  CPPUNIT_ASSERT_EQUAL(uint16_t{6881}, checked_port_value(6881, "test"));
-  CPPUNIT_ASSERT_EQUAL(uint16_t{65535}, checked_port_value(65535, "test"));
-
-  CPPUNIT_ASSERT_THROW(checked_port_value(-1, "test"), torrent::input_error);
-  CPPUNIT_ASSERT_THROW(checked_port_value(65536, "test"), torrent::input_error);
-  CPPUNIT_ASSERT_THROW(checked_port_value(4294967296, "test"), torrent::input_error);
-}

test/src/test_command_tracker.h

@@ -1,19 +0,0 @@
-#include "test/helpers/test_fixture.h"
-
-class TestCommandTracker : public test_fixture {
-  CPPUNIT_TEST_SUITE(TestCommandTracker);
-
-  CPPUNIT_TEST(test_dht_override_port_in_range);
-  CPPUNIT_TEST(test_dht_override_port_out_of_range);
-  CPPUNIT_TEST(test_checked_port_value);
-
-  CPPUNIT_TEST_SUITE_END();
-
-public:
-  void setUp();
-  void tearDown();
-
-  void test_dht_override_port_in_range();
-  void test_dht_override_port_out_of_range();
-  void test_checked_port_value();
-};

test/src/test_download_list.cc

@@ -1,68 +0,0 @@
-#include "config.h"
-
-#include "test/src/test_download_list.h"
-
-#include <cstdio>
-#include <torrent/download.h>
-#include <torrent/download_info.h>
-#include <torrent/hash_string.h>
-#include <torrent/object.h>
-#include <torrent/torrent.h>
-
-#include "control.h"
-#include "core/download.h"
-#include "globals.h"
-
-CPPUNIT_TEST_SUITE_REGISTRATION(TestDownloadList);
-
-static std::string
-insert_download(core::DownloadList* list) {
-  torrent::Object info = torrent::Object::create_map();
-  info.insert_key("name", std::string("test_download_list"));
-  info.insert_key("length", int64_t{16});
-  info.insert_key("piece length", int64_t{262144});
-  info.insert_key("pieces", std::string(20, char(0)));
-
-  auto* object = new torrent::Object(torrent::Object::create_map());
-  object->insert_key("info", info);
-
-  auto download = torrent::download_add(object, 0);
-  list->insert(new core::Download(download));
-
-  char buffer[41];
-
-  for (unsigned int i = 0; i < torrent::HashString::size_data; i++)
-    snprintf(buffer + i * 2, 3, "%02x", static_cast<unsigned char>(download.info()->hash()[i]));
-
-  return std::string(buffer, 40);
-}
-
-void
-TestDownloadList::setUp() {
-  torrent::initialize_main_thread();
-  torrent::initialize();
-
-  if (control == nullptr)
-    control = new Control;
-
-  m_hex = insert_download(&m_list);
-}
-
-void
-TestDownloadList::tearDown() {
-  m_list.clear();
-
-  torrent::cleanup();
-}
-
-void
-TestDownloadList::test_find_hex() {
-  CPPUNIT_ASSERT(m_list.find_hex(m_hex.c_str()) != m_list.end());
-}
-
-void
-TestDownloadList::test_find_hex_wrong_length() {
-  CPPUNIT_ASSERT(m_list.find_hex((m_hex + "f").c_str()) == m_list.end());
-  CPPUNIT_ASSERT(m_list.find_hex((m_hex + m_hex).c_str()) == m_list.end());
-  CPPUNIT_ASSERT(m_list.find_hex(m_hex.substr(0, 39).c_str()) == m_list.end());
-}

test/src/test_download_list.h

@@ -1,24 +0,0 @@
-#include <string>
-
-#include "core/download_list.h"
-#include "test/helpers/test_fixture.h"
-
-class TestDownloadList : public test_fixture {
-  CPPUNIT_TEST_SUITE(TestDownloadList);
-
-  CPPUNIT_TEST(test_find_hex);
-  CPPUNIT_TEST(test_find_hex_wrong_length);
-
-  CPPUNIT_TEST_SUITE_END();
-
-public:
-  void setUp();
-  void tearDown();
-
-  void test_find_hex();
-  void test_find_hex_wrong_length();
-
-private:
-  core::DownloadList m_list;
-  std::string        m_hex;
-};

test/src/test_input_path_input.cc

@@ -1,77 +0,0 @@
-#include "config.h"
-
-#include "test/src/test_input_path_input.h"
-
-#include <cstdlib>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include "input/path_input.h"
-
-CPPUNIT_TEST_SUITE_REGISTRATION(TestInputPathInput);
-
-void
-TestInputPathInput::setUp() {
-  test_fixture::setUp();
-
-  char temp_dir[] = "/tmp/rtorrent_test_path_input_XXXXXX";
-
-  CPPUNIT_ASSERT(mkdtemp(temp_dir) != nullptr);
-
-  m_temp_dir = temp_dir;
-
-  CPPUNIT_ASSERT_EQUAL(0, mkdir((m_temp_dir + "/alpha").c_str(), 0755));
-  CPPUNIT_ASSERT_EQUAL(0, mkdir((m_temp_dir + "/alpha/beta").c_str(), 0755));
-}
-
-void
-TestInputPathInput::tearDown() {
-  rmdir((m_temp_dir + "/alpha/beta").c_str());
-  rmdir((m_temp_dir + "/alpha").c_str());
-  rmdir(m_temp_dir.c_str());
-
-  test_fixture::tearDown();
-}
-
-// Tab at the end of the line completes the trailing component.
-void
-TestInputPathInput::test_complete_at_end() {
-  input::PathInput input;
-
-  input.str() = m_temp_dir + "/al";
-  input.set_pos(input.str().size());
-
-  CPPUNIT_ASSERT(input.pressed('\t'));
-
-  CPPUNIT_ASSERT_EQUAL(m_temp_dir + "/alpha/", input.str());
-  CPPUNIT_ASSERT_EQUAL(input.str().size(), input.get_pos());
-}
-
-// The same completion with the cursor left inside the line. Only the text up to
-// the cursor selects the entry, and the rest of the line is discarded.
-void
-TestInputPathInput::test_complete_mid_line() {
-  input::PathInput input;
-
-  input.str() = m_temp_dir + "/alZZZ";
-  input.set_pos(m_temp_dir.size() + 3);
-
-  CPPUNIT_ASSERT(input.pressed('\t'));
-
-  CPPUNIT_ASSERT_EQUAL(m_temp_dir + "/alpha/", input.str());
-  CPPUNIT_ASSERT_EQUAL(input.str().size(), input.get_pos());
-}
-
-// A cursor resting on a separator keeps completing the component after it.
-void
-TestInputPathInput::test_cursor_on_separator() {
-  input::PathInput input;
-
-  input.str() = m_temp_dir + "/alpha/be";
-  input.set_pos(m_temp_dir.size() + 6);
-
-  CPPUNIT_ASSERT(input.pressed('\t'));
-
-  CPPUNIT_ASSERT_EQUAL(m_temp_dir + "/alpha/beta/", input.str());
-  CPPUNIT_ASSERT_EQUAL(input.str().size(), input.get_pos());
-}

test/src/test_input_path_input.h

@@ -1,24 +0,0 @@
-#include "test/helpers/test_fixture.h"
-
-#include <string>
-
-class TestInputPathInput : public test_fixture {
-  CPPUNIT_TEST_SUITE(TestInputPathInput);
-
-  CPPUNIT_TEST(test_complete_at_end);
-  CPPUNIT_TEST(test_complete_mid_line);
-  CPPUNIT_TEST(test_cursor_on_separator);
-
-  CPPUNIT_TEST_SUITE_END();
-
-public:
-  void setUp();
-  void tearDown();
-
-  void test_complete_at_end();
-  void test_complete_mid_line();
-  void test_cursor_on_separator();
-
-private:
-  std::string m_temp_dir;
-};

test/src/test_session_commit.cc

@@ -1,94 +0,0 @@
-#include "config.h"
-
-#include "test/src/test_session_commit.h"
-
-#include <cstdlib>
-#include <dirent.h>
-#include <fstream>
-#include <sstream>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include "session/download_storer.h"
-
-CPPUNIT_TEST_SUITE_REGISTRATION(TestSessionCommit);
-
-namespace {
-
-const char* entry_name = "0123456789ABCDEF0123456789ABCDEF01234567.torrent";
-
-std::string
-read_file(const std::string& path) {
-  std::ifstream     file(path.c_str());
-  std::stringstream buffer;
-
-  buffer << file.rdbuf();
-  return buffer.str();
-}
-
-void
-remove_directory(const std::string& path) {
-  DIR* d = ::opendir(path.c_str());
-
-  if (d == NULL)
-    return;
-
-  struct dirent* entry;
-
-  while ((entry = ::readdir(d)) != NULL) {
-    if (entry->d_name[0] == '.' && (entry->d_name[1] == '\0' || (entry->d_name[1] == '.' && entry->d_name[2] == '\0')))
-      continue;
-
-    ::unlink((path + "/" + entry->d_name).c_str());
-  }
-
-  ::closedir(d);
-  ::rmdir(path.c_str());
-}
-
-} // namespace
-
-void
-TestSessionCommit::setUp() {
-  test_fixture::setUp();
-
-  char temp_dir[] = "/tmp/rtorrent_test_commit_XXXXXX";
-
-  CPPUNIT_ASSERT(mkdtemp(temp_dir) != nullptr);
-  m_session_dir = temp_dir;
-}
-
-void
-TestSessionCommit::tearDown() {
-  remove_directory(m_session_dir);
-
-  test_fixture::tearDown();
-}
-
-void
-TestSessionCommit::commit_and_verify(bool use_fsyncdisk) {
-  auto path = m_session_dir + "/" + entry_name;
-
-  std::stringstream torrent_stream("torrent-data");
-  std::stringstream rtorrent_stream("rtorrent-data");
-  std::stringstream libtorrent_stream("libtorrent-data");
-
-  session::DownloadStorer::save_and_move_streams(path, use_fsyncdisk, &torrent_stream, &rtorrent_stream, &libtorrent_stream);
-
-  CPPUNIT_ASSERT_EQUAL(std::string("torrent-data"), read_file(path));
-  CPPUNIT_ASSERT_EQUAL(std::string("rtorrent-data"), read_file(path + ".rtorrent"));
-  CPPUNIT_ASSERT_EQUAL(std::string("libtorrent-data"), read_file(path + ".libtorrent_resume"));
-
-  struct stat st;
-  CPPUNIT_ASSERT(::stat((path + ".new").c_str(), &st) == -1);
-}
-
-void
-TestSessionCommit::test_commit_publishes_all_three_files() {
-  commit_and_verify(false);
-}
-
-void
-TestSessionCommit::test_commit_with_fsync_publishes_all_three_files() {
-  commit_and_verify(true);
-}

test/src/test_session_commit.h

@@ -1,24 +0,0 @@
-#include "test/helpers/test_fixture.h"
-
-#include <string>
-
-class TestSessionCommit : public test_fixture {
-  CPPUNIT_TEST_SUITE(TestSessionCommit);
-
-  CPPUNIT_TEST(test_commit_publishes_all_three_files);
-  CPPUNIT_TEST(test_commit_with_fsync_publishes_all_three_files);
-
-  CPPUNIT_TEST_SUITE_END();
-
-public:
-  void setUp();
-  void tearDown();
-
-  void test_commit_publishes_all_three_files();
-  void test_commit_with_fsync_publishes_all_three_files();
-
-private:
-  void commit_and_verify(bool use_fsyncdisk);
-
-  std::string m_session_dir;
-};

test/src/test_session_storer.cc

@@ -1,152 +0,0 @@
-#include "config.h"
-
-#include "test/src/test_session_storer.h"
-
-#include <cstdlib>
-#include <dirent.h>
-#include <fstream>
-#include <sstream>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include "session/download_storer.h"
-#include "utils/directory.h"
-
-CPPUNIT_TEST_SUITE_REGISTRATION(TestSessionStorer);
-
-namespace {
-
-const char* entry_name = "0123456789ABCDEF0123456789ABCDEF01234567.torrent";
-const char* link_name  = "FEDCBA9876543210FEDCBA9876543210FEDCBA98.torrent";
-
-void
-write_file(const std::string& path, const std::string& content) {
-  std::ofstream file(path.c_str());
-
-  file << content;
-  file.close();
-
-  CPPUNIT_ASSERT(file.good());
-}
-
-std::string
-read_file(const std::string& path) {
-  std::ifstream    file(path.c_str());
-  std::stringstream buffer;
-
-  buffer << file.rdbuf();
-  return buffer.str();
-}
-
-void
-save_session_files(const std::string& path) {
-  std::stringstream torrent_stream("torrent-data");
-  std::stringstream rtorrent_stream("rtorrent-data");
-  std::stringstream libtorrent_stream("libtorrent-data");
-
-  session::DownloadStorer::save_and_move_streams(path, false, &torrent_stream, &rtorrent_stream, &libtorrent_stream);
-}
-
-unsigned int
-permissions_of(const std::string& path) {
-  struct stat st;
-
-  CPPUNIT_ASSERT_EQUAL(0, ::stat(path.c_str(), &st));
-  return st.st_mode & 07777;
-}
-
-void
-remove_directory(const std::string& path) {
-  DIR* d = ::opendir(path.c_str());
-
-  if (d == NULL)
-    return;
-
-  struct dirent* entry;
-
-  while ((entry = ::readdir(d)) != NULL) {
-    if (entry->d_name[0] == '.' && (entry->d_name[1] == '\0' || (entry->d_name[1] == '.' && entry->d_name[2] == '\0')))
-      continue;
-
-    ::unlink((path + "/" + entry->d_name).c_str());
-  }
-
-  ::closedir(d);
-  ::rmdir(path.c_str());
-}
-
-} // namespace
-
-void
-TestSessionStorer::setUp() {
-  test_fixture::setUp();
-
-  char temp_dir[] = "/tmp/rtorrent_test_session_XXXXXX";
-
-  CPPUNIT_ASSERT(mkdtemp(temp_dir) != nullptr);
-
-  m_temp_dir    = temp_dir;
-  m_session_dir = m_temp_dir + "/session";
-
-  CPPUNIT_ASSERT_EQUAL(0, ::mkdir(m_session_dir.c_str(), 0755));
-}
-
-void
-TestSessionStorer::tearDown() {
-  remove_directory(m_session_dir);
-  remove_directory(m_temp_dir);
-
-  test_fixture::tearDown();
-}
-
-// A symlink planted where the next temporary session file will be written must
-// not redirect the write to the file it points at.
-void
-TestSessionStorer::test_temp_file_symlink_is_not_followed() {
-  auto outside = m_temp_dir + "/outside.txt";
-  auto path    = m_session_dir + "/" + entry_name;
-
-  write_file(outside, "original");
-  CPPUNIT_ASSERT_EQUAL(0, ::symlink(outside.c_str(), (path + ".new").c_str()));
-
-  save_session_files(path);
-
-  CPPUNIT_ASSERT_EQUAL(std::string("original"), read_file(outside));
-  CPPUNIT_ASSERT_EQUAL(std::string("torrent-data"), read_file(path));
-}
-
-// Session files carry tracker announce urls, so they must not be readable by
-// other users regardless of the umask rtorrent was started with.
-void
-TestSessionStorer::test_saved_files_are_owner_only() {
-  auto path       = m_session_dir + "/" + entry_name;
-  auto prev_umask = ::umask(0);
-
-  save_session_files(path);
-  ::umask(prev_umask);
-
-  CPPUNIT_ASSERT_EQUAL(0600u, permissions_of(path));
-  CPPUNIT_ASSERT_EQUAL(0600u, permissions_of(path + ".rtorrent"));
-  CPPUNIT_ASSERT_EQUAL(0600u, permissions_of(path + ".libtorrent_resume"));
-}
-
-// Entries listed for loading must report their real type so that a symlink in
-// the session directory is skipped instead of loaded.
-void
-TestSessionStorer::test_symlinked_entry_is_not_a_file() {
-  write_file(m_temp_dir + "/outside.txt", "d0:e");
-  write_file(m_session_dir + "/" + entry_name, "d0:e");
-
-  CPPUNIT_ASSERT_EQUAL(0, ::symlink((m_temp_dir + "/outside.txt").c_str(), (m_session_dir + "/" + link_name).c_str()));
-
-  auto entries = session::DownloadStorer::get_formated_entries(m_session_dir + "/");
-
-  CPPUNIT_ASSERT_EQUAL(size_t{2}, size_t{entries.size()});
-
-  for (const auto& entry : entries) {
-    if (entry.s_name == entry_name)
-      CPPUNIT_ASSERT(entry.is_file());
-    else
-      CPPUNIT_ASSERT(!entry.is_file());
-  }
-}

test/src/test_session_storer.h

@@ -1,25 +0,0 @@
-#include "test/helpers/test_fixture.h"
-
-#include <string>
-
-class TestSessionStorer : public test_fixture {
-  CPPUNIT_TEST_SUITE(TestSessionStorer);
-
-  CPPUNIT_TEST(test_temp_file_symlink_is_not_followed);
-  CPPUNIT_TEST(test_saved_files_are_owner_only);
-  CPPUNIT_TEST(test_symlinked_entry_is_not_a_file);
-
-  CPPUNIT_TEST_SUITE_END();
-
-public:
-  void setUp();
-  void tearDown();
-
-  void test_temp_file_symlink_is_not_followed();
-  void test_saved_files_are_owner_only();
-  void test_symlinked_entry_is_not_a_file();
-
-private:
-  std::string m_temp_dir;
-  std::string m_session_dir;
-};

test/src/test_setup.cc

@@ -1,78 +0,0 @@
-#include "config.h"
-
-#include "test/src/test_setup.h"
-
-#include <fstream>
-#include <string>
-#include <unistd.h>
-#include <torrent/exceptions.h>
-
-#include "setup.h"
-
-CPPUNIT_TEST_SUITE_REGISTRATION(TestSetup);
-
-// Linking setup.o pulls in the help printer, which lives in src/main.cc.
-void
-print_help() {}
-
-namespace {
-
-class temp_config_file {
-public:
-  temp_config_file(const std::string& contents) {
-    char path[] = "/tmp/rtorrent_test_setup_XXXXXX";
-
-    CPPUNIT_ASSERT(::mkstemp(path) != -1);
-    m_path = path;
-
-    std::ofstream file(m_path);
-    file << contents << '\n';
-  }
-
-  ~temp_config_file() { ::unlink(m_path.c_str()); }
-
-  const std::string& path() const { return m_path; }
-
-private:
-  std::string m_path;
-};
-
-// The group name must be a valid one, else option_find_string throws before
-// the output argument is ever touched.
-void
-assert_arg_count_error(const std::string& line) {
-  temp_config_file file(line);
-
-  try {
-    parse_config_file_comments(file.path());
-  } catch (torrent::input_error& e) {
-    CPPUNIT_ASSERT_EQUAL(std::string("Invalid number of arguments."), std::string(e.what()));
-    return;
-  }
-
-  CPPUNIT_FAIL("no torrent::input_error thrown for: " + line);
-}
-
-} // namespace
-
-void
-TestSetup::test_config_comment_log_add_output() {
-  temp_config_file file("# do:log.add_output=debug,test_output");
-
-  CPPUNIT_ASSERT_NO_THROW(parse_config_file_comments(file.path()));
-}
-
-void
-TestSetup::test_config_comment_log_add_output_no_args() {
-  assert_arg_count_error("# do:log.add_output=");
-}
-
-void
-TestSetup::test_config_comment_log_add_output_one_arg() {
-  assert_arg_count_error("# do:log.add_output=debug");
-}
-
-void
-TestSetup::test_config_comment_log_add_output_too_many_args() {
-  assert_arg_count_error("# do:log.add_output=debug,test_output,extra");
-}

test/src/test_setup.h

@@ -1,18 +0,0 @@
-#include "test/helpers/test_fixture.h"
-
-class TestSetup : public test_fixture {
-  CPPUNIT_TEST_SUITE(TestSetup);
-
-  CPPUNIT_TEST(test_config_comment_log_add_output);
-  CPPUNIT_TEST(test_config_comment_log_add_output_no_args);
-  CPPUNIT_TEST(test_config_comment_log_add_output_one_arg);
-  CPPUNIT_TEST(test_config_comment_log_add_output_too_many_args);
-
-  CPPUNIT_TEST_SUITE_END();
-
-public:
-  void test_config_comment_log_add_output();
-  void test_config_comment_log_add_output_no_args();
-  void test_config_comment_log_add_output_one_arg();
-  void test_config_comment_log_add_output_too_many_args();
-};

test/src/test_ui_download_list.cc

@@ -1,52 +0,0 @@
-#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());
-}