public inbox for [email protected]  
help / color / mirror / Atom feed
From: Yogesh Mahajan <[email protected]>
To: pgadmin-hackers <[email protected]>
Subject: Re: [Patch] Bug #4256 - ALTER DEFAULT PRIVILEGES FOR ROLE some_role REVOKE EXECUTE ON FUNCTIONS FROM PUBLIC:
Date: Tue, 29 Mar 2022 14:52:03 +0530
Message-ID: <CAMa=N=NF58-jk8=AfCzceHOmWz7PeEY_uae_zsW2Ct-0W2guBg@mail.gmail.com> (raw)
In-Reply-To: <CANxoLDfoXM0ouv2EuqptdPoy5bUX39Do398Jm+A7EEmzcGcUiQ@mail.gmail.com>
References: <CAMa=N=NPPqARLNtwh8hBXHYwOPG6grkFUDKDw0vB74TrYfMuKg@mail.gmail.com>
	<CANxoLDfuwg_z2LgnqFJeXEV_Ys2=dGNMRigcXCwvWb+9Xo4DEg@mail.gmail.com>
	<CAM9w-_=TAoziBkqQWkdBY2SQYwQJ4kaC6yLRuPNtRrT3Kf0LoA@mail.gmail.com>
	<CAMa=N=OS_jw+PWo21PHw2xhGTQW=sG2XCgr_Zqq25gE4V7mj_A@mail.gmail.com>
	<CANxoLDfoXM0ouv2EuqptdPoy5bUX39Do398Jm+A7EEmzcGcUiQ@mail.gmail.com>

Hello,

Please find the attached patch which fixes resql test failures due to the
above patch.

Thanks,
Yogesh Mahajan
EnterpriseDB


On Mon, Mar 28, 2022 at 5:37 PM Akshay Joshi <[email protected]>
wrote:

> Thanks, the patch applied
>
> On Mon, Mar 28, 2022 at 4:43 PM Yogesh Mahajan <
> [email protected]> wrote:
>
>> Hello Team,
>>
>> Please find the updated patch which fixes sql revoke statements shown for
>> databases.
>>
>>
>> Thanks,
>> Yogesh Mahajan
>> EnterpriseDB
>>
>>
>> On Tue, Mar 1, 2022 at 12:50 PM Aditya Toshniwal <
>> [email protected]> wrote:
>>
>>> Hi Yogesh,
>>>
>>> The original bug is not fixed with the patch. You might have fixed the
>>> related ones.
>>>
>>> On Mon, Feb 28, 2022 at 6:24 PM Akshay Joshi <
>>> [email protected]> wrote:
>>>
>>>> Hi Aditya
>>>>
>>>> Can you please review it?
>>>>
>>>> On Mon, Feb 28, 2022 at 6:03 PM Yogesh Mahajan <
>>>> [email protected]> wrote:
>>>>
>>>>> Hi Team,
>>>>>
>>>>> Please find a patch which fixes sql for alter default privileges.
>>>>>
>>>>> Thanks,
>>>>> Yogesh Mahajan
>>>>> EnterpriseDB
>>>>>
>>>>
>>>>
>>>> --
>>>> *Thanks & Regards*
>>>> *Akshay Joshi*
>>>> *pgAdmin Hacker | Principal Software Architect*
>>>> *EDB Postgres <http://edbpostgres.com>*
>>>>
>>>> *Mobile: +91 976-788-8246*
>>>>
>>>
>>>
>>> --
>>> Thanks,
>>> Aditya Toshniwal
>>> pgAdmin Hacker | Software Architect | *edbpostgres.com*
>>> <http://edbpostgres.com;
>>> "Don't Complain about Heat, Plant a TREE"
>>>
>>
>
> --
> *Thanks & Regards*
> *Akshay Joshi*
> *pgAdmin Hacker | Principal Software Architect*
> *EDB Postgres <http://edbpostgres.com>*
>
> *Mobile: +91 976-788-8246*
>


Attachments:

  [application/octet-stream] RM_4256_v3.patch (3.8K, 3-RM_4256_v3.patch)
  download | inline diff:
diff --git a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.3_plus/defacl.sql b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.3_plus/defacl.sql
index e9f9eac89..2527a5d36 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.3_plus/defacl.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.3_plus/defacl.sql
@@ -36,7 +36,7 @@ GROUP BY g.rolname, gt.rolname, a.deftype
 ORDER BY a.deftype
 	)
 {% else %}
