improvements

openvasd/openvasd.c

@@ -17,7 +17,6 @@
 #include <curl/curl.h>
 #include <curl/easy.h>
 #include <curl/multi.h>
-#include <gnutls/gnutls.h>
 #include <netinet/in.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -238,6 +237,7 @@ openvasd_response_free (openvasd_resp_t resp)
 void
 init_stringstream (stringstream *s)
 {
+  g_free (s->ptr);
   s->len = 0;
   s->ptr = g_malloc0 (s->len + 1);
   if (s->ptr == NULL)
@@ -516,29 +516,34 @@ openvasd_get_version (openvasd_connector_t *conn)
   g_free (resp.ptr);
   return response;
 }
-
-struct curl_handlers
-{
-  CURLM *mhnd;
-  CURL *hnd;
-};
-
 /**
  * @brief Wrapps a CURLM * handler
  */
-static curl_handler_t *
-curlm_handler_new (void)
+curlm_t
+openvasd_curlm_handler_new (void)
 {
-  curl_handler_t *handlers = g_malloc0 (sizeof (curl_handler_t));
-  return handlers;
+  CURLM *h = NULL;
+  return h;
 }
 
 void
-openvasd_curl_handler_close (curl_handler_t *h)
+openvasd_curl_handler_close (curlm_t *h)
 {
-  curl_multi_remove_handle (h->mhnd, h->hnd);
-  curl_easy_cleanup (h->hnd);
-  curl_multi_cleanup (h->mhnd);
+  int queued = 0;
+
+  /* when an easy handle has completed, remove it */
+  CURLMsg *msg = curl_multi_info_read (h, &queued);
+  if (msg)
+    {
+      if (msg->msg == CURLMSG_DONE)
+        {
+          curl_multi_remove_handle (h, msg->easy_handle);
+          curl_easy_cleanup (msg->easy_handle);
+          curl_multi_cleanup (h);
+          return;
+        }
+      g_warning ("%s: Not possible to clean up the curl handler", __func__);
+    }
 }
 
 /**
@@ -552,15 +557,14 @@ openvasd_curl_handler_close (curl_handler_t *h)
  * @return The response. Null on error.
  */
 openvasd_resp_t
