Skip to content

Fix Rails 7.1 CSRF token support #296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chadlwilson merged 4 commits into from
Jul 22, 2025
Merged

Fix Rails 7.1 CSRF token support #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
56e22bd
Add Rails 7.1 CSRF token support
chadlwilson Jul 6, 2025
8014853
Correct & update lock files for minimum JRuby version
chadlwilson Jul 8, 2025
ffe1e84
Bump rails80 appraisal dependencies
chadlwilson Jul 8, 2025
ef22fbc
Fix actions branch triggers
chadlwilson Jul 8, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Java CI

on:
push:
branches: [ "master", "*release*", "*stable*" ]
branches: [ "master", "*-stable" ]
pull_request:
branches: [ "master", "*release*", "*stable*" ]
branches: [ "master", "*-stable" ]

env:
# Default versions for canonical release build
Expand Down
6 changes: 4 additions & 2 deletions History.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@
- Drop unnecessary jruby.compat.version and RackConfig.getCompatVersion() API
- Drop JMS support
- update (bundled) rack to 2.2.17
- Fix Rails 7.1 CSRF protection when working with `JavaServletStore` sessions

## 1.2.4 (UNRELEASED)

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

## 1.2.3

- avoid warnings due usage of `File.exists?`
- avoid warnings due to usage of `File.exists?`
- Fix Rails 7.1 compatibility by ensuring active_support is required before railtie
- Workaround logger require issues with concurrent-ruby 1.3.5 and older Rails versions
- Workaround NameError frozen string literal issues with JRuby 9.3 and Rails 5.2/6.0
Expand Down
6 changes: 3 additions & 3 deletions gemfiles/rails50.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ GEM
method_source (1.1.0)
mini_mime (1.1.5)
minitest (5.25.5)
net-imap (0.5.8)
net-imap (0.5.9)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -78,7 +78,7 @@ GEM
nokogiri (1.18.8-java)
racc (~> 1.4)
racc (1.8.1-java)
rack (2.2.16)
rack (2.2.17)
rack-test (0.6.3)
rack (>= 1.0)
rails (5.0.7.2)
Expand Down Expand Up @@ -111,7 +111,7 @@ GEM
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-core (3.13.4)
rspec-core (3.13.5)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.5)
diff-lcs (>= 1.2.0, < 2.0)
Expand Down
6 changes: 3 additions & 3 deletions gemfiles/rails52.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ GEM
method_source (1.1.0)
mini_mime (1.1.5)
minitest (5.25.5)
net-imap (0.5.8)
net-imap (0.5.9)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -84,7 +84,7 @@ GEM
nokogiri (1.18.8-java)
racc (~> 1.4)
racc (1.8.1-java)
rack (2.2.16)
rack (2.2.17)
rack-test (2.2.0)
rack (>= 1.3)
rails (5.2.8.1)
Expand Down Expand Up @@ -118,7 +118,7 @@ GEM
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-core (3.13.4)
rspec-core (3.13.5)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.5)
diff-lcs (>= 1.2.0, < 2.0)
Expand Down
8 changes: 4 additions & 4 deletions gemfiles/rails60.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ GEM
method_source (1.1.0)
mini_mime (1.1.5)
minitest (5.25.5)
net-imap (0.5.8)
net-imap (0.5.9)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -97,7 +97,7 @@ GEM
nokogiri (1.18.8-java)
racc (~> 1.4)
racc (1.8.1-java)
rack (2.2.16)
rack (2.2.17)
rack-test (2.2.0)
rack (>= 1.3)
rails (6.0.6.1)
Expand Down Expand Up @@ -133,7 +133,7 @@ GEM
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-core (3.13.4)
rspec-core (3.13.5)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.5)
diff-lcs (>= 1.2.0, < 2.0)
Expand All @@ -159,7 +159,7 @@ GEM
base64
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
zeitwerk (2.7.3)
zeitwerk (2.6.18)

PLATFORMS
universal-java-1.8
Expand Down
8 changes: 4 additions & 4 deletions gemfiles/rails61.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ GEM
method_source (1.1.0)
mini_mime (1.1.5)
minitest (5.25.5)
net-imap (0.5.8)
net-imap (0.5.9)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -101,7 +101,7 @@ GEM
nokogiri (1.18.8-java)
racc (~> 1.4)
racc (1.8.1-java)
rack (2.2.16)
rack (2.2.17)
rack-test (2.2.0)
rack (>= 1.3)
rails (6.1.7.10)
Expand Down Expand Up @@ -137,7 +137,7 @@ GEM
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-core (3.13.4)
rspec-core (3.13.5)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.5)
diff-lcs (>= 1.2.0, < 2.0)
Expand All @@ -162,7 +162,7 @@ GEM
base64
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
zeitwerk (2.7.3)
zeitwerk (2.6.18)

PLATFORMS
universal-java-1.8
Expand Down
8 changes: 4 additions & 4 deletions gemfiles/rails70.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ GEM
method_source (1.1.0)
mini_mime (1.1.5)
minitest (5.25.5)
net-imap (0.5.8)
net-imap (0.5.9)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -106,7 +106,7 @@ GEM
nokogiri (1.18.8-java)
racc (~> 1.4)
racc (1.8.1-java)
rack (2.2.16)
rack (2.2.17)
rack-test (2.2.0)
rack (>= 1.3)
rails (7.0.8.7)
Expand Down Expand Up @@ -142,7 +142,7 @@ GEM
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-core (3.13.4)
rspec-core (3.13.5)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.5)
diff-lcs (>= 1.2.0, < 2.0)
Expand All @@ -159,7 +159,7 @@ GEM
base64
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
zeitwerk (2.7.3)
zeitwerk (2.6.18)

