From c69bd5c202074626936e2e379a2af6041e24b170 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Fri, 22 Feb 2019 01:55:02 +0100 Subject: [PATCH] pkg/login-validator: fix compilation errors --- pkg/login-validator/cmd/login.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkg/login-validator/cmd/login.go b/pkg/login-validator/cmd/login.go index b0302d0..2775cff 100644 --- a/pkg/login-validator/cmd/login.go +++ b/pkg/login-validator/cmd/login.go @@ -157,13 +157,16 @@ func (l loginChecker) ServeHTTP(w http.ResponseWriter, r *http.Request) { // Find corresponding MAC var fname string - spl := strings.SplitN(remoteAddr, ":", 2) + spl := strings.SplitN(r.RemoteAddr, ":", 2) if ip := net.ParseIP(spl[0]); ip == nil { - return errors.New("Unable to parse given IPv4: " + spl[0]) + http.Error(w, "Unable to parse given IPv4: " + spl[0], http.StatusInternalServerError) + return } else if arptable, err := ARPAnalyze(); err != nil { - return err + http.Error(w, err.Error(), http.StatusInternalServerError) + return } else if arpent := ARPContainsIP(arptable, ip); arpent == nil { - return errors.New("Unable to find MAC in ARP table") + http.Error(w, "Unable to find MAC in ARP table", http.StatusInternalServerError) + return } else { fname = fmt.Sprintf("%02x-%02x-%02x-%02x-%02x-%02x-%02x", arpent.HWType, arpent.HWAddress[0], arpent.HWAddress[1], arpent.HWAddress[2], arpent.HWAddress[3], arpent.HWAddress[4], arpent.HWAddress[5]) }