From d80fef3ef92e95735df182951c5e0e093bef57d8 Mon Sep 17 00:00:00 2001 From: Edznux Date: Tue, 23 Oct 2018 06:35:22 +0200 Subject: [PATCH] Re-run gofmt -s after modifications --- core/core_test.go | 4 ++-- modules/http_proxy_base.go | 2 +- modules/http_proxy_base_sslstriper.go | 2 +- modules/net_recon_show.go | 6 +++--- modules/wifi_show.go | 2 +- network/lan_endpoint.go | 4 ++-- session/environment_test.go | 18 +++++++++--------- session/module.go | 16 ++++++++-------- session/session.go | 2 +- session/session_core_handlers.go | 2 +- session/session_parse.go | 2 +- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/core/core_test.go b/core/core_test.go index 19f13a69..972f690e 100644 --- a/core/core_test.go +++ b/core/core_test.go @@ -2,11 +2,11 @@ package core import ( "bytes" + "github.com/evilsocket/islazy/fs" + "github.com/evilsocket/islazy/str" "io" "os" "testing" - "github.com/evilsocket/islazy/str" - "github.com/evilsocket/islazy/fs" ) func hasInt(a []int, v int) bool { diff --git a/modules/http_proxy_base.go b/modules/http_proxy_base.go index d7da2d8d..9523588b 100644 --- a/modules/http_proxy_base.go +++ b/modules/http_proxy_base.go @@ -122,7 +122,7 @@ func (p *HTTPProxy) Configure(address string, proxyPort int, httpPort int, scrip data, err := ioutil.ReadFile(jsToInject) if err != nil { return err - } + } jsToInject = string(data) } diff --git a/modules/http_proxy_base_sslstriper.go b/modules/http_proxy_base_sslstriper.go index 1526d383..5e790a3b 100644 --- a/modules/http_proxy_base_sslstriper.go +++ b/modules/http_proxy_base_sslstriper.go @@ -273,7 +273,7 @@ func (s *SSLStripper) isMaxRedirs(hostname string) bool { delete(s.redirs, hostname) return true } - // increment + // increment s.redirs[hostname]++ } else { // start tracking redirections diff --git a/modules/net_recon_show.go b/modules/net_recon_show.go index ecabacc7..89e86a2f 100644 --- a/modules/net_recon_show.go +++ b/modules/net_recon_show.go @@ -122,11 +122,11 @@ func (d *Discovery) Show(by string, expr string) (err error) { } switch by { - case "seen" : + case "seen": sort.Sort(BySeenSorter(targets)) - case "sent" : + case "sent": sort.Sort(BySentSorter(targets)) - case "rcvd" : + case "rcvd": sort.Sort(ByRcvdSorter(targets)) default: sort.Sort(ByAddressSorter(targets)) diff --git a/modules/wifi_show.go b/modules/wifi_show.go index 6ca028e2..6338077d 100644 --- a/modules/wifi_show.go +++ b/modules/wifi_show.go @@ -84,7 +84,7 @@ func (w *WiFiModule) getRow(station *network.Station) ([]string, bool) { recvd, seen, }, include - } + } // this is ugly, but necessary in order to have this // method handle both access point and clients // transparently diff --git a/network/lan_endpoint.go b/network/lan_endpoint.go index 81b525fd..a9dd299d 100644 --- a/network/lan_endpoint.go +++ b/network/lan_endpoint.go @@ -162,10 +162,10 @@ func (t *Endpoint) OnMeta(meta map[string]string) { for k, v := range meta { // simple heuristics to get the longest candidate name if len(v) > len(host) { - if strings.HasSuffix(k, ":hostname"){ + if strings.HasSuffix(k, ":hostname") { host = v } - if k == "mdns:md"{ + if k == "mdns:md" { host = v } } diff --git a/session/environment_test.go b/session/environment_test.go index 4c69c08f..fad128a3 100644 --- a/session/environment_test.go +++ b/session/environment_test.go @@ -22,7 +22,7 @@ func setup(t testing.TB, envFile bool, envFileData bool) { teardown(t) if envFile { - fp, err := os.OpenFile(testEnvFile, os.O_RDONLY|os.O_CREATE, 0666); + fp, err := os.OpenFile(testEnvFile, os.O_RDONLY|os.O_CREATE, 0666) if err != nil { panic(err) } @@ -34,7 +34,7 @@ func setup(t testing.TB, envFile bool, envFileData bool) { if err != nil { panic(err) } - err = ioutil.WriteFile(testEnvFile, raw, 0755); + err = ioutil.WriteFile(testEnvFile, raw, 0755) if err != nil { panic(err) } @@ -94,7 +94,7 @@ func TestSessionEnvironmentWithDataFile(t *testing.T) { } if len(env.Data) != len(testEnvData) { t.Fatalf("expected %d, found %d", len(testEnvData), len(env.Data)) - } + } if !reflect.DeepEqual(env.Data, testEnvData) { t.Fatalf("unexpected contents: %v", env.Data) } @@ -147,12 +147,12 @@ func TestSessionEnvironmentHas(t *testing.T) { env, err := NewEnvironment(testEnvFile) if err != nil { t.Fatalf("unexpected error: %v", err) - } + } if len(env.Data) != len(testEnvData) { t.Fatalf("expected %d, found %d", len(testEnvData), len(env.Data)) } t.Log("expected environment") - + for k := range testEnvData { if !env.Has(k) { t.Fatalf("could not find key '%s'", k) @@ -213,7 +213,7 @@ func TestSessionEnvironmentSetWithCallback(t *testing.T) { old = env.Set("people", "shitagain") if old != "ok" { t.Fatalf("unexpected old value: %s", old) - } + } if !cbCalled { t.Fatal("callback has not been called") } @@ -237,7 +237,7 @@ func TestSessionEnvironmentGet(t *testing.T) { t.Fatalf("expected %d, found %d", len(testEnvData), len(env.Data)) } t.Log("expected environment") - + for k, v := range testEnvData { found, vv := env.Get(k) if !found { @@ -276,10 +276,10 @@ func TestSessionEnvironmentGetInt(t *testing.T) { } env.Data["num"] = "1234" - err, i := env.GetInt("num"); + err, i := env.GetInt("num") if err != nil { t.Fatalf("unexpected error: %v", err) - } + } if i != 1234 { t.Fatalf("unexpected integer: %d", i) } diff --git a/session/module.go b/session/module.go index 7f9843f9..64d77622 100644 --- a/session/module.go +++ b/session/module.go @@ -61,11 +61,11 @@ func (m *SessionModule) Param(name string) *ModuleParam { func (m SessionModule) ListParam(name string) (err error, values []string) { values = make([]string, 0) - err, list := m.StringParam(name); + err, list := m.StringParam(name) if err != nil { return } - + parts := strings.Split(list, ",") for _, part := range parts { part = str.Trim(part) @@ -77,9 +77,9 @@ func (m SessionModule) ListParam(name string) (err error, values []string) { } func (m SessionModule) StringParam(name string) (error, string) { - p, found := m.params[name]; + p, found := m.params[name] if found { - err, v := p.Get(m.Session); + err, v := p.Get(m.Session) if err != nil { return err, "" } @@ -89,7 +89,7 @@ func (m SessionModule) StringParam(name string) (error, string) { } func (m SessionModule) IPParam(name string) (error, net.IP) { - err, v := m.StringParam(name); + err, v := m.StringParam(name) if err != nil { return err, nil } @@ -97,9 +97,9 @@ func (m SessionModule) IPParam(name string) (error, net.IP) { } func (m SessionModule) IntParam(name string) (error, int) { - p, found := m.params[name]; + p, found := m.params[name] if found { - err, v := p.Get(m.Session); + err, v := p.Get(m.Session) if err != nil { return err, 0 } @@ -109,7 +109,7 @@ func (m SessionModule) IntParam(name string) (error, int) { } func (m SessionModule) BoolParam(name string) (error, bool) { - err, v := m.params[name].Get(m.Session); + err, v := m.params[name].Get(m.Session) if err != nil { return err, false } diff --git a/session/session.go b/session/session.go index 7749053a..37234650 100644 --- a/session/session.go +++ b/session/session.go @@ -119,7 +119,7 @@ func New() (*Session, error) { } if *s.Options.CpuProfile != "" { - f, err := os.Create(*s.Options.CpuProfile); + f, err := os.Create(*s.Options.CpuProfile) if err != nil { return nil, err } diff --git a/session/session_core_handlers.go b/session/session_core_handlers.go index d75a9e4f..955b551e 100644 --- a/session/session_core_handlers.go +++ b/session/session_core_handlers.go @@ -162,7 +162,7 @@ func (s *Session) exitHandler(args []string, sess *Session) error { } func (s *Session) sleepHandler(args []string, sess *Session) error { - secs, err := strconv.Atoi(args[0]); + secs, err := strconv.Atoi(args[0]) if err == nil { time.Sleep(time.Duration(secs) * time.Second) } diff --git a/session/session_parse.go b/session/session_parse.go index d28f1534..9953a51f 100644 --- a/session/session_parse.go +++ b/session/session_parse.go @@ -74,7 +74,7 @@ func ParseCommands(line string) []string { func (s *Session) parseEnvTokens(str string) (string, error) { for _, m := range reEnvVarCapture.FindAllString(str, -1) { varName := strings.Trim(strings.Replace(m, "env.", "", -1), "{}") - found, value := s.Env.Get(varName); + found, value := s.Env.Get(varName) if !found { return "", fmt.Errorf("variable '%s' is not defined", varName) }