diff options
author | Leith Bade <leith@mapbox.com> | 2014-12-18 20:35:55 +1100 |
---|---|---|
committer | Leith Bade <leith@mapbox.com> | 2014-12-18 20:35:55 +1100 |
commit | 1dd3ad8e642775a01925ebfb78d2ea7f362ea385 (patch) | |
tree | bad0e4aa629655e8361fe6928eacf5641aad0b7d /platform | |
parent | 465ae587a2ed6169df00b182d51f4f647f23c4f6 (diff) | |
download | qtlocation-mapboxgl-1dd3ad8e642775a01925ebfb78d2ea7f362ea385.tar.gz |
Fix build
Diffstat (limited to 'platform')
-rw-r--r-- | platform/android/asset_request_baton_libzip.cpp | 93 | ||||
-rw-r--r-- | platform/android/asset_request_libzip.cpp | 202 | ||||
-rw-r--r-- | platform/default/asset_request_baton_noop.cpp | 22 | ||||
-rw-r--r-- | platform/default/asset_request_libuv.cpp | 24 |
4 files changed, 207 insertions, 134 deletions
diff --git a/platform/android/asset_request_baton_libzip.cpp b/platform/android/asset_request_baton_libzip.cpp deleted file mode 100644 index 8984aa58de..0000000000 --- a/platform/android/asset_request_baton_libzip.cpp +++ /dev/null @@ -1,93 +0,0 @@ -#include <mbgl/mbgl.hpp> -#include <mbgl/android/jni.hpp> -#include <mbgl/storage/asset_request_baton.hpp> -#include <mbgl/storage/response.hpp> -#include <mbgl/util/std.hpp> - -#include <cerrno> -// NOTE a bug in the Android NDK breaks std::errno -// See https://code.google.com/p/android/issues/detail?id=72349 -// After this is fixed change usage errno to std::errno -#include <zip.h> - -namespace mbgl { - -void AssetRequestBaton::run(AssetRequestBaton *ptr) { - assert(std::this_thread::get_id() == ptr->threadId); - - if (ptr->canceled || !ptr->request) { - // Either the AssetRequest object has been destructed, or the - // request was canceled. - cleanup(ptr); - return; - } - - int error = 0; - struct zip *apk = zip_open(mbgl::android::apkPath.c_str(), 0, &error); - if ((apk == nullptr) || ptr->canceled || !ptr->request) { - // Opening the APK failed or was canceled. There isn't much left we can do. - const int messageSize = zip_error_to_str(nullptr, 0, error, errno); - const std::unique_ptr<char[]> message = mbgl::util::make_unique<char[]>(messageSize); - zip_error_to_str(message.get(), 0, error, errno); - notifyError(ptr, 500, message.get()); - cleanup(ptr); - return; - } - - std::string apkFilePath = "assets/" + ptr->path; - struct zip_file *apkFile = zip_fopen(apk, apkFilePath.c_str(), ZIP_FL_NOCASE); - if ((apkFile == nullptr) || ptr->canceled || !ptr->request) { - // Opening the asset failed or was canceled. We already have an open file handle - // though, which we'll have to close. - zip_error_get(apk, &error, nullptr); - notifyError(ptr, error == ZIP_ER_NOENT ? 404 : 500, zip_strerror(apk)); - zip_close(apk); - apk = nullptr; - cleanup(ptr); - return; - } - - struct zip_stat stat; - if ((zip_stat(apk, apkFilePath.c_str(), ZIP_FL_NOCASE, &stat) != 0) || ptr->canceled || !ptr->request) { - // Stating failed or was canceled. We already have an open file handle - // though, which we'll have to close. - notifyError(ptr, 500, zip_strerror(apk)); - zip_fclose(apkFile); - apkFile = nullptr; - zip_close(apk); - apk = nullptr; - cleanup(ptr); - return; - } - - const std::unique_ptr<char[]> data = mbgl::util::make_unique<char[]>(stat.size); - - if (static_cast<zip_uint64_t>(zip_fread(apkFile, reinterpret_cast<void *>(data.get()), stat.size)) != stat.size || ptr->canceled || !ptr->request) { - // Reading failed or was canceled. We already have an open file handle - // though, which we'll have to close. - notifyError(ptr, 500, zip_file_strerror(apkFile)); - zip_fclose(apkFile); - apkFile = nullptr; - zip_close(apk); - apk = nullptr; - cleanup(ptr); - return; - } - - std::string body(data.get(), stat.size); - notifySuccess(ptr, body); - - if (zip_fclose(apkFile) != 0) { - // Closing the asset failed. But there isn't anything we can do. - } - apkFile = nullptr; - - if (zip_close(apk) != 0) { - // Closing the APK failed. But there isn't anything we can do. - } - apk = nullptr; - - cleanup(ptr); -} - -} diff --git a/platform/android/asset_request_libzip.cpp b/platform/android/asset_request_libzip.cpp new file mode 100644 index 0000000000..77f9ae7da1 --- /dev/null +++ b/platform/android/asset_request_libzip.cpp @@ -0,0 +1,202 @@ +#include <mbgl/android/jni.hpp> +#include <mbgl/storage/asset_request.hpp> +#include <mbgl/storage/response.hpp> +#include <mbgl/util/uv_detail.hpp> +#include <mbgl/util/std.hpp> + +#include <cerrno> +// NOTE a bug in the Android NDK breaks std::errno +// See https://code.google.com/p/android/issues/detail?id=72349 +// After this is fixed change usage errno to std::errno +#include <zip.h> + +namespace mbgl { + +struct AssetRequestBaton { + AssetRequestBaton(AssetRequest *request_, const std::string &path, uv_loop_t *loop); + ~AssetRequestBaton(); + + const std::thread::id threadId; + AssetRequest *request = nullptr; + std::unique_ptr<uv::async> asyncRun; + std::string path; + bool canceled = false; + + void cancel(); + static void notifyError(AssetRequestBaton *ptr, const int code, const char *message); + static void notifySuccess(AssetRequestBaton *ptr, const std::string body); + static void cleanup(AssetRequestBaton *ptr); + static void run(AssetRequestBaton *ptr); +}; + +AssetRequestBaton::AssetRequestBaton(AssetRequest *request_, const std::string &path_, uv_loop_t *loop) +: threadId(std::this_thread::get_id()), +request(request_), +path(path_) { + + asyncRun = mbgl::util::make_unique<uv::async>(loop, [this]() { + run(this); + }); + + asyncRun->send(); +} + +AssetRequestBaton::~AssetRequestBaton() { +} + +void AssetRequestBaton::cancel() { + canceled = true; +} + +void AssetRequestBaton::notifyError(AssetRequestBaton *ptr, const int code, const char *message) { + assert(std::this_thread::get_id() == ptr->threadId); + + if (ptr->request && !ptr->canceled) { + ptr->request->response = std::unique_ptr<Response>(new Response); + ptr->request->response->code = code; + ptr->request->response->message = message; + ptr->request->notify(); + } +} + +void AssetRequestBaton::notifySuccess(AssetRequestBaton *ptr, const std::string body) { + assert(std::this_thread::get_id() == ptr->threadId); + + if (ptr->request && !ptr->canceled) { + ptr->request->response = std::unique_ptr<Response>(new Response); + ptr->request->response->code = 200; + ptr->request->response->data = body; + ptr->request->notify(); + } +} + +void AssetRequestBaton::cleanup(AssetRequestBaton *ptr) { + assert(std::this_thread::get_id() == ptr->threadId); + + if (ptr->request) { + ptr->request->ptr = nullptr; + } + + ptr->asyncRun.reset(); + + delete ptr; + ptr = nullptr; +} + +void AssetRequestBaton::run(AssetRequestBaton *ptr) { + assert(std::this_thread::get_id() == ptr->threadId); + + if (ptr->canceled || !ptr->request) { + // Either the AssetRequest object has been destructed, or the + // request was canceled. + cleanup(ptr); + return; + } + + int error = 0; + struct zip *apk = zip_open(mbgl::android::apkPath.c_str(), 0, &error); + if ((apk == nullptr) || ptr->canceled || !ptr->request) { + // Opening the APK failed or was canceled. There isn't much left we can do. + const int messageSize = zip_error_to_str(nullptr, 0, error, errno); + const std::unique_ptr<char[]> message = mbgl::util::make_unique<char[]>(messageSize); + zip_error_to_str(message.get(), 0, error, errno); + notifyError(ptr, 500, message.get()); + cleanup(ptr); + return; + } + + std::string apkFilePath = "assets/" + ptr->path; + struct zip_file *apkFile = zip_fopen(apk, apkFilePath.c_str(), ZIP_FL_NOCASE); + if ((apkFile == nullptr) || ptr->canceled || !ptr->request) { + // Opening the asset failed or was canceled. We already have an open file handle + // though, which we'll have to close. + zip_error_get(apk, &error, nullptr); + notifyError(ptr, error == ZIP_ER_NOENT ? 404 : 500, zip_strerror(apk)); + zip_close(apk); + apk = nullptr; + cleanup(ptr); + return; + } + + struct zip_stat stat; + if ((zip_stat(apk, apkFilePath.c_str(), ZIP_FL_NOCASE, &stat) != 0) || ptr->canceled || !ptr->request) { + // Stating failed or was canceled. We already have an open file handle + // though, which we'll have to close. + notifyError(ptr, 500, zip_strerror(apk)); + zip_fclose(apkFile); + apkFile = nullptr; + zip_close(apk); + apk = nullptr; + cleanup(ptr); + return; + } + + const std::unique_ptr<char[]> data = mbgl::util::make_unique<char[]>(stat.size); + + if (static_cast<zip_uint64_t>(zip_fread(apkFile, reinterpret_cast<void *>(data.get()), stat.size)) != stat.size || ptr->canceled || !ptr->request) { + // Reading failed or was canceled. We already have an open file handle + // though, which we'll have to close. + notifyError(ptr, 500, zip_file_strerror(apkFile)); + zip_fclose(apkFile); + apkFile = nullptr; + zip_close(apk); + apk = nullptr; + cleanup(ptr); + return; + } + + std::string body(data.get(), stat.size); + notifySuccess(ptr, body); + + if (zip_fclose(apkFile) != 0) { + // Closing the asset failed. But there isn't anything we can do. + } + apkFile = nullptr; + + if (zip_close(apk) != 0) { + // Closing the APK failed. But there isn't anything we can do. + } + apk = nullptr; + + cleanup(ptr); +} + +AssetRequest::AssetRequest(const std::string &path_, uv_loop_t *loop) +: BaseRequest(path_) { + if (!path.empty() && path[0] == '/') { + // This is an absolute path. We don't allow this. Note that this is not a way to absolutely + // prevent access to resources outside the application bundle; e.g. there could be symlinks + // in the application bundle that link to outside. We don't care about these. + response = util::make_unique<Response>(); + response->code = 403; + response->message = "Path is outside the application bundle"; + notify(); + } else { + // Note: The AssetRequestBaton object is deleted in AssetRequestBaton::cleanup(). + ptr = new AssetRequestBaton(this, path, loop); + } +} + +void AssetRequest::cancel() { + assert(std::this_thread::get_id() == threadId); + + if (ptr) { + ptr->cancel(); + + // When deleting a AssetRequest object with a uv_fs_* call is in progress, we are making sure + // that the callback doesn't accidentally reference this object again. + ptr->request = nullptr; + ptr = nullptr; + } + + notify(); +} + +AssetRequest::~AssetRequest() { + assert(std::this_thread::get_id() == threadId); + cancel(); + + // Note: The AssetRequestBaton object is deleted in AssetRequestBaton::cleanup(). +} + +} diff --git a/platform/default/asset_request_baton_noop.cpp b/platform/default/asset_request_baton_noop.cpp deleted file mode 100644 index 79f69a2daf..0000000000 --- a/platform/default/asset_request_baton_noop.cpp +++ /dev/null @@ -1,22 +0,0 @@ -#include <mbgl/mbgl.hpp> -#include <mbgl/storage/asset_request_baton.hpp> -#include <mbgl/storage/response.hpp> - -namespace mbgl { - -void AssetRequestBaton::run(AssetRequestBaton *ptr) { - assert(std::this_thread::get_id() == ptr->threadId); - - if (ptr->canceled || !ptr->request) { - // Either the AssetRequest object has been destructed, or the - // request was canceled. - cleanup(ptr); - return; - } - - // Just return a 500 error until implemented properly - notifyError(ptr, 500, "Assets not implemented on this platform."); - cleanup(ptr); -} - -} diff --git a/platform/default/asset_request_libuv.cpp b/platform/default/asset_request_libuv.cpp index c77bb57de8..0e0b7280a7 100644 --- a/platform/default/asset_request_libuv.cpp +++ b/platform/default/asset_request_libuv.cpp @@ -30,16 +30,8 @@ struct AssetRequestBaton { uv_buf_t buffer; }; -void AssetRequestBaton::run(AssetRequestBaton *ptr) { - assert(std::this_thread::get_id() == ptr->threadId); - - if (ptr->canceled || !ptr->request) { - // Either the AssetRequest object has been destructed, or the - // request was canceled. - cleanup(ptr); - return; - } - +AssetRequestBaton::AssetRequestBaton(AssetRequest *request_, const std::string &path, uv_loop_t *loop) + : threadId(std::this_thread::get_id()), request(request_) { req.data = this; uv_fs_open(loop, &req, path.c_str(), O_RDONLY, S_IRUSR, fileOpened); } @@ -56,17 +48,11 @@ void AssetRequestBaton::cancel() { uv_cancel((uv_req_t *)&req); } -void AssetRequestBaton::run(AssetRequestBaton *ptr) { +void AssetRequestBaton::notifyError(uv_fs_t *req) { + AssetRequestBaton *ptr = reinterpret_cast<AssetRequestBaton *>(req->data); assert(std::this_thread::get_id() == ptr->threadId); - if (ptr->canceled || !ptr->request) { - // Either the AssetRequest object has been destructed, or the - // request was canceled. - cleanup(ptr); - return; - } - - rf (ptr->request && req->result < 0 && !ptr->canceled && req->result != UV_ECANCELED) { + if (ptr->request && req->result < 0 && !ptr->canceled && req->result != UV_ECANCELED) { ptr->request->response = util::make_unique<Response>(); ptr->request->response->code = req->result == UV_ENOENT ? 404 : 500; #if UV_VERSION_MAJOR == 0 && UV_VERSION_MINOR <= 10 |