Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
Actor Framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
Actor Framework
Commits
0a3666fc
Commit
0a3666fc
authored
Jul 04, 2023
by
Samir Halilcevic
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Handle WebSocket control fames separately
parent
8ca1a8b9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
148 additions
and
15 deletions
+148
-15
libcaf_net/src/net/web_socket/framing.cpp
libcaf_net/src/net/web_socket/framing.cpp
+22
-15
libcaf_net/test/net/web_socket/framing.cpp
libcaf_net/test/net/web_socket/framing.cpp
+126
-0
No files found.
libcaf_net/src/net/web_socket/framing.cpp
View file @
0a3666fc
...
...
@@ -56,13 +56,25 @@ ptrdiff_t framing::consume(byte_span buffer, byte_span) {
if
(
hdr
.
mask_key
!=
0
)
{
detail
::
rfc6455
::
mask_data
(
hdr
.
mask_key
,
payload
);
}
if
(
hdr
.
fin
)
{
// Handle control frames first, since these may not me fragmented,
// and can come up in between regular message fragments
if
(
detail
::
rfc6455
::
is_control_frame
(
hdr
.
opcode
)
&&
hdr
.
opcode
!=
detail
::
rfc6455
::
continuation_frame
)
{
if
(
!
hdr
.
fin
)
{
abort_and_shutdown
(
sec
::
protocol_error
,
"received a fragmented WebSocket control message"
);
return
-
1
;
}
if
(
hdr
.
opcode
==
detail
::
rfc6455
::
connection_close
)
{
abort_and_shutdown
(
sec
::
connection_closed
);
return
-
1
;
}
else
if
(
!
handle
(
hdr
.
opcode
,
payload
))
{
return
-
1
;
}
}
else
if
(
hdr
.
fin
)
{
if
(
opcode_
==
nil_code
)
{
// Call upper layer.
if
(
hdr
.
opcode
==
detail
::
rfc6455
::
connection_close
)
{
abort_and_shutdown
(
sec
::
connection_closed
);
return
-
1
;
}
else
if
(
!
handle
(
hdr
.
opcode
,
payload
))
{
if
(
!
handle
(
hdr
.
opcode
,
payload
))
{
return
-
1
;
}
}
else
if
(
hdr
.
opcode
!=
detail
::
rfc6455
::
continuation_frame
)
{
...
...
@@ -76,18 +88,13 @@ ptrdiff_t framing::consume(byte_span buffer, byte_span) {
"exceeds maximum size"
);
return
-
1
;
}
else
{
if
(
hdr
.
opcode
==
detail
::
rfc6455
::
connection_close
)
{
abort_and_shutdown
(
sec
::
connection_closed
);
// End of fragmented input.
payload_buf_
.
insert
(
payload_buf_
.
end
(),
payload
.
begin
(),
payload
.
end
());
if
(
!
handle
(
opcode_
,
payload_buf_
))
{
return
-
1
;
}
else
{
// End of fragmented input.
payload_buf_
.
insert
(
payload_buf_
.
end
(),
payload
.
begin
(),
payload
.
end
());
if
(
!
handle
(
opcode_
,
payload_buf_
))
{
return
-
1
;
}
opcode_
=
nil_code
;
payload_buf_
.
clear
();
}
opcode_
=
nil_code
;
payload_buf_
.
clear
();
}
}
else
{
// The first frame must not be a continuation frame. Any frame that is not
...
...
libcaf_net/test/net/web_socket/framing.cpp
View file @
0a3666fc
...
...
@@ -6,6 +6,7 @@
#include "caf/net/web_socket/framing.hpp"
#include "caf/detail/rfc3629.hpp"
#include "net-test.hpp"
using
namespace
caf
;
...
...
@@ -32,6 +33,13 @@ struct fixture {
byte_buffer
make_test_data
(
size_t
requested_size
)
{
return
byte_buffer
{
requested_size
,
std
::
byte
{
0xFF
}};
}
auto
bytes
(
std
::
initializer_list
<
uint8_t
>
xs
)
{
byte_buffer
result
;
for
(
auto
x
:
xs
)
result
.
emplace_back
(
static_cast
<
std
::
byte
>
(
x
));
return
result
;
}
};
}
// namespace
...
...
@@ -162,4 +170,122 @@ SCENARIO("the client closes the connection with a closing handshake") {
}
}
SCENARIO
(
"the client sends a fragmented ping that fails the connection"
)
{
GIVEN
(
"a valid WebSocket connection"
)
{
std
::
vector
<
std
::
byte
>
ping_frame
;
WHEN
(
"the client sends the first frame of a fragmented ping message"
)
{
auto
data
=
make_test_data
(
10
);
detail
::
rfc6455
::
assemble_frame
(
detail
::
rfc6455
::
ping
,
0x0
,
data
,
ping_frame
,
0
);
transport
->
push
(
ping_frame
);
THEN
(
"the server aborts the application"
)
{
CHECK_EQ
(
transport
->
handle_input
(),
0
);
CHECK
(
app
->
has_aborted
());
CHECK_EQ
(
app
->
abort_reason
,
sec
::
protocol_error
);
MESSAGE
(
"Aborted with: "
<<
app
->
abort_reason
);
}
AND
(
"the server closes the connection with a protocol error"
)
{
detail
::
rfc6455
::
header
hdr
;
detail
::
rfc6455
::
decode_header
(
transport
->
output_buffer
(),
hdr
);
MESSAGE
(
"Buffer: "
<<
transport
->
output_buffer
());
CHECK_EQ
(
hdr
.
opcode
,
detail
::
rfc6455
::
connection_close
);
CHECK
(
hdr
.
payload_len
>=
2
);
auto
status
=
(
std
::
to_integer
<
int
>
(
transport
->
output_buffer
()[
2
])
<<
8
)
+
std
::
to_integer
<
int
>
(
transport
->
output_buffer
()[
3
]);
CHECK_EQ
(
status
,
static_cast
<
int
>
(
net
::
web_socket
::
status
::
protocol_error
));
}
}
}
}
SCENARIO
(
"the client sends a fragmented text message with a ping in-between"
)
{
GIVEN
(
"a valid WebSocket connection"
)
{
WHEN
(
"the client sends the first text frame, a ping, and the final text "
"frame at once"
)
{
std
::
vector
<
std
::
byte
>
input
;
auto
fragment1
=
"Hello"
sv
;
auto
fragment2
=
", world!"
sv
;
auto
data
=
as_bytes
(
make_span
(
fragment1
));
detail
::
rfc6455
::
assemble_frame
(
detail
::
rfc6455
::
text_frame
,
0x0
,
data
,
input
,
0
);
transport
->
push
(
input
);
input
.
clear
();
detail
::
rfc6455
::
assemble_frame
(
detail
::
rfc6455
::
ping
,
0x0
,
data
,
input
);
transport
->
push
(
input
);
input
.
clear
();
data
=
as_bytes
(
make_span
(
fragment2
));
detail
::
rfc6455
::
assemble_frame
(
detail
::
rfc6455
::
continuation_frame
,
0x0
,
data
,
input
);
transport
->
push
(
input
);
transport
->
handle_input
();
THEN
(
"the server responds with a pong"
)
{
detail
::
rfc6455
::
header
hdr
;
auto
hdr_len
=
detail
::
rfc6455
::
decode_header
(
transport
->
output_buffer
(),
hdr
);
MESSAGE
(
"Payload: "
<<
transport
->
output_buffer
());
CHECK_EQ
(
hdr_len
,
2u
);
CHECK
(
hdr
.
fin
);
CHECK_EQ
(
hdr
.
opcode
,
detail
::
rfc6455
::
pong
);
CHECK_EQ
(
hdr
.
payload_len
,
5u
);
CHECK_EQ
(
hdr
.
mask_key
,
0u
);
}
THEN
(
"the server receives the full text message"
)
{
CHECK_EQ
(
app
->
text_input
,
"Hello, world!"
sv
);
}
AND
(
"the client did not abort"
)
{
CHECK
(
!
app
->
has_aborted
());
}
}
}
}
SCENARIO
(
"the client sends an fragmented text message with a ping in-between "
"separated by octets"
)
{
GIVEN
(
"a valid WebSocket connection"
)
{
WHEN
(
"the client sends the first text frame, a ping, and then the final "
"text frame separately"
)
{
auto
fragment1
=
"Hello"
sv
;
auto
fragment2
=
", world!"
sv
;
std
::
vector
<
std
::
byte
>
input
;
auto
data
=
as_bytes
(
make_span
(
fragment1
));
detail
::
rfc6455
::
assemble_frame
(
detail
::
rfc6455
::
text_frame
,
0x0
,
data
,
input
,
0
);
transport
->
push
(
input
);
transport
->
handle_input
();
THEN
(
"the server receives nothing"
)
{
CHECK
(
app
->
text_input
.
empty
());
CHECK
(
app
->
binary_input
.
empty
());
}
input
.
clear
();
detail
::
rfc6455
::
assemble_frame
(
detail
::
rfc6455
::
ping
,
0x0
,
data
,
input
);
transport
->
push
(
input
);
transport
->
handle_input
();
THEN
(
"the server responds with a pong"
)
{
detail
::
rfc6455
::
header
hdr
;
auto
hdr_len
=
detail
::
rfc6455
::
decode_header
(
transport
->
output_buffer
(),
hdr
);
CHECK_EQ
(
hdr_len
,
2u
);
CHECK
(
hdr
.
fin
);
CHECK_EQ
(
hdr
.
opcode
,
detail
::
rfc6455
::
pong
);
CHECK_EQ
(
hdr
.
payload_len
,
5u
);
CHECK_EQ
(
hdr
.
mask_key
,
0u
);
}
input
.
clear
();
data
=
as_bytes
(
make_span
(
fragment2
));
detail
::
rfc6455
::
assemble_frame
(
detail
::
rfc6455
::
continuation_frame
,
0x0
,
data
,
input
);
transport
->
push
(
input
);
transport
->
handle_input
();
THEN
(
"the server receives the full text message"
)
{
CHECK_EQ
(
app
->
text_input
,
"Hello, world!"
sv
);
}
AND
(
"the client did not abort"
)
{
CHECK
(
!
app
->
has_aborted
());
}
}
}
}
END_FIXTURE_SCOPE
()
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment