Merge remote-tracking branch 'origin/improve-docker-compose' into SHM race fix

# Conflicts:
#	concore.hpp

Author: concore-dev

.github/workflows/ci.yml

@@ -71,12 +71,13 @@ jobs:
 
       - name: Compile Java tests
         run: |
-          javac -cp jeromq.jar concoredocker.java TestLiteralEval.java TestConcoredockerApi.java
+          javac -cp jeromq.jar ConcoreJavaRuntimeCore.java concore.java concoredocker.java TestLiteralEval.java TestConcoredockerApi.java TestConcoreApi.java
 
       - name: Run Java tests
         run: |
           java -cp .:jeromq.jar TestLiteralEval
           java -cp .:jeromq.jar TestConcoredockerApi
+          java -cp .:jeromq.jar TestConcoreApi
 
   docker-build:
     runs-on: ubuntu-latest

0mq/comm_node.dir/concore2.py

@@ -130,6 +130,16 @@ def unchanged():
     olds = s
     return False
 
+def _resolve_port_file_path(base_path, port_num, name):
+    port_dir = os.path.abspath(base_path + str(port_num))
+    file_path = os.path.abspath(os.path.join(port_dir, name))
+    try:
+        if os.path.commonpath([port_dir, file_path]) != port_dir:
+            raise ValueError
+    except ValueError:
+        raise ValueError(f"Invalid file name '{name}' for port {port_num}")
+    return file_path
+
 def read(port_identifier, name, initstr_val):
     global s, simtime, retrycount
 
@@ -154,12 +164,12 @@ def read(port_identifier, name, initstr_val):
 
     try:
         file_port_num = int(port_identifier)
+        file_path = _resolve_port_file_path(inpath, file_port_num, name)
     except ValueError:
-        print(f"Error: Invalid port identifier '{port_identifier}' for file operation. Must be integer or ZMQ name.")
+        print(f"Error: Invalid port identifier '{port_identifier}' or file name '{name}' for file operation.")
         return default_return_val
 
     time.sleep(delay) 
-    file_path = os.path.join(inpath+str(file_port_num), name)
     ins = ""
 
     try:
@@ -220,9 +230,9 @@ def write(port_identifier, name, val, delta=0):
             file_path = os.path.join("../"+port_identifier, name)
         else:
             file_port_num = int(port_identifier)
-            file_path = os.path.join(outpath+str(file_port_num), name) 
+            file_path = _resolve_port_file_path(outpath, file_port_num, name)
     except ValueError:
-        print(f"Error: Invalid port identifier '{port_identifier}' for file operation. Must be integer or ZMQ name.")
+        print(f"Error: Invalid port identifier '{port_identifier}' or file name '{name}' for file operation.")
         return
 
     if isinstance(val, str):

0mq/funbody.dir/concore2.py

@@ -130,6 +130,16 @@ def unchanged():
     olds = s
     return False
 
+def _resolve_port_file_path(base_path, port_num, name):
+    port_dir = os.path.abspath(base_path + str(port_num))
+    file_path = os.path.abspath(os.path.join(port_dir, name))
+    try:
+        if os.path.commonpath([port_dir, file_path]) != port_dir:
+            raise ValueError
+    except ValueError:
+        raise ValueError(f"Invalid file name '{name}' for port {port_num}")
+    return file_path
+
 def read(port_identifier, name, initstr_val):
     global s, simtime, retrycount
 
@@ -154,12 +164,12 @@ def read(port_identifier, name, initstr_val):
 
     try:
         file_port_num = int(port_identifier)
+        file_path = _resolve_port_file_path(inpath, file_port_num, name)
     except ValueError:
-        print(f"Error: Invalid port identifier '{port_identifier}' for file operation. Must be integer or ZMQ name.")
+        print(f"Error: Invalid port identifier '{port_identifier}' or file name '{name}' for file operation.")
         return default_return_val
 
     time.sleep(delay) 
-    file_path = os.path.join(inpath+str(file_port_num), name)
     ins = ""
 
     try:
