chore: apply review suggestions

Author: theseion

ftwhttp/header.go

@@ -14,8 +14,10 @@ import (
 )
 
 const (
-	headerSeparator = ": "
-	headerDelimiter = "\r\n"
+	// HeaderSeparator is used to separate header name and value
+	HeaderSeparator = ": "
+	// HeaderDelimiter marks then end of a header (CRLF)
+	HeaderDelimiter = "\r\n"
 )
 
 // Header is a representation of the HTTP header section.
@@ -45,7 +47,7 @@ func NewHeader() *Header {
 // This is a convenience and legacy fallback method. In the future,
 // headers should be specified as a list, in order to guarantee order
 // and to allow requests to contain the same header multiple times,
-// potentially, but not necessarily, with different values.
+// potentially with different values.
 func NewHeaderFromMap(headerMap map[string]string) *Header {
 	header := NewHeader()
 	keys := make([]string, 0, len(headerMap))
@@ -121,20 +123,11 @@ func (h *Header) GetAll(name string) []HeaderTuple {
 // Write writes the header to the provided writer
 func (h *Header) Write(writer io.Writer) error {
 	buf := bufio.NewWriter(writer)
-	for _, tuple := range h.entries {
+	for index, tuple := range h.entries {
 		if log.Trace().Enabled() {
-			log.Trace().Msgf("Writing header: %s: %s", tuple.Name, tuple.Value)
-		}
-		if _, err := buf.WriteString(tuple.Name); err != nil {
-			return err
-		}
-		if _, err := buf.WriteString(headerSeparator); err != nil {
-			return err
-		}
-		if _, err := buf.WriteString(tuple.Value); err != nil {
-			return err
+			log.Trace().Msgf("Writing header %d: %s: %s", index, tuple.Name, tuple.Value)
 		}
-		if _, err := buf.WriteString(headerDelimiter); err != nil {
+		if _, err := buf.WriteString(tuple.Name + HeaderSeparator + tuple.Value + HeaderDelimiter); err != nil {
 			return err
 		}
 

ftwhttp/header_values/constants.go

@@ -1,4 +1,4 @@
-package ftwhttp
+package header_values
 
 const (
 	ApplicationXWwwFormUrlencoded = "application/x-www-form-urlencoded"

ftwhttp/request.go

@@ -135,10 +135,8 @@ func BuildRequest(r *Request) ([]byte, error) {
 
 	// Multipart form data needs to end in \r\n, per RFC (and modsecurity make a scene if not)
 	if r.headers.HasAnyValueContaining(header_names.ContentType, "multipart/form-data;") {
-		crlf := []byte("\r\n")
-		lf := []byte("\n")
 		log.Debug().Msgf("ftw/http: with LF only - %d bytes:\n%x\n", len(r.data), r.data)
-		data = bytes.ReplaceAll(r.data, lf, crlf)
+		data = bytes.ReplaceAll(r.data, []byte("\n"), []byte(HeaderDelimiter))
 		log.Debug().Msgf("ftw/http: with CRLF - %d bytes:\n%x\n", len(data), data)
 		r.data = data
 	}
@@ -154,7 +152,7 @@ func BuildRequest(r *Request) ([]byte, error) {
 	}
 
 	// After headers, we need one blank line
-	_, err = b.WriteString("\r\n")
+	_, err = b.WriteString(HeaderDelimiter)
 	if err != nil {
 		log.Debug().Msgf("ftw/http: error writing to buffer: %s", err.Error())
 		return nil, err