"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files
Go azure-blobazure-blob-storageazure-filesbackblaze-b2cloud-storagedropboxencryptionftpfuse-filesystemgogolanggoogle-cloud-storagegoogle-driveonedriveopenstack-swiftrclones3sftpsyncwebdav
gui: drop freePort helper, use libhttp port binding for the RC server
Nick Craig-Wood8ddccc12853f
diff --git a/cmd/gui/gui.go b/cmd/gui/gui.goindex 434ab4aa5..eb082e26f 100644--- a/cmd/gui/gui.go+++ b/cmd/gui/gui.go@@ -8,7 +8,6 @@ import ("flag""fmt"iofs "io/fs"- "net""net/http""net/url""os"@@ -134,11 +133,7 @@ Use --no-auth to disable authentication entirely:if command.Flags().Changed("api-addr") {opt.HTTP.ListenAddr = apiAddr} else {- port, err := freePort()- if err != nil {- return fmt.Errorf("failed to find a free port for RC: %w", err)- }- opt.HTTP.ListenAddr = []string{fmt.Sprintf("localhost:%d", port)}+ opt.HTTP.ListenAddr = []string{"localhost:0"}}// CORS: allow the GUI origin to make cross-port API requests.@@ -181,9 +176,9 @@ Use --no-auth to disable authentication entirely:return fmt.Errorf("failed to start RC server: %w", err)}- // Build the RC URL from the address we configured (rcserver.Server- // does not expose URLs, and we know the address we passed in).- rcURL := "http://" + opt.HTTP.ListenAddr[0] + "/"+ // Read the bound RC URL back from rcserver, in case we asked+ // libhttp to pick a free port (localhost:0).+ rcURL := rcServer.URLs()[0]// Mount the GUI handler and start servingspaHandler, err := guiHandler(srcFS)@@ -219,16 +214,6 @@ Use --no-auth to disable authentication entirely:},}-// freePort asks the OS for a free TCP port on localhost.-func freePort() (int, error) {- l, err := net.Listen("tcp", "localhost:0")- if err != nil {- return 0, err- }- defer func() { _ = l.Close() }()- return l.Addr().(*net.TCPAddr).Port, nil-}-// originFromURL extracts the origin (scheme://host) from a URL string,// stripping any path or trailing slash.func originFromURL(rawURL string) string {diff --git a/cmd/gui/gui_test.go b/cmd/gui/gui_test.goindex 0a9978e46..f6f487d48 100644--- a/cmd/gui/gui_test.go+++ b/cmd/gui/gui_test.go@@ -96,13 +96,6 @@ func TestOriginFromURL(t *testing.T) {}}-func TestFreePort(t *testing.T) {- port, err := freePort()- assert.NoError(t, err)- assert.Greater(t, port, 0)- assert.Less(t, port, 65536)-}-// newTestHandler returns a guiHandler backed by the embedded GUI// bundle, or skips the test if it is not present (i.e. `make fetch-gui`// has not been run).diff --git a/fs/rc/rcserver/rcserver.go b/fs/rc/rcserver/rcserver.goindex 7b6622c43..745a66c07 100644--- a/fs/rc/rcserver/rcserver.go+++ b/fs/rc/rcserver/rcserver.go@@ -409,6 +409,12 @@ func (s *Server) handleGet(w http.ResponseWriter, r *http.Request, path string)http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)}+// URLs returns the URLs the server is listening on. Only valid after+// Serve has been called (which Start does internally before returning).+func (s *Server) URLs() []string {+ return s.server.URLs()+}+// Wait blocks while the server is serving requestsfunc (s *Server) Wait() {s.server.Wait()