OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
Add validations for group mappings form
Jan Sandbrink7d1a918e5523
diff --git a/config/locales/en.yml b/config/locales/en.ymlindex d3ff88a860b..6280aad2544 100644--- a/config/locales/en.yml+++ b/config/locales/en.yml@@ -1368,6 +1368,7 @@ en:odd: "must be odd."regex_match_failed: "does not match the regular expression %{expression}."regex_invalid: "could not be validated with the associated regular expression."+ regex_list_invalid: "could not be parsed as regular expression in lines %{invalid_lines}."smaller_than_or_equal_to_max_length: "must be smaller than or equal to maximum length."taken: "has already been taken."too_long: "is too long (maximum is %{count} characters)."diff --git a/modules/openid_connect/app/components/openid_connect/providers/group_mapping_form.rb b/modules/openid_connect/app/components/openid_connect/providers/group_mapping_form.rbindex 187f94097d1..a5d651e895e 100644--- a/modules/openid_connect/app/components/openid_connect/providers/group_mapping_form.rb+++ b/modules/openid_connect/app/components/openid_connect/providers/group_mapping_form.rb@@ -69,7 +69,7 @@ module OpenIDConnectgroup.text_area(name: :group_regexes,rows: 5,- label: I18n.t("openid_connect.providers.label_group_regexes"),+ label: OpenIDConnect::Provider.human_attribute_name(:group_regexes),caption: link_translate("openid_connect.instructions.group_regexes",links: { docs_url: %i[sysadmin_docs oidc_groups] },external: true),diff --git a/modules/openid_connect/app/contracts/openid_connect/providers/base_contract.rb b/modules/openid_connect/app/contracts/openid_connect/providers/base_contract.rbindex 8cd123138b4..caaa56e3e5c 100644--- a/modules/openid_connect/app/contracts/openid_connect/providers/base_contract.rb+++ b/modules/openid_connect/app/contracts/openid_connect/providers/base_contract.rb@@ -66,6 +66,12 @@ module OpenIDConnectattribute :"mapping_#{attr}"end+ attribute :groups_claim+ validates :groups_claim, presence: true++ attribute :group_regexes+ validate :group_regexes_parseable+privatedef path_attribute?(attr)@@ -79,6 +85,17 @@ module OpenIDConnectrescue JSON::ParserErrorerrors.add(:claims, :not_json)end++ def group_regexes_parseable+ invalid_lines = group_regexes.each_with_index.filter_map do |r, i|+ Regexp.new(r)+ nil+ rescue RegexpError+ i + 1+ end++ errors.add(:group_regexes, :regex_list_invalid, invalid_lines: invalid_lines.to_sentence) if invalid_lines.any?+ endendendenddiff --git a/modules/openid_connect/config/locales/en.yml b/modules/openid_connect/config/locales/en.ymlindex 380b8edf290..8ffa69e537c 100644--- a/modules/openid_connect/config/locales/en.yml+++ b/modules/openid_connect/config/locales/en.yml@@ -16,6 +16,7 @@ en:client_id: Client IDclient_secret: Client secretgroups_claim: Groups claim+ group_regexes: Patterns (regular expressions)secret: Secretscope: Scopesync_groups: Synchronize groups@@ -113,7 +114,6 @@ en:label_empty_title: No OpenID providers configured yet.label_empty_description: Add a provider to see them here.label_group_mapping: Group mapping- label_group_regexes: Pattern (regular expression)label_metadata: OpenID Connect Discovery Endpointlabel_automatic_configuration: Automatic configurationlabel_optional_configuration: Optional configurationdiff --git a/modules/openid_connect/spec/features/administration/oidc_custom_crud_spec.rb b/modules/openid_connect/spec/features/administration/oidc_custom_crud_spec.rbindex 616e9a1eda2..185e50b02c3 100644--- a/modules/openid_connect/spec/features/administration/oidc_custom_crud_spec.rb+++ b/modules/openid_connect/spec/features/administration/oidc_custom_crud_spec.rb@@ -82,13 +82,13 @@ RSpec.describe "OIDC administration CRUD",enabled_checkbox = page.find_by_id("openid_connect_provider_sync_groups")expect(enabled_checkbox).not_to be_checkedexpect(page).to have_no_field " Groups claim"- expect(page).to have_no_field "Pattern (regular expression)"+ expect(page).to have_no_field "Patterns (regular expressions)"check "Synchronize groups"expect(page).to have_field("Groups claim", with: "groups")- expect(page).to have_field("Pattern (regular expression)", with: "")+ expect(page).to have_field("Patterns (regular expressions)", with: "")fill_in "Groups claim", with: "custom-groups"- fill_in "Pattern (regular expression)", with: "Foo\nBar"+ fill_in "Patterns (regular expressions)", with: "Foo\nBar"click_link_or_button "Continue"