add upload/patch

CMakeLists.txt

@@ -30,6 +30,7 @@ add_library(mfapi SHARED
 	mfapi/apicalls/device_get_patch.c
 	mfapi/apicalls/device_get_updates.c
 	mfapi/apicalls/upload_simple.c
+	mfapi/apicalls/upload_patch.c
 	mfapi/apicalls/upload_poll_upload.c
 	)
 

mfapi/apicalls.h

@@ -106,6 +106,10 @@ int             mfconn_api_upload_simple(mfconn * conn, const char *folderkey,
                                          FILE * fh, const char *file_name,
                                          char **upload_key);
 
+int             mfconn_api_upload_patch(mfconn * conn, const char *quickkey,
+                                        FILE * source_fh, FILE * target_fh,
+                                        FILE * patch_fh, char **upload_key);
+
 int             mfconn_api_upload_poll_upload(mfconn * conn,
                                               const char *upload_key,
                                               int *status, int *fileerror);

mfapi/apicalls/upload_patch.c

@@ -0,0 +1,178 @@
+/*
+ * Copyright (C) 2013 Bryan Christ <bryan.christ@mediafire.com>
+ *               2014 Johannes Schauer <j.schauer@email.de>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ */
+
+#define _POSIX_C_SOURCE 200809L // for strdup
+
+#include <jansson.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <inttypes.h>
+#include <openssl/sha.h>
+
+#include "../../utils/http.h"
+#include "../../utils/hash.h"
+#include "../mfconn.h"
+#include "../apicalls.h"        // IWYU pragma: keep
+
+static int      _decode_upload_patch(mfhttp * conn, void *data);
+
+int
+mfconn_api_upload_patch(mfconn * conn, const char *quickkey,
+                        FILE * source_fh, FILE * target_fh,
+                        FILE * patch_fh, char **upload_key)
+{
+    const char     *api_call;
+    int             retval;
+    mfhttp         *http;
+    uint64_t        target_size;
+    int             i;
+    unsigned char   hash[SHA256_DIGEST_LENGTH];
+    char           *source_hash;
+    char           *target_hash;
+
+    if (conn == NULL)
+        return -1;
+
+    if (source_fh == NULL)
+        return -1;
+
+    if (target_fh == NULL)
+        return -1;
+
+    rewind(source_fh);
+    retval = calc_sha256(source_fh, hash, NULL);
+
+    if (retval != 0) {
+        fprintf(stderr, "failed to calculate hash\n");
+        return -1;
+    }
+
+    source_hash = binary2hex(hash, SHA256_DIGEST_LENGTH);
+
+    rewind(target_fh);
+    retval = calc_sha256(target_fh, hash, &target_size);
+
+    if (retval != 0) {
+        fprintf(stderr, "failed to calculate hash\n");
+        return -1;
+    }
+
+    target_hash = binary2hex(hash, SHA256_DIGEST_LENGTH);
+
+    for (i = 0; i < mfconn_get_max_num_retries(conn); i++) {
+        if (*upload_key != NULL) {
+            free(*upload_key);
+            *upload_key = NULL;
+        }
+
+        api_call = mfconn_create_signed_get(conn, 0,
+                                            "upload/patch.php",
+                                            "?response_format=json"
+                                            "&source_hash=%s"
+                                            "&target_hash=%s"
+                                            "&target_size=%" PRIu64
+                                            "&quick_key=%s", source_hash,
+                                            target_hash, target_size,
+                                            quickkey);
+
+        // make sure that we are at the beginning of the file
+        rewind(patch_fh);
+
+        http = http_create();
+        retval = http_post_file(http, api_call, patch_fh, NULL, target_size,
+                                _decode_upload_patch, upload_key);
+        http_destroy(http);
+        mfconn_update_secret_key(conn);
+
+        free((void *)api_call);
+
+        if (retval != 127 && retval != 28)
+            break;
+
+        // if there was either a curl timeout or a token error, get a new
+        // token and try again
+        //
+        // on a curl timeout we get a new token because it is likely that we
+        // lost signature synchronization (we don't know whether the server
+        // accepted or rejected the last call)
+        fprintf(stderr, "got error %d - negotiate a new token\n", retval);
+        retval = mfconn_refresh_token(conn);
+        if (retval != 0) {
+            fprintf(stderr, "failed to get a new token\n");
+            break;
+        }
+    }
+
+    free(source_hash);
+    free(target_hash);
+
+    return retval;
+}
+
+static int _decode_upload_patch(mfhttp * conn, void *user_ptr)
+{
+    json_error_t    error;
+    json_t         *root;
+    json_t         *node;
+    json_t         *j_obj;
+    int             retval;
+
+    char          **upload_key;
+
+    upload_key = (char **)user_ptr;
+    if (upload_key == NULL)
+        return -1;
+
+    root = http_parse_buf_json(conn, 0, &error);
+
+    if (root == NULL) {
+        fprintf(stderr, "http_parse_buf_json failed at line %d\n", error.line);
+        fprintf(stderr, "error message: %s\n", error.text);
+        return -1;
+    }
+
+    node = json_object_get(root, "response");
+
+    retval = mfapi_check_response(node, "upload/patch");
+    if (retval != 0) {
+        fprintf(stderr, "invalid response\n");
+        json_decref(root);
+        return retval;
+    }
+
+    node = json_object_get(node, "doupload");
+
+    j_obj = json_object_get(node, "key");
+    if (j_obj != NULL) {
+        if (strcmp(json_string_value(j_obj), "") == 0) {
+            *upload_key = NULL;
+        } else {
+            *upload_key = strdup(json_string_value(j_obj));
+        }
+    } else {
+        *upload_key = NULL;
+    }
+
+    json_decref(root);
+
+    return 0;
+}

utils/http.c

@@ -282,10 +282,14 @@ http_post_file(mfhttp * conn, const char *url, FILE * fh,
                int (*data_handler) (mfhttp * conn, void *data), void *data)
 {
     int             retval;
+    struct curl_slist *fallback_headers;
 
     http_curl_reset(conn);
     conn->write_buf_len = 0;
 
+    if (custom_headers == NULL) {
+        custom_headers = &fallback_headers;
+    }
     // when using POST, curl implicitly sets
     // Content-Type: application/x-www-form-urlencoded
     // make sure it is set to application/octet-stream instead