Skip to content

[8.0] Replace escape_string with alternatives #8648

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
sfayer wants to merge 2 commits into
base: rel-v8r0
Choose a base branch
from
+241 −154
Open

[8.0] Replace escape_string with alternatives #8648

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
b3eaaef
fix: Parameterise SQL in TransformationSystem
sfayer Jun 15, 2026
d300d07
fix: Replace escape_string with alternatives
sfayer Jun 26, 2026
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
4 changes: 2 additions & 2 deletions src/DIRAC/Core/Utilities/MySQL.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,9 +594,9 @@ def __escapeString(self, myString, connection=None):
# self.log.debug('__escape_string: Could not escape string', '"%s"' % myString)
return S_ERROR(DErrno.EMYSQL, "__escape_string: Could not escape string")

escape_string = connection.escape_string(myString.encode()).decode()
escape_string = connection.string_literal(myString.encode()).decode()
# self.log.debug('__escape_string: returns', '"%s"' % escape_string)
return S_OK(f'"{escape_string}"')
return S_OK(escape_string)
except Exception as x:
return self._except("__escape_string", x, "Could not escape string", myString)

Expand Down
5 changes: 4 additions & 1 deletion src/DIRAC/FrameworkSystem/Client/ComponentInstaller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@
)
from DIRAC.FrameworkSystem.Client.ComponentMonitoringClient import ComponentMonitoringClient

SQL_IDENTIFIER_RE = re.compile(r"^[a-zA-Z_][a-zA-Z0-9_]*$")


def _safeFloat(value):
try:
Expand Down Expand Up @@ -2114,7 +2116,8 @@ def installDatabase(self, dbName):
"""
Install requested DB in MySQL server
"""
dbName = MySQLdb.escape_string(dbName.encode()).decode()
if not SQL_IDENTIFIER_RE.match(dbName):
return S_ERROR(f"Invalid database name '{dbName}'")
if not self.mysqlRootPwd:
rootPwdPath = cfgInstallPath("Database", "RootPwd")
return S_ERROR(f"Missing {rootPwdPath} in {self.cfgFile}")
Expand Down
Loading
Loading