Merge pull request #1420 from chef/praj/SEC-32-2

[rabbitmq] Remove guest user by default
chef · Nov 7, 2017 · c44f90a · c44f90a
2 parents b3eb9dc + 6ab5bc7
commit c44f90a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/omnibus/files/private-chef-cookbooks/private-chef/metadata.rb b/omnibus/files/private-chef-cookbooks/private-chef/metadata.rb
@@ -4,7 +4,7 @@
 license           "Apache 2.0"
 description       "Installs and configures Chef Server from Omnibus"
 long_description       "Installs and configures Chef Server from Omnibus"
-version           "0.1.0"
+version           "0.1.1"
 recipe            "chef-server", "Configures the Chef Server from Omnibus"
 
 %w{ ubuntu debian redhat centos oracle scientific fedora amazon }.each do |os|

diff --git a/omnibus/files/private-chef-cookbooks/private-chef/recipes/rabbitmq.rb b/omnibus/files/private-chef-cookbooks/private-chef/recipes/rabbitmq.rb
@@ -115,6 +115,13 @@
     retries 10
   end
 
+  # Remove default guest users
+  execute "#{rmq_ctl} delete_user guest" do
+    environment (rabbitmq_env)
+    user opc_username
+    only_if "#{rmq_ctl} list_users| grep guest", :environment => rabbitmq_env
+  end
+
   [ rabbitmq['vhost'], rabbitmq['actions_vhost'] ].each do |vhost|
     execute "#{rmq_ctl} add_vhost #{vhost}" do
       environment (rabbitmq_env)