use correct param type instead of asserting

eikenb · eikenb · commit 048358fb969c · 2018-07-23T15:53:41.000-07:00
Instead of accepting a more general type and then asserting it to the
proper type, just take the proper type as the argument.
Also clean up some of the use of it where it checked old direct sending
code's return error (error is now always nil).
diff --git a/packet-typing.go b/packet-typing.go
@@ -75,6 +75,7 @@ func (p sshFxpStatusPacket) id() uint32 { return p.ID }
 func (p sshFxpStatResponse) id() uint32 { return p.ID }
 func (p sshFxpNamePacket) id() uint32   { return p.ID }
 func (p sshFxpHandlePacket) id() uint32 { return p.ID }
+func (p StatVFS) id() uint32            { return p.ID }
 func (p sshFxVersionPacket) id() uint32 { return 0 }
 
 // take raw incoming packet data and build packet objects
diff --git a/request-server.go b/request-server.go
@@ -2,7 +2,6 @@ package sftp
 
 import (
 	"context"
-	"encoding"
 	"io"
 	"os"
 	"path"
@@ -209,10 +208,7 @@ func (rs *RequestServer) packetWorker(
 			return errors.Errorf("unexpected packet type %T", pkt)
 		}
 
-		err := rs.sendPacket(rpkt)
-		if err != nil {
-			return err
-		}
+		rs.sendPacket(rpkt)
 	}
 	return nil
 }
@@ -246,11 +242,6 @@ func cleanPath(p string) string {
 }
 
 // Wrap underlying connection methods to use packetManager
-func (rs *RequestServer) sendPacket(m encoding.BinaryMarshaler) error {
-	if pkt, ok := m.(responsePacket); ok {
-		rs.pktMgr.readyPacket(pkt)
-	} else {
-		return errors.Errorf("unexpected packet type %T", m)
-	}
-	return nil
+func (rs *RequestServer) sendPacket(pkt responsePacket) {
+	rs.pktMgr.readyPacket(pkt)
 }
diff --git a/server.go b/server.go
@@ -140,9 +140,7 @@ func (svr *Server) sftpServerWorker(pktChan chan requestPacket) error {
 		// If server is operating read-only and a write operation is requested,
 		// return permission denied
 		if !readonly && svr.readOnly {
-			if err := svr.sendError(pkt, syscall.EPERM); err != nil {
-				return errors.Wrap(err, "failed to send read only packet response")
-			}
+			svr.sendError(pkt, syscall.EPERM)
 			continue
 		}
 
@@ -339,12 +337,8 @@ func (svr *Server) Serve() error {
 }
 
 // Wrap underlying connection methods to use packetManager
-func (svr *Server) sendPacket(m encoding.BinaryMarshaler) error {
-	if pkt, ok := m.(responsePacket); ok {
-		svr.pktMgr.readyPacket(pkt)
-	} else {
-		return errors.Errorf("unexpected packet type %T", m)
-	}
+func (svr *Server) sendPacket(pkt responsePacket) error {
+	svr.pktMgr.readyPacket(pkt)
 	return nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ package sftp`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`		`- "encoding"`
`6`	`5`	`"io"`
`7`	`6`	`"os"`
`8`	`7`	`"path"`
`@@ -209,10 +208,7 @@ func (rs *RequestServer) packetWorker(`
`209`	`208`	`return errors.Errorf("unexpected packet type %T", pkt)`
`210`	`209`	`}`
`211`	`210`
`212`		`- err := rs.sendPacket(rpkt)`
`213`		`- if err != nil {`
`214`		`- return err`
`215`		`- }`
	`211`	`+ rs.sendPacket(rpkt)`
`216`	`212`	`}`
`217`	`213`	`return nil`
`218`	`214`	`}`
`@@ -246,11 +242,6 @@ func cleanPath(p string) string {`
`246`	`242`	`}`
`247`	`243`
`248`	`244`	`// Wrap underlying connection methods to use packetManager`
`249`		`-func (rs *RequestServer) sendPacket(m encoding.BinaryMarshaler) error {`
`250`		`- if pkt, ok := m.(responsePacket); ok {`
`251`		`- rs.pktMgr.readyPacket(pkt)`
`252`		`- } else {`
`253`		`- return errors.Errorf("unexpected packet type %T", m)`
`254`		`- }`
`255`		`- return nil`
	`245`	`+func (rs *RequestServer) sendPacket(pkt responsePacket) {`
	`246`	`+ rs.pktMgr.readyPacket(pkt)`
`256`	`247`	`}`