Skip to content

Commit d904dbd

Browse files
chadlwilsonchadlwilson
authored
Merge pull request #296 from chadlwilson/fix-rails-71-session-usage
Fix Rails 7.1 CSRF token support
2 parents c758c0c + ef22fbc commit d904dbd

File tree

12 files changed

+98
-84
lines changed

12 files changed

+98
-84
lines changed

‎.github/workflows/maven.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Java CI
22

33
on:
44
push:
5-
branches: [ "master", "*release*", "*stable*" ]
5+
branches: [ "master", "*-stable" ]
66
pull_request:
7-
branches: [ "master", "*release*", "*stable*" ]
7+
branches: [ "master", "*-stable" ]
88

99
env:
1010
# Default versions for canonical release build

‎History.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@
77
- Drop unnecessary jruby.compat.version and RackConfig.getCompatVersion() API
88
- Drop JMS support
99
- update (bundled) rack to 2.2.17
10+
- Fix Rails 7.1 CSRF protection when working with `JavaServletStore` sessions
1011

1112
## 1.2.4 (UNRELEASED)
1213

13-
- update (bundled) rack to 2.2.16
14+
- update (bundled) rack to 2.2.17
15+
- Fix Rails 7.1 CSRF protection when working with `JavaServletStore` sessions
1416

1517
## 1.2.3
1618

17-
- avoid warnings due usage of `File.exists?`
19+
- avoid warnings due to usage of `File.exists?`
1820
- Fix Rails 7.1 compatibility by ensuring active_support is required before railtie
1921
- Workaround logger require issues with concurrent-ruby 1.3.5 and older Rails versions
2022
- Workaround NameError frozen string literal issues with JRuby 9.3 and Rails 5.2/6.0

‎gemfiles/rails50.gemfile.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ GEM
6565
method_source (1.1.0)
6666
mini_mime (1.1.5)
6767
minitest (5.25.5)
68-
net-imap (0.5.8)
68+
net-imap (0.5.9)
6969
date
7070
net-protocol
7171
net-pop (0.1.2)
@@ -78,7 +78,7 @@ GEM
7878
nokogiri (1.18.8-java)
7979
racc (~> 1.4)
8080
racc (1.8.1-java)
81-
rack (2.2.16)
81+
rack (2.2.17)
8282
rack-test (0.6.3)
8383
rack (>= 1.0)
8484
rails (5.0.7.2)
@@ -111,7 +111,7 @@ GEM
111111
rspec-core (~> 3.13.0)
112112
rspec-expectations (~> 3.13.0)
113113
rspec-mocks (~> 3.13.0)
114-
rspec-core (3.13.4)
114+
rspec-core (3.13.5)
115115
rspec-support (~> 3.13.0)
116116
rspec-expectations (3.13.5)
117117
diff-lcs (>= 1.2.0, < 2.0)

‎gemfiles/rails52.gemfile.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ GEM
7171
method_source (1.1.0)
7272
mini_mime (1.1.5)
7373
minitest (5.25.5)
74-
net-imap (0.5.8)
74+
net-imap (0.5.9)
7575
date
7676
net-protocol
7777
net-pop (0.1.2)
@@ -84,7 +84,7 @@ GEM
8484
nokogiri (1.18.8-java)
8585
racc (~> 1.4)
8686
racc (1.8.1-java)
87-
rack (2.2.16)
87+
rack (2.2.17)
8888
rack-test (2.2.0)
8989
rack (>= 1.3)
9090
rails (5.2.8.1)
@@ -118,7 +118,7 @@ GEM
118118
rspec-core (~> 3.13.0)
119119
rspec-expectations (~> 3.13.0)
120120
rspec-mocks (~> 3.13.0)
121-
rspec-core (3.13.4)
121+
rspec-core (3.13.5)
122122
rspec-support (~> 3.13.0)
123123
rspec-expectations (3.13.5)
124124
diff-lcs (>= 1.2.0, < 2.0)

‎gemfiles/rails60.gemfile.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ GEM
8484
method_source (1.1.0)
8585
mini_mime (1.1.5)
8686
minitest (5.25.5)
87-
net-imap (0.5.8)
87+
net-imap (0.5.9)
8888
date
8989
net-protocol
9090
net-pop (0.1.2)
@@ -97,7 +97,7 @@ GEM
9797
nokogiri (1.18.8-java)
9898
racc (~> 1.4)
9999
racc (1.8.1-java)
100-
rack (2.2.16)
100+
rack (2.2.17)
101101
rack-test (2.2.0)
102102
rack (>= 1.3)
103103
rails (6.0.6.1)
@@ -133,7 +133,7 @@ GEM
133133
rspec-core (~> 3.13.0)
134134
rspec-expectations (~> 3.13.0)
135135
rspec-mocks (~> 3.13.0)
136-
rspec-core (3.13.4)
136+
rspec-core (3.13.5)
137137
rspec-support (~> 3.13.0)
138138
rspec-expectations (3.13.5)
139139
diff-lcs (>= 1.2.0, < 2.0)
@@ -159,7 +159,7 @@ GEM
159159
base64
160160
websocket-extensions (>= 0.1.0)
161161
websocket-extensions (0.1.5)
162-
zeitwerk (2.7.3)
162+
zeitwerk (2.6.18)
163163

