From 2b74a188332f152e8952725812e086968a41e925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Janouch?= Date: Sat, 20 Sep 2014 18:10:29 +0200 Subject: Implement more of the services - SSH: ready for action - IRC: ready for action - HTTP: needs some work --- plugins/http.c | 23 ++++++++++--- plugins/irc.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- plugins/ssh.c | 13 +++++--- 3 files changed, 128 insertions(+), 9 deletions(-) (limited to 'plugins') diff --git a/plugins/http.c b/plugins/http.c index 2b16462..b350fee 100644 --- a/plugins/http.c +++ b/plugins/http.c @@ -30,23 +30,38 @@ static struct plugin_data } g_data; +struct scan_data +{ + struct str input; ///< Input buffer +}; + static void * scan_init (struct unit *u) { - // TODO - return NULL; + struct str hello; + str_init (&hello); + str_append_printf (&hello, "GET / HTTP/1.0\r\n" + "Host: %s\r\n\r\n", g_data.api->unit_get_address (u)); + g_data.api->unit_write (u, hello.str, hello.len); + str_free (&hello); + + struct scan_data *scan = xcalloc (1, sizeof *scan); + str_init (&scan->input); + return scan; } static void scan_free (void *handle) { - // TODO + struct scan_data *scan = handle; + str_free (&scan->input); + free (scan); } static void on_data (void *handle, struct unit *u, struct str *data) { - // TODO + // TODO: implement a state machine to parse the headers } static struct service g_http_service = diff --git a/plugins/irc.c b/plugins/irc.c index 58f594a..7732b73 100644 --- a/plugins/irc.c +++ b/plugins/irc.c @@ -191,6 +191,13 @@ irc_fnmatch (const char *pattern, const char *string) return fnmatch (x_pattern, x_string, 0); } +// --- Other selected IRC stuff ------------------------------------------------ + +#define IRC_MAX_NICKNAME 9 ///< The limit from RFC 2812 + +#define IRC_RPL_WELCOME 1 +#define IRC_RPL_MYINFO 4 + // --- Service detection ------------------------------------------------------- static struct plugin_data @@ -200,11 +207,103 @@ static struct plugin_data } g_data; +struct scan_data +{ + struct str input; ///< Input buffer + struct unit *u; ///< Scan unit +}; + +static void * +scan_init (struct unit *u) +{ + char nick[IRC_MAX_NICKNAME + 1]; + for (size_t i = 0; i < sizeof nick - 1; i++) + nick[i] = 'a' + rand () % ('z' - 'a' + 1); + + struct str hello; + str_init (&hello); + str_append_printf (&hello, + "NICK %s\r\nUSER %s 8 * :%s\r\n", nick, nick, nick); + g_data.api->unit_write (u, hello.str, hello.len); + str_free (&hello); + + struct scan_data *scan = xcalloc (1, sizeof *scan); + str_init (&scan->input); + scan->u = u; + return scan; +} + +static void +scan_free (void *handle) +{ + struct scan_data *scan = handle; + str_free (&scan->input); + free (scan); +} + +static void +on_irc_message (const struct irc_message *msg, const char *raw, void *user_data) +{ + (void) raw; + struct scan_data *scan = user_data; + + unsigned long code; + if (!irc_strcmp (msg->command, "PING")) + { + // Without this we might be unable to finish registration + struct str pong; + str_init (&pong); + str_append_printf (&pong, "PONG :%s\r\n", + msg->params.len > 0 ? msg->params.vector[0] : ""); + g_data.api->unit_write (scan->u, pong.str, pong.len); + } + else if (strlen (msg->command) == 3 && xstrtoul (&code, msg->command, 10)) + { + // It looks like we've successfully registered + if (msg->prefix && code == IRC_RPL_WELCOME) + g_data.api->unit_set_success (scan->u, true); + + // Extract the server name at least + if (code == IRC_RPL_MYINFO && msg->params.len > 0) + { + char *info = xstrdup_printf ("%s: %s", + "server name", msg->params.vector[0]); + g_data.api->unit_add_info (scan->u, info); + free (info); + + g_data.api->unit_abort (scan->u); + } + } +} + +static void +on_data (void *handle, struct unit *u, struct str *data) +{ + (void) u; + + struct scan_data *scan = handle; + str_append_str (&scan->input, data); + irc_process_buffer (&scan->input, on_irc_message, scan); +} + +static struct service g_irc_service = +{ + .name = "IRC", + .flags = SERVICE_SUPPORTS_TLS, + + .scan_init = scan_init, + .scan_free = scan_free, + .on_data = on_data, + .on_eof = NULL, + .on_error = NULL, + .on_aborted = NULL +}; + static bool initialize (void *ctx, struct plugin_api *api) { g_data = (struct plugin_data) { .ctx = ctx, .api = api }; - // TODO: register a service + api->register_service (ctx, &g_irc_service); return true; } diff --git a/plugins/ssh.c b/plugins/ssh.c index 3a32223..cf18c3c 100644 --- a/plugins/ssh.c +++ b/plugins/ssh.c @@ -56,20 +56,25 @@ scan_free (void *handle) static void on_data (void *handle, struct unit *u, struct str *data) { - // TODO: don't let the input buffer grow too much + // See RFC 4253 -- we check for a valid SSH banner struct scan_data *scan = handle; - str_append_str (&scan->input, data); + if (scan->input.len + data->len > 255) + goto end_scan; + str_append_str (&scan->input, data); char *input = scan->input.str; char *nl = strstr (input, "\r\n"); if (!nl) return; - // TODO: parse the reply, make sure that it's actually SSH, - // don't put just any garbage in the output info + if (strncmp (input, "SSH-", 4)) + goto end_scan; + *nl = '\0'; g_data.api->unit_add_info (u, input); g_data.api->unit_set_success (u, true); + +end_scan: g_data.api->unit_abort (u); } -- cgit v1.2.3