- tor-commits - lists.torproject.org

[obfsproxy/master] Have autoconf tell us SIZEOF_SIZE_T
by nickm＠torproject.org 10 Jun '11

10 Jun '11

commit 7c2865fa821bd47bc8b831581b438b03e71d3740 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 10 15:08:45 2011 -0400 Have autoconf tell us SIZEOF_SIZE_T --- configure.ac | 2 ++ src/util.h | 9 ++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index faf57a7..da838db 100644 --- a/configure.ac +++ b/configure.ac @@ -17,6 +17,8 @@ PKG_CHECK_MODULES([openssl], [openssl >= 0.9.7]) # We don't need -lssl, only -lcrypto openssl_LIBS=`echo "$openssl_LIBS" | $SED -e 's/-lssl//'` +AC_CHECK_SIZEOF(size_t) + AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/src/util.h b/src/util.h index a48f7d8..e62e730 100644 --- a/src/util.h +++ b/src/util.h @@ -5,11 +5,13 @@ in all redistributed copies and derived works. There is no warranty. */ +#ifndef UTIL_H +#define UTIL_H + /* va_list definition */ #include <stdarg.h> -#ifndef UTIL_H -#define UTIL_H +#include "config.h" struct sockaddr_storage; struct event_base; @@ -29,9 +31,6 @@ int init_evdns_base(struct event_base *base); /***** String functions stuff. *****/ /* The sizeof a size_t, as computed by sizeof. */ -#ifndef SIZEOF_SIZE_T -#define SIZEOF_SIZE_T 4 -#endif #ifndef SSIZE_T_MAX #if (SIZEOF_SIZE_T == 4) #define SSIZE_T_MAX INT32_MAX

1 0

[obfsproxy/master] cleanups and tweaks on logging
by nickm＠torproject.org 10 Jun '11

10 Jun '11

