瀏覽代碼

Ensure the app does not even start if OTP_SECRET is not set (#6557)

* Ensure the app does not even start if OTP_SECRET is not set

* Remove PAPERCLIP_SECRET (it's not used by anything, actually)

Imports are for internal consumption and the url option isn't even
used correctly, so we can remove the hash stuff from them
master
Eugen Rochko 6 年之前
committed by GitHub
父節點
當前提交
5cc716688a
沒有發現已知的金鑰在資料庫的簽署中 GPG 金鑰 ID: 4AEE18F83AFDEB23
共有 4 個檔案被更改,包括 3 行新增4 行删除
  1. +0
    -1
      .env.production.sample
  2. +1
    -1
      app/models/import.rb
  3. +1
    -1
      app/models/user.rb
  4. +1
    -1
      lib/tasks/mastodon.rake

+ 0
- 1
.env.production.sample 查看文件

@@ -33,7 +33,6 @@ LOCAL_DOMAIN=example.com

# Application secrets
# Generate each with the `RAILS_ENV=production bundle exec rake secret` task (`docker-compose run --rm web rake secret` if you use docker compose)
PAPERCLIP_SECRET=
SECRET_KEY_BASE=
OTP_SECRET=



+ 1
- 1
app/models/import.rb 查看文件

@@ -26,7 +26,7 @@ class Import < ApplicationRecord

validates :type, presence: true

has_attached_file :data, url: '/system/:hash.:extension', hash_secret: ENV['PAPERCLIP_SECRET']
has_attached_file :data
validates_attachment_content_type :data, content_type: FILE_TYPES
validates_attachment_presence :data
end

+ 1
- 1
app/models/user.rb 查看文件

@@ -44,7 +44,7 @@ class User < ApplicationRecord
ACTIVE_DURATION = 14.days

devise :two_factor_authenticatable,
otp_secret_encryption_key: ENV['OTP_SECRET']
otp_secret_encryption_key: ENV.fetch('OTP_SECRET')

devise :two_factor_backupable,
otp_number_of_backup_codes: 10


+ 1
- 1
lib/tasks/mastodon.rake 查看文件

@@ -23,7 +23,7 @@ namespace :mastodon do
prompt.say('Single user mode disables registrations and redirects the landing page to your public profile.')
env['SINGLE_USER_MODE'] = prompt.yes?('Do you want to enable single user mode?', default: false)

%w(SECRET_KEY_BASE PAPERCLIP_SECRET OTP_SECRET).each do |key|
%w(SECRET_KEY_BASE OTP_SECRET).each do |key|
env[key] = SecureRandom.hex(64)
end



Loading…
取消
儲存