@@ -220,9 +230,9 @@ def write(port_identifier, name, val, delta=0):
             file_path = os.path.join("../"+port_identifier, name)
         else:
             file_port_num = int(port_identifier)
-            file_path = os.path.join(outpath+str(file_port_num), name) 
+            file_path = _resolve_port_file_path(outpath, file_port_num, name)
     except ValueError:
-        print(f"Error: Invalid port identifier '{port_identifier}' for file operation. Must be integer or ZMQ name.")
+        print(f"Error: Invalid port identifier '{port_identifier}' or file name '{name}' for file operation.")
         return
 
     if isinstance(val, str):

0mq/funbody2.dir/concore2.py

@@ -130,6 +130,16 @@ def unchanged():
     olds = s
     return False
 
+def _resolve_port_file_path(base_path, port_num, name):
+    port_dir = os.path.abspath(base_path + str(port_num))
+    file_path = os.path.abspath(os.path.join(port_dir, name))
+    try:
+        if os.path.commonpath([port_dir, file_path]) != port_dir:
+            raise ValueError
+    except ValueError:
+        raise ValueError(f"Invalid file name '{name}' for port {port_num}")
+    return file_path
+
 def read(port_identifier, name, initstr_val):
     global s, simtime, retrycount
 
@@ -154,12 +164,12 @@ def read(port_identifier, name, initstr_val):
 
     try:
         file_port_num = int(port_identifier)
+        file_path = _resolve_port_file_path(inpath, file_port_num, name)
     except ValueError:
-        print(f"Error: Invalid port identifier '{port_identifier}' for file operation. Must be integer or ZMQ name.")
+        print(f"Error: Invalid port identifier '{port_identifier}' or file name '{name}' for file operation.")
         return default_return_val
 
     time.sleep(delay) 
-    file_path = os.path.join(inpath+str(file_port_num), name)
     ins = ""
 
     try:
@@ -220,9 +230,9 @@ def write(port_identifier, name, val, delta=0):
             file_path = os.path.join("../"+port_identifier, name)
         else:
             file_port_num = int(port_identifier)
-            file_path = os.path.join(outpath+str(file_port_num), name) 
+            file_path = _resolve_port_file_path(outpath, file_port_num, name)
     except ValueError:
-        print(f"Error: Invalid port identifier '{port_identifier}' for file operation. Must be integer or ZMQ name.")
+        print(f"Error: Invalid port identifier '{port_identifier}' or file name '{name}' for file operation.")
         return
 
     if isinstance(val, str):

0mq/funbody_distributed.dir/concore2.py

@@ -130,6 +130,16 @@ def unchanged():
     olds = s
     return False
 
+def _resolve_port_file_path(base_path, port_num, name):
+    port_dir = os.path.abspath(base_path + str(port_num))
+    file_path = os.path.abspath(os.path.join(port_dir, name))
+    try:
+        if os.path.commonpath([port_dir, file_path]) != port_dir:
+            raise ValueError
+    except ValueError:
+        raise ValueError(f"Invalid file name '{name}' for port {port_num}")
+    return file_path
+
 def read(port_identifier, name, initstr_val):
     global s, simtime, retrycount
 
@@ -154,12 +164,12 @@ def read(port_identifier, name, initstr_val):
 
     try:
         file_port_num = int(port_identifier)
+        file_path = _resolve_port_file_path(inpath, file_port_num, name)
     except ValueError:
-        print(f"Error: Invalid port identifier '{port_identifier}' for file operation. Must be integer or ZMQ name.")
+        print(f"Error: Invalid port identifier '{port_identifier}' or file name '{name}' for file operation.")
         return default_return_val
 
     time.sleep(delay) 
-    file_path = os.path.join(inpath+str(file_port_num), name)
     ins = ""
 
     try:
@@ -220,9 +230,9 @@ def write(port_identifier, name, val, delta=0):
             file_path = os.path.join("../"+port_identifier, name)
         else:
             file_port_num = int(port_identifier)
