Fixes #35368 - Prevent multiple envs in host registration (Katello#10236

) (cherry picked from commit bb5d05d)
sjha4 · Aug 29, 2022 · d43df9c · d43df9c
1 parent d2458d0
commit d43df9c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb b/app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb
@@ -313,6 +313,9 @@ def find_content_view_environment
 
       if params.key?(:environment_id)
         environment = get_content_view_environment("cp_id", params[:environment_id])
+      elsif params.key?(:environments)
+        fail HttpErrors::BadRequest, _('Multiple environments are not supported.') if params['environments'].length > 1
+        environment = get_content_view_environment("cp_id", params['environments'].first['id'])
       elsif params.key?(:organization_id) && !params.key?(:environment_id)
         organization = Organization.current
         environment = organization.library.content_view_environment

diff --git a/test/controllers/api/rhsm/candlepin_proxies_controller_test.rb b/test/controllers/api/rhsm/candlepin_proxies_controller_test.rb
@@ -96,6 +96,27 @@ module Katello
         assert_response :success
       end
 
+      it "should register with new environments param" do
+        Resources::Candlepin::Consumer.stubs(:get)
+
+        ::Katello::RegistrationManager.expects(:process_registration).with({'facts' => @facts }, @content_view_environment).returns(@host)
+
+        post(:consumer_create, params: { :organization_id => @content_view_environment.content_view.organization.label, :environments => [{id: @content_view_environment.cp_id}], :facts => @facts })
+
+        assert_response :success
+      end
+
+      it "should not register with multiple envs" do
+        ::Katello::RegistrationManager.expects(:process_registration).never
+
+        post(:consumer_create, params: { :organization_id => @content_view_environment.content_view.organization.label, :environments => [{id: @content_view_environment.cp_id}, {id: @content_view_environment.cp_id}], :facts => @facts })
+
+        body = JSON.parse(response.body)
+
+        assert_equal 'Multiple environments are not supported.', body['displayMessage']
+        assert_response 400
+      end
+
       it "should not register" do
         ::Katello::RegistrationManager.expects(:check_registration_services).returns(false)
         ::Katello::RegistrationManager.expects(:process_registration).never