#52 - is fixed. The module has escaping any string(including keys) recv. from the Tarantool. Update (C) and comments. Update tests.

Author: dedok

Makefile

@@ -86,24 +86,19 @@ configure-as-dynamic-debug:
 json2tp:
 	$(CC) $(CFLAGS) $(DEV_CFLAGS) $(INC_FLAGS) $(LDFLAGS)\
 				$(CUR_PATH)/misc/json2tp.c \
+				src/json_encoders.c \
 				src/tp_transcode.c \
 				-o misc/json2tp \
 				-lyajl_s
 
 tp_dump:
 	$(CC) $(CFLAGS) $(DEV_CFLAGS) $(INC_FLAGS) $(LDFLAGS)\
 				$(CUR_PATH)/misc/tp_dump.c \
+				src/json_encoders.c \
 				src/tp_transcode.c \
 				-o misc/tp_dump \
 				-lyajl_s
 
-tp_allowed:
-	$(CC) $(CFLAGS) $(DEV_CFLAGS) $(INC_FLAGS) $(LDFLAGS)\
-				$(CUR_PATH)/test/tp_allowed.c\
-				$(CUR_PATH)/src/tp_allowed_methods.c\
-				-o test/tp_allowed
-	$(CUR_PATH)/test/tp_allowed
-
 test-dev-man: utils build
 	$(CUR_PATH)/test/transcode.sh
 	$(CUR_PATH)/test/run_all.sh

config

@@ -12,15 +12,17 @@ __include_paths=" \
           "
 
 __sources=" \
-          $__module_src_dir/ngx_http_tnt_module.c   \
+          $__module_src_dir/json_encoders.c         \
           $__module_src_dir/tp_transcode.c          \
+          $__module_src_dir/ngx_http_tnt_module.c   \
           $__module_src_dir/ngx_http_tnt_handlers.c \
           "
 __headers=" \
           $__module_src_dir/debug.h                 \
-          $__module_src_dir/ngx_http_tnt_handlers.h \
           $__module_src_dir/tp_ext.h                \
+          $__module_src_dir/json_encoders.h         \
           $__module_src_dir/tp_transcode.h          \
+          $__module_src_dir/ngx_http_tnt_handlers.h \
           "
 
 __old_style_build=yes

src/debug.h

@@ -26,7 +26,7 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * Copyright (C) 2015 Tarantool AUTHORS:
+ * Copyright (C) 2015-2016 Tarantool AUTHORS:
  * please see AUTHORS file.
  */
 
