rhodes 1.5.5 → 2.0.0.beta1

data/platform/shared/net/AsyncHttp.cpp

@@ -1,5 +1,5 @@
 #include "net/AsyncHttp.h"
-#include "ruby/ext/rho/rhoruby.h"
+#include "rubyext/RhoRuby.h"
 #include "common/StringConverter.h"
 #include "net/URI.h"
 #include "common/RhodesApp.h"
@@ -20,7 +20,8 @@ extern "C" void header_iter(const char* szName, const char* szValue, void* pHash
 }
 
 CAsyncHttp::CAsyncHttp(common::IRhoClassFactory* factory, EHttpCommands eCmd,
-    const char* url, unsigned long headers, const char* body, const char* callback, const char* callback_params) :  CRhoThread(factory)
+    const char* url, unsigned long headers, const char* body,
+    const char* callback, const char* callback_params, boolean ssl_verify_peer) :  CRhoThread(factory)
 {
     m_bFinished = false;
     m_ptrFactory = factory;
@@ -29,6 +30,7 @@ CAsyncHttp::CAsyncHttp(common::IRhoClassFactory* factory, EHttpCommands eCmd,
     m_strCallback = callback != null ? callback : "";
     m_strCallbackParams = callback_params != null ? callback_params : "";
     m_eCmd = eCmd;
+    m_sslVerifyPeer = ssl_verify_peer;
 
     rho_ruby_enum_strhash(headers, &header_iter, &m_mapHeaders);
 
@@ -106,11 +108,12 @@ void CAsyncHttp::cancel(boolean bWait)
 
 void CAsyncHttp::run()
 {
-	LOG(INFO) + "RhoHttp thread start.";
+    LOG(INFO) + "RhoHttp thread start.";
 
     {		
-    	synchronized(m_mxRequest)
+        synchronized(m_mxRequest)
         m_pNetRequest = m_ptrFactory->createNetRequest();
+        m_pNetRequest->sslVerifyPeer(m_sslVerifyPeer);
     }
 
     switch( m_eCmd )
@@ -127,13 +130,19 @@ void CAsyncHttp::run()
         break;
 
     case hcUpload:
-        m_pNetResponse = m_pNetRequest->pushFile(m_strUrl, m_strBody, null, &m_mapHeaders);
-        break;
+        {
+            net::CMultipartItem oItem;
+            oItem.m_strFilePath = m_strBody;
+            oItem.m_strContentType = "application/octet-stream";
+
+            m_pNetResponse = m_pNetRequest->pushMultipartData( m_strUrl, oItem, null, &m_mapHeaders );
+            break;
+        }
     }
 
     if ( !m_pNetRequest->isCancelled())
     {
-        //processResponse(m_pNetResponse);
+        //processResponse(*m_pNetResponse);
         callNotify(*m_pNetResponse,0);
     }
 
@@ -205,13 +214,7 @@ void CAsyncHttp::callNotify(rho::net::INetResponse& resp, int nError )
         else
         {
     	    m_strResBody += "error&error_code=";
-            if ( !resp.isResponseRecieved())
-                m_strResBody += convertToStringA(1);//RhoRuby.ERR_NETWORK);
-            else if ( resp.isUnathorized() )
-                m_strResBody += convertToStringA(9);//RhoRuby.ERR_UNATHORIZED);
-            else
-	            m_strResBody += convertToStringA(2);//RhoRuby.ERR_REMOTESERVER);
-
+            m_strResBody += convertToStringA(RhoRuby.getErrorFromResponse(resp));
             if ( resp.isResponseRecieved())
 	            m_strResBody += "&http_error=" + convertToStringA(resp.getRespCode());
         }
@@ -244,27 +247,27 @@ extern "C" {
 
 using namespace rho::net;
 
-unsigned long rho_asynchttp_get(const char* url, unsigned long headers, const char* callback, const char* callback_params)
+unsigned long rho_asynchttp_get(const char* url, unsigned long headers, const char* callback, const char* callback_params, int ssl_verify_peer)
 {
-    CAsyncHttp* pHttp = new CAsyncHttp(rho::common::createClassFactory(), CAsyncHttp::hcGet, url, headers, null, callback, callback_params );
+    CAsyncHttp* pHttp = new CAsyncHttp(rho::common::createClassFactory(), CAsyncHttp::hcGet, url, headers, null, callback, callback_params, ssl_verify_peer!=0 );
     return pHttp->getRetValue();
 }
 
-unsigned long rho_asynchttp_post(const char* url, unsigned long headers, const char* body, const char* callback, const char* callback_params)
+unsigned long rho_asynchttp_post(const char* url, unsigned long headers, const char* body, const char* callback, const char* callback_params, int ssl_verify_peer)
 {
-    CAsyncHttp* pHttp = new CAsyncHttp(rho::common::createClassFactory(), CAsyncHttp::hcPost, url, headers, body!=null?body:"", callback, callback_params );
+    CAsyncHttp* pHttp = new CAsyncHttp(rho::common::createClassFactory(), CAsyncHttp::hcPost, url, headers, body!=null?body:"", callback, callback_params, ssl_verify_peer!=0 );
     return pHttp->getRetValue();
 }
 
-unsigned long rho_asynchttp_downloadfile(const char* url, unsigned long headers, const char* file_path, const char* callback, const char* callback_params)
+unsigned long rho_asynchttp_downloadfile(const char* url, unsigned long headers, const char* file_path, const char* callback, const char* callback_params, int ssl_verify_peer)
 {
-    CAsyncHttp* pHttp = new CAsyncHttp(rho::common::createClassFactory(), CAsyncHttp::hcDownload, url, headers, file_path, callback, callback_params );
+    CAsyncHttp* pHttp = new CAsyncHttp(rho::common::createClassFactory(), CAsyncHttp::hcDownload, url, headers, file_path, callback, callback_params, ssl_verify_peer!=0 );
     return pHttp->getRetValue();
 }
 
-unsigned long rho_asynchttp_uploadfile(const char* url, unsigned long headers, const char* file_path, const char* callback, const char* callback_params)
+unsigned long rho_asynchttp_uploadfile(const char* url, unsigned long headers, const char* file_path, const char* callback, const char* callback_params, int ssl_verify_peer)
 {
-    CAsyncHttp* pHttp = new CAsyncHttp(rho::common::createClassFactory(), CAsyncHttp::hcUpload, url, headers, file_path, callback, callback_params );
+    CAsyncHttp* pHttp = new CAsyncHttp(rho::common::createClassFactory(), CAsyncHttp::hcUpload, url, headers, file_path, callback, callback_params, ssl_verify_peer!=0 );
     return pHttp->getRetValue();
 }
 

data/platform/shared/net/AsyncHttp.h

@@ -26,7 +26,8 @@ class CAsyncHttp : public common::CRhoThread, rho::ICallbackObject
     Hashtable<String,String> m_mapHeaders;
 
     String m_strUrl, m_strBody, m_strCallback, m_strCallbackParams;
-    String m_strResBody;
+	String m_strResBody;
+    boolean m_sslVerifyPeer;
     boolean m_bFinished;
 public:
     enum EHttpCommands{ hcGet = 0, hcPost, hcDownload, hcUpload };
@@ -34,8 +35,11 @@ private:
     EHttpCommands m_eCmd;
 public:
 
+    static boolean m_bNoThreaded;
+
     CAsyncHttp(common::IRhoClassFactory* factory, EHttpCommands eCmd,
-        const char* url, unsigned long headers, const char* body, const char* callback, const char* callback_params);
+        const char* url, unsigned long headers, const char* body,
+        const char* callback, const char* callback_params, boolean ssl_verify_peer = true);
 
     void cancel(boolean bWait);
 
@@ -63,10 +67,10 @@ private:
 extern "C" {
 #endif //__cplusplus
 	
-unsigned long rho_asynchttp_get(const char* url, unsigned long headers, const char* callback, const char* callback_params);
-unsigned long rho_asynchttp_post(const char* url, unsigned long headers, const char* body, const char* callback, const char* callback_params);
-unsigned long rho_asynchttp_downloadfile(const char* url, unsigned long headers, const char* filename, const char* callback, const char* callback_params);
-unsigned long rho_asynchttp_uploadfile(const char* url, unsigned long headers, const char* filename, const char* callback, const char* callback_params);
+unsigned long rho_asynchttp_get(const char* url, unsigned long headers, const char* callback, const char* callback_params, int ssl_verify_peer);
+unsigned long rho_asynchttp_post(const char* url, unsigned long headers, const char* body, const char* callback, const char* callback_params, int ssl_verify_peer);
+unsigned long rho_asynchttp_downloadfile(const char* url, unsigned long headers, const char* filename, const char* callback, const char* callback_params, int ssl_verify_peer);
+unsigned long rho_asynchttp_uploadfile(const char* url, unsigned long headers, const char* filename, const char* callback, const char* callback_params, int ssl_verify_peer);
 void rho_asynchttp_cancel(const char* cancel_callback);
 void rho_asynchttp_destroy();
 

data/platform/shared/net/CURLNetRequest.cpp

@@ -16,7 +16,8 @@ namespace rho
 {
 namespace net
 {
-curl_slist *set_curl_options(bool trace, CURL *curl, const char *method, const String& strUrl, IRhoSession* pSession, Hashtable<String,String>* pHeaders);
+curl_slist *set_curl_options(bool trace, CURL *curl, const char *method, const String& strUrl, const String& strBody,
+                             IRhoSession* pSession, Hashtable<String,String>* pHeaders, bool sslVerifyPeer);
 CURLMcode do_curl_perform(CURLM *curlm, CURL *curl);
 	
 IMPLEMENT_LOGCLASS(CURLNetRequest, "Net");
@@ -81,6 +82,7 @@ public:
 CURLNetRequest::CURLNetRequest()
 {
     m_bTraceCalls = rho_conf_getBool("net_trace");
+    m_sslVerifyPeer = true;
 	curlm = curl_multi_init();
     curl = curl_easy_init();
     curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, &errbuf);
@@ -115,7 +117,7 @@ static size_t curlBodyStringCallback(void *ptr, size_t size, size_t nmemb, void
     RAWTRACE1("Received %d bytes (string)", nBytes);
     pStr->append((const char *)ptr, nBytes);
     return nBytes;
-}    
+}
 
 INetResponse* CURLNetRequest::pullData(const String& strUrl, IRhoSession* oSession )
 {
@@ -129,11 +131,11 @@ INetResponse* CURLNetRequest::pushData(const String& strUrl, const String& strBo
 
 INetResponse* CURLNetRequest::pullCookies(const String& strUrl, const String& strBody, IRhoSession* oSession)
 {
-	INetResponse* pResp = doRequest("POST", strUrl, strBody, oSession, null );
-	if ( pResp->isOK() )
-		((CURLNetResponseImpl*)pResp)->setCharData(pResp->getCookies());
-		
-	return pResp;
+    INetResponse* pResp = doRequest("POST", strUrl, strBody, oSession, null );
+    if ( pResp->isOK() )
+        ((CURLNetResponseImpl*)pResp)->setCharData(pResp->getCookies());
+
+    return pResp;
 }
 	
 INetResponse* CURLNetRequest::doRequest( const char* method, const String& strUrl, const String& strBody, IRhoSession* oSession, Hashtable<String,String>* pHeaders )
@@ -142,35 +144,90 @@ INetResponse* CURLNetRequest::doRequest( const char* method, const String& strUr
     m_bCancel = false;
     int nRespCode = -1;
     String strRespBody;
-	
+
     RAWLOG_INFO1("Request url: %s", strUrl.c_str());
-	
+
     rho_net_impl_network_indicator(1);
-	
-    curl_slist *hdrs = set_curl_options(m_bTraceCalls, curl, method, strUrl, oSession, pHeaders );
-	if (strcasecmp(method, "POST") == 0) {
-		curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, strBody.size());
-		curl_easy_setopt(curl, CURLOPT_POSTFIELDS, strBody.c_str());
-	}
-	curl_easy_setopt(curl, CURLOPT_WRITEDATA, &strRespBody);
-	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &curlBodyStringCallback);
-	
-	CURLMcode err = do_curl_perform(curlm, curl);
-	curl_slist_free_all(hdrs);
-	
+
+    curl_slist *hdrs = set_curl_options(m_bTraceCalls, curl, method, strUrl, strBody, oSession, pHeaders, m_sslVerifyPeer);
+    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &strRespBody);
+    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &curlBodyStringCallback);
+
+    CURLMcode err = do_curl_perform(curlm, curl);
+    curl_slist_free_all(hdrs);
+
     rho_net_impl_network_indicator(0);
-	
-	nRespCode = getResponseCode(err, strRespBody, oSession);
-	if (nRespCode == 200)
-	{
+
+    nRespCode = getResponseCode(err, strRespBody, oSession);
+    if (nRespCode == 200)
+    {
         RAWTRACE("RESPONSE-----");
         RAWTRACE(strRespBody.c_str());
         RAWTRACE("END RESPONSE-----");
-	}
+    }
+
+    return makeResponse(strRespBody, nRespCode);
+}
+
+INetResponse* CURLNetRequest::pushMultipartData(const String& strUrl, VectorPtr<CMultipartItem*>& arItems, IRhoSession* oSession, Hashtable<String,String>* pHeaders)
+{
+    int nRespCode = -1;
+    String strRespBody;
+    
+    rho_net_impl_network_indicator(1);
+    
+    curl_slist *hdrs = set_curl_options(m_bTraceCalls, curl, "POST", strUrl, String(), oSession, pHeaders, m_sslVerifyPeer);
+    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &strRespBody);
+    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &curlBodyStringCallback);
 	
+    curl_httppost *post = NULL, *last = NULL;
+    curl_easy_setopt(curl, CURLOPT_POSTFIELDS, NULL);
+    for (size_t i = 0, lim = arItems.size(); i < lim; ++i) {
+        CMultipartItem *mi = arItems[i];
+        
+        const char *name = mi->m_strName.c_str();
+        int opt = mi->m_strFilePath.empty() ? CURLFORM_COPYCONTENTS : CURLFORM_FILE;
+        const char *data = mi->m_strFilePath.empty() ? mi->m_strBody.c_str() : mi->m_strFilePath.c_str();
+        const char *ct = mi->m_strContentType.empty() ? NULL : mi->m_strContentType.c_str();
+        if (ct) {
+            curl_formadd(&post, &last,
+                         CURLFORM_COPYNAME, name,
+                         opt, data,
+                         CURLFORM_CONTENTTYPE, ct,
+                         CURLFORM_END);
+        }
+        else {
+            curl_formadd(&post, &last,
+                         CURLFORM_COPYNAME, name,
+                         opt, data,
+                         CURLFORM_END);
+        }
+    }
+        
+    curl_easy_setopt(curl, CURLOPT_HTTPPOST, post);
+    
+    CURLMcode err = do_curl_perform(curlm, curl);
+	
+    curl_slist_free_all(hdrs);
+    curl_formfree(post);
+    
+    rho_net_impl_network_indicator(0);
+    
+    nRespCode = getResponseCode(err, strRespBody, oSession);
     return makeResponse(strRespBody, nRespCode);
 }
 