164164
PLATFORMS
165165
universal-java-11

‎gemfiles/rails61.gemfile.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ GEM
8888
method_source (1.1.0)
8989
mini_mime (1.1.5)
9090
minitest (5.25.5)
91-
net-imap (0.5.8)
91+
net-imap (0.5.9)
9292
date
9393
net-protocol
9494
net-pop (0.1.2)
@@ -101,7 +101,7 @@ GEM
101101
nokogiri (1.18.8-java)
102102
racc (~> 1.4)
103103
racc (1.8.1-java)
104-
rack (2.2.16)
104+
rack (2.2.17)
105105
rack-test (2.2.0)
106106
rack (>= 1.3)
107107
rails (6.1.7.10)
@@ -137,7 +137,7 @@ GEM
137137
rspec-core (~> 3.13.0)
138138
rspec-expectations (~> 3.13.0)
139139
rspec-mocks (~> 3.13.0)
140-
rspec-core (3.13.4)
140+
rspec-core (3.13.5)
141141
rspec-support (~> 3.13.0)
142142
rspec-expectations (3.13.5)
143143
diff-lcs (>= 1.2.0, < 2.0)
@@ -162,7 +162,7 @@ GEM
162162
base64
163163
websocket-extensions (>= 0.1.0)
164164
websocket-extensions (0.1.5)
165-
zeitwerk (2.7.3)
165+
zeitwerk (2.6.18)
166166

167167
PLATFORMS
168168
universal-java-11

‎gemfiles/rails70.gemfile.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ GEM
9393
method_source (1.1.0)
9494
mini_mime (1.1.5)
9595
minitest (5.25.5)
96-
net-imap (0.5.8)
96+
net-imap (0.5.9)
9797
date
9898
net-protocol
9999
net-pop (0.1.2)
@@ -106,7 +106,7 @@ GEM
106106
nokogiri (1.18.8-java)
107107
racc (~> 1.4)
108108
racc (1.8.1-java)
109-
rack (2.2.16)
109+
rack (2.2.17)
110110
rack-test (2.2.0)
111111
rack (>= 1.3)
112112
rails (7.0.8.7)
@@ -142,7 +142,7 @@ GEM
142142
rspec-core (~> 3.13.0)
143143
rspec-expectations (~> 3.13.0)
144144
rspec-mocks (~> 3.13.0)
145-
rspec-core (3.13.4)
145+
rspec-core (3.13.5)
146146
rspec-support (~> 3.13.0)
147147
rspec-expectations (3.13.5)
148148
diff-lcs (>= 1.2.0, < 2.0)
@@ -159,7 +159,7 @@ GEM
159159
base64
160160
websocket-extensions (>= 0.1.0)
161161
websocket-extensions (0.1.5)
162-
zeitwerk (2.7.3)
162+
zeitwerk (2.6.18)
163163

164164
PLATFORMS
165165
universal-java-11

‎gemfiles/rails71.gemfile.lock‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,17 @@ GEM
8484
thor (>= 0.14.0)
8585
base64 (0.3.0)
8686
benchmark (0.4.1)
87-
bigdecimal (3.2.1-java)
87+
bigdecimal (3.2.2-java)
8888
builder (3.3.0)
89+
cgi (0.5.0-java)
8990
concurrent-ruby (1.3.5)
9091
connection_pool (2.5.3)
9192
crass (1.0.6)
9293
date (3.4.1-java)
9394
diff-lcs (1.6.2)
9495
drb (2.2.3)
95-
erb (5.0.1-java)
96+
erb (4.0.4-java)
97+
cgi (>= 0.3.3)
9698
erubi (1.13.1)
9799
globalid (1.2.1)
98100
activesupport (>= 6.1)
@@ -117,7 +119,7 @@ GEM
117119
mini_mime (1.1.5)
118120
minitest (5.25.5)
119121
mutex_m (0.3.0)
120-
net-imap (0.5.8)
122+
net-imap (0.5.9)
121123
date
122124
net-protocol
123125
net-pop (0.1.2)
@@ -136,7 +138,7 @@ GEM
136138
date
137139
jar-dependencies (>= 0.1.7)
138140
racc (1.8.1-java)
139-
rack (2.2.16)
141+
rack (2.2.17)
140142
rack-session (1.0.2)
141143
rack (< 3)
142144
rack-test (2.2.0)
@@ -174,7 +176,7 @@ GEM
174176
thor (~> 1.0, >= 1.2.2)
175177
zeitwerk (~> 2.6)
176178
rake (13.3.0)
177-
rdoc (6.14.0)
179+
rdoc (6.14.2)
178180
erb
179181
psych (>= 4.0.0)
180182
reline (0.6.1)
@@ -183,7 +185,7 @@ GEM
183185
rspec-core (~> 3.13.0)
184186
rspec-expectations (~> 3.13.0)
185187
rspec-mocks (~> 3.13.0)
186-
rspec-core (3.13.4)
188+
rspec-core (3.13.5)
187189
rspec-support (~> 3.13.0)
188190
rspec-expectations (3.13.5)
189191
diff-lcs (>= 1.2.0, < 2.0)
@@ -202,7 +204,7 @@ GEM
202204
base64
203205
websocket-extensions (>= 0.1.0)
204206
websocket-extensions (0.1.5)
205-
zeitwerk (2.7.3)
207+
zeitwerk (2.6.18)
206208

207209
PLATFORMS
208210
universal-java-11

‎gemfiles/rails72.gemfile.lock‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,17 @@ GEM
7878
thor (>= 0.14.0)
7979
base64 (0.3.0)
8080
benchmark (0.4.1)
81-
bigdecimal (3.2.1-java)
81+
bigdecimal (3.2.2-java)
8282
builder (3.3.0)
83+
cgi (0.5.0-java)
8384
concurrent-ruby (1.3.5)
8485
connection_pool (2.5.3)
8586
crass (1.0.6)
8687
date (3.4.1-java)
8788
diff-lcs (1.6.2)
8889
drb (2.2.3)
89-
erb (5.0.1-java)
90+
erb (4.0.4-java)
91+
cgi (>= 0.3.3)
9092
erubi (1.13.1)
9193
globalid (1.2.1)
9294
activesupport (>= 6.1)
@@ -110,7 +112,7 @@ GEM
110112
marcel (1.0.4)
111113
mini_mime (1.1.5)
112114
minitest (5.25.5)
113-
net-imap (0.5.8)
115+
net-imap (0.5.9)
114116
date
115117
net-protocol
116118
net-pop (0.1.2)
@@ -129,7 +131,7 @@ GEM
129131
date
130132
jar-dependencies (>= 0.1.7)
131133
racc (1.8.1-java)
132-
rack (2.2.16)
134+
rack (2.2.17)
133135
rack-session (1.0.2)
134136
rack (< 3)
135137
rack-test (2.2.0)
@@ -167,7 +169,7 @@ GEM
167169
thor (~> 1.0, >= 1.2.2)
168170
zeitwerk (~> 2.6)
169171
rake (13.3.0)
170-
rdoc (6.14.0)
172+
rdoc (6.14.2)
171173
erb
172174
psych (>= 4.0.0)
173175
reline (0.6.1)
@@ -176,7 +178,7 @@ GEM
176178
rspec-core (~> 3.13.0)
177179
rspec-expectations (~> 3.13.0)
178180
rspec-mocks (~> 3.13.0)
179-
rspec-core (3.13.4)
181+
rspec-core (3.13.5)
180182
rspec-support (~> 3.13.0)
181183
rspec-expectations (3.13.5)
182184
diff-lcs (>= 1.2.0, < 2.0)
@@ -196,7 +198,7 @@ GEM
196198
base64
197199
websocket-extensions (>= 0.1.0)
198200
websocket-extensions (0.1.5)
199-
zeitwerk (2.7.3)
201+
zeitwerk (2.6.18)
200202

201203
PLATFORMS
202204
universal-java-11

‎gemfiles/rails80.gemfile.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ GEM
7878
thor (>= 0.14.0)
7979
base64 (0.3.0)
8080
benchmark (0.4.1)
81-
bigdecimal (3.2.1-java)
81+
bigdecimal (3.2.2-java)
8282
builder (3.3.0)
8383
concurrent-ruby (1.3.5)
8484
connection_pool (2.5.3)
@@ -110,7 +110,7 @@ GEM
110110
marcel (1.0.4)
111111
mini_mime (1.1.5)
112112
minitest (5.25.5)
113-
net-imap (0.5.8)
113+
net-imap (0.5.9)
114114
date
115115
net-protocol
116116
net-pop (0.1.2)
@@ -129,7 +129,7 @@ GEM
129129
date
130130
jar-dependencies (>= 0.1.7)
131131
racc (1.8.1-java)
132-
rack (2.2.16)
132+
rack (2.2.17)
133133
rack-session (1.0.2)
134134
rack (< 3)
135135
rack-test (2.2.0)
@@ -167,7 +167,7 @@ GEM
167167
thor (~> 1.0, >= 1.2.2)
168168
zeitwerk (~> 2.6)
169169
rake (13.3.0)
170-
rdoc (6.14.0)
170+
rdoc (6.14.2)
171171
erb
172172
psych (>= 4.0.0)
173173
reline (0.6.1)
@@ -176,7 +176,7 @@ GEM
176176
rspec-core (~> 3.13.0)
177177
rspec-expectations (~> 3.13.0)
178178
rspec-mocks (~> 3.13.0)
179-
rspec-core (3.13.4)
179+
rspec-core (3.13.5)
180180
rspec-support (~> 3.13.0)
181181
rspec-expectations (3.13.5)
182182
diff-lcs (>= 1.2.0, < 2.0)

0 commit comments

Comments
 (0)