Merge pull request pkg#85 from pkg/rootdir

mdlayher · mdlayher · commit e84cc8c755ca · 2016-01-18T14:07:21.000-05:00
server: remote rootDir parameter, as it does nothing
diff --git a/client_integration_test.go b/client_integration_test.go
@@ -102,7 +102,6 @@ func testClientGoSvr(t testing.TB, readonly bool, delay time.Duration) (*Client,
 	server, err := NewServer(
 		txPipeRd,
 		rxPipeWr,
-		".",
 		options...,
 	)
 	if err != nil {
diff --git a/examples/sftp-server/main.go b/examples/sftp-server/main.go
@@ -21,12 +21,10 @@ func main() {
 	var (
 		readOnly    bool
 		debugStderr bool
-		rootDir     string
 	)
 
 	flag.BoolVar(&readOnly, "R", false, "read-only server")
 	flag.BoolVar(&debugStderr, "e", false, "debug to stderr")
-	flag.StringVar(&rootDir, "root", "", "root directory")
 	flag.Parse()
 
 	debugStream := ioutil.Discard
@@ -123,7 +121,6 @@ func main() {
 		server, err := sftp.NewServer(
 			channel,
 			channel,
-			rootDir,
 			sftp.WithDebug(debugStream),
 			sftp.ReadOnly(),
 		)
diff --git a/server.go b/server.go
@@ -29,7 +29,6 @@ type Server struct {
 	outMutex      *sync.Mutex
 	debugStream   io.Writer
 	readOnly      bool
-	rootDir       string
 	lastID        uint32
 	pktChan       chan rxPacket
 	openFiles     map[string]*os.File
@@ -74,26 +73,16 @@ type serverRespondablePacket interface {
 }
 
 // NewServer creates a new Server instance around the provided streams, serving
-// content from the directory specified by rootDir.  Optionally, ServerOption
+// content from the root of the filesystem.  Optionally, ServerOption
 // functions may be specified to further configure the Server.
 //
 // A subsequent call to Serve() is required to begin serving files over SFTP.
-func NewServer(in io.Reader, out io.WriteCloser, rootDir string, options ...ServerOption) (*Server, error) {
-	if rootDir == "" {
-		wd, err := os.Getwd()
-		if err != nil {
-			return nil, err
-		}
-
-		rootDir = wd
-	}
-
+func NewServer(in io.Reader, out io.WriteCloser, options ...ServerOption) (*Server, error) {
 	s := &Server{
 		in:            in,
 		out:           out,
 		outMutex:      &sync.Mutex{},
 		debugStream:   ioutil.Discard,
-		rootDir:       rootDir,
 		pktChan:       make(chan rxPacket, sftpServerWorkerCount),
 		openFiles:     map[string]*os.File{},
 		openFilesLock: &sync.RWMutex{},
diff --git a/server_integration_test.go b/server_integration_test.go
@@ -297,7 +297,6 @@ func (chsvr *sshSessionChannelServer) handleSubsystem(req *ssh.Request) error {
 	sftpServer, err := NewServer(
 		chsvr.ch,
 		chsvr.ch,
-		".",
 		WithDebug(sftpServerDebugStream),
 	)
 	if err != nil {
diff --git a/server_standalone/main.go b/server_standalone/main.go
@@ -30,7 +30,6 @@ func main() {
 	svr, _ := sftp.NewServer(
 		os.Stdin,
 		os.Stdout,
-		"",
 		sftp.WithDebug(debugStream),
 		sftp.ReadOnly(),
 	)

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,6 @@ func testClientGoSvr(t testing.TB, readonly bool, delay time.Duration) (*Client,`
`102`	`102`	`server, err := NewServer(`
`103`	`103`	`txPipeRd,`
`104`	`104`	`rxPipeWr,`
`105`		`- ".",`
`106`	`105`	`options...,`
`107`	`106`	`)`
`108`	`107`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,6 @@ func (chsvr sshSessionChannelServer) handleSubsystem(req ssh.Request) error {`
`297`	`297`	`sftpServer, err := NewServer(`
`298`	`298`	`chsvr.ch,`
`299`	`299`	`chsvr.ch,`
`300`		`- ".",`
`301`	`300`	`WithDebug(sftpServerDebugStream),`
`302`	`301`	`)`
`303`	`302`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ func main() {`
`30`	`30`	`svr, _ := sftp.NewServer(`
`31`	`31`	`os.Stdin,`
`32`	`32`	`os.Stdout,`
`33`		`- "",`
`34`	`33`	`sftp.WithDebug(debugStream),`
`35`	`34`	`sftp.ReadOnly(),`
`36`	`35`	`)`