opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-19 08:09:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Add VarlinkCall.RequiresUpgrade() type and method"

Browse Source 
This reverts commit bd3154fcf6a48b37cfde5d9b1226900cd863c0d9.

Commit in question may be breaking upstream CI.

Signed-off-by: Matthew Heon <mheon@redhat.com>
This commit is contained in:
Matthew Heon
2019-05-16 14:35:49 -04:00
parent 8161802f7d
commit 601fc2ce4f
4 changed files with 23 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
pkg/varlinkapi/transfers.go
View File

@ -15,61 +15,58 @@ import (
// SendFile allows a client to send a file to the varlink server
func (i *LibpodAPI) SendFile(call iopodman.VarlinkCall, ftype string, length int64) error {
varlink := VarlinkCall{&call}
if err := varlink.RequiresUpgrade(); err != nil {
return varlink.ReplyErrorOccurred(err.Error())
if !call.WantsUpgrade() {
return call.ReplyErrorOccurred("client must use upgraded connection to send files")
}
outputFile, err := ioutil.TempFile("", "varlink_send")
if err != nil {
return varlink.ReplyErrorOccurred(err.Error())
return call.ReplyErrorOccurred(err.Error())
}
defer outputFile.Close()
if err = varlink.ReplySendFile(outputFile.Name()); err != nil {
return varlink.ReplyErrorOccurred(err.Error())
if err = call.ReplySendFile(outputFile.Name()); err != nil {
return call.ReplyErrorOccurred(err.Error())
}
writer := bufio.NewWriter(outputFile)
defer writer.Flush()
reader := varlink.Call.Reader
reader := call.Call.Reader
if _, err := io.CopyN(writer, reader, length); err != nil {
return err
}
logrus.Debugf("successfully received %s", outputFile.Name())
// Send an ACK to the client
varlink.Call.Writer.WriteString(fmt.Sprintf("%s:", outputFile.Name()))
varlink.Call.Writer.Flush()
call.Call.Writer.WriteString(fmt.Sprintf("%s:", outputFile.Name()))
call.Call.Writer.Flush()
return nil
}
// ReceiveFile allows the varlink server to send a file to a client
func (i *LibpodAPI) ReceiveFile(call iopodman.VarlinkCall, filepath string, delete bool) error {
varlink := VarlinkCall{&call}
if err := varlink.RequiresUpgrade(); err != nil {
return varlink.ReplyErrorOccurred(err.Error())
if !call.WantsUpgrade() {
return call.ReplyErrorOccurred("client must use upgraded connection to send files")
}
fs, err := os.Open(filepath)
if err != nil {
return varlink.ReplyErrorOccurred(err.Error())
return call.ReplyErrorOccurred(err.Error())
}
fileInfo, err := fs.Stat()
if err != nil {
return varlink.ReplyErrorOccurred(err.Error())
return call.ReplyErrorOccurred(err.Error())
}
// Send the file length down to client
// Varlink connection upraded
if err = varlink.ReplyReceiveFile(fileInfo.Size()); err != nil {
return varlink.ReplyErrorOccurred(err.Error())
if err = call.ReplyReceiveFile(fileInfo.Size()); err != nil {
return call.ReplyErrorOccurred(err.Error())
}
reader := bufio.NewReader(fs)
_, err = reader.WriteTo(varlink.Writer)
_, err = reader.WriteTo(call.Writer)
if err != nil {
return err
}
@ -78,5 +75,5 @@ func (i *LibpodAPI) ReceiveFile(call iopodman.VarlinkCall, filepath string, dele
return err
}
}
return varlink.Writer.Flush()
return call.Writer.Flush()
}