Skip to content

Reject empty or null Username on non-shared server import #10320

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
dpage wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −3
Open

Reject empty or null Username on non-shared server import #10320

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
8 changes: 5 additions & 3 deletions web/pgadmin/utils/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,9 +649,11 @@ def check_is_integer(value):
"found for server '%s'" % server
)
else:
errmsg = check_attrib("Username")
if errmsg:
return errmsg
if not obj.get("Username"):
return gettext(
"'Username' attribute not found for server '%s'" %
server
)

errmsg = check_attrib("MaintenanceDB")
if errmsg:
Expand Down
14 changes: 14 additions & 0 deletions web/pgadmin/utils/tests/test_validate_json_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,20 @@ class TestValidateJsonData(BaseTestGenerator):
expected_error="'Username' attribute not found",
expected_servers=["1"]
)),
('A non-shared server with an empty username is rejected',
dict(
servers={"1": server(Username="")},
is_admin=True,
expected_error="'Username' attribute not found",
expected_servers=["1"]
)),
('A non-shared server with a null username is rejected',
dict(
servers={"1": server(Username=None)},
is_admin=True,
expected_error="'Username' attribute not found",
expected_servers=["1"]
)),
('A shared server with only a shared username is valid',
dict(
servers={"1": server(Shared=True, SharedUsername="postgres")},
Expand Down
Loading