rhodes 6.2.0 → 7.1.17

data/platform/shared/common/map/GeocodingMapEngine.cpp

@@ -181,7 +181,7 @@ void GoogleGeoCoding::processCommand(IQueueCommand *pCmd)
     Command *cmd = (Command*)pCmd;
     GeoCodingCallback &cb = *(cmd->callback);
 
-    String url = "http://maps.googleapis.com/maps/api/geocode/json?";
+    String url = "https://maps.googleapis.com/maps/api/geocode/json?";
     
     if (cmd->is_inverse) {
         char* buf = new char[2048];

data/platform/shared/common/map/GoogleMapEngine.cpp

@@ -77,7 +77,7 @@ int GoogleMapView::getMapTile(uint64 p_zoom, uint64 p_row, uint64 p_column, void
     //snprintf(buf, sizeof(buf), "http://a.tah.openstreetmap.org/Tiles/tile/%d/%d/%d.png", zoom, (int)p_column, (int)p_row);
 
     // Google Map
-    snprintf(buf, sizeof(buf), "http://maps.googleapis.com/maps/api/staticmap?center=%f,%f&zoom=%d&size=256x280&scale=1&maptype=%s&format=png&sensor=false&mobile=true", center_latitude, center_longitude, zoom, mapType().c_str());
+    snprintf(buf, sizeof(buf), "https://maps.googleapis.com/maps/api/staticmap?center=%f,%f&zoom=%d&size=256x280&scale=1&maptype=%s&format=png&sensor=false&mobile=true", center_latitude, center_longitude, zoom, mapType().c_str());
 
     // Google Map on Blackberry
 

data/platform/shared/common/map/OSMMapEngine.cpp

@@ -52,7 +52,7 @@ OSMMapView::OSMMapView(IDrawingDevice *device)
     
     String url = RHOCONF().getString("OSM_map_url_roadmap");
     if (url.empty())
-        url = "http://tile.openstreetmap.org/";
+        url = "https://tile.openstreetmap.org/";
     if (url[url.size() - 1] != '/')
         url.push_back('/');    
     

data/platform/shared/curl/lib/curl_config.h

@@ -873,7 +873,11 @@
 #define RECV_TYPE_ARG4 unsigned int
 
 /* Define to the function return type for recv. */
+#ifdef __aarch64__
+#define RECV_TYPE_RETV ssize_t
+#else
 #define RECV_TYPE_RETV int
+#endif
 
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void
@@ -909,31 +913,55 @@
 #define SEND_TYPE_ARG4 unsigned int
 
 /* Define to the function return type for send. */
+#ifdef __aarch64__
+#define SEND_TYPE_RETV size_t
+#else
 #define SEND_TYPE_RETV int
+#endif
 
 /* The size of `int', as computed by sizeof. */
 #define SIZEOF_INT 4
 
 /* The size of `long', as computed by sizeof. */
+#ifdef __aarch64__
+#define SIZEOF_LONG 8
+#else
 #define SIZEOF_LONG 4
+#endif
 
 /* The size of `long long', as computed by sizeof. */
 /* #undef SIZEOF_LONG_LONG */
 
 /* The size of `off_t', as computed by sizeof. */
+#ifdef __aarch64__
+#define SIZEOF_OFF_T 8
+#else
 #define SIZEOF_OFF_T 4
+#endif
 
 /* The size of `short', as computed by sizeof. */
 #define SIZEOF_SHORT 2
 
 /* The size of `size_t', as computed by sizeof. */
+#ifdef __aarch64__
+#define SIZEOF_SIZE_T 8
+#else
 #define SIZEOF_SIZE_T 4
+#endif
 
 /* The size of `time_t', as computed by sizeof. */
+#ifdef __aarch64__
+#define SIZEOF_TIME_T 8
+#else
 #define SIZEOF_TIME_T 4
+#endif
 
 /* The size of `void*', as computed by sizeof. */
+#ifdef __aarch64__
+#define SIZEOF_VOIDP 8
+#else
 #define SIZEOF_VOIDP 4
+#endif
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1

data/platform/shared/db/DBAdapter.cpp

@@ -354,7 +354,6 @@ void CDBAdapter::CDBVersion::toFile(const String& strFilePath)const//throws Exce
 
 boolean CDBAdapter::migrateDB(const CDBVersion& dbVer, const CDBVersion& dbNewVer )
 {
-    if (usingDeprecatedPageSize()) return true;
     LOG(INFO) + "Try migrate database from " + dbVer.m_strRhoVer + " to " + dbNewVer.m_strRhoVer;
     if ( (dbVer.m_strRhoVer.find("1.4") == 0)&& (dbNewVer.m_strRhoVer.find("1.5")==0||dbNewVer.m_strRhoVer.find("1.4")==0) )
     {
@@ -363,14 +362,22 @@ boolean CDBAdapter::migrateDB(const CDBVersion& dbVer, const CDBVersion& dbNewVe
         return true;
     }
 
-    if ( (dbVer.m_strRhoVer.find("2.0") == 0||dbVer.m_strRhoVer.find("2.1") == 0||dbVer.m_strRhoVer.find("2.2") == 0)&& 
-         (dbNewVer.m_strRhoVer.find("2.0")==0||dbNewVer.m_strRhoVer.find("2.1")==0||dbNewVer.m_strRhoVer.find("2.2")==0) )
+    
+    if ( ( (dbVer.m_strRhoVer.find("2.0") == 0) || (dbVer.m_strRhoVer.find("2.1") == 0) || (dbVer.m_strRhoVer.find("2.2") == 0) || (dbVer.m_strRhoVer.find("3.22.0") == 0))&&
+         ( (dbNewVer.m_strRhoVer.find("2.0")==0) || (dbNewVer.m_strRhoVer.find("2.1")==0) || (dbNewVer.m_strRhoVer.find("2.2")==0) || (dbNewVer.m_strRhoVer.find("3.22.0")==0) ) )
     {
         LOG(INFO) + "No migration required from " + dbVer.m_strRhoVer + " to " + dbNewVer.m_strRhoVer;
         dbNewVer.toFile(m_strDbVerPath);
         return true;
     }
 
+    // we should never visit this code, but ...
+    if (usingDeprecatedPageSize()) {
+        LOG(INFO) + "No migration required with special use_deprecated_encryption flag in build.yml from " + dbVer.m_strRhoVer + " to " + dbNewVer.m_strRhoVer;
+        //dbNewVer.toFile(m_strDbVerPath);
+        return true;
+    }
+    
     //1.2.x -> 1.5.x,1.4.x
     if ( (dbVer.m_strRhoVer.find("1.2") == 0)&& (dbNewVer.m_strRhoVer.find("1.5")==0||dbNewVer.m_strRhoVer.find("1.4")==0) )
     {
@@ -438,17 +445,18 @@ void CDBAdapter::checkDBVersion(String& strRhoDBVer)
 		//	bDbFormatChanged = true;
 	}
 	
-	if ( bDbFormatChanged )
+    if ( bDbFormatChanged ) {
 		LOG(INFO) + "Reset Database( format changed ):" + m_strDbPath;
-	
-    if ( bRhoReset && !bAppReset && !bDbFormatChanged )
+    }
+    if ( bRhoReset && !bAppReset && !bDbFormatChanged ) {
         bRhoReset = !migrateDB(dbVer, dbNewVer);
+    }
 
-        LOG(INFO) + "bRhoReset: " + bRhoReset;
-        LOG(INFO) + "bAppReset: " + bAppReset;
-        LOG(INFO) + "bDbFormatChanged: " + bDbFormatChanged;
+    LOG(INFO) + "bRhoReset: " + bRhoReset;
+    LOG(INFO) + "bAppReset: " + bAppReset;
+    LOG(INFO) + "bDbFormatChanged: " + bDbFormatChanged;
 
-        LOG(INFO) + "Reset Database( format changed ):" + m_strDbPath;
+    //LOG(INFO) + "Reset Database( format changed ):" + m_strDbPath;
 
     if ( bRhoReset || bAppReset || bDbFormatChanged )
 	{

data/platform/shared/json.new/JSONIterator.cpp

@@ -315,7 +315,7 @@ String CJSONEntry::getStringObject( const char* name, const char* szDefValue )
         }
         else {
             const char* str = json_object_get_string(obj);
-            return String(str);
+            return String((0==str)?szDefValue:str);
         }
     }
     else if (szDefValue != 0 )
@@ -336,7 +336,7 @@ String CJSONEntry::getStringObject()
     }
     else {
         const char* str = json_object_get_string(m_object);
-        return String(str);
+        return String((0==str)?"":str);
     }
 }
 

data/platform/shared/net/HttpServer.cpp

@@ -321,6 +321,7 @@ CHttpServer::CHttpServer(int port, String const &root, String const &user_root,
     , m_pQueue(0)    
 #endif
 {
+    //generator = rho_get_RhoClassFactory()->createNetRequestImpl();
     m_enable_external_access = enable_external_access;
     m_started_as_separated_simple_server = started_as_separated_simple_server;
     CHttpServer(port, root, user_root, runtime_root);
@@ -352,6 +353,11 @@ CHttpServer::CHttpServer(int port, String const &root, String const &user_root,
     m_strRhoUserRoot = m_userroot;
 	m_listener = INVALID_SOCKET;
 	m_sock = INVALID_SOCKET;
+
+#if defined(OS_WINDOWS_DESKTOP) || defined(OS_ANDROID)
+    m_generator = rho_conf_getInt("disable_external_access") ? rho_get_RhoClassFactory()->createSecurityTokenGenerator() : nullptr;
+    secureTokenExists = false;
+#endif
 }
     
 CHttpServer::CHttpServer(int port, String const &root)
@@ -375,6 +381,11 @@ CHttpServer::CHttpServer(int port, String const &root)
     m_strRhoUserRoot = m_root.substr(0, m_root.length()-5);
     m_listener = INVALID_SOCKET;
 	m_sock = INVALID_SOCKET;
+
+#if defined(OS_WINDOWS_DESKTOP) || defined(OS_ANDROID)
+    m_generator = rho_conf_getInt("disable_external_access") ? rho_get_RhoClassFactory()->createSecurityTokenGenerator() : nullptr;
+    secureTokenExists = false;
+#endif
 }
 
 CHttpServer::~CHttpServer()
@@ -679,7 +690,9 @@ bool CHttpServer::run()
                 if (verbose) {
                     LOG(INFO) + "GC Start.";
                 }
+                rho_ruby_gc_lock();
                 rb_gc();
+                rho_ruby_gc_release();
                 if (verbose) {
                     LOG(INFO) + "GC End.";
                 }
@@ -959,6 +972,17 @@ bool CHttpServer::process(SOCKET sock)
         return false;
     }
 
+#if defined(OS_WINDOWS_DESKTOP) || defined(OS_ANDROID)
+    if(m_generator && !secureTokenExists)
+    {
+        if (verbose) RAWLOG_ERROR("Rhodes service is only accessible via Rhodes application.");
+        send_response(create_response("403 Forbidden: Rhodes service is only accessible via Rhodes application."));
+        return false;
+    }
+
+    secureTokenExists = false;
+#endif
+
     if ( !String_endsWith( uri, "js_api_entrypoint" ) )
         if (verbose) RAWLOG_INFO1("Process URI: '%s'", uri.c_str());
 
@@ -1012,6 +1036,12 @@ bool CHttpServer::parse_request(String &method, String &uri, String &query, Head
                 Header hdr;
                 if (!parse_header(line, hdr) || hdr.name.empty())
                     return false;
+
+#if defined(OS_WINDOWS_DESKTOP) || defined(OS_ANDROID)
+                if (m_generator && hdr.name == SECURITY_HEADER)
+                    secureTokenExists = hdr.value.find(m_generator->getSecurityToken()) != std::string::npos;
+#endif
+                
                 headers.push_back(hdr);
                 
                 String low;
@@ -1855,7 +1885,9 @@ bool CDirectHttpRequestQueue::run( )
         if ( bProcessed )
         {
           LOG(INFO) + "GC Start.";
+          rho_ruby_gc_lock();
           rb_gc();
+          rho_ruby_gc_release();
           LOG(INFO) + "GC End.";
         }
       }

data/platform/shared/net/HttpServer.h

@@ -32,6 +32,10 @@
 
 #include "common/RhoThread.h"
 
+#if defined(OS_WINDOWS_DESKTOP) || defined(OS_ANDROID)
+#include "common/ISecurityTokenGenerator.h"
+#endif
+
 #if !defined(WINDOWS_PLATFORM)
 typedef int SOCKET;
 #  define INVALID_SOCKET -1
@@ -47,6 +51,12 @@ typedef int SOCKET;
 #  define RHO_NET_ERROR_CODE ::WSAGetLastError()
 #endif
 
+#if defined(OS_WINDOWS_DESKTOP)
+#define SECURITY_HEADER "RHO-SECURE-TOKEN"
+#elif defined(OS_ANDROID)
+#define SECURITY_HEADER "User-Agent"
+#endif
+
 namespace rho
 {
 namespace net
@@ -184,6 +194,11 @@ private:
     bool m_enable_external_access;
     bool m_started_as_separated_simple_server;
 
+#if defined(OS_WINDOWS_DESKTOP) || defined(OS_ANDROID)
+    const rho::common::ISecurityTokenGenerator* m_generator;
+    bool secureTokenExists;
+#endif
+
 #ifdef OS_MACOSX
     common::CMutex m_mxSyncRequest;
     ResponseWriter* m_localResponseWriter;

data/platform/shared/net/INetRequest.cpp

@@ -33,6 +33,7 @@
 
 #include "common/RhoConf.h"
 #include "logging/RhoLog.h"
+#include "common/ISecurityTokenGenerator.h"
 
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "NetRequestTimer"
@@ -161,11 +162,44 @@ rho::net::CNetResponseWrapper CNetRequestWrapper::pullCookies(const String& strU
 
 rho::net::CNetResponseWrapper CNetRequestWrapper::doRequest( const char* method, const String& strUrl, const String& strBody, IRhoSession* oSession, Hashtable<String,String>* pHeaders )
 {
+#if defined(OS_WINDOWS_DESKTOP) || defined(OS_ANDROID)
+    const rho::common::ISecurityTokenGenerator* generator = rho_conf_getInt("disable_external_access") ?
+        rho_get_RhoClassFactory()->createSecurityTokenGenerator() : nullptr;
+
+    Hashtable<String,String> headers;
+    if(generator)
+    {
+        if(!pHeaders)
+            pHeaders = &headers;
+#if defined(OS_ANDROID)
+        pHeaders->insert(std::make_pair(SECURITY_HEADER, "RhodesAgent RHO-SECURE-TOKEN=" + generator->getSecurityToken()));
+#elif defined(OS_WINDOWS_DESKTOP)
+        pHeaders->insert(std::make_pair(SECURITY_HEADER, generator->getSecurityToken()));
+#endif
+    }
+#endif
     return m_pReqImpl->doRequest(method, strUrl, strBody, oSession, pHeaders );
 }
 
 rho::net::CNetResponseWrapper CNetRequestWrapper::pushMultipartData(const String& strUrl, VectorPtr<CMultipartItem*>& arItems, IRhoSession* oSession, Hashtable<String,String>* pHeaders)
 {
+#if defined(OS_WINDOWS_DESKTOP) || defined(OS_ANDROID)
+    const rho::common::ISecurityTokenGenerator* generator = rho_conf_getInt("disable_external_access") ? 
+       rho_get_RhoClassFactory()->createSecurityTokenGenerator() : nullptr;
+
+    Hashtable<String,String> headers;
+    if(generator)
+    {
+        if(!pHeaders)
+            pHeaders = &headers;
+#if defined(OS_ANDROID)
+        pHeaders->insert(std::make_pair(SECURITY_HEADER, "RhodesAgent RHO-SECURE-TOKEN=" + generator->getSecurityToken()));
+#elif defined(OS_WINDOWS_DESKTOP)
+        pHeaders->insert(std::make_pair(SECURITY_HEADER, generator->getSecurityToken()));
+#endif
+    }
+
+#endif
     return m_pReqImpl->pushMultipartData(strUrl, arItems, oSession, pHeaders);
 }
 
@@ -182,6 +216,12 @@ rho::net::CNetResponseWrapper CNetRequestWrapper::pushMultipartData(const String
 
 rho::net::CNetResponseWrapper CNetRequestWrapper::pullFile(const String& strUrl, const String& strFilePath, IRhoSession* oSession, Hashtable<String,String>* pHeaders,bool overwriteFile,bool createFolders, bool* pFileExistsFlag )
 {
+
+#if defined(OS_WINDOWS_DESKTOP) || defined(OS_ANDROID)
+    const rho::common::ISecurityTokenGenerator* generator = rho_conf_getInt("disable_external_access") ?
+        rho_get_RhoClassFactory()->createSecurityTokenGenerator() : nullptr;
+#endif
+
     if (!overwriteFile && common::CRhoFile::isFileExist(strFilePath.c_str())) {
         LOGC(WARNING,"Net") + "pullFile: " + strFilePath + " already exists, won't download since overwrite flag is not set";
         
@@ -213,6 +253,7 @@ rho::net::CNetResponseWrapper CNetRequestWrapper::pullFile(const String& strUrl,
     //don't request headers of will overwrite anyway
     if (!overwriteFile) {
         Hashtable<String, String> h;
+        
         ::getNetRequest().doRequest("HEAD", strUrl, "", oSession, &h );
     
         if ( h.containsKey("last-modified") )
@@ -242,6 +283,19 @@ rho::net::CNetResponseWrapper CNetRequestWrapper::pullFile(const String& strUrl,
         return m_pReqImpl->createEmptyNetResponse();
     }
     
+
+#if defined(OS_WINDOWS_DESKTOP) || defined(OS_ANDROID)
+    Hashtable<String,String> headers;
+    if(!pHeaders)
+        pHeaders = &headers;
+    if(generator)
+#if defined(OS_ANDROID)
+        pHeaders->insert(std::make_pair(SECURITY_HEADER, "RhodesAgent RHO-SECURE-TOKEN=" + generator->getSecurityToken()));
+#elif defined(OS_WINDOWS_DESKTOP)
+        pHeaders->insert(std::make_pair(SECURITY_HEADER, generator->getSecurityToken()));
+#endif
+
+#endif
     INetResponse* pResp = m_pReqImpl->pullFile( strUrl, tmpFile, oSession, pHeaders );
     
     tmpFile.close();

data/platform/shared/qt/RhoRubylib.pro

@@ -0,0 +1,10 @@
+CONFIG += c++14
+
+TEMPLATE = subdirs
+SUBDIRS = rubylib rholib sqlite3 syncengine
+
+CONFIG += ordered
+SUBDIRS += rhodes
+
+QMAKE_CXXFLAGS_RELEASE += -MP9
+QMAKE_CXXFLAGS_DEBUG += -MP9

data/platform/shared/qt/rhodes/impl/AlertImpl.cpp

@@ -30,6 +30,8 @@
 #include "common/RhoAppAdapter.h"
 #include "json/JSONIterator.h"
 #include "MainWindowImpl.h"
+
+#ifndef RHODES_VERSION_LIBRARY
 #undef null
 #if QT_VERSION >= 0x050000
 #ifndef OS_SAILFISH
@@ -38,6 +40,7 @@
 #else
 #include <QSound>
 #endif
+#endif //RHODES_VERSION_LIBRARY
 
 using namespace rho;
 using namespace rho::json;
@@ -46,12 +49,14 @@ extern "C" {
 
 void alert_show_status(const char* szTitle, const char* szMessage, const char* szHide)
 {
+#ifndef RHODES_VERSION_LIBRARY
     rho::String message = szMessage ? szMessage : "";
     rho::String title = szTitle ? szTitle : "";
     rho::String callback = "";
     rho::String icon = "";
     Vector<CAlertParams::CAlertButton> buttons;
     CMainWindow::getInstance()->alertShowPopup(new CAlertParams(title, message, callback, icon, buttons, CAlertParams::DLG_STATUS ));
+#endif
 }
 /*
 void alert_show_popup(rho_param *p)
@@ -141,16 +146,19 @@ void alert_show_popup(rho_param *p)
 
 extern "C" void alert_show_status_ex(const char* szTitle, const char* szMessage, const char* szHide, rho::apiGenerator::CMethodResult& oResult)
 {
+#ifndef RHODES_VERSION_LIBRARY
     String message = szMessage ? szMessage : "";
     String title = szTitle ? szTitle : "";
     String icon = "";
     Vector<CAlertParams::CAlertButton> buttons;
     //buttons.addElement( CAlertParams::CAlertButton(szHide, "") );
     CMainWindow::getInstance()->alertShowPopup(new CAlertParams(title, message, icon, oResult, buttons, CAlertParams::DLG_STATUS ));
+#endif
 }
 
 extern "C" void alert_show_popup_ex(const rho::Hashtable<rho::String, rho::String>& propertyMap, rho::apiGenerator::CMethodResult& oResult)
 {
+#ifndef RHODES_VERSION_LIBRARY
     String title, message, icon;
     Vector<CAlertParams::CAlertButton> buttons;
     if (propertyMap.containsKey("message"))
@@ -184,6 +192,7 @@ extern "C" void alert_show_popup_ex(const rho::Hashtable<rho::String, rho::Strin
         }
     }
     CMainWindow::getInstance()->alertShowPopup(new CAlertParams(title, message, icon, oResult, buttons, CAlertParams::DLG_CUSTOM));
+#endif
 }
 
 void alert_vibrate(int duration_ms) {
@@ -192,6 +201,7 @@ void alert_vibrate(int duration_ms) {
 
 void alert_play_file(char* file_name, char *media_type)
 {
+#ifndef RHODES_VERSION_LIBRARY
 #ifndef OS_SAILFISH
     RAWLOGC_INFO("AlertImpl", "OnAlertPlayFile: trying to play file");
     String path = file_name;
@@ -214,11 +224,14 @@ void alert_play_file(char* file_name, char *media_type)
     }
 #endif
 #endif
+#endif //RHODES_VERSION_LIBRARY
 }
 
 void alert_hide_popup()
 {
+#ifndef RHODES_VERSION_LIBRARY
     CMainWindow::getInstance()->alertHidePopup();
+#endif
 }
 
 } //extern "C"