Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions sentry-ruby/lib/sentry/interfaces/stacktrace.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,25 +28,18 @@ class Frame < Interface
:lineno, :module, :pre_context, :post_context, :vars

def initialize(project_root, line, strip_backtrace_load_path = true, filename_cache: nil)
@strip_backtrace_load_path = strip_backtrace_load_path
@filename_cache = filename_cache

@abs_path = line.file
@function = line.method if line.method
@lineno = line.number
@in_app = line.in_app
@module = line.module_name if line.module_name
@filename = compute_filename
@filename = filename_cache&.compute_filename(@abs_path, @in_app, strip_backtrace_load_path)
end

def to_s
"#{@filename}:#{@lineno}"
end

def compute_filename
@filename_cache&.compute_filename(abs_path, in_app, @strip_backtrace_load_path)
end

def set_context(linecache, context_lines)
return unless abs_path

Expand Down
7 changes: 7 additions & 0 deletions sentry-ruby/spec/sentry/interfaces/stacktrace_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@
expect(second_frame.lineno).to eq(5)
end

it "does not leak internal state into the serialized frame payload" do
frame = Sentry::StacktraceInterface::Frame.new(configuration.project_root, lines.last, true, filename_cache: filename_cache)

expect(frame.to_h.keys).to contain_exactly(:abs_path, :function, :lineno, :in_app, :filename)
expect(frame.to_h).not_to include(:project_root, :strip_backtrace_load_path, :filename_cache)
end

it "does not strip load path when strip_backtrace_load_path is false" do
first_frame = Sentry::StacktraceInterface::Frame.new(configuration.project_root, lines.first, false, filename_cache: filename_cache)
expect(first_frame.filename).to eq(first_frame.abs_path)
Expand Down
Loading