forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix #245

This commit is contained in:
Adam D. Ruppe 2020-03-18 11:00:39 -04:00
parent a27d4ba66a
commit 40837ffeed
1 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
cgi.d
View File

@ -3975,12 +3975,13 @@ class BufferedInputRange {
// we might have to grow the buffer // we might have to grow the buffer
if(minBytesToSettleFor > underlyingBuffer.length || view.length == underlyingBuffer.length) { if(minBytesToSettleFor > underlyingBuffer.length || view.length == underlyingBuffer.length) {
if(allowGrowth) { if(allowGrowth) {
import std.stdio; writeln("growth"); //import std.stdio; writeln("growth");
auto viewStart = view.ptr - underlyingBuffer.ptr; auto viewStart = view.ptr - underlyingBuffer.ptr;
size_t growth = 4096; size_t growth = 4096;
// make sure we have enough for what we're being asked for // make sure we have enough for what we're being asked for
if(minBytesToSettleFor - underlyingBuffer.length > growth) if(minBytesToSettleFor > 0 && minBytesToSettleFor - underlyingBuffer.length > growth)
growth = minBytesToSettleFor - underlyingBuffer.length; growth = minBytesToSettleFor - underlyingBuffer.length;
//import std.stdio; writeln(underlyingBuffer.length, " ", viewStart, " ", view.length, " ", growth, " ", minBytesToSettleFor, " ", minBytesToSettleFor - underlyingBuffer.length);
underlyingBuffer.length += growth; underlyingBuffer.length += growth;
view = underlyingBuffer[viewStart .. view.length]; view = underlyingBuffer[viewStart .. view.length];
} else } else
@ -4762,6 +4763,7 @@ version(cgi_with_websocket) {
} }
struct WebSocketMessage { struct WebSocketMessage {
private bool populated;
bool fin; bool fin;
bool rsv1; bool rsv1;
bool rsv2; bool rsv2;
@ -4861,20 +4863,23 @@ version(cgi_with_websocket) {
cgi.flush(); cgi.flush();
} }
static WebSocketMessage read(BufferedInputRange ir) { static WebSocketMessage read(ref ubyte[] d) {
auto d = ir.front();
while(d.length < 2) {
ir.popFront();
d = ir.front();
}
auto start = d;
WebSocketMessage msg; WebSocketMessage msg;
assert(d.length >= 2);
auto orig = d;
WebSocketMessage needsMoreData() {
d = orig;
return WebSocketMessage.init;
}
if(d.length < 2)
return needsMoreData();
ubyte b = d[0]; ubyte b = d[0];
msg.populated = true;
msg.opcode = cast(WebSocketOpcode) (b & 0x0f); msg.opcode = cast(WebSocketOpcode) (b & 0x0f);
b >>= 4; b >>= 4;
msg.rsv3 = b & 0x01; msg.rsv3 = b & 0x01;
@ -4895,6 +4900,8 @@ version(cgi_with_websocket) {
// 16 bit length // 16 bit length
msg.realLength = 0; msg.realLength = 0;
if(d.length < 2) return needsMoreData();
foreach(i; 0 .. 2) { foreach(i; 0 .. 2) {
msg.realLength |= d[0] << ((1-i) * 8); msg.realLength |= d[0] << ((1-i) * 8);
d = d[1 .. $]; d = d[1 .. $];
@ -4903,6 +4910,8 @@ version(cgi_with_websocket) {
// 64 bit length // 64 bit length
msg.realLength = 0; msg.realLength = 0;
if(d.length < 8) return needsMoreData();
foreach(i; 0 .. 8) { foreach(i; 0 .. 8) {
msg.realLength |= d[0] << ((7-i) * 8); msg.realLength |= d[0] << ((7-i) * 8);
d = d[1 .. $]; d = d[1 .. $];
@ -4913,13 +4922,17 @@ version(cgi_with_websocket) {
} }
if(msg.masked) { if(msg.masked) {
if(d.length < 4) return needsMoreData();
msg.maskingKey = d[0 .. 4]; msg.maskingKey = d[0 .. 4];
d = d[4 .. $]; d = d[4 .. $];
} }
//if(d.length < msg.realLength) { if(msg.realLength > d.length) {
return needsMoreData();
}
//}
msg.data = d[0 .. cast(size_t) msg.realLength]; msg.data = d[0 .. cast(size_t) msg.realLength];
d = d[cast(size_t) msg.realLength .. $]; d = d[cast(size_t) msg.realLength .. $];
@ -4935,11 +4948,20 @@ version(cgi_with_websocket) {
} }
} }
ir.consume(start.length - d.length);
return msg; return msg;
} }
static WebSocketMessage read(BufferedInputRange ir) {
readmore:
auto d = ir.front();
auto m = read(d);
if(m is WebSocketMessage.init) {
ir.popFront();
goto readmore;
}
return m;
}
char[] textData() { char[] textData() {
return cast(char[]) data; return cast(char[]) data;
} }