Skip to content

Commit 5fe9ec5

Browse files
voidlilyvoidlily
committed
Merge branch 'vuln-update' into 'main'
Update rails to 7.1.5.1 to patch vulns in actionpack See merge request lg/identity-pki!58
2 parents 52ed006 + 8974817 commit 5fe9ec5

File tree

2 files changed

+100
-75
lines changed

2 files changed

+100
-75
lines changed

‎Gemfile.lock‎

Lines changed: 76 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -20,81 +20,84 @@ GIT
2020
GEM
2121
remote: https://rubygems.org/
2222
specs:
23-
actioncable (7.1.4.1)
24-
actionpack (= 7.1.4.1)
25-
activesupport (= 7.1.4.1)
23+
actioncable (7.1.5.1)
24+
actionpack (= 7.1.5.1)
25+
activesupport (= 7.1.5.1)
2626
nio4r (~> 2.0)
2727
websocket-driver (>= 0.6.1)
2828
zeitwerk (~> 2.6)
29-
actionmailbox (7.1.4.1)
30-
actionpack (= 7.1.4.1)
31-
activejob (= 7.1.4.1)
32-
activerecord (= 7.1.4.1)
33-
activestorage (= 7.1.4.1)
34-
activesupport (= 7.1.4.1)
29+
actionmailbox (7.1.5.1)
30+
actionpack (= 7.1.5.1)
31+
activejob (= 7.1.5.1)
32+
activerecord (= 7.1.5.1)
33+
activestorage (= 7.1.5.1)
34+
activesupport (= 7.1.5.1)
3535
mail (>= 2.7.1)
3636
net-imap
3737
net-pop
3838
net-smtp
39-
actionmailer (7.1.4.1)
40-
actionpack (= 7.1.4.1)
41-
actionview (= 7.1.4.1)
42-
activejob (= 7.1.4.1)
43-
activesupport (= 7.1.4.1)
39+
actionmailer (7.1.5.1)
40+
actionpack (= 7.1.5.1)
41+
actionview (= 7.1.5.1)
42+
activejob (= 7.1.5.1)
43+
activesupport (= 7.1.5.1)
4444
mail (~> 2.5, >= 2.5.4)
4545
net-imap
4646
net-pop
4747
net-smtp
4848
rails-dom-testing (~> 2.2)
49-
actionpack (7.1.4.1)
50-
actionview (= 7.1.4.1)
51-
activesupport (= 7.1.4.1)
49+
actionpack (7.1.5.1)
50+
actionview (= 7.1.5.1)
51+
activesupport (= 7.1.5.1)
5252
nokogiri (>= 1.8.5)
5353
racc
5454
rack (>= 2.2.4)
5555
rack-session (>= 1.0.1)
5656
rack-test (>= 0.6.3)
5757
rails-dom-testing (~> 2.2)
5858
rails-html-sanitizer (~> 1.6)
59-
actiontext (7.1.4.1)
60-
actionpack (= 7.1.4.1)
61-
activerecord (= 7.1.4.1)
62-
activestorage (= 7.1.4.1)
63-
activesupport (= 7.1.4.1)
59+
actiontext (7.1.5.1)
60+
actionpack (= 7.1.5.1)
61+
activerecord (= 7.1.5.1)
62+
activestorage (= 7.1.5.1)
63+
activesupport (= 7.1.5.1)
6464
globalid (>= 0.6.0)
6565
nokogiri (>= 1.8.5)
66-
actionview (7.1.4.1)
67-
activesupport (= 7.1.4.1)
66+
actionview (7.1.5.1)
67+
activesupport (= 7.1.5.1)
6868
builder (~> 3.1)
6969
erubi (~> 1.11)
7070
rails-dom-testing (~> 2.2)
7171
rails-html-sanitizer (~> 1.6)
72-
activejob (7.1.4.1)
73-
activesupport (= 7.1.4.1)
72+
activejob (7.1.5.1)
73+
activesupport (= 7.1.5.1)
7474
globalid (>= 0.3.6)
75-
activemodel (7.1.4.1)
76-
activesupport (= 7.1.4.1)
77-
activerecord (7.1.4.1)
78-
activemodel (= 7.1.4.1)
79-
activesupport (= 7.1.4.1)
75+
activemodel (7.1.5.1)
76+
activesupport (= 7.1.5.1)
77+
activerecord (7.1.5.1)
78+
activemodel (= 7.1.5.1)
79+
activesupport (= 7.1.5.1)
8080
timeout (>= 0.4.0)
8181
activerecord-import (1.8.1)
8282
activerecord (>= 4.2)
83-
activestorage (7.1.4.1)
84-
actionpack (= 7.1.4.1)
85-
activejob (= 7.1.4.1)
86-
activerecord (= 7.1.4.1)
87-
activesupport (= 7.1.4.1)
83+
activestorage (7.1.5.1)
84+
actionpack (= 7.1.5.1)
85+
activejob (= 7.1.5.1)
86+
activerecord (= 7.1.5.1)
87+
activesupport (= 7.1.5.1)
8888
marcel (~> 1.0)
89-
activesupport (7.1.4.1)
89+
activesupport (7.1.5.1)
9090
base64
91+
benchmark (>= 0.3)
9192
bigdecimal
9293
concurrent-ruby (~> 1.0, >= 1.0.2)
9394
connection_pool (>= 2.2.5)
9495
drb
9596
i18n (>= 1.6, < 2)
97+
logger (>= 1.4.2)
9698
minitest (>= 5.1)
9799
mutex_m
100+
securerandom (>= 0.3)
98101
tzinfo (~> 2.0)
99102
addressable (2.8.7)
100103
public_suffix (>= 2.0.2, < 7.0)
@@ -116,6 +119,7 @@ GEM
116119
aws-sigv4 (1.10.0)
117120
aws-eventstream (~> 1, >= 1.0.2)
118121
base64 (0.2.0)
122+
benchmark (0.4.0)
119123
better_errors (2.10.1)
120124
erubi (>= 1.0.0)
121125
rack (>= 0.9.0)
@@ -142,7 +146,7 @@ GEM
142146
rexml
143147
crass (1.0.6)
144148
csv (3.3.0)
145-
date (3.3.4)
149+
date (3.4.1)
146150
diff-lcs (1.5.1)
147151
docile (1.4.1)
148152
drb (2.2.1)
@@ -158,8 +162,8 @@ GEM
158162
hashdiff (1.1.1)
159163
i18n (1.14.6)
160164
concurrent-ruby (~> 1.0)
161-
io-console (0.7.2)
162-
irb (1.14.1)
165+
io-console (0.8.0)
166+
irb (1.14.2)
163167
rdoc (>= 4.0.0)
164168
reline (>= 0.4.2)
165169
jmespath (1.6.2)
@@ -168,6 +172,7 @@ GEM
168172
listen (3.9.0)
169173
rb-fsevent (~> 0.10, >= 0.10.3)
170174
rb-inotify (~> 0.9, >= 0.9.10)
175+
logger (1.6.3)
171176
lograge (0.14.0)
172177
actionpack (>= 4)
173178
activesupport (>= 4)
@@ -186,10 +191,10 @@ GEM
186191
mini_cache (1.1.0)
187192
mini_mime (1.1.5)
188193
mini_portile2 (2.8.8)
189-
minitest (5.25.1)
194+
minitest (5.25.4)
190195
msgpack (1.7.3)
191-
mutex_m (0.2.0)
192-
net-imap (0.5.0)
196+
mutex_m (0.3.0)
197+
net-imap (0.5.2)
193198
date
194199
net-protocol
195200
net-pop (0.1.2)
@@ -199,8 +204,8 @@ GEM
199204
net-smtp (0.5.0)
200205
net-protocol
201206
newrelic_rpm (8.16.0)
202-
nio4r (2.7.3)
203-
nokogiri (1.16.8)
207+
nio4r (2.7.4)
208+
nokogiri (1.17.2)
204209
mini_portile2 (~> 2.8.2)
205210
racc (~> 1.4)
206211
pairing_heap (3.1.0)
@@ -217,7 +222,8 @@ GEM
217222
pry (>= 0.13, < 0.15)
218223
pry-rails (0.3.11)
219224
pry (>= 0.13.0)
220-
psych (5.1.2)
225+
psych (5.2.1)
226+
date
221227
stringio
222228
public_suffix (6.0.1)
223229
puma (6.4.3)
@@ -228,23 +234,22 @@ GEM
228234
rack (>= 3.0.0)
229235
rack-test (2.1.0)
230236
rack (>= 1.3)
231-
rackup (2.1.0)
237+
rackup (2.2.1)
232238
rack (>= 3)
233-
webrick (~> 1.8)
234-
rails (7.1.4.1)
235-
actioncable (= 7.1.4.1)
236-
actionmailbox (= 7.1.4.1)
237-
actionmailer (= 7.1.4.1)
238-
actionpack (= 7.1.4.1)
239-
actiontext (= 7.1.4.1)
240-
actionview (= 7.1.4.1)
241-
activejob (= 7.1.4.1)
242-
activemodel (= 7.1.4.1)
243-
activerecord (= 7.1.4.1)
244-
activestorage (= 7.1.4.1)
245-
activesupport (= 7.1.4.1)
239+
rails (7.1.5.1)
240+
actioncable (= 7.1.5.1)
241+
actionmailbox (= 7.1.5.1)
242+
actionmailer (= 7.1.5.1)
243+
actionpack (= 7.1.5.1)
244+
actiontext (= 7.1.5.1)
245+
actionview (= 7.1.5.1)
246+
activejob (= 7.1.5.1)
247+
activemodel (= 7.1.5.1)
248+
activerecord (= 7.1.5.1)
249+
activestorage (= 7.1.5.1)
250+
activesupport (= 7.1.5.1)
246251
bundler (>= 1.15.0)
247-
railties (= 7.1.4.1)
252+
railties (= 7.1.5.1)
248253
rails-controller-testing (1.0.5)
249254
actionpack (>= 5.0.1.rc1)
250255
actionview (>= 5.0.1.rc1)
@@ -253,12 +258,12 @@ GEM
253258
activesupport (>= 5.0.0)
254259
minitest
255260
nokogiri (>= 1.6)
256-
rails-html-sanitizer (1.6.1)
261+
rails-html-sanitizer (1.6.2)
257262
loofah (~> 2.21)
258263
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
259-
railties (7.1.4.1)
260-
actionpack (= 7.1.4.1)
261-
activesupport (= 7.1.4.1)
264+
railties (7.1.5.1)
265+
actionpack (= 7.1.5.1)
266+
activesupport (= 7.1.5.1)
262267
irb
263268
rackup (>= 1.0.0)
264269
rake (>= 12.2)
@@ -269,15 +274,15 @@ GEM
269274
rb-fsevent (0.11.2)
270275
rb-inotify (0.11.1)
271276
ffi (~> 1.0)
272-
rdoc (6.7.0)
277+
rdoc (6.9.1)
273278
psych (>= 4.0.0)
274279
redacted_struct (2.0.0)
275280
redis (5.3.0)
276281
redis-client (>= 0.22.0)
277282
redis-client (0.22.2)
278283
connection_pool
279284
regexp_parser (2.9.2)
280-
reline (0.5.10)
285+
reline (0.6.0)
281286
io-console (~> 0.5)
282287
request_store (1.7.0)
283288
rack (>= 1.4)
@@ -327,6 +332,7 @@ GEM
327332
rubocop (>= 1.52.0, < 2.0)
328333
rubocop-ast (>= 1.31.1, < 2.0)
329334
ruby-progressbar (1.13.0)
335+
securerandom (0.4.1)
330336
shoulda-matchers (3.1.3)
331337
activesupport (>= 4.0.0)
332338
simplecov (0.22.0)
@@ -336,9 +342,9 @@ GEM
336342
simplecov-html (0.13.1)
337343
simplecov_json_formatter (0.1.4)
338344
stream (0.5.5)
339-
stringio (3.1.1)
345+
stringio (3.1.2)
340346
thor (1.3.2)
341-
timeout (0.4.1)
347+
timeout (0.4.3)
342348
tzinfo (2.0.6)
343349
concurrent-ruby (~> 1.0)
344350
unicode-display_width (2.6.0)
@@ -347,11 +353,10 @@ GEM
347353
addressable (>= 2.8.0)
348354
crack (>= 0.3.2)
349355
hashdiff (>= 0.4.0, < 2.0.0)
350-
webrick (1.8.2)
351356
websocket-driver (0.7.6)
352357
websocket-extensions (>= 0.1.0)
353358
websocket-extensions (0.1.5)
354-
zeitwerk (2.7.0)
359+
zeitwerk (2.7.1)
355360

