diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-09-14 01:51:41 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-09-14 01:51:41 +0300 |
| commit | 746bf485bc1ef7a7e46eda80ff6b450a14e5bf1d (patch) | |
| tree | 0f2e3ce12e55c2e803ed91f4bc97a9ee35aac497 /lib | |
| parent | acc7f7c6c19d70f37bea30ccc7e9469438959055 (diff) | |
| parent | 11f54caada4baaf8fb179213b1a93aa1a047f9b3 (diff) | |
Merge branch 'workhorse-secret-trailing-newline' into 'master'
Allow trailing newline in secret base64 data
Fixes https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1575
See merge request !6327
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/workhorse.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb index efe4aeb399d..60aae541d46 100644 --- a/lib/gitlab/workhorse.rb +++ b/lib/gitlab/workhorse.rb @@ -102,7 +102,7 @@ module Gitlab def secret @secret ||= begin - bytes = Base64.strict_decode64(File.read(secret_path)) + bytes = Base64.strict_decode64(File.read(secret_path).chomp) raise "#{secret_path} does not contain #{SECRET_LENGTH} bytes" if bytes.length != SECRET_LENGTH bytes end |