mirror of
https://github.com/xorgy/mediafire-fuse
synced 2026-01-13 13:14:29 -08:00
Allow file upload
- add upload/simple - add upload/poll_upload - add "put" command to mfshell - add http POST method
This commit is contained in:
@@ -95,4 +95,13 @@ int mfconn_api_device_get_patch(mfconn * conn, mfpatch * patch,
|
||||
uint64_t source_revision,
|
||||
uint64_t target_revision);
|
||||
|
||||
int mfconn_api_upload_simple(mfconn * conn, const char *folderkey,
|
||||
const char *file_path,
|
||||
const char *file_name,
|
||||
char **upload_key);
|
||||
|
||||
int mfconn_api_upload_poll_upload(mfconn * conn,
|
||||
const char *upload_key,
|
||||
int *status, int *fileerror);
|
||||
|
||||
#endif
|
||||
|
||||
112
mfapi/apicalls/upload_poll_upload.c
Normal file
112
mfapi/apicalls/upload_poll_upload.c
Normal file
@@ -0,0 +1,112 @@
|
||||
/*
|
||||
* 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.
|
||||
*
|
||||
*/
|
||||
|
||||
#include <jansson.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <stddef.h>
|
||||
|
||||
#include "../../utils/http.h"
|
||||
#include "../../utils/json.h"
|
||||
#include "../mfconn.h"
|
||||
#include "../apicalls.h" // IWYU pragma: keep
|
||||
|
||||
struct upload_poll_upload_response {
|
||||
int status;
|
||||
int fileerror;
|
||||
};
|
||||
|
||||
static int _decode_upload_poll_upload(mfhttp * conn, void *data);
|
||||
|
||||
int
|
||||
mfconn_api_upload_poll_upload(mfconn * conn, const char *upload_key,
|
||||
int *status, int *fileerror)
|
||||
{
|
||||
const char *api_call;
|
||||
int retval;
|
||||
mfhttp *http;
|
||||
struct upload_poll_upload_response response;
|
||||
|
||||
if (conn == NULL)
|
||||
return -1;
|
||||
|
||||
if (upload_key == NULL)
|
||||
return -1;
|
||||
|
||||
// make an UNSIGNED get
|
||||
api_call = mfconn_create_unsigned_get(conn, 0,
|
||||
"upload/poll_upload.php",
|
||||
"?response_format=json"
|
||||
"&key=%s", upload_key);
|
||||
|
||||
http = http_create();
|
||||
retval = http_get_buf(http, api_call, _decode_upload_poll_upload,
|
||||
&response);
|
||||
http_destroy(http);
|
||||
|
||||
free((void *)api_call);
|
||||
|
||||
*status = response.status;
|
||||
*fileerror = response.fileerror;
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
||||
static int _decode_upload_poll_upload(mfhttp * conn, void *user_ptr)
|
||||
{
|
||||
json_error_t error;
|
||||
json_t *root;
|
||||
json_t *node;
|
||||
json_t *j_obj;
|
||||
|
||||
struct upload_poll_upload_response *response;
|
||||
|
||||
response = (struct upload_poll_upload_response *)user_ptr;
|
||||
if (response == NULL)
|
||||
return -1;
|
||||
|
||||
response->status = 0;
|
||||
response->fileerror = 0;
|
||||
|
||||
root = http_parse_buf_json(conn, 0, &error);
|
||||
|
||||
node = json_object_by_path(root, "response/doupload");
|
||||
|
||||
// make sure that the result code is zero (success)
|
||||
j_obj = json_object_get(node, "result");
|
||||
if (j_obj == NULL || strcmp(json_string_value(j_obj), "0") != 0) {
|
||||
json_decref(root);
|
||||
return -1;
|
||||
}
|
||||
|
||||
j_obj = json_object_get(node, "status");
|
||||
if (j_obj != NULL) {
|
||||
response->status = atol(json_string_value(j_obj));
|
||||
}
|
||||
|
||||
j_obj = json_object_get(node, "fileerror");
|
||||
if (j_obj != NULL) {
|
||||
response->fileerror = atol(json_string_value(j_obj));
|
||||
}
|
||||
|
||||
if (root != NULL)
|
||||
json_decref(root);
|
||||
|
||||
return 0;
|
||||
}
|
||||
130
mfapi/apicalls/upload_simple.c
Normal file
130
mfapi/apicalls/upload_simple.c
Normal file
@@ -0,0 +1,130 @@
|
||||
/*
|
||||
* 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 <openssl/sha.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
#include "../../utils/http.h"
|
||||
#include "../../utils/json.h"
|
||||
#include "../../utils/hash.h"
|
||||
#include "../mfconn.h"
|
||||
#include "../apicalls.h" // IWYU pragma: keep
|
||||
|
||||
static int _decode_upload_simple(mfhttp * conn, void *data);
|
||||
|
||||
int
|
||||
mfconn_api_upload_simple(mfconn * conn, const char *folderkey,
|
||||
const char *file_path, const char *file_name,
|
||||
char **upload_key)
|
||||
{
|
||||
const char *api_call;
|
||||
int retval;
|
||||
mfhttp *http;
|
||||
FILE *fh;
|
||||
unsigned char hash[SHA256_DIGEST_LENGTH];
|
||||
char *file_hash;
|
||||
struct stat file_info;
|
||||
|
||||
if (conn == NULL)
|
||||
return -1;
|
||||
|
||||
fh = fopen(file_path, "r");
|
||||
if (fh == NULL) {
|
||||
perror("cannot open file");
|
||||
fprintf(stderr, "cannot open %s\n", file_path);
|
||||
return -1;
|
||||
}
|
||||
|
||||
retval = calc_sha256(fh, hash);
|
||||
fclose(fh);
|
||||
|
||||
if (retval != 0) {
|
||||
fprintf(stderr, "failed to calculate hash\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
memset(&file_info, 0, sizeof(file_info));
|
||||
retval = stat(file_path, &file_info);
|
||||
|
||||
if (retval != 0) {
|
||||
fprintf(stderr, "stat failed\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
file_hash = binary2hex(hash, SHA256_DIGEST_LENGTH);
|
||||
|
||||
if (folderkey == NULL) {
|
||||
api_call = mfconn_create_signed_get(conn, 0,
|
||||
"upload/simple.php",
|
||||
"?response_format=json");
|
||||
} else {
|
||||
api_call = mfconn_create_signed_get(conn, 0,
|
||||
"upload/simple.php",
|
||||
"?response_format=json"
|
||||
"&folder_key=%s", folderkey);
|
||||
}
|
||||
|
||||
http = http_create();
|
||||
retval = http_post_file(http, api_call, file_path, file_name,
|
||||
file_info.st_size, file_hash,
|
||||
_decode_upload_simple, upload_key);
|
||||
http_destroy(http);
|
||||
|
||||
free(file_hash);
|
||||
free((void *)api_call);
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
||||
static int _decode_upload_simple(mfhttp * conn, void *user_ptr)
|
||||
{
|
||||
json_error_t error;
|
||||
json_t *root;
|
||||
json_t *node;
|
||||
json_t *j_obj;
|
||||
|
||||
char **upload_key;
|
||||
|
||||
upload_key = (char **)user_ptr;
|
||||
if (upload_key == NULL)
|
||||
return -1;
|
||||
|
||||
root = http_parse_buf_json(conn, 0, &error);
|
||||
|
||||
node = json_object_by_path(root, "response/doupload");
|
||||
|
||||
j_obj = json_object_get(node, "key");
|
||||
if (j_obj != NULL) {
|
||||
*upload_key = strdup(json_string_value(j_obj));
|
||||
} else {
|
||||
*upload_key = NULL;
|
||||
}
|
||||
|
||||
if (root != NULL)
|
||||
json_decref(root);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -65,6 +65,8 @@ mfconn_api_user_get_session_token(mfconn * conn, const char *server,
|
||||
mfconn_create_user_signature(conn, username, password, app_id,
|
||||
app_key);
|
||||
|
||||
// FIXME: username and password have to be urlencoded (maybe using
|
||||
// curl_easy_escape)
|
||||
post_args = strdup_printf("email=%s"
|
||||
"&password=%s"
|
||||
"&application_id=%d"
|
||||
|
||||
@@ -174,6 +174,69 @@ const char *mfconn_create_call_signature(mfconn * conn, const char *url,
|
||||
return strdup((const char *)signature_hex);
|
||||
}
|
||||
|
||||
const char *mfconn_create_unsigned_get(mfconn * conn, int ssl,
|
||||
const char *api, const char *fmt,
|
||||
...)
|
||||
{
|
||||
char *api_request = NULL;
|
||||
char *api_args = NULL;
|
||||
int bytes_to_alloc;
|
||||
int api_args_len;
|
||||
int api_len;
|
||||
va_list ap;
|
||||
|
||||
if (conn == NULL)
|
||||
return NULL;
|
||||
if (conn->server == NULL)
|
||||
return NULL;
|
||||
|
||||
// make sure the api (ex: user/get_info.php) is sane
|
||||
if (api == NULL)
|
||||
return NULL;
|
||||
api_len = strlen(api);
|
||||
if (api_len < 3)
|
||||
return NULL;
|
||||
|
||||
// calculate how big of a buffer we need
|
||||
va_start(ap, fmt);
|
||||
api_args_len = (vsnprintf(NULL, 0, fmt, ap) + 1); // + 1 for NULL
|
||||
va_end(ap);
|
||||
|
||||
// create the correctly sized buffer and process the args
|
||||
api_args = (char *)calloc(api_args_len, sizeof(char));
|
||||
|
||||
// printf("\n\r%d\n\r",api_args_len);
|
||||
|
||||
va_start(ap, fmt);
|
||||
vsnprintf(api_args, api_args_len, fmt, ap);
|
||||
va_end(ap);
|
||||
|
||||
// correct user error of trailing slash
|
||||
if (api[api_len - 1] == '/')
|
||||
return NULL;
|
||||
|
||||
api_request = strdup_printf("%s//%s/api/%s",
|
||||
(ssl ? "https:" : "http:"), conn->server, api);
|
||||
|
||||
// compute the amount of space requred to realloc() the request
|
||||
bytes_to_alloc = api_args_len;
|
||||
bytes_to_alloc += strlen(api_request);
|
||||
bytes_to_alloc += 1; // null termination
|
||||
|
||||
// append api GET args to api request
|
||||
api_request = (char *)realloc(api_request, bytes_to_alloc);
|
||||
if (api_request == NULL) {
|
||||
fprintf(stderr, "cannot allocate memory\n");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
strncat(api_request, api_args, api_args_len);
|
||||
|
||||
free(api_args);
|
||||
|
||||
return api_request;
|
||||
}
|
||||
|
||||
const char *mfconn_create_signed_get(mfconn * conn, int ssl,
|
||||
const char *api, const char *fmt, ...)
|
||||
{
|
||||
|
||||
@@ -34,6 +34,10 @@ void mfconn_destroy(mfconn * conn);
|
||||
|
||||
ssize_t mfconn_download_direct(mffile * file, const char *local_dir);
|
||||
|
||||
const char *mfconn_create_unsigned_get(mfconn * conn, int ssl,
|
||||
const char *api, const char *fmt,
|
||||
...);
|
||||
|
||||
const char *mfconn_create_signed_get(mfconn * conn, int ssl,
|
||||
const char *api, const char *fmt,
|
||||
...);
|
||||
|
||||
Reference in New Issue
Block a user