August 2014 - tor-commits - lists.torproject.org

[fog/master] Added a loading configuration file on the server side. The format is identical to the client configuration file except ClientTransportationPlugin is ServerTransportationPlugin. Uses go-shellwords to parse the config files.
by infinity0＠torproject.org 01 Aug '14

01 Aug '14

commit 58858475e5ba737ca0e7e271b7604fe1ac06bf75 Author: Quinn Jarrell <qjarrell(a)gosynapsify.com> Date: Mon Jun 23 16:15:18 2014 -0400 Added a loading configuration file on the server side. The format is identical to the client configuration file except ClientTransportationPlugin is ServerTransportationPlugin. Uses go-shellwords to parse the config files. --- fog-server/Makefile | 2 +- fog-server/config.go | 145 ++++++++++++++++++++++++++++++++++++++++++++++ fog-server/fog-server.go | 80 ++++--------------------- fog-server/fogrc | 13 +++++ fog-server/torrc | 2 +- 5 files changed, 171 insertions(+), 71 deletions(-) diff --git a/fog-server/Makefile b/fog-server/Makefile index c7d474b..1a153a6 100644 --- a/fog-server/Makefile +++ b/fog-server/Makefile @@ -1,6 +1,6 @@ GOBUILDFLAGS = -./fog-server: ./fog-server.go ./stack.go +./fog-server: ./fog-server.go ./stack.go ./config.go go build $(GOBUILDFLAGS) -o "$@" $^ test: diff --git a/fog-server/config.go b/fog-server/config.go new file mode 100644 index 0000000..615ea47 --- /dev/null +++ b/fog-server/config.go @@ -0,0 +1,145 @@ +package main + +import ( + "errors" + "fmt" + "io/ioutil" + "strings" +) + +import "git.torproject.org/pluggable-transports/goptlib.git" +import "github.com/mattn/go-shellwords" + +// Represents a server transport plugin configuration like: +// ServerTransportPlugin MethodName exec Command +type ServerTransportPlugin struct { + MethodName string + Command []string + Options pt.Args +} + +type Configuration struct { + // Map from method names to command strings. + Transports map[string][]string + // Map from method names to ServerTransportOptions. + Options map[string]pt.Args + // Map from tor-friendly names like "obfs3_websocket" to systematic + // names like "obfs3|websocket". + Aliases map[string]string +} + +func (conf *Configuration) MethodNames() []string { + result := make([]string, 0) + // We understand all the single transports + for k, _ := range conf.Transports { + result = append(result, k) + } + // and aliases. + for k, _ := range conf.Aliases { + result = append(result, k) + } + return result +} + +// Parse a (possibly composed) method name into a slice of single method names. +func (conf *Configuration) ParseMethodName(methodName string) []string { + if name, ok := conf.Aliases[methodName]; ok { + methodName = name + } + return strings.Split(methodName, "|") +} + +func (conf *Configuration) PluginList(methodName string) ([]ServerTransportPlugin, error) { + names := conf.ParseMethodName(methodName) + stp := make([]ServerTransportPlugin, 0) + for _, name := range names { + command, ok := conf.Transports[name] + if !ok { + return nil, errors.New(fmt.Sprintf("no transport named %q", name)) + } + options := conf.Options[name] + stp = append(stp, ServerTransportPlugin{name, command, options}) + } + return stp, nil +} + +// Initialize a configuration object +func getConfiguration() (conf *Configuration) { + conf = new(Configuration) + conf.Transports = make(map[string][]string) + conf.Aliases = make(map[string]string) + conf.Options = make(map[string]pt.Args) + return conf +} + +// Reads a configuration file and returns the contents +func ReadConfigFile(fileName string) (*Configuration, error) { + var contents []byte + contents, err := ioutil.ReadFile(fileName) + if err != nil { + return nil, errors.New(fmt.Sprintf("Error reading configuration file %s contents.", fileName)) + } + return ParseConfiguration(string(contents), getConfiguration()) +} + +// Parses a configuration string and fills the config object's fields with the requested Aliases and ServerTransportPlugins +func ParseConfiguration(configString string, config *Configuration) (*Configuration, error) { + lines := strings.Split(configString, "\n") + for lineCounter, line := range lines { + if len(line) > 0 && line[0] != '#' { // Check for empty lines and comment tags on the first + line = strings.TrimSpace(line) + delimitedTokens, err := shellwords.Parse(line) + if err != nil { + return nil, errors.New(fmt.Sprintf("Line %v: \"%v\" was split incorrectly by shellwords. Error: %v", lineCounter, line, err)) + } + if len(delimitedTokens) > 1 { + configLineType := delimitedTokens[0] // This can be either Alias or ServerTransportPlugin + if configLineType == "ServerTransportPlugin" { + err = parseTransportLine(config, delimitedTokens, lineCounter) + if err != nil { + return nil, err + } + } else if configLineType == "Alias" { + err = parseAliasLine(config, delimitedTokens, lineCounter) + if err != nil { + return nil, err + } + } else { + log("Configuration file has unknown line %s: %s", lineCounter, line) + } + } + } + } + return config, nil +} + +// Parses a ServerTransportPlugin line. +// Ex: ServerTransportPlugin dummy obfsproxy --client T managed +func parseTransportLine(config *Configuration, tokens []string, lineCounter int) error { + transportName := tokens[1] + transportCmdLine := tokens[2:] + if _, ok := config.Transports[transportName]; ok { + return errors.New(fmt.Sprintf("Configuration file has duplicate ServerTransportPlugin lines. Duplicate line is at line number %s", lineCounter)) + } + config.Transports[transportName] = transportCmdLine + return nil +} + +// Parses an alias line +// Ex: Alias b64_b64 b64|b64 +func parseAliasLine(config *Configuration, tokens []string, lineCounter int) error { + var aliasName string + var aliasPath []string + aliasName = tokens[1] + aliasPath = strings.Split(tokens[2], "|") + if _, hashed := config.Aliases[aliasName]; hashed { + return errors.New(fmt.Sprintf("Configuration file has duplicate Alias lines. Duplicate line is at line number %s", lineCounter)) + } + for _, ptName := range aliasPath { + if _, hashed := config.Transports[ptName]; !hashed { + log("Transport map is missing pluggable transport %s needed for chain %s. Check your configuration file for a ServerTransportPlugin line can launch %s", ptName, aliasName, ptName) + } + } + config.Aliases[aliasName] = tokens[2] + return nil +} \ No newline at end of file diff --git a/fog-server/fog-server.go b/fog-server/fog-server.go index cf77a6a..9ee2703 100644 --- a/fog-server/fog-server.go +++ b/fog-server/fog-server.go @@ -39,6 +39,7 @@ func usage() { fmt.Printf(" -h, --help show this help.\n") fmt.Printf(" --log FILE log messages to FILE (default stderr).\n") fmt.Printf(" --port PORT listen on PORT (overrides Tor's requested port).\n") + fmt.Printf(" -f, --file FILE Loads and runs configuration FILE.\n") } var logMutex sync.Mutex @@ -174,14 +175,6 @@ func encodeServerTransportOptions(methodName string, opts pt.Args) string { return strings.Join(parts, ";") } -// Represents a server transport plugin configuration like: -// ServerTransportPlugin MethodName exec Command -type ServerTransportPlugin struct { - MethodName string - Command []string - Options pt.Args -} - func startProcesses(connectBackAddr net.Addr, plugins []ServerTransportPlugin) (bindAddr *net.TCPAddr, procs ProcList, err error) { var stdout io.ReadCloser @@ -393,72 +386,17 @@ func startChain(methodName string, bindaddr *net.TCPAddr, plugins []ServerTransp return chain, nil } -type Configuration struct { - // Map from method names to command strings. - Transports map[string][]string - // Map from method names to ServerTransportOptions. - Options map[string]pt.Args - // Map from tor-friendly names like "obfs3_websocket" to systematic - // names like "obfs3|websocket". - Aliases map[string]string -} - -func (conf *Configuration) MethodNames() []string { - result := make([]string, 0) - // We understand all the single transports - for k, _ := range conf.Transports { - result = append(result, k) - } - // and aliases. - for k, _ := range conf.Aliases { - result = append(result, k) - } - return result -} - -// Parse a (possibly composed) method name into a slice of single method names. -func (conf *Configuration) ParseMethodName(methodName string) []string { - if name, ok := conf.Aliases[methodName]; ok { - methodName = name - } - return strings.Split(methodName, "|") -} - -func (conf *Configuration) PluginList(methodName string) ([]ServerTransportPlugin, error) { - names := conf.ParseMethodName(methodName) - stp := make([]ServerTransportPlugin, 0) - for _, name := range names { - command, ok := conf.Transports[name] - if !ok { - return nil, errors.New(fmt.Sprintf("no transport named %q", name)) - } - options := conf.Options[name] - stp = append(stp, ServerTransportPlugin{name, command, options}) - } - return stp, nil -} - -// Simulate loading a configuration file. -func getConfiguration() (conf *Configuration) { - conf = new(Configuration) - conf.Transports = make(map[string][]string) - conf.Aliases = make(map[string]string) - conf.Options = make(map[string]pt.Args) - conf.Transports["obfs3"] = []string{"obfsproxy", "managed"} - conf.Transports["websocket"] = []string{"pt-websocket-server"} - // conf.Options["obfs3"] = make(pt.Args) - // conf.Options["obfs3"]["secret"] = []string{"foo"} - conf.Aliases["obfs3_websocket"] = "obfs3|websocket" - return conf -} - func main() { var logFilename string var port int + var configFilename string + var conf *Configuration flag.Usage = usage flag.StringVar(&logFilename, "log", "", "log file to write to") flag.IntVar(&port, "port", 0, "port to listen on if unspecified by Tor") + flag.StringVar(&configFilename, "file", "fogrc", "The fog file to read the configuration from.") + flag.StringVar(&configFilename, "f", "fogrc", "The fog file to read the configuration from.") flag.Parse() if logFilename != "" { @@ -469,11 +407,15 @@ func main() { } logFile = f } + var err error + conf, err = ReadConfigFile(configFilename) + if err != nil { + log("Error in reading configuration file: %s", err) + os.Exit(1) + } log("Starting.") - var err error - conf := getConfiguration() ptInfo, err = pt.ServerSetup(conf.MethodNames()) if err != nil { log("Error in ServerSetup: %s", err) diff --git a/fog-server/fogrc b/fog-server/fogrc new file mode 100644 index 0000000..870d8b6 --- /dev/null +++ b/fog-server/fogrc @@ -0,0 +1,13 @@ +#Based off of ticket #9744 +#Server transports are setup like so: +#ServerTransportPlugin name commandline +#For instance to launch obfs3, the server transport line should be this +#ServerTransportPlugin obfs3 obfsproxy managed +# +#For chaining transports together, an alias line is used. +#Alias chainname firsttransportname|secondtransportname +#tor expects alias to use underscores instead of pipes. So an alias links the tor version of a plugin chain to the actual plugins. See ticket #9580 + +ServerTransportPlugin obfs3 obfsproxy managed +ServerTransportPlugin websocket pt-websocket-server +Alias obfs3_websocket obfs3|websocket \ No newline at end of file diff --git a/fog-server/torrc b/fog-server/torrc index f103ddc..88258fa 100644 --- a/fog-server/torrc +++ b/fog-server/torrc @@ -2,4 +2,4 @@ ORPort 9999 ExtORPort 5555 BridgeRelay 1 SocksPort 0 -ServerTransportPlugin obfs3_websocket exec ./bin/fog-server +ServerTransportPlugin obfs3_websocket exec ./fog-server

