Move the supplemental pt config routines to pt_extra.go

2 files changed, 105 insertions, 34 deletions

diff --git a/obfs4proxy/obfs4proxy.go b/obfs4proxy/obfs4proxy.go
index 86589bb..ae18c5d 100644
--- a/obfs4proxy/obfs4proxy.go
+++ b/obfs4proxy/obfs4proxy.go
@@ -69,6 +69,7 @@ const (
 	obfs4LogFile = "obfs4proxy.log"
 )
 
+var enableLogging bool
 var unsafeLogging bool
 var iatObfuscation bool
 var ptListeners []net.Listener
@@ -164,13 +165,16 @@ func serverAcceptLoop(ln *obfs4.Obfs4Listener, info *pt.ServerInfo) error {
 	}
 }
 
-func serverSetup() bool {
-	launch := false
-	var err error
+func serverSetup() (launched bool) {
+	// Initialize pt logging.
+	err := ptInitializeLogging(enableLogging)
+	if err != nil {
+		return
+	}
 
 	ptServerInfo, err := pt.ServerSetup([]string{obfs4Method})
 	if err != nil {
-		return launch
+		return
 	}
 
 	for _, bindaddr := range ptServerInfo.Bindaddrs {
@@ -208,14 +212,14 @@ func serverSetup() bool {
 			go serverAcceptLoop(ln, &ptServerInfo)
 			pt.SmethodArgs(bindaddr.MethodName, ln.Addr(), args)
 			ptListeners = append(ptListeners, ln)
-			launch = true
+			launched = true
 		default:
 			pt.SmethodError(bindaddr.MethodName, "no such method")
 		}
 	}
 	pt.SmethodsDone()
 
-	return launch
+	return
 }
 
 func clientHandler(conn *pt.SocksConn) error {
@@ -282,13 +286,17 @@ func clientAcceptLoop(ln *pt.SocksListener) error {
 	}
 }
 
-func clientSetup() bool {
-	launch := false
+func clientSetup() (launched bool) {
+	// Initialize pt logging.
+	err := ptInitializeLogging(enableLogging)
+	if err != nil {
+		return
+	}
 
 	ptClientInfo, err := pt.ClientSetup([]string{obfs4Method})
 	if err != nil {
 		log.Fatal(err)
-		return launch
+		return
 	}
 
 	for _, methodName := range ptClientInfo.MethodNames {
@@ -302,24 +310,14 @@ func clientSetup() bool {
 			go clientAcceptLoop(ln)
 			pt.Cmethod(methodName, ln.Version(), ln.Addr())
 			ptListeners = append(ptListeners, ln)
-			launch = true
+			launched = true
 		default:
 			pt.CmethodError(methodName, "no such method")
 		}
 	}
 	pt.CmethodsDone()
 
-	return launch
-}
-
-func ptIsClient() bool {
-	env := os.Getenv("TOR_PT_CLIENT_TRANSPORTS")
-	return env != ""
-}
-
-func ptIsServer() bool {
-	env := os.Getenv("TOR_PT_SERVER_TRANSPORTS")
-	return env != ""
+	return
 }
 
 func ptGetStateDir() (dir string, err error) {
@@ -336,21 +334,26 @@ func ptGetStateDir() (dir string, err error) {
 	return
 }
 
-func ptInitializeLogging(enable bool) {
+func ptInitializeLogging(enable bool) error {
 	if enable {
-		dir, err := ptGetStateDir()
-		if err != nil || dir == "" {
-			return
+		// pt.MakeStateDir will ENV-ERROR for us.
+		dir, err := ptMakeStateDir()
+		if err != nil {
+			return err
 		}
 
+		// While we could just exit, log an ENV-ERROR so it will propagate to
+		// the tor log.
 		f, err := os.OpenFile(path.Join(dir, obfs4LogFile), os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600)
 		if err != nil {
-			log.Fatalf("[ERROR] Failed to open log file: %s", err)
+			return ptEnvError(fmt.Sprintf("Failed to open log file: %s\n", err))
 		}
 		log.SetOutput(f)
 	} else {
 		log.SetOutput(ioutil.Discard)
 	}
+
+	return nil
 }
 
 func generateServerParams(id string) {
@@ -396,27 +399,28 @@ func generateServerParams(id string) {
 func main() {
 	// Some command line args.
 	genParams := flag.String("genServerParams", "", "Generate server params given a bridge fingerprint.")
-	doLogging := flag.Bool("enableLogging", false, "Log to TOR_PT_STATE_LOCATION/obfs4proxy.log")
+	flag.BoolVar(&enableLogging, "enableLogging", false, "Log to TOR_PT_STATE_LOCATION/obfs4proxy.log")
 	flag.BoolVar(&iatObfuscation, "iatObfuscation", false, "Enable IAT obufscation (EXPENSIVE)")
 	flag.BoolVar(&unsafeLogging, "unsafeLogging", false, "Disable the address scrubber")
 	flag.Parse()
 	if *genParams != "" {
 		generateServerParams(*genParams)
-		os.Exit(0)
+		return
 	}
 
-	// Initialize pt logging.
-	ptInitializeLogging(*doLogging)
-
 	// Go through the pt protocol and initialize client or server mode.
 	launched := false
-	if ptIsClient() {
+	isClient, err := ptIsClient()
+	if err != nil {
+		log.Fatal("[ERROR] obfs4proxy must be run as a managed transport or server")
+	} else if isClient {
 		launched = clientSetup()
-	} else if ptIsServer() {
+	} else {
 		launched = serverSetup()
 	}
 	if !launched {
-		log.Fatal("[ERROR] obfs4proxy must be run as a managed transport or server")
+		// Something must have failed in client/server setup, just bail.
+		os.Exit(-1)
 	}
 
 	log.Println("[INFO] obfs4proxy - Launched and listening")
diff --git a/obfs4proxy/pt_extra.go b/obfs4proxy/pt_extra.go
new file mode 100644
index 0000000..889c7bd
--- /dev/null
+++ b/obfs4proxy/pt_extra.go
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *  * Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ *  * Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package main
+
+import (
+	"errors"
+	"fmt"
+	"os"
+
+	"git.torproject.org/pluggable-transports/goptlib"
+)
+
+// This file contains things that probably should be in goptlib but are not
+// yet or are not finalized.
+
+func ptEnvError(msg string) error {
+	line := []byte(fmt.Sprintf("ENV-ERROR %s\n", msg))
+	pt.Stdout.Write(line)
+	return errors.New(msg)
+}
+
+func ptMakeStateDir() (string, error) {
+	dir := os.Getenv("TOR_PT_STATE_LOCATION")
+	if dir == "" {
+		return "", ptEnvError("no TOR_PT_STATE_LOCATION enviornment variable")
+	}
+	err := os.MkdirAll(dir, 0700)
+	return dir, err
+}
+
+func ptIsClient() (bool, error) {
+	clientEnv := os.Getenv("TOR_PT_CLIENT_TRANSPORTS")
+	serverEnv := os.Getenv("TOR_PT_SERVER_TRANSPORTS")
+	if clientEnv != "" && serverEnv != "" {
+		return false, ptEnvError("TOR_PT_[CLIENT,SERVER]_TRANSPORTS both set")
+	} else if clientEnv != "" {
+		return true, nil
+	} else if serverEnv != "" {
+		return false, nil
+	}
+	return false, errors.New("not launched as a managed transport")
+}