Fixing bug where unprivileged users cannot connect over a local socke…

…t. Adding integration test.

Fixing bug in mysql_grants_cmd generation

libraries/helpers.rb

@@ -38,7 +38,7 @@ def assign_root_password_cmd
       def install_grants_cmd
         str = '/usr/bin/mysql'
         str << ' -u root '
-        node['mysql']['server_root_password'].empty? ? str << ' < /etc/mysql_grants.sql' : str << " -p#{node['mysql']['server_root_password']}"
+        node['mysql']['server_root_password'].empty? ? str << ' < /etc/mysql_grants.sql' : str << " -p#{node['mysql']['server_root_password']} < /etc/mysql_grants.sql"
       end
     end
   end

recipes/_server_debian.rb

@@ -31,13 +31,11 @@
 end
 
 node['mysql']['server']['directories'].each do |key, value|
-  log "DEBUG: #{value}"
   directory value do
     owner     'mysql'
     group     'mysql'
-    mode      '0770'
+    mode      '0775'
     action    :create
-    recursive true
   end
 end
 

recipes/_server_rhel.rb

@@ -11,8 +11,8 @@
   directory value do
     owner     'mysql'
     group     'mysql'
+    mode      '0775'
     action    :create
-    recursive true
   end
 end
 

test/cookbooks/mysql_test/recipes/server.rb

@@ -36,3 +36,7 @@
 EOF}
   not_if "echo 'SELECT count(name) FROM tv_chef' | mysql #{mysql_conn_args} --skip-column-names #{node['mysql_test']['database']} | grep '^3$'"
 end
+
+user "unprivileged" do
+  action :create
+end

test/integration/server/serverspec/localhost/server_spec.rb

@@ -5,3 +5,8 @@
     expect(port 3306).to be_listening
   end
 end
+
+
+describe command("su -s /bin/sh -c \"mysql --protocol socket -uroot -pilikerandompasswords -e 'show databases;'\" unprivileged") do
+  it { should return_exit_status 0 }
+end