Merge pull request #23677 from opf/merge-release/17.5-20260611050510

Merge release/17.5 into dev

app/controllers/inplace_edit_fields_controller.rb

@@ -33,6 +33,7 @@ class InplaceEditFieldsController < ApplicationController
 
   before_action :find_model
   before_action :set_attribute
+  before_action :authorize_project_custom_field_visibility!, if: :custom_field_attribute?
   no_authorization_required! :edit, :update, :reset, :dialog
 
   def edit
@@ -125,6 +126,15 @@ class InplaceEditFieldsController < ApplicationController
     @attribute = params[:attribute].to_sym
   end
 
+  def authorize_project_custom_field_visibility!
+    return unless @model.is_a?(Project)
+
+    custom_field_id = @attribute.to_s.delete_prefix("custom_field_").to_i
+    unless ProjectCustomField.visible(current_user, project: @model).exists?(custom_field_id)
+      head :not_found
+    end
+  end
+
   def permitted_params
     if custom_field_via_fields_for?
       transform_custom_field_values_params.merge(custom_comments_params)

modules/meeting/config/locales/crowdin/cs.yml

@@ -402,6 +402,38 @@ cs:
         confirm_label:
           enable: Povolit aktualizací e-mailem
           disable: Zakázat aktualizací e-mailem
+      banner:
+        participants:
+          enabled: 'Všichni účastníci obdrží e-mailem aktualizované pozvánky do kalendáře, když přidáte nebo odeberete účastníky.
+
+            '
+          disabled: 'E-mailové aktualizace kalendářů jsou zakázány. Účastníci nedostanou e-mail s informacemi o přidání nebo odebrání účastníků.
+
+            '
+          draft_disabled: 'Participants will not receive an email informing them when you add or remove participants.
+
+            '
+        onetime:
+          enabled: 'Všichni účastníci obdrží e-mailem aktualizované pozvánky do kalendáře, když přidáte nebo odeberete účastníky.
+
+            '
+          disabled: 'Participants will not receive an email informing them of changes to meeting date, time or participants.
+
+            '
+        occurrence:
+          enabled: 'E-mailové aktualizace kalendářů jsou povoleny pro tuto sérii schůzek. Účastníci dostanou e-mail s informacemi, když provedete změny.
+
+            '
+          disabled: 'E-mailové aktualizace kalendářů jsou zakázány pro tuto sérii schůzek. Účastníci nedostanou e-mail s informacemi, když provedete změny.
+
+            '
+        template:
+          enabled: 'E-mailové aktualizace kalendářů jsou povoleny. Účastníci budou dostávat aktualizované pozvánky e-mailem, když upravíte tuto šablonu či individuální výskyty.
+
+            '
+          disabled: 'E-mailové aktualizace kalendářů jsou zakázány pro tuto sérii schůzek. Účastníci nebudou dostávat aktualizované pozvánky e-mailem, když upravíte tuto šablonu či individuální výskyty.
+
+            '
     presentation_mode:
       title: Prezentační mód
       button_present: Prezentovat

spec/controllers/inplace_edit_fields_controller_spec.rb

@@ -144,6 +144,10 @@ RSpec.describe InplaceEditFieldsController do
       let(:custom_field) { create(:project_custom_field) }
       let(:attribute) { custom_field.attribute_name.to_sym }
 
