Verify filters on clientside

src/unoserver/client.py

@@ -50,6 +50,11 @@ def _connect(self, proxy, retries=5, sleep=10):
         while retries > 0:
             try:
                 info = proxy.info()
+                if not info["unoserver"] == __version__:
+                    raise RuntimeError(
+                        f"Version mismatch. Client runs {__version__} while "
+                        f"Server runs {info['unoserver']}"
+                    )
                 return info
             except ConnectionError:
                 retries -= 1
@@ -112,7 +117,21 @@ def convert(
                 raise ValueError("The outpath can not be a directory")
 
         with ServerProxy(f"http://{self.server}:{self.port}", allow_none=True) as proxy:
-            self._connect(proxy)
+            info = self._connect(proxy)
+
+            if infiltername and infiltername not in info["import_filters"]:
+                existing = "\n".join(sorted(info["import_filters"]))
+                logger.critical(
+                    f"Unknown import filter: {infiltername}. Available filters:\n{existing}"
+                )
+                raise RuntimeError("Invalid parameter")
+
+            if filtername and filtername not in info["export_filters"]:
+                existing = "\n".join(sorted(info["export_filters"]))
+                logger.critical(
+                    f"Unknown export filter: {filtername}. Available filters:\n{existing}"
+                )
+                raise RuntimeError("Invalid parameter")
 
             result = proxy.convert(
                 inpath,

tests/test_integration.py

@@ -147,7 +147,7 @@ def test_explicit_export_filter(server_fixture, filename):
 
 @pytest.mark.parametrize("filename", ["simple.odt", "simple.xlsx"])
 def test_invalid_explicit_export_filter_prints_available_filters(
-    server_fixture, filename
+    caplog, server_fixture, filename
 ):
     infile = os.path.join(TEST_DOCS, filename)
 
@@ -156,10 +156,13 @@ def test_invalid_explicit_export_filter_prints_available_filters(
         sys.argv = ["unoconverter", "--filter", "asdasdasd", infile, outfile.name]
         try:
             client.converter_main()
-        except Fault as err:
-            assert "Office Open XML Text" in err.faultString
-            assert "writer8" in err.faultString
-            assert "writer_pdf_Export" in err.faultString
+        except RuntimeError:
+            errstr = caplog.text
+            print(errstr)
+            print("=" * 30)
+            assert "Office Open XML Text" in errstr
+            assert "writer8" in errstr
+            assert "writer_pdf_Export" in errstr
 
 
 def test_update_index(server_fixture):
@@ -190,7 +193,7 @@ def test_update_index(server_fixture):
 
 def test_convert_not_local():
     hostname = socket.gethostname()
-    cmd = ["unoserver", "--uno-port=2102", "--port=2103", f"--interface={hostname}"]
+    cmd = ["unoserver", "--uno-port=2104", "--port=2105", f"--interface={hostname}"]
     process = subprocess.Popen(cmd)
     try:
         # Wait for it to start
@@ -205,7 +208,7 @@ def test_convert_not_local():
                 "unoconverter",
                 "--host",
                 hostname,
-                "--port=2103",
+                "--port=2105",
                 infile,
                 outfile.name,
             ]
@@ -226,7 +229,7 @@ def test_convert_not_local():
 
 def test_compare_not_local():
     hostname = socket.gethostname()
-    cmd = ["unoserver", "--uno-port=2102", "--port=2103", f"--interface={hostname}"]
+    cmd = ["unoserver", "--uno-port=2104", "--port=2105", f"--interface={hostname}"]
     process = subprocess.Popen(cmd)
     try:
         # Wait for it to start
@@ -242,7 +245,7 @@ def test_compare_not_local():
                 "unoconverter",
                 "--host",
                 hostname,
-                "--port=2103",
+                "--port=2105",
                 infile1,
                 infile2,
                 outfile.name,

tests/test_server.py

@@ -27,6 +27,7 @@ def test_server_params(popen_mock, thread_mock):
         ]
     )
 
+
 @mock.patch("threading.Thread")
 @mock.patch("subprocess.Popen")
 def test_server_ipv6_params(popen_mock, thread_mock):