Skip to content

Need to convert non-str values to str before applying sanitisation #564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tieneupin merged 2 commits into from
Apr 8, 2025
Merged

Need to convert non-str values to str before applying sanitisation #564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8472e36
Need to convert non-str values to str before applying sanitisation
tieneupin Apr 8, 2025
2455e65
Sanitised again
tieneupin Apr 8, 2025
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: 5 additions & 6 deletions src/murfey/server/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,9 @@
from workflows.transport.pika_transport import PikaTransport

import murfey
import murfey.server.ispyb
import murfey.server.prometheus as prom
import murfey.server.websocket
import murfey.util.db as db
from murfey.server.ispyb import get_session_id
from murfey.server.murfey_db import url # murfey_db
from murfey.util import LogFilter
from murfey.util.config import (
Expand Down Expand Up @@ -2207,7 +2206,7 @@
_transport_object.transport.ack(header)
return None
elif message["register"] == "data_collection_group":
ispyb_session_id = murfey.server.ispyb.get_session_id(
ispyb_session_id = get_session_id(

Check warning on line 2209 in src/murfey/server/__init__.py

View check run for this annotation

Codecov / codecov/patch

src/murfey/server/__init__.py#L2209 

Added line #L2209 was not covered by tests
microscope=message["microscope"],
proposal_code=message["proposal_code"],
proposal_number=message["proposal_number"],
Expand Down Expand Up @@ -2292,11 +2291,11 @@
return None
elif message["register"] == "data_collection":
logger.debug(
f"Received message named 'data_collection' containing the following items:\n"
f"{', '.join([f'{sanitise(key)}: {sanitise(value)}' for key, value in message.items()])}"
"Received message named 'data_collection' containing the following items:\n"
f"{', '.join([f'{sanitise(key)}: {sanitise(str(value))}' for key, value in message.items()])}"
)
murfey_session_id = message["session_id"]
ispyb_session_id = murfey.server.ispyb.get_session_id(
ispyb_session_id = get_session_id(

Check warning on line 2298 in src/murfey/server/__init__.py

View check run for this annotation

Codecov / codecov/patch

src/murfey/server/__init__.py#L2298 

Added line #L2298 was not covered by tests
microscope=message["microscope"],
proposal_code=message["proposal_code"],
proposal_number=message["proposal_number"],
Expand Down
4 changes: 2 additions & 2 deletions src/murfey/server/ispyb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,8 +564,8 @@ def get_session_id(
"Looking up ISPyB BLSession ID using the following values:\n"
f"microscope: {sanitise(microscope)}\n"
f"proposal_code: {sanitise(proposal_code)}\n"
f"proposal_number: {sanitise(proposal_number)}\n"
f"visit_number: {sanitise(visit_number)}\n"
f"proposal_number: {sanitise(str(proposal_number))}\n"
f"visit_number: {sanitise(str(visit_number))}\n"
)

# Lookup BLSession ID
Expand Down