gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-10-05 16:42:47 +00:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Extract secret size constants in Webhook model (#35104)

Browse Source
This commit is contained in:
Matt Jankowski 2025-06-20 06:05:24 -04:00 committed by GitHub
parent e9b1c1edfe
commit 54f9a1b43b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/models/webhook.rb
View File

@ -25,12 +25,15 @@ class Webhook < ApplicationRecord
status.updated status.updated
).freeze ).freeze
SECRET_LENGTH_MIN = 12
SECRET_SIZE = 20
attr_writer :current_account attr_writer :current_account
scope :enabled, -> { where(enabled: true) } scope :enabled, -> { where(enabled: true) }
validates :url, presence: true, url: true validates :url, presence: true, url: true
validates :secret, presence: true, length: { minimum: 12 } validates :secret, presence: true, length: { minimum: SECRET_LENGTH_MIN }
validates :events, presence: true validates :events, presence: true
validate :events_validation_error, if: :invalid_events? validate :events_validation_error, if: :invalid_events?
@ -41,7 +44,7 @@ class Webhook < ApplicationRecord
before_validation :generate_secret before_validation :generate_secret
def rotate_secret! def rotate_secret!
update!(secret: SecureRandom.hex(20)) update!(secret: random_secret)
end end
def enable! def enable!
@ -93,6 +96,10 @@ class Webhook < ApplicationRecord
end end
def generate_secret def generate_secret
self.secret = SecureRandom.hex(20) if secret.blank? self.secret = random_secret if secret.blank?
end
def random_secret
SecureRandom.hex(SECRET_SIZE)
end end
end end

2
spec/models/webhook_spec.rb
View File

@ -8,6 +8,8 @@ RSpec.describe Webhook do
describe 'Validations' do describe 'Validations' do
subject { Fabricate.build :webhook } subject { Fabricate.build :webhook }
it { is_expected.to validate_length_of(:secret).is_at_least(described_class::SECRET_LENGTH_MIN) }
it { is_expected.to validate_presence_of(:events) } it { is_expected.to validate_presence_of(:events) }
it { is_expected.to_not allow_values([], %w(account.invalid)).for(:events) } it { is_expected.to_not allow_values([], %w(account.invalid)).for(:events) }