1 0

[fog/master] Adds launching multiple chains. Now after finding the needed chains, all the pts needed by the chains are launched first. Then after each pt succeeds, if a chain has all its pts setup, it will launch.
by infinity0＠torproject.org 01 Aug '14

01 Aug '14

commit c3aaf32b2b57401b56e1991b451f8252981df349 Author: Quinn Jarrell <qjarrell(a)gosynapsify.com> Date: Wed Jul 16 21:48:55 2014 -0400 Adds launching multiple chains. Now after finding the needed chains, all the pts needed by the chains are launched first. Then after each pt succeeds, if a chain has all its pts setup, it will launch. --- fog-client/fog-client | 113 +++++++++++++++++++++++++++++------------------ fog-client/fog/socks.py | 4 +- 2 files changed, 73 insertions(+), 44 deletions(-) diff --git a/fog-client/fog-client b/fog-client/fog-client index 808504c..f651a83 100755 --- a/fog-client/fog-client +++ b/fog-client/fog-client @@ -17,6 +17,7 @@ from pyptlib.client import ClientTransportPlugin from subprocess import PIPE from twisted.internet.defer import Deferred, DeferredList +from twisted.internet.error import CannotListenError from twisted.internet.stdio import StandardIO from twisted.internet.protocol import Factory, connectionDone from twisted.internet.endpoints import TCP4ClientEndpoint @@ -291,7 +292,7 @@ if sys.platform == "win32": self.proto.makeConnection(self) -def pt_launch_child(reactor, client, methodnames, pt_method_name, cmdline): +def pt_launch_child(reactor, client, methodnames, chain_names, cmdline): """Launch a child PT and ensure it has the right transport methods.""" cur_env = pt_child_env(ManagedTransportProtocolV1.protocol_version) environment = dict(cur_env + { @@ -305,17 +306,74 @@ def pt_launch_child(reactor, client, methodnames, pt_method_name, cmdline): # we ought to pass reactor=reactor in below, but this breaks Twisted 12 StandardIO(sub_protocol, stdin=sub_proc.stdout.fileno()) methoddefers = [sub_protocol.whenCMethodsDone().addCallback( - partial(pt_require_child, client, name, pt_method_name)) + partial(pt_require_child, client, name, chain_names)) for name in methodnames] return sub_proc, sub_protocol, methoddefers -def pt_require_child(client, childmethod, pt_method_name, cmethods): +def pt_require_child(client, childmethod, chain_names, cmethods): """Callback for checking a child PT has the right transport methods.""" if childmethod not in cmethods: - client.reportMethodError(pt_method_name, "failed to start required child transport: %s" % childmethod) + for chain_name in chain_names: + client.reportMethodError(chain_name, "failed to start required child transport: %s" % childmethod) raise ValueError() return cmethods[childmethod] +def pt_get_unique_transport_list(aliases, config): + """ + Returns all the pts needed by the chains without duplicates + :param aliases list: The list of alias names requested by tor and intersected with the transports fog can serve + :param Config config: The configuration object + """ + uniq_transports = set() + for alias in aliases: + for pt_name in config.alias_map[alias]: + uniq_transports.add(pt_name) + return list(uniq_transports) + +def pt_setup_transports(reactor, client, configuration, pt_names, chain_names): + """ + Sets up the pluggable transports needed by the chains + :param twisted.internet.interfaces.IReactor reactor: Reactor to install this PT to. + :param pyptlib.client.ClientTransportPlugin client: PT client API. + :param Config configuration: The configuration object. + :param list pt_names: The list of pt names to setup. + :param list chain_names: The list of chain names to launch. + """ + pt_defer_map = {} + for pt_name in pt_names: + if pt_name not in configuration.transport_map: + raise ValueError("Pluggable transport %s not found in transport_map. Check your configuration file." % pt_name) + pt_cmdline = configuration.transport_map[pt_name] + # TODO make this more than a one item list when fixing multiple transports launched by one ClientTransportPlugin line. + multi_pts = [pt_name] + # Find all the chains where this pt is used. + pt_chains = [chain_name for chain_name in chain_names if pt_name in configuration.alias_map[chain_name]] + _, _, defers = pt_launch_child(reactor, client, multi_pts, pt_chains, pt_cmdline) + for pt, defer in zip(multi_pts, defers): + pt_defer_map[pt] = defer + chains_finished_dlist = pt_setup_chains(reactor, client, configuration, chain_names, pt_defer_map) + chains_finished_dlist.addCallback(lambda x: client.reportMethodsEnd()) + +def pt_setup_chains(reactor, client, configuration, chain_names, pt_defer_map): + """ + Sets up each chain of pluggable transports + :param twisted.internet.interfaces.IReactor reactor: Reactor to install this PT to. + :param pyptlib.client.ClientTransportPlugin client: PT client API. + :param Config configuration: The configuration object. + :param list chain_names: The list of chain names to setup. + :param dict pt_defer_map: A map between each pt and the defer that will callback when the pt is successfully launched. + """ + all_chains_defer_list = [] + for chain_name in chain_names: + chain = configuration.alias_map[chain_name] + if len(chain) < 2: + raise ValueError("PT Chain %s does not contain enough transports." % chain) + chain_deferred_list = DeferredList([pt_defer_map[pt] for pt in set(chain)]) + partial_funct = partial(pt_launch_interceptor, reactor, client, configuration, chain_name) + chain_deferred_list.addCallback(partial_funct) + all_chains_defer_list.append(chain_deferred_list) + return DeferredList(all_chains_defer_list) + def pt_setup_socks_shim(pt_name, pt_chain, success_list, dest_address, dest_port, reactor, proxy_deferreds): """ Launches a socks proxy server to link two PTs together. @@ -395,7 +453,7 @@ def pt_launch_interceptor(reactor, client, configuration, pt_method_name, succes Ex: [(True, MethodSpec(name='dummy', protocol='socks4', addrport=('127.0.0.1', 58982), args=[], opts=[])), (True, MethodSpec(name='b64', protocol='socks4', addrport=('127.0.0.1', 58981), args=[], opts=[]))] """ - logger.debug("launching interceptor") + logger.debug("launching interceptor for %s" % pt_method_name) pt_chain = configuration.alias_map[pt_method_name] success = all(r[0] for r in success_list if r[1].name in pt_chain) # failure was already reported by pt_require_child, just return @@ -404,41 +462,13 @@ def pt_launch_interceptor(reactor, client, configuration, pt_method_name, succes lambda dest_address, dest_port, pt_method_name, chain_finished: pt_launch_chain(dest_address, dest_port, pt_chain, chain_finished, reactor, success_list)) # TODO switch to using endpoints instead of listenTCP - interceptor = reactor.listenTCP(interface='127.0.0.1', port=0, factory=socks_interceptor) - interceptor_port = interceptor.getHost().port + try: + interceptor = reactor.listenTCP(interface='127.0.0.1', port=0, factory=socks_interceptor) + interceptor_port = interceptor.getHost().port + except CannotListenError: + client.reportMethodError(pt_method_name, " failed to launch SOCKS interceptor. The interceptor listenTCP failed.") + return client.reportMethodSuccess(pt_method_name, "socks4", ("127.0.0.1", interceptor_port)) - client.reportMethodsEnd() - -def pt_setup_transports(reactor, client, configuration, pt_method_name): - """ - Launches the PT processes. - :param twisted.internet.interfaces.IReactor reactor: Reactor to install this PT to. - :param pyptlib.client.ClientTransportPlugin client: PT client API. - :param Config configuration: The configuration structure for this pair. - :param str pt_method_name: The name of the pt chain to launch. Ex: "obfs3_flashproxy" - """ - logger.debug("Setting up transports %s" % pt_method_name) - if pt_method_name in configuration.alias_map: - pt_chain = configuration.alias_map[pt_method_name] - else: - logger.error('Pluggable Transport Combination %s not found in configuration alias map.' % pt_method_name) - raise KeyError() - - defer_list = [] - - if len(pt_chain) < 2: - raise ValueError("PT Chain %s does not contain enough transports." % pt_chain) - - for pt in pt_chain: - if pt in configuration.transport_map: - pt_cmdline = configuration.transport_map[pt] - else: - raise ValueError("Pluggable transport %s not found in transport_map. Check your configuration file." % pt) - _, _, defer = pt_launch_child(reactor, client, [pt], pt_method_name, pt_cmdline) - defer_list.extend(defer) - whenAllDone = DeferredList(defer_list, consumeErrors=False) - whenAllDone.addCallback(lambda success_list: pt_launch_interceptor(reactor, client, configuration, pt_method_name, success_list)) - class Config(): # Transport map links a pluggable transport name to the a commandline to launch it. @@ -527,14 +557,13 @@ def main(*args): if not client.getTransports(): logger.error("no transports to serve. pt_method_names may be invalid.") return 1 - + pt_method_names = pt_get_unique_transport_list(client.getTransports(), configuration) from twisted.internet import reactor auto_killall(1, cleanup=reactor.stop) #TODO Change from launching a single pair to launching multiple chains. - pt_setup_transports(reactor, client, configuration, pt_method_names[0]) + pt_setup_transports(reactor, client, configuration, pt_method_names, client.getTransports()) reactor.run(installSignalHandlers=0) return 0 if __name__ == "__main__": sys.exit(main(*sys.argv[1:])) - diff --git a/fog-client/fog/socks.py b/fog-client/fog/socks.py index b44135d..ec6d3d0 100644 --- a/fog-client/fog/socks.py +++ b/fog-client/fog/socks.py @@ -29,7 +29,7 @@ class SOCKSv4InterceptorProtocol(socks.SOCKSv4): self.makeReply(91) return def _chain_set_up(remote_address, remote_port): - logger.debug("chain finished, connecting %s:%s" % (remote_address, remote_port)) + logger.debug("chain finished, connecting to %s:%s" % (remote_address, remote_port)) # Connect to our remote address instead of the requested one d = self.connectClass(remote_address, remote_port, socks.SOCKSv4Outgoing, self) d.addErrback(lambda result, self = self: self.makeReply(91)) @@ -56,4 +56,4 @@ class SOCKSv4InterceptorFactory(Factory): self._new_conn_callback = new_conn_callback def buildProtocol(self, addr): - return SOCKSv4InterceptorProtocol(self, self._pt_method_name) \ No newline at end of file + return SOCKSv4InterceptorProtocol(self, self._pt_method_name)

1 0

[fog/master] changed remote_host, remote_port into a pair to shorten parameters.
by infinity0＠torproject.org 01 Aug '14

01 Aug '14

commit 5d8436cc9f2fb827bde0a3bcae734f614132df8e Author: Quinn Jarrell <qjarrell(a)gosynapsify.com> Date: Mon Jul 7 15:16:58 2014 -0400 changed remote_host, remote_port into a pair to shorten parameters. --- fog-client/fog-client | 33 +++++++++++++++------------------ fog-client/fog/socks.py | 8 ++++---- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/fog-client/fog-client b/fog-client/fog-client index f651a83..4415a03 100755 --- a/fog-client/fog-client +++ b/fog-client/fog-client @@ -214,11 +214,11 @@ class OneUseSOCKSWrapper(ProxyServer): class OneUseSOCKSFactory(Factory): protocol = OneUseSOCKSWrapper - def __init__(self, method_spec, remote_host, remote_port): + def __init__(self, method_spec, dest_addr_port): self._connected_once = False self.method_spec = method_spec - self.remote_host = remote_host - self.remote_port = remote_port + self.remote_host = dest_addr_port[0] + self.remote_port = dest_addr_port[1] self.d_connected = Deferred() self.listen_port = None @@ -374,7 +374,7 @@ def pt_setup_chains(reactor, client, configuration, chain_names, pt_defer_map): all_chains_defer_list.append(chain_deferred_list) return DeferredList(all_chains_defer_list) -def pt_setup_socks_shim(pt_name, pt_chain, success_list, dest_address, dest_port, reactor, proxy_deferreds): +def pt_setup_socks_shim(pt_name, pt_chain, success_list, dest_addr_port, reactor, proxy_deferreds): """ Launches a socks proxy server to link two PTs together. :param str pt_name: The name of the pt to send traffic to. @@ -382,8 +382,7 @@ def pt_setup_socks_shim(pt_name, pt_chain, success_list, dest_address, dest_port :param list success_list: A list of tuples containing a launch status boolean, MethodSpec pairs. Ex: [(True, MethodSpec(name='dummy', protocol='socks4', addrport=('127.0.0.1', 58982), args=[], opts=[])), (True, MethodSpec(name='b64', protocol='socks4', addrport=('127.0.0.1', 58981), args=[], opts=[]))] - :param str dest_address: The address for the next PT to send its results to. - :param int dest_port: The port for the next PT to send to. + :param tuple dest_addr_port: The bridge address:port pair for the next PT to send its results to. :param twisted.internet.interfaces.IReactor reactor: Reactor to attack the TCP server to. :param list proxy_deferreds: This list has each factorys' deferred appended to it. @@ -391,19 +390,18 @@ def pt_setup_socks_shim(pt_name, pt_chain, success_list, dest_address, dest_port :returns twisted.internet.interfaces.IListeningPort: An IListeningPort used for shutting down a factory after a connection is made. """ methodspec = [r[1] for r in success_list if r[1].name == pt_name][0] # Returns the resulting methodspec. - factory = OneUseSOCKSFactory(methodspec, dest_address, dest_port) + factory = OneUseSOCKSFactory(methodspec, dest_addr_port) # TODO switch to using endpoints instead of listenTCP proxy_server = reactor.listenTCP(interface='127.0.0.1', port=0, factory=factory) factory.setListenPort(proxy_server) proxy_deferreds.append(factory.whenConnected()) - logger.debug("launched %s on port %s with dest %s:%s" % (pt_name, proxy_server.getHost().port, dest_address, dest_port)) + logger.debug("launched %s on port %s with dest %s" % (pt_name, proxy_server.getHost().port, dest_addr_port)) return proxy_server -def pt_launch_chain(dest_address, dest_port, pt_chain, _chain_set_up, reactor, success_list): +def pt_launch_chain(dest_addr_port, pt_chain, _chain_set_up, reactor, success_list): """ Launches a chain of pluggable transports by connecting each pt with SOCKS proxies. - :param str dest_address: The bridge address to connect to. - :param int dest_port: The bridge port to connect to. + :param tuple dest_addr_port: The bridge address:port pair to connect to. :param list pt_chain: The list of pt names to launch. :param function _chain_set_up: The function to call when the shims have been set up. :param twisted.internet.interfaces.IReactor reactor: Reactor to install this PT to. @@ -415,12 +413,12 @@ def pt_launch_chain(dest_address, dest_port, pt_chain, _chain_set_up, reactor, s last_pt_name = pt_chain[-1] logger.debug("launching chain %s" % pt_chain) # Initialize prev_server to the port picked by the last proxy server as that's the only one we know yet. - last_server = pt_setup_socks_shim(last_pt_name, pt_chain, success_list, dest_address, dest_port, + last_server = pt_setup_socks_shim(last_pt_name, pt_chain, success_list, dest_addr_port, reactor, proxy_deferreds) prev_server = last_server for pt_name in reversed(pt_chain[:-1]): # Loops through the pts linking them together through SOCKS proxies, skipping the last pt. - prev_server = pt_setup_socks_shim(pt_name, pt_chain, success_list, '127.0.0.1', prev_server.getHost().port, + prev_server = pt_setup_socks_shim(pt_name, pt_chain, success_list, ('127.0.0.1', prev_server.getHost().port), reactor, proxy_deferreds) def check_chain_all_connected(protocol_list): """ @@ -440,7 +438,7 @@ def pt_launch_chain(dest_address, dest_port, pt_chain, _chain_set_up, reactor, s finished = DeferredList(proxy_deferreds) finished.addCallback(check_chain_all_connected) - _chain_set_up(prev_server.getHost().host, prev_server.getHost().port) + _chain_set_up((prev_server.getHost().host, prev_server.getHost().port)) def pt_launch_interceptor(reactor, client, configuration, pt_method_name, success_list): """ @@ -459,14 +457,14 @@ def pt_launch_interceptor(reactor, client, configuration, pt_method_name, succes # failure was already reported by pt_require_child, just return if not success: return socks_interceptor = SOCKSv4InterceptorFactory(pt_method_name, - lambda dest_address, dest_port, pt_method_name, chain_finished: - pt_launch_chain(dest_address, dest_port, pt_chain, chain_finished, reactor, success_list)) + lambda dest_addr_port, pt_method_name, chain_finished: + pt_launch_chain(dest_addr_port, pt_chain, chain_finished, reactor, success_list)) # TODO switch to using endpoints instead of listenTCP try: interceptor = reactor.listenTCP(interface='127.0.0.1', port=0, factory=socks_interceptor) interceptor_port = interceptor.getHost().port except CannotListenError: - client.reportMethodError(pt_method_name, " failed to launch SOCKS interceptor. The interceptor listenTCP failed.") + client.reportMethodError(pt_method_name, "failed to launch SOCKS interceptor. The interceptor listenTCP failed.") return client.reportMethodSuccess(pt_method_name, "socks4", ("127.0.0.1", interceptor_port)) @@ -560,7 +558,6 @@ def main(*args): pt_method_names = pt_get_unique_transport_list(client.getTransports(), configuration) from twisted.internet import reactor auto_killall(1, cleanup=reactor.stop) - #TODO Change from launching a single pair to launching multiple chains. pt_setup_transports(reactor, client, configuration, pt_method_names, client.getTransports()) reactor.run(installSignalHandlers=0) return 0 diff --git a/fog-client/fog/socks.py b/fog-client/fog/socks.py index ec6d3d0..a23a3a9 100644 --- a/fog-client/fog/socks.py +++ b/fog-client/fog/socks.py @@ -28,12 +28,12 @@ class SOCKSv4InterceptorProtocol(socks.SOCKSv4): if not self.authorize(code, server, port, user): self.makeReply(91) return - def _chain_set_up(remote_address, remote_port): - logger.debug("chain finished, connecting to %s:%s" % (remote_address, remote_port)) + def _chain_set_up(remote_addr_port): + logger.debug("chain finished, connecting %s" % (remote_addr_port,)) # Connect to our remote address instead of the requested one - d = self.connectClass(remote_address, remote_port, socks.SOCKSv4Outgoing, self) + d = self.connectClass(remote_addr_port[0], remote_addr_port[1], socks.SOCKSv4Outgoing, self) d.addErrback(lambda result, self = self: self.makeReply(91)) - self.factory._new_conn_callback(server, port, self._pt_method_name, _chain_set_up) + self.factory._new_conn_callback((server, port), self._pt_method_name, _chain_set_up) assert self.buf == "", "hmm, still stuff in buffer... %s" % repr(self.buf) else: super(SOCKSv4InterceptorProtocol, self)._dataReceived2(server, user, version, code, port)

1 0

[fog/master] Proxy shims now detect what type of protocol each PT needs, SOCKS4 or SOCKS5.
by infinity0＠torproject.org 01 Aug '14

01 Aug '14

commit e8a2eb04ba430562b81db7ba4d36c60915de189c Author: Quinn Jarrell <qjarrell(a)gosynapsify.com> Date: Mon Jun 30 18:31:46 2014 -0400 Proxy shims now detect what type of protocol each PT needs, SOCKS4 or SOCKS5. --- obfs-flash-client | 50 +++++++++++++++++++++++++++++++++----------------- torrc | 2 +- 2 files changed, 34 insertions(+), 18 deletions(-) diff --git a/obfs-flash-client b/obfs-flash-client index 6bfa2a0..1c2267d 100755 --- a/obfs-flash-client +++ b/obfs-flash-client @@ -23,7 +23,7 @@ from twisted.internet.endpoints import TCP4ClientEndpoint from twisted.protocols.basic import LineReceiver from twisted.protocols.portforward import ProxyServer as _ProxyServer from twisted.python import log -from txsocksx.client import SOCKS4ClientEndpoint +from txsocksx.client import SOCKS4ClientEndpoint, SOCKS5ClientEndpoint from fog.socks import SOCKSv4InterceptorFactory import shlex @@ -165,18 +165,22 @@ class ProxyServer(_ProxyServer): def connectProxyClient(self, client): raise NotImplementedError() -class OneUseSOCKS4Wrapper(ProxyServer): +class OneUseSOCKSWrapper(ProxyServer): def connectProxyClient(self, client): + local_host, local_port = self.factory.method_spec.addrport TCPPoint = TCP4ClientEndpoint( self.reactor, - self.factory.local_host, - self.factory.local_port) - SOCKSPoint = SOCKS4ClientEndpoint( - self.factory.remote_host, - self.factory.remote_port, - TCPPoint) - # Store port for debugging messages before stopListening is called. listen_port will not have a port after stopListening is called. + local_host, + local_port) + # Next PT may need either SOCKS4 or SOCKS5 so check its protocol and get the required class + socks_endpoint_class = self.getSocksEndpointClass() + SOCKSPoint = socks_endpoint_class( + self.factory.remote_host, + self.factory.remote_port, + TCPPoint) + # Store port for debugging messages before stopListening is called. + # listen_port will not have a port after stopListening is called. stored_port = self.factory.listen_port.getHost().port d_port_closed = self.factory.listen_port.stopListening() d_port_closed.addCallback( @@ -189,23 +193,35 @@ class OneUseSOCKS4Wrapper(ProxyServer): def _gotError(error): log.err(error, "error connecting to SOCKS server") -class OneUseSOCKS4Factory(Factory): - protocol = OneUseSOCKS4Wrapper + def getSocksEndpointClass(self): + """ + Checks self.factory.method_spec.protocol and returns the appropriate socks endpoint class. + """ + socks_endpoint_class = None + if self.factory.method_spec.protocol == 'socks4': + socks_endpoint_class = SOCKS4ClientEndpoint + elif self.factory.method_spec.protocol == 'socks5': + socks_endpoint_class = SOCKS5ClientEndpoint + else: + raise ValueError("Pluggable transport requires unknown protocol %s. Supported protocols are %s" % + (self.factory.method_spec.protocol, ('socks4', 'socks5'))) + return socks_endpoint_class - def __init__(self, local_host, local_port, remote_host, remote_port): +class OneUseSOCKSFactory(Factory): + protocol = OneUseSOCKSWrapper + def __init__(self, method_spec, remote_host, remote_port): self._connected_once = False - self.local_host = local_host - self.local_port = local_port + self.method_spec = method_spec self.remote_host = remote_host self.remote_port = remote_port self.d_connected = Deferred() self.listen_port = None def __str__(self): - return "OneUseSOCKS4Factory connecting %s:%s to %s:%s" % (self.local_host, self.local_port, self.remote_host, self.remote_port) + return "OneUseSOCKSFactory connecting %s to %s:%s" % (self.method_spec, self.remote_host, self.remote_port) def __repr__(self): - return "OneUseSOCKS4Factory(%s, %s, %s, %s)" % (self.local_host, self.local_port, self.remote_host, self.remote_port) + return "OneUseSOCKSFactory(%s, %s, %s)" % (self.method_spec, self.remote_host, self.remote_port) def setListenPort(self, listen_port): """ @@ -313,7 +329,7 @@ def pt_setup_socks_shim(pt_name, pt_chain, success_list, dest_address, dest_port :returns twisted.internet.interfaces.IListeningPort: An IListeningPort used for shutting down a factory after a connection is made. """ methodspec = [r[1] for r in success_list if r[1].name == pt_name][0] # Returns the resulting methodspec. - factory = OneUseSOCKS4Factory(methodspec.addrport[0], methodspec.addrport[1], dest_address, dest_port) + factory = OneUseSOCKSFactory(methodspec, dest_address, dest_port) # TODO switch to using endpoints instead of listenTCP proxy_server = reactor.listenTCP(interface='127.0.0.1', port=0, factory=factory) factory.setListenPort(proxy_server) diff --git a/torrc b/torrc index 80da3f3..42560c1 100644 --- a/torrc +++ b/torrc @@ -1,5 +1,5 @@ UseBridges 1 -Bridge obfs3_flashproxy 127.0.0.1:0 +Bridge obfs3_flashproxy 127.0.0.1:9000 LearnCircuitBuildTimeout 0 CircuitBuildTimeout 300 ClientTransportPlugin obfs3_flashproxy exec ./obfs-flash-client --fp-arg=--register

1 0

[fog/master] Added a modified socks protocol from obfsproxy. Stripped out references to pluggable transports..
by infinity0＠torproject.org 01 Aug '14

01 Aug '14

commit 49e865f46dec9534313f67dc57b3f0849a90f77d Author: Quinn Jarrell <qjarrell(a)gosynapsify.com> Date: Wed Jun 11 17:06:30 2014 -0400 Added a modified socks protocol from obfsproxy. Stripped out references to pluggable transports.. --- fog/socks.py | 59 +++++++++++++++ obfs-flash-client | 205 +++++++++++++++++++++++++++++++++++------------------ torrc | 6 +- 3 files changed, 198 insertions(+), 72 deletions(-) diff --git a/fog/__init__.py b/fog/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/fog/socks.py b/fog/socks.py new file mode 100644 index 0000000..e3b483b --- /dev/null +++ b/fog/socks.py @@ -0,0 +1,59 @@ +from twisted.protocols import socks +from twisted.internet.protocol import Factory +import logging + +logger = logging.getLogger('obfs-flash-logger') + +class SOCKSv4InterceptorProtocol(socks.SOCKSv4): + """ + A modified SOCKS protocol which extracts the requested ip and port + and redirects connections to the first pluggable transport in the chain. + """ + + def __init__(self, factory, pt_method_name): + """ + :param twisted.internet.protocol.factory factory: The factory that launched this protocol + :param pt_method_name: The name of the chain to be launched when a new connection is received + """ + self.factory = factory + self._pt_method_name = pt_method_name + socks.SOCKSv4.__init__(self) + + def _dataReceived2(self, server, user, version, code, port): + """ + Extracts the requested ip and port and redirects to a different address + """ + if code == 1: # CONNECT + assert version == 4, "Bad version code: %s" % version + if not self.authorize(code, server, port, user): + self.makeReply(91) + return + def _chain_set_up(remote_address, remote_port): + logger.debug("chain finished, connecting %s:%s" % (remote_address, remote_port)) + # Connect to our remote address instead of the requested one + d = self.connectClass(remote_address, remote_port, socks.SOCKSv4Outgoing, self) + d.addErrback(lambda result, self = self: self.makeReply(91)) + self.factory._new_conn_callback(server, port, self._pt_method_name, _chain_set_up) + assert self.buf == "", "hmm, still stuff in buffer... %s" % repr(self.buf) + else: + super(SOCKSv4InterceptorProtocol, self)._dataReceived2(server, user, version, code, port) + +class SOCKSv4InterceptorFactory(Factory): + + def __init__(self, pt_method_name, new_conn_callback): + """ + :param str pt_method_name: The name of the pt_method that this factory is launching. + :param function new_conn_callback: The function to be called when a connection is made. + def new_conn_callback + :param str server: The ip address requested by the SOCKS client. + :param int port: The port requested by the SOCKS client. + :param str pt_method_name: The name of the pt_method this factory is a part of. + :param function chain_set_up: The function to be called when the chain has finished setting up. + :param str remote_address: The address to relay the SOCKS request to. + :param int remote_port: The port to to send the SOCKS request to. + """ + self._pt_method_name = pt_method_name + self._new_conn_callback = new_conn_callback + + def buildProtocol(self, addr): + return SOCKSv4InterceptorProtocol(self, self._pt_method_name) \ No newline at end of file diff --git a/obfs-flash-client b/obfs-flash-client index 75622e6..486e714 100755 --- a/obfs-flash-client +++ b/obfs-flash-client @@ -24,6 +24,7 @@ from twisted.protocols.basic import LineReceiver from twisted.protocols.portforward import ProxyServer as _ProxyServer from twisted.python import log from txsocksx.client import SOCKS4ClientEndpoint +from fog.socks import SOCKSv4InterceptorFactory import shlex @@ -156,7 +157,7 @@ class ProxyServer(_ProxyServer): def connectProxyClient(self, client): raise NotImplementedError() -class SOCKS4Wrapper(ProxyServer): +class OneUseSOCKS4Wrapper(ProxyServer): def connectProxyClient(self, client): TCPPoint = TCP4ClientEndpoint( @@ -167,19 +168,60 @@ class SOCKS4Wrapper(ProxyServer): self.factory.remote_host, self.factory.remote_port, TCPPoint) + # Store port for debugging messages before stopListening is called. listen_port will not have a port after stopListening is called. + stored_port = self.factory.listen_port.getHost().port + d_port_closed = self.factory.listen_port.stopListening() + d_port_closed.addCallback( + lambda x: logging.debug("Closed factory listener %s on port %s" % (self.factory, stored_port))) + d_port_closed.addErrback( + lambda x: logging.warn("Failed to close factory listener %s listening on port %s" % (self.factory, stored_port))) d = SOCKSPoint.connect(client) + d.chainDeferred(self.factory.d_connected) @d.addErrback def _gotError(error): log.err(error, "error connecting to SOCKS server") -class SOCKS4WrapperFactory(Factory): - protocol = SOCKS4Wrapper +class OneUseSOCKS4Factory(Factory): + protocol = OneUseSOCKS4Wrapper def __init__(self, local_host, local_port, remote_host, remote_port): + self._connected_once = False self.local_host = local_host self.local_port = local_port self.remote_host = remote_host self.remote_port = remote_port + self.d_connected = Deferred() + self.listen_port = None + + def __str__(self): + return "OneUseSOCKS4Factory connecting %s:%s to %s:%s" % (self.local_host, self.local_port, self.remote_host, self.remote_port) + + def __repr__(self): + return "OneUseSOCKS4Factory(%s, %s, %s, %s)" % (self.local_host, self.local_port, self.remote_host, self.remote_port) + + def setListenPort(self, listen_port): + """ + Sets the listen_port object. + :param function listen_port: The function returned from a ListenTCP call. Used to shutdown the port when a connection is made. + """ + self.listen_port = listen_port + + def whenConnected(self): + """ + Returns a new Deferred that triggers when a connection is successfully made. + """ + return branch(self.d_connected) + + def buildProtocol(self, addr): + """ + Only allows one protocol to be created. After that it always returns None + :param twisted.internet.interfaces.IAddress addr: an object implementing L{twisted.internet.interfaces.IAddress} + """ + if self._connected_once: + return None + else: + self._connected_once = True + return Factory.buildProtocol(self, addr) if sys.platform == "win32": # TODO(infinity0): push this upstream to Twisted @@ -246,8 +288,9 @@ def pt_require_child(client, childmethod, pt_method_name, cmethods): raise ValueError() return cmethods[childmethod] -def pt_setup_socks_proxy(pt_name, pt_chain, success_list, dest_address, dest_port, reactor, listen_port=0): - """Launches a socks proxy server to link two PTs together. +def pt_setup_socks_shim(pt_name, pt_chain, success_list, dest_address, dest_port, reactor, proxy_deferreds): + """ + Launches a socks proxy server to link two PTs together. :param str pt_name: The name of the pt to send traffic to. :param list pt_chain: The list of PTs in this chain. :param list success_list: A list of tuples containing a launch status boolean, MethodSpec pairs. @@ -256,27 +299,97 @@ def pt_setup_socks_proxy(pt_name, pt_chain, success_list, dest_address, dest_por :param str dest_address: The address for the next PT to send its results to. :param int dest_port: The port for the next PT to send to. :param twisted.internet.interfaces.IReactor reactor: Reactor to attack the TCP server to. - :param int listen_port. The port to for the TCP server to listen on. Default is chosen by the OS.""" + :param list proxy_deferreds: This list has each factorys' deferred appended to it. + + :returns twisted.internet.interfaces.IListeningPort: An IListeningPort used for shutting down a factory after a connection is made. + """ methodspec = [r[1] for r in success_list if r[1].name == pt_name][0] # Returns the resulting methodspec. - proxy_server = reactor.listenTCP(interface='127.0.0.1', port=listen_port, factory= - SOCKS4WrapperFactory(methodspec.addrport[0], methodspec.addrport[1], dest_address, dest_port)) - return proxy_server.getHost().port + factory = OneUseSOCKS4Factory(methodspec.addrport[0], methodspec.addrport[1], dest_address, dest_port) + # TODO switch to using endpoints instead of listenTCP + proxy_server = reactor.listenTCP(interface='127.0.0.1', port=0, factory=factory) + factory.setListenPort(proxy_server) + proxy_deferreds.append(factory.whenConnected()) + logging.debug("launched %s on port %s with dest %s:%s" % (pt_name, proxy_server.getHost().port, dest_address, dest_port)) + return proxy_server + +def pt_launch_chain(dest_address, dest_port, pt_chain, _chain_set_up, reactor, success_list): + """ + Launches a chain of pluggable transports by connecting each pt with SOCKS proxies. + :param str dest_address: The bridge address to connect to. + :param int dest_port: The bridge port to connect to. + :param list pt_chain: The list of pt names to launch. + :param function _chain_set_up: The function to call when the shims have been set up. + :param twisted.internet.interfaces.IReactor reactor: Reactor to install this PT to. + :param list success_list: A list of tuples containing a launch status boolean, MethodSpec pairs. + Ex: [(True, MethodSpec(name='dummy', protocol='socks4', addrport=('127.0.0.1', 58982), args=[], opts=[])), + (True, MethodSpec(name='b64', protocol='socks4', addrport=('127.0.0.1', 58981), args=[], opts=[]))] + """ + proxy_deferreds = [] + last_pt_name = pt_chain[-1] + logging.debug("launching chain %s" % pt_chain) + # Initialize prev_server to the port picked by the last proxy server as that's the only one we know yet. + last_server = pt_setup_socks_shim(last_pt_name, pt_chain, success_list, dest_address, dest_port, + reactor, proxy_deferreds) + prev_server = last_server + for pt_name in reversed(pt_chain[:-1]): + # Loops through the pts linking them together through SOCKS proxies, skipping the last pt. + prev_server = pt_setup_socks_shim(pt_name, pt_chain, success_list, '127.0.0.1', prev_server.getHost().port, + reactor, proxy_deferreds) + def check_chain_all_connected(protocol_list): + """ + Checks all the shims launched to see if they successfully connected. + :param list protocol_list: A list of tuples containing status boolean, twisted.protocols.portforward.ProxyClient pairs. + Ex: [(True, <twisted.protocols.portforward.ProxyClient instance at 0x10b825518>), + (True, <twisted.protocols.portforward.ProxyClient instance at 0x10b829518>)] + """ + if all([result[0] for result in protocol_list]): + logging.debug("All PT shims connected correctly") + else: + # At this point the SOCKS protocol is in communication mode so no need to call makeReply(91) + # This assumes that the child pluggable transport will shut down the connection cleanly. + failed_protocols = [x[1] for x in protocol_list if x[0] == False] + logging.error("Shims %s failed to connect." % failed_protocols) + raise ValueError() + + finished = DeferredList(proxy_deferreds) + finished.addCallback(check_chain_all_connected) + _chain_set_up(prev_server.getHost().host, prev_server.getHost().port) -def pt_launch_chain(reactor, client, callback_port, configuration, pt_method_name): +def pt_launch_interceptor(reactor, client, configuration, pt_method_name, success_list): """ - Launches a chain of pluggable transports. + Launches a SOCKS interceptor. :param twisted.internet.interfaces.IReactor reactor: Reactor to install this PT to. :param pyptlib.client.ClientTransportPlugin client: PT client API. - :param int callback_port: Local listen port for the first PT to connect to. :param Config configuration: The configuration structure for this pair. :param str pt_method_name: The name of the pt chain to launch. Ex: "obfs3_flashproxy" + :param list success_list: A list of tuples containing a launch status boolean, MethodSpec pairs. + Ex: [(True, MethodSpec(name='dummy', protocol='socks4', addrport=('127.0.0.1', 58982), args=[], opts=[])), + (True, MethodSpec(name='b64', protocol='socks4', addrport=('127.0.0.1', 58981), args=[], opts=[]))] """ - - # Temporary hardcoded ip/port - dest_address = '127.0.0.1' - dest_port = 2400 - + logging.debug("launching interceptor") + pt_chain = configuration.alias_map[pt_method_name] + success = all(r[0] for r in success_list if r[1].name in pt_chain) + # failure was already reported by pt_require_child, just return + if not success: return + socks_interceptor = SOCKSv4InterceptorFactory(pt_method_name, + lambda dest_address, dest_port, pt_method_name, chain_finished: + pt_launch_chain(dest_address, dest_port, pt_chain, chain_finished, reactor, success_list)) + # TODO switch to using endpoints instead of listenTCP + interceptor = reactor.listenTCP(interface='127.0.0.1', port=0, factory=socks_interceptor) + interceptor_port = interceptor.getHost().port + client.reportMethodSuccess(pt_method_name, "socks4", ("127.0.0.1", interceptor_port)) + client.reportMethodsEnd() + +def pt_setup_transports(reactor, client, configuration, pt_method_name): + """ + Launches the PT processes. + :param twisted.internet.interfaces.IReactor reactor: Reactor to install this PT to. + :param pyptlib.client.ClientTransportPlugin client: PT client API. + :param Config configuration: The configuration structure for this pair. + :param str pt_method_name: The name of the pt chain to launch. Ex: "obfs3_flashproxy" + """ + logging.debug("Setting up transports %s" % pt_method_name) if pt_method_name in configuration.alias_map: pt_chain = configuration.alias_map[pt_method_name] else: @@ -296,40 +409,7 @@ def pt_launch_chain(reactor, client, callback_port, configuration, pt_method_nam _, _, defer = pt_launch_child(reactor, client, [pt], pt_method_name, pt_cmdline) defer_list.extend(defer) whenAllDone = DeferredList(defer_list, consumeErrors=False) - - def allDone(success_list): - """ - Connects the pluggable transports together through SOCKS proxies. - :param list success_list: A list of tuples containing a launch status boolean, MethodSpec pairs. - Ex: [(True, MethodSpec(name='dummy', protocol='socks4', addrport=('127.0.0.1', 58982), args=[], opts=[])), - (True, MethodSpec(name='b64', protocol='socks4', addrport=('127.0.0.1', 58981), args=[], opts=[]))] - """ - - success = all(r[0] for r in success_list if r[1].name in pt_chain) - # failure was already reported by pt_require_child, just return - if not success: return - - #This TCP server forwards the data to the last pt, which then sends the data to the actual bridge address - last_pt_name = pt_chain[-1] - # Initialize prev_port to the first port picked by the last proxy as that's the only one we know yet. - listen_port = 0 if len(pt_chain) > 2 else callback_port - prev_port = pt_setup_socks_proxy(last_pt_name, pt_chain, success_list, dest_address, dest_port, reactor, listen_port) - - if len(pt_chain) > 2: - for pt_name in reversed(pt_chain[2:-1]): - #Loops through the middle pts linking them together through SOCKS proxies, skipping the first and last pts. - prev_port = pt_setup_socks_proxy(pt_name, pt_chain, success_list, '127.0.0.1', prev_port, reactor) - - # Links the second server to listen on the given callback_port - pt_name = pt_chain[1] - prev_port = pt_setup_socks_proxy(pt_name, pt_chain, success_list, '127.0.0.1', prev_port, reactor, listen_port=callback_port) - - # now report success of the overall composed PT - first_pt_name = pt_chain[0] - first_methodspec = [r[1] for r in success_list if r[1].name == first_pt_name and r[1].name in pt_chain][0] - client.reportMethodSuccess(pt_method_name, first_methodspec.protocol, first_methodspec.addrport) - client.reportMethodsEnd() - whenAllDone.addCallback(allDone) + whenAllDone.addCallback(lambda success_list: pt_launch_interceptor(reactor, client, configuration, pt_method_name, success_list)) class Config(): # Transport map links a pluggable transport name to the a commandline to launch it. @@ -399,17 +479,13 @@ class Config(): raise KeyError('Transport map is missing pluggable transport %s needed for chain %s. Check your configuration file for a ClientTransportPlugin line can launch %s' % (pt_name, alias_name, pt_name)) alias_map[alias_name] = alias_path -def obfs3_flashproxy(reactor, client, callback_port, fp_remote, fp_args=[], fp_local=0): +def obfs3_flashproxy(fp_remote, fp_args=[], fp_local=0): """ Set up the obfs3_flashproxy combined PT. - - :param twisted.internet.interfaces.IReactor reactor: Reactor to install this PT to. - :param pyptlib.client.ClientTransportPlugin client: PT client API. - :param int callback_port: Local listen port for obfsproxy to connect to. :param str fp_remote: Listen address for remote flashproxy connections. + :param str fp_args: The arguments to pass to the flashproxy connections. :param int fp_local: Local listen port for local flashproxy connections. """ - ob_client = os.getenv("OBFSPROXY", "obfsproxy") fp_client = os.getenv("FLASHPROXY_CLIENT", "flashproxy-client") @@ -420,14 +496,10 @@ def obfs3_flashproxy(reactor, client, callback_port, fp_remote, fp_args=[], fp_l alias_map = {'obfs3_flashproxy': ['obfs3', 'flashproxy']} configuration = Config(transport_map, alias_map) - pt_launch_chain(reactor, client, callback_port, configuration, "obfs3_flashproxy") # Launch + return configuration def main(*args): parser = argparse.ArgumentParser() - parser.add_argument("callback_port", help="local listen port for obfsproxy to " - "connect to. This must match the appropriate bridge line in your " # TODO print bridge line - "torrc.", - metavar='PORT', type=int) parser.add_argument("fp_remote", help="remote connections listen address " "for flashproxy, default %(default)s", metavar='REMOTE:PORT', nargs='?', default=":9000") @@ -451,7 +523,7 @@ def main(*args): pt_method_names = configuration.alias_map.keys() else: pt_method_names = ["obfs3_flashproxy"] - + configuration = obfs3_flashproxy(opts.fp_remote, opts.fp_arg or []) client = ClientTransportPlugin() client.init(pt_method_names) # Initialize our possible methods to all the chains listed by the fog file and stored in alias map. if not client.getTransports(): @@ -461,12 +533,7 @@ def main(*args): from twisted.internet import reactor auto_killall(1, cleanup=reactor.stop) #TODO Change from launching a single pair to launching multiple chains. - if configuration: - pt_launch_chain(reactor, client, opts.callback_port, configuration, pt_method_names[0]) - else: - logging.warn("No configuration file specified. Defaulting to launching obfs3|flashproxy pair.") - obfs3_flashproxy(reactor, client, opts.callback_port, opts.fp_remote, opts.fp_arg or []) - + pt_setup_transports(reactor, client, configuration, pt_method_names[0]) reactor.run(installSignalHandlers=0) return 0 diff --git a/torrc b/torrc index 7dc78f4..80da3f3 100644 --- a/torrc +++ b/torrc @@ -1,7 +1,7 @@ UseBridges 1 -Bridge obfs3_flashproxy 127.0.0.1:2334 +Bridge obfs3_flashproxy 127.0.0.1:0 LearnCircuitBuildTimeout 0 CircuitBuildTimeout 300 -ClientTransportPlugin obfs3_flashproxy exec ./obfs-flash-client 2334 --fp-arg=--register +ClientTransportPlugin obfs3_flashproxy exec ./obfs-flash-client --fp-arg=--register # use a different facilitator -#ClientTransportPlugin obfs3_flashproxy exec ./obfs-flash-client --fp-arg=-f --fp-arg=http://siteb.fp-facilitator.org/fac/ --fp-arg=--register-methods=http 2334 +#ClientTransportPlugin obfs3_flashproxy exec ./obfs-flash-client --fp-arg=-f --fp-arg=http://siteb.fp-facilitator.org/fac/ --fp-arg=--register-methods=http

1 0

[fog/master] Switched logging name from logging to logger to keep it consistent with the modsocks.py file.
by infinity0＠torproject.org 01 Aug '14

01 Aug '14

commit 8ec03d4a8386bdc57a2fd1be3840bd195668024c Author: Quinn Jarrell <qjarrell(a)gosynapsify.com> Date: Thu Jun 12 15:57:39 2014 -0400 Switched logging name from logging to logger to keep it consistent with the modsocks.py file. --- obfs-flash-client | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/obfs-flash-client b/obfs-flash-client index 486e714..6bfa2a0 100755 --- a/obfs-flash-client +++ b/obfs-flash-client @@ -30,6 +30,14 @@ import shlex import logging +logger = None +def pt_setup_logger(): + global logger + logger = logging.getLogger('obfs-flash-logger') + logger.setLevel(logging.WARNING) + ch = logging.StreamHandler() + ch.setLevel(logging.DEBUG) + logger.addHandler(ch) def pt_child_env(managed_ver, env=os.environ): """ @@ -172,9 +180,9 @@ class OneUseSOCKS4Wrapper(ProxyServer): stored_port = self.factory.listen_port.getHost().port d_port_closed = self.factory.listen_port.stopListening() d_port_closed.addCallback( - lambda x: logging.debug("Closed factory listener %s on port %s" % (self.factory, stored_port))) + lambda x: logger.debug("Closed factory listener %s on port %s" % (self.factory, stored_port))) d_port_closed.addErrback( - lambda x: logging.warn("Failed to close factory listener %s listening on port %s" % (self.factory, stored_port))) + lambda x: logger.warn("Failed to close factory listener %s listening on port %s" % (self.factory, stored_port))) d = SOCKSPoint.connect(client) d.chainDeferred(self.factory.d_connected) @d.addErrback @@ -310,7 +318,7 @@ def pt_setup_socks_shim(pt_name, pt_chain, success_list, dest_address, dest_port proxy_server = reactor.listenTCP(interface='127.0.0.1', port=0, factory=factory) factory.setListenPort(proxy_server) proxy_deferreds.append(factory.whenConnected()) - logging.debug("launched %s on port %s with dest %s:%s" % (pt_name, proxy_server.getHost().port, dest_address, dest_port)) + logger.debug("launched %s on port %s with dest %s:%s" % (pt_name, proxy_server.getHost().port, dest_address, dest_port)) return proxy_server def pt_launch_chain(dest_address, dest_port, pt_chain, _chain_set_up, reactor, success_list): @@ -327,7 +335,7 @@ def pt_launch_chain(dest_address, dest_port, pt_chain, _chain_set_up, reactor, s """ proxy_deferreds = [] last_pt_name = pt_chain[-1] - logging.debug("launching chain %s" % pt_chain) + logger.debug("launching chain %s" % pt_chain) # Initialize prev_server to the port picked by the last proxy server as that's the only one we know yet. last_server = pt_setup_socks_shim(last_pt_name, pt_chain, success_list, dest_address, dest_port, reactor, proxy_deferreds) @@ -344,12 +352,12 @@ def pt_launch_chain(dest_address, dest_port, pt_chain, _chain_set_up, reactor, s (True, <twisted.protocols.portforward.ProxyClient instance at 0x10b829518>)] """ if all([result[0] for result in protocol_list]): - logging.debug("All PT shims connected correctly") + logger.debug("All PT shims connected correctly") else: # At this point the SOCKS protocol is in communication mode so no need to call makeReply(91) # This assumes that the child pluggable transport will shut down the connection cleanly. failed_protocols = [x[1] for x in protocol_list if x[0] == False] - logging.error("Shims %s failed to connect." % failed_protocols) + logger.error("Shims %s failed to connect." % failed_protocols) raise ValueError() finished = DeferredList(proxy_deferreds) @@ -367,7 +375,7 @@ def pt_launch_interceptor(reactor, client, configuration, pt_method_name, succes Ex: [(True, MethodSpec(name='dummy', protocol='socks4', addrport=('127.0.0.1', 58982), args=[], opts=[])), (True, MethodSpec(name='b64', protocol='socks4', addrport=('127.0.0.1', 58981), args=[], opts=[]))] """ - logging.debug("launching interceptor") + logger.debug("launching interceptor") pt_chain = configuration.alias_map[pt_method_name] success = all(r[0] for r in success_list if r[1].name in pt_chain) # failure was already reported by pt_require_child, just return @@ -389,11 +397,11 @@ def pt_setup_transports(reactor, client, configuration, pt_method_name): :param Config configuration: The configuration structure for this pair. :param str pt_method_name: The name of the pt chain to launch. Ex: "obfs3_flashproxy" """ - logging.debug("Setting up transports %s" % pt_method_name) + logger.debug("Setting up transports %s" % pt_method_name) if pt_method_name in configuration.alias_map: pt_chain = configuration.alias_map[pt_method_name] else: - logging.error('Pluggable Transport Combination %s not found in configuration alias map.' % pt_method_name) + logger.error('Pluggable Transport Combination %s not found in configuration alias map.' % pt_method_name) raise KeyError() defer_list = [] @@ -411,6 +419,7 @@ def pt_setup_transports(reactor, client, configuration, pt_method_name): whenAllDone = DeferredList(defer_list, consumeErrors=False) whenAllDone.addCallback(lambda success_list: pt_launch_interceptor(reactor, client, configuration, pt_method_name, success_list)) + class Config(): # Transport map links a pluggable transport name to the a commandline to launch it. # Ex: {'b64' : 'exec obfsproxy managed'} @@ -457,7 +466,7 @@ class Config(): elif config_line_type == 'Alias': cls.parse_alias_line(alias_map, transport_map, delimited_tokens, line_counter) else: - logging.warn("Configuration file has unknown line %s: '%s'" % (line_counter, line)) + logger.warn("Configuration file has unknown line %s: '%s'" % (line_counter, line)) return cls(transport_map, alias_map) @classmethod @@ -508,6 +517,7 @@ def main(*args): parser.add_argument("-f", help="fog configuration file path", metavar='FOGFILE', type=argparse.FileType('r')) + pt_setup_logger() # TODO(infinity0): add an "external" mode, which would require us to run # obfsproxy in external mode too. @@ -527,7 +537,7 @@ def main(*args): client = ClientTransportPlugin() client.init(pt_method_names) # Initialize our possible methods to all the chains listed by the fog file and stored in alias map. if not client.getTransports(): - logging.error("no transports to serve. pt_method_names may be invalid.") + logger.error("no transports to serve. pt_method_names may be invalid.") return 1 from twisted.internet import reactor

1 0

[fog/master] Switched the obfs3_flashproxy into a config file. This file is now read as the default configuration if no configuration file is specified on the command line
by infinity0＠torproject.org 01 Aug '14

01 Aug '14

commit 20602bc6985459a67bc1008d51a0fb97282b0e6e Author: Quinn Jarrell <qjarrell(a)gosynapsify.com> Date: Wed Jul 2 13:52:54 2014 -0400 Switched the obfs3_flashproxy into a config file. This file is now read as the default configuration if no configuration file is specified on the command line --- example-fog-config | 13 ------------- fogrc | 17 +++++++++++++++++ obfs-flash-client | 42 ++++++------------------------------------ torrc | 4 +--- 4 files changed, 24 insertions(+), 52 deletions(-) diff --git a/example-fog-config b/example-fog-config deleted file mode 100644 index 746e5ad..0000000 --- a/example-fog-config +++ /dev/null @@ -1,13 +0,0 @@ -#Based off of ticket #9744 -#Client transports are setup like so: -#ClientTransportPlugin name commandline -#For instance to launch obfs3, the client transport line should be this -#ClientTransportPlugin obfs3 obfsproxy managed -# -#For chaining transports together, an alias line is used. -#Alias chainname firsttransportname|secondtransportname -#tor expects alias to use underscores instead of pipes. So an alias links the tor version of a plugin chain to the actual plugins. See ticket #9580 - -ClientTransportPlugin dummy obfsproxy managed -ClientTransportPlugin b64 obfsproxy managed -Alias dummy_b64 dummy|b64 diff --git a/fogrc b/fogrc new file mode 100644 index 0000000..ee28514 --- /dev/null +++ b/fogrc @@ -0,0 +1,17 @@ +#Based off of ticket #9744 +#Client transports are setup like so: +#ClientTransportPlugin name commandline +#For instance to launch obfs3, the client transport line should be this +#ClientTransportPlugin obfs3 obfsproxy managed +# +#For chaining transports together, an alias line is used. +#Alias chainname firsttransportname|secondtransportname +#tor expects alias to use underscores instead of pipes. So an alias links the tor version of a plugin chain to the actual plugins. See ticket #9580 + +ClientTransportPlugin obfs3 obfsproxy managed +ClientTransportPlugin flashproxy flashproxy-client --transport obfs3|websocket --register 127.0.0.1:0 :9000 +# If port 9000 cannot be portforwarded change it to a port that can be ported like so: +#ClientTransportPlugin flashproxy flashproxy-client --transport obfs3|websocket --register 127.0.0.1:0 :3923 +# use a different facilitator +#ClientTransportPlugin flashproxy flashproxy-client --transport obfs3|websocket -f http://siteb.fp-facilitator.org/fac/ --register —-register-methods=http 127.0.0.1:0 :3923 +Alias obfs3_flashproxy obfs3|flashproxy diff --git a/obfs-flash-client b/obfs-flash-client index 1c2267d..18adff4 100755 --- a/obfs-flash-client +++ b/obfs-flash-client @@ -30,6 +30,8 @@ import shlex import logging +DEFAULT_CONFIG_FILE_NAME = 'fogrc' + logger = None def pt_setup_logger(): global logger @@ -504,52 +506,20 @@ class Config(): raise KeyError('Transport map is missing pluggable transport %s needed for chain %s. Check your configuration file for a ClientTransportPlugin line can launch %s' % (pt_name, alias_name, pt_name)) alias_map[alias_name] = alias_path -def obfs3_flashproxy(fp_remote, fp_args=[], fp_local=0): - """ - Set up the obfs3_flashproxy combined PT. - :param str fp_remote: Listen address for remote flashproxy connections. - :param str fp_args: The arguments to pass to the flashproxy connections. - :param int fp_local: Local listen port for local flashproxy connections. - """ - ob_client = os.getenv("OBFSPROXY", "obfsproxy") - fp_client = os.getenv("FLASHPROXY_CLIENT", "flashproxy-client") - - fp_cmdline = [fp_client, "--transport", 'obfs3|websocket'] + fp_args + ['127.0.0.1:%s' % fp_local, fp_remote] - obfs_cmd_line = [ob_client, "managed"] - - transport_map = {'obfs3': obfs_cmd_line, 'flashproxy': fp_cmdline} - alias_map = {'obfs3_flashproxy': ['obfs3', 'flashproxy']} - - configuration = Config(transport_map, alias_map) - return configuration - def main(*args): parser = argparse.ArgumentParser() - parser.add_argument("fp_remote", help="remote connections listen address " - "for flashproxy, default %(default)s", - metavar='REMOTE:PORT', nargs='?', default=":9000") - parser.add_argument("--fp-arg", help="arguments for flashproxy-client", - metavar='ARG', action='append') parser.add_argument("-f", help="fog configuration file path", - metavar='FOGFILE', type=argparse.FileType('r')) + metavar='FOGFILE', type=argparse.FileType('r'), default=DEFAULT_CONFIG_FILE_NAME) pt_setup_logger() # TODO(infinity0): add an "external" mode, which would require us to run # obfsproxy in external mode too. opts = parser.parse_args(args) - - # ensure string address is valid - _, _, = parse_addr_spec(opts.fp_remote, defhost="0.0.0.0") configuration = None - - if opts.f: - file_contents = opts.f.read() - configuration = Config.parse(file_contents) - pt_method_names = configuration.alias_map.keys() - else: - pt_method_names = ["obfs3_flashproxy"] - configuration = obfs3_flashproxy(opts.fp_remote, opts.fp_arg or []) + file_contents = opts.f.read() + configuration = Config.parse(file_contents) + pt_method_names = configuration.alias_map.keys() client = ClientTransportPlugin() client.init(pt_method_names) # Initialize our possible methods to all the chains listed by the fog file and stored in alias map. if not client.getTransports(): diff --git a/torrc b/torrc index 42560c1..32c558e 100644 --- a/torrc +++ b/torrc @@ -2,6 +2,4 @@ UseBridges 1 Bridge obfs3_flashproxy 127.0.0.1:9000 LearnCircuitBuildTimeout 0 CircuitBuildTimeout 300 -ClientTransportPlugin obfs3_flashproxy exec ./obfs-flash-client --fp-arg=--register -# use a different facilitator -#ClientTransportPlugin obfs3_flashproxy exec ./obfs-flash-client --fp-arg=-f --fp-arg=http://siteb.fp-facilitator.org/fac/ --fp-arg=--register-methods=http +ClientTransportPlugin obfs3_flashproxy exec ./obfs-flash-client

1 0

[support-tools/master] Add response time data for July 2014
by lunar＠torproject.org 01 Aug '14

01 Aug '14

commit 5a638b89e914bd96759998532a300c6e36a90cf5 Author: Lunar <lunar(a)torproject.org> Date: Fri Aug 1 13:15:07 2014 +0200 Add response time data for July 2014 --- response-time/data/2014Q3.csv | 177 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 177 insertions(+) diff --git a/response-time/data/2014Q3.csv b/response-time/data/2014Q3.csv new file mode 100644 index 0000000..1dab19e --- /dev/null +++ b/response-time/data/2014Q3.csv @@ -0,0 +1,177 @@ +month,fromhours,tohours,requests +2014-07,0,1,383 +2014-07,1,2,164 +2014-07,2,3,115 +2014-07,3,4,103 +2014-07,4,5,74 +2014-07,5,6,88 +2014-07,6,7,68 +2014-07,7,8,68 +2014-07,8,9,59 +2014-07,9,10,46 +2014-07,10,11,48 +2014-07,11,12,34 +2014-07,12,13,45 +2014-07,13,14,48 +2014-07,14,15,47 +2014-07,15,16,44 +2014-07,16,17,48 +2014-07,17,18,41 +2014-07,18,19,31 +2014-07,19,20,32 +2014-07,20,21,29 +2014-07,21,22,31 +2014-07,22,23,37 +2014-07,23,24,26 +2014-07,24,25,19 +2014-07,25,26,22 +2014-07,26,27,20 +2014-07,27,28,26 +2014-07,28,29,19 +2014-07,29,30,15 +2014-07,30,31,23 +2014-07,31,32,15 +2014-07,32,33,13 +2014-07,33,34,13 +2014-07,34,35,11 +2014-07,35,36,11 +2014-07,36,37,11 +2014-07,37,38,2 +2014-07,38,39,13 +2014-07,39,40,6 +2014-07,40,41,15 +2014-07,41,42,8 +2014-07,42,43,10 +2014-07,43,44,14 +2014-07,44,45,9 +2014-07,45,46,8 +2014-07,46,47,8 +2014-07,47,48,6 +2014-07,48,49,9 +2014-07,49,50,14 +2014-07,50,51,11 +2014-07,51,52,9 +2014-07,52,53,8 +2014-07,53,54,7 +2014-07,54,55,5 +2014-07,55,56,7 +2014-07,56,57,11 +2014-07,57,58,7 +2014-07,58,59,5 +2014-07,59,60,4 +2014-07,60,61,2 +2014-07,61,62,7 +2014-07,62,63,4 +2014-07,63,64,3 +2014-07,64,65,9 +2014-07,65,66,4 +2014-07,66,67,4 +2014-07,67,68,3 +2014-07,68,69,2 +2014-07,69,70,4 +2014-07,70,71,2 +2014-07,71,72,4 +2014-07,72,73,7 +2014-07,73,74,6 +2014-07,74,75,9 +2014-07,75,76,6 +2014-07,76,77,3 +2014-07,77,78,7 +2014-07,78,79,1 +2014-07,79,80,7 +2014-07,80,81,7 +2014-07,81,82,4 +2014-07,82,83,1 +2014-07,83,84,7 +2014-07,84,85,6 +2014-07,85,86,5 +2014-07,86,87,4 +2014-07,87,88,4 +2014-07,88,89,3 +2014-07,89,90,3 +2014-07,90,91,2 +2014-07,91,92,4 +2014-07,92,93,2 +2014-07,93,94,5 +2014-07,94,95,6 +2014-07,95,96,1 +2014-07,96,97,1 +2014-07,97,98,1 +2014-07,99,100,1 +2014-07,100,101,4 +2014-07,102,103,2 +2014-07,103,104,1 +2014-07,105,106,3 +2014-07,106,107,2 +2014-07,108,109,1 +2014-07,110,111,1 +2014-07,111,112,1 +2014-07,117,118,1 +2014-07,118,119,1 +2014-07,122,123,2 +2014-07,123,124,2 +2014-07,124,125,1 +2014-07,125,126,2 +2014-07,126,127,1 +2014-07,128,129,1 +2014-07,129,130,1 +2014-07,130,131,1 +2014-07,132,133,1 +2014-07,138,139,2 +2014-07,142,143,1 +2014-07,144,145,1 +2014-07,145,146,1 +2014-07,146,147,1 +2014-07,148,149,1 +2014-07,149,150,1 +2014-07,152,153,1 +2014-07,155,156,2 +2014-07,158,159,1 +2014-07,160,161,1 +2014-07,165,166,1 +2014-07,168,169,1 +2014-07,171,172,3 +2014-07,172,173,1 +2014-07,173,174,3 +2014-07,174,175,1 +2014-07,177,178,1 +2014-07,178,179,1 +2014-07,179,180,1 +2014-07,180,181,1 +2014-07,182,183,1 +2014-07,186,187,1 +2014-07,196,197,1 +2014-07,203,204,1 +2014-07,217,218,1 +2014-07,223,224,1 +2014-07,229,230,2 +2014-07,243,244,1 +2014-07,249,250,1 +2014-07,253,254,2 +2014-07,265,266,1 +2014-07,272,273,1 +2014-07,277,278,1 +2014-07,293,294,1 +2014-07,298,299,1 +2014-07,299,300,1 +2014-07,302,303,1 +2014-07,333,334,1 +2014-07,344,345,1 +2014-07,421,422,1 +2014-07,434,435,1 +2014-07,436,437,1 +2014-07,505,506,1 +2014-07,507,508,1 +2014-07,527,528,1 +2014-07,696,697,1 +2014-07,938,939,1 +2014-07,1046,1047,1 +2014-07,1171,1172,1 +2014-07,1218,1219,1 +2014-07,3073,3074,1 +2014-07,3655,3656,1 +2014-07,3803,3804,1 +2014-07,4305,4306,1 +2014-07,4850,4851,1 +2014-07,5740,5741,1 +2014-07,7271,7272,1

1 0

[support-tools/master] Add queue graphs data for July 2014
by lunar＠torproject.org 01 Aug '14

01 Aug '14

commit 692cf5256bdbf7957b1e1f07697a495833600c9d Author: Lunar <lunar(a)torproject.org> Date: Fri Aug 1 13:14:04 2014 +0200 Add queue graphs data for July 2014 --- queue-graphs/data/2014Q3.csv | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/queue-graphs/data/2014Q3.csv b/queue-graphs/data/2014Q3.csv new file mode 100644 index 0000000..4ce9d25 --- /dev/null +++ b/queue-graphs/data/2014Q3.csv @@ -0,0 +1,7 @@ +month,queue,newtickets +2014-07,ar,7 +2014-07,en,1147 +2014-07,es,52 +2014-07,fa,156 +2014-07,fr,37 +2014-07,zh,73

1 0