+      before do
+        allow(ProjectCustomField).to receive(:visible).and_return(ProjectCustomField.all)
+      end
+
       it "accepts custom_field_values hash params and returns ok" do
         patch :update, params: {
           model: model_param,
@@ -161,6 +165,10 @@ RSpec.describe InplaceEditFieldsController do
       let(:custom_field) { create(:project_custom_field) }
       let(:attribute) { custom_field.attribute_name.to_sym }
 
+      before do
+        allow(ProjectCustomField).to receive(:visible).and_return(ProjectCustomField.all)
+      end
+
       it "accepts custom_field_values array params and returns ok" do
         patch :update, params: {
           model: model_param,
@@ -204,6 +212,59 @@ RSpec.describe InplaceEditFieldsController do
     end
   end
 
+  describe "project custom field visibility guard" do
+    let(:handler) { double }
+
+    context "when the model is a project and the custom field is not visible to the user" do
+      let(:custom_field) { create(:project_custom_field) }
+      let(:attribute) { custom_field.attribute_name.to_sym }
+
+      before do
+        allow(ProjectCustomField)
+          .to receive(:visible)
+          .and_return(ProjectCustomField.none)
+      end
+
+      it "returns 404" do
+        get :dialog, params: {
+          model: model_param,
+          id: model.id,
+          attribute:
+        }, format: :turbo_stream
+
+        expect(response).to have_http_status(:not_found)
+      end
+    end
+
+    context "when the model is not a project" do
+      let(:non_project_model) { create(:user) }
+
+      let(:update_registry) do
+        registry = OpenProject::InplaceEdit::UpdateRegistry.new
+        contract = double
+        allow(contract).to receive(:new).and_return(double(writable?: true))
+        registry.register(User, handler:, contract:)
+        registry
+      end
+
+      before do
+        allow(controller).to receive_messages(current_user: user, update_registry:)
+        allow(User).to receive(:visible).and_return(User.where(id: non_project_model.id))
+        allow(controller).to receive(:respond_with_dialog) # skip component rendering for non-project model
+      end
+
+      it "does not apply the project custom field visibility check for a custom field attribute" do
+        get :dialog, params: {
+          model: "user",
+          id: non_project_model.id,
+          attribute: :custom_field_1
+        }, format: :turbo_stream
+
+        expect(response).not_to have_http_status(:not_found)
+      end
+    end
+  end
+
   describe "model resolution errors" do
     let(:handler) { double }
 

spec/requests/inplace_edit_fields/hidden_project_custom_field_comment_spec.rb

@@ -0,0 +1,138 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+
+# Security issue where the inplace-edit dialog endpoint
+# would expose stored comment text of admin_only project custom fields to
+# non-admin project members who cannot see the field through normal visibility
+# boundaries. (Regression#SC-244)
+#
+# The endpoint GET /inplace_edit_fields/project/:id/custom_field_<id>/dialog
+# must enforce the proper project custom field visibility.
+RSpec.describe "InplaceEditFieldsController — admin_only project custom field visibility",
+               :skip_csrf,
+               type: :rails_request do
+  let(:project) { create(:project) }
+
+  let(:hidden_custom_field) do
+    create(:project_custom_field, :admin_only, :has_comment, projects: [project])
+  end
+
+  let(:confidential_comment_text) { "confidential sponsor comment" }
+
+  let!(:custom_comment) do
+    create(:custom_comment,
+           customized: project,
+           custom_field: hidden_custom_field,
+           text: confidential_comment_text)
+  end
+
+  let(:attribute) { hidden_custom_field.attribute_name }
+  let(:path_params) { { model: "project", id: project.id, attribute: } }
+  let(:turbo_headers) { { "Accept" => "text/vnd.turbo-stream.html" } }
+
+  context "as a non-admin project member with edit_project_attributes" do
+    let(:member_role) do
+      create(:project_role, permissions: %i[view_project edit_project_attributes])
+    end
+    let(:non_admin_user) do
+      create(:user, member_with_roles: { project => member_role })
+    end
+
+    current_user { non_admin_user }
+
+    it "confirms that normal visibility scoping excludes the admin_only field" do
+      expect(ProjectCustomField.visible(non_admin_user, project:)).not_to include(hidden_custom_field)
+    end
+
+    it "confirms that the update contract marks the field as not writable" do
+      contract = Projects::UpdateContract.new(project, non_admin_user, options: { project_attributes_only: true })
+      expect(contract.writable?(hidden_custom_field.attribute_name)).to be(false)
+    end
+
+    it "blocks GET edit" do
+      get inplace_edit_field_edit_path(path_params), headers: turbo_headers
+      expect(response).to have_http_status(:not_found)
+    end
+
+    it "blocks PATCH update" do
+      patch inplace_edit_field_update_path(path_params), headers: turbo_headers
+      expect(response).to have_http_status(:not_found)
+    end
+
+    it "blocks GET reset" do
+      get inplace_edit_field_reset_path(path_params), headers: turbo_headers
+      expect(response).to have_http_status(:not_found)
+    end
+
+    it "blocks GET dialog and does not expose the comment text", :aggregate_failures do
+      get inplace_edit_field_dialog_path(path_params), headers: turbo_headers
+
+      expect(response).to have_http_status(:not_found)
+      expect(response.body).not_to include(confidential_comment_text)
+    end
+  end
+
+  context "when the attribute is not a custom field" do
+    let(:member_role) do
+      create(:project_role, permissions: %i[view_project edit_project_attributes])
+    end
+    let(:non_admin_user) do
+      create(:user, member_with_roles: { project => member_role })
+    end
+
+    current_user { non_admin_user }
+
+    it "does not block the non-admin user for standard project attributes" do
+      get inplace_edit_field_dialog_path(model: "project", id: project.id, attribute: "name"),
+          headers: turbo_headers
+
+      expect(response).to have_http_status(:ok)
+    end
+  end
+
+  context "as an admin" do
+    let(:admin) { create(:admin) }
+
+    current_user { admin }
+
+    it "confirms that visibility scoping includes the admin_only field for admins" do
+      expect(ProjectCustomField.visible(admin, project:)).to include(hidden_custom_field)
+    end
+
+    it "can access the dialog and see the comment", :aggregate_failures do
+      get inplace_edit_field_dialog_path(path_params), headers: turbo_headers
+
+      expect(response).to have_http_status(:ok)
+      expect(response.body).to include(confidential_comment_text)
+    end
+  end
+end