#120 fixed & add tests. Update (C) dates.

dedok · dedok · commit 1a6208051f5a · 2019-04-15T22:31:59.000+03:00
diff --git a/src/debug.h b/src/debug.h
@@ -27,7 +27,7 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * Copyright (C) 2015-2018 Tarantool AUTHORS:
+ * Copyright (C) 2015-2019 Tarantool AUTHORS:
  * please see AUTHORS file.
  */
 
diff --git a/src/json_encoders.c b/src/json_encoders.c
@@ -27,7 +27,7 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * Copyright (C) 2016 - 2018 Tarantool AUTHORS:
+ * Copyright (C) 2016-2019 Tarantool AUTHORS:
  * please see AUTHORS file.
  */
 
diff --git a/src/json_encoders.h b/src/json_encoders.h
@@ -27,7 +27,7 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * Copyright (C) 2016 - 2018 Tarantool AUTHORS:
+ * Copyright (C) 2016-2019 Tarantool AUTHORS:
  * please see AUTHORS file.
  */
 
diff --git a/src/ngx_http_tnt_module.c b/src/ngx_http_tnt_module.c
@@ -27,11 +27,10 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * Copyright (C) 2015-2018 Tarantool AUTHORS:
+ * Copyright (C) 2015-2019 Tarantool AUTHORS:
  * please see AUTHORS file.
  */
 
-
 #include <ngx_core.h>
 #include <ngx_http.h>
 #include <ngx_config.h>
@@ -1616,7 +1615,7 @@ ngx_http_tnt_urldecode(ngx_http_request_t *r, ngx_str_t *src)
 
         c = src->data[s++];
 
-        if (c == '%' && (ngx_uint_t) (s + 2) < src->len) {
+        if (c == '%' && (ngx_uint_t) (s + 2) <= src->len) {
 
             u_char c2 = src->data[s++];
             u_char c3 = src->data[s++];
diff --git a/src/ngx_http_tnt_version.h b/src/ngx_http_tnt_version.h
@@ -27,13 +27,13 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * Copyright (C) 2015-2018 Tarantool AUTHORS:
+ * Copyright (C) 2015-2019 Tarantool AUTHORS:
  * please see AUTHORS file.
  */
 
 #ifndef NGX_HTTP_TNT_VERSION_H
 #define NGX_HTTP_TNT_VERSION_H 1
 
-#define NGX_HTTP_TNT_MODULE_VERSION_STRING "v2.7"
+#define NGX_HTTP_TNT_MODULE_VERSION_STRING "v2.7.1"
 
 #endif
diff --git a/src/ngx_http_tnt_version.h.in b/src/ngx_http_tnt_version.h.in
@@ -27,7 +27,7 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * Copyright (C) 2015-2018 Tarantool AUTHORS:
+ * Copyright (C) 2015-2019 Tarantool AUTHORS:
  * please see AUTHORS file.
  */
 
diff --git a/src/tp_ext.h b/src/tp_ext.h
@@ -27,7 +27,7 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * Copyright (C) 2015-2018 Tarantool AUTHORS:
+ * Copyright (C) 2015-2019 Tarantool AUTHORS:
  * please see AUTHORS file.
  */
 
diff --git a/src/tp_transcode.c b/src/tp_transcode.c
@@ -27,7 +27,7 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * Copyright (C) 2015-2018 Tarantool AUTHORS:
+ * Copyright (C) 2015-2019 Tarantool AUTHORS:
  * please see AUTHORS file.
  */
 
diff --git a/src/tp_transcode.h b/src/tp_transcode.h
@@ -27,7 +27,7 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * Copyright (C) 2015-2018 Tarantool AUTHORS:
+ * Copyright (C) 2015-2019 Tarantool AUTHORS:
  * please see AUTHORS file.
  */
 
diff --git a/t/ngx_confs/tnt_server_test.conf b/t/ngx_confs/tnt_server_test.conf
@@ -1,7 +1,7 @@
+
 http {
 
    autoindex  off;
-   access_log off;
 
    include       mime.types;
    default_type  application/octet-stream;
@@ -455,5 +455,11 @@ http {
       }
       tnt_pass tnt;
     }
+    location /issue_120 {
+      tnt_pass_http_request on parse_args unescape;
+      tnt_http_rest_methods all;
+      tnt_http_methods all;
+      tnt_pass tnt;
+    }
    }
 }
diff --git a/t/run_all.sh b/t/run_all.sh
@@ -30,6 +30,9 @@ for i in {1..10}; do
   $WORK_DIR/v26_features.py 1> /dev/null || (
       echo "[-] $WORK_DIR/v26_features.py failed" && exit 1
     )
+  $WORK_DIR/v27_features.py 1> /dev/null || (
+      echo "[-] $WORK_DIR/v26_features.py failed" && exit 1
+    )
 done
 echo '[+] OK'
 
@@ -64,7 +67,9 @@ for i in {1..3}; do
   #$WORK_DIR/v26_features.py 1> /dev/null || (
   #    echo "[-] $WORK_DIR/v26_features.py failed" && exit 1
   #  )
-
+  $WORK_DIR/v27_features.py 1> /dev/null || (
+      echo "[-] $WORK_DIR/v26_features.py failed" && exit 1
+    )
   clients_pids="$clients_pids $!"
 done
 for job in $clients_pids; do
diff --git a/t/test.lua b/t/test.lua
@@ -192,6 +192,10 @@ function issue_108(req)
   return req
 end
 
+function issue_120(request)
+  return request
+end
+
 -- CFG
 box.cfg {
     log_level = 5,
diff --git a/t/v27_features.py b/t/v27_features.py
@@ -0,0 +1,22 @@
+#!/usr/bin/python
+# -_- encoding: utf8 -_-
+
+import sys
+import time
+sys.path.append('./t')
+from http_utils import *
+
+please_unescape_it = BASE_URL + '/issue_120/'
+
+print ('[+] unescape regression test')
+args = {'arg1': 1, 'arg2': 'somestring'}
+result = get_success(please_unescape_it + '19UM|SMSO/a%7Cx%3Db', args, {})
+assert(result['uri'] == '/issue_120/19UM|SMSO/a|x=b?arg1=1&arg2=somestring'), \
+    "expected result"
+print ('[+] OK')
+
+print ('[+] issue 120')
+result = get_success(please_unescape_it + '%7B%7D', {}, {})
+assert(result['uri'] == '/issue_120/{}'), "expected result"
+print ('[+] OK')
+

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`* THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF`
`28`	`28`	`* SUCH DAMAGE.`
`29`	`29`	`*`
`30`		`- * Copyright (C) 2015-2018 Tarantool AUTHORS:`
	`30`	`+ * Copyright (C) 2015-2019 Tarantool AUTHORS:`
`31`	`31`	`* please see AUTHORS file.`
`32`	`32`	`*/`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
	`1`	`+`
`1`	`2`	`http {`
`2`	`3`
`3`	`4`	`autoindex off;`
`4`		`- access_log off;`
`5`	`5`
`6`	`6`	`include mime.types;`
`7`	`7`	`default_type application/octet-stream;`
`@@ -455,5 +455,11 @@ http {`
`455`	`455`	`}`
`456`	`456`	`tnt_pass tnt;`
`457`	`457`	`}`
	`458`	`+ location /issue_120 {`
	`459`	`+ tnt_pass_http_request on parse_args unescape;`
	`460`	`+ tnt_http_rest_methods all;`
	`461`	`+ tnt_http_methods all;`
	`462`	`+ tnt_pass tnt;`
	`463`	`+ }`
`458`	`464`	`}`
`459`	`465`	`}`