<% end %>
+
|
|
@@ -114,6 +121,8 @@
+ <%= paginate @api_keys %>
+
<%= button_to t(".new_key"), new_profile_api_key_path, method: "get", class: "form__submit" %>
<% if current_user.oidc_api_key_roles.any? %>
<%= link_to t("oidc.api_key_roles.index.api_key_roles"), profile_oidc_api_key_roles_path, class: "t-link t-underline" %> →
diff --git a/app/views/mailer/admin_manual.html.erb b/app/views/mailer/admin_manual.html.erb
new file mode 100644
index 00000000000..e53371b916d
--- /dev/null
+++ b/app/views/mailer/admin_manual.html.erb
@@ -0,0 +1,20 @@
+<% @title = t(".title") %>
+
+
+
+
+ |
+
+
+
+
+ <%= simple_format @body %>
+
+
+
+
+ |
+ |
+
+
+
diff --git a/app/views/mailer/admin_manual.text.erb b/app/views/mailer/admin_manual.text.erb
new file mode 100644
index 00000000000..9e66ef58e6d
--- /dev/null
+++ b/app/views/mailer/admin_manual.text.erb
@@ -0,0 +1,3 @@
+Hi <%= @user.handle %>
+
+<%= strip_tags @body %>
diff --git a/config/application.rb b/config/application.rb
index 7de954883d6..548551b8d00 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -69,6 +69,10 @@ class Application < Rails::Application
config.active_support.cache_format_version = 7.1
config.action_dispatch.rescue_responses["Rack::Multipart::EmptyContentError"] = :bad_request
+
+ config.action_dispatch.default_headers.merge!(
+ "Cross-Origin-Opener-Policy" => "same-origin"
+ )
end
def self.config
diff --git a/config/initializers/better_html.rb b/config/initializers/better_html.rb
index 07b30994ef3..3eb5dc80cfe 100644
--- a/config/initializers/better_html.rb
+++ b/config/initializers/better_html.rb
@@ -1,5 +1,5 @@
BetterHtml.configure do |config|
config.template_exclusion_filter = proc { |filename|
- filename.include?("avo")
+ filename.include?("avo") || filename.include?("/railties-")
}
end
diff --git a/config/initializers/statsd.rb b/config/initializers/statsd.rb
index 2e91b49bc84..a3721b165bb 100644
--- a/config/initializers/statsd.rb
+++ b/config/initializers/statsd.rb
@@ -57,8 +57,10 @@
ActiveSupport::Notifications.subscribe("perform_job.good_job") do |event|
execution = event.payload[:execution]
+ # TODO: remove || execution after GoodJob 4 upgrade
+ job = event.payload[:job] || execution
- result = if event.payload[:retried] || execution.retried_good_job_id.present?
+ result = if event.payload[:retried] || job.retried_good_job_id.present?
:retried
elsif event.payload[:unhandled_error]
:unhandled_error
@@ -72,7 +74,7 @@
job_class: execution.serialized_params['job_class'],
exception: event.payload.dig(:exception, 0),
queue: execution.queue_name,
- priority: execution.priority,
+ priority: job.priority,
result:
}
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 05ea1a97e7c..45dfb79110c 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -427,6 +427,8 @@ de:
gepusht wurde.
gem_trusted_publisher_added:
title: VERTRAUENSWÜRDIGER PUBLISHER HINZUGEFÜGT
+ admin_manual:
+ title:
news:
show:
title: Neue Veröffentlichungen — Alle Gems
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7bd9587da3e..24b224df018 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -377,6 +377,8 @@ en:
gem_html: This webhook was previously called when
%{gem} was pushed.
gem_trusted_publisher_added:
title: TRUSTED PUBLISHER ADDED
+ admin_manual:
+ title: MESSAGE FROM RUBYGEMS.ORG ADMINS
news:
show:
title: New Releases — All Gems
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 315466f7d70..53126188d4b 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -418,6 +418,8 @@ es:
gem_html: Este webhook se ejecutaba antes cuando se subía
%{gem}.
gem_trusted_publisher_added:
title:
+ admin_manual:
+ title:
news:
show:
title: Nuevos lanzamientos — Todas las Gemas
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index d9fdef24909..6cf3dc8fa38 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -383,6 +383,8 @@ fr:
gem_html:
gem_trusted_publisher_added:
title:
+ admin_manual:
+ title:
news:
show:
title: Nouvelles Versions - Toutes les Gems
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 254592e147c..c07d1cfe93d 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -377,6 +377,8 @@ ja:
gem_html: このwebhookは以前
%{gem}がプッシュされたときに呼ばれました。
gem_trusted_publisher_added:
title: 信頼できる発行元が追加されました
+ admin_manual:
+ title:
news:
show:
title: 新しいリリース - 全てのgem
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 0bbba0c11d6..f4d63d2a5e7 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -368,6 +368,8 @@ nl:
gem_html:
gem_trusted_publisher_added:
title:
+ admin_manual:
+ title:
news:
show:
title:
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 0d8c9a12263..e095dd86717 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -380,6 +380,8 @@ pt-BR:
gem_html:
gem_trusted_publisher_added:
title:
+ admin_manual:
+ title:
news:
show:
title: Novos Releases - Todas as Gems
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index b2282b754fb..35eeae1c007 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -382,6 +382,8 @@ zh-CN:
被推送时被调用。
gem_trusted_publisher_added:
title:
+ admin_manual:
+ title:
news:
show:
title: 新的发布 — 所有 Gem
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 72988f60f0b..dedf71f927f 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -374,6 +374,8 @@ zh-TW:
被推送的時候被呼叫。
gem_trusted_publisher_added:
title:
+ admin_manual:
+ title:
news:
show:
title: 最新發佈
diff --git a/db/migrate/20240722182907_create_good_job_execution_duration.rb b/db/migrate/20240722182907_create_good_job_execution_duration.rb
new file mode 100644
index 00000000000..fef37f07bc1
--- /dev/null
+++ b/db/migrate/20240722182907_create_good_job_execution_duration.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class CreateGoodJobExecutionDuration < ActiveRecord::Migration[7.1]
+ def change
+ reversible do |dir|
+ dir.up do
+ # Ensure this incremental update migration is idempotent
+ # with monolithic install migration.
+ return if connection.column_exists?(:good_job_executions, :duration)
+ end
+ end
+
+ add_column :good_job_executions, :duration, :interval
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index d96543466c8..36bfa9037c0 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[7.1].define(version: 2024_07_20_201622) do
+ActiveRecord::Schema[7.1].define(version: 2024_07_22_182907) do
# These are extensions that must be enabled in order to support this database
enable_extension "hstore"
enable_extension "pgcrypto"
@@ -202,6 +202,7 @@
t.integer "error_event", limit: 2
t.text "error_backtrace", array: true
t.uuid "process_id"
+ t.interval "duration"
t.index ["active_job_id", "created_at"], name: "index_good_job_executions_on_active_job_id_and_created_at"
t.index ["process_id", "created_at"], name: "index_good_job_executions_on_process_id_and_created_at"
end
diff --git a/lib/name_format_validator.rb b/lib/name_format_validator.rb
index d8fae743d2c..fa59e37b185 100644
--- a/lib/name_format_validator.rb
+++ b/lib/name_format_validator.rb
@@ -2,14 +2,18 @@
class NameFormatValidator < ActiveModel::EachValidator
def validate_each(record, attribute, value)
- if value.class != String
- record.errors.add attribute, "must be a String"
- elsif !Patterns::LETTER_REGEXP.match?(value)
- record.errors.add attribute, "must include at least one letter"
- elsif !Patterns::NAME_PATTERN.match?(value)
- record.errors.add attribute, "can only include letters, numbers, dashes, and underscores"
- elsif Patterns::SPECIAL_CHAR_PREFIX_REGEXP.match?(value)
- record.errors.add attribute, "can not begin with a period, dash, or underscore"
- end
+ return record.errors.add attribute, "must be a String" if value.class != String
+
+ record.errors.add attribute, "must include at least one letter" if requires_letter? && !Patterns::LETTER_REGEXP.match?(value)
+ record.errors.add attribute, "can only include letters, numbers, dashes, and underscores" unless Patterns::NAME_PATTERN.match?(value)
+ record.errors.add attribute, "can not begin with a period, dash, or underscore" if Patterns::SPECIAL_CHAR_PREFIX_REGEXP.match?(value)
+ record.errors.add attribute, "can not end with a period, dash, or underscore" if Patterns::SPECIAL_CHAR_SUFFIX_REGEXP.match?(value)
+ record.errors.add attribute, "can not end with a common file extension" if Patterns::BANNED_EXTENSION_REGEXP.match?(value)
+ end
+
+ private
+
+ def requires_letter?
+ options.fetch(:requires_letter, true)
end
end
diff --git a/lib/patterns.rb b/lib/patterns.rb
index ee994260dfb..edde659b41f 100644
--- a/lib/patterns.rb
+++ b/lib/patterns.rb
@@ -4,14 +4,17 @@ module Patterns
JAVA_HTTP_USER_AGENT = /^java/i
SPECIAL_CHARACTERS = ".-_".freeze
ALLOWED_CHARACTERS = "[A-Za-z0-9#{Regexp.escape(SPECIAL_CHARACTERS)}]+".freeze
- ROUTE_PATTERN = /#{ALLOWED_CHARACTERS}/
+ ROUTE_PATTERN = /#{ALLOWED_CHARACTERS}(?with html and a
link
+ TEXT
+ end
end
diff --git a/test/models/rubygem_test.rb b/test/models/rubygem_test.rb
index 7ccddf44871..68626ff4a44 100644
--- a/test/models/rubygem_test.rb
+++ b/test/models/rubygem_test.rb
@@ -21,11 +21,15 @@ class RubygemTest < ActiveSupport::TestCase
should allow_value("factory_girl").for(:name)
should allow_value("rack-test").for(:name)
should allow_value("perftools.rb").for(:name)
+ should allow_value("s3-4-2").for(:name)
+ should allow_value("its.a.gem.ok").for(:name)
should_not allow_value("\342\230\203").for(:name)
should_not allow_value("2.2").for(:name)
should_not allow_value(".omghi").for(:name)
should_not allow_value("-omghi").for(:name)
should_not allow_value("_omghi").for(:name)
+ should_not allow_value("omg-").for(:name)
+ should_not allow_value("omg.gem").for(:name)
context "with reserved Ruby gem" do
setup do
@@ -265,6 +269,18 @@ class RubygemTest < ActiveSupport::TestCase
assert_nil dependency.rubygem_id
assert_equal dependency.unresolved_name, @rubygem.name
end
+
+ should "allow destroying a gem with versions" do
+ @rubygem.save!
+ create(:ownership, rubygem: @rubygem)
+ create(:version, rubygem: @rubygem)
+ v2 = create(:version, rubygem: @rubygem)
+ create(:deletion, version: v2)
+
+ @rubygem.destroy!
+
+ assert_predicate Rubygem.where(id: @rubygem.id), :none?
+ end
end
context "with reverse dependencies" do
diff --git a/test/models/version_test.rb b/test/models/version_test.rb
index 0e361d26b46..726ecf497e9 100644
--- a/test/models/version_test.rb
+++ b/test/models/version_test.rb
@@ -406,16 +406,21 @@ class VersionTest < ActiveSupport::TestCase
end
subject { @version }
+ should allow_value("1.2.3.pre").for(:number)
should_not allow_value("#YAML
").for(:number)
should_not allow_value("1.2.3-\"[javalol]\"").for(:number)
should_not allow_value("0.8.45::Gem::PLATFORM::FAILBOAT").for(:number)
should_not allow_value("1.2.3\n").for(:number)
should_not allow_value("1.2.3-bad").for(:number)
+ should_not allow_value("1.2.3.").for(:number)
+ should_not allow_value("1.2.3.gem").for(:number)
should allow_value("ruby").for(:platform)
should allow_value("mswin32").for(:platform)
should allow_value("x86_64-linux").for(:platform)
+ should allow_value("it.is.fine").for(:platform)
should_not allow_value("Gem::Platform::Ruby").for(:platform)
+ should_not allow_value("ruby.gem").for(:platform)
should "be invalid with platform longer than maximum field length" do
@version.platform = "r" * (Gemcutter::MAX_FIELD_LENGTH + 1)
diff --git a/test/system/gem_server_conformance_test.rb b/test/system/gem_server_conformance_test.rb
new file mode 100644
index 00000000000..ec64139de96
--- /dev/null
+++ b/test/system/gem_server_conformance_test.rb
@@ -0,0 +1,68 @@
+require "application_system_test_case"
+
+require_relative "../../lib/gemcutter/middleware/hostess"
+
+class GemServerConformanceTest < ApplicationSystemTestCase
+ include ActionDispatch::Assertions::RoutingAssertions
+ include ActiveJob::TestHelper
+
+ setup do
+ @tmp_versions_file = Tempfile.new("tmp_versions_file")
+ tmp_path = @tmp_versions_file.path
+
+ Rails.application.config.rubygems.stubs(:[]).with("versions_file_location").returns(tmp_path)
+ Rails.application.config.rubygems.stubs(:[]).with("s3_compact_index_bucket").returns("s3_compact_index_bucket")
+ Rails.application.config.rubygems.stubs(:[]).with("s3_contents_bucket").returns("s3_contents_bucket")
+
+ test = self
+ Rails.application.routes.disable_clear_and_finalize = true
+ Rails.application.routes.draw do
+ post "/set_time", to: lambda { |env|
+ test.travel_to Time.iso8601(Rack::Request.new(env).body.read)
+ [200, {}, ["OK"]]
+ }
+ post "/rebuild_versions_list", to: lambda { |_env|
+ Rake::Task["compact_index:update_versions_file"].execute
+ Rake::Task["compact_index:update_versions_file"].reenable
+ [200, {}, ["OK"]]
+ }
+ hostess = Gemcutter::Middleware::Hostess.new(nil)
+ to = lambda { |env|
+ hostess.call(env)
+ .tap do |response|
+ response[1].delete("x-cascade")
+ end
+ }
+ match "/quick/Marshal.4.8/:name", to:, via: :get, constraints: { name: /[A-Za-z0-9._-]+/ }
+ match "/gems/:name", to:, via: :get, constraints: { name: Patterns::ROUTE_PATTERN }
+ match "/specs.4.8.gz", to:, via: :get
+ match "/prerelease_specs.4.8.gz", to:, via: :get
+ match "/latest_specs.4.8.gz", to:, via: :get
+ end
+
+ Indexer.perform_now
+ @subscriber = ActiveSupport::Notifications.subscribe("process_action.action_controller") do
+ perform_enqueued_jobs only: [Indexer]
+ end
+ end
+
+ teardown do
+ ActiveSupport::Notifications.unsubscribe(@subscriber)
+ Rails.application.reload_routes!
+ end
+
+ test "is a conformant gem server" do
+ create(:api_key, scopes: %w[push_rubygem yank_rubygem])
+
+ output, status = Open3.capture2e(
+ {
+ "UPSTREAM" => "http://#{Capybara.current_session.config.server_host}:#{Capybara.current_session.config.server_port}",
+ "GEM_HOST_API_KEY" => "12345"
+ },
+ "gem_server_conformance",
+ "--fail-fast", "--tag=~content_type_header", "--tag=~content_length_header"
+ )
+
+ assert_predicate status, :success?, output
+ end
+end