github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-19 13:09:49 -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 2019-03-27 16:47:28 +01:00
commit 4713d25ea7
No known key found for this signature in database
GPG key ID: 1564D7F30393A456
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/dns_spoof/dns_spoof_hosts.go
View file

@ -46,7 +46,7 @@ func NewHostEntry(host string, address net.IP) HostEntry {
return entry return entry
} }
func HostsFromFile(filename string,defaultAddress net.IP) (err error, entries []HostEntry) { func HostsFromFile(filename string, defaultAddress net.IP) (err error, entries []HostEntry) {
input, err := os.Open(filename) input, err := os.Open(filename)
if err != nil { if err != nil {
return return

20
modules/utils/script_builtins.go
View file

@ -38,7 +38,7 @@ func init() {
entry_list := []string{} entry_list := []string{}
for _, file := range dir { for _, file := range dir {
entry_list = append( entry_list, file.Name() ) entry_list = append(entry_list, file.Name())
} }
v, err := otto.Otto.ToValue(*call.Otto, entry_list) v, err := otto.Otto.ToValue(*call.Otto, entry_list)
@ -167,21 +167,21 @@ func init() {
return errOtto("gzipCompress: expected 1 argument, %d given instead.", argc) return errOtto("gzipCompress: expected 1 argument, %d given instead.", argc)
} }
uncompressed_bytes := []byte( argv[0].String() ) uncompressed_bytes := []byte(argv[0].String())
var writer_buffer bytes.Buffer var writer_buffer bytes.Buffer
gzip_writer := gzip.NewWriter(&writer_buffer) gzip_writer := gzip.NewWriter(&writer_buffer)
_, err := gzip_writer.Write(uncompressed_bytes) _, err := gzip_writer.Write(uncompressed_bytes)
if err != nil { if err != nil {
return errOtto( "gzipCompress: could not compress data: %s", err.Error() ) return errOtto("gzipCompress: could not compress data: %s", err.Error())
} }
gzip_writer.Close() gzip_writer.Close()
compressed_bytes := writer_buffer.Bytes() compressed_bytes := writer_buffer.Bytes()
v, err := otto.ToValue( string(compressed_bytes) ) v, err := otto.ToValue(string(compressed_bytes))
if err != nil { if err != nil {
return errOtto( "Could not convert to string: %s", err.Error() ) return errOtto("Could not convert to string: %s", err.Error())
} }
return v return v
@ -195,24 +195,24 @@ func init() {
return errOtto("gzipDecompress: expected 1 argument, %d given instead.", argc) return errOtto("gzipDecompress: expected 1 argument, %d given instead.", argc)
} }
compressed_bytes := []byte( argv[0].String() ) compressed_bytes := []byte(argv[0].String())
reader_buffer := bytes.NewBuffer(compressed_bytes) reader_buffer := bytes.NewBuffer(compressed_bytes)
gzip_reader, err := gzip.NewReader(reader_buffer) gzip_reader, err := gzip.NewReader(reader_buffer)
if err != nil { if err != nil {
return errOtto( "gzipDecompress: could not create gzip reader: %s", err.Error() ) return errOtto("gzipDecompress: could not create gzip reader: %s", err.Error())
} }
var decompressed_buffer bytes.Buffer var decompressed_buffer bytes.Buffer
_, err = decompressed_buffer.ReadFrom(gzip_reader) _, err = decompressed_buffer.ReadFrom(gzip_reader)
if err != nil { if err != nil {
return errOtto( "gzipDecompress: could not decompress data: %s", err.Error() ) return errOtto("gzipDecompress: could not decompress data: %s", err.Error())
} }
decompressed_bytes := decompressed_buffer.Bytes() decompressed_bytes := decompressed_buffer.Bytes()
v, err := otto.ToValue( string(decompressed_bytes) ) v, err := otto.ToValue(string(decompressed_bytes))
if err != nil { if err != nil {
return errOtto( "Could not convert to string: %s", err.Error() ) return errOtto("Could not convert to string: %s", err.Error())
} }
return v return v