rsyncd: add HandleConnArgs (rsyncopts is not exported)

We should refactor InternalHandleConn away eventually.

Author: stapelberg

internal/maincmd/maincmd.go

@@ -96,7 +96,7 @@ func Main(ctx context.Context, args []string, stdin io.Reader, stdout io.Writer,
 			log.Printf("paths: %q", remaining[1:])
 		}
 		conn := rsyncd.NewConnection(stdin, stdout, "<remote-shell>")
-		return nil, srv.HandleConn(ctx, conn, nil, pc)
+		return nil, srv.InternalHandleConn(ctx, conn, nil, pc)
 	}
 
 	if !opts.Daemon() {

rsyncclient/rsyncclient_test.go

@@ -77,7 +77,7 @@ func ExampleClient_Run_sendToGoroutine() {
 		if err != nil {
 			log.Fatalf("parsing server args: %v", err)
 		}
-		if err := rsync.HandleConn(ctx, conn, nil, pc); err != nil {
+		if err := rsync.InternalHandleConn(ctx, conn, nil, pc); err != nil {
 			log.Fatal(err)
 		}
 	}()
@@ -176,7 +176,7 @@ func TestClientServerModule(t *testing.T) {
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
-		err := rsync.HandleConn(t.Context(), conn, &mod, pc)
+		err := rsync.InternalHandleConn(t.Context(), conn, &mod, pc)
 		if err != nil {
 			t.Error(err)
 		}
@@ -243,7 +243,7 @@ func TestClientServerCommand(t *testing.T) {
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
-		err := rsync.HandleConn(t.Context(), conn, nil, pc)
+		err := rsync.InternalHandleConn(t.Context(), conn, nil, pc)
 		if err != nil {
 			t.Error(err)
 		}
@@ -309,7 +309,7 @@ func TestClientServerCommandSender(t *testing.T) {
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
-		err := rsync.HandleConn(t.Context(), conn, nil, pc)
+		err := rsync.InternalHandleConn(t.Context(), conn, nil, pc)
 		if err != nil {
 			t.Error(err)
 		}

rsyncd/rsyncd.go

@@ -300,7 +300,16 @@ func NewConnection(r io.Reader, w io.Writer, name string) *Conn {
 	}
 }
 
-func (s *Server) HandleConn(ctx context.Context, conn *Conn, module *Module, pc *rsyncopts.Context) error {
+// This method is only exported until we refactor; use HandleConnArgs() instead
+func (s *Server) InternalHandleConn(ctx context.Context, conn *Conn, module *Module, pc *rsyncopts.Context) error {
+	return s.handleConn(ctx, conn, module, pc, true /* negotiate */)
+}
+
+func (s *Server) HandleConnArgs(ctx context.Context, conn *Conn, module *Module, args []string) error {
+	pc, err := rsyncopts.ParseArguments(args)
+	if err != nil {
+		return fmt.Errorf("parsing server args: %v", err)
+	}
 	return s.handleConn(ctx, conn, module, pc, true /* negotiate */)
 }