Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions 0mq/comm_node.dir/concore2.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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:
Expand Down Expand Up @@ -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):
Expand Down
18 changes: 14 additions & 4 deletions 0mq/funbody.dir/concore2.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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:
Expand Down Expand Up @@ -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):
Expand Down
18 changes: 14 additions & 4 deletions 0mq/funbody2.dir/concore2.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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:
Expand Down Expand Up @@ -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):
Expand Down
18 changes: 14 additions & 4 deletions 0mq/funbody_distributed.dir/concore2.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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:
Expand Down Expand Up @@ -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):
Expand Down
18 changes: 14 additions & 4 deletions 0mq/funbody_zmq.dir/concore2.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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:
Expand Down Expand Up @@ -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):
Expand Down
18 changes: 14 additions & 4 deletions 0mq/funbody_zmq2.dir/concore2.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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:
Expand Down Expand Up @@ -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):
Expand Down
18 changes: 14 additions & 4 deletions 0mq/funcall.dir/concore2.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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:
Expand Down Expand Up @@ -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):
Expand Down
18 changes: 14 additions & 4 deletions 0mq/funcall2.dir/concore2.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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:
Expand Down Expand Up @@ -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):
Expand Down
18 changes: 14 additions & 4 deletions 0mq/funcall_distributed.dir/concore2.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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:
Expand Down Expand Up @@ -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):
Expand Down
Loading
Loading