From 7d1d5559f22d047597af38005154396c50408d71 Mon Sep 17 00:00:00 2001
From: "boya.zheng" <boya.zheng@oceanbluecloud.com>
Date: Thu, 29 Mar 2018 15:25:24 +0800
Subject: [PATCH] add log and tls cipher suites

---
 src/vendor/config/config.go | 21 +++++++++++++++++----
 src/vendor/mitm/mitm.go     |  2 ++
 src/vendor/mylog/my_log.go  |  4 ++++
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/vendor/config/config.go b/src/vendor/config/config.go
index 945ed42..45794e5 100644
--- a/src/vendor/config/config.go
+++ b/src/vendor/config/config.go
@@ -26,16 +26,29 @@ func NewTlsConfig(pk, cert, org, cn string) *TlsConfig {
 		CommonName:     cn,
 		ServerTLSConfig: &tls.Config{
 			CipherSuites: []uint16{
-				tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
-				tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
-				tls.TLS_ECDHE_RSA_WITH_RC4_128_SHA,
-				tls.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
 				tls.TLS_RSA_WITH_RC4_128_SHA,
 				tls.TLS_RSA_WITH_3DES_EDE_CBC_SHA,
 				tls.TLS_RSA_WITH_AES_128_CBC_SHA,
 				tls.TLS_RSA_WITH_AES_256_CBC_SHA,
+				tls.TLS_RSA_WITH_AES_128_CBC_SHA256,
+				tls.TLS_RSA_WITH_AES_128_GCM_SHA256,
+				tls.TLS_RSA_WITH_AES_256_GCM_SHA384,
+				tls.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,
+				tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+				tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
+				tls.TLS_ECDHE_RSA_WITH_RC4_128_SHA,
+				tls.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
+				tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+				tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
+				tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
+				tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
 				tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
 				tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
+				tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
+				tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
+				tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,
+				tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
+				tls.TLS_FALLBACK_SCSV,
 			},
 			PreferServerCipherSuites: true,
 		},
diff --git a/src/vendor/mitm/mitm.go b/src/vendor/mitm/mitm.go
index fcc4896..aef8d87 100644
--- a/src/vendor/mitm/mitm.go
+++ b/src/vendor/mitm/mitm.go
@@ -108,6 +108,7 @@ func (hw *HandlerWrapper) FakeCertForName(name string) (cert *tls.Certificate, e
 }
 
 func (hw *HandlerWrapper) DumpHTTPAndHTTPs(resp http.ResponseWriter, req *http.Request) {
+	mylog.Println("DumpHTTPAndHTTPs")
 	req.Header.Del("Proxy-Connection")
 	req.Header.Set("Connection", "Keep-Alive")
 	var reqDump []byte
@@ -217,6 +218,7 @@ func (hw *HandlerWrapper) ServeHTTP(resp http.ResponseWriter, req *http.Request)
 }
 
 func (hw *HandlerWrapper) InterceptHTTPs(resp http.ResponseWriter, req *http.Request) {
+	mylog.Println("InterceptHTTPs")
 	addr := req.Host
 	host := strings.Split(addr, ":")[0]
 
diff --git a/src/vendor/mylog/my_log.go b/src/vendor/mylog/my_log.go
index 55e6a8c..91523e4 100644
--- a/src/vendor/mylog/my_log.go
+++ b/src/vendor/mylog/my_log.go
@@ -5,6 +5,10 @@ import "io"
 
 var logger *log.Logger
 
+func init() {
+	log.SetFlags(log.LstdFlags | log.Lshortfile)
+}
+
 func SetLog(l io.WriteCloser) {
 	logger = log.New(l, "[gomitmproxy]", log.LstdFlags)
 }