Skip to content

Fix issue with Username being required for Shared server import config #9971

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
KijongHan wants to merge 2 commits into
base: master
Choose a base branch
from
+27 −9
Open

Fix issue with Username being required for Shared server import config #9971

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7a95a7
fix(import-export): accept Username or SharedUsername for shared servers
KijongHan May 22, 2026
177b57d
fix(import-export): set username fallback to SharedUsername for share…
KijongHan May 22, 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
36 changes: 27 additions & 9 deletions web/pgadmin/utils/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,8 +601,10 @@ def validate_json_data(data, is_admin):
for server in data["Servers"]:
obj = data["Servers"][server]

is_shared = obj.get("Shared", None)

# Check if server is shared.Won't import if user is non-admin
if obj.get('Shared', None) and not is_admin:
if is_shared and not is_admin:
print("Won't import the server '%s' as it is shared " %
obj["Name"])
skip_servers.append(server)
Expand All @@ -627,14 +629,25 @@ def check_is_integer(value):
is_service_attrib_available = obj.get("Service", None) is not None

if not is_service_attrib_available:
for attrib in ("Port", "Username"):
errmsg = check_attrib(attrib)
errmsg = check_attrib("Port")
if errmsg:
return errmsg
errmsg = check_is_integer(obj["Port"])
if errmsg:
return errmsg

if is_shared:
# Shared servers may carry either the owner's username
# or a per-user override, so accept either attribute.
if "Username" not in obj and "SharedUsername" not in obj:
return gettext(
"'Username' or 'SharedUsername' attribute not "
"found for server '%s'" % server
)
else:
errmsg = check_attrib("Username")
if errmsg:
return errmsg
if attrib == 'Port':
errmsg = check_is_integer(obj[attrib])
if errmsg:
return errmsg

errmsg = check_attrib("MaintenanceDB")
if errmsg:
Expand Down Expand Up @@ -720,6 +733,11 @@ def load_database_servers(input_file, selected_servers,
groups_added = groups_added + 1
groups = ServerGroup.query.filter_by(user_id=user_id)

is_shared = obj.get("Shared", None)
username = obj.get("Username", None)
if is_shared and not username:
username = obj.get("SharedUsername", None)

# Create the server
new_server = Server()
new_server.name = obj["Name"]
Expand All @@ -731,7 +749,7 @@ def load_database_servers(input_file, selected_servers,

new_server.port = obj.get("Port", None)

new_server.username = obj.get("Username", None)
new_server.username = username

new_server.role = obj.get("Role", None)

Expand Down Expand Up @@ -785,7 +803,7 @@ def load_database_servers(input_file, selected_servers,
new_server.tunnel_keep_alive = \
obj.get("TunnelKeepAlive", None)

new_server.shared = obj.get("Shared", None)
new_server.shared = is_shared

new_server.shared_username = obj.get("SharedUsername", None)

Expand Down
Loading