Skip to content

Added role-based restriction for editing server connections. #1947 #8831

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

Merged
akshay-joshi merged 3 commits into from
Jun 10, 2025
Merged

Added role-based restriction for editing server connections. #1947 #8831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c8afdb
Added role-based restriction for editing server connections. #1947
RohitBhati8269 Jun 4, 2025
0472689
Update permission lables for better consistency.
RohitBhati8269 Jun 5, 2025
a48a566
Use enum instead of hardcoded.
RohitBhati8269 Jun 8, 2025
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
Binary file modified docs/en_US/images/permissions.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions web/pgadmin/browser/server_groups/servers/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,6 +719,7 @@ def delete(self, gid, sid):
return make_json_response(success=1,
info=gettext("Server deleted"))

@permissions_required(AllPermissionTypes.object_register_server)
@pga_login_required
def update(self, gid, sid):
"""Update the server settings"""
Expand Down
3 changes: 2 additions & 1 deletion web/pgadmin/browser/static/js/node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ define('pgadmin.browser.node', [
function() {
return !!(self.canEdit(...arguments));
} : (!!self.canEdit),
permission: self.type == 'server' ? AllPermissionTypes.OBJECT_REGISTER_SERVER : undefined,
}]);
}

Expand All @@ -161,7 +162,7 @@ define('pgadmin.browser.node', [
function() {
return !!(self.canDrop(...arguments));
} : (!!self.canDrop),
permission: self.type == 'server' ? 'object_register_server' : undefined,
permission: self.type == 'server' ? AllPermissionTypes.OBJECT_REGISTER_SERVER : undefined,
}]);

if (self.canDropCascade) {
Expand Down
28 changes: 14 additions & 14 deletions web/pgadmin/tools/user_management/PgAdminPermissions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ def __init__(self):
self.add_permission(
AllPermissionCategories.object_explorer,
AllPermissionTypes.object_register_server,
gettext("Register/remove server")
gettext("Manage Server")
)
self.add_permission(
AllPermissionCategories.tools,
AllPermissionTypes.tools_query_tool,
gettext("Query tool")
gettext("Query Tool")
)
self.add_permission(
AllPermissionCategories.tools,
Expand All @@ -63,32 +63,32 @@ def __init__(self):
self.add_permission(
AllPermissionCategories.tools,
AllPermissionTypes.tools_psql_tool,
gettext("PSQL tool")
gettext("PSQL Tool")
)
self.add_permission(
AllPermissionCategories.tools,
AllPermissionTypes.tools_backup,
gettext("Backup tool (including server and globals)")
gettext("Backup Tool (including server and globals)")
)
self.add_permission(
AllPermissionCategories.tools,
AllPermissionTypes.tools_restore,
gettext("Restore tool")
gettext("Restore Tool")
)
self.add_permission(
AllPermissionCategories.tools,
AllPermissionTypes.tools_import_export_data,
gettext("Import/export data")
gettext("Import/Export Data")
)
self.add_permission(
AllPermissionCategories.tools,
AllPermissionTypes.tools_import_export_servers,
gettext("Import/export servers")
gettext("Import/Export Servers")
)
self.add_permission(
AllPermissionCategories.tools,
AllPermissionTypes.tools_search_objects,
gettext("Search objects")
gettext("Search Objects")
)
self.add_permission(
AllPermissionCategories.tools,
Expand All @@ -98,32 +98,32 @@ def __init__(self):
self.add_permission(
AllPermissionCategories.tools,
AllPermissionTypes.tools_schema_diff,
gettext("Schema diff")
gettext("Schema Diff")
)
self.add_permission(
AllPermissionCategories.tools,
AllPermissionTypes.tools_grant_wizard,
gettext("Grant wizard")
gettext("Grant Wizard")
)
self.add_permission(
AllPermissionCategories.tools,
AllPermissionTypes.tools_erd_tool,
gettext("ERD tool")
gettext("ERD Tool")
)
self.add_permission(
AllPermissionCategories.storage_manager,
AllPermissionTypes.storage_add_folder,
gettext("Add folder")
gettext("Add Folder")
)
self.add_permission(
AllPermissionCategories.storage_manager,
AllPermissionTypes.storage_remove_folder,
gettext("Delete file/folder")
gettext("Delete File/Folder")
)
self.add_permission(
AllPermissionCategories.miscellaneous,
AllPermissionTypes.change_password,
gettext("Change password")
gettext("Change Password")
)

def add_permission(self, category: str, permission: str, label: str):
Expand Down