From ebf9a784a9f7f4148a669dbb39e7cd50df779a14 Mon Sep 17 00:00:00 2001 From: James Rowe Date: Thu, 11 Jan 2018 19:21:20 -0700 Subject: Massive removal of unused modules --- src/web_service/CMakeLists.txt | 16 ----- src/web_service/telemetry_json.cpp | 86 ----------------------- src/web_service/telemetry_json.h | 59 ---------------- src/web_service/verify_login.cpp | 28 -------- src/web_service/verify_login.h | 24 ------- src/web_service/web_backend.cpp | 140 ------------------------------------- src/web_service/web_backend.h | 39 ----------- 7 files changed, 392 deletions(-) delete mode 100644 src/web_service/CMakeLists.txt delete mode 100644 src/web_service/telemetry_json.cpp delete mode 100644 src/web_service/telemetry_json.h delete mode 100644 src/web_service/verify_login.cpp delete mode 100644 src/web_service/verify_login.h delete mode 100644 src/web_service/web_backend.cpp delete mode 100644 src/web_service/web_backend.h (limited to 'src/web_service') diff --git a/src/web_service/CMakeLists.txt b/src/web_service/CMakeLists.txt deleted file mode 100644 index c93811892..000000000 --- a/src/web_service/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -set(SRCS - telemetry_json.cpp - verify_login.cpp - web_backend.cpp - ) - -set(HEADERS - telemetry_json.h - verify_login.h - web_backend.h - ) - -create_directory_groups(${SRCS} ${HEADERS}) - -add_library(web_service STATIC ${SRCS} ${HEADERS}) -target_link_libraries(web_service PUBLIC common cpr json-headers) diff --git a/src/web_service/telemetry_json.cpp b/src/web_service/telemetry_json.cpp deleted file mode 100644 index 6ad2ffcd4..000000000 --- a/src/web_service/telemetry_json.cpp +++ /dev/null @@ -1,86 +0,0 @@ -// Copyright 2017 Citra Emulator Project -// Licensed under GPLv2 or any later version -// Refer to the license.txt file included. - -#include "common/assert.h" -#include "web_service/telemetry_json.h" -#include "web_service/web_backend.h" - -namespace WebService { - -template -void TelemetryJson::Serialize(Telemetry::FieldType type, const std::string& name, T value) { - sections[static_cast(type)][name] = value; -} - -void TelemetryJson::SerializeSection(Telemetry::FieldType type, const std::string& name) { - TopSection()[name] = sections[static_cast(type)]; -} - -void TelemetryJson::Visit(const Telemetry::Field& field) { - Serialize(field.GetType(), field.GetName(), field.GetValue()); -} - -void TelemetryJson::Visit(const Telemetry::Field& field) { - Serialize(field.GetType(), field.GetName(), field.GetValue()); -} - -void TelemetryJson::Visit(const Telemetry::Field& field) { - Serialize(field.GetType(), field.GetName(), field.GetValue()); -} - -void TelemetryJson::Visit(const Telemetry::Field& field) { - Serialize(field.GetType(), field.GetName(), field.GetValue()); -} - -void TelemetryJson::Visit(const Telemetry::Field& field) { - Serialize(field.GetType(), field.GetName(), field.GetValue()); -} - -void TelemetryJson::Visit(const Telemetry::Field& field) { - Serialize(field.GetType(), field.GetName(), field.GetValue()); -} - -void TelemetryJson::Visit(const Telemetry::Field& field) { - Serialize(field.GetType(), field.GetName(), field.GetValue()); -} - -void TelemetryJson::Visit(const Telemetry::Field& field) { - Serialize(field.GetType(), field.GetName(), field.GetValue()); -} - -void TelemetryJson::Visit(const Telemetry::Field& field) { - Serialize(field.GetType(), field.GetName(), field.GetValue()); -} - -void TelemetryJson::Visit(const Telemetry::Field& field) { - Serialize(field.GetType(), field.GetName(), field.GetValue()); -} - -void TelemetryJson::Visit(const Telemetry::Field& field) { - Serialize(field.GetType(), field.GetName(), field.GetValue()); -} - -void TelemetryJson::Visit(const Telemetry::Field& field) { - Serialize(field.GetType(), field.GetName(), field.GetValue()); -} - -void TelemetryJson::Visit(const Telemetry::Field& field) { - Serialize(field.GetType(), field.GetName(), std::string(field.GetValue())); -} - -void TelemetryJson::Visit(const Telemetry::Field& field) { - Serialize(field.GetType(), field.GetName(), field.GetValue().count()); -} - -void TelemetryJson::Complete() { - SerializeSection(Telemetry::FieldType::App, "App"); - SerializeSection(Telemetry::FieldType::Session, "Session"); - SerializeSection(Telemetry::FieldType::Performance, "Performance"); - SerializeSection(Telemetry::FieldType::UserFeedback, "UserFeedback"); - SerializeSection(Telemetry::FieldType::UserConfig, "UserConfig"); - SerializeSection(Telemetry::FieldType::UserSystem, "UserSystem"); - PostJson(endpoint_url, TopSection().dump(), true, username, token); -} - -} // namespace WebService diff --git a/src/web_service/telemetry_json.h b/src/web_service/telemetry_json.h deleted file mode 100644 index 9e78c6803..000000000 --- a/src/web_service/telemetry_json.h +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright 2017 Citra Emulator Project -// Licensed under GPLv2 or any later version -// Refer to the license.txt file included. - -#pragma once - -#include -#include -#include -#include "common/telemetry.h" - -namespace WebService { - -/** - * Implementation of VisitorInterface that serialized telemetry into JSON, and submits it to the - * Citra web service - */ -class TelemetryJson : public Telemetry::VisitorInterface { -public: - TelemetryJson(const std::string& endpoint_url, const std::string& username, - const std::string& token) - : endpoint_url(endpoint_url), username(username), token(token) {} - ~TelemetryJson() = default; - - void Visit(const Telemetry::Field& field) override; - void Visit(const Telemetry::Field& field) override; - void Visit(const Telemetry::Field& field) override; - void Visit(const Telemetry::Field& field) override; - void Visit(const Telemetry::Field& field) override; - void Visit(const Telemetry::Field& field) override; - void Visit(const Telemetry::Field& field) override; - void Visit(const Telemetry::Field& field) override; - void Visit(const Telemetry::Field& field) override; - void Visit(const Telemetry::Field& field) override; - void Visit(const Telemetry::Field& field) override; - void Visit(const Telemetry::Field& field) override; - void Visit(const Telemetry::Field& field) override; - void Visit(const Telemetry::Field& field) override; - - void Complete() override; - -private: - nlohmann::json& TopSection() { - return sections[static_cast(Telemetry::FieldType::None)]; - } - - template - void Serialize(Telemetry::FieldType type, const std::string& name, T value); - - void SerializeSection(Telemetry::FieldType type, const std::string& name); - - nlohmann::json output; - std::array sections; - std::string endpoint_url; - std::string username; - std::string token; -}; - -} // namespace WebService diff --git a/src/web_service/verify_login.cpp b/src/web_service/verify_login.cpp deleted file mode 100644 index 1bc3b5afe..000000000 --- a/src/web_service/verify_login.cpp +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright 2017 Citra Emulator Project -// Licensed under GPLv2 or any later version -// Refer to the license.txt file included. - -#include -#include "web_service/verify_login.h" -#include "web_service/web_backend.h" - -namespace WebService { - -std::future VerifyLogin(std::string& username, std::string& token, - const std::string& endpoint_url, std::function func) { - auto get_func = [func, username](const std::string& reply) -> bool { - func(); - if (reply.empty()) - return false; - nlohmann::json json = nlohmann::json::parse(reply); - std::string result; - try { - result = json["username"]; - } catch (const nlohmann::detail::out_of_range&) { - } - return result == username; - }; - return GetJson(get_func, endpoint_url, false, username, token); -} - -} // namespace WebService diff --git a/src/web_service/verify_login.h b/src/web_service/verify_login.h deleted file mode 100644 index 303f5dbbc..000000000 --- a/src/web_service/verify_login.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2017 Citra Emulator Project -// Licensed under GPLv2 or any later version -// Refer to the license.txt file included. - -#pragma once - -#include -#include -#include - -namespace WebService { - -/** - * Checks if username and token is valid - * @param username Citra username to use for authentication. - * @param token Citra token to use for authentication. - * @param endpoint_url URL of the services.citra-emu.org endpoint. - * @param func A function that gets exectued when the verification is finished - * @returns Future with bool indicating whether the verification succeeded - */ -std::future VerifyLogin(std::string& username, std::string& token, - const std::string& endpoint_url, std::function func); - -} // namespace WebService diff --git a/src/web_service/web_backend.cpp b/src/web_service/web_backend.cpp deleted file mode 100644 index b17d82f9c..000000000 --- a/src/web_service/web_backend.cpp +++ /dev/null @@ -1,140 +0,0 @@ -// Copyright 2017 Citra Emulator Project -// Licensed under GPLv2 or any later version -// Refer to the license.txt file included. - -#ifdef _WIN32 -#include -#endif - -#include -#include -#include -#include "common/logging/log.h" -#include "web_service/web_backend.h" - -namespace WebService { - -static constexpr char API_VERSION[]{"1"}; - -static std::unique_ptr g_session; - -void Win32WSAStartup() { -#ifdef _WIN32 - // On Windows, CPR/libcurl does not properly initialize Winsock. The below code is used to - // initialize Winsock globally, which fixes this problem. Without this, only the first CPR - // session will properly be created, and subsequent ones will fail. - WSADATA wsa_data; - const int wsa_result{WSAStartup(MAKEWORD(2, 2), &wsa_data)}; - if (wsa_result) { - LOG_CRITICAL(WebService, "WSAStartup failed: %d", wsa_result); - } -#endif -} - -void PostJson(const std::string& url, const std::string& data, bool allow_anonymous, - const std::string& username, const std::string& token) { - if (url.empty()) { - LOG_ERROR(WebService, "URL is invalid"); - return; - } - - const bool are_credentials_provided{!token.empty() && !username.empty()}; - if (!allow_anonymous && !are_credentials_provided) { - LOG_ERROR(WebService, "Credentials must be provided for authenticated requests"); - return; - } - - Win32WSAStartup(); - - // Built request header - cpr::Header header; - if (are_credentials_provided) { - // Authenticated request if credentials are provided - header = {{"Content-Type", "application/json"}, - {"x-username", username.c_str()}, - {"x-token", token.c_str()}, - {"api-version", API_VERSION}}; - } else { - // Otherwise, anonymous request - header = cpr::Header{{"Content-Type", "application/json"}, {"api-version", API_VERSION}}; - } - - // Post JSON asynchronously - static std::future future; - future = cpr::PostCallback( - [](cpr::Response r) { - if (r.error) { - LOG_ERROR(WebService, "POST returned cpr error: %u:%s", - static_cast(r.error.code), r.error.message.c_str()); - return; - } - if (r.status_code >= 400) { - LOG_ERROR(WebService, "POST returned error status code: %u", r.status_code); - return; - } - if (r.header["content-type"].find("application/json") == std::string::npos) { - LOG_ERROR(WebService, "POST returned wrong content: %s", - r.header["content-type"].c_str()); - return; - } - }, - cpr::Url{url}, cpr::Body{data}, header); -} - -template -std::future GetJson(std::function func, const std::string& url, - bool allow_anonymous, const std::string& username, - const std::string& token) { - if (url.empty()) { - LOG_ERROR(WebService, "URL is invalid"); - return std::async(std::launch::async, [func{std::move(func)}]() { return func(""); }); - } - - const bool are_credentials_provided{!token.empty() && !username.empty()}; - if (!allow_anonymous && !are_credentials_provided) { - LOG_ERROR(WebService, "Credentials must be provided for authenticated requests"); - return std::async(std::launch::async, [func{std::move(func)}]() { return func(""); }); - } - - Win32WSAStartup(); - - // Built request header - cpr::Header header; - if (are_credentials_provided) { - // Authenticated request if credentials are provided - header = {{"Content-Type", "application/json"}, - {"x-username", username.c_str()}, - {"x-token", token.c_str()}, - {"api-version", API_VERSION}}; - } else { - // Otherwise, anonymous request - header = cpr::Header{{"Content-Type", "application/json"}, {"api-version", API_VERSION}}; - } - - // Get JSON asynchronously - return cpr::GetCallback( - [func{std::move(func)}](cpr::Response r) { - if (r.error) { - LOG_ERROR(WebService, "GET returned cpr error: %u:%s", - static_cast(r.error.code), r.error.message.c_str()); - return func(""); - } - if (r.status_code >= 400) { - LOG_ERROR(WebService, "GET returned error code: %u", r.status_code); - return func(""); - } - if (r.header["content-type"].find("application/json") == std::string::npos) { - LOG_ERROR(WebService, "GET returned wrong content: %s", - r.header["content-type"].c_str()); - return func(""); - } - return func(r.text); - }, - cpr::Url{url}, header); -} - -template std::future GetJson(std::function func, - const std::string& url, bool allow_anonymous, - const std::string& username, const std::string& token); - -} // namespace WebService diff --git a/src/web_service/web_backend.h b/src/web_service/web_backend.h deleted file mode 100644 index a63c75d13..000000000 --- a/src/web_service/web_backend.h +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright 2017 Citra Emulator Project -// Licensed under GPLv2 or any later version -// Refer to the license.txt file included. - -#pragma once - -#include -#include -#include -#include "common/common_types.h" - -namespace WebService { - -/** - * Posts JSON to services.citra-emu.org. - * @param url URL of the services.citra-emu.org endpoint to post data to. - * @param data String of JSON data to use for the body of the POST request. - * @param allow_anonymous If true, allow anonymous unauthenticated requests. - * @param username Citra username to use for authentication. - * @param token Citra token to use for authentication. - */ -void PostJson(const std::string& url, const std::string& data, bool allow_anonymous, - const std::string& username = {}, const std::string& token = {}); - -/** - * Gets JSON from services.citra-emu.org. - * @param func A function that gets exectued when the json as a string is received - * @param url URL of the services.citra-emu.org endpoint to post data to. - * @param allow_anonymous If true, allow anonymous unauthenticated requests. - * @param username Citra username to use for authentication. - * @param token Citra token to use for authentication. - * @return future that holds the return value T of the func - */ -template -std::future GetJson(std::function func, const std::string& url, - bool allow_anonymous, const std::string& username = {}, - const std::string& token = {}); - -} // namespace WebService -- cgit v1.2.3