From 65b3396bc48540791e303c5455f3165988f02a49 Mon Sep 17 00:00:00 2001
From: Mariotaku <mariotaku.lee@gmail.com>
Date: Mon, 20 Jun 2022 00:19:10 +0900
Subject: [PATCH 01/15] fetches covers from https://github.com/mariotaku/gcdb
 (domain needs to be changed later)

---
 CMakeLists.txt                         |   2 +
 src_assets/common/assets/web/apps.html | 173 ++++++++++++++++++++++++-
 sunshine/confighttp.cpp                |  61 ++++++++-
 sunshine/httpcommon.cpp                |  17 +++
 sunshine/httpcommon.h                  |   1 +
 5 files changed, 246 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44f24e7d6b2..d69d3aecbdb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,6 +43,7 @@ include_directories(third-party/miniupnp)
 
 find_package(Threads REQUIRED)
 find_package(OpenSSL REQUIRED)
+find_package(CURL REQUIRED)
 if(NOT APPLE)
 	set(Boost_USE_STATIC_LIBS ON)
 endif()
@@ -413,6 +414,7 @@ list(APPEND SUNSHINE_EXTERNAL_LIBRARIES
 		${FFMPEG_LIBRARIES}
 		${Boost_LIBRARIES}
 		${OPENSSL_LIBRARIES}
+		${CURL_LIBRARIES}
 		${PLATFORM_LIBRARIES})
 
 if (NOT WIN32)
diff --git a/src_assets/common/assets/web/apps.html b/src_assets/common/assets/web/apps.html
index 9c21fe6333e..b20400b621d 100644
--- a/src_assets/common/assets/web/apps.html
+++ b/src_assets/common/assets/web/apps.html
@@ -169,13 +169,47 @@ <h1>Applications</h1>
       <!-- Image path -->
       <div class="mb-3">
         <label for="appImagePath" class="form-label">Image</label>
-        <input
-          type="text"
-          class="form-control monospace"
-          id="appImagePath"
-          aria-describedby="appImagePathHelp"
-          v-model="editForm['image-path']"
-        />
+        <div class="input-group dropup">
+          <input
+              type="text"
+              class="form-control monospace"
+              id="appImagePath"
+              aria-describedby="appImagePathHelp"
+              v-model="editForm['image-path']"
+          />
+          <button class="btn btn-secondary dropdown-toggle" type="button" id="findCoverToggle" data-bs-toggle="dropdown"
+                  data-bs-auto-close="outside" aria-expanded="false" v-dropdown-show="showCoverFinder"
+                  ref="coverFinderDropdown">
+            Find Cover
+          </button>
+          <div class="dropdown-menu dropdown-menu-end w-50 cover-finder overflow-hidden"
+               aria-labelledby="findCoverToggle">
+            <div class="modal-header">
+              <h4 class="modal-title">Covers Found</h4>
+              <button type="button" class="btn-close" aria-label="Close" @click="closeCoverFinder"></button>
+            </div>
+            <div class="cover-results px-3 pt-3" :class="{ busy: coverFinderBusy }">
+              <div class="row">
+                <div v-if="coverSearching" class="col-12 col-sm-6 col-lg-4 mb-3">
+                  <div class="cover-container">
+                    <div class="spinner-border" role="status">
+                      <span class="visually-hidden">Loading...</span>
+                    </div>
+                  </div>
+                </div>
+                <div v-for="(cover,i) in coverCandidates" :key="i" class="col-12 col-sm-6 col-lg-4 mb-3"
+                     @click="useCover(cover)">
+                  <div class="cover-container result">
+                    <img class="rounded" :src="cover.url"/>
+                  </div>
+                  <label class="d-block text-nowrap text-center text-truncate">
+                    {{cover.name}}
+                  </label>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
         <div id="appImagePathHelp" class="form-text">
           Application icon/picture/image path that will be sent to client. Image must be a PNG file.
           If not set, Sunshine will send default box image.
@@ -196,6 +230,12 @@ <h1>Applications</h1>
 </div>
 
 <script>
+  Vue.directive('dropdown-show', {
+    bind: function (el, binding) {
+      el.addEventListener('show.bs.dropdown', binding.value);
+    }
+  });
+
   new Vue({
     el: "#app",
     data() {
@@ -204,6 +244,9 @@ <h1>Applications</h1>
         showEditForm: false,
         editForm: null,
         detachedCmd: "",
+        coverSearching: false,
+        coverFinderBusy: false,
+        coverCandidates: [],
       };
     },
     created() {
@@ -253,6 +296,80 @@ <h1>Applications</h1>
           undo: "",
         });
       },