356361
PLATFORMS
357362
ruby

‎k8files/application.yaml‎

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -384,11 +384,31 @@ spec:
384384
logo: '18f.svg'
385385
certs:
386386
- 'identity_dashboard_cert'
387-
return_to_sp_url: 'https://dashboard.{{ENVIRONMENT}}.identitysandbox.gov/'
387+
return_to_sp_url: 'https://{{ENVIRONMENT}}-dashboard.reviewapps.identitysandbox.gov/'
388388
redirect_uris:
389-
- 'https://dashboard.{{ENVIRONMENT}}.identitysandbox.gov/auth/logindotgov/callback'
390-
- 'https://dashboard.{{ENVIRONMENT}}.identitysandbox.gov'
391-
push_notification_url: 'https://dashboard.{{ENVIRONMENT}}.identitysandbox.gov/api/security_events'
389+
- 'https://{{ENVIRONMENT}}-dashboard.reviewapps.identitysandbox.gov/auth/logindotgov/callback'
390+
- 'https://{{ENVIRONMENT}}-dashboard.reviewapps.identitysandbox.gov'
391+
push_notification_url: 'https://{{ENVIRONMENT}}-dashboard.reviewapps.identitysandbox.gov/api/security_events'
392+
- target:
393+
kind: ConfigMap
394+
name: service-providers-yml-dbsetup
395+
patch: |-
396+
- op: replace
397+
path: /data/service_providers.yml
398+
value: |
399+
production:
400+
'urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:dashboard':
401+
friendly_name: 'Dashboard'
402+
agency: 'GSA'
403+
agency_id: 2
404+
logo: '18f.svg'
405+
certs:
406+
- 'identity_dashboard_cert'
407+
return_to_sp_url: 'https://{{ENVIRONMENT}}-dashboard.reviewapps.identitysandbox.gov/'
408+
redirect_uris:
409+
- 'https://{{ENVIRONMENT}}-dashboard.reviewapps.identitysandbox.gov/auth/logindotgov/callback'
410+
- 'https://{{ENVIRONMENT}}-dashboard.reviewapps.identitysandbox.gov'
411+
push_notification_url: 'https://{{ENVIRONMENT}}-dashboard.reviewapps.identitysandbox.gov/api/security_events'
392412
# Patch idp database setup jobs
393413
- target:
394414
kind: Job

0 commit comments

Comments
 (0)