Skip to content

fix(gql): collapse carriage returns when sanitizing GraphQL strings #2168

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

Open
feiiiiii5 wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −1
Open

fix(gql): collapse carriage returns when sanitizing GraphQL strings #2168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions test/test_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,9 @@ def test_is_weaviate_client_too_old(current_version: str, latest_version: str, t
('\\\\"', '\\\\\\"'),
('\\\\"', '\\\\\\"'),
('\\\\\\"', '\\\\\\"'),
("foo\nbar", "foo bar"),
("foo\r\nbar", "foo bar"),
("foo\rbar", "foo bar"),
],
)
def test_sanitize_str(in_str: str, out_str: str) -> None:
Expand Down
4 changes: 3 additions & 1 deletion weaviate/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,9 @@ def is_weaviate_domain(url: str) -> bool:


def strip_newlines(s: str) -> str:
return s.replace("\n", " ")
# GraphQL treats CR as a line terminator inside string literals just like LF,
# so a CRLF value must collapse to one space instead of leaving a bare CR.
return s.replace("\r\n", "\n").replace("\r", "\n").replace("\n", " ")


def _sanitize_str(value: str) -> str:
Expand Down
Loading