-openvasd_get_vts_stream_init (openvasd_connector_t *conn, curl_handler_t **h,
+openvasd_get_vts_stream_init (openvasd_connector_t *conn, curlm_t *mhnd,
                               stringstream *resp)
 {
   GString *path;
   openvasd_resp_t response = NULL;
   char *err = NULL;
   CURL *hnd = NULL;
-
-  *h = curlm_handler_new ();
+  CURLM *h = NULL;
   response = g_malloc0 (sizeof (struct openvasd_response));
   if (response == NULL)
     return NULL;
@@ -576,9 +580,9 @@ openvasd_get_vts_stream_init (openvasd_connector_t *conn, curl_handler_t **h,
     }
   g_string_free (path, TRUE);
 
-  (*h)->mhnd = curl_multi_init ();
-  curl_multi_add_handle ((*h)->mhnd, hnd);
-  (*h)->hnd = hnd;
+  h = curl_multi_init ();
+  curl_multi_add_handle (h, hnd);
+  *mhnd = h;
 
   response->code = RESP_CODE_OK;
   return response;
@@ -596,19 +600,19 @@ openvasd_get_vts_stream_init (openvasd_connector_t *conn, curl_handler_t **h,
  * transmision finished. -1 on error
  */
 int
-openvasd_get_vts_stream (curl_handler_t *h)
+openvasd_get_vts_stream (curlm_t mhnd)
 {
   static int running = 0;
-
-  if (!(h->mhnd))
+  CURLM *h = mhnd;
+  if (!(h))
     {
       return -1;
     }
 
-  CURLMcode mc = curl_multi_perform (h->mhnd, &running);
+  CURLMcode mc = curl_multi_perform (h, &running);
   if (!mc && running)
     /* wait for activity, timeout or "nothing" */
-    mc = curl_multi_poll (h->mhnd, NULL, 0, 5000, NULL);
+    mc = curl_multi_poll (h, NULL, 0, 5000, NULL);
   if (mc != CURLM_OK)
     {
       g_warning ("%s: error on curl_multi_poll(): %d\n", __func__, mc);
@@ -723,7 +727,8 @@ openvasd_start_scan (openvasd_connector_t *conn, char *data)
         }
       response->code = RESP_CODE_ERR;
       g_free (resp.ptr);
-      goto cleanup_start_scan;
+      cJSON_Delete (parser);
+      return response;
     }
 
   (*conn)->scan_id = g_strdup (cJSON_GetStringValue (parser));
@@ -741,10 +746,10 @@ openvasd_start_scan (openvasd_connector_t *conn, char *data)
       response->body = g_strdup ("{\"error\": \"Missing scan ID\"}");
       g_string_free (path, TRUE);
       g_warning ("%s: Missing scan ID", __func__);
-      g_free (resp.ptr);
-      goto cleanup_start_scan;
+      cJSON_Delete (parser);
+      return response;
     }
-  g_free (resp.ptr);
+
   init_stringstream (&resp);
   if ((hnd = handler (conn, POST, path->str, "{\"action\": \"start\"}", &resp,
                       &err))
@@ -771,9 +776,7 @@ openvasd_start_scan (openvasd_connector_t *conn, char *data)
       return response;
     }
 
-cleanup_start_scan:
   cJSON_Delete (parser);
-
   response->body = g_strdup (resp.ptr);
   g_free (resp.ptr);
   return response;
@@ -1000,12 +1003,12 @@ openvasd_parsed_results (openvasd_connector_t *conn, unsigned long first,
   const char *err = NULL;
   openvasd_resp_t resp = NULL;
   openvasd_result_t result = NULL;
-  unsigned long id;
+  unsigned long id = 0;
   gchar *type = NULL;
   gchar *ip_address = NULL;
   gchar *hostname = NULL;
   gchar *oid = NULL;
-  int port;
+  int port = 0;
   gchar *protocol = NULL;
   gchar *message = NULL;
   gchar *detail_name = NULL;
@@ -1701,7 +1704,7 @@ openvasd_parsed_scans_preferences (openvasd_connector_t *conn, GSList **params)
 
   cJSON_ArrayForEach (param_obj, parser)
   {
-    const char *id, *name, *desc;
+    const char *id = NULL, *name = NULL, *desc = NULL;
     char *defval = NULL, *param_type = NULL;
     openvasd_param_t *param = NULL;
     int val, mandatory = 0;

openvasd/openvasd.h

@@ -272,10 +272,7 @@ openvasd_build_scan_config_json (openvasd_target_t *, GHashTable *, GSList *);
 
 /* Curl multiperform wrapper */
 
-typedef struct curl_handlers curl_handler_t;
-
-void
-openvasd_curl_handler_close (curl_handler_t *);
+typedef void *curlm_t;
 
 /** @brief Define a string struct for storing the response.
  */
@@ -288,11 +285,16 @@ typedef struct string
 void
 init_stringstream (stringstream *s);
 
+curlm_t
+openvasd_curlm_handler_new (void);
+
+void
+openvasd_curl_handler_close (curlm_t *);
+
 openvasd_resp_t
-openvasd_get_vts_stream_init (openvasd_connector_t *, curl_handler_t **,
+openvasd_get_vts_stream_init (openvasd_connector_t *, curlm_t *,
                               stringstream *);
 
-int
-openvasd_get_vts_stream (curl_handler_t *);
+int openvasd_get_vts_stream (curlm_t);
 
 #endif

openvasd/vtparser.c

@@ -323,17 +323,19 @@ openvasd_parse_vt (gvm_json_pull_parser_t *parser, gvm_json_pull_event_t *event)
       g_debug ("%s: Start parsing feed", __func__);
     }
   else if (!g_strcmp0 (path, "$")
-           && event->type == GVM_JSON_PULL_EVENT_ARRAY_END)
+           && (event->type == GVM_JSON_PULL_EVENT_ARRAY_END
+               || event->type == GVM_JSON_PULL_EVENT_EOF))
     {
       g_debug ("%s: Finish parsing feed", __func__);
+      g_free (path);
       return NULL;
     }
   g_free (path);
 
   // It is an NVT object
   if (event->type != GVM_JSON_PULL_EVENT_OBJECT_START)
     {
-      g_message ("%s: Error reading VT object", __func__);
+      g_warning ("%s: Error reading VT object", __func__);
       return NULL;
     }
 

util/jsonpull.c

@@ -740,7 +740,7 @@ gvm_json_pull_parser_next (gvm_json_pull_parser_t *parser,
           return;
         }
     }
-  
+
   event->path = parser->path;
 
   // Delayed addition to path after a container start element