github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-19 21:13:18 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: fs related scripting functions will now resolve paths containing special characters

Browse source
This commit is contained in:
Simone Margaritelli 2022-06-13 16:55:41 +02:00
commit 4f3f55f648
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
session/script_builtin_runtime.go
View file

@ -107,9 +107,9 @@ func jsSaveJSONFunc(call otto.FunctionCall) otto.Value {
} }
obj := argv[0] obj := argv[0]
fileName := argv[1].String() if fileName, err := fs.Expand(argv[1].String()); err != nil {
return js.ReportError("can't expand '%s': %v", fileName, err)
if exp, err := obj.Export(); err != nil { } else if exp, err := obj.Export(); err != nil {
return js.ReportError("error exporting object: %v", err) return js.ReportError("error exporting object: %v", err)
} else if raw, err := json.Marshal(exp); err != nil { } else if raw, err := json.Marshal(exp); err != nil {
return js.ReportError("error serializing object: %v", err) return js.ReportError("error serializing object: %v", err)
@ -129,9 +129,11 @@ func jsLoadJSONFunc(call otto.FunctionCall) otto.Value {
return js.ReportError("loadJSON accepts one string argument") return js.ReportError("loadJSON accepts one string argument")
} }
fileName := argv[0].String()
var obj interface{} var obj interface{}
if rawData, err := ioutil.ReadFile(fileName); err != nil {
if fileName, err := fs.Expand(argv[0].String()); err != nil {
return js.ReportError("can't expand '%s': %v", fileName, err)
} else if rawData, err := ioutil.ReadFile(fileName); err != nil {
return js.ReportError("can't read '%s': %v", fileName, err) return js.ReportError("can't read '%s': %v", fileName, err)
} else if err = json.Unmarshal(rawData, &obj); err != nil { } else if err = json.Unmarshal(rawData, &obj); err != nil {
return js.ReportError("can't parse '%s': %v", fileName, err) return js.ReportError("can't parse '%s': %v", fileName, err)
@ -149,10 +151,9 @@ func jsFileExistsFunc(call otto.FunctionCall) otto.Value {
return js.ReportError("fileExists accepts one string argument") return js.ReportError("fileExists accepts one string argument")
} else if argv[0].IsString() == false { } else if argv[0].IsString() == false {
return js.ReportError("fileExists accepts one string argument") return js.ReportError("fileExists accepts one string argument")
} } else if fileName, err := fs.Expand(argv[0].String()); err != nil {
return js.ReportError("can't expand '%s': %v", fileName, err)
fileName := argv[0].String() } else if fs.Exists(fileName) {
if fs.Exists(fileName) {
return otto.TrueValue() return otto.TrueValue()
} }