PLATFORMS
universal-java-1.8
Expand Down
16 changes: 9 additions & 7 deletions gemfiles/rails71.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,17 @@ GEM
thor (>= 0.14.0)
base64 (0.3.0)
benchmark (0.4.1)
bigdecimal (3.2.1-java)
bigdecimal (3.2.2-java)
builder (3.3.0)
cgi (0.5.0-java)
concurrent-ruby (1.3.5)
connection_pool (2.5.3)
crass (1.0.6)
date (3.4.1-java)
diff-lcs (1.6.2)
drb (2.2.3)
erb (5.0.1-java)
erb (4.0.4-java)
cgi (>= 0.3.3)
erubi (1.13.1)
globalid (1.2.1)
activesupport (>= 6.1)
Expand All @@ -117,7 +119,7 @@ GEM
mini_mime (1.1.5)
minitest (5.25.5)
mutex_m (0.3.0)
net-imap (0.5.8)
net-imap (0.5.9)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -136,7 +138,7 @@ GEM
date
jar-dependencies (>= 0.1.7)
racc (1.8.1-java)
rack (2.2.16)
rack (2.2.17)
rack-session (1.0.2)
rack (< 3)
rack-test (2.2.0)
Expand Down Expand Up @@ -174,7 +176,7 @@ GEM
thor (~> 1.0, >= 1.2.2)
zeitwerk (~> 2.6)
rake (13.3.0)
rdoc (6.14.0)
rdoc (6.14.2)
erb
psych (>= 4.0.0)
reline (0.6.1)
Expand All @@ -183,7 +185,7 @@ GEM
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-core (3.13.4)
rspec-core (3.13.5)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.5)
diff-lcs (>= 1.2.0, < 2.0)
Expand All @@ -202,7 +204,7 @@ GEM
base64
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
zeitwerk (2.7.3)
zeitwerk (2.6.18)

PLATFORMS
universal-java-1.8
Expand Down
16 changes: 9 additions & 7 deletions gemfiles/rails72.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,17 @@ GEM
thor (>= 0.14.0)
base64 (0.3.0)
benchmark (0.4.1)
bigdecimal (3.2.1-java)
bigdecimal (3.2.2-java)
builder (3.3.0)
cgi (0.5.0-java)
concurrent-ruby (1.3.5)
connection_pool (2.5.3)
crass (1.0.6)
date (3.4.1-java)
diff-lcs (1.6.2)
drb (2.2.3)
erb (5.0.1-java)
erb (4.0.4-java)
cgi (>= 0.3.3)
erubi (1.13.1)
globalid (1.2.1)
activesupport (>= 6.1)
Expand All @@ -110,7 +112,7 @@ GEM
marcel (1.0.4)
mini_mime (1.1.5)
minitest (5.25.5)
net-imap (0.5.8)
net-imap (0.5.9)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -129,7 +131,7 @@ GEM
date
jar-dependencies (>= 0.1.7)
racc (1.8.1-java)
rack (2.2.16)
rack (2.2.17)
rack-session (1.0.2)
rack (< 3)
rack-test (2.2.0)
Expand Down Expand Up @@ -167,7 +169,7 @@ GEM
thor (~> 1.0, >= 1.2.2)
zeitwerk (~> 2.6)
rake (13.3.0)
rdoc (6.14.0)
rdoc (6.14.2)
erb
psych (>= 4.0.0)
reline (0.6.1)
Expand All @@ -176,7 +178,7 @@ GEM
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-core (3.13.4)
rspec-core (3.13.5)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.5)
diff-lcs (>= 1.2.0, < 2.0)
Expand All @@ -196,7 +198,7 @@ GEM
base64
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
zeitwerk (2.7.3)
zeitwerk (2.6.18)

PLATFORMS
universal-java-1.8
Expand Down
10 changes: 5 additions & 5 deletions gemfiles/rails80.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ GEM
thor (>= 0.14.0)
base64 (0.3.0)
benchmark (0.4.1)
bigdecimal (3.2.1-java)
bigdecimal (3.2.2-java)
builder (3.3.0)
concurrent-ruby (1.3.5)
connection_pool (2.5.3)
Expand Down Expand Up @@ -110,7 +110,7 @@ GEM
marcel (1.0.4)
mini_mime (1.1.5)
minitest (5.25.5)
net-imap (0.5.8)
net-imap (0.5.9)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -129,7 +129,7 @@ GEM
date
jar-dependencies (>= 0.1.7)
racc (1.8.1-java)
rack (2.2.16)
rack (2.2.17)
rack-session (1.0.2)
rack (< 3)
rack-test (2.2.0)
Expand Down Expand Up @@ -167,7 +167,7 @@ GEM
thor (~> 1.0, >= 1.2.2)
zeitwerk (~> 2.6)
rake (13.3.0)
rdoc (6.14.0)
rdoc (6.14.2)
erb
psych (>= 4.0.0)
reline (0.6.1)
Expand All @@ -176,7 +176,7 @@ GEM
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-core (3.13.4)
rspec-core (3.13.5)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.5)
diff-lcs (>= 1.2.0, < 2.0)
Expand Down
Loading