Skip to content

Validate gem name against protected typos when creating pending trusted publisher #6330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Hemang360 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Validate gem name against protected typos when creating pending trusted publisher #6330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f74292
Add validation for protected gem typos
Hemang360 Mar 17, 2026
8f50d8f
Add test for rubygem name validation
Hemang360 Mar 17, 2026
f8994e4
Merge branch 'master' into gem-name-validation
colby-swandale Mar 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions app/models/oidc/pending_trusted_publisher.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ class OIDC::PendingTrustedPublisher < ApplicationRecord
uniqueness: { case_sensitive: false, scope: %i[trusted_publisher_id trusted_publisher_type], conditions: -> { unexpired } }

validate :available_rubygem_name, on: :create
validate :protected_gem_typo, on: :create

scope :unexpired, -> { where(arel_table[:expires_at].eq(nil).or(arel_table[:expires_at].gt(Time.now.utc))) }
scope :expired, -> { where(arel_table[:expires_at].lteq(Time.now.utc)) }
Expand All @@ -37,4 +38,12 @@ def available_rubygem_name

errors.add(:rubygem_name, :unavailable)
end

def protected_gem_typo
return if rubygem_name.blank?
gem_typo = GemTypo.new(rubygem_name)

return unless gem_typo.protected_typo?
errors.add :rubygem_name, "'#{rubygem_name}' is too similar to an existing gem named '#{gem_typo.protected_gem}'"
end
end
10 changes: 10 additions & 0 deletions test/models/oidc/pending_trusted_publisher_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,14 @@ class OIDC::PendingTrustedPublisherTest < ActiveSupport::TestCase
refute_predicate publisher, :valid?
assert_equal ["is already in use"], publisher.errors[:rubygem_name]
end

test "validates rubygem name is not a protected typo" do
rubygem = create(:rubygem, name: "typekit", downloads: 15_000)
create(:version, rubygem: rubygem, created_at: 1.day.ago)

publisher = build(:oidc_pending_trusted_publisher, rubygem_name: "type_kit")

refute_predicate publisher, :valid?
assert_includes publisher.errors[:rubygem_name].first, "is too similar to an existing gem named 'typekit'"
end
end
Loading