Fix: CI token removal regression from build trace
This commit is contained in:
parent
9d8257238e
commit
0e54847339
|
@ -143,12 +143,6 @@ module Ci
|
|||
html ||= ''
|
||||
end
|
||||
|
||||
def trace
|
||||
if project && read_attribute(:trace).present?
|
||||
read_attribute(:trace).gsub(project.token, 'xxxxxx')
|
||||
end
|
||||
end
|
||||
|
||||
def started?
|
||||
!pending? && !canceled? && started_at
|
||||
end
|
||||
|
@ -223,7 +217,7 @@ module Ci
|
|||
end
|
||||
end
|
||||
|
||||
def trace
|
||||
def raw_trace
|
||||
if File.exist?(path_to_trace)
|
||||
File.read(path_to_trace)
|
||||
else
|
||||
|
@ -232,6 +226,15 @@ module Ci
|
|||
end
|
||||
end
|
||||
|
||||
def trace
|
||||
trace = raw_trace
|
||||
if project && trace.present?
|
||||
trace.gsub(project.token, 'xxxxxx')
|
||||
else
|
||||
trace
|
||||
end
|
||||
end
|
||||
|
||||
def trace=(trace)
|
||||
unless Dir.exists? dir_to_trace
|
||||
FileUtils.mkdir_p dir_to_trace
|
||||
|
|
|
@ -178,6 +178,17 @@ describe Ci::Build do
|
|||
it { is_expected.to include(text) }
|
||||
it { expect(subject.length).to be >= text.length }
|
||||
end
|
||||
|
||||
context 'if build.trace hides token' do
|
||||
let(:token) { 'my_secret_token' }
|
||||
|
||||
before do
|
||||
build.project.update_attributes(token: token)
|
||||
build.update_attributes(trace: token)
|
||||
end
|
||||
|
||||
it { is_expected.to_not include(token) }
|
||||
end
|
||||
end
|
||||
|
||||
describe :timeout do
|
||||
|
|
Loading…
Reference in New Issue