osbase: move test packages under osbase/test
The cmd, freeport and socksproxy packages are only used in tests, and
are also intended to be only used in tests. This change moves these
packages under osbase/test.
Change-Id: I8fe679945990c295bdf822abfce56c25233c4588
Reviewed-on: https://review.monogon.dev/c/monogon/+/4564
Reviewed-by: Tim Windelschmidt <tim@monogon.tech>
Tested-by: Jenkins CI
diff --git a/osbase/test/freeport/BUILD.bazel b/osbase/test/freeport/BUILD.bazel
new file mode 100644
index 0000000..30d229f
--- /dev/null
+++ b/osbase/test/freeport/BUILD.bazel
@@ -0,0 +1,8 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+ name = "freeport",
+ srcs = ["freeport.go"],
+ importpath = "source.monogon.dev/osbase/test/freeport",
+ visibility = ["//visibility:public"],
+)
diff --git a/osbase/test/freeport/freeport.go b/osbase/test/freeport/freeport.go
new file mode 100644
index 0000000..ec6a417
--- /dev/null
+++ b/osbase/test/freeport/freeport.go
@@ -0,0 +1,41 @@
+// Copyright The Monogon Project Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package freeport
+
+import (
+ "io"
+ "net"
+)
+
+// AllocateTCPPort allocates a TCP port on the looopback address, and starts a
+// temporary listener on it. That listener is returned to the caller alongside with
+// the allocated port number. The listener must be closed right before the port is
+// used by the caller. This naturally still leaves a race condition window where
+// that port number might be snatched up by some other process, but there doesn't
+// seem to be a better way to do this.
+func AllocateTCPPort() (uint16, io.Closer, error) {
+ addr, err := net.ResolveTCPAddr("tcp", "127.0.0.1:0")
+ if err != nil {
+ return 0, nil, err
+ }
+
+ l, err := net.ListenTCP("tcp", addr)
+ if err != nil {
+ return 0, nil, err
+ }
+ return uint16(l.Addr().(*net.TCPAddr).Port), l, nil
+}
+
+// MustConsume takes the result of AllocateTCPPort, closes the listener and returns
+// the allocated port. If anything goes wrong (port could not be allocated or
+// closed) it will panic.
+func MustConsume(port uint16, lis io.Closer, err error) int {
+ if err != nil {
+ panic(err)
+ }
+ if err := lis.Close(); err != nil {
+ panic(err)
+ }
+ return int(port)
+}