Ark/mediafire-fuse
1
0
Fork 0
mirror of https://github.com/xorgy/mediafire-fuse synced 2026-01-13 13:14:29 -08:00
Code Issues Packages Projects Releases Wiki Activity

urlencode all filenames, foldernames, username and password

Browse Source
This commit is contained in:
josch
2015-01-16 08:49:23 +01:00
parent 3bff628066
commit f0a55615ae
11 changed files with 117 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@@ -26,8 +26,6 @@
- add an option to only call device/get_status in configurable intervals
- add an option to make file cache size configurable
- write man pages
- username and password must be urlencoded in
mfapi/apicalls/user_get_session_token.c
- implement truncate (problem: zero byte files are not allowed at the remote)
- move uploading of files from release() to flush() because the return
value of release is ignored and because the calling close() returns

3
fuse/operations.c
View File

@@ -612,7 +612,8 @@ int mediafirefs_release(const char *path, struct fuse_file_info *file_info)
// hash exists, so use upload/instant
retval = mfconn_api_upload_instant(ctx->conn, NULL,
file_name, hash, size, folder_key);
file_name, hash, size,
folder_key);
fclose(fh);
free(temp1);

8
mfapi/apicalls.h
View File

@@ -145,11 +145,13 @@ int mfconn_api_device_get_patch(mfconn * conn, mfpatch * patch,
int mfconn_api_upload_check(mfconn * conn, const char *filename,
const char *hash,
uint64_t size, const char *folder_key,
struct mfconn_upload_check_result *result);
struct mfconn_upload_check_result
*result);
int mfconn_api_upload_instant(mfconn * conn, const char *quick_key,
const char *filename, const char *hash,
uint64_t size, const char *folder_key);
const char *filename,
const char *hash, uint64_t size,
const char *folder_key);
int mfconn_api_upload_simple(mfconn * conn, const char *folderkey,
FILE * fh, const char *file_name,

9
mfapi/apicalls/file_update.c
View File

@@ -32,6 +32,7 @@ int mfconn_api_file_update(mfconn * conn, const char *quickkey,
int retval;
mfhttp *http;
int i;
char *filename_urlenc;
if (conn == NULL)
return -1;
@@ -49,11 +50,17 @@ int mfconn_api_file_update(mfconn * conn, const char *quickkey,
return -1;
for (i = 0; i < mfconn_get_max_num_retries(conn); i++) {
filename_urlenc = urlencode(filename);
if (filename_urlenc == NULL) {
fprintf(stderr, "urlencode failed\n");
return -1;
}
api_call = mfconn_create_signed_get(conn, 0, "file/update.php",
"?quick_key=%s"
"&filename=%s"
"&response_format=json", quickkey,
filename);
filename_urlenc);
free(filename_urlenc);
if (api_call == NULL) {
fprintf(stderr, "mfconn_create_signed_get failed\n");
return -1;

11
mfapi/apicalls/folder_create.c
View File

@@ -32,6 +32,7 @@ int mfconn_api_folder_create(mfconn * conn, const char *parent,
int retval;
mfhttp *http;
int i;
char *name_urlenc;
if (conn == NULL)
return -1;
@@ -47,18 +48,24 @@ int mfconn_api_folder_create(mfconn * conn, const char *parent,
}
for (i = 0; i < mfconn_get_max_num_retries(conn); i++) {
name_urlenc = urlencode(name);
if (name_urlenc == NULL) {
fprintf(stderr, "urlencode failed\n");
return -1;
}
if (parent != NULL) {
api_call =
mfconn_create_signed_get(conn, 0, "folder/create.php",
"?parent_key=%s&foldername=%s"
"&response_format=json", parent,
name);
name_urlenc);
} else {
api_call =
mfconn_create_signed_get(conn, 0, "folder/create.php",
"?foldername=%s&response_format=json",
name);
name_urlenc);
}
free(name_urlenc);
if (api_call == NULL) {
fprintf(stderr, "mfconn_create_signed_get failed\n");
return -1;

9
mfapi/apicalls/folder_update.c
View File

@@ -32,6 +32,7 @@ int mfconn_api_folder_update(mfconn * conn, const char *folder_key,
int retval;
mfhttp *http;
int i;
char *foldername_urlenc;
if (conn == NULL)
return -1;
@@ -49,11 +50,17 @@ int mfconn_api_folder_update(mfconn * conn, const char *folder_key,
return -1;
for (i = 0; i < mfconn_get_max_num_retries(conn); i++) {
foldername_urlenc = urlencode(foldername);
if (foldername_urlenc == NULL) {
fprintf(stderr, "urlencode failed\n");
return -1;
}
api_call = mfconn_create_signed_get(conn, 0, "folder/update.php",
"?folder_key=%s"
"&foldername=%s"
"&response_format=json",
folder_key, foldername);
folder_key, foldername_urlenc);
free(foldername_urlenc);
if (api_call == NULL) {
fprintf(stderr, "mfconn_create_signed_get failed\n");
return -1;

22
mfapi/apicalls/upload_check.c
View File

@@ -22,22 +22,24 @@
#include <string.h>
#include <inttypes.h>
#include <stdio.h>
#include <stdbool.h>
#include "../../utils/http.h"
#include "../mfconn.h"
#include "../patch.h"
#include "../apicalls.h" // IWYU pragma: keep
static int _decode_upload_check(mfhttp * conn, void *data);
int mfconn_api_upload_check(mfconn * conn, const char *filename, const char *hash,
uint64_t size, const char *folder_key,
int mfconn_api_upload_check(mfconn * conn, const char *filename,
const char *hash, uint64_t size,
const char *folder_key,
struct mfconn_upload_check_result *result)
{
const char *api_call;
int retval;
mfhttp *http;
int i;
char *filename_urlenc;
if (conn == NULL)
return -1;
@@ -58,13 +60,19 @@ int mfconn_api_upload_check(mfconn * conn, const char *filename, const char *has
}
for (i = 0; i < mfconn_get_max_num_retries(conn); i++) {
filename_urlenc = urlencode(filename);
if (filename_urlenc == NULL) {
fprintf(stderr, "urlencode failed\n");
return -1;
}
api_call = mfconn_create_signed_get(conn, 0, "upload/check.php",
"?response_format=json"
"&filename=%s"
"&size=%" PRIu64
"&hash=%s"
"&folder_key=%s", filename,
"&folder_key=%s", filename_urlenc,
size, hash, folder_key);
free(filename_urlenc);
if (api_call == NULL) {
fprintf(stderr, "mfconn_create_signed_get failed\n");
return -1;
@@ -160,7 +168,8 @@ static int _decode_upload_check(mfhttp * conn, void *data)
return -1;
}
if (!json_is_string(obj)) {
fprintf(stderr, "response/in_account is not expected type string\n");
fprintf(stderr,
"response/in_account is not expected type string\n");
json_decref(root);
return -1;
}
@@ -206,7 +215,8 @@ static int _decode_upload_check(mfhttp * conn, void *data)
return -1;
}
if (!json_is_string(obj)) {
fprintf(stderr, "response/different_hash is not expected type string\n");
fprintf(stderr,
"response/different_hash is not expected type string\n");
json_decref(root);
return -1;
}

19
mfapi/apicalls/upload_instant.c
View File

@@ -18,8 +18,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <inttypes.h>
#include <stdint.h>
#include "../../utils/http.h"
#include "../mfconn.h"
@@ -33,6 +33,7 @@ int mfconn_api_upload_instant(mfconn * conn, const char *quick_key,
int retval;
mfhttp *http;
int i;
char *filename_urlenc;
if (conn == NULL)
return -1;
@@ -51,17 +52,22 @@ int mfconn_api_upload_instant(mfconn * conn, const char *quick_key,
"&hash=%s"
"&response_format=json",
quick_key, size, hash);
} else if (filename != NULL && filename[0] != '\0'
&& folder_key != 0) {
} else if (filename != NULL && filename[0] != '\0' && folder_key != 0) {
// upload a new file
filename_urlenc = urlencode(filename);
if (filename_urlenc == NULL) {
fprintf(stderr, "urlencode failed\n");
return -1;
}
api_call = mfconn_create_signed_get(conn, 0, "upload/instant.php",
"?folder_key=%s"
"&filename=%s"
"&size=%" PRIu64
"&hash=%s"
"&response_format=json",
folder_key, filename, size,
hash);
folder_key, filename_urlenc,
size, hash);
free(filename_urlenc);
} else {
fprintf(stderr, "you must either pass a quick_key or a filename "
"and folder_key\n");
@@ -75,7 +81,8 @@ int mfconn_api_upload_instant(mfconn * conn, const char *quick_key,
http = http_create();
retval =
http_get_buf(http, api_call, mfapi_decode_common, "upload/instant");
http_get_buf(http, api_call, mfapi_decode_common,
"upload/instant");
http_destroy(http);
mfconn_update_secret_key(conn);

19
mfapi/apicalls/user_get_session_token.c
View File

@@ -55,6 +55,8 @@ mfconn_api_user_get_session_token(mfconn * conn, const char *server,
struct user_get_session_token_response response;
mfhttp *http;
int i;
char *username_urlenc;
char *password_urlenc;
if (conn == NULL)
return -1;
@@ -81,15 +83,26 @@ 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)
username_urlenc = urlencode(username);
if (username_urlenc == NULL) {
fprintf(stderr, "urlencode failed\n");
return -1;
}
password_urlenc = urlencode(password);
if (password_urlenc == NULL) {
fprintf(stderr, "urlencode failed\n");
return -1;
}
post_args = strdup_printf("email=%s"
"&password=%s"
"&application_id=%d"
"&signature=%s"
"&token_version=2"
"&response_format=json",
username, password, app_id, user_signature);
username_urlenc, password_urlenc, app_id,
user_signature);
free(username_urlenc);
free(password_urlenc);
free((void *)user_signature);
http = http_create();

36
utils/http.c
View File

@@ -328,3 +328,39 @@ http_post_file(mfhttp * conn, const char *url, FILE * fh,
retval = data_handler(conn, data);
return retval;
}
// we roll our own urlencode function because curl_easy_escape requires a curl
// handle
char *urlencode(const char *inp)
{
char *buf;
char *bufp;
char hex[] = "0123456789abcdef";
// allocating three times the length of the input because in the worst
// case each character must be urlencoded and add a byte for the
// terminating zero
bufp = buf = (char *)malloc(strlen(inp) * 3 + 1);
if (buf == NULL) {
fprintf(stderr, "malloc failed\n");
return NULL;
}
while (*inp) {
if ((*inp >= '0' && *inp <= '9')
|| (*inp >= 'A' && *inp <= 'Z')
|| (*inp >= 'a' && *inp <= 'z')
|| *inp == '-' || *inp == '_' || *inp == '.' || *inp == '~') {
*bufp++ = *inp;
} else {
*bufp++ = '%';
*bufp++ = hex[(*inp >> 4) & 0xf];
*bufp++ = hex[*inp & 0xf];
}
inp++;
}
*bufp = '\0';
return buf;
}

2
utils/http.h
View File

@@ -46,4 +46,6 @@ int http_post_file(mfhttp * conn, const char *url, FILE * fh,
int (*data_handler) (mfhttp * conn, void *data),
void *data);
char *urlencode(const char *input);
#endif