SSLSocket write and non-block fixes #354
+573
−29
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| package org.jruby.ext.openssl; | ||
|
|
||
| import org.jruby.Ruby; | ||
| import org.jruby.runtime.ThreadContext; | ||
|
|
||
| import java.io.ByteArrayOutputStream; | ||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.nio.charset.StandardCharsets; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
| import static org.junit.Assert.assertTrue; | ||
|
|
||
| abstract class OpenSSLHelper { | ||
|
|
||
| protected Ruby runtime; | ||
|
|
||
| void setUpRuntime() throws ClassNotFoundException { | ||
| runtime = Ruby.newInstance(); | ||
| loadOpenSSL(runtime); | ||
| } | ||
|
|
||
| void tearDownRuntime() { | ||
| if (runtime != null) runtime.tearDown(false); | ||
| } | ||
|
|
||
| protected void loadOpenSSL(final Ruby runtime) throws ClassNotFoundException { | ||
| // prepend lib/ so openssl.rb + jopenssl/ are loaded instead of bundled OpenSSL in jruby-stdlib | ||
| final String libDir = new File("lib").getAbsolutePath(); | ||
| runtime.evalScriptlet("$LOAD_PATH.unshift '" + libDir + "'"); | ||
| runtime.evalScriptlet("require 'openssl'"); | ||
|
|
||
| // sanity: verify openssl was loaded from the project, not jruby-stdlib : | ||
| final String versionFile = new File(libDir, "jopenssl/version.rb").getAbsolutePath(); | ||
| final String expectedVersion = runtime.evalScriptlet( | ||
| "File.read('" + versionFile + "').match( /.*\\sVERSION\\s*=\\s*['\"](.*)['\"]/ )[1]") | ||
| .toString(); | ||
| final String loadedVersion = runtime.evalScriptlet("JOpenSSL::VERSION").toString(); | ||
| assertEquals("OpenSSL must be loaded from project (got version " + loadedVersion + | ||
| "), not from jruby-stdlib", expectedVersion, loadedVersion); | ||
|
|
||
| // Also check the Java extension classes were resolved from the project, not jruby-stdlib : | ||
| final String classOrigin = runtime.getJRubyClassLoader() | ||
| .loadClass("org.jruby.ext.openssl.OpenSSL") | ||
| .getProtectionDomain().getCodeSource().getLocation().toString(); | ||
| assertTrue("OpenSSL.class (via JRuby classloader) come from project, got: " + classOrigin, | ||
| classOrigin.endsWith("/pkg/classes/")); | ||
| } | ||
|
|
||
| // HELPERS | ||
|
|
||
| public ThreadContext currentContext() { | ||
| return runtime.getCurrentContext(); | ||
| } | ||
|
|
||
| public static String readResource(final String resource) { | ||
| int n; | ||
| try (InputStream in = SSLSocketTest.class.getResourceAsStream(resource)) { | ||
| if (in == null) throw new IllegalArgumentException(resource + " not found on classpath"); | ||
|
|
||
| ByteArrayOutputStream out = new ByteArrayOutputStream(); | ||
| byte[] buf = new byte[8192]; | ||
| while ((n = in.read(buf)) != -1) out.write(buf, 0, n); | ||
| return new String(out.toByteArray(), StandardCharsets.UTF_8); | ||
| } catch (IOException e) { | ||
| throw new IllegalStateException("failed to load" + resource, e); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it necessary to duplicate EMPTY_DATA? It is already zero-length and marked as read-only.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
shouldn't be, except
engine.wrapin theory does setlimitalthough likely not on an empty buffer.