Add tests for and fix #14

tests/helpers.py

@@ -84,6 +84,7 @@ class SubprocessReader(contextlib.AbstractContextManager):
         self._log.debug(f"cleanup()")
         if self.process and self.process.running:
             self.process.terminate(kill_delay=0.1)
+        time.sleep(0.5)
 
     def __exit__(self, __exc_type: typing.Type[BaseException], __exc_value: BaseException,
                  __traceback: types.TracebackType) -> bool:

tests/test_args.py

@@ -33,11 +33,26 @@ def test_program_initiate_no_args():
         args = rnsh.args.Args(shlex.split("rnsh one"))
         assert not args.listen
         assert args.destination == "one"
+        assert not args.no_id
         assert args.command_line == []
     except docopt.DocoptExit:
         docopt_threw = True
     assert not docopt_threw
 
+
+def test_program_initiate_no_auth():
+    docopt_threw = False
+    try:
+        args = rnsh.args.Args(shlex.split("rnsh -N one"))
+        assert not args.listen
+        assert args.destination == "one"
+        assert args.no_id
+        assert args.command_line == []
+    except docopt.DocoptExit:
+        docopt_threw = True
+    assert not docopt_threw
+
+
 def test_program_initiate_dash_args():
     docopt_threw = False
     try:

tests/test_rnsh.py

@@ -123,14 +123,17 @@ async def do_connected_test(listener_args: str, initiator_args: str, test: calla
         assert len(ih) == 32
         assert len(dh) == 32
         assert len(iih) == 32
+        assert "dh" in initiator_args
+        initiator_args = initiator_args.replace("dh", dh)
+        listener_args = listener_args.replace("iih", iih)
         with tests.helpers.SubprocessReader(name="listener", argv=shlex.split(f"poetry run -- rnsh -l -c \"{td}\" {listener_args}")) as listener, \
-                tests.helpers.SubprocessReader(name="initiator", argv=shlex.split(f"poetry run -- rnsh -c \"{td}\" {dh} {initiator_args}")) as initiator:
+                tests.helpers.SubprocessReader(name="initiator", argv=shlex.split(f"poetry run -- rnsh -c \"{td}\" {initiator_args}")) as initiator:
             # listener startup
             listener.start()
             await asyncio.sleep(0.1)
             assert listener.process.running
             # wait for process to start up
-            await asyncio.sleep(5)
+            await asyncio.sleep(2)
             # read the output
             text = listener.read().decode("utf-8")
             assert text.index(dh) is not None
@@ -166,7 +169,55 @@ async def test_rnsh_get_echo_through():
         text = initiator.read().decode("utf-8").replace("\r", "").replace("\n", "")
         assert text[len(text)-len(cwd):] == cwd
 
-    await do_connected_test("-n -C -- /bin/pwd", "", test)
+    await do_connected_test("-n -C -- /bin/pwd", "dh", test)
+
+
+@pytest.mark.skip_ci
+@pytest.mark.asyncio
+async def test_rnsh_no_ident():
+    cwd = os.getcwd()
+
+    async def test(td: str, ih: str, dh: str, iih: str, listener: tests.helpers.SubprocessReader,
+                   initiator: tests.helpers.SubprocessReader):
+        start_time = time.time()
+        while initiator.return_code is None and time.time() - start_time < 3:
+            await asyncio.sleep(0.1)
+        text = initiator.read().decode("utf-8").replace("\r", "").replace("\n", "")
+        assert text[len(text)-len(cwd):] == cwd
+
+    await do_connected_test("-n -C -- /bin/pwd", "-N dh", test)
+
+
+@pytest.mark.skip_ci
+@pytest.mark.asyncio
+async def test_rnsh_invalid_ident():
+    cwd = os.getcwd()
+
+    async def test(td: str, ih: str, dh: str, iih: str, listener: tests.helpers.SubprocessReader,
+                   initiator: tests.helpers.SubprocessReader):
+        start_time = time.time()
+        while initiator.return_code is None and time.time() - start_time < 3:
+            await asyncio.sleep(0.1)
+        text = initiator.read().decode("utf-8").replace("\r", "").replace("\n", "")
+        assert "not allowed" in text
+
+    await do_connected_test("-a 12345678901234567890123456789012 -C -- /bin/pwd", "dh", test)
+
+
+@pytest.mark.skip_ci
+@pytest.mark.asyncio
+async def test_rnsh_valid_ident():
+    cwd = os.getcwd()
+
+    async def test(td: str, ih: str, dh: str, iih: str, listener: tests.helpers.SubprocessReader,
+                   initiator: tests.helpers.SubprocessReader):
+        start_time = time.time()
+        while initiator.return_code is None and time.time() - start_time < 3:
+            await asyncio.sleep(0.1)
+        text = initiator.read().decode("utf-8").replace("\r", "").replace("\n", "")
+        assert text[len(text)-len(cwd):] == cwd
+
+    await do_connected_test("-a iih -C -- /bin/pwd", "dh", test)