added support for optional password for score server access

[rocksndiamonds.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index 4878aa8368e42bfdf1ddf59b7e901bd877a381dd..de9c7e37028ee6d75511011d18c1baf1d7326ab8 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -9016,6 +9016,26 @@ static void ExecuteAsThread(SDL_ThreadFunction function, char *name, void *data,
   Delay(1);
 }
 
+static char *getPasswordJSON(char *password)
+{
+  static char password_json[MAX_FILENAME_LEN] = "";
+  static boolean initialized = FALSE;
+
+  if (!initialized)
+  {
+    if (password != NULL &&
+       !strEqual(password, "") &&
+       !strEqual(password, UNDEFINED_PASSWORD))
+      snprintf(password_json, MAX_FILENAME_LEN,
+              "  \"password\":             \"%s\",\n",
+              setup.api_server_password);
+
+    initialized = TRUE;
+  }
+
+  return password_json;
+}
+
 static void DownloadServerScoreToCacheExt(struct HttpRequest *request,
                                          struct HttpResponse *response,
                                          int level_nr,
@@ -9028,9 +9048,11 @@ static void DownloadServerScoreToCacheExt(struct HttpRequest *request,
 
   snprintf(request->body, MAX_HTTP_BODY_SIZE,
           "{\n"
+          "%s"
           "  \"levelset_identifier\":  \"%s\",\n"
           "  \"level_nr\":             \"%d\"\n"
           "}\n",
+          getPasswordJSON(setup.api_server_password),
           levelset.identifier, level_nr);
 
   ConvertHttpRequestBodyToServerEncoding(request);
@@ -9109,21 +9131,23 @@ static int DownloadServerScoreToCacheThread(void *data_raw)
   DownloadServerScoreToCache(data->level_nr,
                             data->score_cache_filename);
 
+  checked_free(data->score_cache_filename);
+  checked_free(data);
+
   return 0;
 }
 
 static void DownloadServerScoreToCacheAsThread(int nr)
 {
-  static struct DownloadServerScoreToCacheThreadData data;
+  struct DownloadServerScoreToCacheThreadData *data =
+    checked_malloc(sizeof(struct DownloadServerScoreToCacheThreadData));
   char *score_cache_filename = getScoreCacheFilename(nr);
 
-  checked_free(data.score_cache_filename);
-
-  data.level_nr = nr;
-  data.score_cache_filename = getStringCopy(score_cache_filename);
+  data->level_nr = nr;
+  data->score_cache_filename = getStringCopy(score_cache_filename);
 
   ExecuteAsThread(DownloadServerScoreToCacheThread,
-                 "DownloadServerScoreToCache", &data,
+                 "DownloadServerScoreToCache", data,
                  "download scores from server");
 }
 
@@ -9296,6 +9320,7 @@ static void UploadScoreToServerExt(struct HttpRequest *request,
 
   snprintf(request->body, MAX_HTTP_BODY_SIZE,
           "{\n"
+          "%s"
           "  \"game_version\":         \"%s\",\n"
           "  \"levelset_identifier\":  \"%s\",\n"
           "  \"levelset_name\":        \"%s\",\n"
@@ -9312,6 +9337,7 @@ static void UploadScoreToServerExt(struct HttpRequest *request,
           "  \"tape_basename\":        \"%s\",\n"
           "  \"tape\":                 \"%s\"\n"
           "}\n",
+          getPasswordJSON(setup.api_server_password),
           getProgramRealVersionString(),
           levelset_identifier,
           levelset_name,
@@ -9384,23 +9410,25 @@ static int UploadScoreToServerThread(void *data_raw)
                      data->score_tape_filename,
                      &data->score_entry);
 
+  checked_free(data->score_tape_filename);
+  checked_free(data);
+
   return 0;
 }
 
 static void UploadScoreToServerAsThread(int nr)
 {
-  static struct UploadScoreToServerThreadData data;
+  struct UploadScoreToServerThreadData *data =
+    checked_malloc(sizeof(struct UploadScoreToServerThreadData));
   struct ScoreEntry *score_entry = &scores.entry[scores.last_added];
   char *score_tape_filename = getScoreTapeFilename(score_entry->tape_basename, nr);
 
-  checked_free(data.score_tape_filename);
-
-  data.level_nr = nr;
-  data.score_entry = *score_entry;
-  data.score_tape_filename = getStringCopy(score_tape_filename);
+  data->level_nr = nr;
+  data->score_entry = *score_entry;
+  data->score_tape_filename = getStringCopy(score_tape_filename);
 
   ExecuteAsThread(UploadScoreToServerThread,
-                 "UploadScoreToServer", &data,
+                 "UploadScoreToServer", data,
                  "upload score to server");
 }
 
@@ -9677,6 +9705,10 @@ static struct TokenInfo global_setup_tokens[] =
     TYPE_STRING,
     &setup.api_server_hostname,                        "api_server_hostname"
   },
+  {
+    TYPE_STRING,
+    &setup.api_server_password,                        "api_server_password"
+  },
   {
     TYPE_STRING,
     &setup.touch.control_type,                 "touch.control_type"
@@ -10313,6 +10345,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
 
   si->api_server = TRUE;
   si->api_server_hostname = getStringCopy(API_SERVER_HOSTNAME);
+  si->api_server_password = getStringCopy(UNDEFINED_PASSWORD);
 
   si->touch.control_type = getStringCopy(TOUCH_CONTROL_DEFAULT);
   si->touch.move_distance = TOUCH_MOVE_DISTANCE_DEFAULT;       // percent