From 0a0ca9c340f5bf2a55d3620a471b531944f67f74 Mon Sep 17 00:00:00 2001 From: Reynald Bourtembourg Date: Thu, 24 Jan 2019 14:43:20 +0100 Subject: [PATCH] Add DServer::EventConfirmSubscription command ... (#13) ... to the default list of commands always allowed by TangoAccessControl Thanks @egorbe for reporting this tango-controls/cppTango#507 issue and for proposing this solution. --- create_db.sql.in | 1 + update_db5.sql.in | 1 + update_db6.sql.in | 1 + update_db7.sql.in | 1 + update_db8.sql.in | 5 ++++- 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/create_db.sql.in b/create_db.sql.in index d5993c9ef..ff7f3edd7 100644 --- a/create_db.sql.in +++ b/create_db.sql.in @@ -133,6 +133,7 @@ INSERT INTO property_class VALUES('DServer','AllowedAccessCmd',7,'QueryWizardDev INSERT INTO property_class VALUES('DServer','AllowedAccessCmd',8,'QueryWizardClassProperty',NOW(),NOW(),NULL); INSERT INTO property_class VALUES('DServer','AllowedAccessCmd',9,'QuerySubDevice',NOW(),NOW(),NULL); INSERT INTO property_class VALUES('DServer','AllowedAccessCmd',10,'ZMQEventSubscriptionChange',NOW(),NOW(),NULL); +INSERT INTO property_class VALUES('DServer','AllowedAccessCmd',11,'EventConfirmSubscription',NOW(),NOW(),NULL); # # diff --git a/update_db5.sql.in b/update_db5.sql.in index a22874dbc..dd50f258b 100644 --- a/update_db5.sql.in +++ b/update_db5.sql.in @@ -232,6 +232,7 @@ INSERT INTO property_class VALUES('DServer','AllowedAccessCmd',7,'QueryWizardDev INSERT INTO property_class VALUES('DServer','AllowedAccessCmd',8,'QueryWizardClassProperty',NULL,NULL,NULL); INSERT INTO property_class VALUES('DServer','AllowedAccessCmd',9,'QuerySubDevice',NULL,NULL,NULL); INSERT INTO property_class VALUES('DServer','AllowedAccessCmd',10,'ZMQEventSubscriptionChange',NULL,NULL,NULL); +INSERT INTO property_class VALUES('DServer','AllowedAccessCmd',11,'EventConfirmSubscription',NULL,NULL,NULL); # # diff --git a/update_db6.sql.in b/update_db6.sql.in index fb775e1b9..13666ac11 100644 --- a/update_db6.sql.in +++ b/update_db6.sql.in @@ -19,6 +19,7 @@ INSERT INTO property_class VALUES('Database','AllowedAccessCmd',34,'DbGetCSDbSer INSERT INTO property_class VALUES('DServer','AllowedAccessCmd',9,'QuerySubDevice',NULL,NULL,NULL); INSERT INTO property_class VALUES('DServer','AllowedAccessCmd',10,'ZMQEventSubscriptionChange',NULL,NULL,NULL); +INSERT INTO property_class VALUES('DServer','AllowedAccessCmd',11,'EventConfirmSubscription',NULL,NULL,NULL); # # diff --git a/update_db7.sql.in b/update_db7.sql.in index 06729260f..14b1e3cf9 100644 --- a/update_db7.sql.in +++ b/update_db7.sql.in @@ -127,6 +127,7 @@ INSERT INTO property_class VALUES('Database','AllowedAccessCmd',45,'DbGetForward DELETE FROM property_class WHERE class='DServer' AND count >= 10; INSERT INTO property_class VALUES('DServer','AllowedAccessCmd',10,'ZMQEventSubscriptionChange',NOW(),NOW(),NULL); +INSERT INTO property_class VALUES('DServer','AllowedAccessCmd',11,'EventConfirmSubscription',NOW(),NOW(),NULL); DELETE FROM property_class WHERE class='Starter' AND count >= 5; INSERT INTO property_class VALUES('Starter','AllowedAccessCmd',5,'UpdateServerList',NOW(),NOW(),NULL); diff --git a/update_db8.sql.in b/update_db8.sql.in index 475a823a2..18dcf07b8 100644 --- a/update_db8.sql.in +++ b/update_db8.sql.in @@ -105,7 +105,7 @@ ALTER TABLE device_history_id MODIFY id bigint unsigned NOT NULL default '0'; ALTER TABLE object_history_id MODIFY id bigint unsigned NOT NULL default '0'; # -# Update entries in the property_class tables for database +# Update entries in the property_class tables for controlled access service # DELETE FROM property_class WHERE class='Database' AND count >= 35; @@ -122,6 +122,9 @@ INSERT INTO property_class VALUES('Database','AllowedAccessCmd',43,'DbGetDeviceP INSERT INTO property_class VALUES('Database','AllowedAccessCmd',44,'DbGetAttributeAliasList',NOW(),NOW(),NULL); INSERT INTO property_class VALUES('Database','AllowedAccessCmd',45,'DbGetForwardedAttributeListForDevice',NOW(),NOW(),NULL); +DELETE FROM property_class WHERE class='DServer' AND count >= 11; +INSERT INTO property_class VALUES('DServer','AllowedAccessCmd',11,'EventConfirmSubscription',NOW(),NOW(),NULL); + # # Remove history entries for the property used by memorized attribute #