Skip to content

Commit 8c7434c

Browse files
authored
Merge pull request #8143 from fstagni/80_quote_plus_password
[8.0] fix: escape db password when passing to sqlalchemy
2 parents 247c4ed + 38892af commit 8c7434c

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

src/DIRAC/DataManagementSystem/DB/FTS3DB.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import datetime
99
import errno
10+
from urllib.parse import quote_plus
1011

1112
from sqlalchemy.orm.exc import NoResultFound
1213
from sqlalchemy.exc import SQLAlchemyError
@@ -184,7 +185,7 @@ def __getDBConnectionInfo(self, fullname):
184185
self.dbHost = dbParameters["Host"]
185186
self.dbPort = dbParameters["Port"]
186187
self.dbUser = dbParameters["User"]
187-
self.dbPass = dbParameters["Password"]
188+
self.dbPass = quote_plus(dbParameters["Password"])
188189
self.dbName = dbParameters["DBName"]
189190

190191
def __init__(self, pool_size=15, url=None, parentLogger=None):

src/DIRAC/RequestManagementSystem/DB/RequestDB.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"""
2020
import errno
2121
import random
22+
from urllib.parse import quote_plus
2223

2324
import datetime
2425

@@ -199,7 +200,7 @@ def __getDBConnectionInfo(self, fullname):
199200
dbParameters = result["Value"]
200201
self.dbHost = dbParameters["Host"]
201202
self.dbPort = dbParameters["Port"]
202-
self.dbUser = dbParameters["User"]
203+
self.dbUser = quote_plus(dbParameters["User"])
203204
self.dbPass = dbParameters["Password"]
204205
self.dbName = dbParameters["DBName"]
205206

0 commit comments

Comments
 (0)