fix golint and gosimple issues

Author: dmitris

cmd/webseclab/main.go

@@ -21,7 +21,6 @@ type indexHandler func(http.ResponseWriter, *http.Request) error
 
 func (fn indexHandler) ServerHTTP(w http.ResponseWriter, r *http.Request) {
 	fn(w, r)
-	return
 }
 
 const notice = `Attention: Webseclab is purposedly INSECURE software intended for testing and education.  Use it at your own risk and be careful! Hit Ctrl-C now if you don't understand the risks invovled.
@@ -63,7 +62,6 @@ func main() {
 		http.HandleFunc("/index.html", webseclab.MakeIndexFunc("/index.html"))
 	}
 	http.HandleFunc("favicon.ico", func(w http.ResponseWriter, r *http.Request) {
-		return
 	})
 	http.Handle("/", webseclab.MakeMainHandler(*noindex))
 	http.HandleFunc("/exit", webseclab.MakeExitFunc(ln))

common_test.go

@@ -26,5 +26,4 @@ func (r mockResponseWriter) Write([]byte) (int, error) {
 }
 
 func (r mockResponseWriter) WriteHeader(int) {
-	return
 }

custom.go

@@ -125,15 +125,15 @@ func XSSFullCookies(w http.ResponseWriter, r *http.Request) *LabResp {
 			return DoLabTestStandard(w, r)
 		}
 	}
-	return &LabResp{Err: errors.New("Sorry your cookies are no good - please put the word awesome into a cookie value and try again."),
+	return &LabResp{Err: errors.New("sorry your cookies are no good - please put the word awesome into a cookie value and try again"),
 		Code: http.StatusForbidden}
 }
 
 // XSSFullHeaders is a wrapper around standard handler (non-filtered output echo)
 // but requires the presence of HTTP Header X-Letmein with the value 1.
 func XSSFullHeaders(w http.ResponseWriter, r *http.Request) *LabResp {
 	if r.Header.Get("X-Letmein") != "1" {
-		return &LabResp{Err: errors.New("Missing or invalid value of the X-Letmein HTTP Header - please set to 1 and try again."),
+		return &LabResp{Err: errors.New("missing or invalid value of the X-Letmein HTTP Header - please set to 1 and try again"),
 			Code: http.StatusForbidden}
 	}
 	return DoLabTestStandard(w, r)
@@ -144,7 +144,7 @@ func XSSFullHeaders(w http.ResponseWriter, r *http.Request) *LabResp {
 func XSSFullUseragent(w http.ResponseWriter, r *http.Request) *LabResp {
 	ua := r.Header.Get("User-Agent")
 	if !strings.Contains(ua, "Mobile") {
-		return &LabResp{Err: errors.New("Access requires forward-looking thinking - please add Mobile to the User-Agent header and try again."),
+		return &LabResp{Err: errors.New("access requires forward-looking thinking - please add Mobile to the User-Agent header and try again"),
 			Code: http.StatusForbidden}
 	}
 	return DoLabTestStandard(w, r)

handler.go

@@ -151,7 +151,6 @@ func MakeIndexFunc(page string) func(http.ResponseWriter, *http.Request) {
 			w.Write([]byte(`Internal Server Error`))
 			return
 		}
-		return
 	}
 }
 

input.go

@@ -9,7 +9,8 @@ import (
 	"strings"
 )
 
-// ParseRawQuery copied from net/url parseQuery but without unescaping keys/values
+// ParseRawQuery is copied from net/url parseQuery
+// but without unescaping keys/values.
 func ParseRawQuery(m map[string][]string, query string) {
 	for query != "" {
 		key := query
@@ -27,7 +28,6 @@ func ParseRawQuery(m map[string][]string, query string) {
 		}
 		m[key] = append(m[key], value)
 	}
-	return
 }
 
 // Input extracts the escaped and "raw" values of in parameters

transform.go

@@ -16,18 +16,18 @@ import (
 // The second part are the functions that do transformations
 // beyond simple string substitution (regexp etc.)
 
-// Transformer transforms a string by escaping, filtering or other modification
+// Transformer transforms a string by escaping, filtering or other modification.
 type Transformer interface {
 	Transform(s string) string
 }
 
-// StringsReplacer implements Transformer using embedded strings.Replacer
+// StringsReplacer implements Transformer using embedded strings.Replacer.
 type StringsReplacer struct {
 	strings.Replacer
 }
 
 // NewStringsReplacer creates a new StringsReplacer
-// using the list of old/new strings (as in strings.NewReplacer)
+// using the list of old/new strings (as in strings.NewReplacer).
 func NewStringsReplacer(oldnew ...string) *StringsReplacer {
 	r := strings.NewReplacer(oldnew...)
 	return &StringsReplacer{*r}
@@ -212,7 +212,7 @@ func RemoveTagsExceptTextareaClose(src string) (out string) {
 		// fmt.Printf("%d %s\n", i, src[m[i][0]:m[i][1]])
 	}
 	if last < len(src) {
-		out += src[last:len(src)]
+		out += src[last:]
 	}
 	// leave for debugging
 	// fmt.Printf("RemoveTagsUntilTextareaClose Out: %s\n", out)
@@ -238,7 +238,7 @@ func RemoveTagsUntilTextareaClose(src string) (out string) {
 		// fmt.Printf("%d %s\n", i, src[m[i][0]:m[i][1]])
 	}
 	if last < len(src) {
-		out += src[last:len(src)]
+		out += src[last:]
 	}
 	// leave for debugging
 	// fmt.Printf("RemoveTagsUntilTextareaClose Out: %s\n", out)
@@ -268,7 +268,7 @@ func ReplaceTextareaSafe(src string) (out string) {
 		// fmt.Printf("%d %s\n", i, src[m[i][0]:m[i][1]])
 	}
 	if last < len(src) {
-		out += src[last:len(src)]
+		out += src[last:]
 	}
 	// leave for debugging
 	// fmt.Printf("TextareaSafe Out: %s\n", out)