github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-07-16 10:03:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

misc: small fix or general refactoring i did not bother commenting

Browse source
This commit is contained in:
evilsocket 2018-02-20 04:51:45 +01:00
parent b5ffeeba7a
commit 0e03db7b9e
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/http_proxy_script.go
View file

@ -45,7 +45,7 @@ func LoadProxyScriptSource(path, source string, sess *session.Session) (err erro
} }
// define session pointer // define session pointer
err = s.VM.Set("env", sess.Env.Storage) err = s.VM.Set("env", sess.Env.Data)
if err != nil { if err != nil {
log.Error("Error while defining environment: %s", err) log.Error("Error while defining environment: %s", err)
return return

14
session/environment.go
View file

@ -15,7 +15,7 @@ type Environment struct {
sync.Mutex sync.Mutex
Padding int `json:"-"` Padding int `json:"-"`
Storage map[string]string `json:"storage"` Data map[string]string `json:"data"`
cbs map[string]SetCallback cbs map[string]SetCallback
sess *Session sess *Session
@ -24,7 +24,7 @@ type Environment struct {
func NewEnvironment(s *Session) *Environment { func NewEnvironment(s *Session) *Environment {
env := &Environment{ env := &Environment{
Padding: 0, Padding: 0,
Storage: make(map[string]string), Data: make(map[string]string),
sess: s, sess: s,
cbs: make(map[string]SetCallback), cbs: make(map[string]SetCallback),
} }
@ -36,7 +36,7 @@ func (env *Environment) Has(name string) bool {
env.Lock() env.Lock()
defer env.Unlock() defer env.Unlock()
_, found := env.Storage[name] _, found := env.Data[name]
return found return found
} }
@ -57,8 +57,8 @@ func (env *Environment) Set(name, value string) string {
env.Lock() env.Lock()
defer env.Unlock() defer env.Unlock()
old, _ := env.Storage[name] old, _ := env.Data[name]
env.Storage[name] = value env.Data[name] = value
if cb, hasCallback := env.cbs[name]; hasCallback == true { if cb, hasCallback := env.cbs[name]; hasCallback == true {
cb(value) cb(value)
@ -78,7 +78,7 @@ func (env *Environment) Get(name string) (bool, string) {
env.Lock() env.Lock()
defer env.Unlock() defer env.Unlock()
if value, found := env.Storage[name]; found == true { if value, found := env.Data[name]; found == true {
return true, value return true, value
} }
@ -102,7 +102,7 @@ func (env *Environment) Sorted() []string {
defer env.Unlock() defer env.Unlock()
var keys []string var keys []string
for k := range env.Storage { for k := range env.Data {
keys = append(keys, k) keys = append(keys, k)
} }
sort.Strings(keys) sort.Strings(keys)

6
session/session_core_handlers.go
View file

@ -132,7 +132,7 @@ func (s *Session) getHandler(args []string, sess *Session) error {
prev_ns = ns prev_ns = ns
} }
fmt.Printf(" %"+strconv.Itoa(s.Env.Padding)+"s: '%s'\n", k, s.Env.Storage[k]) fmt.Printf(" %"+strconv.Itoa(s.Env.Padding)+"s: '%s'\n", k, s.Env.Data[k])
} }
fmt.Println() fmt.Println()
} else if found, value := s.Env.Get(key); found == true { } else if found, value := s.Env.Get(key); found == true {
@ -241,7 +241,7 @@ func (s *Session) registerCoreHandlers() {
readline.PcItem("get", readline.PcItemDynamic(func(prefix string) []string { readline.PcItem("get", readline.PcItemDynamic(func(prefix string) []string {
prefix = core.Trim(prefix[3:]) prefix = core.Trim(prefix[3:])
varNames := []string{""} varNames := []string{""}
for key := range s.Env.Storage { for key := range s.Env.Data {
if prefix == "" || strings.HasPrefix(key, prefix) == true { if prefix == "" || strings.HasPrefix(key, prefix) == true {
varNames = append(varNames, key) varNames = append(varNames, key)
} }
@ -256,7 +256,7 @@ func (s *Session) registerCoreHandlers() {
readline.PcItem("set", readline.PcItemDynamic(func(prefix string) []string { readline.PcItem("set", readline.PcItemDynamic(func(prefix string) []string {
prefix = core.Trim(prefix[3:]) prefix = core.Trim(prefix[3:])
varNames := []string{""} varNames := []string{""}
for key := range s.Env.Storage { for key := range s.Env.Data {
if prefix == "" || strings.HasPrefix(key, prefix) == true { if prefix == "" || strings.HasPrefix(key, prefix) == true {
varNames = append(varNames, key) varNames = append(varNames, key)
} }