-            file_path = os.path.join(outpath+str(file_port_num), name) 
+            file_path = _resolve_port_file_path(outpath, file_port_num, name)
     except ValueError:
-        print(f"Error: Invalid port identifier '{port_identifier}' for file operation. Must be integer or ZMQ name.")
+        print(f"Error: Invalid port identifier '{port_identifier}' or file name '{name}' for file operation.")
         return
 
     if isinstance(val, str):

0mq/funbody_zmq.dir/concore2.py

@@ -130,6 +130,16 @@ def unchanged():
     olds = s
     return False
 
+def _resolve_port_file_path(base_path, port_num, name):
+    port_dir = os.path.abspath(base_path + str(port_num))
+    file_path = os.path.abspath(os.path.join(port_dir, name))
+    try:
+        if os.path.commonpath([port_dir, file_path]) != port_dir:
+            raise ValueError
+    except ValueError:
+        raise ValueError(f"Invalid file name '{name}' for port {port_num}")
+    return file_path
+
 def read(port_identifier, name, initstr_val):
     global s, simtime, retrycount
 
@@ -154,12 +164,12 @@ def read(port_identifier, name, initstr_val):
 
     try:
         file_port_num = int(port_identifier)
+        file_path = _resolve_port_file_path(inpath, file_port_num, name)
     except ValueError:
-        print(f"Error: Invalid port identifier '{port_identifier}' for file operation. Must be integer or ZMQ name.")
+        print(f"Error: Invalid port identifier '{port_identifier}' or file name '{name}' for file operation.")
         return default_return_val
 
     time.sleep(delay) 
-    file_path = os.path.join(inpath+str(file_port_num), name)
     ins = ""
 
     try:
@@ -220,9 +230,9 @@ def write(port_identifier, name, val, delta=0):
             file_path = os.path.join("../"+port_identifier, name)
         else:
             file_port_num = int(port_identifier)
-            file_path = os.path.join(outpath+str(file_port_num), name) 
+            file_path = _resolve_port_file_path(outpath, file_port_num, name)
     except ValueError:
-        print(f"Error: Invalid port identifier '{port_identifier}' for file operation. Must be integer or ZMQ name.")
+        print(f"Error: Invalid port identifier '{port_identifier}' or file name '{name}' for file operation.")
         return
 
     if isinstance(val, str):

0mq/funbody_zmq2.dir/concore2.py

@@ -130,6 +130,16 @@ def unchanged():
     olds = s
     return False
 
+def _resolve_port_file_path(base_path, port_num, name):
+    port_dir = os.path.abspath(base_path + str(port_num))
+    file_path = os.path.abspath(os.path.join(port_dir, name))
+    try:
+        if os.path.commonpath([port_dir, file_path]) != port_dir:
+            raise ValueError
+    except ValueError:
+        raise ValueError(f"Invalid file name '{name}' for port {port_num}")
+    return file_path
+
 def read(port_identifier, name, initstr_val):
     global s, simtime, retrycount
 
@@ -154,12 +164,12 @@ def read(port_identifier, name, initstr_val):
 
     try:
         file_port_num = int(port_identifier)
+        file_path = _resolve_port_file_path(inpath, file_port_num, name)
     except ValueError:
-        print(f"Error: Invalid port identifier '{port_identifier}' for file operation. Must be integer or ZMQ name.")
+        print(f"Error: Invalid port identifier '{port_identifier}' or file name '{name}' for file operation.")
         return default_return_val
 
     time.sleep(delay) 
-    file_path = os.path.join(inpath+str(file_port_num), name)
     ins = ""
 
     try:
@@ -220,9 +230,9 @@ def write(port_identifier, name, val, delta=0):
             file_path = os.path.join("../"+port_identifier, name)
         else:
             file_port_num = int(port_identifier)
-            file_path = os.path.join(outpath+str(file_port_num), name) 
+            file_path = _resolve_port_file_path(outpath, file_port_num, name)
     except ValueError:
