From 5e163aad16340721c86c78949a2b2d8e5f658afb Mon Sep 17 00:00:00 2001
From: boya <baoyang.zheng@oceanbluecloud.com>
Date: Sun, 20 Aug 2017 16:24:15 +0800
Subject: [PATCH] mv doc dir

---
 build.sh                       |   5 ++++-
 {src/doc => doc}/goproxy.png   | Bin
 {src/doc => doc}/proxy.png     | Bin
 gomitmproxy-ca-cert.pem        |  20 ++++++++++----------
 src/main/main.go               |   7 +++++--
 src/vendor/mitm/gomitmproxy.go |   5 +----
 src/vendor/mitm/mitm.go        |   3 ---
 7 files changed, 20 insertions(+), 20 deletions(-)
 rename {src/doc => doc}/goproxy.png (100%)
 rename {src/doc => doc}/proxy.png (100%)

diff --git a/build.sh b/build.sh
index 522ae1b..cef2cae 100755
--- a/build.sh
+++ b/build.sh
@@ -1,2 +1,5 @@
+os=$1
+arch=$2
+
 export GOPATH=`pwd`
-go build -o bin/gomitmproxy src/main/*.go
\ No newline at end of file
+GOOS=$os GOARCH=$arch go build -o bin/gomitmproxy$os$arch src/main/*.go
diff --git a/src/doc/goproxy.png b/doc/goproxy.png
similarity index 100%
rename from src/doc/goproxy.png
rename to doc/goproxy.png
diff --git a/src/doc/proxy.png b/doc/proxy.png
similarity index 100%
rename from src/doc/proxy.png
rename to doc/proxy.png
diff --git a/gomitmproxy-ca-cert.pem b/gomitmproxy-ca-cert.pem
index 714be03..bc17942 100644
--- a/gomitmproxy-ca-cert.pem
+++ b/gomitmproxy-ca-cert.pem
@@ -1,8 +1,8 @@
 -----BEGIN CERTIFICATE-----
-MIIDIjCCAgqgAwIBAgIIFFyG4pw+r+kwDQYJKoZIhvcNAQELBQAwLzEXMBUGA1UE
-ChMOZ29taXRtcHJveHkxLjAxFDASBgNVBAMTC2dvbWl0bXByb3h5MB4XDTE2MDUy
-OTEwMjQ0NloXDTE3MDYyOTEwMjQ0NlowLzEXMBUGA1UEChMOZ29taXRtcHJveHkx
-LjAxFDASBgNVBAMTC2dvbWl0bXByb3h5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIDIjCCAgqgAwIBAgIIFNKdPYoAW+YwDQYJKoZIhvcNAQELBQAwLzEXMBUGA1UE
+ChMOZ29taXRtcHJveHkxLjExFDASBgNVBAMTC2dvbWl0bXByb3h5MB4XDTE3MDYx
+OTAzMjE1M1oXDTE4MDcxOTAzMjE1M1owLzEXMBUGA1UEChMOZ29taXRtcHJveHkx
+LjExFDASBgNVBAMTC2dvbWl0bXByb3h5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
 MIIBCgKCAQEA5i5e0Ioniij/zx4uP+pEwIfCPuqRHpmtxnylXtDJNS7Mibsl57cC
 pKDymhGtehXKzt/7lv7Zh4PQyHUAPJQqTp6Q/bQRcnCEKoY0jSCDy7ZYxz+6YMth
 JD9CG67jCio78hQDyYQc8RpUJ8FyH+HWE8xyPkixnGC9tZSG6bAtP2ORtn9AsKXX
@@ -10,10 +10,10 @@ JD9CG67jCio78hQDyYQc8RpUJ8FyH+HWE8xyPkixnGC9tZSG6bAtP2ORtn9AsKXX
 eXt3de+PxFfs+nN2IIPbLTmRHW8qrworkJ0TBJWYMiT6mFOEiqlF92pzdLNDyR3e
 xednS3We07jZBAbvQGmy1eenZORXZsDuRQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMC
 AqQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA8GA1UdEwEB/wQFMAMB
-Af8wDQYJKoZIhvcNAQELBQADggEBAH1Gj0AtwzwbM0+NPrGsv2B0z/BLLDHu9MIN
-EhVIPgcGj9E9e3uP2uzxBBfFIeIk9w2GyuzqHqq/NTOJSf3CpL0RJYI9gS8qMg4x
-wn5wkSPVb8cp36jS3rNvpNx6nuz+P+H+t1x4+KWk12GM2gz7g/YSmkXOtntQzpOW
-Gl9ydNYWbd0ad5k+kQhBp2nsq1NByg3fwEd1jgvSnxKB+P76OK01pSxRczLpCp0F
-+1gpD6ukiPIC1RZCUiHk4UeY8jmpBNgNW4OJmxgA+LFclB3hytkxN2qbnk5xfA33
-1JciXh8y0ZD1wXB7y14PAB1TB53Rgjvk38OrPpBf3nETxlqP5zQ=
+Af8wDQYJKoZIhvcNAQELBQADggEBAC4Udyzjgwii05U7g9dWjCu/pfmKyFVYx6WR
+xGvxXI+sZIZ1hi/gtlMx8atYtnmbOFyG5SppIMqBIwZHDbP1kZL/af4KZIV1Usxa
+U8sAyjiJP/fnAcPI5TxCc/wc+VexMZC445ojldukQKxoxbLrpzmUuvgnAw/tfVir
+y4THt50xnhCLl86cH9mJVtv18GxtJDQZBgnuUT7P9DdcfHSu1mN9wCEYwS1+/zPj
+MBgDAugKzD273sePhPwl+j+PXpa+RyaUgYyj3MRmJMN/XXeqFEz4Z1tx3KXzQWac
+gbbKrmA6TDPXZh0jeM5WU5vWJIP4NDNMSjg9qZrkiCPP3Dbntts=
 -----END CERTIFICATE-----
diff --git a/src/main/main.go b/src/main/main.go
index 3a3ab49..13f451e 100644
--- a/src/main/main.go
+++ b/src/main/main.go
@@ -20,22 +20,25 @@ func main() {
 	conf.Log = flag.String("logFile", "", "log file path")
 	conf.Monitor = flag.Bool("m", false, "monitor mode")
 	conf.Tls = flag.Bool("tls", false, "tls connect")
+
 	flag.Parse()
 
 	// init log
 	if *conf.Log != "" {
 		log, err = os.Create(*conf.Log)
 		if err != nil {
-			mylog.Fatalln("fail to create log file!")
+			mylog.Fatalln("fail to create log file " + err.Error())
 		}
 	} else {
 		log = os.Stderr
 	}
 	mylog.SetLog(log)
 
+	// init tls config
+	tlsConfig := config.NewTlsConfig("gomitmproxy-ca-pk.pem", "gomitmproxy-ca-cert.pem", "", "")
 	// start mitm proxy
 	wg := new(sync.WaitGroup)
 	wg.Add(1)
-	mitm.Gomitmproxy(conf, wg)
+	mitm.Gomitmproxy(conf, tlsConfig, wg)
 	wg.Wait()
 }
diff --git a/src/vendor/mitm/gomitmproxy.go b/src/vendor/mitm/gomitmproxy.go
index a050d02..e158c18 100644
--- a/src/vendor/mitm/gomitmproxy.go
+++ b/src/vendor/mitm/gomitmproxy.go
@@ -11,9 +11,7 @@ import (
 	"time"
 )
 
-func Gomitmproxy(conf *config.Cfg, wg *sync.WaitGroup) {
-	tlsConfig := config.NewTlsConfig("gomitmproxy-ca-pk.pem", "gomitmproxy-ca-cert.pem", "", "")
-
+func Gomitmproxy(conf *config.Cfg, tlsConfig *config.TlsConfig, wg *sync.WaitGroup) {
 	handler, err := InitConfig(conf, tlsConfig)
 	if err != nil {
 		mylog.Fatalf("InitConfig error: %s", err)
@@ -40,7 +38,6 @@ func Gomitmproxy(conf *config.Cfg, wg *sync.WaitGroup) {
 		}
 
 		wg.Done()
-
 		mylog.Printf("Gomitmproxy Stop!!!!")
 	}()
 
diff --git a/src/vendor/mitm/mitm.go b/src/vendor/mitm/mitm.go
index 4e0c956..e4209c2 100644
--- a/src/vendor/mitm/mitm.go
+++ b/src/vendor/mitm/mitm.go
@@ -139,13 +139,11 @@ func (hw *HandlerWrapper) DumpHTTPAndHTTPs(resp http.ResponseWriter, req *http.R
 
 		connOut, err := net.DialTimeout("tcp", host, time.Second*30)
 		if err != nil {
-
 			mylog.Println("dial to", host, "error:", err)
 			return
 		}
 
 		if err = req.Write(connOut); err != nil {
-
 			mylog.Println("send to server error", err)
 			return
 		}
@@ -204,7 +202,6 @@ func (hw *HandlerWrapper) DumpHTTPAndHTTPs(resp http.ResponseWriter, req *http.R
 }
 
 func (hw *HandlerWrapper) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
-
 	raddr := *hw.MyConfig.Raddr
 	if len(raddr) != 0 {
 		hw.Forward(resp, req, raddr)