Fix tutorial

not_my_board/_agent.py

@@ -96,11 +96,10 @@ async def usbip_detach(vhci_port):
         await asyncio.sleep(2)
 
     async def port_forward(self, ready_event, proxy, target, local_port):
-        localhost = "127.0.0.1"
         connection_handler = functools.partial(
             self._handle_port_forward_client, proxy, target
         )
-        async with util.Server(connection_handler, localhost, local_port) as server:
+        async with util.Server(connection_handler, "localhost", local_port) as server:
             ready_event.set()
             await server.serve_forever()
 

not_my_board/_auth/_login.py

@@ -17,6 +17,9 @@ def __init__(self, hub_url, http_client, token_store_path):
         self._show_claims = None
         self._token_store = _TokenStore(token_store_path)
 
+        # fail early, if user doesn't have permission
+        self._token_store.check_access()
+
     async def _context_stack(self, stack):
         url = f"{self._hub_url}/api/v1/auth-info"
         auth_info = await self._http.get_json(url)
@@ -114,16 +117,15 @@ async def get_id_token(self):
 
 class _TokenStore(util.ContextStack):
     def __init__(self, path_str=None):
-        path = pathlib.Path(path_str)
-
-        if not path.exists():
-            path.parent.mkdir(parents=True, exist_ok=True)
-            path.touch(mode=0o600)
+        self._path = pathlib.Path(path_str)
 
-        if not os.access(path, os.R_OK | os.W_OK):
-            raise RuntimeError(f"Not allowed to access {path}")
+    def check_access(self):
+        if not self._path.exists():
+            self._path.parent.mkdir(parents=True, exist_ok=True)
+            self._path.touch(mode=0o600)
 
-        self._path = path
+        if not os.access(self._path, os.R_OK | os.W_OK):
+            raise RuntimeError(f"Not allowed to access {self._path}")
 
     async def _context_stack(self, stack):
         self._f = stack.enter_context(self._path.open("r+"))

not_my_board/_export.py

@@ -102,6 +102,11 @@ async def _handle_client(self, reader, writer):
 
             await self._tunnel(reader, writer, target, trailing_data)
         else:
+            logger.debug(
+                "Denying request for client %s, expected %s",
+                client_ip,
+                list(self._ip_to_tasks_map),
+            )
             await con.deny_request()
 
     async def _tunnel(self, client_r, client_w, target, trailing_data):

not_my_board/_hub.py

@@ -33,10 +33,11 @@ def run_hub():
 
     import uvicorn
 
-    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
-        s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+    with socket.socket(socket.AF_INET6, socket.SOCK_STREAM) as s:
+        s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, True)
+        s.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, False)
 
-        host = "0.0.0.0"  # noqa: S104
+        host = "::"
         port = 2092
         s.bind((host, port))
 

tests/test_tutorial.py

@@ -0,0 +1,23 @@
+async def test_tutorial(vms):
+    async with vms.hub.ssh_task("not-my-board hub", "hub", wait_ready=True):
+        async with vms.hub.ssh_task(
+            "python3 -m http.server -d ./src/tests/tutorial -b localhost 8080",
+            "http_server",
+        ):
+            async with vms.hub.ssh_task(
+                "not-my-board export http://localhost:2092 ./src/tests/tutorial/tutorial-tcp-place.toml",
+                "export",
+                wait_ready=True,
+            ):
+                async with vms.hub.ssh_task_root(
+                    "not-my-board agent http://localhost:2092", "agent", wait_ready=True
+                ):
+                    await vms.hub.ssh(
+                        "doas not-my-board attach ./src/tests/tutorial/tutorial-tcp.toml"
+                    )
+
+                    await vms.hub.ssh_poll("nc -z localhost 8080")
+                    result = await vms.hub.ssh(
+                        "wget -qO - http://localhost:8081/hello", prefix="wget"
+                    )
+                    assert result.stdout.rstrip() == "Hello, World!"

tests/tutorial/hello

@@ -0,0 +1 @@
+Hello, World!

tests/tutorial/tutorial-tcp-place.toml

@@ -0,0 +1,5 @@
+port = 2192
+
+[[parts]]
+compatible = [ "tutorial-http-server" ]
+tcp.http = { host = "localhost", port = 8080 }

tests/tutorial/tutorial-tcp.toml

@@ -0,0 +1,3 @@
+[parts.http-server]
+compatible = [ "tutorial-http-server" ]
+tcp.http = { local_port = 8081 }

tests/util.py

@@ -151,9 +151,9 @@ async def wait_for_ports(*ports, timeout=7):  # noqa: ASYNC109
         while True:
             try:
                 for port in ports:
-                    async with util.connect("127.0.0.1", port):
+                    async with util.connect("localhost", port):
                         pass
-            except ConnectionRefusedError:
+            except (ConnectionRefusedError, OSError):
                 await asyncio.sleep(0.1)
                 continue
             break