sqreen 1.19.4 → 1.20.4.beta1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +22 -1
- data/lib/sqreen/actions/block_user.rb +1 -1
- data/lib/sqreen/actions/redirect_ip.rb +1 -1
- data/lib/sqreen/actions/redirect_user.rb +1 -1
- data/lib/sqreen/agent_message.rb +20 -0
- data/lib/sqreen/aggregated_metric.rb +25 -0
- data/lib/sqreen/attack_detected.html +1 -2
- data/lib/sqreen/ca.crt +24 -0
- data/lib/sqreen/configuration.rb +11 -5
- data/lib/sqreen/deferred_logger.rb +50 -14
- data/lib/sqreen/deliveries/batch.rb +4 -1
- data/lib/sqreen/deliveries/simple.rb +4 -0
- data/lib/sqreen/deprecation.rb +38 -0
- data/lib/sqreen/endpoint_testing.rb +184 -0
- data/lib/sqreen/event.rb +7 -5
- data/lib/sqreen/events/attack.rb +23 -18
- data/lib/sqreen/events/remote_exception.rb +0 -22
- data/lib/sqreen/events/request_record.rb +15 -70
- data/lib/sqreen/frameworks/generic.rb +9 -0
- data/lib/sqreen/frameworks/rails.rb +0 -7
- data/lib/sqreen/frameworks/request_recorder.rb +13 -2
- data/lib/sqreen/graft/call.rb +76 -18
- data/lib/sqreen/graft/callback.rb +1 -1
- data/lib/sqreen/graft/hook.rb +187 -85
- data/lib/sqreen/graft/hook_point.rb +1 -1
- data/lib/sqreen/kit/signals/specialized/aggregated_metric.rb +72 -0
- data/lib/sqreen/kit/signals/specialized/attack.rb +57 -0
- data/lib/sqreen/kit/signals/specialized/binning_metric.rb +76 -0
- data/lib/sqreen/kit/signals/specialized/http_trace.rb +26 -0
- data/lib/sqreen/kit/signals/specialized/sdk_track_call.rb +50 -0
- data/lib/sqreen/kit/signals/specialized/sqreen_exception.rb +57 -0
- data/lib/sqreen/legacy/instrumentation.rb +22 -10
- data/lib/sqreen/legacy/old_event_submission_strategy.rb +221 -0
- data/lib/sqreen/legacy/waf_redactions.rb +49 -0
- data/lib/sqreen/log.rb +3 -2
- data/lib/sqreen/log/loggable.rb +2 -1
- data/lib/sqreen/logger.rb +24 -0
- data/lib/sqreen/metrics/base.rb +3 -0
- data/lib/sqreen/metrics_store.rb +33 -12
- data/lib/sqreen/null_logger.rb +22 -0
- data/lib/sqreen/performance_notifications/binned_metrics.rb +8 -2
- data/lib/sqreen/remote_command.rb +1 -0
- data/lib/sqreen/rules.rb +5 -3
- data/lib/sqreen/rules/blacklist_ips_cb.rb +2 -2
- data/lib/sqreen/rules/rule_cb.rb +4 -0
- data/lib/sqreen/rules/waf_cb.rb +11 -8
- data/lib/sqreen/runner.rb +103 -10
- data/lib/sqreen/sensitive_data_redactor.rb +19 -31
- data/lib/sqreen/session.rb +51 -43
- data/lib/sqreen/signals/conversions.rb +283 -0
- data/lib/sqreen/signals/http_trace_redaction.rb +111 -0
- data/lib/sqreen/signals/signals_submission_strategy.rb +78 -0
- data/lib/sqreen/version.rb +1 -1
- data/lib/sqreen/weave/budget.rb +46 -0
- data/lib/sqreen/weave/legacy/instrumentation.rb +156 -94
- data/lib/sqreen/worker.rb +6 -2
- metadata +51 -8
- data/lib/sqreen/backport.rb +0 -9
- data/lib/sqreen/backport/clock_gettime.rb +0 -74
- data/lib/sqreen/backport/original_name.rb +0 -88
data/lib/sqreen/worker.rb
CHANGED
@@ -23,11 +23,15 @@ module Sqreen
|
|
23
23
|
Sqreen.log.debug("Starting Sqreen #{Sqreen::VERSION}")
|
24
24
|
prevent_startup = Sqreen.framework.prevent_startup
|
25
25
|
if !prevent_startup
|
26
|
-
|
26
|
+
logger = Sqreen.log.instance_eval { @logger }
|
27
|
+
log_level = logger.send(:format_severity, logger.level)
|
28
|
+
log_filename = logger.instance_eval { @logdev.filename }
|
29
|
+
warn "process.pid:#{Process.pid} sqreen.log.level:#{log_level} sqreen.log.location:#{log_filename.inspect}"
|
27
30
|
runner = Sqreen::Runner.new(configuration, framework)
|
28
31
|
runner.run_watcher
|
32
|
+
Sqreen.log.info("process.pid:#{Process.pid} sqreen.start:true")
|
29
33
|
else
|
30
|
-
Sqreen.log.
|
34
|
+
Sqreen.log.info("process.pid:#{Process.pid} sqreen.start:false cause:#{prevent_startup}")
|
31
35
|
end
|
32
36
|
rescue Sqreen::TokenNotFoundException
|
33
37
|
Sqreen.log.error "Sorry but we couldn't find your Sqreen token.\nYour application is NOT currently protected by Sqreen.\n\nHave you filled your config/sqreen.yml?\n\n"
|
metadata
CHANGED
@@ -1,15 +1,43 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: sqreen
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.20.4.beta1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Sqreen
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-08-14 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
|
+
- !ruby/object:Gem::Dependency
|
14
|
+
name: sqreen-backport
|
15
|
+
requirement: !ruby/object:Gem::Requirement
|
16
|
+
requirements:
|
17
|
+
- - "~>"
|
18
|
+
- !ruby/object:Gem::Version
|
19
|
+
version: 0.1.0
|
20
|
+
type: :runtime
|
21
|
+
prerelease: false
|
22
|
+
version_requirements: !ruby/object:Gem::Requirement
|
23
|
+
requirements:
|
24
|
+
- - "~>"
|
25
|
+
- !ruby/object:Gem::Version
|
26
|
+
version: 0.1.0
|
27
|
+
- !ruby/object:Gem::Dependency
|
28
|
+
name: sqreen-kit
|
29
|
+
requirement: !ruby/object:Gem::Requirement
|
30
|
+
requirements:
|
31
|
+
- - "~>"
|
32
|
+
- !ruby/object:Gem::Version
|
33
|
+
version: 0.2.1
|
34
|
+
type: :runtime
|
35
|
+
prerelease: false
|
36
|
+
version_requirements: !ruby/object:Gem::Requirement
|
37
|
+
requirements:
|
38
|
+
- - "~>"
|
39
|
+
- !ruby/object:Gem::Version
|
40
|
+
version: 0.2.1
|
13
41
|
- !ruby/object:Gem::Dependency
|
14
42
|
name: sq_mini_racer
|
15
43
|
requirement: !ruby/object:Gem::Requirement
|
@@ -65,11 +93,10 @@ files:
|
|
65
93
|
- lib/sqreen/actions/user_action_class.rb
|
66
94
|
- lib/sqreen/actions/users_index.rb
|
67
95
|
- lib/sqreen/agent.rb
|
96
|
+
- lib/sqreen/agent_message.rb
|
97
|
+
- lib/sqreen/aggregated_metric.rb
|
68
98
|
- lib/sqreen/attack_blocked.rb
|
69
99
|
- lib/sqreen/attack_detected.html
|
70
|
-
- lib/sqreen/backport.rb
|
71
|
-
- lib/sqreen/backport/clock_gettime.rb
|
72
|
-
- lib/sqreen/backport/original_name.rb
|
73
100
|
- lib/sqreen/binding_accessor.rb
|
74
101
|
- lib/sqreen/binding_accessor/path_elem.rb
|
75
102
|
- lib/sqreen/binding_accessor/transforms.rb
|
@@ -95,7 +122,9 @@ files:
|
|
95
122
|
- lib/sqreen/dependency/rails.rb
|
96
123
|
- lib/sqreen/dependency/sentry.rb
|
97
124
|
- lib/sqreen/dependency/sinatra.rb
|
125
|
+
- lib/sqreen/deprecation.rb
|
98
126
|
- lib/sqreen/encoding_sanitizer.rb
|
127
|
+
- lib/sqreen/endpoint_testing.rb
|
99
128
|
- lib/sqreen/error_handling_middleware.rb
|
100
129
|
- lib/sqreen/event.rb
|
101
130
|
- lib/sqreen/events/attack.rb
|
@@ -129,8 +158,16 @@ files:
|
|
129
158
|
- lib/sqreen/js/mini_racer_adapter.rb
|
130
159
|
- lib/sqreen/js/mini_racer_executable_js.rb
|
131
160
|
- lib/sqreen/js/thread_local_exec_js_runnable.rb
|
161
|
+
- lib/sqreen/kit/signals/specialized/aggregated_metric.rb
|
162
|
+
- lib/sqreen/kit/signals/specialized/attack.rb
|
163
|
+
- lib/sqreen/kit/signals/specialized/binning_metric.rb
|
164
|
+
- lib/sqreen/kit/signals/specialized/http_trace.rb
|
165
|
+
- lib/sqreen/kit/signals/specialized/sdk_track_call.rb
|
166
|
+
- lib/sqreen/kit/signals/specialized/sqreen_exception.rb
|
132
167
|
- lib/sqreen/legacy.rb
|
133
168
|
- lib/sqreen/legacy/instrumentation.rb
|
169
|
+
- lib/sqreen/legacy/old_event_submission_strategy.rb
|
170
|
+
- lib/sqreen/legacy/waf_redactions.rb
|
134
171
|
- lib/sqreen/log.rb
|
135
172
|
- lib/sqreen/log/loggable.rb
|
136
173
|
- lib/sqreen/logger.rb
|
@@ -201,6 +238,9 @@ files:
|
|
201
238
|
- lib/sqreen/shared_storage.rb
|
202
239
|
- lib/sqreen/shared_storage23.rb
|
203
240
|
- lib/sqreen/shrink_wrap.rb
|
241
|
+
- lib/sqreen/signals/conversions.rb
|
242
|
+
- lib/sqreen/signals/http_trace_redaction.rb
|
243
|
+
- lib/sqreen/signals/signals_submission_strategy.rb
|
204
244
|
- lib/sqreen/signature_verifier.rb
|
205
245
|
- lib/sqreen/sinatra_middleware.rb
|
206
246
|
- lib/sqreen/sqreen_signed_verifier.rb
|
@@ -216,6 +256,7 @@ files:
|
|
216
256
|
- lib/sqreen/version.rb
|
217
257
|
- lib/sqreen/waf_error.rb
|
218
258
|
- lib/sqreen/weave.rb
|
259
|
+
- lib/sqreen/weave/budget.rb
|
219
260
|
- lib/sqreen/weave/hardcoded.rb
|
220
261
|
- lib/sqreen/weave/instrumentor.rb
|
221
262
|
- lib/sqreen/weave/legacy.rb
|
@@ -238,7 +279,9 @@ metadata:
|
|
238
279
|
changelog_uri: https://docs.sqreen.com/ruby/release-notes/
|
239
280
|
source_code_uri: https://github.com/sqreen/ruby-agent
|
240
281
|
bug_tracker_uri: https://github.com/sqreen/ruby-agent/issues
|
241
|
-
post_install_message:
|
282
|
+
post_install_message: |2
|
283
|
+
This is a Sqreen beta release and may not work in all situations.
|
284
|
+
Make sure to review CHANGELOG.md for important details.
|
242
285
|
rdoc_options: []
|
243
286
|
require_paths:
|
244
287
|
- lib
|
@@ -249,9 +292,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
249
292
|
version: 1.9.3
|
250
293
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
251
294
|
requirements:
|
252
|
-
- - "
|
295
|
+
- - ">"
|
253
296
|
- !ruby/object:Gem::Version
|
254
|
-
version:
|
297
|
+
version: 1.3.1
|
255
298
|
requirements: []
|
256
299
|
rubygems_version: 3.1.2
|
257
300
|
signing_key:
|
data/lib/sqreen/backport.rb
DELETED
@@ -1,74 +0,0 @@
|
|
1
|
-
# typed: ignore
|
2
|
-
|
3
|
-
# Copyright (c) 2015 Sqreen. All Rights Reserved.
|
4
|
-
# Please refer to our terms for more information: https://www.sqreen.com/terms.html
|
5
|
-
|
6
|
-
require 'sqreen/backport'
|
7
|
-
|
8
|
-
module Sqreen
|
9
|
-
module Backport
|
10
|
-
module ClockGettime
|
11
|
-
class << self
|
12
|
-
def supported?
|
13
|
-
Process.respond_to?(:clock_gettime)
|
14
|
-
end
|
15
|
-
end
|
16
|
-
|
17
|
-
unless supported?
|
18
|
-
require 'ffi'
|
19
|
-
|
20
|
-
class Timespec < FFI::Struct
|
21
|
-
layout :tv_sec => :time_t, :tv_nsec => :long
|
22
|
-
end
|
23
|
-
|
24
|
-
module LibC
|
25
|
-
extend FFI::Library
|
26
|
-
ffi_lib FFI::Library::LIBC
|
27
|
-
|
28
|
-
# TODO: FFI::NotFoundError
|
29
|
-
|
30
|
-
if RUBY_PLATFORM =~ /darwin/
|
31
|
-
attach_function :mach_absolute_time, [], :uint64
|
32
|
-
end
|
33
|
-
|
34
|
-
attach_function :clock_gettime, [:int, :pointer], :int
|
35
|
-
end
|
36
|
-
|
37
|
-
module Constants
|
38
|
-
case RUBY_PLATFORM
|
39
|
-
when /darwin/
|
40
|
-
CLOCK_REALTIME = 0
|
41
|
-
CLOCK_MONOTONIC = 6
|
42
|
-
CLOCK_PROCESS_CPUTIME_ID = 12
|
43
|
-
CLOCK_THERAD_CPUTIME_ID = 16
|
44
|
-
when /linux/
|
45
|
-
CLOCK_REALTIME = 0
|
46
|
-
CLOCK_MONOTONIC = 1
|
47
|
-
CLOCK_PROCESS_CPUTIME_ID = 2
|
48
|
-
CLOCK_THREAD_CPUTIME_ID = 3
|
49
|
-
end
|
50
|
-
end
|
51
|
-
|
52
|
-
def clock_gettime(clock_id, unit = :float_second)
|
53
|
-
unless unit == :float_second
|
54
|
-
raise "Process.clock_gettime: unsupported unit #{unit.inspect}"
|
55
|
-
end
|
56
|
-
|
57
|
-
t = Timespec.new
|
58
|
-
ret = LibC.clock_gettime(clock_id, t.pointer)
|
59
|
-
|
60
|
-
raise SystemCallError, "Errno #{FFI.errno}" if ret == -1
|
61
|
-
|
62
|
-
t[:tv_sec].to_f + t[:tv_nsec].to_f / 1_000_000_000
|
63
|
-
end
|
64
|
-
end
|
65
|
-
end
|
66
|
-
end
|
67
|
-
end
|
68
|
-
|
69
|
-
unless Sqreen::Backport::ClockGettime.supported?
|
70
|
-
Process.instance_eval do
|
71
|
-
extend Sqreen::Backport::ClockGettime
|
72
|
-
include Sqreen::Backport::ClockGettime::Constants
|
73
|
-
end
|
74
|
-
end
|
@@ -1,88 +0,0 @@
|
|
1
|
-
# typed: false
|
2
|
-
|
3
|
-
# Copyright (c) 2015 Sqreen. All Rights Reserved.
|
4
|
-
# Please refer to our terms for more information: https://www.sqreen.com/terms.html
|
5
|
-
|
6
|
-
module Sqreen
|
7
|
-
module Backport
|
8
|
-
module OriginalName
|
9
|
-
HAS_UNBOUND_METHOD_ORIGINAL_NAME = ::UnboundMethod.instance_methods(false).include?(:original_name)
|
10
|
-
HAS_METHOD_ORIGINAL_NAME = ::Method.instance_methods(false).include?(:original_name)
|
11
|
-
|
12
|
-
def original_name
|
13
|
-
self.class.get_original_name(owner, original_name_key) || self.original_name = name
|
14
|
-
end
|
15
|
-
|
16
|
-
private
|
17
|
-
|
18
|
-
def original_name=(name)
|
19
|
-
self.class.set_original_name(owner, original_name_key, name)
|
20
|
-
end
|
21
|
-
|
22
|
-
def original_name_key
|
23
|
-
return hash if is_a?(::UnboundMethod)
|
24
|
-
|
25
|
-
owner.instance_method(name).hash
|
26
|
-
end
|
27
|
-
|
28
|
-
class << self
|
29
|
-
def supported?
|
30
|
-
!::Kernel.const_defined?(:JRUBY_VERSION) && HAS_UNBOUND_METHOD_ORIGINAL_NAME && HAS_METHOD_ORIGINAL_NAME
|
31
|
-
end
|
32
|
-
|
33
|
-
def included(klass)
|
34
|
-
klass.extend(ClassMethods)
|
35
|
-
end
|
36
|
-
|
37
|
-
def prepended(klass)
|
38
|
-
klass.extend(ClassMethods)
|
39
|
-
end
|
40
|
-
end
|
41
|
-
|
42
|
-
class Store < ::Hash; end
|
43
|
-
|
44
|
-
module ClassMethods
|
45
|
-
def original_names(owner)
|
46
|
-
owner.instance_eval { @__sqreen_backport_original_names ||= Store.new }
|
47
|
-
end
|
48
|
-
|
49
|
-
def get_original_name(owner, key)
|
50
|
-
original_names(owner)[key]
|
51
|
-
end
|
52
|
-
|
53
|
-
def set_original_name(owner, key, name)
|
54
|
-
original_names(owner)[key] ||= name
|
55
|
-
end
|
56
|
-
end
|
57
|
-
end
|
58
|
-
end
|
59
|
-
end
|
60
|
-
|
61
|
-
class UnboundMethod
|
62
|
-
if Sqreen::Backport::OriginalName::HAS_UNBOUND_METHOD_ORIGINAL_NAME
|
63
|
-
prepend Sqreen::Backport::OriginalName
|
64
|
-
else
|
65
|
-
include Sqreen::Backport::OriginalName
|
66
|
-
end
|
67
|
-
end unless Sqreen::Backport::OriginalName.supported?
|
68
|
-
|
69
|
-
class Method
|
70
|
-
if Sqreen::Backport::OriginalName::HAS_METHOD_ORIGINAL_NAME
|
71
|
-
prepend Sqreen::Backport::OriginalName
|
72
|
-
else
|
73
|
-
include Sqreen::Backport::OriginalName
|
74
|
-
end
|
75
|
-
end unless Sqreen::Backport::OriginalName.supported?
|
76
|
-
|
77
|
-
class Module
|
78
|
-
alias_method(:alias_method_without_original_name, :alias_method)
|
79
|
-
|
80
|
-
def alias_method_with_original_name(newname, oldname)
|
81
|
-
alias_method_without_original_name(newname, oldname).tap do
|
82
|
-
instance_method(newname).send(:original_name=, :"#{oldname}")
|
83
|
-
end
|
84
|
-
end
|
85
|
-
|
86
|
-
alias_method_with_original_name(:alias_method_without_original_name, :alias_method)
|
87
|
-
alias_method_with_original_name(:alias_method, :alias_method_with_original_name)
|
88
|
-
end unless Sqreen::Backport::OriginalName.supported?
|