September 2013 - tor-commits - lists.torproject.org

[tor/master] Integration test for parsing arguments on the commandline
by nickm＠torproject.org 13 Sep '13

13 Sep '13

commit 675eb1fea76c11be9f2bb02275b80833a0cde7fa Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Aug 25 14:31:24 2013 -0400 Integration test for parsing arguments on the commandline (incomplete) --- src/test/test_cmdline_args.py | 114 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/src/test/test_cmdline_args.py b/src/test/test_cmdline_args.py new file mode 100644 index 0000000..d41117d --- /dev/null +++ b/src/test/test_cmdline_args.py @@ -0,0 +1,114 @@ +#!/usr/bin/python + +import binascii +import hashlib +import os +import re +import subprocess +import tempfile +import unittest + +TOR = "./src/or/tor-cov" +TOPDIR = "." + +class UnexpectedSuccess(Exception): + pass + +class UnexpectedFailure(Exception): + pass + +def run_tor(args, failure=False): + p = subprocess.Popen([TOR] + args, stdout=subprocess.PIPE) + output, _ = p.communicate() + result = p.poll() + if result and not failure: + raise UnexpectedFailure() + elif not result and failure: + raise UnexpectedSuccess() + return output + +def lines(s): + out = s.split("\n") + if out and out[-1] == '': + del out[-1] + return out + +def strip_log_junk(line): + m = re.match(r'([^\[]+\[[a-z]*\] *)(.*)', line) + if not m: + return ""+line + return m.group(2).strip() + +class CmdlineTests(unittest.TestCase): + + def test_version(self): + out = run_tor(["--version"]) + self.failUnless(out.startswith("Tor version ")) + self.assertEquals(len(lines(out)), 1) + + def test_quiet(self): + out = run_tor(["--quiet", "--quumblebluffin", "1"], failure=True) + self.assertEquals(out, "") + + def test_help(self): + out = run_tor(["--help"], failure=False) + out2 = run_tor(["-h"], failure=False) + self.assert_(out.startswith("Copyright (c) 2001")) + self.assert_(out.endswith( + "tor -f <torrc> [args]\n" + "See man page for options, or https://www.torproject.org/ for documentation.\n")) + self.assert_(out == out2) + + def test_hush(self): + torrc = tempfile.NamedTemporaryFile(delete=False) + torrc.close() + try: + out = run_tor(["--hush", "-f", torrc.name, + "--quumblebluffin", "1"], failure=True) + finally: + os.unlink(torrc.name) + self.assertEquals(len(lines(out)), 2) + ln = [ strip_log_junk(l) for l in lines(out) ] + self.assertEquals(ln[0], "Failed to parse/validate config: Unknown option 'quumblebluffin'. Failing.") + self.assertEquals(ln[1], "Reading config failed--see warnings above.") + + def test_missing_argument(self): + out = run_tor(["--hush", "--hash-password"], failure=True) + self.assertEquals(len(lines(out)), 2) + ln = [ strip_log_junk(l) for l in lines(out) ] + self.assertEquals(ln[0], "Command-line option '--hash-password' with no value. Failing.") + + def test_hash_password(self): + out = run_tor(["--hash-password", "woodwose"]) + result = lines(out)[-1] + self.assertEquals(result[:3], "16:") + self.assertEquals(len(result), 61) + r = binascii.a2b_hex(result[3:]) + self.assertEquals(len(r), 29) + + salt, how, hashed = r[:8], r[8], r[9:] + self.assertEquals(len(hashed), 20) + + count = (16 + (ord(how) & 15)) << ((ord(how) >> 4) + 6) + stuff = salt + "woodwose" + repetitions = count // len(stuff) + 1 + inp = stuff * repetitions + inp = inp[:count] + + self.assertEquals(hashlib.sha1(inp).digest(), hashed) + + def test_digests(self): + main_c = os.path.join(TOPDIR, "src", "or", "main.c") + + if os.stat(TOR).st_mtime < os.stat(main_c).st_mtime: + self.skipTest(TOR+" not up to date") + out = run_tor(["--digests"]) + main_line = [ l for l in lines(out) if l.endswith("/main.c") ] + digest, name = main_line[0].split() + actual = hashlib.sha1(open(main_c).read()).hexdigest() + self.assertEquals(digest, actual) + + +if __name__ == '__main__': + + unittest.main()

