logstash-filter-elasticsearch 4.3.1 → 4.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +3 -0
- data/lib/logstash/filters/elasticsearch/client.rb +3 -18
- data/lib/logstash/filters/elasticsearch.rb +0 -3
- data/logstash-filter-elasticsearch.gemspec +2 -2
- data/spec/filters/elasticsearch_dsl_spec.rb +0 -30
- data/spec/filters/elasticsearch_spec.rb +9 -37
- data/spec/filters/elasticsearch_ssl_spec.rb +1 -1
- data/spec/filters/fixtures/test_certs/ca.crt +30 -30
- data/spec/filters/fixtures/test_certs/ca.der.sha256 +1 -1
- data/spec/filters/fixtures/test_certs/ca.key +52 -51
- data/spec/filters/fixtures/test_certs/es.chain.crt +62 -61
- data/spec/filters/fixtures/test_certs/es.crt +32 -31
- data/spec/filters/fixtures/test_certs/es.der.sha256 +1 -1
- data/spec/filters/fixtures/test_certs/es.key +52 -51
- data/spec/filters/fixtures/test_certs/ls.chain.crt +58 -58
- data/spec/filters/fixtures/test_certs/ls.chain.jks +0 -0
- data/spec/filters/fixtures/test_certs/ls.chain.p12 +0 -0
- data/spec/filters/fixtures/test_certs/ls.crt +28 -28
- data/spec/filters/fixtures/test_certs/ls.der.sha256 +1 -1
- data/spec/filters/fixtures/test_certs/ls.key +52 -51
- data/spec/filters/integration/elasticsearch_spec.rb +1 -9
- metadata +7 -10
- data/lib/logstash/filters/elasticsearch/patches/_elasticsearch_transport_http_manticore.rb +0 -44
- data/spec/filters/fixtures/elasticsearch_7.x_hits_total_as_object.json +0 -70
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 10a199f70ca7ff54065e7e4963955fdf4d53d0518600aab629afaa411d160e83
|
|
4
|
+
data.tar.gz: a5dc7db41fa52d8fc015251f7bbc01306ff56fa0f08788fa24e07a9786fb9271
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: e863b563166c5e221435aa0df97a196dee7640810266089ed2ba76f931986631a3d573c2bc82a16457b19d7c33e8edef09ee65b2b0ae556515ed8267cee5e298
|
|
7
|
+
data.tar.gz: 3fa03c7460eb9c345251bfe02b93b9b00d975592dc1efd8a18aa4bd3a35c73e48407cc6b65b22288f218578b3eacdaedbbbe4980a2c851bf74ed5463ca6d603a
|
data/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,6 @@
|
|
|
1
|
+
## 4.4.0
|
|
2
|
+
- Drop a support for Logstash 7.x by requiring `elasticsearch` gem >= 8. Logstash 8+ continues to work as before. [#213](https://github.com/logstash-plugins/logstash-filter-elasticsearch/pull/213)
|
|
3
|
+
|
|
1
4
|
## 4.3.1
|
|
2
5
|
- Added support for encoded and non encoded api-key formats on plugin configuration [#203](https://github.com/logstash-plugins/logstash-filter-elasticsearch/pull/203)
|
|
3
6
|
|
|
@@ -1,14 +1,13 @@
|
|
|
1
1
|
# encoding: utf-8
|
|
2
|
-
require "elasticsearch"
|
|
3
2
|
require "base64"
|
|
4
|
-
|
|
3
|
+
require "elasticsearch"
|
|
4
|
+
require "elastic/transport/transport/http/manticore"
|
|
5
5
|
|
|
6
6
|
module LogStash
|
|
7
7
|
module Filters
|
|
8
8
|
class ElasticsearchClient
|
|
9
9
|
|
|
10
10
|
attr_reader :client
|
|
11
|
-
attr_reader :es_transport_client_type
|
|
12
11
|
|
|
13
12
|
BUILD_FLAVOR_SERVERLESS = 'serverless'.freeze
|
|
14
13
|
DEFAULT_EAV_HEADER = { "Elastic-Api-Version" => "2023-10-31" }.freeze
|
|
@@ -44,7 +43,7 @@ module LogStash
|
|
|
44
43
|
|
|
45
44
|
client_options = {
|
|
46
45
|
hosts: hosts,
|
|
47
|
-
transport_class:
|
|
46
|
+
transport_class: ::Elastic::Transport::Transport::HTTP::Manticore,
|
|
48
47
|
transport_options: transport_options,
|
|
49
48
|
ssl: ssl_options,
|
|
50
49
|
retry_on_failure: options[:retry_on_failure],
|
|
@@ -112,20 +111,6 @@ module LogStash
|
|
|
112
111
|
rescue ArgumentError
|
|
113
112
|
false
|
|
114
113
|
end
|
|
115
|
-
|
|
116
|
-
def get_transport_client_class
|
|
117
|
-
# LS-core includes `elasticsearch` gem. The gem is composed of two separate gems: `elasticsearch-api` and `elasticsearch-transport`
|
|
118
|
-
# And now `elasticsearch-transport` is old, instead we have `elastic-transport`.
|
|
119
|
-
# LS-core updated `elasticsearch` > 8: https://github.com/elastic/logstash/pull/17161
|
|
120
|
-
# Following source bits are for the compatibility to support both `elasticsearch-transport` and `elastic-transport` gems
|
|
121
|
-
require "elasticsearch/transport/transport/http/manticore"
|
|
122
|
-
es_transport_client_type = "elasticsearch_transport"
|
|
123
|
-
::Elasticsearch::Transport::Transport::HTTP::Manticore
|
|
124
|
-
rescue ::LoadError
|
|
125
|
-
require "elastic/transport/transport/http/manticore"
|
|
126
|
-
es_transport_client_type = "elastic_transport"
|
|
127
|
-
::Elastic::Transport::Transport::HTTP::Manticore
|
|
128
|
-
end
|
|
129
114
|
end
|
|
130
115
|
end
|
|
131
116
|
end
|
|
@@ -209,9 +209,6 @@ class LogStash::Filters::Elasticsearch < LogStash::Filters::Base
|
|
|
209
209
|
test_connection!
|
|
210
210
|
validate_es_for_esql_support! if @query_type == "esql"
|
|
211
211
|
setup_serverless
|
|
212
|
-
if get_client.es_transport_client_type == "elasticsearch_transport"
|
|
213
|
-
require_relative "elasticsearch/patches/_elasticsearch_transport_http_manticore"
|
|
214
|
-
end
|
|
215
212
|
end # def register
|
|
216
213
|
|
|
217
214
|
def filter(event)
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
Gem::Specification.new do |s|
|
|
2
2
|
|
|
3
3
|
s.name = 'logstash-filter-elasticsearch'
|
|
4
|
-
s.version = '
|
|
4
|
+
s.version = ::File.read('version').split("\n").first
|
|
5
5
|
s.licenses = ['Apache License (2.0)']
|
|
6
6
|
s.summary = "Copies fields from previous log events in Elasticsearch to current events "
|
|
7
7
|
s.description = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
|
|
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
|
|
|
21
21
|
|
|
22
22
|
# Gem dependencies
|
|
23
23
|
s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
|
|
24
|
-
s.add_runtime_dependency 'elasticsearch',
|
|
24
|
+
s.add_runtime_dependency 'elasticsearch', '>= 8', '< 10'
|
|
25
25
|
s.add_runtime_dependency 'manticore', ">= 0.7.1"
|
|
26
26
|
s.add_runtime_dependency 'logstash-mixin-ecs_compatibility_support', '~> 1.3'
|
|
27
27
|
s.add_runtime_dependency 'logstash-mixin-ca_trusted_fingerprint_support', '~> 1.0'
|
|
@@ -58,11 +58,6 @@ describe LogStash::Filters::Elasticsearch::DslExecutor do
|
|
|
58
58
|
|
|
59
59
|
before(:each) do
|
|
60
60
|
allow(LogStash::Filters::ElasticsearchClient).to receive(:new).and_return(client)
|
|
61
|
-
if defined?(Elastic::Transport)
|
|
62
|
-
allow(client).to receive(:es_transport_client_type).and_return('elastic_transport')
|
|
63
|
-
else
|
|
64
|
-
allow(client).to receive(:es_transport_client_type).and_return('elasticsearch_transport')
|
|
65
|
-
end
|
|
66
61
|
allow(client).to receive(:search).and_return(response)
|
|
67
62
|
allow(plugin).to receive(:test_connection!)
|
|
68
63
|
allow(plugin).to receive(:setup_serverless)
|
|
@@ -123,26 +118,6 @@ describe LogStash::Filters::Elasticsearch::DslExecutor do
|
|
|
123
118
|
end
|
|
124
119
|
end
|
|
125
120
|
|
|
126
|
-
context 'when Elasticsearch 7.x gives us a totals object instead of an integer' do
|
|
127
|
-
let(:plugin_config) do
|
|
128
|
-
{
|
|
129
|
-
"hosts" => ["localhost:9200"],
|
|
130
|
-
"query" => "response: 404",
|
|
131
|
-
"fields" => { "response" => "code" },
|
|
132
|
-
"result_size" => 10
|
|
133
|
-
}
|
|
134
|
-
end
|
|
135
|
-
|
|
136
|
-
let(:response) do
|
|
137
|
-
LogStash::Json.load(File.read(File.join(File.dirname(__FILE__), "fixtures", "elasticsearch_7.x_hits_total_as_object.json")))
|
|
138
|
-
end
|
|
139
|
-
|
|
140
|
-
it "should enhance the current event with new data" do
|
|
141
|
-
plugin.filter(event)
|
|
142
|
-
expect(event.get("[@metadata][total_hits]")).to eq(13476)
|
|
143
|
-
end
|
|
144
|
-
end
|
|
145
|
-
|
|
146
121
|
context "if something wrong happen during connection" do
|
|
147
122
|
|
|
148
123
|
before(:each) do
|
|
@@ -307,11 +282,6 @@ describe LogStash::Filters::Elasticsearch::DslExecutor do
|
|
|
307
282
|
|
|
308
283
|
before do
|
|
309
284
|
allow(plugin).to receive(:get_client).and_return(client_double)
|
|
310
|
-
if defined?(Elastic::Transport)
|
|
311
|
-
allow(client_double).to receive(:es_transport_client_type).and_return('elastic_transport')
|
|
312
|
-
else
|
|
313
|
-
allow(client_double).to receive(:es_transport_client_type).and_return('elasticsearch_transport')
|
|
314
|
-
end
|
|
315
285
|
allow(client_double).to receive(:client).and_return(transport_double)
|
|
316
286
|
end
|
|
317
287
|
|
|
@@ -4,6 +4,7 @@ require "logstash/plugin"
|
|
|
4
4
|
require "logstash/filters/elasticsearch"
|
|
5
5
|
require "logstash/json"
|
|
6
6
|
require "cabin"
|
|
7
|
+
require "manticore"
|
|
7
8
|
require "webrick"
|
|
8
9
|
require "uri"
|
|
9
10
|
|
|
@@ -61,17 +62,9 @@ describe LogStash::Filters::Elasticsearch do
|
|
|
61
62
|
allow(filter_client).to receive(:serverless?).and_return(true)
|
|
62
63
|
allow(filter_client).to receive(:client).and_return(es_client)
|
|
63
64
|
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
:headers => LogStash::Filters::ElasticsearchClient::DEFAULT_EAV_HEADER))
|
|
68
|
-
.and_raise(Elastic::Transport::Transport::Errors::BadRequest.new)
|
|
69
|
-
else
|
|
70
|
-
allow(es_client).to receive(:info)
|
|
71
|
-
.with(a_hash_including(
|
|
72
|
-
:headers => LogStash::Filters::ElasticsearchClient::DEFAULT_EAV_HEADER))
|
|
73
|
-
.and_raise(Elasticsearch::Transport::Transport::Errors::BadRequest.new)
|
|
74
|
-
end
|
|
65
|
+
allow(es_client).to receive(:info)
|
|
66
|
+
.with(a_hash_including(:headers => LogStash::Filters::ElasticsearchClient::DEFAULT_EAV_HEADER))
|
|
67
|
+
.and_raise(Elastic::Transport::Transport::Errors::BadRequest.new)
|
|
75
68
|
end
|
|
76
69
|
|
|
77
70
|
it "raises an exception when Elastic Api Version is not supported" do
|
|
@@ -118,15 +111,15 @@ describe LogStash::Filters::Elasticsearch do
|
|
|
118
111
|
"cluster_name": "docker-cluster",
|
|
119
112
|
"cluster_uuid": "DyR1hN03QvuCWXRy3jtb0g",
|
|
120
113
|
"version": {
|
|
121
|
-
"number": "
|
|
114
|
+
"number": "8.0.0",
|
|
122
115
|
"build_flavor": "default",
|
|
123
116
|
"build_type": "docker",
|
|
124
117
|
"build_hash": "9a7758028e4ea59bcab41c12004603c5a7dd84a9",
|
|
125
118
|
"build_date": "2021-05-28T17:40:59.346932922Z",
|
|
126
119
|
"build_snapshot": false,
|
|
127
|
-
"lucene_version": "
|
|
128
|
-
"minimum_wire_compatibility_version": "
|
|
129
|
-
"minimum_index_compatibility_version": "
|
|
120
|
+
"lucene_version": "9.0.0",
|
|
121
|
+
"minimum_wire_compatibility_version": "7.17.0",
|
|
122
|
+
"minimum_index_compatibility_version": "7.0.0"
|
|
130
123
|
},
|
|
131
124
|
"tagline": "You Know, for Search"
|
|
132
125
|
}
|
|
@@ -187,17 +180,6 @@ describe LogStash::Filters::Elasticsearch do
|
|
|
187
180
|
end
|
|
188
181
|
let(:plugin) { described_class.new(config) }
|
|
189
182
|
let(:event) { LogStash::Event.new({}) }
|
|
190
|
-
|
|
191
|
-
# elasticsearch-ruby 7.17.9 initialize two user agent headers, `user-agent` and `User-Agent`
|
|
192
|
-
# hence, fail this header size test case
|
|
193
|
-
xit "client should sent the expect user-agent" do
|
|
194
|
-
plugin.register
|
|
195
|
-
|
|
196
|
-
request = webserver.wait_receive_request
|
|
197
|
-
|
|
198
|
-
expect(request.header['user-agent'].size).to eq(1)
|
|
199
|
-
expect(request.header['user-agent'][0]).to match(/logstash\/\d*\.\d*\.\d* \(OS=.*; JVM=.*\) logstash-filter-elasticsearch\/\d*\.\d*\.\d*/)
|
|
200
|
-
end
|
|
201
183
|
end
|
|
202
184
|
end
|
|
203
185
|
|
|
@@ -225,12 +207,7 @@ describe LogStash::Filters::Elasticsearch do
|
|
|
225
207
|
# this spec is a safeguard to trigger an assessment of thread-safety should
|
|
226
208
|
# we choose a different transport adapter in the future.
|
|
227
209
|
transport_class = extract_transport(client).options.fetch(:transport_class)
|
|
228
|
-
|
|
229
|
-
allow(client).to receive(:es_transport_client_type).and_return("elastic_transport")
|
|
230
|
-
expect(transport_class).to equal ::Elastic::Transport::Transport::HTTP::Manticore
|
|
231
|
-
else
|
|
232
|
-
expect(transport_class).to equal ::Elasticsearch::Transport::Transport::HTTP::Manticore
|
|
233
|
-
end
|
|
210
|
+
expect(transport_class).to equal ::Elastic::Transport::Transport::HTTP::Manticore
|
|
234
211
|
end
|
|
235
212
|
|
|
236
213
|
it 'uses a client with sufficient connection pool size' do
|
|
@@ -559,11 +536,6 @@ describe LogStash::Filters::Elasticsearch do
|
|
|
559
536
|
|
|
560
537
|
before(:each) do
|
|
561
538
|
allow(LogStash::Filters::ElasticsearchClient).to receive(:new).and_return(client)
|
|
562
|
-
if defined?(Elastic::Transport)
|
|
563
|
-
allow(client).to receive(:es_transport_client_type).and_return('elastic_transport')
|
|
564
|
-
else
|
|
565
|
-
allow(client).to receive(:es_transport_client_type).and_return('elasticsearch_transport')
|
|
566
|
-
end
|
|
567
539
|
allow(plugin).to receive(:test_connection!)
|
|
568
540
|
allow(plugin).to receive(:setup_serverless)
|
|
569
541
|
plugin.register
|
|
@@ -15,7 +15,7 @@ describe "SSL options" do
|
|
|
15
15
|
before do
|
|
16
16
|
allow(es_client_double).to receive(:close)
|
|
17
17
|
allow(es_client_double).to receive(:ping).with(any_args).and_return(double("pong").as_null_object)
|
|
18
|
-
allow(es_client_double).to receive(:info).with(any_args).and_return({"version" => {"number" => "
|
|
18
|
+
allow(es_client_double).to receive(:info).with(any_args).and_return({"version" => {"number" => "8.0.0", "build_flavor" => "default"},
|
|
19
19
|
"tagline" => "You Know, for Search"})
|
|
20
20
|
allow(Elasticsearch::Client).to receive(:new).and_return(es_client_double)
|
|
21
21
|
end
|
|
@@ -1,32 +1,32 @@
|
|
|
1
1
|
-----BEGIN CERTIFICATE-----
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
/
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
2
|
+
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
|
|
32
32
|
-----END CERTIFICATE-----
|
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
f87c28293c97641f5d26976330f69af97be14900508bb66562696bdd15d19ec8
|
|
@@ -1,51 +1,52 @@
|
|
|
1
|
-
-----BEGIN
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
1
|
+
-----BEGIN PRIVATE KEY-----
|
|
2
|
+
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
|
|
51
|
+
hdh+Ptk6tdOWYuZaDnuuoeyq7+v6zw==
|
|
52
|
+
-----END PRIVATE KEY-----
|
|
@@ -1,68 +1,69 @@
|
|
|
1
1
|
-----BEGIN CERTIFICATE-----
|
|
2
|
-
|
|
2
|
+
MIIGZzCCBE+gAwIBAgIBAzANBgkqhkiG9w0BAQsFADBRMQswCQYDVQQGEwJMUzEL
|
|
3
3
|
MAkGA1UECAwCTkExEzARBgNVBAcMCkh0dHAgSW5wdXQxETAPBgNVBAoMCExvZ3N0
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
YXNoMQ0wCwYDVQQDDARyb290MB4XDTI1MTAxNzE0NTQ1NFoXDTI4MTAxNzE0NTQ1
|
|
5
|
+
NFowUzELMAkGA1UEBhMCTFMxCzAJBgNVBAgMAk5BMRMwEQYDVQQHDApIdHRwIElu
|
|
6
6
|
cHV0MREwDwYDVQQKDAhMb2dzdGFzaDEPMA0GA1UEAwwGc2VydmVyMIICIjANBgkq
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
7
|
+
hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAv+YLYyzgQ472/UrTfzKUabKSho9TEGtQ
|
|
8
|
+
lc/EtwZEAx5oABKVmgCZvhspQyfh3UC+Pmptokr4vlVs3x8M6jKJIsJsXu/ieAQ4
|
|
9
|
+
jNI/VOojwF/tmlnUrElNgRmymucnGZ5U+IZrbyt/qAf2iWuRxvX/g+9aBgcBbhk0
|
|
10
|
+
zXRP20E2KtKQwLen0KviSIQO+cLSCnqQcEIC3pt/KjsCB7FrWIx6bUHFk+g6W/iR
|
|
11
|
+
TC6N3D+sQNZiMH9WQfcptGzGJJ69DxizZ59ei+f0vcrZNmY4vldmyiaenMWkPpJQ
|
|
12
|
+
MO0UPhFAhAUAwv9u8fBP3Frfvpl7nJ1sj5xgkVkFocIG0y3y0leBXm9HzVcdYcP2
|
|
13
|
+
7ChaSu6WioiWkV03CFNW6BnnT2aiX3QTNyr8oPu1bBt4Gm29ZTcvJru3ytyQyCc4
|
|
14
|
+
9W2NxPswdUbuPeA68mQGdXzSfmeDD061uTKGbuARvkIEy+gBvijiXxHvmmr6x/vx
|
|
15
|
+
d9dbidEV67MdKhCr4tSicpP6wdVEziWLBRDGsXYn3nPVrrActWaZYBkYNz5PFozC
|
|
16
|
+
IxPKRt8GNi+ooA0rh9h9PmYmXmr9H1G1F7lIPKGYH19u9FnSZVFsGTG71sDFdbp4
|
|
17
|
+
03jEjX5v9R4fFB0PQKVomuCr9WJK2tvImYVJEZejFn+6b1CQ0c1aqQ08/ccZM6Tl
|
|
18
|
+
8wxClPNkS0kCAwEAAaOCAUYwggFCMAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEBBAQD
|
|
19
19
|
AgZAMDMGCWCGSAGG+EIBDQQmFiRPcGVuU1NMIEdlbmVyYXRlZCBTZXJ2ZXIgQ2Vy
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
20
|
+
dGlmaWNhdGUwHQYDVR0OBBYEFBVL+S3eYli7G+RgCMAoBQZYFzeCMIGOBgNVHSME
|
|
21
|
+
gYYwgYOAFLco+OJUWIqEoPx6HUrxJdmai77ZoVWkUzBRMQswCQYDVQQGEwJMUzEL
|
|
22
|
+
MAkGA1UECAwCTkExEzARBgNVBAcMCkh0dHAgSW5wdXQxETAPBgNVBAoMCExvZ3N0
|
|
23
|
+
YXNoMQ0wCwYDVQQDDARyb290ghQCMYmXgBCeu54sK9ZlHnI3z21IcTAOBgNVHQ8B
|
|
24
|
+
Af8EBAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwGAYDVR0RBBEwD4INZWxhc3Rp
|
|
25
|
+
Y3NlYXJjaDANBgkqhkiG9w0BAQsFAAOCAgEAK3wDtY/RAZfAckpM29zgmmLvjQNO
|
|
26
|
+
aCN3yvyub8xu392E5pd8d1JPgDf0oXBJUJQhJVot4bsum4C5nquQp180h7txsUdO
|
|
27
|
+
caUXk8Udm1WveJesKBgGABFiWfCtVpJqWepiYaFsiHdcCAkY0CTP04nrRwA+n418
|
|
28
|
+
wtotrT/7OGbxIMFeFmDP0yBd+K7aEmaK4e2uMUmNVLbRG3ViBgTkiLJjhkPN92b9
|
|
29
|
+
k/9KuQIzWu+80IuSmGBt0iil9yMvje0dOC0/ZxMjBDQnMb7dEY5idRWxr76FPfnU
|
|
30
|
+
G7XrbJJKfTkZhHdw20WrffG4lFR84sv/A3rVg06DYxrsr558sLl7D1WPY8GxRssR
|
|
31
|
+
BWmuFmi+R9XlxSjJcdte68J7QAznVpRv0dcOOPqmwQcnoJBmBH9QMSwM7aSelSXc
|
|
32
|
+
zNryH3hDnQmqZA36PdMV0SKown2YEG1RZ/CvoNKiZGyVoI4vB8LdjRUVNQQPpsai
|
|
33
|
+
Ix3xROFtCPnPMu5UGi/X8bKuegrkFWW1JGjnepA890Ld7rXRrvoAl8Te6GRBEzBt
|
|
34
|
+
74u0Wc4xpsT2tv5DmH1nTwgJvlL3OUtHNCFryn2D3NhzzFkG/vFvRTIYBoU43X5n
|
|
35
|
+
rT6zT6c1e+JDqrglLAONLs3tzsLCMh0xEhOTQHgSnj96F8Ilc75wwofT0mLyUj5s
|
|
36
|
+
MWBub3eUKrRF8BU=
|
|
36
37
|
-----END CERTIFICATE-----
|
|
37
38
|
-----BEGIN CERTIFICATE-----
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
/
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
39
|
+
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
|
|
68
69
|
-----END CERTIFICATE-----
|