diff options
author | Jacob Vosmaer <jacob@gitlab.com> | 2016-09-13 20:45:02 +0300 |
---|---|---|
committer | Jacob Vosmaer <jacob@gitlab.com> | 2016-09-13 20:45:02 +0300 |
commit | 11f54caada4baaf8fb179213b1a93aa1a047f9b3 (patch) | |
tree | c032e130a73cdafbf10f5c07d2b1358fca82e7b5 /lib/gitlab/workhorse.rb | |
parent | 82b8cc5d66655605091b1fa089b6a3e946bd536d (diff) |
Allow trailing newline in secret base64 data
Diffstat (limited to 'lib/gitlab/workhorse.rb')
-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 |