FM-2236 Change to permissions and allow user to pass an array instead of single permission

Author: Travis Fields

manifests/user/permission.pp

@@ -13,8 +13,8 @@
 # [database]
 #   The databaser you would like the permission managed on.
 #
-# [permission]
-#   The permission you would like managed. i.e. 'SELECT', 'INSERT', 'UPDATE', 'DELETE'
+# [permissions]
+#   An array of permissions you would like managed. i.e. ['SELECT', 'INSERT', 'UPDATE', 'DELETE']
 #
 # [state]
 #   The state you would like the permission in.  Accepts 'GRANT', 'DENY', 'REVOKE' Please note that REVOKE equates to absent and will default to database and system level permissions.
@@ -29,17 +29,16 @@
 define sqlserver::user::permission (
   $user,
   $database,
-  $permission        = $title,
+  $permissions,
   $state             = 'GRANT',
   $with_grant_option = false,
   $instance          = 'MSSQLSERVER',
 ){
   sqlserver_validate_instance_name($instance)
 
 ## Validate Permissions
-  $_permission = upcase($permission)
-  sqlserver_validate_range($_permission, 4, 128, 'Permission must be between 4 and 128 characters')
-  validate_re($_permission, '^([A-Z]|\s)+$','Permissions must be alphabetic only')
+  sqlserver_validate_range($permissions, 4, 128, 'Permission must be between 4 and 128 characters')
+  validate_array($permissions)
 
 ## Validate state
   $_state = upcase($state)
@@ -54,8 +53,11 @@
 
   sqlserver_validate_range($user, 1, 128, 'User must be between 1 and 128 characters')
 
+  if $with_grant_option {
+    $grant_option = "-WITH_GRANT_OPTION"
+  }
   sqlserver_tsql{
-    "user-permissions-${instance}-${database}-${user}-${_permission}":
+    "user-permissions-${instance}-${database}-${user}-${_state}${grant_option}":
       instance => $instance,
       command  => template("sqlserver/create/user/permission.sql.erb"),
       onlyif   => template('sqlserver/query/user/permission_exists.sql.erb'),

spec/defines/user/permission_spec.rb

@@ -6,11 +6,11 @@
   context 'validation errors' do
     include_context 'manifests' do
       let(:title) { 'myTitle' }
-      let(:sqlserver_tsql_title) { 'user-permissions-MSSQLSERVER-loggingDb-loggingUser-SELECT' }
+      let(:sqlserver_tsql_title) { 'user-permissions-MSSQLSERVER-loggingDb-loggingUser-GRANT' }
     end
     context 'user =>' do
       let(:params) { {
-          :permission => 'SELECT',
+          :permissions => ['SELECT'],
           :database => 'loggingDb',
       } }
       let(:raise_error_check) { 'User must be between 1 and 128 characters' }
@@ -27,28 +27,28 @@
         it_behaves_like 'validation error'
       end
     end
-    context 'permission' do
+    context 'permissions' do
       let(:params) { {
           :user => 'loggingUser',
           :database => 'loggingDb',
       } }
       let(:raise_error_check) { 'Permission must be between 4 and 128 characters' }
       describe 'empty' do
-        let(:additional_params) { {:permission => ''} }
+        let(:additional_params) { {:permissions => ''} }
         it_behaves_like 'validation error'
       end
       describe 'under limit' do
-        let(:additional_params) { {:permission => random_string_of_size(3, false)} }
+        let(:additional_params) { {:permissions => [random_string_of_size(3, false)]} }
         it_behaves_like 'validation error'
       end
       describe 'over limit' do
-        let(:additional_params) { {:permission => random_string_of_size(129, false)} }
+        let(:additional_params) { {:permissions => [random_string_of_size(129, false)]} }
         it_behaves_like 'validation error'
       end
     end
     context 'state =>' do
       let(:params) { {
-          :permission => 'SELECT',
+          :permissions => ['SELECT'],
           :database => 'loggingDb',
           :user => 'loggingUser'
       } }
@@ -60,7 +60,7 @@
     end
     context 'with_grant_option => ' do
       let(:params) { {
-          :permission => 'SELECT',
+          :permissions => ['SELECT'],
           :database => 'loggingDb',
           :user => 'loggingUser',
 
@@ -80,16 +80,16 @@
   context 'successfully' do
     include_context 'manifests' do
       let(:title) { 'myTitle' }
-      let(:sqlserver_tsql_title) { 'user-permissions-MSSQLSERVER-loggingDb-loggingUser-SELECT' }
+      let(:sqlserver_tsql_title) { 'user-permissions-MSSQLSERVER-loggingDb-loggingUser-GRANT' }
       let(:params) { {
           :user => 'loggingUser',
-          :permission => 'SELECT',
+          :permissions => ['SELECT'],
           :database => 'loggingDb',
       } }
     end
     %w(revoke grant deny).each do |state|
       context "state => '#{state}'" do
-        let(:sqlserver_tsql_title) { 'user-permissions-MSSQLSERVER-loggingDb-loggingUser-SELECT' }
+        let(:sqlserver_tsql_title) { "user-permissions-MSSQLSERVER-loggingDb-loggingUser-#{state.upcase}" }
         let(:should_contain_command) { ["#{state.upcase} SELECT TO [loggingUser];", 'USE [loggingDb];'] }
         describe "lowercase #{state}" do
           let(:additional_params) { {:state => state} }
@@ -106,15 +106,15 @@
     context 'permission' do
       describe 'upper limit' do
         permission =random_string_of_size(128, false)
-        let(:additional_params) { {:permission => permission} }
-        let(:sqlserver_tsql_title) { "user-permissions-MSSQLSERVER-loggingDb-loggingUser-#{permission.upcase}" }
+        let(:additional_params) { {:permissions => [permission]} }
+        let(:sqlserver_tsql_title) { "user-permissions-MSSQLSERVER-loggingDb-loggingUser-GRANT" }
         let(:should_contain_command) { ['USE [loggingDb];'] }
         it_behaves_like 'sqlserver_tsql command'
       end
       describe 'alter' do
-        let(:additional_params) { {:permission => 'ALTER'} }
+        let(:additional_params) { {:permissions => ['ALTER']} }
         let(:should_contain_command) { ['USE [loggingDb];', 'GRANT ALTER TO [loggingUser];'] }
-        let(:sqlserver_tsql_title) { 'user-permissions-MSSQLSERVER-loggingDb-loggingUser-ALTER' }
+        let(:sqlserver_tsql_title) { 'user-permissions-MSSQLSERVER-loggingDb-loggingUser-GRANT' }
         it_behaves_like 'sqlserver_tsql command'
       end
     end
@@ -131,6 +131,7 @@
 
     context 'with_grant_option =>' do
       describe 'true' do
+        let(:sqlserver_tsql_title) { 'user-permissions-MSSQLSERVER-loggingDb-loggingUser-GRANT-WITH_GRANT_OPTION' }
         let(:additional_params) { {:with_grant_option => true} }
         let(:should_contain_command) { [
             "IF @perm_state != 'GRANT_WITH_GRANT_OPTION'",
@@ -150,7 +151,6 @@
             'REVOKE GRANT OPTION FOR SELECT TO [loggingUser] CASCADE;',
             "IF 'GRANT_WITH_GRANT_OPTION' = ISNULL(",
         ] }
-
         let(:should_contain_onlyif) { ["IF @perm_state != 'GRANT'",] }
         it_behaves_like 'sqlserver_tsql command'
         it_behaves_like 'sqlserver_tsql onlyif'
@@ -161,21 +161,22 @@
   context 'command syntax' do
     include_context 'manifests' do
       let(:title) { 'myTitle' }
-      let(:sqlserver_tsql_title) { 'user-permissions-MSSQLSERVER-loggingDb-loggingUser-SELECT' }
+      let(:sqlserver_tsql_title) { 'user-permissions-MSSQLSERVER-loggingDb-loggingUser-GRANT' }
       let(:params) { {
           :user => 'loggingUser',
-          :permission => 'SELECT',
+          :permissions => ['SELECT'],
           :database => 'loggingDb',
       } }
       describe '' do
         let(:should_contain_command) { [
             'USE [loggingDb];',
             'GRANT SELECT TO [loggingUser];',
-            /DECLARE @perm_state varchar\(250\)/,
+            /DECLARE @perm_state varchar\(250\), @error_msg varchar\(250\)/,
+            /SET @permission = 'SELECT'/,
             /SET @perm_state = ISNULL\(\n\s+\(SELECT perm.state_desc FROM sys\.database_principals princ\n\s+JOIN sys\./,
             /JOIN sys\.database_permissions perm ON perm\.grantee_principal_id = princ.principal_id\n\s+WHERE/,
-            /WHERE princ\.type in \('U','S','G'\) AND name = 'loggingUser' AND permission_name = 'SELECT'\),\n\s+'REVOKE'\)\s+;/,
-            /DECLARE @error_msg varchar\(250\);\nSET @error_msg = 'EXPECTED user \[loggingUser\] to have permission \[SELECT\] with GRANT but got ' \+ @perm_state;/,
+            /WHERE princ\.type in \('U','S','G'\) AND name = 'loggingUser' AND permission_name = @permission\),\n\s+'REVOKE'\)\s+;/,
+            /SET @error_msg = 'EXPECTED user \[loggingUser\] to have permission \[' \+ @permission \+ '\] with GRANT but got ' \+ @perm_state;/,
             /IF @perm_state != 'GRANT'\n\s+THROW 51000, @error_msg, 10/
         ] }
         it_behaves_like 'sqlserver_tsql command'

templates/create/user/permission.sql.erb

@@ -1,11 +1,17 @@
+ USE [<%= @database %>];
+ DECLARE @perm_state varchar(250), @error_msg varchar(250), @permission varchar(250);
+ <% @permissions.each do |permission|
+  permission.upcase!
+ %>
+SET @permission = '<%= permission %>'
 BEGIN
-    USE [<%= @database %>];
     <% if @with_grant_option == false %>
     IF 'GRANT_WITH_GRANT_OPTION' = <%= scope.function_template(['sqlserver/snippets/user/permission/get_perm_state.sql.erb']) %>
-        REVOKE GRANT OPTION FOR <%= @_permission %> TO [<%= @user %>] CASCADE;
+        REVOKE GRANT OPTION FOR <%= permission %> TO [<%= @user %>] CASCADE;
     <% end %>
-    <%= @_state %> <%= @_permission %> TO [<%= @user %>]<% if @with_grant_option == true %> WITH GRANT OPTION<% end %>;
+    <%= @_state %> <%= permission %> TO [<%= @user %>]<% if @with_grant_option == true %> WITH GRANT OPTION<% end %>;
 END
 BEGIN
-    <%= scope.function_template(['sqlserver/query/user/permission_exists.sql.erb']) %>
+    <%= scope.function_template(['sqlserver/snippets/user/permission/exists.sql.erb']) %>
 END
+<% end %>

templates/query/user/permission_exists.sql.erb

@@ -1,8 +1,8 @@
 USE [<%= @database %>];
-DECLARE @perm_state varchar(250);
-SET @perm_state = <%= scope.function_template(['sqlserver/snippets/user/permission/get_perm_state.sql.erb']) %>;
-DECLARE @error_msg varchar(250);
-SET @error_msg = 'EXPECTED user [<%= @user %>] to have permission [<%= @_permission %>] with <%= @_state %> but got ' + @perm_state;
 
-IF @perm_state != '<% if @with_grant_option == true %>GRANT_WITH_GRANT_OPTION<% else %><%= @_state %><% end %>'
-	THROW 51000, @error_msg, 10
+DECLARE @perm_state varchar(250), @error_msg varchar(250), @permission varchar(250);
+<% @permissions.each do |permission|
+permission.upcase! %>
+SET @permission = '<%= permission %>'
+<%= scope.function_template(['sqlserver/snippets/user/permission/exists.sql.erb']) %>
+<% end %>

templates/snippets/user/permission/exists.sql.erb

@@ -0,0 +1,4 @@
+SET @perm_state = <%= scope.function_template(['sqlserver/snippets/user/permission/get_perm_state.sql.erb']) %>;
+SET @error_msg = 'EXPECTED user [<%= @user %>] to have permission [' + @permission + '] with <%= @_state %> but got ' + @perm_state;
+IF @perm_state != '<% if @with_grant_option == true %>GRANT_WITH_GRANT_OPTION<% else %><%= @_state %><% end %>'
+	THROW 51000, @error_msg, 10

templates/snippets/user/permission/get_perm_state.sql.erb

@@ -1,5 +1,5 @@
 ISNULL(
     (SELECT perm.state_desc FROM sys.database_principals princ
         JOIN sys.database_permissions perm ON perm.grantee_principal_id = princ.principal_id
-        WHERE princ.type in ('U','S','G') AND name = '<%= @user %>' AND permission_name = '<%= @_permission %>'),
+        WHERE princ.type in ('U','S','G') AND name = '<%= @user %>' AND permission_name = @permission),
         'REVOKE')