use go 1.6.1 on travis ci

Signed-off-by: Salimane Adjao Moustapha <me@salimane.com>

.gitignore

@@ -10,5 +10,5 @@
 *.class
 
 *.test
-
+.idea
 gor

.travis.yml

@@ -1,3 +1,7 @@
 language: go
-go: 1.4.2
-script: sudo -E bash -c "source /etc/profile && eval '$(gimme 1.4.2)' && export GOPATH=$HOME/gopath:$GOPATH && go get && GORACE='halt_on_error=1' go test ./... -v -timeout 60s -race"
+go:
+  - 1.6.1
+
+install: go get ./...
+
+script: go test ./... -v -timeout 60s -race

Makefile

@@ -24,7 +24,7 @@ drace:
 	docker run -v `pwd`:$(SOURCE_PATH) -t -i --env GORACE="halt_on_error=1" gor go test ./... $(ARGS) -v -race -timeout 15s
 
 dtest:
-	docker run -v `pwd`:$(SOURCE_PATH) -t -i gor go test ./ -timeout 60s $(ARGS) -v
+	docker run -v `pwd`:$(SOURCE_PATH) -t -i gor go test ./... -timeout 60s $(ARGS) -v
 
 dcover:
 	docker run -v `pwd`:$(SOURCE_PATH) -t -i --env GORACE="halt_on_error=1" gor go test $(ARGS) -race -v -timeout 15s -coverprofile=coverage.out

README.md

@@ -2,8 +2,7 @@
 
 ## About
 
-Gor is a simple http traffic replication tool written in Go.
-Its main goal is to replay traffic from production servers to staging and dev environments.
+Gor is an open-source tool for capturing and replaying live HTTP traffic into a test environment in order to continuously test your system with real data. It can be used to increase confidence in code deployments, configuration changes and infrastructure changes.
 
 
 Now you can test your code on real user sessions in an automated and repeatable fashion.

input_file.go

