nortti
/
ethermess
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Allow tabs in messages

This commit is contained in:
Juhani Krekelä 2019-07-16 00:43:22 +03:00
parent 607d445c93
commit 6abb09b0c9
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ethermess-backend.c
View File

@ -415,7 +415,7 @@ void writeallx_u16(int fd, uint16_t value) {
writeallx(fd, buf, sizeof(buf)); writeallx(fd, buf, sizeof(buf));
} }
bool check_utf8(const unsigned char *data, size_t data_length, bool newline_allowed); bool check_utf8(const unsigned char *data, size_t data_length, bool newline_tab_allowed);
void read_status(void) { void read_status(void) {
unsigned char status; unsigned char status;
@ -503,7 +503,7 @@ bool check_padding(const unsigned char *data, size_t index, size_t data_length)
return true; return true;
} }
bool check_utf8(const unsigned char *data, size_t data_length, bool newline_allowed) { bool check_utf8(const unsigned char *data, size_t data_length, bool newline_tab_allowed) {
size_t remaining = 0; size_t remaining = 0;
size_t length = 0; size_t length = 0;
uint32_t codepoint = 0; uint32_t codepoint = 0;
@ -595,7 +595,7 @@ bool check_utf8(const unsigned char *data, size_t data_length, bool newline_allo
// Reject control characters // Reject control characters
if (codepoint <= 0x1f) { if (codepoint <= 0x1f) {
// C0 control character // C0 control character
if (!newline_allowed || codepoint != 0x0a) { if (!newline_tab_allowed || (codepoint != 0x0a && codepoint != 0x09)) {
return false; return false;
} }
} else if (0x80 <= codepoint && codepoint <= 0x9f) { } else if (0x80 <= codepoint && codepoint <= 0x9f) {

8
ethermess.py
View File

@ -130,7 +130,7 @@ def timestamp():
class NonCharacterError(Exception): pass class NonCharacterError(Exception): pass
class ControlCharacterError(Exception): pass class ControlCharacterError(Exception): pass
def validate_encoding(text, newline_allowed): def validate_encoding(text, newline_tab_allowed):
# We assume text is valid unicode, so we skip stuff like surrogate pairs # We assume text is valid unicode, so we skip stuff like surrogate pairs
for char in text: for char in text:
@ -146,7 +146,7 @@ def validate_encoding(text, newline_allowed):
# Reject control characters # Reject control characters
if codepoint <= 0x1f: if codepoint <= 0x1f:
# C0 control characters # C0 control characters
if not newline_allowed or codepoint != 0x0a: if not newline_tab_allowed or codepoint not in [0x0a, 0x09]:
raise ControlCharacterError(char) raise ControlCharacterError(char)
elif 0x80 <= codepoint <= 0x9f: elif 0x80 <= codepoint <= 0x9f:
# C1 control characters # C1 control characters
@ -158,7 +158,7 @@ def validate_encoding(text, newline_allowed):
class NickLengthError(Exception): pass class NickLengthError(Exception): pass
def validate_nick(nick): def validate_nick(nick):
validate_encoding(nick, newline_allowed = False) validate_encoding(nick, newline_tab_allowed = False)
# Nick length is stored as one byte # Nick length is stored as one byte
if len(nick.encode('utf-8')) > 255: if len(nick.encode('utf-8')) > 255:
raise NickLengthError raise NickLengthError
@ -166,7 +166,7 @@ def validate_nick(nick):
class MessageLengthError(Exception): pass class MessageLengthError(Exception): pass
def validate_message(message): def validate_message(message):
validate_encoding(message, newline_allowed = True) validate_encoding(message, newline_tab_allowed = True)
# Maximum frame payload is 1500 bytes # Maximum frame payload is 1500 bytes
# -2 for EtherMess packet header # -2 for EtherMess packet header
# -2 for msgid # -2 for msgid

1
libexecdir.build Normal file
View File

@ -0,0 +1 @@
.