Merge pull request #4040 from smashwilson/generate-secret

Security: keep the Rails secret token out of version control.

Merge pull request #4040 from smashwilson/generate-secret
Security: keep the Rails secret token out of version control.
Dmitriy Zaporozhets
2 parents c5de01f8 e444c7f6
Showing 2 changed files with 18 additions and 1 deletions Show diff stats
.gitignore
config/initializers/secret_token.rb
@@ -29,3 +29,4 @@ db/data.yml
 vendor/bundle/*
 rails_best_practices_output.html
 doc/code/*
+.secret
 # Be sure to restart your server when you modify this file.
  
+require 'securerandom'
+
 # Your secret key for verifying the integrity of signed cookies.
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Gitlab::Application.config.secret_token = '0a38e9a40ca5d66d7002a6ade0ed0f8b71058c820163f66cf65d91521ab55255ff708b9909b138008a7f13d68fec575def1dc3ff7200cd72b065896315e0bed2'
+
+def find_secure_token
+  token_file = Rails.root.join('.secret')
+  if File.exist? token_file
+    # Use the existing token.
+    File.read(token_file).chomp
+  else
+    # Generate a new token of 64 random hexadecimal characters and store it in token_file.
+    token = SecureRandom.hex(64)
+    File.write(token_file, token)
+    token
+  end
+end
+
+Gitlab::Application.config.secret_token = find_secure_token
...	...	@@ -29,3 +29,4 @@ db/data.yml
29	29	vendor/bundle/*
30	30	rails_best_practices_output.html
31	31	doc/code/*
	32	+.secret
...	...
1	1	# Be sure to restart your server when you modify this file.
2	2
	3	+require 'securerandom'
	4	+
3	5	# Your secret key for verifying the integrity of signed cookies.
4	6	# If you change this key, all old signed cookies will become invalid!
5	7	# Make sure the secret is at least 30 characters and all random,
6	8	# no regular words or you'll be exposed to dictionary attacks.
7		-Gitlab::Application.config.secret_token = '0a38e9a40ca5d66d7002a6ade0ed0f8b71058c820163f66cf65d91521ab55255ff708b9909b138008a7f13d68fec575def1dc3ff7200cd72b065896315e0bed2'
	9	+
	10	+def find_secure_token
	11	+ token_file = Rails.root.join('.secret')
	12	+ if File.exist? token_file
	13	+ # Use the existing token.
	14	+ File.read(token_file).chomp
	15	+ else
	16	+ # Generate a new token of 64 random hexadecimal characters and store it in token_file.
	17	+ token = SecureRandom.hex(64)
	18	+ File.write(token_file, token)
	19	+ token
	20	+ end
	21	+end
	22	+
	23	+Gitlab::Application.config.secret_token = find_secure_token
...	...