From 967bdbe64a77db1234fff97360d338480dd8b7c7 Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Wed, 2 May 2012 17:47:25 +0200 Subject: [PATCH] Updated credential description The appkit.admin. does not give access to the editor but for providers (other interfaces using the data, e.g. sharing cronks) fixes #2300. --- .../lib/database/models/generated/BaseNsmTarget.php | 4 ++-- etc/schema/mysql.sql | 4 ++-- etc/schema/oracle.sql | 4 ++-- etc/schema/pgsql.sql | 4 ++-- etc/schema/sqlite.sql | 4 ++-- etc/schema/updates/mysql_v1-6-2_to_v1-7.sql | 8 +++++++- etc/schema/updates/oracle_v1-6-2_to_v1-7.sql | 8 +++++++- etc/schema/updates/pgsql_v1-6-2_to_v1-7.sql | 8 +++++++- 8 files changed, 31 insertions(+), 13 deletions(-) diff --git a/app/modules/AppKit/lib/database/models/generated/BaseNsmTarget.php b/app/modules/AppKit/lib/database/models/generated/BaseNsmTarget.php index 381a93820..783b665da 100644 --- a/app/modules/AppKit/lib/database/models/generated/BaseNsmTarget.php +++ b/app/modules/AppKit/lib/database/models/generated/BaseNsmTarget.php @@ -86,8 +86,8 @@ public static function getInitialData() { array('target_id'=>6,'target_name'=>"IcingaCommandRo",'target_description'=>"Limit access to commands",'target_class'=>"IcingaDataCommandRoPrincipalTarget",'target_type'=>"icinga"), array('target_id'=>7,'target_name'=>"appkit.access",'target_description'=>"Access to login-page (which, actually, means no access)",'target_class'=>"",'target_type'=>"credential"), array('target_id'=>8,'target_name'=>"icinga.user",'target_description'=>"Access to icinga",'target_class'=>"",'target_type'=>"credential"), - array('target_id'=>9,'target_name'=>"appkit.admin.groups",'target_description'=>"Access to group editor",'target_class'=>"",'target_type'=>"credential"), - array('target_id'=>10,'target_name'=>"appkit.admin.users",'target_description'=>"Access to user editor",'target_class'=>"",'target_type'=>"credential"), + array('target_id'=>9,'target_name'=>"appkit.admin.groups",'target_description'=>"Access to group related data (e.g. share cronks)",'target_class'=>"",'target_type'=>"credential"), + array('target_id'=>10,'target_name'=>"appkit.admin.users",'target_description'=>"Access to user related data (provider)",'target_class'=>"",'target_type'=>"credential"), array('target_id'=>11,'target_name'=>"appkit.admin",'target_description'=>"Access to admin panel ",'target_class'=>"",'target_type'=>"credential"), array('target_id'=>12,'target_name'=>"appkit.user.dummy",'target_description'=>"Basic right for users",'target_class'=>"",'target_type'=>"credential"), array('target_id'=>13,'target_name'=>"appkit.api.access",'target_description'=>"Access to web-based api adapter",'target_class'=>"",'target_type'=>"credential"), diff --git a/etc/schema/mysql.sql b/etc/schema/mysql.sql index 556424438..ea3f656dd 100644 --- a/etc/schema/mysql.sql +++ b/etc/schema/mysql.sql @@ -48,8 +48,8 @@ INSERT INTO nsm_target (target_id,target_name,target_description,target_class,ta INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('6','IcingaCommandRo','Limit access to commands','IcingaDataCommandRoPrincipalTarget','icinga'); INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('7','appkit.access','Access to login-page (which, actually, means no access)','','credential'); INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('8','icinga.user','Access to icinga','','credential'); -INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('9','appkit.admin.groups','Access to group editor','','credential'); -INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('10','appkit.admin.users','Access to user editor','','credential'); +INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('9','appkit.admin.groups','Access to group related data (e.g. share cronks)','','credential'); +INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('10','appkit.admin.users','Access to user related data (provider)','','credential'); INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('11','appkit.admin','Access to admin panel ','','credential'); INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('12','appkit.user.dummy','Basic right for users','','credential'); INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('13','appkit.api.access','Access to web-based api adapter','','credential'); diff --git a/etc/schema/oracle.sql b/etc/schema/oracle.sql index 95fa7b157..a053d3677 100644 --- a/etc/schema/oracle.sql +++ b/etc/schema/oracle.sql @@ -413,8 +413,8 @@ INSERT INTO nsm_target (target_id,target_name,target_description,target_class,ta INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('6','IcingaCommandRo','Limit access to commands','IcingaDataCommandRoPrincipalTarget','icinga'); INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('7','appkit.access','Access to login-page (which, actually, means no access)','','credential'); INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('8','icinga.user','Access to icinga','','credential'); -INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('9','appkit.admin.groups','Access to group editor','','credential'); -INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('10','appkit.admin.users','Access to user editor','','credential'); +INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('9','appkit.admin.groups','Access to group related data (e.g. share cronks)','','credential'); +INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('10','appkit.admin.users','Access to user related data (provider)','','credential'); INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('11','appkit.admin','Access to admin panel ','','credential'); INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('12','appkit.user.dummy','Basic right for users','','credential'); INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('13','appkit.api.access','Access to web-based api adapter','','credential'); diff --git a/etc/schema/pgsql.sql b/etc/schema/pgsql.sql index 8b51aadc3..64066df52 100644 --- a/etc/schema/pgsql.sql +++ b/etc/schema/pgsql.sql @@ -57,8 +57,8 @@ INSERT INTO nsm_target (target_id,target_name,target_description,target_class,ta INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('6','IcingaCommandRo','Limit access to commands','IcingaDataCommandRoPrincipalTarget','icinga'); INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('7','appkit.access','Access to login-page (which, actually, means no access)','','credential'); INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('8','icinga.user','Access to icinga','','credential'); -INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('9','appkit.admin.groups','Access to group editor','','credential'); -INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('10','appkit.admin.users','Access to user editor','','credential'); +INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('9','appkit.admin.groups',' to group related data (e.g. share cronks)','','credential'); +INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('10','appkit.admin.users','Access to user related data (provider)','','credential'); INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('11','appkit.admin','Access to admin panel ','','credential'); INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('12','appkit.user.dummy','Basic right for users','','credential'); INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('13','appkit.api.access','Access to web-based api adapter','','credential'); diff --git a/etc/schema/sqlite.sql b/etc/schema/sqlite.sql index cbe6e46a9..fd6ecf546 100644 --- a/etc/schema/sqlite.sql +++ b/etc/schema/sqlite.sql @@ -163,8 +163,8 @@ INSERT INTO nsm_target (target_id,target_name,target_description,target_class,ta INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('6','IcingaCommandRo','Limit access to commands','IcingaDataCommandRoPrincipalTarget','icinga'); INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('7','appkit.access','Access to login-page (which, actually, means no access)','','credential'); INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('8','icinga.user','Access to icinga','','credential'); -INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('9','appkit.admin.groups','Access to group editor','','credential'); -INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('10','appkit.admin.users','Access to user editor','','credential'); +INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('9','appkit.admin.groups','Access to group related data (e.g. share cronks)','','credential'); +INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('10','appkit.admin.users','Access to user related data (provider)','','credential'); INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('11','appkit.admin','Access to admin panel ','','credential'); INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('12','appkit.user.dummy','Basic right for users','','credential'); INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('13','appkit.api.access','Access to web-based api adapter','','credential'); diff --git a/etc/schema/updates/mysql_v1-6-2_to_v1-7.sql b/etc/schema/updates/mysql_v1-6-2_to_v1-7.sql index e73634b5b..f97739e06 100644 --- a/etc/schema/updates/mysql_v1-6-2_to_v1-7.sql +++ b/etc/schema/updates/mysql_v1-6-2_to_v1-7.sql @@ -4,4 +4,10 @@ DROP TABLE IF EXISTS nsm_db_version; CREATE TABLE nsm_db_version (id INT, version VARCHAR(32) NOT NULL, modified DATETIME NOT NULL, created DATETIME NOT NULL, PRIMARY KEY(id)) ENGINE = INNODB; -INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.7.0', NOW(), NOW()); \ No newline at end of file +INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.7.0', NOW(), NOW()); + +UPDATE nsm_target SET target_description='Access to group related data (e.g. share cronks)' +where target_name='appkit.admin.groups'; + +UPDATE nsm_target SET target_description='Access to user related data (provider)' +where target_name='appkit.admin.users'; diff --git a/etc/schema/updates/oracle_v1-6-2_to_v1-7.sql b/etc/schema/updates/oracle_v1-6-2_to_v1-7.sql index 318f439f4..4c0b2d061 100644 --- a/etc/schema/updates/oracle_v1-6-2_to_v1-7.sql +++ b/etc/schema/updates/oracle_v1-6-2_to_v1-7.sql @@ -4,4 +4,10 @@ DROP TABLE IF EXISTS nsm_db_version; CREATE TABLE nsm_db_version (id INT, version VARCHAR(32) NOT NULL, modified TIMESTAMP NOT NULL, created TIMESTAMP NOT NULL, PRIMARY KEY(id)); -INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.7.0', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); \ No newline at end of file +INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.7.0', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); + +UPDATE nsm_target SET target_description='Access to group related data (e.g. share cronks)' +where target_name='appkit.admin.groups'; + +UPDATE nsm_target SET target_description='Access to user related data (provider)' +where target_name='appkit.admin.users'; diff --git a/etc/schema/updates/pgsql_v1-6-2_to_v1-7.sql b/etc/schema/updates/pgsql_v1-6-2_to_v1-7.sql index aa194cfb6..2fc9c52de 100644 --- a/etc/schema/updates/pgsql_v1-6-2_to_v1-7.sql +++ b/etc/schema/updates/pgsql_v1-6-2_to_v1-7.sql @@ -4,4 +4,10 @@ DROP TABLE IF EXISTS nsm_db_version; CREATE TABLE nsm_db_version (id INT, version VARCHAR(32) NOT NULL, modified TIMESTAMP NOT NULL, created TIMESTAMP NOT NULL, PRIMARY KEY(id)); -INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.7.0', NOW(), NOW()); \ No newline at end of file +INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.7.0', NOW(), NOW()); + +UPDATE nsm_target SET target_description='Access to group related data (e.g. share cronks)' +where target_name='appkit.admin.groups'; + +UPDATE nsm_target SET target_description='Access to user related data (provider)' +where target_name='appkit.admin.users';