+INetResponse* CURLNetRequest::pushMultipartData(const String& strUrl, CMultipartItem& oItem, IRhoSession* oSession, Hashtable<String,String>* pHeaders)
+{
+    VectorPtr<CMultipartItem*> arItems;
+    arItems.addElement(&oItem);
+
+    INetResponse* pResp = pushMultipartData(strUrl, arItems, oSession, pHeaders);
+
+    arItems[0] = 0; //do not delete item
+    return pResp;
+}
+
 INetResponse* CURLNetRequest::pushFile(const String& strUrl, const String& strFilePath, IRhoSession* oSession, Hashtable<String,String>* pHeaders)
 {
     m_bCancel = false;
@@ -188,9 +245,9 @@ INetResponse* CURLNetRequest::pushFile(const String& strUrl, const String& strFi
 	
     rho_net_impl_network_indicator(1);
 	
-    curl_slist *hdrs = set_curl_options(m_bTraceCalls, curl, "POST", strUrl, oSession, pHeaders );
-	curl_easy_setopt(curl, CURLOPT_WRITEDATA, &strRespBody);
-	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &curlBodyStringCallback);
+    curl_slist *hdrs = set_curl_options(m_bTraceCalls, curl, "POST", strUrl, String(), oSession, pHeaders, m_sslVerifyPeer);
+    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &strRespBody);
+    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &curlBodyStringCallback);
 	
     curl_httppost *post = NULL, *last = NULL;
     curl_easy_setopt(curl, CURLOPT_POSTFIELDS, NULL);
