Add support for Ruby 3.3 #18668
Add support for Ruby 3.3 #18668
Conversation
adfoster-r7
force-pushed
the
add-support-for-ruby-3.3
branch
from
18ebc19 to
e9b7029
Compare
| @@ -83,8 +83,7 @@ Gem::Specification.new do |spec| | |||
| # NTLM authentication | |||
| spec.add_runtime_dependency 'rubyntlm' | |||
| # Needed by anemone crawler | |||
| # Locked until build env can handle newer version due to native compile issue in 1.15.x | |||
| spec.add_runtime_dependency 'nokogiri', '~> 1.14.0' | |||
| spec.add_runtime_dependency 'nokogiri' | |||
There was a problem hiding this comment.
Nokogiri v16 is required for Ruby 3.3 support
But it looks like this was pinned previously by #18103 when there were issues with compiling the nightly omnibus installers with older. Before we merge this, we'll need to manually rebuild the omnibus installer to see if the previous issues are resolved or not, as it looks like some changes have been made to how they handle libxml
adfoster-r7
force-pushed
the
add-support-for-ruby-3.3
branch
2 times, most recently
from
ddfe6db to
f51af88
Compare
| @@ -495,7 +495,7 @@ GEM | |||
| rack (~> 2.2, >= 2.2.4) | |||
| rack-protection (= 3.1.0) | |||
| tilt (~> 2.0) | |||
| sqlite3 (1.6.6) | |||
| sqlite3 (1.7.0) | |||
There was a problem hiding this comment.
Bump required for Ruby 3.3 support
adfoster-r7
force-pushed
the
add-support-for-ruby-3.3
branch
5 times, most recently
from
279b183 to
d728419
Compare
| @@ -70,7 +72,9 @@ def generate(_opts = {}) | |||
| shellcode = shellcode + command_string + "\x00" | |||
|
|
|||
| # we need to align our shellcode to 4 bytes | |||
| (shellcode = shellcode + "\x00") while shellcode.length%4 != 0 | |||
There was a problem hiding this comment.
Bit of a weird behaviour change here between ruby versions:
shellcode = ""
(shellcode = shellcode + "\x00") while shellcode.bytesize%4 != 0
puts RUBY_DESCRIPTION
puts shellcode.bytesizeRuby 3.0:
$ ruby foo.rb
ruby 3.0.2p107 (2021-07-07 revision 0db68f0233) [x86_64-darwin20]
0
Ruby 3.3:
$ ruby foo.rb
ruby 3.3.0 (2023-12-25 revision 5124f9ac75) [x86_64-darwin22]
4
There was a problem hiding this comment.
Looks like this is fixed in the head of Ruby now; Will leave it as-is
adfoster-r7
force-pushed
the
add-support-for-ruby-3.3
branch
2 times, most recently
from
e5f67f6 to
7901125
Compare
|
This is blocked until Nokogiri 1.16.1 is released with this GCC fix for omnibus installer sparklemotion/nokogiri#3090 |
adfoster-r7
force-pushed
the
add-support-for-ruby-3.3
branch
2 times, most recently
from
5b8d5f3 to
0f67182
Compare
adfoster-r7
force-pushed
the
add-support-for-ruby-3.3
branch
from
0f67182 to
458606f
Compare
|
I've split this PR up into smaller groups; should be able to close this now 👍 |
Adds support for Ruby 3.3
Verification
Ensure that CI passes