-
+SELECT * from (
 (SELECT
     CASE (e.deftype)
     WHEN 'r' THEN 'deftblacl'
@@ -157,5 +157,5 @@ FROM(
 LEFT JOIN pg_catalog.pg_roles g ON (e.grantor = g.oid)
    LEFT JOIN pg_catalog.pg_roles gt ON (e.grantee = gt.oid)
 GROUP BY g.rolname, gt.rolname, e.deftype
-ORDER BY e.deftype)
+ORDER BY e.deftype)) f order by f.acltype DESC
 {% endif %}
diff --git a/web/pgadmin/browser/server_groups/servers/databases/tests/pg/default/alter_default_db_privileges_sequences.sql b/web/pgadmin/browser/server_groups/servers/databases/tests/pg/default/alter_default_db_privileges_sequences.sql
index 494432610..3fac293cf 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/tests/pg/default/alter_default_db_privileges_sequences.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/tests/pg/default/alter_default_db_privileges_sequences.sql
@@ -13,9 +13,9 @@ CREATE DATABASE <TEST_DB_NAME>
 
 ALTER DEFAULT PRIVILEGES FOR ROLE postgres REVOKE ALL ON TABLES FROM postgres;
 
+ALTER DEFAULT PRIVILEGES FOR ROLE postgres REVOKE ALL ON SEQUENCES FROM postgres;
+
 ALTER DEFAULT PRIVILEGES FOR ROLE postgres
 GRANT SELECT, USAGE ON SEQUENCES TO PUBLIC;
 
-ALTER DEFAULT PRIVILEGES FOR ROLE postgres REVOKE ALL ON SEQUENCES FROM postgres;
-
 ALTER DEFAULT PRIVILEGES FOR ROLE postgres REVOKE EXECUTE ON FUNCTIONS FROM PUBLIC;
diff --git a/web/pgadmin/browser/server_groups/servers/databases/tests/pg/default/alter_default_db_privileges_types.sql b/web/pgadmin/browser/server_groups/servers/databases/tests/pg/default/alter_default_db_privileges_types.sql
index 90541625d..f3dbd0523 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/tests/pg/default/alter_default_db_privileges_types.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/tests/pg/default/alter_default_db_privileges_types.sql
@@ -13,11 +13,11 @@ CREATE DATABASE <TEST_DB_NAME>
 
 ALTER DEFAULT PRIVILEGES FOR ROLE postgres REVOKE ALL ON TABLES FROM postgres;
 
+ALTER DEFAULT PRIVILEGES FOR ROLE postgres REVOKE ALL ON SEQUENCES FROM postgres;
+
 ALTER DEFAULT PRIVILEGES FOR ROLE postgres
 GRANT SELECT, USAGE ON SEQUENCES TO PUBLIC;
 
-ALTER DEFAULT PRIVILEGES FOR ROLE postgres REVOKE ALL ON SEQUENCES FROM postgres;
-
 ALTER DEFAULT PRIVILEGES FOR ROLE postgres REVOKE EXECUTE ON FUNCTIONS FROM PUBLIC;
 
 ALTER DEFAULT PRIVILEGES FOR ROLE postgres REVOKE USAGE ON TYPES FROM PUBLIC;
diff --git a/web/pgadmin/browser/server_groups/servers/databases/tests/ppas/default/alter_default_db_privileges_tables.sql b/web/pgadmin/browser/server_groups/servers/databases/tests/ppas/default/alter_default_db_privileges_tables.sql
index 86e1b7e8b..ec12171f3 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/tests/ppas/default/alter_default_db_privileges_tables.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/tests/ppas/default/alter_default_db_privileges_tables.sql
@@ -11,9 +11,9 @@ CREATE DATABASE <TEST_DB_NAME>
     TABLESPACE = pg_default
     CONNECTION LIMIT = -1;
 
+ALTER DEFAULT PRIVILEGES FOR ROLE enterprisedb REVOKE ALL ON TABLES FROM enterprisedb;
+
 ALTER DEFAULT PRIVILEGES FOR ROLE enterprisedb
 GRANT SELECT ON TABLES TO PUBLIC;
 
-ALTER DEFAULT PRIVILEGES FOR ROLE enterprisedb REVOKE ALL ON TABLES FROM enterprisedb;
-
 ALTER DEFAULT PRIVILEGES FOR ROLE enterprisedb REVOKE EXECUTE ON FUNCTIONS FROM PUBLIC;


view thread (7+ messages)  latest in thread

reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Reply to all the recipients using the --to and --cc options:
  reply via email

  To: [email protected]
  Cc: [email protected]
  Subject: Re: [Patch] Bug #4256 - ALTER DEFAULT PRIVILEGES FOR ROLE some_role REVOKE EXECUTE ON FUNCTIONS FROM PUBLIC:
  In-Reply-To: <CAMa=N=NF58-jk8=AfCzceHOmWz7PeEY_uae_zsW2Ct-0W2guBg@mail.gmail.com>

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox