mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-23 16:24:02 +00:00
Code Issues Releases Wiki Activity

#5802: Require absolute paths in "session-set" and "free-space" requests as well

Browse source
This commit is contained in:
Mike Gelfand 2015-11-05 21:48:00 +00:00
parent 2bab67cb06
commit 505561c055
1 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
libtransmission/rpcimpl.c
View file

@ -1831,13 +1831,28 @@ sessionSet (tr_session * session,
tr_variant * args_out UNUSED, tr_variant * args_out UNUSED,
struct tr_rpc_idle_data * idle_data UNUSED) struct tr_rpc_idle_data * idle_data UNUSED)
{ {
assert (idle_data == NULL);
const char * download_dir = NULL;
const char * incomplete_dir = NULL;
if (tr_variantDictFindStr (args_in, TR_KEY_download_dir, &download_dir, NULL))
{
if (tr_sys_path_is_relative (download_dir))
return "download directory path is not absolute";
}
if (tr_variantDictFindStr (args_in, TR_KEY_incomplete_dir, &incomplete_dir, NULL))
{
if (tr_sys_path_is_relative (incomplete_dir))
return "incomplete torrents directory path is not absolute";
}
int64_t i; int64_t i;
double d; double d;
bool boolVal; bool boolVal;
const char * str; const char * str;
assert (idle_data == NULL);
if (tr_variantDictFindInt (args_in, TR_KEY_cache_size_mb, &i)) if (tr_variantDictFindInt (args_in, TR_KEY_cache_size_mb, &i))
tr_sessionSetCacheLimit_MB (session, i); tr_sessionSetCacheLimit_MB (session, i);
@ -1868,8 +1883,8 @@ sessionSet (tr_session * session,
if (tr_variantDictFindStr (args_in, TR_KEY_blocklist_url, &str, NULL)) if (tr_variantDictFindStr (args_in, TR_KEY_blocklist_url, &str, NULL))
tr_blocklistSetURL (session, str); tr_blocklistSetURL (session, str);
if (tr_variantDictFindStr (args_in, TR_KEY_download_dir, &str, NULL)) if (download_dir != NULL)
tr_sessionSetDownloadDir (session, str); tr_sessionSetDownloadDir (session, download_dir);
if (tr_variantDictFindInt (args_in, TR_KEY_queue_stalled_minutes, &i)) if (tr_variantDictFindInt (args_in, TR_KEY_queue_stalled_minutes, &i))
tr_sessionSetQueueStalledMinutes (session, i); tr_sessionSetQueueStalledMinutes (session, i);
@ -1883,8 +1898,8 @@ sessionSet (tr_session * session,
if (tr_variantDictFindBool (args_in, TR_KEY_download_queue_enabled, &boolVal)) if (tr_variantDictFindBool (args_in, TR_KEY_download_queue_enabled, &boolVal))
tr_sessionSetQueueEnabled (session, TR_DOWN, boolVal); tr_sessionSetQueueEnabled (session, TR_DOWN, boolVal);
if (tr_variantDictFindStr (args_in, TR_KEY_incomplete_dir, &str, NULL)) if (incomplete_dir != NULL)
tr_sessionSetIncompleteDir (session, str); tr_sessionSetIncompleteDir (session, incomplete_dir);
if (tr_variantDictFindBool (args_in, TR_KEY_incomplete_dir_enabled, &boolVal)) if (tr_variantDictFindBool (args_in, TR_KEY_incomplete_dir_enabled, &boolVal))
tr_sessionSetIncompleteDirEnabled (session, boolVal); tr_sessionSetIncompleteDirEnabled (session, boolVal);
@ -2105,8 +2120,13 @@ freeSpace (tr_session * session,
const char * err = NULL; const char * err = NULL;
int64_t free_space = -1; int64_t free_space = -1;
if (!tr_variantDictFindStr (args_in, TR_KEY_path, &path, NULL))
return "directory path argument is missing";
if (tr_sys_path_is_relative (path))
return "directory path is not absolute";
/* get the free space */ /* get the free space */
tr_variantDictFindStr (args_in, TR_KEY_path, &path, NULL);
tmperr = errno; tmperr = errno;
errno = 0; errno = 0;
free_space = tr_sessionGetDirFreeSpace (session, path); free_space = tr_sessionGetDirFreeSpace (session, path);