@@ -61,7 +61,7 @@ func (i *FileInput) emit() {
 		buf := scanner.Bytes()
 		meta := payloadMeta(buf)
 
-		if meta[0][0] == RequestPayload {
+		if len(meta) > 2 && meta[0][0] == RequestPayload {
 			ts, _ := strconv.ParseInt(string(meta[2]), 10, 64)
 
 			if lastTime != 0 {

middleware.go

@@ -47,7 +47,11 @@ func NewMiddleware(command string) *Middleware {
 			log.Fatal(err)
 		}
 
-		cmd.Wait()
+		err = cmd.Wait()
+
+		if err != nil {
+			log.Fatal(err)
+		}
 	}()
 
 	return m

output_http.go

@@ -184,6 +184,9 @@ func (o *HTTPOutput) Read(data []byte) (int, error) {
 
 func (o *HTTPOutput) sendRequest(client *HTTPClient, request []byte) {
 	meta := payloadMeta(request)
+	if len(meta) < 2 {
+		return
+	}
 	uuid := meta[1]
 
 	body := payloadBody(request)

proto/proto.go

@@ -55,7 +55,13 @@ func header(payload []byte, name []byte) (value []byte, headerStart, valueStart,
 	if payload[valueStart] == ' ' {          // Ignore empty space after ':'
 		valueStart++
 	}
-	headerEnd = valueStart + bytes.IndexByte(payload[valueStart:], '\r')
+
+	headerEnd = valueStart + bytes.IndexByte(payload[valueStart:], '\n')
+
+	if payload[headerEnd - 1] == '\r' {
+		headerEnd -= 1
+	}
+
 	value = payload[valueStart:headerEnd]
 
 	return

proto/proto_test.go

@@ -9,18 +9,36 @@ func TestHeader(t *testing.T) {
 	var payload, val []byte
 	var headerStart int
 
+	// Value with space at start
 	payload = []byte("POST /post HTTP/1.1\r\nContent-Length: 7\r\nHost: www.w3.org\r\n\r\na=1&b=2")
 
 	if val = Header(payload, []byte("Content-Length")); !bytes.Equal(val, []byte("7")) {
 		t.Error("Should find header value")
 	}
 
+	// Value without space at start
 	payload = []byte("POST /post HTTP/1.1\r\nContent-Length:7\r\nHost: www.w3.org\r\n\r\na=1&b=2")
 
 	if val = Header(payload, []byte("Content-Length")); !bytes.Equal(val, []byte("7")) {
 		t.Error("Should find header value without space after :")
 	}
 
+	// Value is empty
+	payload = []byte("GET /p HTTP/1.1\r\nCookie:\r\nHost: www.w3.org\r\n\r\n")
+
+	if val = Header(payload, []byte("Cookie")); len(val) > 0 {
+		t.Error("Should return empty value")
+	}
+
+	// Wrong delimeter
+	payload = []byte("GET /p HTTP/1.1\r\nCookie: 123\nHost: www.w3.org\r\n\r\n")
+
+	if val = Header(payload, []byte("Cookie")); !bytes.Equal(val, []byte("123")) {
+		t.Error("Should handle wrong header delimeter")
+	}
+
+
+	// Header not found
 	if _, headerStart, _, _ = header(payload, []byte("Not-Found")); headerStart != -1 {
 		t.Error("Should not found header")
 	}

protocol.go

@@ -67,6 +67,9 @@ func payloadBody(payload []byte) []byte {
 
 func payloadMeta(payload []byte) [][]byte {
 	headerSize := bytes.IndexByte(payload, '\n')
+        if headerSize < 0 {
+                headerSize = 0;
+	}
 	return bytes.Split(payload[:headerSize], []byte{' '})
 }
 

raw_socket_listener/listener.go

@@ -196,7 +196,7 @@ func (t *Listener) processTCPPacket(packet *TCPPacket) {
 	// Don't exit on panic
 	defer func() {
 		if r := recover(); r != nil {
-			log.Println("PANIC: pkg:", r, string(debug.Stack()))
+			log.Println("PANIC: pkg:", r, packet, string(debug.Stack()))
 		}
 	}()
 
@@ -234,7 +234,7 @@ func (t *Listener) processTCPPacket(packet *TCPPacket) {
 	}
 
 	// Handling Expect: 100-continue requests
-	if bytes.Equal(packet.Data[0:4], bPOST) {
+	if len(packet.Data) > 4 && bytes.Equal(packet.Data[0:4], bPOST) {
 		// reading last 20 bytes (not counting CRLF): last header value (if no body presented)
 		if bytes.Equal(packet.Data[len(packet.Data)-24:len(packet.Data)-4], bExpect100ContinueCheck) {
 			t.seqWithData[packet.Seq+uint32(len(packet.Data))] = packet.Ack

raw_socket_listener/tcp_message.go

@@ -92,6 +92,11 @@ func (t *TCPMessage) IsMultipart() bool {
 	}
 
 	payload := t.packets[0].Data
+
+	if len(payload) < 4 {
+		return true
+	}
+
 	m := payload[:4]
 
 	if t.IsIncoming {

settings.go

@@ -65,7 +65,7 @@ func init() {
 	flag.Usage = usage
 
 	flag.BoolVar(&Settings.verbose, "verbose", false, "Turn on more verbose output")
-	flag.BoolVar(&Settings.debug, "debug", false, "Turn on debug output, shows all itercepted traffic. Works only when with `verbose` flag")
+	flag.BoolVar(&Settings.debug, "debug", false, "Turn on debug output, shows all intercepted traffic. Works only when with `verbose` flag")
 	flag.BoolVar(&Settings.stats, "stats", false, "Turn on queue stats output")
 
 	flag.BoolVar(&Settings.splitOutput, "split-output", false, "By default each output gets same traffic. If set to `true` it splits traffic equally among all outputs.")