@@ -208,7 +265,7 @@ INetResponse* CURLNetRequest::pushFile(const String& strUrl, const String& strFi
 	
     rho_net_impl_network_indicator(0);
     
-	nRespCode = getResponseCode(err, strRespBody, oSession);
+    nRespCode = getResponseCode(err, strRespBody, oSession);
     return makeResponse(strRespBody, nRespCode);
 }
 	
@@ -229,7 +286,7 @@ INetResponse* CURLNetRequest::pullFile(const String& strUrl, const String& strFi
 
     rho_net_impl_network_indicator(1);
     
-	curl_slist *hdrs = set_curl_options(m_bTraceCalls, curl, "GET", strUrl, oSession, pHeaders);
+	curl_slist *hdrs = set_curl_options(m_bTraceCalls, curl, "GET", strUrl, String(), oSession, pHeaders, m_sslVerifyPeer);
 	curl_easy_setopt(curl, CURLOPT_WRITEDATA, &oFile);
 	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &curlBodyFileCallback);
 	
@@ -368,11 +425,11 @@ static size_t curlHeaderCallback(void *ptr, size_t size, size_t nmemb, void *opa
     int nSep = strHeader.find(':');
     if (nSep > 0 )
     {		
-        String strName = trim(strHeader.substr(0, nSep));
+        String strName = String_trim(strHeader.substr(0, nSep));
         String lName;
         std::transform(strName.begin(), strName.end(), std::back_inserter(lName), &::tolower);
 
-        String strValue = trim(strHeader.substr(nSep+1, strHeader.length() - (nSep+3) ));
+        String strValue = String_trim(strHeader.substr(nSep+1, strHeader.length() - (nSep+3) ));
     
         pHeaders->put(lName, strValue);
     }
@@ -380,7 +437,8 @@ static size_t curlHeaderCallback(void *ptr, size_t size, size_t nmemb, void *opa
     return nBytes;
 }
 
-curl_slist *set_curl_options(bool trace, CURL *curl, const char *method, const String& strUrl, IRhoSession* pSession, Hashtable<String,String>* pHeaders)
+curl_slist *set_curl_options(bool trace, CURL *curl, const char *method, const String& strUrl, const String& strBody,
+                             IRhoSession* pSession, Hashtable<String,String>* pHeaders, bool sslVerifyPeer)
 {
     curl_easy_reset(curl);
     if (strcasecmp(method, "GET") == 0)
@@ -405,6 +463,8 @@ curl_slist *set_curl_options(bool trace, CURL *curl, const char *method, const S
     curl_easy_setopt(curl, CURLOPT_TIMEOUT, 180);
     curl_easy_setopt(curl, CURLOPT_TCP_NODELAY, 1);
     
+    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, (long)sslVerifyPeer);
+    
     // Set very large timeout in case of local requests
     // It is required because otherwise requests (especially requests to writing!)
     // could repeated twice or more times
@@ -416,13 +476,22 @@ curl_slist *set_curl_options(bool trace, CURL *curl, const char *method, const S
     hdrs = curl_slist_append(hdrs, "Expect:");
     // Add Keep-Alive header
     hdrs = curl_slist_append(hdrs, "Connection: Keep-Alive");
+
+    if (strcasecmp(method, "POST") == 0) {
+        curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, strBody.size());
+        curl_easy_setopt(curl, CURLOPT_POSTFIELDS, strBody.c_str());
+    }
+    
+    bool hasContentType = false;
     if (pHeaders)
     {
         for ( Hashtable<String,String>::iterator it = pHeaders->begin();  it != pHeaders->end(); ++it )
         {
-            String strHeader = it->first + ":" + it->second;
+            if (!hasContentType && strcasecmp(it->first.c_str(), "content-type") == 0)
+                hasContentType = true;
+            String strHeader = it->first + ": " + it->second;
             hdrs = curl_slist_append(hdrs, strHeader.c_str());
-            curl_easy_setopt(curl, CURLOPT_HTTPHEADER, hdrs);
+//            curl_easy_setopt(curl, CURLOPT_HTTPHEADER, hdrs);
         }
         
         //set header callback
@@ -431,6 +500,16 @@ curl_slist *set_curl_options(bool trace, CURL *curl, const char *method, const S
         
     }
     
+    if (!hasContentType && strcasecmp(method, "POST") == 0 && strBody.length() > 0)
+    {
+        String strHeader = "Content-Type: ";
+        if ( pSession )
+            strHeader += pSession->getContentType().c_str();
+        else
+            strHeader += "application/x-www-form-urlencoded";
+        hdrs = curl_slist_append(hdrs, strHeader.c_str());
+    }
+    
     curl_easy_setopt(curl, CURLOPT_HTTPHEADER, hdrs);
     
     if (trace) {

data/platform/shared/net/CURLNetRequest.h

@@ -21,10 +21,15 @@ public:
     INetResponse *pullData(const String& strUrl, IRhoSession *oSession);
     INetResponse *pushData(const String& strUrl, const String& strBody, IRhoSession *oSession);
     INetResponse *pushFile(const String& strUrl, const String& strFileName, IRhoSession *oSession, Hashtable<String,String>* pHeaders);
+    INetResponse* pushMultipartData(const String& strUrl, VectorPtr<CMultipartItem*>& arItems, IRhoSession* oSession, Hashtable<String,String>* pHeaders);
+    INetResponse* pushMultipartData(const String& strUrl, CMultipartItem& oItem, IRhoSession* oSession, Hashtable<String,String>* pHeaders);
     INetResponse *pullFile(const String& strUrl, const String& strFilePath, IRhoSession *oSession, Hashtable<String,String>* pHeaders);
     INetResponse *pullCookies(const String& strUrl, const String& strBody, IRhoSession *oSession);
     INetResponse* doRequest( const char* method, const String& strUrl, const String& strBody, IRhoSession* oSession, Hashtable<String,String>* pHeaders );
 
+    boolean sslVerifyPeer() {return m_sslVerifyPeer;}
+    void sslVerifyPeer(boolean mode) {m_sslVerifyPeer = mode;}
+    
     String resolveUrl(const String& strUrl);
 
     void cancel();
@@ -40,6 +45,7 @@ private:
     CURL *curl;
     char *errbuf[CURL_ERROR_SIZE];
     boolean m_bTraceCalls;
+    boolean m_sslVerifyPeer;
 };
 
 } // namespace net

data/platform/shared/net/HttpServer.cpp

@@ -1,10 +1,10 @@
-#include <algorithm>
-
 #include "net/HttpServer.h"
 #include "common/RhodesApp.h"
 #include "common/RhoFilePath.h"
 #include "ruby/ext/rho/rhoruby.h"
 
+#include <algorithm>
+
 #if !defined(OS_WINCE)
 #include <sys/stat.h>
 #else
@@ -813,7 +813,9 @@ bool CHttpServer::dispatch(String const &uri, Route &route)
 bool CHttpServer::send_file(String const &path)
 {
     String fullPath = CFilePath::normalizePath(path);
-	if (fullPath.find(m_root) != 0)
+    if (String_startsWith(fullPath,"/app/db/db-files") )
+        fullPath = CFilePath::join( RHODESAPP().getRhoRootPath(), path.substr(4) );
+    else if (fullPath.find(m_root) != 0)
         fullPath = CFilePath::join( m_root, path );
 	
     if (verbose) RAWTRACE1("Sending file %s...", fullPath.c_str());
@@ -877,7 +879,7 @@ bool CHttpServer::decide(String const &method, String const &uri, String const &
     callback_t callback = registered(uri);
     if (callback) {
         RAWTRACE1("Uri %s is registered callback, so handle it appropriately", uri.c_str());
-        callback(this, query);
+        callback(this, query.length() ? query : body);
         return true;
     }