nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Provide default OTP_SECRET value for development environment (#6617)

This commit is contained in:
Akihiko Odaki 2018-03-05 04:28:24 +09:00 committed by Eugen Rochko
parent 7a6eaad445
commit c110fa62ac
5 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env.test
View File

@ -1,4 +1,3 @@
# Federation # Federation
LOCAL_DOMAIN=cb6e6126.ngrok.io LOCAL_DOMAIN=cb6e6126.ngrok.io
LOCAL_HTTPS=true LOCAL_HTTPS=true
OTP_SECRET=100c7faeef00caa29242f6b04156742bf76065771fd4117990c4282b8748ff3d99f8fdae97c982ab5bd2e6756a159121377cce4421f4a8ecd2d67bd7749a3fb4

2
app/models/user.rb
View File

@ -44,7 +44,7 @@ class User < ApplicationRecord
ACTIVE_DURATION = 14.days ACTIVE_DURATION = 14.days
devise :two_factor_authenticatable, devise :two_factor_authenticatable,
otp_secret_encryption_key: ENV.fetch('OTP_SECRET') otp_secret_encryption_key: Rails.configuration.x.otp_secret
devise :two_factor_backupable, devise :two_factor_backupable,
otp_number_of_backup_codes: 10 otp_number_of_backup_codes: 10

2
config/environments/development.rb
View File

@ -82,6 +82,8 @@ Rails.application.configure do
Bullet.add_whitelist type: :n_plus_one_query, class_name: 'User', association: :account Bullet.add_whitelist type: :n_plus_one_query, class_name: 'User', association: :account
end end
config.x.otp_secret = ENV.fetch('OTP_SECRET', '1fc2b87989afa6351912abeebe31ffc5c476ead9bf8b3d74cbc4a302c7b69a45b40b1bbef3506ddad73e942e15ed5ca4b402bf9a66423626051104f4b5f05109')
end end
ActiveRecordQueryTrace.enabled = ENV.fetch('QUERY_TRACE_ENABLED') { false } ActiveRecordQueryTrace.enabled = ENV.fetch('QUERY_TRACE_ENABLED') { false }

2
config/environments/production.rb
View File

@ -96,4 +96,6 @@ Rails.application.configure do
'X-Content-Type-Options' => 'nosniff', 'X-Content-Type-Options' => 'nosniff',
'X-XSS-Protection' => '1; mode=block', 'X-XSS-Protection' => '1; mode=block',
} }
config.x.otp_secret = ENV.fetch('OTP_SECRET')
end end

2
config/environments/test.rb
View File

@ -44,6 +44,8 @@ Rails.application.configure do
# Print deprecation notices to the stderr. # Print deprecation notices to the stderr.
config.active_support.deprecation = :stderr config.active_support.deprecation = :stderr
config.x.otp_secret = '100c7faeef00caa29242f6b04156742bf76065771fd4117990c4282b8748ff3d99f8fdae97c982ab5bd2e6756a159121377cce4421f4a8ecd2d67bd7749a3fb4'
# Generate random VAPID keys # Generate random VAPID keys
vapid_key = Webpush.generate_key vapid_key = Webpush.generate_key
config.x.vapid_private_key = vapid_key.private_key config.x.vapid_private_key = vapid_key.private_key