jruby extension

.github/workflows/ci.yml

@@ -46,3 +46,15 @@ jobs:
           bundler-cache: true
       - run: bundle exec rake compile
       - run: bundle exec rake test
+
+  jruby:
+    name: ubuntu-latest ruby jruby
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: jruby
+          bundler-cache: true
+      - run: bundle exec rake compile:java
+      - run: bundle exec rake test

.gitignore

@@ -1,4 +1,5 @@
-lib/
+lib/*.jar
+lib/*.so
 pkg/
 tmp/
 Gemfile.lock

Rakefile

@@ -2,12 +2,17 @@ require 'rake/testtask'
 require 'rubygems/package_task'
 require 'bundler/gem_tasks'
 require 'rake/extensiontask'
+begin
+  require 'rake/javaextensiontask'
+rescue LoadError
+end
 require 'rake/clean'
 require 'rdoc/task'
 require 'benchmark'
 require 'rake_compiler_dock'
 
 CLEAN.add("{ext,lib}/**/*.{o,so}", "pkg")
+CLEAN.add("{ext,lib}/**/*.{jar,class}")
 
 cross_rubies = ["3.4.0", "3.3.0", "3.2.0", "3.1.0", "3.0.0", "2.7.0"]
 cross_platforms = [
@@ -41,11 +46,23 @@ RDoc::Task.new do |rdoc|
   rdoc.rdoc_files.include(*GEMSPEC.extra_rdoc_files)
 end
 
-Rake::ExtensionTask.new("bcrypt_pbkdf_ext", GEMSPEC) do |ext|
-  ext.ext_dir = 'ext/mri'
-  ext.cross_compile = true
-  ext.cross_platform = cross_platforms
-  ext.cross_config_options << "--enable-cross-build" # so extconf.rb knows we're cross-compiling
+unless RUBY_PLATFORM == 'java'
+  Rake::ExtensionTask.new("bcrypt_pbkdf_ext", GEMSPEC) do |ext|
+    ext.ext_dir = 'ext/mri'
+    ext.cross_compile = true
+    ext.cross_platform = cross_platforms
+    ext.cross_config_options << "--enable-cross-build" # so extconf.rb knows we're cross-compiling
+  end
+end
+
+if defined?(Rake::JavaExtensionTask)
+  Rake::JavaExtensionTask.new("bcrypt_pbkdf_ext", GEMSPEC) do |ext|
+    ext.ext_dir = 'ext/jruby'
+    ext.source_pattern = '**/*.java'
+    ext.source_version = '8'
+    ext.target_version = '8'
+    ext.lint_option = '-options'
+  end
 end
 
 namespace "gem" do
@@ -73,6 +90,12 @@ namespace "gem" do
     end
   end
 
+  desc "build java gem for JRuby"
+  task "java" do
+    Rake::Task["java:#{GEMSPEC.name}"].invoke
+    Rake::Task["pkg/#{GEMSPEC.full_name}-java.gem"].invoke
+  end
+
   desc "build native gem for all platforms"
   task "all" do
     cross_platforms.each do |platform|

ext/jruby/org/netssh/bcrypt_pbkdf/BCryptPbkdfExt.java

@@ -0,0 +1,47 @@
+package org.netssh.bcrypt_pbkdf;
+
+import org.jcodings.specific.ASCIIEncoding;
+import org.jruby.Ruby;
+import org.jruby.RubyClass;
+import org.jruby.RubyModule;
+import org.jruby.RubyNumeric;
+import org.jruby.RubyString;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+
+public final class BCryptPbkdfExt {
+
+  public static void load(final Ruby runtime) {
+    RubyModule bcryptPbkdf = runtime.getOrCreateModule("BCryptPbkdf");
+    RubyClass engine = bcryptPbkdf.defineOrGetClassUnder("Engine", runtime.getObject());
+    engine.getSingletonClass().defineAnnotatedMethods(BCryptPbkdfExt.class);
+  }
+
+  @JRubyMethod(required = 4, rest = true)
+  public static IRubyObject __bc_crypt_pbkdf(ThreadContext context, IRubyObject self, IRubyObject[] args) {
+    byte[] key = BCryptPbkdf.cryptPbkdf(
+            stringToBytes(args[0]),
+            stringToBytes(args[1]),
+            RubyNumeric.num2int(args[2]),
+            RubyNumeric.num2int(args[3]));
+    if (key == null) return context.nil;
+    return newString(context.runtime, key);
+  }
+
+
+  @JRubyMethod(required = 2, rest = true)
+  public static IRubyObject __bc_crypt_hash(ThreadContext context, IRubyObject self, IRubyObject[] args) {
+    byte[] out = BCryptPbkdf.cryptHash(stringToBytes(args[0]), stringToBytes(args[1]));
+    if (out == null) return context.nil;
+    return newString(context.runtime, out);
+  }
+
+  private static byte[] stringToBytes(final IRubyObject value) {
+    return value.convertToString().getBytes();
+  }
+
+  private static RubyString newString(final Ruby runtime, final byte[] bytes) {
+    return RubyString.newString(runtime, bytes, 0, bytes.length, ASCIIEncoding.INSTANCE);
+  }
+}

lib/bcrypt_pbkdf.rb

@@ -1,8 +1,13 @@
-begin
-  RUBY_VERSION =~ /(\d+.\d+)/
-  require "#{$1}/bcrypt_pbkdf_ext"
-rescue LoadError
-  require "bcrypt_pbkdf_ext"
+if RUBY_PLATFORM == 'java'
+  load File.expand_path('bcrypt_pbkdf_ext.jar', __dir__)
+  JRuby::Util.load_ext('org.netssh.bcrypt_pbkdf.BCryptPbkdfExt')
+else
+  begin
+    RUBY_VERSION =~ /(\d+.\d+)/
+    require "#{$1}/bcrypt_pbkdf_ext"
+  rescue LoadError
+    require "bcrypt_pbkdf_ext"
+  end
 end
 
 module BCryptPbkdf
@@ -21,4 +26,3 @@ def self.key(pass,salt,keylen,rounds)
     BCryptPbkdf::Engine::__bc_crypt_pbkdf(pass,salt,keylen,rounds)
   end
 end
-

test/bcrypt_pnkdf/engine_test.rb

@@ -65,6 +65,22 @@ def test_ruby_and_native_returns_the_same
     end
   end
 
+  def test_invalid_pbkdf_arguments_return_nil
+    assert_nil BCryptPbkdf::Engine.__bc_crypt_pbkdf('', 'salt', 14, 1)
+    assert_nil BCryptPbkdf::Engine.__bc_crypt_pbkdf('pass', '', 14, 1)
+    assert_nil BCryptPbkdf::Engine.__bc_crypt_pbkdf('pass', 'salt', 0, 1)
+    assert_nil BCryptPbkdf::Engine.__bc_crypt_pbkdf('pass', 'salt', 14, 0)
+    assert_nil BCryptPbkdf::Engine.__bc_crypt_pbkdf('pass', 'salt', 1025, 1)
+  end
+
+  def test_hash_argument_lengths
+    sha2pass = OpenSSL::Digest.digest('SHA512', 'pass')
+    sha2salt = OpenSSL::Digest.digest('SHA512', 'salt')
+
+    assert_equal BCRYPT_HASHSIZE, BCryptPbkdf::Engine.__bc_crypt_hash(sha2pass, sha2salt).bytesize
+    assert_nil BCryptPbkdf::Engine.__bc_crypt_hash(sha2pass.byteslice(0, 63), sha2salt)
+    assert_nil BCryptPbkdf::Engine.__bc_crypt_hash(sha2pass, sha2salt.byteslice(0, 63))
+  end
 
   def table
     [