From d6a819c7cb1ac00671b7e76b23d7d065d1fd76a3 Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Tue, 22 Aug 2017 20:58:19 -0400
Subject: telemetry_session: Log telemetry ID.

---
 src/core/telemetry_session.cpp | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

(limited to 'src/core/telemetry_session.cpp')

diff --git a/src/core/telemetry_session.cpp b/src/core/telemetry_session.cpp
index 94483f385..61ba78457 100644
--- a/src/core/telemetry_session.cpp
+++ b/src/core/telemetry_session.cpp
@@ -3,8 +3,10 @@
 // Refer to the license.txt file included.
 
 #include <cstring>
+#include <cryptopp/osrng.h>
 
 #include "common/assert.h"
+#include "common/file_util.h"
 #include "common/scm_rev.h"
 #include "common/x64/cpu_detect.h"
 #include "core/core.h"
@@ -29,12 +31,46 @@ static const char* CpuVendorToStr(Common::CPUVendor vendor) {
     UNREACHABLE();
 }
 
+static u64 GenerateTelemetryId() {
+    u64 telemetry_id{};
+    CryptoPP::AutoSeededRandomPool rng;
+    rng.GenerateBlock(reinterpret_cast<CryptoPP::byte*>(&telemetry_id), sizeof(u64));
+    return telemetry_id;
+}
+
+static u64 GetTelemetryId() {
+    u64 telemetry_id{};
+    static const std::string& filename{FileUtil::GetUserPath(D_CONFIG_IDX) + "telemetry_id"};
+
+    if (FileUtil::Exists(filename)) {
+        FileUtil::IOFile file(filename, "rb");
+        if (!file.IsOpen()) {
+            LOG_ERROR(WebService, "failed to open telemetry_id: %s", filename.c_str());
+            return {};
+        }
+        file.ReadBytes(&telemetry_id, sizeof(u64));
+    } else {
+        FileUtil::IOFile file(filename, "wb");
+        if (!file.IsOpen()) {
+            LOG_ERROR(WebService, "failed to open telemetry_id: %s", filename.c_str());
+            return {};
+        }
+        telemetry_id = GenerateTelemetryId();
+        file.WriteBytes(&telemetry_id, sizeof(u64));
+    }
+
+    return telemetry_id;
+}
+
 TelemetrySession::TelemetrySession() {
 #ifdef ENABLE_WEB_SERVICE
     backend = std::make_unique<WebService::TelemetryJson>();
 #else
     backend = std::make_unique<Telemetry::NullVisitor>();
 #endif
+    // Log one-time top-level information
+    AddField(Telemetry::FieldType::None, "TelemetryId", GetTelemetryId());
+
     // Log one-time session start information
     const s64 init_time{std::chrono::duration_cast<std::chrono::milliseconds>(
                             std::chrono::system_clock::now().time_since_epoch())
-- 
cgit v1.2.3


From 9f0da33c3349df47580d93fcd25346be4d2b94a7 Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Wed, 23 Aug 2017 00:08:07 -0400
Subject: qt: Add an option to view/regenerate telemetry ID.

---
 src/core/telemetry_session.cpp | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

(limited to 'src/core/telemetry_session.cpp')

diff --git a/src/core/telemetry_session.cpp b/src/core/telemetry_session.cpp
index 61ba78457..d0f257f58 100644
--- a/src/core/telemetry_session.cpp
+++ b/src/core/telemetry_session.cpp
@@ -38,21 +38,21 @@ static u64 GenerateTelemetryId() {
     return telemetry_id;
 }
 
-static u64 GetTelemetryId() {
+u64 GetTelemetryId() {
     u64 telemetry_id{};
     static const std::string& filename{FileUtil::GetUserPath(D_CONFIG_IDX) + "telemetry_id"};
 
     if (FileUtil::Exists(filename)) {
         FileUtil::IOFile file(filename, "rb");
         if (!file.IsOpen()) {
-            LOG_ERROR(WebService, "failed to open telemetry_id: %s", filename.c_str());
+            LOG_ERROR(Core, "failed to open telemetry_id: %s", filename.c_str());
             return {};
         }
         file.ReadBytes(&telemetry_id, sizeof(u64));
     } else {
         FileUtil::IOFile file(filename, "wb");
         if (!file.IsOpen()) {
-            LOG_ERROR(WebService, "failed to open telemetry_id: %s", filename.c_str());
+            LOG_ERROR(Core, "failed to open telemetry_id: %s", filename.c_str());
             return {};
         }
         telemetry_id = GenerateTelemetryId();
@@ -62,6 +62,19 @@ static u64 GetTelemetryId() {
     return telemetry_id;
 }
 
+u64 RegenerateTelemetryId() {
+    const u64 new_telemetry_id{GenerateTelemetryId()};
+    static const std::string& filename{FileUtil::GetUserPath(D_CONFIG_IDX) + "telemetry_id"};
+
+    FileUtil::IOFile file(filename, "wb");
+    if (!file.IsOpen()) {
+        LOG_ERROR(Core, "failed to open telemetry_id: %s", filename.c_str());
+        return {};
+    }
+    file.WriteBytes(&new_telemetry_id, sizeof(u64));
+    return new_telemetry_id;
+}
+
 TelemetrySession::TelemetrySession() {
 #ifdef ENABLE_WEB_SERVICE
     backend = std::make_unique<WebService::TelemetryJson>();
-- 
cgit v1.2.3


From 04bd0c957e583a518121626deb029f214cc98cf6 Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Wed, 23 Aug 2017 21:09:34 -0400
Subject: web_services: Refactor to remove dependency on Core.

---
 src/core/telemetry_session.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/core/telemetry_session.cpp')

diff --git a/src/core/telemetry_session.cpp b/src/core/telemetry_session.cpp
index d0f257f58..104a16cc9 100644
--- a/src/core/telemetry_session.cpp
+++ b/src/core/telemetry_session.cpp
@@ -77,7 +77,13 @@ u64 RegenerateTelemetryId() {
 
 TelemetrySession::TelemetrySession() {
 #ifdef ENABLE_WEB_SERVICE
-    backend = std::make_unique<WebService::TelemetryJson>();
+    if (Settings::values.enable_telemetry) {
+        backend = std::make_unique<WebService::TelemetryJson>(
+            Settings::values.telemetry_endpoint_url, Settings::values.citra_username,
+            Settings::values.citra_token);
+    } else {
+        backend = std::make_unique<Telemetry::NullVisitor>();
+    }
 #else
     backend = std::make_unique<Telemetry::NullVisitor>();
 #endif
-- 
cgit v1.2.3