devs/stabber
2
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Added verify to http api

Browse Source
This commit is contained in:
James Booth
2015-06-14 01:39:21 +01:00
parent 2058d8e295
commit 3733390d0f
4 changed files with 41 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/stabber.c
View File

@@ -78,7 +78,7 @@ stbbr_last_received(char *stanza)
int
stbbr_received(char *stanza)
{
return verify_any(stanza);
return verify_any(stanza, FALSE);
}
void

58
src/server/httpapi.c
View File

@@ -34,6 +34,7 @@
#include "server/log.h"
#include "server/server.h"
#include "server/prime.h"
#include "server/verify.h"
struct MHD_Daemon *httpdaemmon = NULL;
@@ -42,7 +43,8 @@ struct MHD_Daemon *httpdaemmon = NULL;
typedef enum {
STBBR_OP_UNKNOWN,
STBBR_OP_SEND,
STBBR_OP_FOR
STBBR_OP_FOR,
STBBR_OP_VERIFY
} stbbr_op_t;
typedef struct conn_info_t {
@@ -99,6 +101,8 @@ int connection_cb(void* cls, struct MHD_Connection* conn, const char* url, const
con_info->stbbr_op = STBBR_OP_SEND;
} else if (g_strcmp0(method, "POST") == 0 && g_strcmp0(url, "/for") == 0) {
con_info->stbbr_op = STBBR_OP_FOR;
} else if (g_strcmp0(method, "POST") == 0 && g_strcmp0(url, "/verify") == 0) {
con_info->stbbr_op = STBBR_OP_VERIFY;
} else {
con_info->stbbr_op = STBBR_OP_UNKNOWN;
return send_response(conn, NULL, MHD_HTTP_BAD_REQUEST);
@@ -121,32 +125,44 @@ int connection_cb(void* cls, struct MHD_Connection* conn, const char* url, const
const char *query = NULL;
switch (con_info->stbbr_op) {
case STBBR_OP_SEND:
{
server_send(con_info->body->str);
return send_response(conn, NULL, MHD_HTTP_OK);
}
case STBBR_OP_FOR:
{
id = MHD_lookup_connection_value(conn, MHD_GET_ARGUMENT_KIND, "id");
query = MHD_lookup_connection_value(conn, MHD_GET_ARGUMENT_KIND, "query");
if (id && query) {
return send_response(conn, NULL, MHD_HTTP_BAD_REQUEST);
}
case STBBR_OP_SEND:
server_send(con_info->body->str);
return send_response(conn, NULL, MHD_HTTP_OK);
if (id) {
prime_for_id(id, con_info->body->str);
return send_response(conn, NULL, MHD_HTTP_CREATED);
}
if (query) {
prime_for_query(query, con_info->body->str);
return send_response(conn, NULL, MHD_HTTP_CREATED);
}
case STBBR_OP_FOR:
id = MHD_lookup_connection_value(conn, MHD_GET_ARGUMENT_KIND, "id");
query = MHD_lookup_connection_value(conn, MHD_GET_ARGUMENT_KIND, "query");
if (id && query) {
return send_response(conn, NULL, MHD_HTTP_BAD_REQUEST);
}
if (id) {
prime_for_id(id, con_info->body->str);
return send_response(conn, NULL, MHD_HTTP_CREATED);
case STBBR_OP_VERIFY:
{
int res = verify_any(con_info->body->str, TRUE);
if (res) {
return send_response(conn, "true", MHD_HTTP_OK);
} else {
return send_response(conn, "false", MHD_HTTP_OK);
}
}
if (query) {
prime_for_query(query, con_info->body->str);
return send_response(conn, NULL, MHD_HTTP_CREATED);
default:
{
return send_response(conn, NULL, MHD_HTTP_BAD_REQUEST);
}
return send_response(conn, NULL, MHD_HTTP_BAD_REQUEST);
default:
return send_response(conn, NULL, MHD_HTTP_BAD_REQUEST);
}
}
}

4
src/server/verify.c
View File

@@ -44,12 +44,12 @@ verify_set_timeout(int seconds)
}
int
verify_any(char *stanza_text)
verify_any(char *stanza_text, gboolean ign_timeout)
{
XMPPStanza *stanza = stanza_parse(stanza_text);
int result = 0;
if (timeoutsecs <= 0) {
if (timeoutsecs <= 0 || ign_timeout) {
result = stanzas_verify_any(stanza);
} else {
double elapsed = 0.0;

2
src/server/verify.h
View File

@@ -25,6 +25,6 @@
void verify_set_timeout(int seconds);
int verify_last(char *stanza);
int verify_any(char *stanza);
int verify_any(char *stanza, gboolean ign_timeout);
#endif