-        print(f"Error: Invalid port identifier '{port_identifier}' for file operation. Must be integer or ZMQ name.")
+        print(f"Error: Invalid port identifier '{port_identifier}' or file name '{name}' for file operation.")
         return
 
     if isinstance(val, str):

0mq/funcall.dir/concore2.py

@@ -130,6 +130,16 @@ def unchanged():
     olds = s
     return False
 
+def _resolve_port_file_path(base_path, port_num, name):
+    port_dir = os.path.abspath(base_path + str(port_num))
+    file_path = os.path.abspath(os.path.join(port_dir, name))
+    try:
+        if os.path.commonpath([port_dir, file_path]) != port_dir:
+            raise ValueError
+    except ValueError:
+        raise ValueError(f"Invalid file name '{name}' for port {port_num}")
+    return file_path
+
 def read(port_identifier, name, initstr_val):
     global s, simtime, retrycount
 
@@ -154,12 +164,12 @@ def read(port_identifier, name, initstr_val):
 
     try:
         file_port_num = int(port_identifier)
+        file_path = _resolve_port_file_path(inpath, file_port_num, name)
     except ValueError:
-        print(f"Error: Invalid port identifier '{port_identifier}' for file operation. Must be integer or ZMQ name.")
+        print(f"Error: Invalid port identifier '{port_identifier}' or file name '{name}' for file operation.")
         return default_return_val
 
     time.sleep(delay) 
-    file_path = os.path.join(inpath+str(file_port_num), name)
     ins = ""
 
     try:
@@ -220,9 +230,9 @@ def write(port_identifier, name, val, delta=0):
             file_path = os.path.join("../"+port_identifier, name)
         else:
             file_port_num = int(port_identifier)
-            file_path = os.path.join(outpath+str(file_port_num), name) 
+            file_path = _resolve_port_file_path(outpath, file_port_num, name)
     except ValueError:
-        print(f"Error: Invalid port identifier '{port_identifier}' for file operation. Must be integer or ZMQ name.")
+        print(f"Error: Invalid port identifier '{port_identifier}' or file name '{name}' for file operation.")
         return
 
     if isinstance(val, str):

0mq/funcall2.dir/concore2.py

@@ -130,6 +130,16 @@ def unchanged():
     olds = s
     return False
 
+def _resolve_port_file_path(base_path, port_num, name):
+    port_dir = os.path.abspath(base_path + str(port_num))
+    file_path = os.path.abspath(os.path.join(port_dir, name))
+    try:
+        if os.path.commonpath([port_dir, file_path]) != port_dir:
+            raise ValueError
+    except ValueError:
+        raise ValueError(f"Invalid file name '{name}' for port {port_num}")
+    return file_path
+
 def read(port_identifier, name, initstr_val):
     global s, simtime, retrycount
 
@@ -154,12 +164,12 @@ def read(port_identifier, name, initstr_val):
 
     try:
         file_port_num = int(port_identifier)
+        file_path = _resolve_port_file_path(inpath, file_port_num, name)
     except ValueError:
-        print(f"Error: Invalid port identifier '{port_identifier}' for file operation. Must be integer or ZMQ name.")
+        print(f"Error: Invalid port identifier '{port_identifier}' or file name '{name}' for file operation.")
         return default_return_val
 
     time.sleep(delay) 
-    file_path = os.path.join(inpath+str(file_port_num), name)
     ins = ""
 
     try:
@@ -220,9 +230,9 @@ def write(port_identifier, name, val, delta=0):
             file_path = os.path.join("../"+port_identifier, name)
         else:
             file_port_num = int(port_identifier)
-            file_path = os.path.join(outpath+str(file_port_num), name) 
+            file_path = _resolve_port_file_path(outpath, file_port_num, name)
     except ValueError:
-        print(f"Error: Invalid port identifier '{port_identifier}' for file operation. Must be integer or ZMQ name.")
+        print(f"Error: Invalid port identifier '{port_identifier}' or file name '{name}' for file operation.")
         return
 
     if isinstance(val, str):