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

retrieve and store user's ekey when calling user/get_session_token

Browse Source
This commit is contained in:
josch
2014-12-29 15:11:53 +01:00
parent 80036b5bd9
commit 51b2ca1392
3 changed files with 51 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mfapi/apicalls.h
View File

@@ -109,7 +109,8 @@ int mfconn_api_user_get_session_token(mfconn * conn,
const char *app_key, const char *app_key,
uint32_t * secret_key, uint32_t * secret_key,
char **secret_time, char **secret_time,
char **session_token); char **session_token,
char **ekey);
int mfconn_api_folder_delete(mfconn * conn, const char *folderkey); int mfconn_api_folder_delete(mfconn * conn, const char *folderkey);

51
mfapi/apicalls/user_get_session_token.c
View File

@@ -37,6 +37,7 @@ struct user_get_session_token_response {
uint32_t secret_key; uint32_t secret_key;
char *secret_time; char *secret_time;
char *session_token; char *session_token;
char *ekey;
}; };
int int
@@ -44,7 +45,8 @@ mfconn_api_user_get_session_token(mfconn * conn, const char *server,
const char *username, const char *password, const char *username, const char *password,
int app_id, const char *app_key, int app_id, const char *app_key,
uint32_t * secret_key, uint32_t * secret_key,
char **secret_time, char **session_token) char **secret_time, char **session_token,
char **ekey)
{ {
char *login_url; char *login_url;
char *post_args; char *post_args;
@@ -66,6 +68,10 @@ mfconn_api_user_get_session_token(mfconn * conn, const char *server,
free(*session_token); free(*session_token);
*session_token = NULL; *session_token = NULL;
} }
if (*ekey != NULL) {
free(*ekey);
*ekey = NULL;
}
// configure url for operation // configure url for operation
login_url = strdup_printf("https://%s/api/user/get_session_token.php", login_url = strdup_printf("https://%s/api/user/get_session_token.php",
server); server);
@@ -115,6 +121,7 @@ mfconn_api_user_get_session_token(mfconn * conn, const char *server,
*secret_key = response.secret_key; *secret_key = response.secret_key;
*secret_time = response.secret_time; *secret_time = response.secret_time;
*session_token = response.session_token; *session_token = response.session_token;
*ekey = response.ekey;
return retval; return retval;
} }
@@ -124,9 +131,7 @@ static int _decode_get_session_token(mfhttp * conn, void *user_ptr)
json_error_t error; json_error_t error;
json_t *root = NULL; json_t *root = NULL;
json_t *node; json_t *node;
json_t *session_token; json_t *j_obj;
json_t *secret_key;
json_t *secret_time;
struct user_get_session_token_response *response; struct user_get_session_token_response *response;
int retval; int retval;
@@ -152,29 +157,43 @@ static int _decode_get_session_token(mfhttp * conn, void *user_ptr)
return retval; return retval;
} }
session_token = json_object_get(node, "session_token"); j_obj = json_object_get(node, "session_token");
if (session_token == NULL) { if (j_obj == NULL) {
json_decref(root); json_decref(root);
fprintf(stderr, "json: no /session_token content\n"); fprintf(stderr, "json: no /session_token content\n");
return -1; return -1;
} }
response->session_token = strdup(json_string_value(j_obj));
response->session_token = strdup(json_string_value(session_token)); j_obj = json_object_get(node, "secret_key");
if (j_obj == NULL) {
secret_key = json_object_get(node, "secret_key"); json_decref(root);
if (secret_key != NULL) fprintf(stderr, "json: no /secret_key content\n");
response->secret_key = atoll(json_string_value(secret_key)); return -1;
}
response->secret_key = atoll(json_string_value(j_obj));
/* /*
time looks like a float but we must store it as a string to time looks like a float but we must store it as a string to
remain congruent with the server on decimal place presentation. remain congruent with the server on decimal place presentation.
*/ */
secret_time = json_object_get(node, "time"); j_obj = json_object_get(node, "time");
if (secret_time != NULL) if (j_obj == NULL) {
response->secret_time = strdup(json_string_value(secret_time));
if (root != NULL)
json_decref(root); json_decref(root);
fprintf(stderr, "json: no /time content\n");
return -1;
}
response->secret_time = strdup(json_string_value(j_obj));
j_obj = json_object_get(node, "ekey");
if (j_obj == NULL) {
json_decref(root);
fprintf(stderr, "json: no /ekey content\n");
return -1;
}
response->ekey = strdup(json_string_value(j_obj));
json_decref(root);
return 0; return 0;
} }

16
mfapi/mfconn.c
View File

@@ -37,6 +37,7 @@ struct mfconn {
uint32_t secret_key; uint32_t secret_key;
char *secret_time; char *secret_time;
char *session_token; char *session_token;
char *ekey;
char *username; char *username;
char *password; char *password;
int app_id; int app_id;
@@ -76,12 +77,14 @@ mfconn *mfconn_create(const char *server, const char *username,
conn->max_num_retries = max_num_retries; conn->max_num_retries = max_num_retries;
conn->secret_time = NULL; conn->secret_time = NULL;
conn->session_token = NULL; conn->session_token = NULL;
conn->ekey = NULL;
retval = mfconn_api_user_get_session_token(conn, conn->server, retval = mfconn_api_user_get_session_token(conn, conn->server,
conn->username, conn->password, conn->username, conn->password,
conn->app_id, conn->app_key, conn->app_id, conn->app_key,
&(conn->secret_key), &(conn->secret_key),
&(conn->secret_time), &(conn->secret_time),
&(conn->session_token)); &(conn->session_token),
&(conn->ekey));
if (retval != 0) { if (retval != 0) {
fprintf(stderr, "error: mfconn_api_user_get_session_token\n"); fprintf(stderr, "error: mfconn_api_user_get_session_token\n");
@@ -99,12 +102,15 @@ int mfconn_refresh_token(mfconn * conn)
conn->secret_time = NULL; conn->secret_time = NULL;
free(conn->session_token); free(conn->session_token);
conn->session_token = NULL; conn->session_token = NULL;
free(conn->ekey);
conn->ekey = NULL;
retval = mfconn_api_user_get_session_token(conn, conn->server, retval = mfconn_api_user_get_session_token(conn, conn->server,
conn->username, conn->password, conn->username, conn->password,
conn->app_id, conn->app_key, conn->app_id, conn->app_key,
&(conn->secret_key), &(conn->secret_key),
&(conn->secret_time), &(conn->secret_time),
&(conn->session_token)); &(conn->session_token),
&(conn->ekey));
if (retval != 0) { if (retval != 0) {
fprintf(stderr, "user/get_session_token failed\n"); fprintf(stderr, "user/get_session_token failed\n");
return -1; return -1;
@@ -121,6 +127,7 @@ void mfconn_destroy(mfconn * conn)
free(conn->app_key); free(conn->app_key);
free(conn->secret_time); free(conn->secret_time);
free(conn->session_token); free(conn->session_token);
free(conn->ekey);
free(conn); free(conn);
} }
@@ -404,6 +411,11 @@ int mfconn_get_max_num_retries(mfconn * conn)
return conn->max_num_retries; return conn->max_num_retries;
} }
const char *mfconn_get_ekey(mfconn * conn)
{
return conn->ekey;
}
int mfconn_upload_poll_for_completion(mfconn * conn, const char *upload_key) int mfconn_upload_poll_for_completion(mfconn * conn, const char *upload_key)
{ {
int status; int status;