kotovalexarian-likes-github/puma--puma
1
0
Fork 0
mirror of https://github.com/puma/puma.git synced 2022-11-09 13:48:40 -05:00
Code Releases Activity

[jruby] a couple refactorings - avoid copy-ing bytes (#2730)

Browse source 
* [jruby][refactor] avoid byte[] copy-ing

* [jruby][refactor] proper ASCII string creation

* [jruby][refactor] drop unused KeyStore instances

* [jruby][refactor] review exception handling (catch less)

* [jruby][refactor] no need to copy local byte[] array
This commit is contained in:
Karol Bucek 2021-11-01 22:23:37 +01:00 • committed by GitHub
parent 5608248c13
commit 66962e4c18
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
ext/puma_http11/org/jruby/puma/MiniSSL.java
View file

@ -6,6 +6,7 @@ import org.jruby.RubyModule;
import org.jruby.RubyObject;
import org.jruby.RubyString;
import org.jruby.anno.JRubyMethod;
import org.jruby.exceptions.RaiseException;
import org.jruby.javasupport.JavaEmbedUtils;
import org.jruby.runtime.Block;
import org.jruby.runtime.ObjectAllocator;
@ -80,11 +81,11 @@ public class MiniSSL extends RubyObject {
/**
* Writes bytes to the buffer after ensuring there's room
*/
public void put(byte[] bytes) {
if (buffer.remaining() < bytes.length) {
resize(buffer.limit() + bytes.length);
private void put(byte[] bytes, final int offset, final int length) {
if (buffer.remaining() < length) {
resize(buffer.limit() + length);
}
buffer.put(bytes);
buffer.put(bytes, offset, length);
}
/**
@ -115,7 +116,7 @@ public class MiniSSL extends RubyObject {
buffer.get(bss);
buffer.clear();
return new ByteList(bss);
return new ByteList(bss, false);
}
@Override
@ -174,8 +175,6 @@ public class MiniSSL extends RubyObject {
@JRubyMethod
public IRubyObject initialize(ThreadContext threadContext, IRubyObject miniSSLContext)
throws KeyStoreException, NoSuchAlgorithmException, KeyManagementException {
KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
KeyStore ts = KeyStore.getInstance(KeyStore.getDefaultType());
String keystoreFile = miniSSLContext.callMethod(threadContext, "keystore").convertToString().asJavaString();
KeyManagerFactory kmf = keyManagerFactoryMap.get(keystoreFile);
@ -230,14 +229,9 @@ public class MiniSSL extends RubyObject {
@JRubyMethod
public IRubyObject inject(IRubyObject arg) {
try {
byte[] bytes = arg.convertToString().getBytes();
inboundNetData.put(bytes);
return this;
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException(e);
}
ByteList bytes = arg.convertToString().getByteList();
inboundNetData.put(bytes.unsafeBytes(), bytes.getBegin(), bytes.getRealSize());
return this;
}
private enum SSLOperation {
@ -297,7 +291,7 @@ public class MiniSSL extends RubyObject {
}
@JRubyMethod
public IRubyObject read() throws Exception {
public IRubyObject read() {
try {
inboundNetData.flip();
@ -342,55 +336,46 @@ public class MiniSSL extends RubyObject {
return getRuntime().getNil();
}
RubyString str = getRuntime().newString("");
str.setValue(appDataByteList);
return str;
} catch (Exception e) {
throw getRuntime().newEOFError(e.getMessage());
return RubyString.newString(getRuntime(), appDataByteList);
} catch (SSLException e) {
RaiseException re = getRuntime().newEOFError(e.getMessage());
re.initCause(e);
throw re;
}
}
@JRubyMethod
public IRubyObject write(IRubyObject arg) {
try {
byte[] bls = arg.convertToString().getBytes();
outboundAppData = new MiniSSLBuffer(bls);
byte[] bls = arg.convertToString().getBytes();
outboundAppData = new MiniSSLBuffer(bls);
return getRuntime().newFixnum(bls.length);
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException(e);
}
return getRuntime().newFixnum(bls.length);
}
@JRubyMethod
public IRubyObject extract() throws SSLException {
public IRubyObject extract(ThreadContext context) {
try {
ByteList dataByteList = outboundNetData.asByteList();
if (dataByteList != null) {
RubyString str = getRuntime().newString("");
str.setValue(dataByteList);
return str;
return RubyString.newString(context.runtime, dataByteList);
}
if (!outboundAppData.hasRemaining()) {
return getRuntime().getNil();
return context.nil;
}
outboundNetData.clear();
doOp(SSLOperation.WRAP, outboundAppData, outboundNetData);
dataByteList = outboundNetData.asByteList();
if (dataByteList == null) {
return getRuntime().getNil();
return context.nil;
}
RubyString str = getRuntime().newString("");
str.setValue(dataByteList);
return str;
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException(e);
return RubyString.newString(context.runtime, dataByteList);
} catch (SSLException e) {
RaiseException ex = context.runtime.newRuntimeError(e.toString());
ex.initCause(e);
throw ex;
}
}
@ -398,7 +383,7 @@ public class MiniSSL extends RubyObject {
public IRubyObject peercert() throws CertificateEncodingException {
try {
return JavaEmbedUtils.javaToRuby(getRuntime(), engine.getSession().getPeerCertificates()[0].getEncoded());
} catch (SSLPeerUnverifiedException ex) {
} catch (SSLPeerUnverifiedException e) {
return getRuntime().getNil();
}
}