go fmt/vet

internal/http/upgrade/request/errors.go

@@ -3,6 +3,7 @@ package request
 import (
 	"fmt"
 )
+
 // invalid request
 // - multiple-value if only 1 expected
 type InvalidRequest struct {
@@ -23,13 +24,13 @@ func (err IncompleteRequest) Error() string {
 	return fmt.Sprintf("imcomplete request, '%s' is invalid or missing", err.MissingField)
 }
 
-
 // Request has a violated origin policy
 type InvalidOriginPolicy struct {
 	Host   string
 	Origin string
 	err    error
 }
+
 func (err InvalidOriginPolicy) Error() string {
 	return fmt.Sprintf("invalid origin policy; (host: '%s' origin: '%s' error: '%s')", err.Host, err.Origin, err.err)
 }

internal/http/upgrade/request/request-line.go

@@ -1,13 +1,14 @@
 package request
 
 import (
-	"fmt"
 	"bytes"
+	"fmt"
 	"regexp"
 )
 
 // httpMethod represents available http methods
 type httpMethod byte
+
 const (
 	OPTIONS httpMethod = iota
 	GET
@@ -17,7 +18,6 @@ const (
 	DELETE
 )
 
-
 // RequestLine represents the HTTP Request line
 // defined in rfc-2616 : https://tools.ietf.org/html/rfc2616#section-5.1
 type RequestLine struct {
@@ -26,7 +26,6 @@ type RequestLine struct {
 	version byte
 }
 
-
 // parseRequestLine parses the first HTTP request line
 func (r *RequestLine) Parse(b []byte) error {
 
@@ -60,14 +59,11 @@ func (r *RequestLine) Parse(b []byte) error {
 
 }
 
-
 // GetURI returns the actual URI
 func (r RequestLine) GetURI() string {
 	return r.uri
 }
 
-
-
 // extractHttpMethod extracts the HTTP method from a []byte
 // and checks for errors
 // allowed format: OPTIONS|GET|HEAD|POST|PUT|DELETE
@@ -75,7 +71,8 @@ func (r *RequestLine) extractHttpMethod(b []byte) error {
 
 	switch string(b) {
 	// case "OPTIONS": r.method = OPTIONS
-		case "GET":     r.method = GET
+	case "GET":
+		r.method = GET
 	// case "HEAD":    r.method = HEAD
 	// case "POST":    r.method = POST
 	// case "PUT":     r.method = PUT
@@ -88,7 +85,6 @@ func (r *RequestLine) extractHttpMethod(b []byte) error {
 	return nil
 }
 
-
 // extractURI extracts the URI from a []byte and checks for errors
 // allowed format: /([^/]/)*/?
 func (r *RequestLine) extractURI(b []byte) error {
@@ -106,13 +102,12 @@ func (r *RequestLine) extractURI(b []byte) error {
 
 }
 
-
 // extractHttpVersion extracts the version and checks for errors
 // allowed format: [1-9] or [1.9].[0-9]
 func (r *RequestLine) extractHttpVersion(b []byte) error {
 
 	/* (1) Extract version parts */
-	extractor := regexp.MustCompile(`^HTTP/([1-9])(?:\.([0-9]))?$`);
+	extractor := regexp.MustCompile(`^HTTP/([1-9])(?:\.([0-9]))?$`)
 
 	if !extractor.Match(b) {
 		return fmt.Errorf("HTTP version, expected INT or INT.INT, got '%s'", b)

internal/http/upgrade/request/request_test.go

@@ -1,10 +1,11 @@
 package request
 
 import (
-	"io"
 	"bytes"
+	"io"
 	"testing"
 )
+
 // /* (1) Parse request */
 // req, _ := request.Parse(s)
 
@@ -96,7 +97,7 @@ func TestInvalidRequestLine(t *testing.T){
 			continue
 		}
 
-		ir, ok := err.(*InvalidRequest);
+		ir, ok := err.(*InvalidRequest)
 
 		// not InvalidRequest err -> error
 		if !ok || ir.Field != "Request-Line" {
@@ -151,7 +152,6 @@ func TestInvalidHost(t *testing.T){
 
 		if !tc.HasError {
 
-
 			// no error -> ok
 			if err == nil {
 				continue
@@ -170,7 +170,7 @@ func TestInvalidHost(t *testing.T){
 		}
 
 		// check if InvalidRequest
-		ir, ok := err.(*InvalidRequest);
+		ir, ok := err.(*InvalidRequest)
 
 		// not InvalidRequest err -> error
 		if ok && ir.Field != "Host" {

internal/http/upgrade/response/public.go

@@ -1,14 +1,12 @@
 package response
 
 import (
+	"crypto/sha1"
+	"encoding/base64"
 	"fmt"
 	"io"
-	"encoding/base64"
-	"crypto/sha1"
 )
 
-
-
 // SetStatusCode sets the status code
 func (r *T) SetStatusCode(sc StatusCode) {
 	r.code = sc
@@ -40,7 +38,6 @@ func (r *T) ProcessKey(k []byte) {
 
 }
 
-
 // Send sends the response through an io.Writer
 // typically a socket
 func (r T) Send(w io.Writer) (int, error) {
@@ -75,7 +72,6 @@ func (r T) GetProtocol() []byte {
 	return r.protocol
 }
 
-
 // GetStatusCode returns the response status code
 func (r T) GetStatusCode() StatusCode {
 	return r.code

internal/http/upgrade/response/status_code.go

@@ -13,12 +13,18 @@ var INTERNAL            StatusCode = 500 // custom error
 func (sc StatusCode) Message() string {
 
 	switch sc {
-		case SWITCHING_PROTOCOLS: return "Switching Protocols"
+	case SWITCHING_PROTOCOLS:
-		case BAD_REQUEST:         return "Bad Request"
+		return "Switching Protocols"
-		case FORBIDDEN:           return "Forbidden"
+	case BAD_REQUEST:
-		case UPGRADE_REQUIRED:    return "Upgrade Required"
+		return "Bad Request"
-		case NOT_FOUND:           return "Not Found"
+	case FORBIDDEN:
-		case INTERNAL:            return "Internal Server Error"
+		return "Forbidden"
+	case UPGRADE_REQUIRED:
+		return "Upgrade Required"
+	case NOT_FOUND:
+		return "Not Found"
+	case INTERNAL:
+		return "Internal Server Error"
 	default:
 		return "Unknown Status Code"
 	}

internal/http/upgrade/response/types.go

@@ -3,11 +3,11 @@ package response
 // Constant
 const HttpVersion = "1.1"
 const WSVersion = 13
+
 var WSSalt []byte = []byte("258EAFA5-E914-47DA-95CA-C5AB0DC85B11")
 
 // T represents an HTTP Upgrade Response
 type T struct {
-
 	code     StatusCode // status code
 	accept   []byte     // processed from Sec-WebSocket-Key
 	protocol []byte     // set from Sec-WebSocket-Protocol or none if not received

internal/uri/parser/private.go

@@ -1,11 +1,10 @@
 package parser
 
 import (
-	"strings"
 	"fmt"
+	"strings"
 )
 
-
 // buildScheme builds a 'basic' scheme
 // from a pattern string
 func buildScheme(ss []string) (Scheme, error) {
@@ -16,7 +15,9 @@ func buildScheme(ss []string) (Scheme, error) {
 	for _, s := range ss {
 
 		/* (2) ignore empty */
-		if len(s) == 0 { continue }
+		if len(s) == 0 {
+			continue
+		}
 
 		m := new(matcher)
 
@@ -60,8 +61,6 @@ func buildScheme(ss []string) (Scheme, error) {
 	return sch, nil
 }
 
-
-
 // optimise optimised the scheme for further parsing
 func (s Scheme) optimise() (Scheme, error) {
 
@@ -74,7 +73,6 @@ func (s Scheme) optimise() (Scheme, error) {
 	rshift := make(Scheme, 0, maxMatch)
 	rshift = append(rshift, s[0])
 
-
 	/* (2) Iterate over matchers */
 	for p, i, l := 0, 1, len(s); i < l; i++ {
 
@@ -103,7 +101,6 @@ func (s Scheme) optimise() (Scheme, error) {
 
 }
 
-
 // matchString checks the STRING matchers from an URI
 // it returns a boolean : false when not matching, true eitherway
 // it returns a cleared uri, without STRING data
@@ -116,18 +113,23 @@ func (s Scheme) matchString(uri string) (string, bool) {
 	/* (2) Iterate over strings */
 	for _, m := range s {
 
-
 		ls := len(m.pat)
 
 		// {1} If not STRING matcher -> ignore //
-		if ls == 0 { continue }
+		if ls == 0 {
+			continue
+		}
 
 		// {2} Get offset in URI (else -1) //
 		off := strings.Index(clr, m.pat)
-		if off < 0 { return "", false }
+		if off < 0 {
+			return "", false
+		}
 
 		// {3} Fail on invalid offset range //
-		if off < minOff { return "", false }
+		if off < minOff {
+			return "", false
+		}
 
 		// {4} Check for trailing '/' //
 		hasSlash := 0
@@ -159,7 +161,6 @@ func (s Scheme) matchString(uri string) (string, bool) {
 
 }
 
-
 // matchWildcards check the WILCARDS (non-string) matchers from
 // a cleared URI. it returns if the string matches
 // + it sets the matchers buffers for later extraction

internal/uri/parser/public.go

@@ -19,7 +19,7 @@ func Build(s string) (*Scheme, error){
 	/* (3) Max exceeded */
 	if len(parts)-2 > maxMatch {
 		for i, p := range parts {
-			fmt.Printf("%d: '%s'\n", i, p);
+			fmt.Printf("%d: '%s'\n", i, p)
 		}
 		return nil, fmt.Errorf("URI must not exceed %d slash-separated components, got %d", maxMatch, len(parts))
 	}
@@ -40,12 +40,13 @@ func Build(s string) (*Scheme, error){
 
 }
 
-
 // Match returns if the given URI is matched by the scheme
 func (s Scheme) Match(str string) bool {
 
 	/* (1) Nothing -> match all */
-	if len(s) == 0 { return true }
+	if len(s) == 0 {
+		return true
+	}
 
 	/* (2) Check for string match */
 	clearURI, match := s.matchString(str)
@@ -62,7 +63,6 @@ func (s Scheme) Match(str string) bool {
 	return true
 }
 
-
 // GetMatch returns the indexed match (excluding string matchers)
 func (s Scheme) GetMatch(n uint8) ([]string, error) {
 
@@ -76,7 +76,9 @@ func (s Scheme) GetMatch(n uint8) ([]string, error) {
 	for _, m := range s {
 
 		// ignore strings
-		if len(m.pat) > 0 { continue }
+		if len(m.pat) > 0 {
+			continue
+		}
 
 		// increment match counter : ni
 		ni++
@@ -93,9 +95,6 @@ func (s Scheme) GetMatch(n uint8) ([]string, error) {
 
 }
 
-
-
-
 // GetAllMatch returns all the indexed match (excluding string matchers)
 func (s Scheme) GetAllMatch() [][]string {
 
@@ -104,7 +103,9 @@ func (s Scheme) GetAllMatch() [][]string {
 	for _, m := range s {
 
 		// ignore strings
-		if len(m.pat) > 0 { continue }
+		if len(m.pat) > 0 {
+			continue
+		}
 
 		match = append(match, m.buf)
 

internal/uri/parser/types.go

@@ -31,6 +31,5 @@ type matcher struct {
 	buf []string // matched content (when matching)
 }
 
-
 // Represents an URI scheme
 type Scheme []*matcher