From 5f5e1c865027a1aa1af6efcfcd406e31b07d4a26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 23 Oct 2013 16:00:37 +0200 Subject: [PATCH] [api] accept missing secret.key file in test environment and use hardcoded "secret" --- dist/ci/obs_testsuite_common.sh | 2 -- src/api/config/initializers/secret_token.rb | 9 ++++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dist/ci/obs_testsuite_common.sh b/dist/ci/obs_testsuite_common.sh index f7a4c2e02bb..31b6dfb2c25 100644 --- a/dist/ci/obs_testsuite_common.sh +++ b/dist/ci/obs_testsuite_common.sh @@ -35,7 +35,6 @@ setup_api() { echo "Setup additional configuration" cp config/options.yml.example config/options.yml cp config/thinking_sphinx.yml.example config/thinking_sphinx.yml - echo "dummy" > config/secret.key chmod a+x script/start_test_backend echo "Initialize test database, load seed data" @@ -52,7 +51,6 @@ setup_webui() { echo "Setup additional configuration" cp config/options.yml.example config/options.yml - echo "dummy" > config/secret.key chmod +x script/start_test_api diff --git a/src/api/config/initializers/secret_token.rb b/src/api/config/initializers/secret_token.rb index 62ef4d0e8dc..adf684c1b3a 100644 --- a/src/api/config/initializers/secret_token.rb +++ b/src/api/config/initializers/secret_token.rb @@ -6,4 +6,11 @@ # no regular words or you'll be exposed to dictionary attacks. # obs-api package is generating this file during installation -OBSApi::Application.config.secret_key_base = File.read "#{Rails.root}/config/secret.key" || 'assad' +if File.exists? "#{Rails.root}/config/secret.key" + OBSApi::Application.config.secret_key_base = File.read "#{Rails.root}/config/secret.key" +elsif Rails.env.production? + raise "Missing config/secret.key file!" +else + # for development and test environment + OBSApi::Application.config.secret_key_base = '92b2ed725cb4d68cc5fbf86d6ba204f1dec4172086ee7eac8f083fb62ef34057f1b770e0722ade7b298837be7399c6152938627e7d15aca5fcda7a4faef91fc7' +end