From 3733390d0f950e78a8359bae73dd2e11e78942b5 Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sun, 14 Jun 2015 01:39:21 +0100
Subject: [PATCH] Added verify to http api

---
 src/client/stabber.c |  2 +-
 src/server/httpapi.c | 58 ++++++++++++++++++++++++++++----------------
 src/server/verify.c  |  4 +--
 src/server/verify.h  |  2 +-
 4 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/src/client/stabber.c b/src/client/stabber.c
index 42f5cc4..353d5ff 100644
--- a/src/client/stabber.c
+++ b/src/client/stabber.c
@@ -78,7 +78,7 @@ stbbr_last_received(char *stanza)
 int
 stbbr_received(char *stanza)
 {
-    return verify_any(stanza);
+    return verify_any(stanza, FALSE);
 }
 
 void
diff --git a/src/server/httpapi.c b/src/server/httpapi.c
index fbdf9bf..e6c59be 100644
--- a/src/server/httpapi.c
+++ b/src/server/httpapi.c
@@ -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);
         }
     }
 }
diff --git a/src/server/verify.c b/src/server/verify.c
index 2cd9d0d..808ba59 100644
--- a/src/server/verify.c
+++ b/src/server/verify.c
@@ -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;
diff --git a/src/server/verify.h b/src/server/verify.h
index 95f0e87..abee8a6 100644
--- a/src/server/verify.h
+++ b/src/server/verify.h
@@ -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