1 0

[tor/master] make check-spaces fix
by nickm＠torproject.org 13 Sep '13

13 Sep '13

commit b121ca581d8a2390f6aa61f6537a1884cd268c44 Author: Cristian Toader <cristian.matei.toader(a)gmail.com> Date: Mon Aug 26 21:28:30 2013 +0300 make check-spaces fix --- src/common/sandbox.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 79a8930..50d6f99 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -185,14 +185,14 @@ sb_accept4(scmp_filter_ctx ctx, sandbox_cfg_t *filter) #ifdef __i386__ rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(socketcall), 1, - SCMP_CMP(0, SCMP_CMP_EQ, 18)); + SCMP_CMP(0, SCMP_CMP_EQ, 18)); if (rc) { return rc; } #endif rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(accept4), 1, - SCMP_CMP(3, SCMP_CMP_EQ, SOCK_CLOEXEC)); + SCMP_CMP(3, SCMP_CMP_EQ, SOCK_CLOEXEC)); if (rc) { return rc; }

1 0

[tor/master] updated open syscall strings
by nickm＠torproject.org 13 Sep '13

13 Sep '13

commit 148c6dc47348bccfd304a6ee3cd898663eef8841 Author: Cristian Toader <cristian.matei.toader(a)gmail.com> Date: Mon Aug 26 21:19:22 2013 +0300 updated open syscall strings --- src/or/main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index 9d0719c..d075972 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2647,11 +2647,12 @@ sandbox_init_filter() sandbox_cfg_allow_openat_filename(&cfg, get_datadir_fname("cached-status"), 1); - sandbox_cfg_allow_open_filename_array(&cfg, 23, + sandbox_cfg_allow_open_filename_array(&cfg, 24, get_datadir_fname("cached-certs"), 1, get_datadir_fname("cached-certs.tmp"), 1, get_datadir_fname("cached-consensus"), 1, get_datadir_fname("unverified-consensus"), 1, + get_datadir_fname("unverified-consensus.tmp"), 1, get_datadir_fname("cached-microdesc-consensus"), 1, get_datadir_fname("cached-microdesc-consensus.tmp"), 1, get_datadir_fname("cached-microdescs"), 1, @@ -2683,7 +2684,7 @@ sandbox_init_filter() // orport if (server_mode(get_options())) { - sandbox_cfg_allow_open_filename_array(&cfg, 12, + sandbox_cfg_allow_open_filename_array(&cfg, 14, get_datadir_fname2("keys", "secret_id_key"), 1, get_datadir_fname2("keys", "secret_onion_key"), 1, get_datadir_fname2("keys", "secret_onion_key_ntor"), 1, @@ -2692,7 +2693,9 @@ sandbox_init_filter() get_datadir_fname2("keys", "secret_onion_key.old"), 1, get_datadir_fname2("keys", "secret_onion_key_ntor.old"), 1, get_datadir_fname2("keys", "secret_onion_key.tmp"), 1, + get_datadir_fname2("keys", "secret_id_key.tmp"), 1, get_datadir_fname("fingerprint"), 1, + get_datadir_fname("fingerprint.tmp"), 1, get_datadir_fname("cached-consensus"), 1, get_datadir_fname("cached-consensus.tmp"), 1, "/etc/resolv.conf", 0

1 0

[tor/master] removed PARAM_LEN
by nickm＠torproject.org 13 Sep '13

13 Sep '13

commit 8b8f87a06ad5f18460012d0a0b4ceaa119bbccd3 Author: Cristian Toader <cristian.matei.toader(a)gmail.com> Date: Wed Aug 28 19:56:42 2013 +0300 removed PARAM_LEN --- src/common/sandbox.c | 9 +++------ src/common/sandbox.h | 3 --- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 50d6f99..8ef8757 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -669,7 +669,7 @@ sandbox_intern_string(const char *param) return NULL; for (elem = filter_dynamic; elem != NULL; elem = elem->next) { - if (elem->prot && !strncmp(param, (char*)(elem->param), MAX_PARAM_LEN)) { + if (elem->prot && !strcmp(param, (char*)(elem->param))) { return (char*)(elem->param); } } @@ -688,10 +688,7 @@ prot_strdup(char* str) goto out; // allocating protected memory region for parameter - param_size = 1 + strnlen(str, MAX_PARAM_LEN); - if (param_size == MAX_PARAM_LEN) { - log_warn(LD_BUG, "(Sandbox) Parameter length too large!"); - } + param_size = 1 + strlen(str); res = (char*) mmap(NULL, param_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0); @@ -903,7 +900,7 @@ sandbox_getaddrinfo(const char *name, struct addrinfo **res) return -1; } - if (strncmp(name, hname, sizeof(hname)) || sb_addr_info == NULL) { + if (strcmp(name, hname) || sb_addr_info == NULL) { log_err(LD_BUG,"(Sandbox) failed for hname %s!", name); return -1; } diff --git a/src/common/sandbox.h b/src/common/sandbox.h index 6cb827e..a844fc5 100644 --- a/src/common/sandbox.h +++ b/src/common/sandbox.h @@ -36,9 +36,6 @@ #include <seccomp.h> #include <netdb.h> -/** Security measure for filter string parameter lengths*/ -#define MAX_PARAM_LEN 64 - #define PARAM_PTR 0 #define PARAM_NUM 1

1 0

[tor/master] Added doxygen struct doc and replaced func() with funct(void)
by nickm＠torproject.org 13 Sep '13

13 Sep '13

commit 6cae5d706c5802f28c46cece95b1cf8bd08f387a Author: Cristian Toader <cristian.matei.toader(a)gmail.com> Date: Wed Aug 28 20:01:52 2013 +0300 Added doxygen struct doc and replaced func() with funct(void) --- src/common/sandbox.c | 2 +- src/common/sandbox.h | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 8ef8757..13d4ce9 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -1138,7 +1138,7 @@ initialise_libseccomp_sandbox(sandbox_cfg_t* cfg) #endif // USE_LIBSECCOMP sandbox_cfg_t* -sandbox_cfg_new() +sandbox_cfg_new(void) { return NULL; } diff --git a/src/common/sandbox.h b/src/common/sandbox.h index a844fc5..d7e1172 100644 --- a/src/common/sandbox.h +++ b/src/common/sandbox.h @@ -46,12 +46,16 @@ * parameters for open, openat, execve, stat64. */ struct pfd_elem { - int syscall; // syscall associated with parameter + /** syscall associated with parameter. */ + int syscall; - char pindex; // parameter index - intptr_t param; // parameter value + /** parameter index. */ + char pindex; + /** parameter value. */ + intptr_t param; - char prot; // parameter flag (0 = not protected, 1 = protected) + /** parameter flag (0 = not protected, 1 = protected). */ + char prot; struct pfd_elem *next; }; @@ -101,7 +105,7 @@ void sandbox_set_debugging_fd(int fd); const char* sandbox_intern_string(const char *param); /** Creates an empty sandbox configuration file.*/ -sandbox_cfg_t * sandbox_cfg_new(); +sandbox_cfg_t * sandbox_cfg_new(void); /** * Function used to add a open allowed filename to a supplied configuration.

1 0

[tor/master] replaced boolean char with int
by nickm＠torproject.org 13 Sep '13

13 Sep '13

commit ce04d2a6220c00497a60d38b3a96385226d94866 Author: Cristian Toader <cristian.matei.toader(a)gmail.com> Date: Thu Aug 29 15:19:49 2013 +0300 replaced boolean char with int --- src/common/sandbox.c | 12 ++++++------ src/common/sandbox.h | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 39f6932..0bfbd01 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -712,7 +712,7 @@ prot_strdup(char* str) #ifdef __NR_stat64 int -sandbox_cfg_allow_stat64_filename(sandbox_cfg_t **cfg, char *file, char fr) +sandbox_cfg_allow_stat64_filename(sandbox_cfg_t **cfg, char *file, int fr) { sandbox_cfg_t *elem = NULL; @@ -740,7 +740,7 @@ sandbox_cfg_allow_stat64_filename_array(sandbox_cfg_t **cfg, int num, ...) for (i = 0; i < num; i++) { char *fn = va_arg(ap, char*); - char fr = (char) va_arg(ap, int); + int fr = va_arg(ap, int); rc = sandbox_cfg_allow_stat64_filename(cfg, fn, fr); if (rc) { @@ -756,7 +756,7 @@ sandbox_cfg_allow_stat64_filename_array(sandbox_cfg_t **cfg, int num, ...) #endif int -sandbox_cfg_allow_open_filename(sandbox_cfg_t **cfg, char *file, char fr) +sandbox_cfg_allow_open_filename(sandbox_cfg_t **cfg, char *file, int fr) { sandbox_cfg_t *elem = NULL; @@ -784,7 +784,7 @@ sandbox_cfg_allow_open_filename_array(sandbox_cfg_t **cfg, int num, ...) for (i = 0; i < num; i++) { char *fn = va_arg(ap, char*); - char fr = (char) va_arg(ap, int); + int fr = va_arg(ap, int); rc = sandbox_cfg_allow_open_filename(cfg, fn, fr); if (rc) { @@ -799,7 +799,7 @@ sandbox_cfg_allow_open_filename_array(sandbox_cfg_t **cfg, int num, ...) } int -sandbox_cfg_allow_openat_filename(sandbox_cfg_t **cfg, char *file, char fr) +sandbox_cfg_allow_openat_filename(sandbox_cfg_t **cfg, char *file, int fr) { sandbox_cfg_t *elem = NULL; @@ -827,7 +827,7 @@ sandbox_cfg_allow_openat_filename_array(sandbox_cfg_t **cfg, int num, ...) for (i = 0; i < num; i++) { char *fn = va_arg(ap, char*); - char fr = (char) va_arg(ap, int); + int fr = va_arg(ap, int); rc = sandbox_cfg_allow_openat_filename(cfg, fn, fr); if (rc) { diff --git a/src/common/sandbox.h b/src/common/sandbox.h index 605df7f..4119d92 100644 --- a/src/common/sandbox.h +++ b/src/common/sandbox.h @@ -50,12 +50,12 @@ struct pfd_elem { int syscall; /** parameter index. */ - char pindex; + int pindex; /** parameter value. */ intptr_t param; /** parameter flag (0 = not protected, 1 = protected). */ - char prot; + int prot; struct pfd_elem *next; }; @@ -114,7 +114,7 @@ sandbox_cfg_t * sandbox_cfg_new(void); * need to be free-ed. */ int sandbox_cfg_allow_open_filename(sandbox_cfg_t **cfg, char *file, - char fr); + int fr); /** Function used to add a series of open allowed filenames to a supplied * configuration. @@ -134,7 +134,7 @@ int sandbox_cfg_allow_open_filename_array(sandbox_cfg_t **cfg, int num, ...); * need to be free-ed. */ int sandbox_cfg_allow_openat_filename(sandbox_cfg_t **cfg, char *file, - char fr); + int fr); /** Function used to add a series of openat allowed filenames to a supplied * configuration. @@ -173,7 +173,7 @@ int sandbox_cfg_allow_execve_array(sandbox_cfg_t **cfg, int num, ...); * need to be free-ed. */ int sandbox_cfg_allow_stat64_filename(sandbox_cfg_t **cfg, char *file, - char fr); + int fr); /** Function used to add a series of stat64 allowed filenames to a supplied * configuration.

1 0

[tor/master] small fixes in documentation and sandbox_getaddrinfo()
by nickm＠torproject.org 13 Sep '13

13 Sep '13

commit 8e2b9d28442a6291f4de5d039d4035882b12845f Author: Cristian Toader <cristian.matei.toader(a)gmail.com> Date: Thu Aug 29 12:41:17 2013 +0300 small fixes in documentation and sandbox_getaddrinfo() --- src/common/sandbox.c | 2 +- src/common/sandbox.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 13d4ce9..39f6932 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -892,7 +892,7 @@ sandbox_getaddrinfo(const char *name, struct addrinfo **res) } *res = NULL; *res = (struct addrinfo *)malloc(sizeof(struct addrinfo)); - if (!res) { + if (*res == NULL) { return -2; } diff --git a/src/common/sandbox.h b/src/common/sandbox.h index d7e1172..605df7f 100644 --- a/src/common/sandbox.h +++ b/src/common/sandbox.h @@ -68,10 +68,10 @@ typedef int (*sandbox_filter_func_t)(scmp_filter_ctx ctx, /** Type that will be used in step 3 in order to manage multiple sandboxes.*/ typedef struct { - // function pointers associated with the filter + /** function pointers associated with the filter */ sandbox_filter_func_t *filter_func; - // filter function pointer parameters + /** filter function pointer parameters */ sandbox_cfg_t *filter_dynamic; } sandbox_t;

1 0

[tor/master] make check-spaces fix
by nickm＠torproject.org 13 Sep '13

13 Sep '13

commit 3e803a1f18aa04c69e18652f84bf054841706eea Author: Cristian Toader <cristian.matei.toader(a)gmail.com> Date: Thu Aug 29 16:53:12 2013 +0300 make check-spaces fix --- src/common/sandbox.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 4fd95f0..748141c 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -679,14 +679,15 @@ sandbox_intern_string(const char *param) } static int -prot_strings(sandbox_cfg_t* cfg) { +prot_strings(sandbox_cfg_t* cfg) +{ int ret = 0; int pr_mem_size = 0, pr_mem_left = 0; char *pr_mem_next = NULL, *pr_mem_base; sandbox_cfg_t *el = NULL; // get total number of bytes required to mmap - for(el = cfg; el != NULL; el = el->next) { + for (el = cfg; el != NULL; el = el->next) { pr_mem_size += strlen((char*) el->param) + 1; } @@ -768,7 +769,7 @@ sandbox_cfg_allow_stat64_filename_array(sandbox_cfg_t **cfg, ...) va_list ap; va_start(ap, cfg); - while((fn = va_arg(ap, char*)) != NULL) { + while ((fn = va_arg(ap, char*)) != NULL) { int fr = va_arg(ap, int); rc = sandbox_cfg_allow_stat64_filename(cfg, fn, fr); @@ -812,7 +813,7 @@ sandbox_cfg_allow_open_filename_array(sandbox_cfg_t **cfg, ...) va_list ap; va_start(ap, cfg); - while((fn = va_arg(ap, char*)) != NULL) { + while ((fn = va_arg(ap, char*)) != NULL) { int fr = va_arg(ap, int); rc = sandbox_cfg_allow_open_filename(cfg, fn, fr); @@ -855,7 +856,7 @@ sandbox_cfg_allow_openat_filename_array(sandbox_cfg_t **cfg, ...) va_list ap; va_start(ap, cfg); - while((fn = va_arg(ap, char*)) != NULL) { + while ((fn = va_arg(ap, char*)) != NULL) { int fr = va_arg(ap, int); rc = sandbox_cfg_allow_openat_filename(cfg, fn, fr); @@ -896,7 +897,7 @@ sandbox_cfg_allow_execve_array(sandbox_cfg_t **cfg, ...) va_list ap; va_start(ap, cfg); - while((fn = va_arg(ap, char*)) != NULL) { + while ((fn = va_arg(ap, char*)) != NULL) { rc = sandbox_cfg_allow_execve(cfg, fn); if (rc) {

1 0

[tor/master] switched to a more generic way of handling the sandbox configuration
by nickm＠torproject.org 13 Sep '13

13 Sep '13

commit b4b0eddd29b0b2ad78e4cf61362283034677f42f Author: Cristian Toader <cristian.matei.toader(a)gmail.com> Date: Mon Sep 2 13:54:43 2013 +0300 switched to a more generic way of handling the sandbox configuration --- src/common/sandbox.c | 119 +++++++++++++++++++++++++++++++++----------------- src/common/sandbox.h | 37 ++++++++++++---- 2 files changed, 107 insertions(+), 49 deletions(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 84d2183..1f0584c 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -24,6 +24,7 @@ #include "orconfig.h" #include "torint.h" #include "util.h" +#include "tor_queue.h" #if defined(HAVE_SECCOMP_H) && defined(__linux__) #define USE_LIBSECCOMP @@ -156,9 +157,12 @@ sb_execve(scmp_filter_ctx ctx, sandbox_cfg_t *filter) // for each dynamic parameter filters for (elem = filter; elem != NULL; elem = elem->next) { - if (elem->prot == 1 && elem->syscall == SCMP_SYS(execve)) { + smp_param_t *param = (smp_param_t*) elem->param; + + if (param != NULL && param->prot == 1 && param->syscall + == SCMP_SYS(execve)) { rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(execve), 1, - SCMP_CMP(0, SCMP_CMP_EQ, elem->param)); + SCMP_CMP(0, SCMP_CMP_EQ, param->value)); if (rc != 0) { log_err(LD_BUG,"(Sandbox) failed to add execve syscall, received " "libseccomp error %d", rc); @@ -266,9 +270,12 @@ sb_open(scmp_filter_ctx ctx, sandbox_cfg_t *filter) // for each dynamic parameter filters for (elem = filter; elem != NULL; elem = elem->next) { - if (elem->prot == 1 && elem->syscall == SCMP_SYS(open)) { + smp_param_t *param = elem->param; + + if (param != NULL && param->prot == 1 && param->syscall + == SCMP_SYS(open)) { rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(open), 1, - SCMP_CMP(0, SCMP_CMP_EQ, elem->param)); + SCMP_CMP(0, SCMP_CMP_EQ, param->value)); if (rc != 0) { log_err(LD_BUG,"(Sandbox) failed to add open syscall, received " "libseccomp error %d", rc); @@ -297,10 +304,13 @@ sb_openat(scmp_filter_ctx ctx, sandbox_cfg_t *filter) // for each dynamic parameter filters for (elem = filter; elem != NULL; elem = elem->next) { - if (elem->prot == 1 && elem->syscall == SCMP_SYS(openat)) { + smp_param_t *param = elem->param; + + if (param != NULL && param->prot == 1 && param->syscall + == SCMP_SYS(openat)) { rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(openat), 1, SCMP_CMP(0, SCMP_CMP_EQ, AT_FDCWD), - SCMP_CMP(1, SCMP_CMP_EQ, elem->param), + SCMP_CMP(1, SCMP_CMP_EQ, param->value), SCMP_CMP(2, SCMP_CMP_EQ, O_RDONLY|O_NONBLOCK|O_LARGEFILE|O_DIRECTORY| O_CLOEXEC)); if (rc != 0) { @@ -618,10 +628,12 @@ sb_stat64(scmp_filter_ctx ctx, sandbox_cfg_t *filter) // for each dynamic parameter filters for (elem = filter; elem != NULL; elem = elem->next) { - if (elem->prot == 1 && (elem->syscall == SCMP_SYS(open) || - elem->syscall == SCMP_SYS(stat64))) { + smp_param_t *param = elem->param; + + if (param != NULL && param->prot == 1 && (param->syscall == SCMP_SYS(open) + || param->syscall == SCMP_SYS(stat64))) { rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(stat64), 1, - SCMP_CMP(0, SCMP_CMP_EQ, elem->param)); + SCMP_CMP(0, SCMP_CMP_EQ, param->value)); if (rc != 0) { log_err(LD_BUG,"(Sandbox) failed to add open syscall, received " "libseccomp error %d", rc); @@ -660,21 +672,23 @@ static sandbox_filter_func_t filter_func[] = { }; const char* -sandbox_intern_string(const char *param) +sandbox_intern_string(const char *str) { sandbox_cfg_t *elem; - if (param == NULL) + if (str == NULL) return NULL; for (elem = filter_dynamic; elem != NULL; elem = elem->next) { - if (elem->prot && !strcmp(param, (char*)(elem->param))) { - return (char*)(elem->param); + smp_param_t *param = elem->param; + + if (param->prot && !strcmp(str, (char*)(param->value))) { + return (char*)(param->value); } } - log_info(LD_GENERAL, "(Sandbox) Parameter %s not found", param); - return param; + log_info(LD_GENERAL, "(Sandbox) Parameter %s not found", str); + return str; } static int @@ -687,7 +701,7 @@ prot_strings(sandbox_cfg_t* cfg) // get total number of bytes required to mmap for (el = cfg; el != NULL; el = el->next) { - pr_mem_size += strlen((char*) el->param) + 1; + pr_mem_size += strlen((char*) ((smp_param_t*)el->param)->value) + 1; } // allocate protected memory @@ -705,7 +719,7 @@ prot_strings(sandbox_cfg_t* cfg) // change el value pointer to protected for (el = cfg; el != NULL; el = el->next) { - char *param_val = (char*) el->param; + char *param_val = (char*)((smp_param_t *)el->param)->value; int param_size = strlen(param_val) + 1; if (pr_mem_left - param_size >= 0) { @@ -713,9 +727,9 @@ prot_strings(sandbox_cfg_t* cfg) memcpy(pr_mem_next, param_val, param_size); // re-point el parameter to protected - free((char*) el->param); - el->param = (intptr_t) pr_mem_next; - el->prot = 1; + free((char*) ((smp_param_t*)el->param)->value); + ((smp_param_t*)el->param)->value = (intptr_t) pr_mem_next; + ((smp_param_t*)el->param)->prot = 1; // move next available protected memory pr_mem_next += param_size; @@ -739,23 +753,46 @@ prot_strings(sandbox_cfg_t* cfg) return ret; } +static sandbox_cfg_t* +new_element(int syscall, int index, intptr_t value) +{ + smp_param_t *param = NULL; + + sandbox_cfg_t *elem = (sandbox_cfg_t*) malloc(sizeof(sandbox_cfg_t)); + if (!elem) + return NULL; + + elem->param = (smp_param_t*) malloc(sizeof(smp_param_t)); + if (!elem->param) { + free(elem); + return NULL; + } + + param = elem->param; + param->syscall = syscall; + param->pindex = index; + param->value = value; + param->prot = 0; + + return elem; +} + #ifdef __NR_stat64 int sandbox_cfg_allow_stat64_filename(sandbox_cfg_t **cfg, char *file, int fr) { sandbox_cfg_t *elem = NULL; - elem = (sandbox_cfg_t*) malloc(sizeof(sandbox_cfg_t)); - elem->syscall = SCMP_SYS(stat64); - elem->pindex = 0; - elem->param = (intptr_t) strdup(file); - elem->prot = 0; + elem = new_element(SCMP_SYS(stat64), 0, (intptr_t) strdup(file)); + if (!elem) { + log_err(LD_BUG,"(Sandbox) failed to register parameter!"); + return -1; + } elem->next = *cfg; *cfg = elem; if (fr) tor_free_(file); - return 0; } @@ -789,11 +826,11 @@ sandbox_cfg_allow_open_filename(sandbox_cfg_t **cfg, char *file, int fr) { sandbox_cfg_t *elem = NULL; - elem = (sandbox_cfg_t*) malloc(sizeof(sandbox_cfg_t)); - elem->syscall = SCMP_SYS(open); - elem->pindex = 0; - elem->param = (intptr_t) strdup(file); - elem->prot = 0; + elem = new_element(SCMP_SYS(open), 0, (intptr_t) strdup(file)); + if (!elem) { + log_err(LD_BUG,"(Sandbox) failed to register parameter!"); + return -1; + } elem->next = *cfg; *cfg = elem; @@ -832,11 +869,11 @@ sandbox_cfg_allow_openat_filename(sandbox_cfg_t **cfg, char *file, int fr) { sandbox_cfg_t *elem = NULL; - elem = (sandbox_cfg_t*) malloc(sizeof(sandbox_cfg_t)); - elem->syscall = SCMP_SYS(openat); - elem->pindex = 1; - elem->param = (intptr_t) strdup(file); - elem->prot = 0; + elem = new_element(SCMP_SYS(openat), 1, (intptr_t) strdup(file)); + if (!elem) { + log_err(LD_BUG,"(Sandbox) failed to register parameter!"); + return -1; + } elem->next = *cfg; *cfg = elem; @@ -875,11 +912,11 @@ sandbox_cfg_allow_execve(sandbox_cfg_t **cfg, char *com) { sandbox_cfg_t *elem = NULL; - elem = (sandbox_cfg_t*) malloc(sizeof(sandbox_cfg_t)); - elem->syscall = SCMP_SYS(openat); - elem->pindex = 1; - elem->param = (intptr_t) strdup(com); - elem->prot = 0; + elem = new_element(SCMP_SYS(execve), 1, (intptr_t) strdup(com)); + if (!elem) { + log_err(LD_BUG,"(Sandbox) failed to register parameter!"); + return -1; + } elem->next = *cfg; *cfg = elem; diff --git a/src/common/sandbox.h b/src/common/sandbox.h index 9a61749..59474c4 100644 --- a/src/common/sandbox.h +++ b/src/common/sandbox.h @@ -40,27 +40,48 @@ #define PARAM_NUM 1 /** - * Structure used to manage a sandbox configuration. - * - * It is implemented as a linked list of parameters. Currently only controls - * parameters for open, openat, execve, stat64. + * Enum used to manage the type of the implementation for general purpose. */ -struct pfd_elem { +typedef enum { + /** Libseccomp implementation based on seccomp2*/ + LIBSECCOMP2 = 0 +} SB_IMPL; + +/** + * Configuration parameter structure associated with the LIBSECCOMP2 + * implementation. + */ +typedef struct smp_param { /** syscall associated with parameter. */ int syscall; /** parameter index. */ int pindex; /** parameter value. */ - intptr_t param; + intptr_t value; /** parameter flag (0 = not protected, 1 = protected). */ int prot; +} smp_param_t; + +/** + * Structure used to manage a sandbox configuration. + * + * It is implemented as a linked list of parameters. Currently only controls + * parameters for open, openat, execve, stat64. + */ +struct sandbox_cfg_elem { + /** Sandbox implementation which dictates the parameter type. */ + SB_IMPL implem; + + /** Configuration parameter. */ + void *param; - struct pfd_elem *next; + /** Next element of the configuration*/ + struct sandbox_cfg_elem *next; }; /** Typedef to structure used to manage a sandbox configuration. */ -typedef struct pfd_elem sandbox_cfg_t; +typedef struct sandbox_cfg_elem sandbox_cfg_t; /** * Structure used for keeping a linked list of getaddrinfo pre-recorded

1 0

[tor/master] supporting /dev/urandom instead of /dev/random
by nickm＠torproject.org 13 Sep '13

13 Sep '13

commit b1f7105506ca496a29fb4cdfd6f7f1a876a1e47b Author: Cristian Toader <cristian.matei.toader(a)gmail.com> Date: Thu Aug 29 15:22:14 2013 +0300 supporting /dev/urandom instead of /dev/random --- src/or/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/main.c b/src/or/main.c index d075972..ca7e3b3 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2789,7 +2789,7 @@ tor_main(int argc, char *argv[]) // registering libevent rng evutil_secure_rng_set_urandom_device_file( - (char*) sandbox_intern_string("/dev/random")); + (char*) sandbox_intern_string("/dev/urandom")); } switch (get_options()->command) {

1 0