@@ -80,7 +80,7 @@ get_str_safe(const u_char *str) {
 # define crit(...) log_crit(r->connection->log, __VA_ARGS__)
 # else
 /** TODO
- *  Warn. user here
+ *  Need I add some warn message?
  */
 static inline void
 crit(...) {}

src/json_encoders.c

@@ -0,0 +1,114 @@
+/*
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above
+ *    copyright notice, this list of conditions and the
+ *    following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above
+ *    copyright notice, this list of conditions and the following
+ *    disclaimer in the documentation and/or other materials
+ *    provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY AUTHORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * AUTHORS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * Copyright (C) 2016 Tarantool AUTHORS:
+ * please see AUTHORS file.
+ */
+
+#include "json_encoders.h"
+
+
+static inline void
+hex_buf_init(char *hex_buf)
+{
+    hex_buf[0] = '\\';
+    hex_buf[1] = 'u';
+    hex_buf[2] = '0';
+    hex_buf[3] = '0';
+    hex_buf[6] = 0;
+}
+
+
+static inline void
+char_to_hex(char *hex_buf, unsigned char c)
+{
+    static const char * hexchar = "0123456789ABCDEF";
+    hex_buf[0] = hexchar[c >> 4];
+    hex_buf[1] = hexchar[c & 0x0F];
+}
+
+
+const char * /*error message*/
+json_encode_string(
+    char **buf, size_t buf_len,
+    const char *str, size_t str_len,
+    bool escape_solidus)
+{
+    if (!buf || !*buf || !buf_len || !str || !str_len)
+        return "json_encode_string: invalid arguments";
+
+    char hex_buf[7];
+
+    hex_buf_init(hex_buf);
+
+    if (!append_ch(buf, &buf_len, '\"'))
+        goto oom;
+
+    for (;str_len != 0; --str_len, ++str) {
+
+        const char ch = *str;
+        const char *escaped = NULL;
+
+        switch (ch) {
+        case '\r': escaped = "\\r"; break;
+        case '\n': escaped = "\\n"; break;
+        case '\\': escaped = "\\\\"; break;
+        /* it is not required to escape a solidus in JSON:
+         * read sec. 2.5: http://www.ietf.org/rfc/rfc4627.txt
+         * specifically, this production from the grammar:
+         *   unescaped = %x20-21 / %x23-5B / %x5D-10FFFF
+         */
+        case '/': if (escape_solidus) escaped = "\\/"; break;
+        case '"': escaped = "\\\""; break;
+        case '\f': escaped = "\\f"; break;
+        case '\b': escaped = "\\b"; break;
+        case '\t': escaped = "\\t"; break;
+        default:
+            if ((unsigned char) ch < 32) {
+                char_to_hex(hex_buf + 4, ch);
+                escaped = hex_buf;
+            }
+            break;
+        } /* switch */
+
+        if (escaped) {
+            if (!append_str(buf, &buf_len, escaped, strlen(escaped)))
+                goto oom;
+        } else {
+            if (!append_ch(buf, &buf_len, ch))
+                goto oom;
+        }
+    } /* for */
+
+    if (!append_ch(buf, &buf_len, '\"'))
+        goto oom;
+
+    return NULL;
+oom:
+    return "json_encode_string: out of memory";
+}

src/json_encoders.h

@@ -0,0 +1,96 @@
+/*
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above
+ *    copyright notice, this list of conditions and the
+ *    following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above
+ *    copyright notice, this list of conditions and the following
+ *    disclaimer in the documentation and/or other materials
+ *    provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY AUTHORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * AUTHORS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * Copyright (C) 2016 Tarantool AUTHORS:
+ * please see AUTHORS file.
+ */
+
+#ifndef JSON_ENCODER_H_INCLUDED
+#define JSON_ENCODER_H_INCLUDED 1
+
+#include <string.h>
+#include <stdlib.h>
+#include <stdbool.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* {{{ API declaration */
+
+/** Utils [
+ */
+static inline bool
+append_str(char **buf, size_t *buf_len, const char *str, size_t str_size)
+{
+    if (*buf_len < str_size)
+        return false;
+    memcpy(*buf, str, str_size);
+    *buf_len -= str_size;
+    *buf += str_size;
+    return true;
+}
+
+static inline bool
+append_ch(char **buf, size_t *buf_len, char ch)
+{
+    return append_str(buf, buf_len, (const char *)&ch, 1);
+}
+/* ]
+ */
+
+/**
+ * Encode input string to JSON string.
+ * Plus, this function does "JSON escape" the input string
+ *
+ * Returns NULL - if ok, error message - if error occurred
+ */
+const char * /*error message*/
+json_encode_string(
+    char **buf, size_t buf_len,
+    const char *str, size_t str_len,
+    bool escape_solidus);
+
+/* escape_solidus = false
+ */
+#define json_encode_string_ns(a,b,c,d) \
+  json_encode_string((a), (b), (c), (d), false)
+
+/* escape_solidus = true
+ */
+#define json_encode_string_s(a,b,c,d) \
+  json_encode_string((a), (b), (c), (d), true)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+/* }}} */
+
+#endif /* JSON_ENCODER_H_INCLUDED */

src/ngx_http_tnt_handlers.c

@@ -34,6 +34,7 @@
 #include <ngx_http_tnt_handlers.h>
 #include <debug.h>
 
+
 extern ngx_module_t ngx_http_tnt_module;
 
 static inline size_t
@@ -131,9 +132,9 @@ ngx_http_tnt_read_greeting(ngx_http_request_t *r,
     {
         b->pos = b->pos + 128;
         /**
-         *  Sometimes Nginx reads only 'greeting'(i.e. 128 bytes) -- to avoid
-         *  side effects (inside 'init'/'filter') we must return to
-         *  'process_header'
+         *  Nginx can read only the "greeting"(128 bytes).
+         *  This check is to avoid the "read only the greeting" side effects.
+         *  Fix is - I just telling the nginx read more bytes.
          */
         if (b->pos == b->last) {
             return NGX_AGAIN;
@@ -250,7 +251,7 @@ ngx_http_tnt_set_method(ngx_http_tnt_ctx_t *ctx,
             ngx_memcpy(ctx->preset_method, start, ctx->preset_method_len);
         }
     }
-    /* Else -- expect method in the body */
+    /* Else -- expect the method in the body */
 
     return NGX_OK;