+      showCoverFinder($event) {
+        this.coverCandidates = [];
+        this.coverSearching = true;
+
+        function getSearchKey(q) {
+          const key = q.toLowerCase().replaceAll(/[^\da-z]+/g, '.');
+          if (key.endsWith('.')) {
+            return key.substring(0, key.length - 1);
+          }
+          return key;
+        }
+
+        function getSearchBucket(key) {
+          let index = key.indexOf('.');
+          if (index < 0) {
+            index = key.length;
+          }
+          const s = key.substring(0, Math.min(2, index));
+          if (!s || s === '.') return '@';
+          return s;
+        }
+
+        function searchCovers(key) {
+          let bucket = getSearchBucket(key);
+          return fetch("https://mariotaku.org/gcdb/buckets/" + bucket + ".json").then(r => {
+            if (!r.ok) throw new Error("Failed to search covers");
+            return r.json();
+          }).then(maps => {
+            let result = [];
+            for (let itemKey of Object.keys(maps)) {
+              if (itemKey.startsWith(key)) {
+                let item = maps[itemKey];
+                result.push({
+                  name: item.name,
+                  key: itemKey,
+                  url: "https://images.igdb.com/igdb/image/upload/t_cover_big/" + item.hash + ".jpg",
+                  saveUrl: "https://images.igdb.com/igdb/image/upload/t_cover_big_2x/" + item.hash + ".png",
+                });
+              }
+            }
+            return result;
+          });
+        }
+
+        searchCovers(getSearchKey(this.editForm["name"].toString()))
+          .then(body => this.coverCandidates = body)
+          .finally(() => this.coverSearching = false);
+      },
+      closeCoverFinder() {
+        const ref = this.$refs.coverFinderDropdown;
+        if (!ref) {
+          return;
+        }
+        const dropdown = this.coverFinderDropdown = bootstrap.Dropdown.getInstance(ref);
+        if (!dropdown) {
+          return;
+        }
+        dropdown.hide();
+      },
+      useCover(cover) {
+        this.coverFinderBusy = true;
+        fetch("/api/covers/upload", {
+          method: "POST",
+          body: JSON.stringify({
+            key: cover.key,
+            url: cover.saveUrl,
+          })
+        }).then(r => {
+          if (!r.ok) throw new Error("Failed to download covers");
+          return r.json();
+        }).then(body => this.$set(this.editForm, "image-path", body.path))
+          .then(() => this.closeCoverFinder())
+          .finally(() => this.coverFinderBusy = false);
+      },
       save() {
         this.editForm["image-path"] = this.editForm["image-path"].toString().replace(/"/g, '');
         fetch("/api/apps", {
@@ -274,4 +391,46 @@ <h1>Applications</h1>
   .monospace {
     font-family: monospace;
   }
+
+  .cover-finder {
+  }
+
+  .cover-finder .cover-results {
+    max-height: 400px;
+    overflow-x: hidden;
+    overflow-y: auto;
+  }
+
+  .cover-finder .cover-results.busy * {
+    cursor: wait !important;
+    pointer-events: none;
+  }
+
+  .cover-container {
+    padding-top: 133.33%;
+    position: relative;
+  }
+
+  .cover-container.result {
+    cursor: pointer;
+  }
+
+  .spinner-border {
+    position: absolute;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    margin: auto;
+  }
+
+  .cover-container img {
+    display: block;
+    position: absolute;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+  }
+
 </style>
\ No newline at end of file
diff --git a/sunshine/confighttp.cpp b/sunshine/confighttp.cpp
index c21089de21f..efb0aa6d96c 100644
--- a/sunshine/confighttp.cpp
+++ b/sunshine/confighttp.cpp
@@ -14,6 +14,8 @@
 
 #include <boost/asio/ssl/context.hpp>
 
+#include <boost/filesystem.hpp>
+
 #include <Simple-Web-Server/crypto.hpp>
 #include <Simple-Web-Server/server_https.hpp>
 #include <boost/asio/ssl/context_base.hpp>
@@ -165,9 +167,12 @@ void getAppsPage(resp_https_t response, req_https_t request) {
 
   print_req(request);
 
+  SimpleWeb::CaseInsensitiveMultimap headers;
+  headers.emplace("Access-Control-Allow-Origin", "https://images.igdb.com/");
+
   std::string header  = read_file(WEB_DIR "header.html");
   std::string content = read_file(WEB_DIR "apps.html");
-  response->write(header + content);
+  response->write(header + content, headers);
 }
 
 void getClientsPage(resp_https_t response, req_https_t request) {
@@ -412,6 +417,59 @@ void deleteApp(resp_https_t response, req_https_t request) {
   proc::refresh(config::stream.file_apps);
 }
 
+void uploadCover(resp_https_t response, req_https_t request) {
+  if(!authenticate(response, request)) return;
+
+  std::stringstream ss;
+  std::stringstream configStream;
+  ss << request->content.rdbuf();
+  pt::ptree outputTree;
+  auto g = util::fail_guard([&]() {
+    std::ostringstream data;
+
+    SimpleWeb::StatusCode code = SimpleWeb::StatusCode::success_ok;
+    if (outputTree.get_child_optional("error").has_value()) {
+      code = SimpleWeb::StatusCode::client_error_bad_request;
+    }
+
+    pt::write_json(data, outputTree);
+    response->write(code, data.str());
+  });
+  pt::ptree inputTree;
+  try {
+    //TODO: Input Validation
+    pt::read_json(ss, inputTree);
+  }
+  catch(std::exception &e) {
+    BOOST_LOG(warning) << "UploadCover: "sv << e.what();
+    outputTree.put("status", "false");
+    outputTree.put("error", e.what());
+    return;
+  }
+
+  auto key = inputTree.get<std::string>("key");
+  auto url = inputTree.get("url", "");
+
+  const std::string coverdir = SUNSHINE_ASSETS_DIR "/covers/";
+  if(!boost::filesystem::exists(coverdir)) {
+    boost::filesystem::create_directory(coverdir);
+  }
+
+  std::basic_string path = coverdir + key + ".png";
+  if (!url.empty()) {
+    if (!http::download_file(url, path)) {
+      outputTree.put("error", "Failed to download cover");
+      return;
+    }
+  } else {
+    auto data = SimpleWeb::Crypto::Base64::decode(inputTree.get<std::string>("data"));
+
+    std::ofstream imgfile(path);
+    imgfile.write(data.data(), (int)data.size());
+  }
+  outputTree.put("path", path);
+}
+
 void getConfig(resp_https_t response, req_https_t request) {
   if(!authenticate(response, request)) return;
 
@@ -617,6 +675,7 @@ void start() {
   server.resource["^/api/apps/([0-9]+)$"]["DELETE"]                   = deleteApp;
   server.resource["^/api/clients/unpair$"]["POST"]                    = unpairAll;
   server.resource["^/api/apps/close"]["POST"]                         = closeApp;
+  server.resource["^/api/covers/upload$"]["POST"]                     = uploadCover;
   server.resource["^/images/favicon.ico$"]["GET"]                     = getFaviconImage;
   server.resource["^/images/logo-sunshine-45.png$"]["GET"]            = getSunshineLogoImage;
   server.resource["^/third_party/bootstrap.min.css$"]["GET"]          = getBootstrapCss;
diff --git a/sunshine/httpcommon.cpp b/sunshine/httpcommon.cpp
index 9107414495d..947130f9f31 100644
--- a/sunshine/httpcommon.cpp
+++ b/sunshine/httpcommon.cpp
@@ -13,6 +13,7 @@
 #include <Simple-Web-Server/server_http.hpp>
 #include <Simple-Web-Server/server_https.hpp>
 #include <boost/asio/ssl/context_base.hpp>
+#include <curl/curl.h>
 
 #include "config.h"
 #include "crypto.h"
@@ -180,4 +181,20 @@ int create_creds(const std::string &pkey, const std::string &cert) {
 
   return 0;
 }
+
+bool download_file(const std::string &url, const std::string &file) {
+  CURL *curl = curl_easy_init();
+  if (!curl) {
+    return false;
+  }
+  FILE *fp = fopen(file.c_str(), "wb");
+  curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
+  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, fwrite);
+  curl_easy_setopt(curl, CURLOPT_WRITEDATA, fp);
+  bool result = curl_easy_perform(curl) == CURLE_OK;
+  curl_easy_cleanup(curl);
+  fclose(fp);
+  return result;
+}
+
 } // namespace http
\ No newline at end of file
diff --git a/sunshine/httpcommon.h b/sunshine/httpcommon.h
index 37d8451fab5..ec2e93c0ded 100644
--- a/sunshine/httpcommon.h
+++ b/sunshine/httpcommon.h
@@ -12,6 +12,7 @@ int save_user_creds(
   bool run_our_mouth = false);
 
 int reload_user_creds(const std::string &file);
+bool download_file(const std::string &url, const std::string &file);
 extern std::string unique_id;
 extern net::net_e origin_pin_allowed;
 extern net::net_e origin_web_ui_allowed;

From ca84bc6dde51c44e26f0ae0a4db258d370ad2292 Mon Sep 17 00:00:00 2001
From: Mariotaku <mariotaku.lee@gmail.com>
Date: Tue, 28 Jun 2022 01:20:44 +0900
Subject: [PATCH 02/15] changed to use sunshinestream/db key escape url host
 check

---
 src_assets/common/assets/web/apps.html |  4 ++--
 sunshine/confighttp.cpp                | 12 ++++++++++--
 sunshine/httpcommon.cpp                | 23 +++++++++++++++++++++++
 sunshine/httpcommon.h                  |  3 +++
 4 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/src_assets/common/assets/web/apps.html b/src_assets/common/assets/web/apps.html
index b20400b621d..d0161873b82 100644
--- a/src_assets/common/assets/web/apps.html
+++ b/src_assets/common/assets/web/apps.html
@@ -188,7 +188,7 @@ <h1>Applications</h1>
               <h4 class="modal-title">Covers Found</h4>
               <button type="button" class="btn-close" aria-label="Close" @click="closeCoverFinder"></button>
             </div>
-            <div class="cover-results px-3 pt-3" :class="{ busy: coverFinderBusy }">
+            <div class="modal-body cover-results px-3 pt-3" :class="{ busy: coverFinderBusy }">
               <div class="row">
                 <div v-if="coverSearching" class="col-12 col-sm-6 col-lg-4 mb-3">
                   <div class="cover-container">
@@ -320,7 +320,7 @@ <h4 class="modal-title">Covers Found</h4>
 
         function searchCovers(key) {
           let bucket = getSearchBucket(key);
-          return fetch("https://mariotaku.org/gcdb/buckets/" + bucket + ".json").then(r => {
+          return fetch("https://sunshinestream.github.io/db/buckets/" + bucket + ".json").then(r => {
             if (!r.ok) throw new Error("Failed to search covers");
             return r.json();
           }).then(maps => {
diff --git a/sunshine/confighttp.cpp b/sunshine/confighttp.cpp
index efb0aa6d96c..6e19c882e1a 100644
--- a/sunshine/confighttp.cpp
+++ b/sunshine/confighttp.cpp
@@ -447,7 +447,11 @@ void uploadCover(resp_https_t response, req_https_t request) {
     return;
   }
 
-  auto key = inputTree.get<std::string>("key");
+  auto key = inputTree.get("key", "");
+  if (key.empty()) {
+    outputTree.put("error", "Cover key is required");
+    return;
+  }
   auto url = inputTree.get("url", "");
 
   const std::string coverdir = SUNSHINE_ASSETS_DIR "/covers/";
@@ -455,8 +459,12 @@ void uploadCover(resp_https_t response, req_https_t request) {
     boost::filesystem::create_directory(coverdir);
   }
 
-  std::basic_string path = coverdir + key + ".png";
+  std::basic_string path = coverdir + http::url_escape(key) + ".png";
   if (!url.empty()) {
+    if (http::url_get_host(url) != "images.igdb.com") {
+      outputTree.put("error", "Only images.igdb.com is allowed");
+      return;
+    }
     if (!http::download_file(url, path)) {
       outputTree.put("error", "Failed to download cover");
       return;
diff --git a/sunshine/httpcommon.cpp b/sunshine/httpcommon.cpp
index 947130f9f31..615c6348ef1 100644
--- a/sunshine/httpcommon.cpp
+++ b/sunshine/httpcommon.cpp
@@ -197,4 +197,27 @@ bool download_file(const std::string &url, const std::string &file) {
   return result;
 }
 
+std::string url_escape(const std::string &url) {
+  CURL *curl = curl_easy_init();
+  char *string = curl_easy_escape(curl, url.c_str(), url.length());
+  std::string result(string);
+  curl_free(string);
+  curl_easy_cleanup(curl);
+  return result;
+}
+
+std::string url_get_host(const std::string &url) {
+  CURLU *curlu = curl_url();
+  curl_url_set(curlu, CURLUPART_URL, url.c_str(), url.length());
+  char *host;
+  if (curl_url_get(curlu, CURLUPART_HOST, &host, 0) != CURLUE_OK) {
+    curl_url_cleanup(curlu);
+    return "";
+  }
+  std::string result(host);
+  curl_free(host);
+  curl_url_cleanup(curlu);
+  return result;
+}
+
 } // namespace http
\ No newline at end of file
diff --git a/sunshine/httpcommon.h b/sunshine/httpcommon.h
index ec2e93c0ded..082b80cf4e1 100644
--- a/sunshine/httpcommon.h
+++ b/sunshine/httpcommon.h
@@ -13,6 +13,9 @@ int save_user_creds(
 
 int reload_user_creds(const std::string &file);
 bool download_file(const std::string &url, const std::string &file);
+std::string url_escape(const std::string &url);
+std::string url_get_host(const std::string &url);
+
 extern std::string unique_id;
 extern net::net_e origin_pin_allowed;
 extern net::net_e origin_web_ui_allowed;

From 940ce2e4c43f4863fcd54286a531d89372cfa167 Mon Sep 17 00:00:00 2001
From: Mariotaku <mariotaku.lee@gmail.com>
Date: Tue, 28 Jun 2022 10:08:03 +0900
Subject: [PATCH 03/15] updated format

---
 sunshine/confighttp.cpp | 14 +++++++-------
 sunshine/httpcommon.cpp |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sunshine/confighttp.cpp b/sunshine/confighttp.cpp
index 6e19c882e1a..cb7266a0fac 100644
--- a/sunshine/confighttp.cpp
+++ b/sunshine/confighttp.cpp
@@ -428,7 +428,7 @@ void uploadCover(resp_https_t response, req_https_t request) {
     std::ostringstream data;
 
     SimpleWeb::StatusCode code = SimpleWeb::StatusCode::success_ok;
-    if (outputTree.get_child_optional("error").has_value()) {
+    if(outputTree.get_child_optional("error").has_value()) {
       code = SimpleWeb::StatusCode::client_error_bad_request;
     }
 
@@ -437,7 +437,6 @@ void uploadCover(resp_https_t response, req_https_t request) {
   });
   pt::ptree inputTree;
   try {
-    //TODO: Input Validation
     pt::read_json(ss, inputTree);
   }
   catch(std::exception &e) {
@@ -448,7 +447,7 @@ void uploadCover(resp_https_t response, req_https_t request) {
   }
 
   auto key = inputTree.get("key", "");
-  if (key.empty()) {
+  if(key.empty()) {
     outputTree.put("error", "Cover key is required");
     return;
   }
@@ -460,16 +459,17 @@ void uploadCover(resp_https_t response, req_https_t request) {
   }
 
   std::basic_string path = coverdir + http::url_escape(key) + ".png";
-  if (!url.empty()) {
-    if (http::url_get_host(url) != "images.igdb.com") {
+  if(!url.empty()) {
+    if(http::url_get_host(url) != "images.igdb.com") {
       outputTree.put("error", "Only images.igdb.com is allowed");
       return;
     }
-    if (!http::download_file(url, path)) {
+    if(!http::download_file(url, path)) {
       outputTree.put("error", "Failed to download cover");
       return;
     }
-  } else {
+  }
+  else {
     auto data = SimpleWeb::Crypto::Base64::decode(inputTree.get<std::string>("data"));
 
     std::ofstream imgfile(path);
diff --git a/sunshine/httpcommon.cpp b/sunshine/httpcommon.cpp
index 615c6348ef1..8b85c691dc3 100644
--- a/sunshine/httpcommon.cpp
+++ b/sunshine/httpcommon.cpp
@@ -184,7 +184,7 @@ int create_creds(const std::string &pkey, const std::string &cert) {
 
 bool download_file(const std::string &url, const std::string &file) {
   CURL *curl = curl_easy_init();
-  if (!curl) {
+  if(!curl) {
     return false;
   }
   FILE *fp = fopen(file.c_str(), "wb");
@@ -198,7 +198,7 @@ bool download_file(const std::string &url, const std::string &file) {
 }
 
 std::string url_escape(const std::string &url) {
-  CURL *curl = curl_easy_init();
+  CURL *curl   = curl_easy_init();
   char *string = curl_easy_escape(curl, url.c_str(), url.length());
   std::string result(string);
   curl_free(string);
@@ -210,7 +210,7 @@ std::string url_get_host(const std::string &url) {
   CURLU *curlu = curl_url();
   curl_url_set(curlu, CURLUPART_URL, url.c_str(), url.length());
   char *host;
-  if (curl_url_get(curlu, CURLUPART_HOST, &host, 0) != CURLUE_OK) {
+  if(curl_url_get(curlu, CURLUPART_HOST, &host, 0) != CURLUE_OK) {
     curl_url_cleanup(curlu);
     return "";
   }

From e9cd7ce36873a9c744e62a6f8563ede1eb438ea4 Mon Sep 17 00:00:00 2001
From: Mariotaku <mariotaku.lee@gmail.com>
Date: Tue, 28 Jun 2022 10:11:10 +0900
Subject: [PATCH 04/15] added libcurl to CI config

---
 .github/workflows/CI.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 2562d68d6e3..28872ce8bd9 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -183,6 +183,7 @@ jobs:
               libboost-log-dev \
               libboost-thread-dev \
               libcap-dev \
+              libcurl4-openssl-dev \
               libdrm-dev \
               libevdev-dev \
               libpulse-dev \

From 8730aab3f9646c0977510bb179dd44c966de23d4 Mon Sep 17 00:00:00 2001
From: Mariotaku <mariotaku.lee@gmail.com>
Date: Tue, 28 Jun 2022 14:31:49 +0900
Subject: [PATCH 05/15] added libcurl to cpack dependencies

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e17d1493a9..7ec5d6fa280 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -606,8 +606,8 @@ if(UNIX AND NOT APPLE)
 
 	# Dependencies
 	set(CPACK_DEB_COMPONENT_INSTALL ON)
-	set(CPACK_DEBIAN_PACKAGE_DEPENDS "openssl, libavdevice58, libboost-thread1.67.0 | libboost-thread1.71.0 | libboost-thread1.74.0, libboost-filesystem1.67.0 | libboost-filesystem1.71.0 | libboost-filesystem1.74.0, libboost-log1.67.0 | libboost-log1.71.0 | libboost-log1.74.0, libpulse0, libopus0, libxcb-shm0, libxcb-xfixes0, libxtst6, libevdev2, libdrm2, libcap2")
-	set(CPACK_RPM_PACKAGE_REQUIRES "openssl >= 1.1, libavdevice >= 4.3, boost-thread >= 1.67.0, boost-filesystem >= 1.67.0, boost-log >= 1.67.0, pulseaudio-libs >= 10.0, libopusenc >= 0.2.1, libxcb >= 1.13, libXtst >= 1.2.3, libevdev >= 1.5.6, libdrm >= 2.4.97, libcap >= 2.22")
+	set(CPACK_DEBIAN_PACKAGE_DEPENDS "openssl, libavdevice58, libboost-thread1.67.0 | libboost-thread1.71.0 | libboost-thread1.74.0, libboost-filesystem1.67.0 | libboost-filesystem1.71.0 | libboost-filesystem1.74.0, libboost-log1.67.0 | libboost-log1.71.0 | libboost-log1.74.0, libcurl4, libpulse0, libopus0, libxcb-shm0, libxcb-xfixes0, libxtst6, libevdev2, libdrm2, libcap2")
+	set(CPACK_RPM_PACKAGE_REQUIRES "openssl >= 1.1, libavdevice >= 4.3, boost-thread >= 1.67.0, boost-filesystem >= 1.67.0, boost-log >= 1.67.0, libcurl >= 7.0, pulseaudio-libs >= 10.0, libopusenc >= 0.2.1, libxcb >= 1.13, libXtst >= 1.2.3, libevdev >= 1.5.6, libdrm >= 2.4.97, libcap >= 2.22")
 	set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS OFF) # This should automatically figure out dependencies, doesn't work with the current config
 endif()
 

From 921990d49f73d7df23326d0221e9c90f0c079b3b Mon Sep 17 00:00:00 2001
From: Mariotaku <mariotaku.lee@gmail.com>
Date: Sat, 16 Jul 2022 00:54:55 +0900
Subject: [PATCH 06/15] uses https://github.com/LizardByte/db

---
 src_assets/common/assets/web/apps.html | 71 ++++++++++++++------------
 1 file changed, 38 insertions(+), 33 deletions(-)

diff --git a/src_assets/common/assets/web/apps.html b/src_assets/common/assets/web/apps.html
index d0161873b82..87c22c0d0fe 100644
--- a/src_assets/common/assets/web/apps.html
+++ b/src_assets/common/assets/web/apps.html
@@ -300,48 +300,53 @@ <h4 class="modal-title">Covers Found</h4>
         this.coverCandidates = [];
         this.coverSearching = true;
 
-        function getSearchKey(q) {
-          const key = q.toLowerCase().replaceAll(/[^\da-z]+/g, '.');
-          if (key.endsWith('.')) {
-            return key.substring(0, key.length - 1);
+        function getSearchBucket(name) {
+          let bucket = name.substring(0, Math.min(name.length, 2)).toLowerCase().replaceAll(/[^a-z\d]/g, '');
+          if (!bucket) {
+            return '@';
           }
-          return key;
+          return bucket;
         }
 
-        function getSearchBucket(key) {
-          let index = key.indexOf('.');
-          if (index < 0) {
-            index = key.length;
+        function searchCovers(name) {
+          if (!name) {
+            return Promise.resolve([]);
           }
-          const s = key.substring(0, Math.min(2, index));
-          if (!s || s === '.') return '@';
-          return s;
-        }
-
-        function searchCovers(key) {
-          let bucket = getSearchBucket(key);
-          return fetch("https://sunshinestream.github.io/db/buckets/" + bucket + ".json").then(r => {
+          let searchName = name.replaceAll(/\s+/g, '.').toLowerCase();
+          let bucket = getSearchBucket(name);
+          return fetch("https://db.lizardbyte.dev/buckets/" + bucket + ".json").then(function (r) {
             if (!r.ok) throw new Error("Failed to search covers");
             return r.json();
-          }).then(maps => {
-            let result = [];
-            for (let itemKey of Object.keys(maps)) {
-              if (itemKey.startsWith(key)) {
-                let item = maps[itemKey];
-                result.push({
-                  name: item.name,
-                  key: itemKey,
-                  url: "https://images.igdb.com/igdb/image/upload/t_cover_big/" + item.hash + ".jpg",
-                  saveUrl: "https://images.igdb.com/igdb/image/upload/t_cover_big_2x/" + item.hash + ".png",
-                });
-              }
+          }).then(maps => Promise.all(Object.keys(maps).map(id => {
+            let item = maps[id];
+            if (item.name.replaceAll(/\s+/g, '.').toLowerCase().startsWith(searchName)) {
+              return fetch("https://db.lizardbyte.dev/games/" + id + ".json").then(function (r) {
+                return r.json();
+              }).catch(() => null);
             }
-            return result;
-          });
+            return null;
+          }).filter(item => item)))
+            .then(results => results
+              .filter(item => item && item.cover && item.cover.url)
+              .map(game => {
+                const thumb = game.cover.url;
+                const dotIndex = thumb.lastIndexOf('.');
+                const slashIndex = thumb.lastIndexOf('/');
+                if (dotIndex < 0 || slashIndex < 0) {
+                  return null;
+                }
+                const hash = thumb.substring(slashIndex + 1, dotIndex);
+                return {
+                  name: game.name,
+                  key: "igdb_" + game.id,
+                  url: "https://images.igdb.com/igdb/image/upload/t_cover_big/" + hash + ".jpg",
+                  saveUrl: "https://images.igdb.com/igdb/image/upload/t_cover_big_2x/" + hash + ".png",
+                }
+              }).filter(item => item));
         }
 
-        searchCovers(getSearchKey(this.editForm["name"].toString()))
-          .then(body => this.coverCandidates = body)
+        searchCovers(this.editForm["name"].toString())
+          .then(list => this.coverCandidates = list)
           .finally(() => this.coverSearching = false);
       },
       closeCoverFinder() {

From b11d73599448fd4608c841811896d49c9dfa2236 Mon Sep 17 00:00:00 2001
From: Mariotaku <mariotaku.lee@gmail.com>
Date: Thu, 4 Aug 2022 12:01:27 +0900
Subject: [PATCH 07/15] added errors logging

---
 sunshine/httpcommon.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/sunshine/httpcommon.cpp b/sunshine/httpcommon.cpp
index 8b85c691dc3..2a229654dff 100644
--- a/sunshine/httpcommon.cpp
+++ b/sunshine/httpcommon.cpp
@@ -185,16 +185,25 @@ int create_creds(const std::string &pkey, const std::string &cert) {
 bool download_file(const std::string &url, const std::string &file) {
   CURL *curl = curl_easy_init();
   if(!curl) {
+    BOOST_LOG(error) << "Couldn't create CURL instance";
     return false;
   }
   FILE *fp = fopen(file.c_str(), "wb");
+  if(!fp) {
+    BOOST_LOG(error) << "Couldn't open ["sv << file << ']';
+    curl_easy_cleanup(curl);
+    return false;
+  }
   curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
   curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, fwrite);
   curl_easy_setopt(curl, CURLOPT_WRITEDATA, fp);
-  bool result = curl_easy_perform(curl) == CURLE_OK;
+  CURLcode result = curl_easy_perform(curl);
+  if(result != CURLE_OK) {
+    BOOST_LOG(error) << "Couldn't download ["sv << url << ", code:" << result << ']';
+  }
   curl_easy_cleanup(curl);
   fclose(fp);
-  return result;
+  return result == CURLE_OK;
 }
 
 std::string url_escape(const std::string &url) {

From 7656a7a06a2bd8af4dcf40e192daf3b4102ebac0 Mon Sep 17 00:00:00 2001
From: Mariotaku <mariotaku.lee@gmail.com>
Date: Tue, 9 Aug 2022 00:30:38 +0900
Subject: [PATCH 08/15] added curl dep in CI

---
 .github/workflows/CI.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 46a6b4ac2c4..2012a5b0996 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -723,6 +723,7 @@ jobs:
             mingw-w64-x86_64-binutils
             mingw-w64-x86_64-boost
             mingw-w64-x86_64-cmake
+            mingw-w64-x86_64-curl
             mingw-w64-x86_64-nsis
             mingw-w64-x86_64-openssl
             mingw-w64-x86_64-opus

From 78b32c42c344b24469b0fd4b3e26d84f086e6ec0 Mon Sep 17 00:00:00 2001
From: Mariotaku <mariotaku.lee@gmail.com>
Date: Wed, 24 Aug 2022 22:39:29 +0900
Subject: [PATCH 09/15] updated covers directory

---
 sunshine/confighttp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sunshine/confighttp.cpp b/sunshine/confighttp.cpp
index cb7266a0fac..a5ae4160ce3 100644
--- a/sunshine/confighttp.cpp
+++ b/sunshine/confighttp.cpp
@@ -453,7 +453,7 @@ void uploadCover(resp_https_t response, req_https_t request) {
   }
   auto url = inputTree.get("url", "");
 
-  const std::string coverdir = SUNSHINE_ASSETS_DIR "/covers/";
+  const std::string coverdir = platf::appdata().string() +  "/covers/";
   if(!boost::filesystem::exists(coverdir)) {
     boost::filesystem::create_directory(coverdir);
   }

From 8a1c6cf8b5e91d406e1402e343d315fa48560769 Mon Sep 17 00:00:00 2001
From: Mariotaku <mariotaku.lee@gmail.com>
Date: Wed, 24 Aug 2022 22:49:59 +0900
Subject: [PATCH 10/15] updated build deps

---
 .github/workflows/CI.yml     | 2 +-
 packaging/linux/aur/PKGBUILD | 2 +-
 packaging/macos/Portfile     | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index da2ddcf29e4..14e5d9972db 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -468,7 +468,7 @@ jobs:
       - name: Setup Dependencies MacOS
         run: |
           # install dependencies using homebrew
-          brew install boost cmake ffmpeg opus
+          brew install boost cmake curl ffmpeg opus
 
           # fix openssl header not found
           ln -sf /usr/local/opt/openssl/include/openssl /usr/local/include/openssl
diff --git a/packaging/linux/aur/PKGBUILD b/packaging/linux/aur/PKGBUILD
index ede1af256eb..852ec881d0d 100644
--- a/packaging/linux/aur/PKGBUILD
+++ b/packaging/linux/aur/PKGBUILD
@@ -9,7 +9,7 @@ arch=('x86_64' 'i686')
 url=@PROJECT_HOMEPAGE_URL@
 license=('GPL3')
 
-depends=('avahi' 'boost-libs' 'ffmpeg4.4' 'libevdev' 'libpulse' 'libx11' 'libxcb' 'libxfixes' 'libxrandr' 'libxtst' 'openssl' 'opus' 'udev')
+depends=('avahi' 'boost-libs' 'curl' 'ffmpeg4.4' 'libevdev' 'libpulse' 'libx11' 'libxcb' 'libxfixes' 'libxrandr' 'libxtst' 'openssl' 'opus' 'udev')
 makedepends=('boost' 'cmake' 'git' 'make')
 optdepends=('cuda' 'libcap' 'libdrm')
 
diff --git a/packaging/macos/Portfile b/packaging/macos/Portfile
index 8707cedca13..166cab3c401 100644
--- a/packaging/macos/Portfile
+++ b/packaging/macos/Portfile
@@ -32,6 +32,7 @@ post-fetch {
 }
 
 depends_lib              port:avahi \
+                         port:curl \
                          port:ffmpeg \
                          port:libopus
 

From 9400d86d4976d43ea1a5a536f26a88cab4075ada Mon Sep 17 00:00:00 2001
From: Conn O'Griofa <connogriofa@gmail.com>
Date: Thu, 17 Nov 2022 09:00:45 +0000
Subject: [PATCH 11/15] CMakeLists: fix building against statically linked
 libcurl

---
 CMakeLists.txt | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7989fb375dc..f270902e993 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,7 +68,9 @@ include_directories(third-party/miniupnp)
 
 find_package(Threads REQUIRED)
 find_package(OpenSSL REQUIRED)
-find_package(CURL REQUIRED)
+find_package(PkgConfig REQUIRED)
+pkg_check_modules (CURL REQUIRED libcurl)
+
 if(NOT APPLE)
 	set(Boost_USE_STATIC_LIBS ON)
 endif()
@@ -88,6 +90,7 @@ if(WIN32)
 		INPUT "${CMAKE_CURRENT_BINARY_DIR}/pre-compiled.zip"
 		DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/pre-compiled)
 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CURL_STATIC_LDFLAGS} ${CURL_STATIC_CFLAGS}")
 
 	if(NOT DEFINED SUNSHINE_PREPARED_BINARIES)
 		set(SUNSHINE_PREPARED_BINARIES "${CMAKE_CURRENT_BINARY_DIR}/pre-compiled/windows")
@@ -149,6 +152,7 @@ if(WIN32)
 		d3d11 dxgi D3DCompiler
 		setupapi
 		dwmapi
+		${CURL_STATIC_LIBRARIES}
 		)
 
 	set_source_files_properties(third-party/ViGEmClient/src/ViGEmClient.cpp PROPERTIES COMPILE_DEFINITIONS "UNICODE=1;ERROR_INVALID_DEVICE_OBJECT_PARAMETER=650")
@@ -457,6 +461,11 @@ endif()
 list(APPEND SUNSHINE_DEFINITIONS SUNSHINE_ASSETS_DIR="${SUNSHINE_ASSETS_DIR}")
 list(APPEND SUNSHINE_DEFINITIONS SUNSHINE_CONFIG_DIR="${SUNSHINE_CONFIG_DIR}")
 add_executable(sunshine ${SUNSHINE_TARGET_FILES})
+
+if(WIN32)
+        set_target_properties(sunshine PROPERTIES LINK_SEARCH_START_STATIC 1)
+endif()
+
 target_link_libraries(sunshine ${SUNSHINE_EXTERNAL_LIBRARIES} ${EXTRA_LIBS})
 target_compile_definitions(sunshine PUBLIC ${SUNSHINE_DEFINITIONS})
 set_target_properties(sunshine PROPERTIES CXX_STANDARD 17

From 2efb9067ad536b9f046433665a5c6577d48afdf1 Mon Sep 17 00:00:00 2001
From: Mariotaku <mariotaku.lee@gmail.com>
Date: Fri, 18 Nov 2022 00:38:30 +0900
Subject: [PATCH 12/15] updated build deps

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index b493b0d4621..2b6f57cd080 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,6 +14,7 @@ RUN apt-get update -y \
         libboost-log-dev=1.74.0* \
         libboost-thread-dev=1.74.0* \
         libcap-dev=1:2.44* \
+        libcurl4-openssl-dev=7.68.0* \
         libdrm-dev=2.4.110* \
         libevdev-dev=1.12.1* \
         libpulse-dev=1:15.99.1* \

From 625e7fc09f5d2cd3b9ac55e5cf3af4277860fa09 Mon Sep 17 00:00:00 2001
From: Mariotaku <mariotaku.lee@gmail.com>
Date: Fri, 18 Nov 2022 00:40:41 +0900
Subject: [PATCH 13/15] fixed code format

---
 src/confighttp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/confighttp.cpp b/src/confighttp.cpp
index d425a9cc655..ec38fb9335d 100644
--- a/src/confighttp.cpp
+++ b/src/confighttp.cpp
@@ -452,7 +452,7 @@ void uploadCover(resp_https_t response, req_https_t request) {
   }
   auto url = inputTree.get("url", "");
 
-  const std::string coverdir = platf::appdata().string() +  "/covers/";
+  const std::string coverdir = platf::appdata().string() + "/covers/";
   if(!boost::filesystem::exists(coverdir)) {
     boost::filesystem::create_directory(coverdir);
   }

From 0af2d8b56f6541d784e03e980f567acba0ab475c Mon Sep 17 00:00:00 2001
From: Mariotaku <mariotaku.lee@gmail.com>
Date: Fri, 18 Nov 2022 01:39:43 +0900
Subject: [PATCH 14/15] updated build deps

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 2b6f57cd080..3f52d99e33f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@ RUN apt-get update -y \
         libboost-log-dev=1.74.0* \
         libboost-thread-dev=1.74.0* \
         libcap-dev=1:2.44* \
-        libcurl4-openssl-dev=7.68.0* \
+        libcurl4-openssl-dev=7.81.0* \
         libdrm-dev=2.4.110* \
         libevdev-dev=1.12.1* \
         libpulse-dev=1:15.99.1* \

From 900bca3a8cddff4497235bab9c733fb97226f3e5 Mon Sep 17 00:00:00 2001
From: Mariotaku <mariotaku.lee@gmail.com>
Date: Fri, 18 Nov 2022 23:43:56 +0900
Subject: [PATCH 15/15] uses native CA for CURL on Windows

---
 src/httpcommon.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/httpcommon.cpp b/src/httpcommon.cpp
index 092c2dc6bf3..e4747e327d7 100644
--- a/src/httpcommon.cpp
+++ b/src/httpcommon.cpp
@@ -197,6 +197,9 @@ bool download_file(const std::string &url, const std::string &file) {
   curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
   curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, fwrite);
   curl_easy_setopt(curl, CURLOPT_WRITEDATA, fp);
+#ifdef _WIN32
+  curl_easy_setopt(curl, CURLOPT_SSL_OPTIONS, CURLSSLOPT_NATIVE_CA);
+#endif
   CURLcode result = curl_easy_perform(curl);
   if(result != CURLE_OK) {
     BOOST_LOG(error) << "Couldn't download ["sv << url << ", code:" << result << ']';