commit 01c29282a94241121c0890279e007becfe6f99bd Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 10 15:26:19 2011 -0400 cleanups and tweaks on logging The macro syntax originally used here is a gcc extension; let's also support the c99 version and a fallback to declaring this stuff as function. Also, let's use the __attribute__((format)) feature in GCC so that we can learn about type mismatches earlier. Also, make more functions const. --- src/util.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++----------- src/util.h | 32 +++++++++++++++++++++++----- 2 files changed, 79 insertions(+), 19 deletions(-) diff --git a/src/util.c b/src/util.c index 6ff337f..976dd59 100644 --- a/src/util.c +++ b/src/util.c @@ -24,9 +24,9 @@ static const char *sev_to_string(int severity); static int sev_is_valid(int severity); static int write_logfile_prologue(int fd); static int compose_logfile_prologue(char *buf, size_t buflen); -static int string_to_sev(char *string); -static int open_and_set_obfsproxy_logfile(char *filename); - +static int string_to_sev(const char *string); +static int open_and_set_obfsproxy_logfile(const char *filename); +static void logv(int severity, const char *format, va_list ap); /************************ Obfsproxy Network Routines *************************/ @@ -182,7 +182,7 @@ sev_to_string(int severity) /** If 'string' is a valid log severity, return the corresponding * numeric value. Otherwise, return -1. */ static int -string_to_sev(char *string) +string_to_sev(const char *string) { if (!strcasecmp(string, "warn")) return LOG_SEV_WARN; @@ -212,7 +212,7 @@ sev_is_valid(int severity) It returns 1 on success and -1 on fail. */ int -log_set_method(int method, char *filename) +log_set_method(int method, const char *filename) { logging_method = method; @@ -230,7 +230,7 @@ log_set_method(int method, char *filename) On success it returns 1, on fail it returns -1. */ static int -open_and_set_obfsproxy_logfile(char *filename) +open_and_set_obfsproxy_logfile(const char *filename) { if (!filename) return -1; @@ -291,7 +291,7 @@ compose_logfile_prologue(char *buf, size_t buflen) not a valid severity, it returns -1. */ int -log_set_min_severity(char* sev_string) { +log_set_min_severity(const char* sev_string) { int severity = string_to_sev(sev_string); if (!sev_is_valid(severity)) { log_warn("Severity '%s' makes no sense.", sev_string); @@ -301,7 +301,7 @@ log_set_min_severity(char* sev_string) { return 1; } -/** +/** Logging function of obfsproxy. Don't call this directly; use the log_* macros defined in util.h instead. @@ -313,6 +313,18 @@ log_set_min_severity(char* sev_string) { void log_fn(int severity, const char *format, ...) { + + va_list ap; + va_start(ap,format); + + logv(severity, format, ap); + + va_end(ap); +} + +static void +logv(int severity, const char *format, va_list ap) +{ assert(sev_is_valid(severity)); if (logging_method == LOG_METHOD_NULL) @@ -328,9 +340,6 @@ log_fn(int severity, const char *format, ...) size_t buflen = MAX_LOG_ENTRY-2; - va_list ap; - va_start(ap,format); - r = obfs_snprintf(buf, buflen, "[%s] ", sev_to_string(severity)); if (r < 0) n = strlen(buf); @@ -351,8 +360,6 @@ log_fn(int severity, const char *format, ...) buf[n]='\n'; buf[n+1]='\0'; - - va_end(ap); if (logging_method == LOG_METHOD_STDOUT) fprintf(stdout, "%s", buf); @@ -363,3 +370,36 @@ log_fn(int severity, const char *format, ...) } else assert(0); } + +#ifdef NEED_LOG_WRAPPERS +void +log_info(const char *format, ...) +{ + va_list ap; + va_start(ap,format); + + logv(LOG_SEV_INFO, format, ap); + + va_end(ap); +} +void +log_warn(const char *format, ...) +{ + va_list ap; + va_start(ap,format); + + logv(LOG_SEV_WARN, format, ap); + + va_end(ap); +} +void +log_debug(const char *format, ...) +{ + va_list ap; + va_start(ap,format); + + logv(LOG_SEV_DEBUG, format, ap); + + va_end(ap); +} +#endif diff --git a/src/util.h b/src/util.h index e62e730..af3cd88 100644 --- a/src/util.h +++ b/src/util.h @@ -43,21 +43,41 @@ int init_evdns_base(struct event_base *base); /** Any size_t larger than this amount is likely to be an underflow. */ #define SIZE_T_CEILING ((size_t)(SSIZE_T_MAX-16)) -int obfs_vsnprintf(char *str, size_t size, +#ifndef __GNUC__ +#define __attribute__(x) +#endif + +int obfs_vsnprintf(char *str, size_t size, const char *format, va_list args); -int obfs_snprintf(char *str, size_t size, - const char *format, ...); +int obfs_snprintf(char *str, size_t size, + const char *format, ...) + __attribute__((format(printf, 3, 4))); /***** Logging subsystem stuff. *****/ -void log_fn(int severity, const char *format, ...); -int log_set_method(int method, char *filename); -int log_set_min_severity(char* sev_string); +void log_fn(int severity, const char *format, ...) + __attribute__((format(printf, 2, 3))); +int log_set_method(int method, const char *filename); +int log_set_min_severity(const char* sev_string); int close_obfsproxy_logfile(void); +#ifdef __GNUC__ #define log_info(args...) log_fn(LOG_SEV_INFO, args) #define log_warn(args...) log_fn(LOG_SEV_WARN, args) #define log_debug(args...) log_fn(LOG_SEV_DEBUG, args) +#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L +#define log_info(...) log_fn(LOG_SEV_INFO, __VA_ARGS__) +#define log_warn(...) log_fn(LOG_SEV_WARN, __VA_ARGS__) +#define log_debug(...) log_fn(LOG_SEV_DEBUG, __VA_ARGS__) +#else +#define NEED_LOG_WRAPPERS +void log_info(const char *format, ...) + __attribute__((format(printf, 1, 2))); +void log_warn(const char *format, ...) + __attribute__((format(printf, 1, 2))); +void log_debug(const char *format, ...) + __attribute__((format(printf, 1, 2))); +#endif /** Logging methods */

1 0

[obfsproxy/master] Remove an extraneous newline at the end of a log message
by nickm＠torproject.org 10 Jun '11

10 Jun '11

commit 6b2249034b7381c42fd39bf109b58c7e1b93c84d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 10 15:34:13 2011 -0400 Remove an extraneous newline at the end of a log message --- src/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/main.c b/src/main.c index 0c3227e..cebf14b 100644 --- a/src/main.c +++ b/src/main.c @@ -342,7 +342,7 @@ main(int argc, const char **argv) if (n_listeners) event_base_dispatch(base); - log_info("Exiting.\n"); + log_info("Exiting."); if (close_obfsproxy_logfile() < 0) printf("Failed closing logfile!\n");

1 0

[obfsproxy/master] Silence the noisy unit test.
by nickm＠torproject.org 10 Jun '11

10 Jun '11

commit 2d17ad70d83992a10038aaa30a85cd19df53055a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 10 15:39:19 2011 -0400 Silence the noisy unit test. --- src/protocols/obfs2.c | 4 ++-- src/test/unittest_obfs2.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/protocols/obfs2.c b/src/protocols/obfs2.c index b24bf05..d84d3ae 100644 --- a/src/protocols/obfs2.c +++ b/src/protocols/obfs2.c @@ -160,7 +160,7 @@ parse_and_set_options(int n_options, char **options, static void usage(void) { - printf("You failed at creating a correct obfs2 line.\n" + log_warn("You failed at creating a correct obfs2 line.\n" "obfs2 syntax:\n" "\tobfs2 [obfs2_args] obfs2_opts\n" "\t'obfs2_opts':\n" @@ -171,7 +171,7 @@ usage(void) "\t\tShared Secret ~ --shared-secret=<secret>\n" "\tExample:\n" "\tobfsproxy --dest=127.0.0.1:666 --shared-secret=himitsu " - "\tobfs2 server 127.0.0.1:1026\n"); + "\tobfs2 server 127.0.0.1:1026"); } /** diff --git a/src/test/unittest_obfs2.c b/src/test/unittest_obfs2.c index 1348c7d..dd51762 100644 --- a/src/test/unittest_obfs2.c +++ b/src/test/unittest_obfs2.c @@ -30,6 +30,9 @@ test_proto_option_parsing(void *data) char *options[] = {"obfs2", "--shared-secret=a", "socks", "127.0.0.1:0"}; int n_options = 4; + /* Suppress logs for the duration of this function. */ + log_set_method(LOG_METHOD_NULL, NULL); + tt_assert(set_up_protocol(n_options, options, proto_params) == 1); @@ -99,6 +102,8 @@ test_proto_option_parsing(void *data) end: if (proto_params) free(proto_params); + /* Unsuspend logging */ + log_set_method(LOG_METHOD_STDOUT, NULL); } /* Make sure we can successfully set up a protocol state */

1 0

[arm/packaging] Adding tarball dependencies for autofetching
by atagar＠torproject.org 10 Jun '11

10 Jun '11

commit 5442c4365d43bc706ec4e903644c54a56c633df3 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 10 09:55:48 2011 -0700 Adding tarball dependencies for autofetching The autofetched library dependencies weren't having their signatures checked, making this a very stupid vulnerability when on an untrusted network (that said, in practice you'd need to check arm's integrity for this fix to be meaningful which isn't possible when it's coming from git). However, this is probably better than nothing. Suggested by Sebastian and rransom --- deps/cagraph-1.2.tar.gz | Bin 0 -> 22600 bytes deps/fetch.sh | 29 +++++++++++++++++++++++++++++ deps/torctl.tar.gz | Bin 0 -> 64261 bytes 3 files changed, 29 insertions(+), 0 deletions(-) diff --git a/deps/cagraph-1.2.tar.gz b/deps/cagraph-1.2.tar.gz new file mode 100644 index 0000000..9ebc16e Binary files /dev/null and b/deps/cagraph-1.2.tar.gz differ diff --git a/deps/fetch.sh b/deps/fetch.sh new file mode 100755 index 0000000..03ae800 --- /dev/null +++ b/deps/fetch.sh @@ -0,0 +1,29 @@ +#!/bin/sh +# This fetches copies of arm's library dependencies. They're relatively static +# and provided with the tarball to avoid complicating the install process. +# +# TorCtl (https://gitweb.torproject.org/pytorctl.git) +# 6/10/11 - be583e53b2bccf09a7126c5271f9af5682447903b6ac92cf1cf78ca5b35273ed +# +# cagraph (https://code.google.com/p/cagraph/) +# 6/10/11 - a6928f07adb8f8d4b0076e01c0ec264e1acaaa6db21376c854fa827c9b04e3f3 + +# removes old archives if they exist +[ -f "torctl.tar.gz" ] && rm -f "torctl.tar.gz" +[ -f "cagraph-1.2.tar.gz" ] && rm -f "cagraph-1.2.tar.gz" + +# retrieves torctl +# note: This checksum changes with each fetch (maybe a timestamp's included?) +git clone --quiet git://git.torproject.org/pytorctl.git +cd pytorctl +git archive --format=tar --prefix=TorCtl/ master | gzip > ../torctl.tar.gz +cd .. +rm -rf pytorctl + +# retrieves cagraph +wget --quiet http://cagraph.googlecode.com/files/cagraph-1.2.tar.gz + +echo "Sha256 Checksums:" +sha256sum torctl.tar.gz +sha256sum cagraph-1.2.tar.gz + diff --git a/deps/torctl.tar.gz b/deps/torctl.tar.gz new file mode 100644 index 0000000..d45820b Binary files /dev/null and b/deps/torctl.tar.gz differ

1 0

[arm/master] Added gui as expanded option.
by atagar＠torproject.org 10 Jun '11

10 Jun '11

commit 9e59ed0df5168c801a72bf25c5986de9256a5b85 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Wed Jun 8 20:44:52 2011 +0500 Added gui as expanded option. --- src/starter.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/starter.py b/src/starter.py index a94020f..edb8bb2 100644 --- a/src/starter.py +++ b/src/starter.py @@ -51,7 +51,7 @@ CONFIG = {"startup.controlPassword": None, "log.savingDebugLog": util.log.NOTICE} OPT = "gi:c:dbe:vh" -OPT_EXPANDED = ["gtk", "interface=", "config=", "debug", "blind", "event=", "version", "help"] +OPT_EXPANDED = ["gui", "interface=", "config=", "debug", "blind", "event=", "version", "help"] HELP_MSG = """Usage arm [OPTION] Terminal status monitor for Tor relays.

1 0

[arm/master] fix: checking cli or gui prereqs based on args
by atagar＠torproject.org 10 Jun '11

10 Jun '11

commit 0c6fcdfaca98fede097d970fa42a3406e63bb334 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 10 08:34:28 2011 -0700 fix: checking cli or gui prereqs based on args This only checks for curses dependencies if running the cli and gtk dependencies when running the gui. This isn't quite an ideal solution since it duplicates the gui args in prereq.py but not the end of the world. --- arm | 2 +- src/prereq.py | 39 ++++++++++++++++++++++++++++++++++----- 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/arm b/arm index de0b248..a6dba93 100755 --- a/arm +++ b/arm @@ -5,7 +5,7 @@ else arm_base=$( dirname "$0" )/src/ fi -python "${arm_base}prereq.py" +python "${arm_base}prereq.py" $* if [ $? = 0 ]; then exec python -W ignore::DeprecationWarning "${arm_base}starter.py" $* diff --git a/src/prereq.py b/src/prereq.py index 506a4b0..93d9de3 100644 --- a/src/prereq.py +++ b/src/prereq.py @@ -133,7 +133,11 @@ def installCagraph(): # of errors. shutil.rmtree(tmpDir, ignore_errors=True) -if __name__ == '__main__': +def allPrereq(): + """ + Requrements for both the cli and gui versions of arm. + """ + majorVersion = sys.version_info[0] minorVersion = sys.version_info[1] @@ -144,17 +148,42 @@ if __name__ == '__main__': print("arm requires python version 2.5 or greater\n") sys.exit(1) + if not isTorCtlAvailable(): + isInstalled = promptTorCtlInstall() + if not isInstalled: sys.exit(1) + +def cliPrereq(): + """ + Requirements for the cli arm interface. + """ + + allPrereq() + try: import curses except ImportError: print("arm requires curses - try installing the python-curses package\n") sys.exit(1) - - if not isTorCtlAvailable(): - isInstalled = promptTorCtlInstall() - if not isInstalled: sys.exit(1) +def guiPrereq(): + """ + Requirements for the gui arm interface. + """ + + allPrereq() + + try: + import gtk + except ImportError: + print("arm requires gtk - try installing the python-gtk2 package\n") + sys.exit(1) + if not isCagraphAvailable(): isInstalled = promptCagraphInstall() if not isInstalled: sys.exit(1) +if __name__ == '__main__': + isGui = "-g" in sys.argv or "--gui" in sys.argv + if isGui: guiPrereq() + else: cliPrereq() +

1 0

[arm/master] Adding source flag to disable gui while in beta
by atagar＠torproject.org 10 Jun '11

10 Jun '11

commit 155c58fe5ddb1734b4b5a46b0a7906cbf01677d5 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 10 08:36:54 2011 -0700 Adding source flag to disable gui while in beta Source flag disables the --gui argument (and by extention prevents the gui from being run). This isn't perfect in that the gui prereqs are checked despite this flag when we have the gui arg, but this is both a temporary hack and not a terribly big concern. --- src/starter.py | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/starter.py b/src/starter.py index edb8bb2..d2ac910 100644 --- a/src/starter.py +++ b/src/starter.py @@ -30,6 +30,7 @@ import util.uiTools import TorCtl.TorCtl import TorCtl.TorUtil +INCLUDE_GUI = False LOG_DUMP_PATH = os.path.expanduser("~/.arm/log") DEFAULT_CONFIG = os.path.expanduser("~/.arm/armrc") CONFIG = {"startup.controlPassword": None, @@ -50,8 +51,13 @@ CONFIG = {"startup.controlPassword": None, "log.configDescriptions.persistance.saveFailed": util.log.NOTICE, "log.savingDebugLog": util.log.NOTICE} -OPT = "gi:c:dbe:vh" -OPT_EXPANDED = ["gui", "interface=", "config=", "debug", "blind", "event=", "version", "help"] +if INCLUDE_GUI: + OPT = "gi:c:dbe:vh" + OPT_EXPANDED = ["gui", "interface=", "config=", "debug", "blind", "event=", "version", "help"] +else: + OPT = "i:c:dbe:vh" + OPT_EXPANDED = ["interface=", "config=", "debug", "blind", "event=", "version", "help"] + HELP_MSG = """Usage arm [OPTION] Terminal status monitor for Tor relays. @@ -71,6 +77,11 @@ arm -b -i 1643 hide connection data, attaching to control port 1643 arm -e we -c /tmp/cfg use this configuration file with 'WARN'/'ERR' events """ % (CONFIG["startup.interface.ipAddress"], CONFIG["startup.interface.port"], DEFAULT_CONFIG, LOG_DUMP_PATH, CONFIG["startup.events"], cli.logPanel.EVENT_LISTING) +# icky and temporary hack to remove the gui help option if it's unavailbe +if not INCLUDE_GUI: + helpComp = HELP_MSG.split("\n") + HELP_MSG = "\n".join(helpComp[:3] + helpComp[4:]) + # filename used for cached tor config descriptions CONFIG_DESC_FILENAME = "torConfigDesc.txt" @@ -239,7 +250,7 @@ if __name__ == '__main__': param["startup.interface.ipAddress"] = controlAddr param["startup.interface.port"] = controlPort - elif opt in ("-g", "--gui"): launchGui = True + elif opt in ("-g", "--gui") and INCLUDE_GUI: launchGui = True elif opt in ("-c", "--config"): configPath = arg # sets path of user's config elif opt in ("-d", "--debug"): isDebugMode = True # dumps all logs elif opt in ("-b", "--blind"):

1 0

[arm/master] Fixed file mode.
by atagar＠torproject.org 10 Jun '11

10 Jun '11

commit d4a7db902d187810b3ce2b3ba247dbd2760eeeef Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jun 5 21:13:49 2011 +0500 Fixed file mode. --- 0 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/gui/controller.py b/src/gui/controller.py old mode 100755 new mode 100644

1 0

[arm/master] Skeletal Gtk+ UI.
by atagar＠torproject.org 10 Jun '11

10 Jun '11

commit 5ed6caafc77f43a389c7fcafa829803983c490a5 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jun 5 21:10:48 2011 +0500 Skeletal Gtk+ UI. Launched via -g or --gtk command-line flag. Rudimentary usage of torTools to display Tor pid. --- src/gui/__init__.py | 6 + src/gui/arm.xml | 628 +++++++++++++++++++++++++++++++++++++++++++++++++ src/gui/controller.py | 85 +++++++ src/starter.py | 13 +- 4 files changed, 729 insertions(+), 3 deletions(-) diff --git a/src/gui/__init__.py b/src/gui/__init__.py new file mode 100644 index 0000000..f461b3e --- /dev/null +++ b/src/gui/__init__.py @@ -0,0 +1,6 @@ +""" +Panels, popups, and handlers comprising the arm user interface. +""" + +__all__ = ["controller"] + diff --git a/src/gui/arm.xml b/src/gui/arm.xml new file mode 100644 index 0000000..49ffc89 --- /dev/null +++ b/src/gui/arm.xml @@ -0,0 +1,628 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> +  + <object class="GtkListStore" id="liststore_sticky"> + <columns> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">arm</col> + <col id="1" translatable="yes">orthanc (Linux 2.6.35.11-83.fc14)</col> + <col id="2" translatable="yes">black</col> + <col id="3" translatable="yes">white</col> + </row> + <row> + <col id="0" translatable="yes">Tor</col> + <col id="1" translatable="yes">0.2.1.28 (obsolete)</col> + <col id="2" translatable="yes">black</col> + <col id="3" translatable="yes">black</col> + </row> + <row> + <col id="0" translatable="yes">Relaying</col> + <col id="1" translatable="yes">Disabled</col> + <col id="2" translatable="yes">red</col> + <col id="3" translatable="yes">white</col> + </row> + <row> + <col id="0" translatable="yes">Control Port</col> + <col id="1" translatable="yes">9051 (open)</col> + <col id="2" translatable="yes">black</col> + <col id="3" translatable="yes">white</col> + </row> + <row> + <col id="0" translatable="yes">CPU Tor</col> + <col id="1" translatable="yes">0.0%</col> + <col id="2" translatable="yes">black</col> + <col id="3" translatable="yes">white</col> + </row> + <row> + <col id="0" translatable="yes">CPU arm</col> + <col id="1" translatable="yes">0.0%</col> + <col id="2" translatable="yes">black</col> + <col id="3" translatable="yes">white</col> + </row> + <row> + <col id="0" translatable="yes">Memory</col> + <col id="1" translatable="yes">20 MB (1.0%)</col> + <col id="2" translatable="yes">black</col> + <col id="3" translatable="yes">white</col> + </row> + <row> + <col id="0" translatable="yes">PID</col> + <col id="1" translatable="yes">3980</col> + <col id="2" translatable="yes">black</col> + <col id="3" translatable="yes">white</col> + </row> + <row> + <col id="0" translatable="yes">Uptime</col> + <col id="1" translatable="yes">01:01:34</col> + <col id="2" translatable="yes">black</col> + <col id="3" translatable="yes">white</col> + </row> + </data> + </object> + <object class="GtkListStore" id="liststore_conn"> + <columns> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">115.167.31.237:56835</col> + <col id="1" translatable="yes">188.120.245.249:9001 (ru)</col> + <col id="2" translatable="yes">10.7m</col> + <col id="3" translatable="yes">CLIENT</col> + <col id="4" translatable="yes">blue</col> + <col id="5" translatable="yes">white</col> + </row> + <row> + <col id="0" translatable="yes">115.167.31.237:44940</col> + <col id="1" translatable="yes">206.217.215.183:53 (us)</col> + <col id="2" translatable="yes">28.3m</col> + <col id="3" translatable="yes">CLIENT</col> + <col id="4" translatable="yes">blue</col> + <col id="5" translatable="yes">white</col> + </row> + <row> + <col id="0" translatable="yes">127.0.0.1:9051</col> + <col id="1" translatable="yes">127.0.0.1:51665</col> + <col id="2" translatable="yes">30.0m</col> + <col id="3" translatable="yes">CONTROL</col> + <col id="4" translatable="yes">red</col> + <col id="5" translatable="yes">white</col> + </row> + </data> + </object> + <object class="GtkListStore" id="liststore_config"> + <columns> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">BandwidthRate</col> + <col id="1" translatable="yes">5242880</col> + <col id="2" translatable="yes">Average bandwidth usage limit</col> + <col id="3" translatable="yes">#368918</col> + <col id="4" translatable="yes">white</col> + </row> + <row> + <col id="0" translatable="yes">BandwidthBurst</col> + <col id="1" translatable="yes">10485760</col> + <col id="2" translatable="yes">Maximum bandwidth usage limit</col> + <col id="3" translatable="yes">#368918</col> + <col id="4" translatable="yes">white</col> + </row> + <row> + <col id="0" translatable="yes">RelayBandwidthBurst</col> + <col id="1" translatable="yes">0 B</col> + <col id="2" translatable="yes">Maximum bandwidth usage limit for relaying</col> + <col id="3" translatable="yes">#368918</col> + <col id="4" translatable="yes">white</col> + </row> + <row> + <col id="0" translatable="yes">ControlPort</col> + <col id="1" translatable="yes">9051</col> + <col id="2" translatable="yes">Port providing access to tor controllers (arm, vidalia, etc)</col> + <col id="3" translatable="yes">#368918</col> + <col id="4" translatable="yes">white</col> + </row> + </data> + </object> + <object class="GtkWindow" id="window_main"> + <property name="title" translatable="yes">arm</property> + <property name="default_width">640</property> + <property name="default_height">480</property> + <signal name="delete_event" handler="on_window_main_delete_event"/> + <child> + <object class="GtkVBox" id="vbox_main"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">5</property> + <child> + <object class="GtkMenuBar" id="menubar_main"> + <property name="visible">True</property> + <child> + <object class="GtkMenuItem" id="menuitem_file"> + <property name="visible">True</property> + <property name="label" translatable="yes">_File</property> + <property name="use_underline">True</property> + <child type="submenu"> + <object class="GtkMenu" id="menu_file"> + <property name="visible">True</property> + <child> + <object class="GtkImageMenuItem" id="imagemenuitem_new"> + <property name="label">gtk-new</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="imagemenuitem_open"> + <property name="label">gtk-open</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="imagemenuitem_save"> + <property name="label">gtk-save</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="imagemenuitem_saveas"> + <property name="label">gtk-save-as</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separatormenuitem_file"> + <property name="visible">True</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="imagemenuitem_exit"> + <property name="label">gtk-quit</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + </object> + </child> + </object> + </child> + </object> + </child> + <child> + <object class="GtkMenuItem" id="menuitem_edit"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Edit</property> + <property name="use_underline">True</property> + <child type="submenu"> + <object class="GtkMenu" id="menu_edit"> + <property name="visible">True</property> + <child> + <object class="GtkImageMenuItem" id="imagemenuitem_cut"> + <property name="label">gtk-cut</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="imagemenuitem_copy"> + <property name="label">gtk-copy</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="imagemenuitem_paste"> + <property name="label">gtk-paste</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="imagemenuitem_delete"> + <property name="label">gtk-delete</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + </object> + </child> + </object> + </child> + </object> + </child> + <child> + <object class="GtkMenuItem" id="menuitem_view"> + <property name="visible">True</property> + <property name="label" translatable="yes">_View</property> + <property name="use_underline">True</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="menuitem_help"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Help</property> + <property name="use_underline">True</property> + <child type="submenu"> + <object class="GtkMenu" id="menu_help"> + <property name="visible">True</property> + <child> + <object class="GtkImageMenuItem" id="imagemenuitem_about"> + <property name="label">gtk-about</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + </object> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox_main"> + <property name="visible">True</property> + <child> + <object class="GtkNotebook" id="notebook_main"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <child> + <object class="GtkVBox" id="vbox_graph"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="label_graph_top"> + <property name="visible">True</property> + <property name="label" translatable="yes">Limit: 40 Mb/s, Burst: 80 Mb/s</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox_graph"> + <property name="visible">True</property> + <child> + <object class="GtkVBox" id="vbox_graph_a"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="label_graph_a_top"> + <property name="visible">True</property> + <property name="label" translatable="yes">Download (0.0 b/sec)</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkCurve" id="curve_graph_a"> + <property name="visible">True</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label_graph_a_bottom"> + <property name="visible">True</property> + <property name="label" translatable="yes">avg: 3.5 Kb/sec, total: 2.0 MB</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox_graph_b"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="label_graph_b_top"> + <property name="visible">True</property> + <property name="label" translatable="yes">Upload (0.0 b/sec)</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkCurve" id="curve_graph_b"> + <property name="visible">True</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label_graph_b_bottom"> + <property name="visible">True</property> + <property name="label" translatable="yes">avg: 3.5 Kb/sec, total: 2.0 MB</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + <child type="tab"> + <object class="GtkLabel" id="label_notebook_graph"> + <property name="visible">True</property> + <property name="label" translatable="yes">Graphs</property> + </object> + <packing> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox_conn"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="label_conn_top"> + <property name="visible">True</property> + <property name="label" translatable="yes">2 Clients, 1 Control</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkTreeView" id="treeview_conn"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="model">liststore_conn</property> + <property name="headers_visible">False</property> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn_conn_origin"> + <property name="title">column</property> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn_conn_dest"> + <property name="title">column</property> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn_conn_time"> + <property name="title">column</property> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn_conn_alive"> + <property name="title">column</property> + </object> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="label_notebook_conn"> + <property name="visible">True</property> + <property name="label" translatable="yes">Connections</property> + </object> + <packing> + <property name="position">1</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox_config"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="label_config_top"> + <property name="visible">True</property> + <property name="label" translatable="yes">RelayBandwidthBurst (General Option) +Value: 0 B (default, DataSize, usage: N bytes|KB|MB|GB|TB) +Description: Limit the maximum token bucket size (also known as +the burst) for relayed traffic to the given number of bytes in +each direction. (Default: 0) </property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow_config"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <child> + <object class="GtkTreeView" id="treeview_config"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="model">liststore_config</property> + <property name="headers_visible">False</property> + <property name="search_column">0</property> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn_name"> + <property name="title">column</property> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn_value"> + <property name="title">column</property> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn_desc"> + <property name="title">column</property> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="label_notebook_config"> + <property name="visible">True</property> + <property name="label" translatable="yes">Configuration</property> + </object> + <packing> + <property name="position">2</property> + <property name="tab_fill">False</property> + </packing> + </child> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow_sticky"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <child> + <object class="GtkTreeView" id="treeview_sticky"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="model">liststore_sticky</property> + <property name="headers_visible">False</property> + <property name="headers_clickable">False</property> + <property name="search_column">0</property> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn_sticky_name"> + <property name="title">column</property> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn_sticky_value"> + <property name="title">column</property> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="padding">5</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow_log"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <child> + <object class="GtkTextView" id="textview_log"> + <property name="visible">True</property> + <property name="can_focus">True</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="padding">5</property> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + </object> + <object class="GtkTextBuffer" id="textbuffer_log"> + <property name="text" translatable="yes">16:09:20 [NOTICE] Bootstrapped 90%: Establishing a Tor circuit. +16:09:23 [NOTICE] Tor has successfully opened a circuit. Looks like client functionality is working. +16:09:23 [NOTICE] Tor has successfully opened a circuit. Looks like client functionality is working. +16:09:24 [NOTICE] Bootstrapped 100%: Done. +</property> + </object> +</interface> diff --git a/src/gui/controller.py b/src/gui/controller.py new file mode 100755 index 0000000..2f54933 --- /dev/null +++ b/src/gui/controller.py @@ -0,0 +1,85 @@ +from util import torTools + +import gtk + +class GuiController: + def __init__(self): + filename = 'src/gui/arm.xml' + self.builder = gtk.Builder() + self.builder.add_from_file(filename) + self.builder.connect_signals(self) + + def run(self): + window = self.builder.get_object('window_main') + + col = self.builder.get_object('treeview_sticky').get_column(0) + cell = gtk.CellRendererText() + col.pack_start(cell) + col.add_attribute(cell, 'text', 0) + + col = self.builder.get_object('treeview_sticky').get_column(1) + cell = gtk.CellRendererText() + col.pack_start(cell) + col.add_attribute(cell, 'markup', 1) + col.add_attribute(cell, 'foreground', 2) + + col = self.builder.get_object('treeview_conn').get_column(0) + cell = gtk.CellRendererText() + col.pack_start(cell) + col.add_attribute(cell, 'markup', 0) + col.add_attribute(cell, 'foreground', 4) + + col = self.builder.get_object('treeview_conn').get_column(1) + cell = gtk.CellRendererText() + col.pack_start(cell) + col.add_attribute(cell, 'markup', 1) + col.add_attribute(cell, 'foreground', 4) + + col = self.builder.get_object('treeview_conn').get_column(2) + cell = gtk.CellRendererText() + col.pack_start(cell) + col.add_attribute(cell, 'markup', 2) + col.add_attribute(cell, 'foreground', 4) + + col = self.builder.get_object('treeview_conn').get_column(3) + cell = gtk.CellRendererText() + col.pack_start(cell) + col.add_attribute(cell, 'markup', 3) + col.add_attribute(cell, 'foreground', 4) + + col = self.builder.get_object('treeview_config').get_column(0) + cell = gtk.CellRendererText() + col.pack_start(cell) + col.add_attribute(cell, 'markup', 0) + col.add_attribute(cell, 'foreground', 3) + + col = self.builder.get_object('treeview_config').get_column(1) + cell = gtk.CellRendererText() + col.pack_start(cell) + col.add_attribute(cell, 'markup', 1) + col.add_attribute(cell, 'foreground', 3) + + col = self.builder.get_object('treeview_config').get_column(2) + cell = gtk.CellRendererText() + col.pack_start(cell) + col.add_attribute(cell, 'markup', 2) + col.add_attribute(cell, 'foreground', 3) + + textview = self.builder.get_object('textview_log') + textbuffer = self.builder.get_object('textbuffer_log') + textview.set_buffer(textbuffer) + + conn = torTools.getConn() + torPid = conn.getMyPid() + textbuffer.set_text("Tor pid: %s" % torPid) + + window.show_all() + gtk.main() + + def on_window_main_delete_event(self, widget, data=None): + gtk.main_quit() + +def startGui(): + controller = GuiController() + controller.run() + diff --git a/src/starter.py b/src/starter.py index b41b18b..9d7f17c 100644 --- a/src/starter.py +++ b/src/starter.py @@ -16,6 +16,7 @@ import platform import version import cli.controller import cli.logPanel +import gui.controller import util.conf import util.connections import util.hostnames @@ -49,11 +50,12 @@ CONFIG = {"startup.controlPassword": None, "log.configDescriptions.persistance.saveFailed": util.log.NOTICE, "log.savingDebugLog": util.log.NOTICE} -OPT = "i:c:dbe:vh" -OPT_EXPANDED = ["interface=", "config=", "debug", "blind", "event=", "version", "help"] +OPT = "gi:c:dbe:vh" +OPT_EXPANDED = ["gtk", "interface=", "config=", "debug", "blind", "event=", "version", "help"] HELP_MSG = """Usage arm [OPTION] Terminal status monitor for Tor relays. + -g, --gtk launch the Gtk+ interface -i, --interface [ADDRESS:]PORT change control interface from %s:%i -c, --config CONFIG_PATH loaded configuration options, CONFIG_PATH defaults to: %s @@ -208,6 +210,7 @@ def _dumpConfig(): if __name__ == '__main__': startTime = time.time() param = dict([(key, None) for key in CONFIG.keys()]) + launchGui = False isDebugMode = False configPath = DEFAULT_CONFIG # path used for customized configuration @@ -236,6 +239,7 @@ if __name__ == '__main__': param["startup.interface.ipAddress"] = controlAddr param["startup.interface.port"] = controlPort + elif opt in ("-g", "--gtk"): launchGui = True elif opt in ("-c", "--config"): configPath = arg # sets path of user's config elif opt in ("-d", "--debug"): isDebugMode = True # dumps all logs elif opt in ("-b", "--blind"): @@ -401,5 +405,8 @@ if __name__ == '__main__': if util.uiTools.isUnicodeAvailable(): locale.setlocale(locale.LC_ALL, "") - cli.controller.startTorMonitor(time.time() - initTime) + if launchGui == True: + gui.controller.startGui() + else: + cli.controller.startTorMonitor(time.time() - initTime)

1 0