Change in openvpn[master]: Allow trailing \r and \n in control channel message
A message that is not in the archive (sent off-list or not yet received): gerrit.1720433364000.I47c992b6b73b1475cbff8a28f720cf50dc1fbe3e@...2715...
Attention is currently required from: flichtenheld.
Hello flichtenheld,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/672?usp=email
to review the following change.
Change subject: Allow trailing \r and \n in control channel message
......................................................................
Allow trailing \r and \n in control channel message
Writing a reason from a script will easily end up adding extra \r\n characters at the end of the reason. Our current code pushes this to the peer. So be more liberal in accepting these message.
Closes openvpn/openvpn#568
Change-Id: I47c992b6b73b1475cbff8a28f720cf50dc1fbe3e
---
M src/openvpn/forward.c
1 file changed, 14 insertions(+), 6 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/72/672/1
src/openvpn/forward.c +14 -6
@@ -290,7 +290,6 @@struct buffer buf =alloc_buf_gc (len, &gc);if (tls_rec_payload (c->c2.tls_multi, &buf)) { -while (BLEN (&buf) >1 ) {/* commands on the control channel are seperated by 0x00 bytes.
@@ -300,19 +299,28 @@if (cmdlen <BLEN (&buf)) {/* include the NUL byte and ensure NUL termination */ -int cmdlen = (int )strlen (BSTR (&buf)) +1 ; +int buflen = (int )strlen (BSTR (&buf)) +1 ;/* Construct a buffer that only holds the current command and * its closing NUL byte */ -struct buffer cmdbuf =alloc_buf_gc (cmdlen, &gc); -buf_write (&cmdbuf,BPTR (&buf), cmdlen); +struct buffer cmdbuf =alloc_buf_gc (buflen, &gc); +buf_write (&cmdbuf,BPTR (&buf), buflen); + +/* Remove \r and \n at the end of the buffer to avoid +* problems with scripts and other that add extra \r and \n */ +while (BLEN (&cmdbuf) + && (*(BEND (&cmdbuf) -2 ) =='\r' || *(BEND (&cmdbuf) -2 )=='\n' )) + { + *(BEND (&cmdbuf) -2 ) ='\0' ; +buf_inc_len (&cmdbuf,-1 ); + }/* check we have only printable characters or null byte in the * command string and no newlines */ -if (!string_check_buf (&buf,CC_PRINT |CC_NULL ,CC_CRLF )) +if (!string_check_buf (&cmdbuf,CC_PRINT |CC_NULL ,CC_CRLF )) {msg (D_PUSH_ERRORS ,"WARNING: Received control with invalid characters: %s" , -format_hex (BPTR (&buf),BLEN (&buf),256 , &gc)); +format_hex (BPTR (&buf),BLEN (&cmdbuf),256 , &gc)); }else {
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/672?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I47c992b6b73b1475cbff8a28f720cf50dc1fbe3e
Gerrit-Change-Number: 672
Gerrit-PatchSet: 1
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newchange
Attention is currently required from: plaisthos.
flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/672?usp=email )
Change subject: Allow trailing \r and \n in control channel message
......................................................................
Patch Set 1: Code-Review-1
(1 comment)
File src/openvpn/forward.c:
http://gerrit.openvpn.net/c/openvpn/+/672/comment/f61c55e2_9b297160 :
PS1, Line 309: /* Remove \r and \n at the end of the buffer to avoid
Why can't you use buf_chomp?
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/672?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I47c992b6b73b1475cbff8a28f720cf50dc1fbe3e
Gerrit-Change-Number: 672
Gerrit-PatchSet: 1
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Comment-Date: Mon, 08 Jul 2024 11:14:41 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld.
plaisthos has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/672?usp=email )
Change subject: Allow trailing \r and \n in control channel message
......................................................................
Patch Set 1:
(1 comment)
File src/openvpn/forward.c:
http://gerrit.openvpn.net/c/openvpn/+/672/comment/ab73eb7e_71ef24b3 :
PS1, Line 309: /* Remove \r and \n at the end of the buffer to avoid
Quoted 1 line
Why can't you use
buf_chomp?
I can. I missed that there is a buf_chomp. I looked for buf_trim buf_rtrim or similar.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/672?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I47c992b6b73b1475cbff8a28f720cf50dc1fbe3e
Gerrit-Change-Number: 672
Gerrit-PatchSet: 1
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Mon, 08 Jul 2024 16:16:19 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: flichtenheld <[email protected]...>
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld.
Hello flichtenheld,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/672?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Code-Review-1 by flichtenheld
Change subject: Allow trailing \r and \n in control channel message
......................................................................
Allow trailing \r and \n in control channel message
Writing a reason from a script will easily end up adding extra \r\n characters at the end of the reason. Our current code pushes this to the peer. So be more liberal in accepting these message.
Closes openvpn/openvpn#568
---
M src/openvpn/forward.c
1 file changed, 9 insertions(+), 6 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/72/672/2
src/openvpn/forward.c +9 -6
@@ -290,7 +290,6 @@struct buffer buf =alloc_buf_gc (len, &gc);if (tls_rec_payload (c->c2.tls_multi, &buf)) { -while (BLEN (&buf) >1 ) {/* commands on the control channel are seperated by 0x00 bytes.
@@ -300,19 +299,23 @@if (cmdlen <BLEN (&buf)) {/* include the NUL byte and ensure NUL termination */ -int cmdlen = (int )strlen (BSTR (&buf)) +1 ; +int buflen = (int )strlen (BSTR (&buf)) +1 ;/* Construct a buffer that only holds the current command and * its closing NUL byte */ -struct buffer cmdbuf =alloc_buf_gc (cmdlen, &gc); -buf_write (&cmdbuf,BPTR (&buf), cmdlen); +struct buffer cmdbuf =alloc_buf_gc (buflen, &gc); +buf_write (&cmdbuf,BPTR (&buf), buflen); + +/* Remove \r and \n at the end of the buffer to avoid +* problems with scripts and other that add extra \r and \n */ +buf_chomp (&cmdbuf);/* check we have only printable characters or null byte in the * command string and no newlines */ -if (!string_check_buf (&buf,CC_PRINT |CC_NULL ,CC_CRLF )) +if (!string_check_buf (&cmdbuf,CC_PRINT |CC_NULL ,CC_CRLF )) {msg (D_PUSH_ERRORS ,"WARNING: Received control with invalid characters: %s" , -format_hex (BPTR (&buf),BLEN (&buf),256 , &gc)); +format_hex (BPTR (&buf),BLEN (&cmdbuf),256 , &gc)); }else {
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/672?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I47c992b6b73b1475cbff8a28f720cf50dc1fbe3e
Gerrit-Change-Number: 672
Gerrit-PatchSet: 2
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: plaisthos.
flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/672?usp=email )
Change subject: Allow trailing \r and \n in control channel message
......................................................................
Patch Set 2: Code-Review-1
(2 comments)
Patchset:
PS2:
I must say that I would feel better if we had a UT covering all this. Not sure how difficult that would be?
File src/openvpn/forward.c:
http://gerrit.openvpn.net/c/openvpn/+/672/comment/9a73fe6c_d79f0ee2 :
PS2, Line 318: format_hex(BPTR(&buf), BLEN(&cmdbuf), 256, &gc));
While it is not actually wrong to use BPTR(&buf) here, I would recommend BPTR(&cmdbuf). It should make no difference to the output and looks less like an error.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/672?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I47c992b6b73b1475cbff8a28f720cf50dc1fbe3e
Gerrit-Change-Number: 672
Gerrit-PatchSet: 2
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Comment-Date: Mon, 08 Jul 2024 16:32:44 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld, plaisthos.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/672?usp=email )
Change subject: Allow trailing \r and \n in control channel message
......................................................................
Patch Set 2: Code-Review-1
(3 comments)
Patchset:
PS2:
getting close
File src/openvpn/forward.c:
http://gerrit.openvpn.net/c/openvpn/+/672/comment/fbe5364d_eb37f3f4 :
PS2, Line 302: int buflen = (int)strlen(BSTR(&buf)) + 1;
While this is besser than the original, I find it still confusing to call strlen() twice on the very same string, in direct sequence. What's wrong with int buflen = cmdlen +1;...?
http://gerrit.openvpn.net/c/openvpn/+/672/comment/46ed5072_d7aeafa2 :
PS2, Line 318: format_hex(BPTR(&buf), BLEN(&cmdbuf), 256, &gc));
Quoted 1 line
While it is not actually wrong to use
BPTR(&buf)here, I would recommendBPTR(&cmdbuf). […]
It is "not wrong today", but this sort of booby trap will come back and bite us later - so this should both be &cmdbuf if that's the buffer we have looked at (especially with new code in the pipeline that might handle multiple commands in a single TLS record etc)
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/672?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I47c992b6b73b1475cbff8a28f720cf50dc1fbe3e
Gerrit-Change-Number: 672
Gerrit-PatchSet: 2
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Mon, 08 Jul 2024 19:27:55 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: flichtenheld <[email protected]...>
Gerrit-MessageType: comment
Attention is currently required from: cron2, flichtenheld, plaisthos.
Hello cron2, flichtenheld,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/672?usp=email
to look at the new patch set (#3).
The following approvals got outdated and were removed:
Code-Review-1 by cron2, Code-Review-1 by flichtenheld
Change subject: Allow trailing \r and \n in control channel message
......................................................................
Allow trailing \r and \n in control channel message
Writing a reason from a script will easily end up adding extra \r\n characters at the end of the reason. Our current code pushes this to the peer. So be more liberal in accepting these message.
Closes openvpn/openvpn#568
---
M src/openvpn/forward.c
M src/openvpn/ssl_pkt.c
M src/openvpn/ssl_pkt.h
M tests/unit_tests/openvpn/test_pkt.c
4 files changed, 92 insertions(+), 30 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/72/672/3
src/openvpn/forward.c +3 -30
@@ -290,41 +290,14 @@struct buffer buf =alloc_buf_gc (len, &gc);if (tls_rec_payload (c->c2.tls_multi, &buf)) { -while (BLEN (&buf) >1 ) { -/* commands on the control channel are seperated by 0x00 bytes. -* cmdlen does not include the 0 byte of the string */ -int cmdlen = (int )strnlen (BSTR (&buf),BLEN (&buf)); +struct buffer cmdbuf =extract_command_buffer (buf, &gc); -if (cmdlen <BLEN (&buf)) +if (cmdbuf.len >0 ) { -/* include the NUL byte and ensure NUL termination */ -int cmdlen = (int )strlen (BSTR (&buf)) +1 ; - -/* Construct a buffer that only holds the current command and -* its closing NUL byte */ -struct buffer cmdbuf =alloc_buf_gc (cmdlen, &gc); -buf_write (&cmdbuf,BPTR (&buf), cmdlen); - -/* check we have only printable characters or null byte in the -* command string and no newlines */ -if (!string_check_buf (&buf,CC_PRINT |CC_NULL ,CC_CRLF )) - { -msg (D_PUSH_ERRORS ,"WARNING: Received control with invalid characters: %s" , -format_hex (BPTR (&buf),BLEN (&buf),256 , &gc)); - } -else - { -parse_incoming_control_channel_command (c, &cmdbuf); - } +parse_incoming_control_channel_command (c, &cmdbuf); } -else - { -msg (D_PUSH_ERRORS ,"WARNING: Ignoring control channel " -"message command without NUL termination" ); - } -buf_advance (&buf, cmdlen); } }else
src/openvpn/ssl_pkt.c +40 -0
@@ -557,3 +557,43 @@ }return false; } + +struct buffer +extract_command_buffer (struct buffer *buf,struct gc_arena *gc) +{ +/* commands on the control channel are seperated by 0x00 bytes. +* cmdlen does not include the 0 byte of the string */ +int cmdlen = (int )strnlen (BSTR (buf),BLEN (buf)); + +if (cmdlen >=BLEN (buf)) + { +buf_advance (buf, cmdlen); +/* Return empty buffer */ +struct buffer empty = {0 }; +return empty; + } + +/* include the NUL byte and ensure NUL termination */ +int buflen = (int )strlen (BSTR (buf)) +1 ; + +/* Construct a buffer that only holds the current command and +* its closing NUL byte */ +struct buffer cmdbuf =alloc_buf_gc (buflen, gc); +buf_write (&cmdbuf,BPTR (buf), buflen); + +/* Remove \r and \n at the end of the buffer to avoid +* problems with scripts and other that add extra \r and \n */ +buf_chomp (&cmdbuf); + +/* check we have only printable characters or null byte in the +* command string and no newlines */ +if (!string_check_buf (&cmdbuf,CC_PRINT |CC_NULL ,CC_CRLF )) + { +msg (D_PUSH_ERRORS ,"WARNING: Received control with invalid characters: %s" , +format_hex (BPTR (&cmdbuf),BLEN (&cmdbuf),256 , gc)); + cmdbuf.len =0 ; + } + +buf_advance (buf, buflen); +return cmdbuf; +}
src/openvpn/ssl_pkt.h +14 -0
@@ -230,6 +230,20 @@uint8_t header, bool request_resend_wkc); + +/** +* Extracts a control channel message from buf and adjusts the size of +* buf after the message has been extracted +* @param buf The buffer the message should be extracted from +* @param gc gc_arena to be used for the returned buffer and displaying +* diagnostic messages +* @return A buffer with a control channel message or a buffer with +* with length 0 if there is no message or the message has +* invalid characters. +*/ +struct buffer +extract_command_buffer (struct buffer *buf,struct gc_arena *gc); +static inline const char *packet_opcode_name (int op) {
tests/unit_tests/openvpn/test_pkt.c +35 -0
@@ -626,6 +626,40 @@free_tas (&tas_server); } +static void +test_extract_control_message (void **ut_state) +{ +struct gc_arena gc =gc_new (); +struct buffer input_buf =alloc_buf_gc (1024 , &gc); + +/* This message will have a \0x00 at the end since it is a C string */ +const char input[] ="valid control message\r\n\0\0Invalid\r\none\0valid one again" ; + +buf_write (&input_buf, input,sizeof (input)); +struct buffer cmd1 =extract_command_buffer (&input_buf, &gc); +struct buffer cmd2 =extract_command_buffer (&input_buf, &gc); +struct buffer cmd3 =extract_command_buffer (&input_buf, &gc); +struct buffer cmd4 =extract_command_buffer (&input_buf, &gc); +struct buffer cmd5 =extract_command_buffer (&input_buf, &gc); + +assert_string_equal (BSTR (&cmd1),"valid control message" ); +/* empty message with just a \0x00 */ +assert_int_equal (cmd2.len,1 ); +assert_string_equal (BSTR (&cmd2),"" ); +assert_int_equal (cmd3.len,0 ); +assert_string_equal (BSTR (&cmd4),"valid one again" ); +assert_int_equal (cmd5.len,0 ); + +const uint8_t nonull[6 ] = {'n' ,'o' ,' ' ,'N' ,'U' ,'L' }; +struct buffer nonull_buf =alloc_buf_gc (1024 , &gc); + +buf_write (&nonull_buf, nonull,sizeof (nonull)); +struct buffer nonullcmd =extract_command_buffer (&nonull_buf, &gc); +assert_int_equal (nonullcmd.len,0 ); + +gc_free (&gc); +} +int main (void ) {
@@ -640,6 +674,7 @@cmocka_unit_test (test_verify_hmac_tls_auth),cmocka_unit_test (test_generate_reset_packet_plain),cmocka_unit_test (test_generate_reset_packet_tls_auth), + cmocka_unit_test(test_extract_control_message) };#if defined(ENABLE_CRYPTO_OPENSSL )
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/672?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I47c992b6b73b1475cbff8a28f720cf50dc1fbe3e
Gerrit-Change-Number: 672
Gerrit-PatchSet: 3
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: cron2, plaisthos.
flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/672?usp=email )
Change subject: Allow trailing \r and \n in control channel message
......................................................................
Patch Set 3: Code-Review-1
(4 comments)
Patchset:
PS2:
Quoted 1 line
I must say that I would feel better if we had a UT covering all this. […]
Done
Patchset:
PS3:
Thanks, addresses my concerns. However, does not actually build currently ;)
File src/openvpn/forward.c:
http://gerrit.openvpn.net/c/openvpn/+/672/comment/5483cbeb_14179e53 :
PS2, Line 318: format_hex(BPTR(&buf), BLEN(&cmdbuf), 256, &gc));
Quoted 1 line
It is "not wrong today", but this sort of booby trap will come back and bite us later - so this shou […]
Done
File src/openvpn/forward.c:
http://gerrit.openvpn.net/c/openvpn/+/672/comment/2df6966e_2cf72181 :
PS3, Line 295: struct buffer cmdbuf = extract_command_buffer(buf, &gc);
&buf
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/672?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I47c992b6b73b1475cbff8a28f720cf50dc1fbe3e
Gerrit-Change-Number: 672
Gerrit-PatchSet: 3
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-Comment-Date: Tue, 09 Jul 2024 16:13:27 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: cron2 <[email protected]...>
Comment-In-Reply-To: flichtenheld <[email protected]...>
Gerrit-MessageType: comment
Attention is currently required from: cron2, flichtenheld, plaisthos.
Hello cron2, flichtenheld,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/672?usp=email
to look at the new patch set (#4).
The following approvals got outdated and were removed:
Code-Review-1 by flichtenheld
Change subject: Allow trailing \r and \n in control channel message
......................................................................
Allow trailing \r and \n in control channel message
Writing a reason from a script will easily end up adding extra \r\n characters at the end of the reason. Our current code pushes this to the peer. So be more liberal in accepting these message.
Closes openvpn/openvpn#568
---
M src/openvpn/forward.c
M src/openvpn/ssl_pkt.c
M src/openvpn/ssl_pkt.h
M tests/unit_tests/openvpn/test_pkt.c
4 files changed, 92 insertions(+), 30 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/72/672/4
src/openvpn/forward.c +3 -30
@@ -290,41 +290,14 @@struct buffer buf =alloc_buf_gc (len, &gc);if (tls_rec_payload (c->c2.tls_multi, &buf)) { -while (BLEN (&buf) >1 ) { -/* commands on the control channel are seperated by 0x00 bytes. -* cmdlen does not include the 0 byte of the string */ -int cmdlen = (int )strnlen (BSTR (&buf),BLEN (&buf)); +struct buffer cmdbuf =extract_command_buffer (&buf, &gc); -if (cmdlen <BLEN (&buf)) +if (cmdbuf.len >0 ) { -/* include the NUL byte and ensure NUL termination */ -int cmdlen = (int )strlen (BSTR (&buf)) +1 ; - -/* Construct a buffer that only holds the current command and -* its closing NUL byte */ -struct buffer cmdbuf =alloc_buf_gc (cmdlen, &gc); -buf_write (&cmdbuf,BPTR (&buf), cmdlen); - -/* check we have only printable characters or null byte in the -* command string and no newlines */ -if (!string_check_buf (&buf,CC_PRINT |CC_NULL ,CC_CRLF )) - { -msg (D_PUSH_ERRORS ,"WARNING: Received control with invalid characters: %s" , -format_hex (BPTR (&buf),BLEN (&buf),256 , &gc)); - } -else - { -parse_incoming_control_channel_command (c, &cmdbuf); - } +parse_incoming_control_channel_command (c, &cmdbuf); } -else - { -msg (D_PUSH_ERRORS ,"WARNING: Ignoring control channel " -"message command without NUL termination" ); - } -buf_advance (&buf, cmdlen); } }else
src/openvpn/ssl_pkt.c +40 -0
@@ -557,3 +557,43 @@ }return false; } + +struct buffer +extract_command_buffer (struct buffer *buf,struct gc_arena *gc) +{ +/* commands on the control channel are seperated by 0x00 bytes. +* cmdlen does not include the 0 byte of the string */ +int cmdlen = (int )strnlen (BSTR (buf),BLEN (buf)); + +if (cmdlen >=BLEN (buf)) + { +buf_advance (buf, cmdlen); +/* Return empty buffer */ +struct buffer empty = {0 }; +return empty; + } + +/* include the NUL byte and ensure NUL termination */ + cmdlen +=1 ; + +/* Construct a buffer that only holds the current command and +* its closing NUL byte */ +struct buffer cmdbuf =alloc_buf_gc (cmdlen, gc); +buf_write (&cmdbuf,BPTR (buf), cmdlen); + +/* Remove \r and \n at the end of the buffer to avoid +* problems with scripts and other that add extra \r and \n */ +buf_chomp (&cmdbuf); + +/* check we have only printable characters or null byte in the +* command string and no newlines */ +if (!string_check_buf (&cmdbuf,CC_PRINT |CC_NULL ,CC_CRLF )) + { +msg (D_PUSH_ERRORS ,"WARNING: Received control with invalid characters: %s" , +format_hex (BPTR (&cmdbuf),BLEN (&cmdbuf),256 , gc)); + cmdbuf.len =0 ; + } + +buf_advance (buf, cmdlen); +return cmdbuf; +}
src/openvpn/ssl_pkt.h +14 -0
@@ -230,6 +230,20 @@uint8_t header, bool request_resend_wkc); + +/** +* Extracts a control channel message from buf and adjusts the size of +* buf after the message has been extracted +* @param buf The buffer the message should be extracted from +* @param gc gc_arena to be used for the returned buffer and displaying +* diagnostic messages +* @return A buffer with a control channel message or a buffer with +* with length 0 if there is no message or the message has +* invalid characters. +*/ +struct buffer +extract_command_buffer (struct buffer *buf,struct gc_arena *gc); +static inline const char *packet_opcode_name (int op) {
tests/unit_tests/openvpn/test_pkt.c +35 -0
@@ -626,6 +626,40 @@free_tas (&tas_server); } +static void +test_extract_control_message (void **ut_state) +{ +struct gc_arena gc =gc_new (); +struct buffer input_buf =alloc_buf_gc (1024 , &gc); + +/* This message will have a \0x00 at the end since it is a C string */ +const char input[] ="valid control message\r\n\0\0Invalid\r\none\0valid one again" ; + +buf_write (&input_buf, input,sizeof (input)); +struct buffer cmd1 =extract_command_buffer (&input_buf, &gc); +struct buffer cmd2 =extract_command_buffer (&input_buf, &gc); +struct buffer cmd3 =extract_command_buffer (&input_buf, &gc); +struct buffer cmd4 =extract_command_buffer (&input_buf, &gc); +struct buffer cmd5 =extract_command_buffer (&input_buf, &gc); + +assert_string_equal (BSTR (&cmd1),"valid control message" ); +/* empty message with just a \0x00 */ +assert_int_equal (cmd2.len,1 ); +assert_string_equal (BSTR (&cmd2),"" ); +assert_int_equal (cmd3.len,0 ); +assert_string_equal (BSTR (&cmd4),"valid one again" ); +assert_int_equal (cmd5.len,0 ); + +const uint8_t nonull[6 ] = {'n' ,'o' ,' ' ,'N' ,'U' ,'L' }; +struct buffer nonull_buf =alloc_buf_gc (1024 , &gc); + +buf_write (&nonull_buf, nonull,sizeof (nonull)); +struct buffer nonullcmd =extract_command_buffer (&nonull_buf, &gc); +assert_int_equal (nonullcmd.len,0 ); + +gc_free (&gc); +} +int main (void ) {
@@ -640,6 +674,7 @@cmocka_unit_test (test_verify_hmac_tls_auth),cmocka_unit_test (test_generate_reset_packet_plain),cmocka_unit_test (test_generate_reset_packet_tls_auth), + cmocka_unit_test(test_extract_control_message) };#if defined(ENABLE_CRYPTO_OPENSSL )
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/672?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I47c992b6b73b1475cbff8a28f720cf50dc1fbe3e
Gerrit-Change-Number: 672
Gerrit-PatchSet: 4
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: cron2, plaisthos.
flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/672?usp=email )
Change subject: Allow trailing \r and \n in control channel message
......................................................................
Patch Set 4: Code-Review+2
(2 comments)
File src/openvpn/forward.c:
http://gerrit.openvpn.net/c/openvpn/+/672/comment/48fff3e1_39fedac0 :
PS2, Line 302: int buflen = (int)strlen(BSTR(&buf)) + 1;
Quoted 1 line
While this is besser than the original, I find it still confusing to call
strlen()twice on the ve […]
Done
File src/openvpn/forward.c:
http://gerrit.openvpn.net/c/openvpn/+/672/comment/562bef0c_87a4f24d :
PS3, Line 295: struct buffer cmdbuf = extract_command_buffer(buf, &gc);
Quoted 1 line
&buf
Done
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/672?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I47c992b6b73b1475cbff8a28f720cf50dc1fbe3e
Gerrit-Change-Number: 672
Gerrit-PatchSet: 4
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-Comment-Date: Wed, 10 Jul 2024 14:05:11 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: cron2 <[email protected]...>
Comment-In-Reply-To: flichtenheld <[email protected]...>
Gerrit-MessageType: comment
PATCH v4 1/1 Allow trailing \r and \n in control channel message
In reply to a message not in the archiveFrom: Arne Schwabe <[email protected]...>
Writing a reason from a script will easily end up adding extra \r\n characters at the end of the reason. Our current code pushes this to the peer. So be more liberal in accepting these message.
Closes openvpn/openvpn#568
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/672
This mail reflects revision 4 of this Change.
Acked-by according to Gerrit (reflected above):
Frank Lichtenheld <[email protected]...>
src/openvpn/forward.c +3 -30
@@ -290,41 +290,14 @@struct buffer buf =alloc_buf_gc (len, &gc);if (tls_rec_payload (c->c2.tls_multi, &buf)) { -while (BLEN (&buf) >1 ) { -/* commands on the control channel are seperated by 0x00 bytes. -* cmdlen does not include the 0 byte of the string */ -int cmdlen = (int )strnlen (BSTR (&buf),BLEN (&buf)); +struct buffer cmdbuf =extract_command_buffer (&buf, &gc); -if (cmdlen <BLEN (&buf)) +if (cmdbuf.len >0 ) { -/* include the NUL byte and ensure NUL termination */ -int cmdlen = (int )strlen (BSTR (&buf)) +1 ; - -/* Construct a buffer that only holds the current command and -* its closing NUL byte */ -struct buffer cmdbuf =alloc_buf_gc (cmdlen, &gc); -buf_write (&cmdbuf,BPTR (&buf), cmdlen); - -/* check we have only printable characters or null byte in the -* command string and no newlines */ -if (!string_check_buf (&buf,CC_PRINT |CC_NULL ,CC_CRLF )) - { -msg (D_PUSH_ERRORS ,"WARNING: Received control with invalid characters: %s" , -format_hex (BPTR (&buf),BLEN (&buf),256 , &gc)); - } -else - { -parse_incoming_control_channel_command (c, &cmdbuf); - } +parse_incoming_control_channel_command (c, &cmdbuf); } -else - { -msg (D_PUSH_ERRORS ,"WARNING: Ignoring control channel " -"message command without NUL termination" ); - } -buf_advance (&buf, cmdlen); } }else
src/openvpn/ssl_pkt.c +40 -0
@@ -557,3 +557,43 @@ }return false; } + +struct buffer +extract_command_buffer (struct buffer *buf,struct gc_arena *gc) +{ +/* commands on the control channel are seperated by 0x00 bytes. +* cmdlen does not include the 0 byte of the string */ +int cmdlen = (int )strnlen (BSTR (buf),BLEN (buf)); + +if (cmdlen >=BLEN (buf)) + { +buf_advance (buf, cmdlen); +/* Return empty buffer */ +struct buffer empty = {0 }; +return empty; + } + +/* include the NUL byte and ensure NUL termination */ + cmdlen +=1 ; + +/* Construct a buffer that only holds the current command and +* its closing NUL byte */ +struct buffer cmdbuf =alloc_buf_gc (cmdlen, gc); +buf_write (&cmdbuf,BPTR (buf), cmdlen); + +/* Remove \r and \n at the end of the buffer to avoid +* problems with scripts and other that add extra \r and \n */ +buf_chomp (&cmdbuf); + +/* check we have only printable characters or null byte in the +* command string and no newlines */ +if (!string_check_buf (&cmdbuf,CC_PRINT |CC_NULL ,CC_CRLF )) + { +msg (D_PUSH_ERRORS ,"WARNING: Received control with invalid characters: %s" , +format_hex (BPTR (&cmdbuf),BLEN (&cmdbuf),256 , gc)); + cmdbuf.len =0 ; + } + +buf_advance (buf, cmdlen); +return cmdbuf; +}
src/openvpn/ssl_pkt.h +14 -0
@@ -230,6 +230,20 @@uint8_t header, bool request_resend_wkc); + +/** +* Extracts a control channel message from buf and adjusts the size of +* buf after the message has been extracted +* @param buf The buffer the message should be extracted from +* @param gc gc_arena to be used for the returned buffer and displaying +* diagnostic messages +* @return A buffer with a control channel message or a buffer with +* with length 0 if there is no message or the message has +* invalid characters. +*/ +struct buffer +extract_command_buffer (struct buffer *buf,struct gc_arena *gc); +static inline const char *packet_opcode_name (int op) {
tests/unit_tests/openvpn/test_pkt.c +35 -0
@@ -626,6 +626,40 @@free_tas (&tas_server); } +static void +test_extract_control_message (void **ut_state) +{ +struct gc_arena gc =gc_new (); +struct buffer input_buf =alloc_buf_gc (1024 , &gc); + +/* This message will have a \0x00 at the end since it is a C string */ +const char input[] ="valid control message\r\n\0\0Invalid\r\none\0valid one again" ; + +buf_write (&input_buf, input,sizeof (input)); +struct buffer cmd1 =extract_command_buffer (&input_buf, &gc); +struct buffer cmd2 =extract_command_buffer (&input_buf, &gc); +struct buffer cmd3 =extract_command_buffer (&input_buf, &gc); +struct buffer cmd4 =extract_command_buffer (&input_buf, &gc); +struct buffer cmd5 =extract_command_buffer (&input_buf, &gc); + +assert_string_equal (BSTR (&cmd1),"valid control message" ); +/* empty message with just a \0x00 */ +assert_int_equal (cmd2.len,1 ); +assert_string_equal (BSTR (&cmd2),"" ); +assert_int_equal (cmd3.len,0 ); +assert_string_equal (BSTR (&cmd4),"valid one again" ); +assert_int_equal (cmd5.len,0 ); + +const uint8_t nonull[6 ] = {'n' ,'o' ,' ' ,'N' ,'U' ,'L' }; +struct buffer nonull_buf =alloc_buf_gc (1024 , &gc); + +buf_write (&nonull_buf, nonull,sizeof (nonull)); +struct buffer nonullcmd =extract_command_buffer (&nonull_buf, &gc); +assert_int_equal (nonullcmd.len,0 ); + +gc_free (&gc); +} +int main (void ) {
@@ -640,6 +674,7 @@cmocka_unit_test (test_verify_hmac_tls_auth),cmocka_unit_test (test_generate_reset_packet_plain),cmocka_unit_test (test_generate_reset_packet_tls_auth), + cmocka_unit_test(test_extract_control_message) };#if defined(ENABLE_CRYPTO_OPENSSL )
Re: [Openvpn-devel] [PATCH v4] Allow trailing \r and \n in control channel message
Quoted 13 lines · Frank Lichtenheld
From: Arne Schwabe <[email protected]...>
Writing a reason from a script will easily end up adding extra \r\n characters at the end of the reason. Our current code pushes this to the peer. So be more liberal in accepting these message.
Closes openvpn/openvpn#568
Change-Id I47c992b6b73b1475cbff8a28f720cf50dc1fbe3eSigned-off-by Arne Schwabe <[email protected]...>---
Quoted 8 lines
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/672
This mail reflects revision 4 of this Change.Acked-by according to Gerrit (reflected above):
Frank Lichtenheld <[email protected]...>
Merge notes: Applies cleanly to release/2.6, does NOT apply to release/2.5 at all (due to ssl_pkt.c and test_pkt.c not existing).
At least OpenVPN-NL and EPEL9 will want this patch in 2.5 (and potentially some other distros as well). Unless someone else volunteers I can provide the backport once we have merged in release/2.6. Probably enough to move the function to forward.c and skip the UT.
Regards,
Signature · 1 line
Frank Lichtenheld
PATCH 1/1 Allow trailing \r and \n in control channel message
From: Arne Schwabe <[email protected]...>
Writing a reason from a script will easily end up adding extra \r\n characters at the end of the reason. Our current code pushes this to the peer. So be more liberal in accepting these message.
Closes openvpn/openvpn#568
This is the backport of the fix to release/2.5.
--- src/openvpn/forward.c | 73 +++++++++++++++++++++++++------------------ 1 file changed, 43 insertions(+), 30 deletions(-)
src/openvpn/forward.c +43 -30
@@ -221,6 +221,46 @@ parse_incoming_control_channel_command(struct context *c, struct buffer *buf) } } +static struct buffer +extract_command_buffer (struct buffer *buf,struct gc_arena *gc) +{ +/* commands on the control channel are seperated by 0x00 bytes. +* cmdlen does not include the 0 byte of the string */ +int cmdlen = (int )strnlen (BSTR (buf),BLEN (buf)); + +if (cmdlen >=BLEN (buf)) + { +buf_advance (buf, cmdlen); +/* Return empty buffer */ +struct buffer empty = {0 }; +return empty; + } + +/* include the NUL byte and ensure NUL termination */ + cmdlen +=1 ; + +/* Construct a buffer that only holds the current command and +* its closing NUL byte */ +struct buffer cmdbuf =alloc_buf_gc (cmdlen, gc); +buf_write (&cmdbuf,BPTR (buf), cmdlen); + +/* Remove \r and \n at the end of the buffer to avoid +* problems with scripts and other that add extra \r and \n */ +buf_chomp (&cmdbuf); + +/* check we have only printable characters or null byte in the +* command string and no newlines */ +if (!string_check_buf (&cmdbuf,CC_PRINT |CC_NULL ,CC_CRLF )) + { +msg (D_PUSH_ERRORS ,"WARNING: Received control with invalid characters: %s" , +format_hex (BPTR (&cmdbuf),BLEN (&cmdbuf),256 , gc)); + cmdbuf.len =0 ; + } + +buf_advance (buf, cmdlen); +return cmdbuf; +} +/* * Handle incoming configuration * messages on the control channel.
@@ -236,41 +276,14 @@ check_incoming_control_channel(struct context *c)struct buffer buf =alloc_buf_gc (len, &gc);if (tls_rec_payload (c->c2.tls_multi, &buf)) { -while (BLEN (&buf) >1 ) { -/* commands on the control channel are seperated by 0x00 bytes. -* cmdlen does not include the 0 byte of the string */ -int cmdlen = (int )strnlen (BSTR (&buf),BLEN (&buf)); - -if (cmdlen <BLEN (&buf)) - { -/* include the NUL byte and ensure NUL termination */ -int cmdlen = (int )strlen (BSTR (&buf)) +1 ; - -/* Construct a buffer that only holds the current command and -* its closing NUL byte */ -struct buffer cmdbuf =alloc_buf_gc (cmdlen, &gc); -buf_write (&cmdbuf,BPTR (&buf), cmdlen); +struct buffer cmdbuf =extract_command_buffer (&buf, &gc); -/* check we have only printable characters or null byte in the -* command string and no newlines */ -if (!string_check_buf (&buf,CC_PRINT |CC_NULL ,CC_CRLF )) - { -msg (D_PUSH_ERRORS ,"WARNING: Received control with invalid characters: %s" , -format_hex (BPTR (&buf),BLEN (&buf),256 , &gc)); - } -else - { -parse_incoming_control_channel_command (c, &cmdbuf); - } - } -else +if (cmdbuf.len >0 ) { -msg (D_PUSH_ERRORS ,"WARNING: Ignoring control channel " -"message command without NUL termination" ); +parse_incoming_control_channel_command (c, &cmdbuf); } -buf_advance (&buf, cmdlen); } }else
Signature · 1 line
2.34.1
[Openvpn-devel] [PATCH applied] Re: Allow trailing \r and \n in control channel message
Thanks for the backport. Verified that it's the same change (without the unit test, and having extract_command_buffer() in forward.c), and that it gets the job done :-)
Your patch has been applied to the release/2.5 branch.
commit dddb87f126a6e87e61de830a9efe0bc257a71e2b (release/2.5)
Author: Arne Schwabe Date: Thu Jul 11 13:30:22 2024 +0200
Allow trailing \r and \n in control channel message
Signed-off-by: Arne Schwabe <[email protected]...>
Signed-off-by: Frank Lichtenheld <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28923.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
[Openvpn-devel] [PATCH applied] Re: Allow trailing \r and \n in control channel message
In reply to Frank LichtenheldStared at code, reviewed, and fed to my test case where the server replies with "AUTH_FAIL,you stink\r\n" - which wasn't working with the previous code (and was overlooked during testing), now works.
2024-07-17 20:54:32 AUTH: Received control message: AUTH_FAILED,you stink
Also, unit tests, yay :-)
Your patch has been applied to the master and release/2.6 branch (backport will be applied to 2.5).
commit be31325e1dfdffbb152374985c2ae7b6644e3519 (master) commit 343573990135023d855d151fcd9248e5c26d9f8b (release/2.6)
Author: Arne Schwabe Date: Wed Jul 10 16:06:23 2024 +0200
Allow trailing \r and \n in control channel message
Signed-off-by: Arne Schwabe <[email protected]...>
Acked-by: Frank Lichtenheld <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28910.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
cron2 has uploaded a new patch set (#5) to the change originally created by plaisthos. ( http://gerrit.openvpn.net/c/openvpn/+/672?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by flichtenheld
Change subject: Allow trailing \r and \n in control channel message
......................................................................
Allow trailing \r and \n in control channel message
Writing a reason from a script will easily end up adding extra \r\n characters at the end of the reason. Our current code pushes this to the peer. So be more liberal in accepting these message.
Github: closes OpenVPN/openvpn#568
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28910.html
---
M src/openvpn/forward.c
M src/openvpn/ssl_pkt.c
M src/openvpn/ssl_pkt.h
M tests/unit_tests/openvpn/test_pkt.c
4 files changed, 92 insertions(+), 30 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/72/672/5
src/openvpn/forward.c +3 -30
@@ -290,41 +290,14 @@struct buffer buf =alloc_buf_gc (len, &gc);if (tls_rec_payload (c->c2.tls_multi, &buf)) { -while (BLEN (&buf) >1 ) { -/* commands on the control channel are seperated by 0x00 bytes. -* cmdlen does not include the 0 byte of the string */ -int cmdlen = (int )strnlen (BSTR (&buf),BLEN (&buf)); +struct buffer cmdbuf =extract_command_buffer (&buf, &gc); -if (cmdlen <BLEN (&buf)) +if (cmdbuf.len >0 ) { -/* include the NUL byte and ensure NUL termination */ -int cmdlen = (int )strlen (BSTR (&buf)) +1 ; - -/* Construct a buffer that only holds the current command and -* its closing NUL byte */ -struct buffer cmdbuf =alloc_buf_gc (cmdlen, &gc); -buf_write (&cmdbuf,BPTR (&buf), cmdlen); - -/* check we have only printable characters or null byte in the -* command string and no newlines */ -if (!string_check_buf (&buf,CC_PRINT |CC_NULL ,CC_CRLF )) - { -msg (D_PUSH_ERRORS ,"WARNING: Received control with invalid characters: %s" , -format_hex (BPTR (&buf),BLEN (&buf),256 , &gc)); - } -else - { -parse_incoming_control_channel_command (c, &cmdbuf); - } +parse_incoming_control_channel_command (c, &cmdbuf); } -else - { -msg (D_PUSH_ERRORS ,"WARNING: Ignoring control channel " -"message command without NUL termination" ); - } -buf_advance (&buf, cmdlen); } }else
src/openvpn/ssl_pkt.c +40 -0
@@ -557,3 +557,43 @@ }return false; } + +struct buffer +extract_command_buffer (struct buffer *buf,struct gc_arena *gc) +{ +/* commands on the control channel are seperated by 0x00 bytes. +* cmdlen does not include the 0 byte of the string */ +int cmdlen = (int )strnlen (BSTR (buf),BLEN (buf)); + +if (cmdlen >=BLEN (buf)) + { +buf_advance (buf, cmdlen); +/* Return empty buffer */ +struct buffer empty = {0 }; +return empty; + } + +/* include the NUL byte and ensure NUL termination */ + cmdlen +=1 ; + +/* Construct a buffer that only holds the current command and +* its closing NUL byte */ +struct buffer cmdbuf =alloc_buf_gc (cmdlen, gc); +buf_write (&cmdbuf,BPTR (buf), cmdlen); + +/* Remove \r and \n at the end of the buffer to avoid +* problems with scripts and other that add extra \r and \n */ +buf_chomp (&cmdbuf); + +/* check we have only printable characters or null byte in the +* command string and no newlines */ +if (!string_check_buf (&cmdbuf,CC_PRINT |CC_NULL ,CC_CRLF )) + { +msg (D_PUSH_ERRORS ,"WARNING: Received control with invalid characters: %s" , +format_hex (BPTR (&cmdbuf),BLEN (&cmdbuf),256 , gc)); + cmdbuf.len =0 ; + } + +buf_advance (buf, cmdlen); +return cmdbuf; +}
src/openvpn/ssl_pkt.h +14 -0
@@ -230,6 +230,20 @@uint8_t header, bool request_resend_wkc); + +/** +* Extracts a control channel message from buf and adjusts the size of +* buf after the message has been extracted +* @param buf The buffer the message should be extracted from +* @param gc gc_arena to be used for the returned buffer and displaying +* diagnostic messages +* @return A buffer with a control channel message or a buffer with +* with length 0 if there is no message or the message has +* invalid characters. +*/ +struct buffer +extract_command_buffer (struct buffer *buf,struct gc_arena *gc); +static inline const char *packet_opcode_name (int op) {
tests/unit_tests/openvpn/test_pkt.c +35 -0
@@ -626,6 +626,40 @@free_tas (&tas_server); } +static void +test_extract_control_message (void **ut_state) +{ +struct gc_arena gc =gc_new (); +struct buffer input_buf =alloc_buf_gc (1024 , &gc); + +/* This message will have a \0x00 at the end since it is a C string */ +const char input[] ="valid control message\r\n\0\0Invalid\r\none\0valid one again" ; + +buf_write (&input_buf, input,sizeof (input)); +struct buffer cmd1 =extract_command_buffer (&input_buf, &gc); +struct buffer cmd2 =extract_command_buffer (&input_buf, &gc); +struct buffer cmd3 =extract_command_buffer (&input_buf, &gc); +struct buffer cmd4 =extract_command_buffer (&input_buf, &gc); +struct buffer cmd5 =extract_command_buffer (&input_buf, &gc); + +assert_string_equal (BSTR (&cmd1),"valid control message" ); +/* empty message with just a \0x00 */ +assert_int_equal (cmd2.len,1 ); +assert_string_equal (BSTR (&cmd2),"" ); +assert_int_equal (cmd3.len,0 ); +assert_string_equal (BSTR (&cmd4),"valid one again" ); +assert_int_equal (cmd5.len,0 ); + +const uint8_t nonull[6 ] = {'n' ,'o' ,' ' ,'N' ,'U' ,'L' }; +struct buffer nonull_buf =alloc_buf_gc (1024 , &gc); + +buf_write (&nonull_buf, nonull,sizeof (nonull)); +struct buffer nonullcmd =extract_command_buffer (&nonull_buf, &gc); +assert_int_equal (nonullcmd.len,0 ); + +gc_free (&gc); +} +int main (void ) {
@@ -640,6 +674,7 @@cmocka_unit_test (test_verify_hmac_tls_auth),cmocka_unit_test (test_generate_reset_packet_plain),cmocka_unit_test (test_generate_reset_packet_tls_auth), + cmocka_unit_test(test_extract_control_message) };#if defined(ENABLE_CRYPTO_OPENSSL )
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/672?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I47c992b6b73b1475cbff8a28f720cf50dc1fbe3e
Gerrit-Change-Number: 672
Gerrit-PatchSet: 5
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/672?usp=email )
Change subject: Allow trailing \r and \n in control channel message
......................................................................
Allow trailing \r and \n in control channel message
Writing a reason from a script will easily end up adding extra \r\n characters at the end of the reason. Our current code pushes this to the peer. So be more liberal in accepting these message.
Github: closes OpenVPN/openvpn#568
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28910.html
---
M src/openvpn/forward.c
M src/openvpn/ssl_pkt.c
M src/openvpn/ssl_pkt.h
M tests/unit_tests/openvpn/test_pkt.c
4 files changed, 92 insertions(+), 30 deletions(-)
src/openvpn/forward.c +3 -30
@@ -290,41 +290,14 @@struct buffer buf =alloc_buf_gc (len, &gc);if (tls_rec_payload (c->c2.tls_multi, &buf)) { -while (BLEN (&buf) >1 ) { -/* commands on the control channel are seperated by 0x00 bytes. -* cmdlen does not include the 0 byte of the string */ -int cmdlen = (int )strnlen (BSTR (&buf),BLEN (&buf)); +struct buffer cmdbuf =extract_command_buffer (&buf, &gc); -if (cmdlen <BLEN (&buf)) +if (cmdbuf.len >0 ) { -/* include the NUL byte and ensure NUL termination */ -int cmdlen = (int )strlen (BSTR (&buf)) +1 ; - -/* Construct a buffer that only holds the current command and -* its closing NUL byte */ -struct buffer cmdbuf =alloc_buf_gc (cmdlen, &gc); -buf_write (&cmdbuf,BPTR (&buf), cmdlen); - -/* check we have only printable characters or null byte in the -* command string and no newlines */ -if (!string_check_buf (&buf,CC_PRINT |CC_NULL ,CC_CRLF )) - { -msg (D_PUSH_ERRORS ,"WARNING: Received control with invalid characters: %s" , -format_hex (BPTR (&buf),BLEN (&buf),256 , &gc)); - } -else - { -parse_incoming_control_channel_command (c, &cmdbuf); - } +parse_incoming_control_channel_command (c, &cmdbuf); } -else - { -msg (D_PUSH_ERRORS ,"WARNING: Ignoring control channel " -"message command without NUL termination" ); - } -buf_advance (&buf, cmdlen); } }else
src/openvpn/ssl_pkt.c +40 -0
@@ -557,3 +557,43 @@ }return false; } + +struct buffer +extract_command_buffer (struct buffer *buf,struct gc_arena *gc) +{ +/* commands on the control channel are seperated by 0x00 bytes. +* cmdlen does not include the 0 byte of the string */ +int cmdlen = (int )strnlen (BSTR (buf),BLEN (buf)); + +if (cmdlen >=BLEN (buf)) + { +buf_advance (buf, cmdlen); +/* Return empty buffer */ +struct buffer empty = {0 }; +return empty; + } + +/* include the NUL byte and ensure NUL termination */ + cmdlen +=1 ; + +/* Construct a buffer that only holds the current command and +* its closing NUL byte */ +struct buffer cmdbuf =alloc_buf_gc (cmdlen, gc); +buf_write (&cmdbuf,BPTR (buf), cmdlen); + +/* Remove \r and \n at the end of the buffer to avoid +* problems with scripts and other that add extra \r and \n */ +buf_chomp (&cmdbuf); + +/* check we have only printable characters or null byte in the +* command string and no newlines */ +if (!string_check_buf (&cmdbuf,CC_PRINT |CC_NULL ,CC_CRLF )) + { +msg (D_PUSH_ERRORS ,"WARNING: Received control with invalid characters: %s" , +format_hex (BPTR (&cmdbuf),BLEN (&cmdbuf),256 , gc)); + cmdbuf.len =0 ; + } + +buf_advance (buf, cmdlen); +return cmdbuf; +}
src/openvpn/ssl_pkt.h +14 -0
@@ -230,6 +230,20 @@uint8_t header, bool request_resend_wkc); + +/** +* Extracts a control channel message from buf and adjusts the size of +* buf after the message has been extracted +* @param buf The buffer the message should be extracted from +* @param gc gc_arena to be used for the returned buffer and displaying +* diagnostic messages +* @return A buffer with a control channel message or a buffer with +* with length 0 if there is no message or the message has +* invalid characters. +*/ +struct buffer +extract_command_buffer (struct buffer *buf,struct gc_arena *gc); +static inline const char *packet_opcode_name (int op) {
tests/unit_tests/openvpn/test_pkt.c +35 -0
@@ -626,6 +626,40 @@free_tas (&tas_server); } +static void +test_extract_control_message (void **ut_state) +{ +struct gc_arena gc =gc_new (); +struct buffer input_buf =alloc_buf_gc (1024 , &gc); + +/* This message will have a \0x00 at the end since it is a C string */ +const char input[] ="valid control message\r\n\0\0Invalid\r\none\0valid one again" ; + +buf_write (&input_buf, input,sizeof (input)); +struct buffer cmd1 =extract_command_buffer (&input_buf, &gc); +struct buffer cmd2 =extract_command_buffer (&input_buf, &gc); +struct buffer cmd3 =extract_command_buffer (&input_buf, &gc); +struct buffer cmd4 =extract_command_buffer (&input_buf, &gc); +struct buffer cmd5 =extract_command_buffer (&input_buf, &gc); + +assert_string_equal (BSTR (&cmd1),"valid control message" ); +/* empty message with just a \0x00 */ +assert_int_equal (cmd2.len,1 ); +assert_string_equal (BSTR (&cmd2),"" ); +assert_int_equal (cmd3.len,0 ); +assert_string_equal (BSTR (&cmd4),"valid one again" ); +assert_int_equal (cmd5.len,0 ); + +const uint8_t nonull[6 ] = {'n' ,'o' ,' ' ,'N' ,'U' ,'L' }; +struct buffer nonull_buf =alloc_buf_gc (1024 , &gc); + +buf_write (&nonull_buf, nonull,sizeof (nonull)); +struct buffer nonullcmd =extract_command_buffer (&nonull_buf, &gc); +assert_int_equal (nonullcmd.len,0 ); + +gc_free (&gc); +} +int main (void ) {
@@ -640,6 +674,7 @@cmocka_unit_test (test_verify_hmac_tls_auth),cmocka_unit_test (test_generate_reset_packet_plain),cmocka_unit_test (test_generate_reset_packet_tls_auth), + cmocka_unit_test(test_extract_control_message) };#if defined(ENABLE_CRYPTO_OPENSSL )
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/672?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I47c992b6b73b1475cbff8a28f720cf50dc1fbe3e
Gerrit-Change-Number: 672
Gerrit-PatchSet: 5
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged