Skip to content
Closed
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
11 changes: 10 additions & 1 deletion sirepo/pkcli/madx_device_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
_ARRAY_PROP_NAMES = set([_READ_CURRENT_PROP_NAME, _POSITION_PROP_NAME])
_SIM_OUTPUT_DIR = "DeviceServer"
_SET_CONTEXT = PKDict()
_SAFE_NAME_RE = re.compile(r"^[\w:\-\.]+$")

app = flask.Flask(__name__)

Expand Down Expand Up @@ -129,7 +130,7 @@ def _format_prop_value(prop_name, value):


def _http_response(content):
res = flask.make_response(content)
res = flask.Response(str(content), content_type="text/plain; charset=utf-8")
res.headers["sirepo-dev"] = "1"
return res

Expand Down Expand Up @@ -212,6 +213,14 @@ def _query_params(fields):
res[f] = flask.request.args[f]
if f in ("names", "props", "values"):
res[f] = re.split(r"\s*,\s*", res[f])
for v in res[f]:
if f == "values":
try:
float(v)
except ValueError:
_abort(f"invalid numeric value for {f}: {v}")
elif not _SAFE_NAME_RE.match(v):
_abort(f"invalid characters in {f}: {v}")
return res


Expand Down