Skip to content

Fix .pgpass file to properly de-escape backslash escapes #1304

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
veeceey wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix .pgpass file to properly de-escape backslash escapes #1304

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
9 changes: 7 additions & 2 deletions asyncpg/connect_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,15 @@ def _read_password_file(passfile: pathlib.Path) \
continue
# Backslash escapes both itself and the colon,
# which is a record separator.
# First, temporarily replace \\ with a placeholder
line = line.replace(R'\\', '\n')
# Split on unescaped colons
parts = re.split(r'(?<!\\):', line, maxsplit=4)
# De-escape: replace \n (placeholder for \\) with \
# and \: with :
passtab.append(tuple(
p.replace('\n', R'\\')
for p in re.split(r'(?<!\\):', line, maxsplit=4)
p.replace('\n', '\\').replace(R'\:', ':')
for p in parts
))
except IOError:
pass
Expand Down
11 changes: 6 additions & 5 deletions tests/test_connect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1514,18 +1514,19 @@ def test_connect_pgpass_regular(self):
)
})

# test escaping
# test escaping - values should be de-escaped
# \: becomes : and \\ becomes \
self.run_testcase({
'host': 'fgh',
'user': R'test\\',
'database': R'test\:db',
'user': R'test\',
'database': R'test:db',
'passfile': passfile.name,
'result': (
[('fgh', 5432)],
{
'password': 'password from pgpass with escapes',
'user': R'test\\',
'database': R'test\:db',
'user': R'test\',
'database': R'test:db',
'target_session_attrs': 'any',
}
)
Expand Down