forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 07:06:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

swarm: removed limit, fixed tmpfile leak

Browse source 
added cleanup routine to delete tmpfile on fail
removed limit for stdin data
This commit is contained in:
nolash 2017-03-04 16:57:42 +01:00
parent 9f7d7f2e3a
commit 61b2ef3be8
1 changed files with 29 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
cmd/swarm/upload.go
View file

@ -36,23 +36,18 @@ import (
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )
var ( func cleanupAndDie(file *string, description string) {
MAX_STDIN_SIZE = 1024 * 1000 * 100 if file != nil {
) os.Remove(*file)
}
utils.Fatalf(description)
}
func swapStdin() (size int, path string) { func swapStdin(f *os.File) (size int) {
b := make([]byte, 1024) b := make([]byte, 1024)
path := f.Name()
size = 0 size = 0
td, err := ioutil.TempDir("", "swarm-stdin")
if err != nil {
utils.Fatalf("Could not create temporary directory: %s", err)
}
path = filepath.Join(td, "data")
f, err := os.Create(path)
if err != nil {
utils.Fatalf("Could not create temporary file: %s", err)
}
r := io.TeeReader(os.Stdin, f) r := io.TeeReader(os.Stdin, f)
for true { for true {
@ -60,15 +55,14 @@ func swapStdin() (size int, path string) {
if err == io.EOF { if err == io.EOF {
break break
} else if err != nil { } else if err != nil {
utils.Fatalf("STDIN Read failed: %s", err) cleanupAndDie(&path, "STDIN read failed")
} else if n > MAX_STDIN_SIZE {
utils.Fatalf("STDIN beyond max byte limit %d", MAX_STDIN_SIZE)
} }
size += n size += n
} }
if size == 0 {
return cleanupAndDie(&path, "STDIN zero length input")
}
return size
} }
func upload(ctx *cli.Context) { func upload(ctx *cli.Context) {
@ -86,10 +80,17 @@ func upload(ctx *cli.Context) {
var client = &client{api: bzzapi} var client = &client{api: bzzapi}
var entry manifestEntry var entry manifestEntry
var file string var file string
var cleanfile *string
if len(args) != 1 { if len(args) != 1 {
if fromStdin { if fromStdin {
_, file = swapStdin() f, err := ioutil.TempFile("", "swarm-stdin")
if err != nil {
utils.Fatalf("Could not create tempfile")
}
swapStdin(f)
file = f.Name()
cleanfile = &file
} else { } else {
utils.Fatalf("Need filename as the first and only argument") utils.Fatalf("Need filename as the first and only argument")
} }
@ -99,28 +100,29 @@ func upload(ctx *cli.Context) {
fi, err := os.Stat(expandPath(file)) fi, err := os.Stat(expandPath(file))
if err != nil { if err != nil {
utils.Fatalf("Failed to stat file: %v", err) cleanupAndDie(cleanfile, fmt.Sprintf("Failed to stat file: %v", err))
} }
if fi.IsDir() { if fi.IsDir() {
if !recursive { if !recursive {
utils.Fatalf("Argument is a directory and recursive upload is disabled") cleanupAndDie(cleanfile, "Argument is a directory and recursive upload is disabled")
} }
if !wantManifest { if !wantManifest {
utils.Fatalf("Manifest is required for directory uploads") cleanupAndDie(cleanfile, "Manifest is required for directory uploads")
} }
mhash, err := client.uploadDirectory(file, defaultPath) mhash, err := client.uploadDirectory(file, defaultPath)
if err != nil { if err != nil {
utils.Fatalf("Failed to upload directory: %v", err) cleanupAndDie(cleanfile, fmt.Sprintf("Failed to upload directory: %v", err))
} }
fmt.Println(mhash) fmt.Println(mhash)
return return
} }
entry, err = client.uploadFile(file, fi, mimeType) entry, err = client.uploadFile(file, fi, mimeType)
if err != nil { if err != nil {
utils.Fatalf("Upload failed: %v", err) cleanupAndDie(cleanfile, fmt.Sprintf("Upload failed: %v", err))
} }
if fromStdin { if cleanfile != nil {
os.RemoveAll(filepath.Dir(file)) os.Remove(file)
cleanfile = nil
} }
mroot := manifest{[]manifestEntry{entry}} mroot := manifest{[]manifestEntry{entry}}
if !wantManifest { if !wantManifest {