IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2024-11-28 03:23:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added Grant Wizard option under Package node. Fixes #1591

Browse Source
This commit is contained in:
Rahul Shirsat 2021-06-04 12:47:37 +05:30 committed by Akshay Joshi
parent 2c51925638
commit ac8e8961ce
10 changed files with 159 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_5_4.rst
View File

@ -9,6 +9,7 @@ This release contains a number of bug fixes and new features since the release o
New features
************
| `Issue #1591 <https://redmine.postgresql.org/issues/1591>`_ - Added Grant Wizard option under Package node.
| `Issue #2341 <https://redmine.postgresql.org/issues/2341>`_ - Added support to launch PSQL for the connected database server.
| `Issue #4064 <https://redmine.postgresql.org/issues/4064>`_ - Added window maximize/restore functionality for properties dialog.
| `Issue #6231 <https://redmine.postgresql.org/issues/6231>`_ - Added OS, Browser, Configuration details in the About dialog.

48
web/pgadmin/tools/grant_wizard/__init__.py
View File

@ -251,6 +251,15 @@ def _get_rows_for_type(conn, ntype, server_prop, node_id):
status, res = conn.execute_dict(sql)
# Logic for generating privileges sql only for ppas
# Fetch Packages.
if server_prop['server_type'] == 'ppas' and ntype in ['package']:
sql = render_template("/".join(
[server_prop['template_path'], '/sql/package.sql']),
node_id=node_id)
status, res = conn.execute_dict(sql)
return status, res
@ -300,6 +309,7 @@ def properties(sid, did, node_id, node_type):
current_app.logger.error(res)
failed_objects.append(disp_type)
else:
if len(res) > 0:
res_data.extend(res['rows'])
for row in node_types:
@ -338,6 +348,10 @@ def properties(sid, did, node_id, node_type):
status, res = _get_rows_for_type(
conn, 'foreign_table', server_prop, node_id)
_append_rows(status, res, 'foreign table')
status, res = _get_rows_for_type(
conn, 'package', server_prop, node_id)
_append_rows(status, res, 'package')
else:
status, res = _get_rows_for_type(conn, ntype, server_prop, node_id)
_append_rows(status, res, 'function')
@ -401,6 +415,12 @@ def msql(sid, did):
data['acl'],
acls['foreign_table']['acl'])
# Logic for setting privileges only for ppas
if server_prop['server_type'] == 'ppas':
data['priv']['package'] = parse_priv_to_db(
data['acl'],
acls['package']['acl'])
# Pass database objects and get SQL for privileges
sql_data = ''
data_func = {'objects': data['objects'],
@ -438,6 +458,17 @@ def msql(sid, did):
if sql and sql.strip('\n') != '':
sql_data += sql
# Logic for generating privileges sql only for ppas
if server_prop['server_type'] == 'ppas':
data_package = {'objects': data['objects'],
'priv': data['priv']['package']}
sql = render_template(
"/".join([server_prop['template_path'],
'/sql/grant_package.sql']),
data=data_package, conn=conn)
if sql and sql.strip('\n') != '':
sql_data += sql
res = {'data': sql_data}
return ajax_response(
@ -501,6 +532,12 @@ def save(sid, did):
data['acl'],
acls['foreign_table']['acl'])
# Logic for setting privileges only for ppas
if server_prop['server_type'] == 'ppas':
data['priv']['package'] = parse_priv_to_db(
data['acl'],
acls['package']['acl'])
# Pass database objects and get SQL for privileges
# Pass database objects and get SQL for privileges
sql_data = ''
@ -539,6 +576,17 @@ def save(sid, did):
if sql and sql.strip('\n') != '':
sql_data += sql
# Logic for generating privileges sql only for ppas
if server_prop['server_type'] == 'ppas':
data_package = {'objects': data['objects'],
'priv': data['priv']['package']}
sql = render_template(
"/".join([server_prop['template_path'],
'/sql/grant_package.sql']),
data=data_package, conn=conn)
if sql and sql.strip('\n') != '':
sql_data += sql
status, res = conn.execute_dict(sql_data)
if not status:
return internal_server_error(errormsg=res)

3
web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
View File

@ -545,6 +545,9 @@ define([
case 'Foreign Table':
object_type = 'foreign_table';
break;
case 'Package':
object_type = 'package';
break;
default:
break;
}

1
web/pgadmin/tools/grant_wizard/static/js/menu_utils.js
View File

@ -11,6 +11,7 @@ export const supportedNodes = [
'schema', 'coll-function', 'coll-sequence',
'coll-table', 'coll-view', 'coll-procedure',
'coll-mview', 'database', 'coll-trigger_function',
'coll-package',
];

15
web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/12_plus/sql/package.sql Normal file
View File

@ -0,0 +1,15 @@
{# ===== Fetch list of Database object types(Package) ===== #}
{% if node_id %}
SELECT
nsp.nspname AS name,
snsp.nspname AS nspname,
'Package' as object_type,
'icon-package' as icon
FROM
pg_catalog.pg_namespace nsp
LEFT OUTER JOIN pg_catalog.pg_namespace snsp ON (nsp.nspparent = snsp.oid)
WHERE nsp.nspparent = {{ node_id }}::oid
AND nsp.nspobjecttype = 0
AND nsp.nspcompoundtrigger = false
ORDER BY nsp.nspname;
{% endif %}

4
web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/acl.json
View File

@ -30,5 +30,9 @@
"procedure": {
"type": "PROCEDURE",
"acl": ["X"]
},
"package": {
"type": "PACKAGE",
"acl": ["X"]
}
}

9
web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/grant_package.sql Normal file
View File

@ -0,0 +1,9 @@
{# ===== Grant Permissions on Database Objects Selected ==== #}
{% import 'macros/schemas/privilege.macros' as PRIVILEGE %}
{% for obj in data.objects -%}
{% for priv in data.priv -%}
{% if obj.object_type == 'Package' %}
{{ PRIVILEGE.SET(conn, 'PACKAGE', priv['grantee'], obj.name, priv['without_grant'], priv['with_grant'], obj.nspname ) }}
{% endif %}
{% endfor -%}
{% endfor -%}

14
web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/package.sql Normal file
View File

@ -0,0 +1,14 @@
{# ===== Fetch list of Database object types(Package) ===== #}
{% if node_id %}
SELECT
nsp.nspname AS name,
snsp.nspname AS nspname,
'Package' as object_type,
'icon-package' as icon
FROM
pg_catalog.pg_namespace nsp
LEFT OUTER JOIN pg_catalog.pg_namespace snsp ON (nsp.nspparent = snsp.oid)
WHERE nsp.nspparent = {{ node_id }}::oid
AND nsp.nspobjecttype = 0
ORDER BY nsp.nspname;
{% endif %}

32
web/pgadmin/tools/grant_wizard/tests/grant_wizard_test_data.json
View File

@ -217,6 +217,38 @@
"expected_data": {
"status_code": 200
}
},
{
"name": "Grant wizard to packages SQL statement",
"url": "/grant_wizard/sql/",
"is_positive_test": true,
"mocking_required": false,
"test_data": {
"objects": [
{
"selected": true,
"name": "auth_group",
"name_with_args": "auth_group",
"nspname": "public",
"object_type": "Package"
}
],
"acl": [
{
"privileges": [
{
"privilege_type": "X",
"privilege": true,
"with_grant": true
}
]
}
]
},
"mock_data": {},
"expected_data": {
"status_code": 200
}
}
],
"grant_wizard_get_acl_list": [

27
web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_get_sql.py
View File

@ -22,6 +22,8 @@ from pgadmin.utils.route import BaseTestGenerator
from regression import parent_node_dict
from regression.python_test_utils import test_utils as utils
from . import utils as grant_wizard_utils
from pgadmin.browser.server_groups.servers.databases.schemas.packages.tests \
import utils as package_utils
class GrantWizardSaveGetSQLTestCase(BaseTestGenerator):
@ -52,12 +54,35 @@ class GrantWizardSaveGetSQLTestCase(BaseTestGenerator):
self.schema_name)
if not schema_response:
raise Exception("Could not find the schema to add a table.")
if self.test_data['objects'][-1]['object_type'] == 'Package':
if self.server_information['type'] == 'pg':
message = "Packages are not supported by PG."
self.skipTest(message)
self.pkg_name = "pkg_%s" % str(uuid.uuid4())[1:8]
self.proc_name = "proc_%s" % str(uuid.uuid4())[1:8]
self.package_id = package_utils.create_package(self.server,
self.db_name,
self.schema_name,
self.pkg_name,
self.proc_name)
self.test_data['objects'][-1]['name'] = self.pkg_name
self.test_data['objects'][-1]['name_with_args'] = self.pkg_name
else:
self.table_name = "table_for_wizard%s" % (str(uuid.uuid4())[1:8])
self.table_id = tables_utils.create_table(self.server, self.db_name,
self.table_id = tables_utils.create_table(self.server,
self.db_name,
self.schema_name,
self.table_name)
self.test_data['objects'][-1]['name'] = self.table_name
self.test_data['objects'][-1]['name_with_args'] = self.table_name
self.test_data['objects'][-1]['nspname'] = self.schema_name
if self.server_information['type'] == 'ppas':