Changeset 1579

Timestamp:

02/28/08 21:49:03 (6 months ago)

Author:

oxff

Message:

fixed broken libcurl usage and server response interpretation

Files:

• honeytrap/trunk/src/modules/htm_submitMWserv.c (modified) (16 diffs)

honeytrap/trunk/src/modules/htm_submitMWserv.c

@@ -14 +14 @@
- *   still to come...
- */
+ 
+#define C(); { printf("%s:%u\n", __PRETTY_FUNCTION__, __LINE__); fflush(stdout); }
+ 
-
-#define _GNU_SOURCE 1
@@ -50 +53 @@
-#define TSS_UNKNOWN     1
-#define TSS_OK          2
-#define TSS_HEARTBEAT   3
-
-#define ST_SUBMIT       1
@@ -68 +70 @@
-
-const char      *mwserv_url;
+char * submit_url;
-
-const char      *guid;
@@ -87 +90 @@
-void plugin_unload(void) {
-        unhook(PPRIO_SAVEDATA, module_name, "submit_mwserv");
+        free(submit_url);
-        return;
-}
@@ -115 +119 @@
-                if OPT_IS("mwserv_url") {
-                        mwserv_url = value;
+                        asprintf(&submit_url, "%shoneytrap/submit-binary", mwserv_url);
-                } else if OPT_IS("guid") {
-                        guid = value;
@@ -167 +172 @@
-
-int response_code(const bstr *response) {
-
-
-
-
-
+
+
+
-}
-
@@ -178 +181 @@
-        switch(response_code(response)) {
-        case TSS_OK:
+                C();
-                logmsg(LOG_NOISY, 1, "SubmitMWServ - Server returned transfer status OK.\n");
-                return(TSS_OK);
-        case TSS_HEARTBEAT:
-                logmsg(LOG_NOISY, 1, "SubmitMWServ - Server returned transfer status HEARTBEAT.\n");
-                return(TSS_HEARTBEAT);
-        case TSS_ERROR:
-                logmsg(LOG_ERR, 1, "SubmitMWServ - Server returned transfer status ERROR.\n");
-                return(TSS_ERROR);
-        case TSS_UNKNOWN:
+                C();
+                logmsg(LOG_WARN, 1, "SubmitMWServ - Server returned status UNKNOWN.\n");
+                return(TSS_UNKNOWN);
-        default:
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-}
-
-int transfer_data(CURLM *mhandle, const bstr *response) {
-, resp
+
-        fd_set          rfds, wfds, efds;
-        struct timeval  select_timeout;
@@ -201 +208 @@
-
-        rv      = 1;
-
+ >= 0
-                FD_ZERO(&rfds);
-                FD_ZERO(&wfds);
@@ -214 +221 @@
-                max_fd = MAX(max_fd, sigpipe[0]);
-
-timeout
+1
-                select_timeout.tv_usec  = 0;
-                
@@ -226 +233 @@
-                        }
-                        break;
-                case 0:
-                        logmsg(LOG_WARN, 1, "SubmitMWServ Warning - Select timed out.\n");
-                        if ((resp = check_response(response)) == -1) return(-1);
-                        else if (resp == 1) return(1);
-                        break;
-                default:
+                
-                        if (FD_ISSET(sigpipe[0], &rfds) && (check_sigpipe() == -1)) {
-                                fprintf(stderr, "SubmitMWServ Error - Select failed.\n");
@@ -239 +242 @@
-                        handles = 0;
-                        logmsg(LOG_DEBUG, 1, "SubmitMWServ - Data to process.\n");
+                        
+                        
-                        while(curl_multi_perform(mhandle, &handles) == CURLM_CALL_MULTI_PERFORM && handles);
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
-                        break;
-                }
-        }
@@ -272 +287 @@
-                return(NULL);
-        }
-
-        
+                
-        logmsg(LOG_NOISY, 1, "SubmitMWServ - Constructing HTTP form for request type %d.\n", type);
-        
@@ -296 +311 @@
-        curl_easy_setopt(*curlhandle, CURLOPT_SSL_VERIFYHOST, 0);
-        curl_easy_setopt(*curlhandle, CURLOPT_SSL_VERIFYPEER, 0);
-mwserv
+submit
-        curl_easy_setopt(*curlhandle, CURLOPT_USERAGENT, "honeytrap " VERSION " (" MY_OS ", " MY_ARCH ", " MY_COMPILER ")");
-        curl_easy_setopt(*curlhandle, CURLOPT_WRITEDATA, response);
-        curl_easy_setopt(*curlhandle, CURLOPT_WRITEFUNCTION, get_response);
+        curl_easy_setopt(*curlhandle, CURLOPT_TIMEOUT, timeout);
-
-        logmsg(LOG_DEBUG, 1, "SubmitMWServ - Creating multi handle.\n");
@@ -339 +355 @@
-                memset(&response, 0, sizeof(bstr));
-                
+                if (build_uri(&uri, attack->download[i]) == -1) {
+                        logmsg(LOG_ERR, 1, "SubmitMWServ Error - Unable to create URI: %m.\n");
+                        return(0);
+                }
+                
-                if ((pinfo = init_handle(&multihandle, &curlhandle,
-                                attack->download[i].dl_payload.data, attack->download[i].dl_payload.size,
@@ -346 +367 @@
-                }
-
-
+
+
+
-                        logmsg(LOG_NOTICE, 1, "SubmitMWServ - Sample is already present at %s, skipping submission.\n", mwserv_url);
-
+
+
+
+
+
-                        logmsg(LOG_ERR, 1, "SubmitMWServ Error - Hash test failed.\n");
+                        free(response.data);
+                        
+                        continue;
+                }
-
-                free(response.data);
@@ -356 +387 @@
-                // submit sample
-                logmsg(LOG_INFO, 1, "SubmitMWServ - Submitting sample to %s.\n", mwserv_url);
-
-                if (build_uri(&uri, attack->download[i]) == -1) {
-                        logmsg(LOG_ERR, 1, "SubmitMWServ Error - Unable to create URI: %m.\n");
-                        return(0);
-                }
-
-                memset(&response, 0, sizeof(bstr));