technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Python: decoding unicode strings as Latin1.

Browse Source 
According to PEP 3333, header names and values should be decoded as Latin1.
This commit is contained in:
Max Romanov
2018-08-06 19:16:45 +03:00
parent 1bb22d1e92
commit b021188e95
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/nxt_python_wsgi.c
View File

@@ -41,12 +41,11 @@
#if PY_MAJOR_VERSION == 3 #if PY_MAJOR_VERSION == 3
#define NXT_PYTHON_BYTES_TYPE "bytestring" #define NXT_PYTHON_BYTES_TYPE "bytestring"
#define PyString_FromString PyUnicode_FromString #define PyString_FromStringAndSize(str, size) \
#define PyString_FromStringAndSize PyUnicode_FromStringAndSize PyUnicode_DecodeLatin1((str), (size), "strict")
#else #else
#define NXT_PYTHON_BYTES_TYPE "string" #define NXT_PYTHON_BYTES_TYPE "string"
#define PyBytes_FromString PyString_FromString
#define PyBytes_FromStringAndSize PyString_FromStringAndSize #define PyBytes_FromStringAndSize PyString_FromStringAndSize
#define PyBytes_Check PyString_Check #define PyBytes_Check PyString_Check
#define PyBytes_GET_SIZE PyString_GET_SIZE #define PyBytes_GET_SIZE PyString_GET_SIZE
@@ -627,7 +626,7 @@ nxt_python_create_environ(nxt_task_t *task)
} }
obj = PyString_FromString("http"); obj = PyString_FromStringAndSize("http", nxt_length("http"));
if (nxt_slow_path(obj == NULL)) { if (nxt_slow_path(obj == NULL)) {
nxt_alert(task, nxt_alert(task,
@@ -805,6 +804,7 @@ nxt_python_add_sptr(nxt_python_run_ctx_t *ctx, const char *name,
nxt_unit_req_error(ctx->req, nxt_unit_req_error(ctx->req,
"Python failed to create value string \"%.*s\"", "Python failed to create value string \"%.*s\"",
(int) size, src); (int) size, src);
PyErr_PrintEx(1);
return NXT_UNIT_ERROR; return NXT_UNIT_ERROR;
} }
@@ -839,6 +839,7 @@ nxt_python_add_str(nxt_python_run_ctx_t *ctx, const char *name,
nxt_unit_req_error(ctx->req, nxt_unit_req_error(ctx->req,
"Python failed to create value string \"%.*s\"", "Python failed to create value string \"%.*s\"",
(int) size, str); (int) size, str);
PyErr_PrintEx(1);
return NXT_UNIT_ERROR; return NXT_UNIT_ERROR;
} }
@@ -1160,7 +1161,7 @@ nxt_py_input_read(nxt_py_input_t *self, PyObject *args)
static PyObject * static PyObject *
nxt_py_input_readline(nxt_py_input_t *self, PyObject *args) nxt_py_input_readline(nxt_py_input_t *self, PyObject *args)
{ {
return PyBytes_FromString(""); return PyBytes_FromStringAndSize("", 0);
} }

1
test/test_http_header.py
View File

@@ -83,7 +83,6 @@ class TestUnitHTTPHeader(unit.TestUnitApplicationPython):
self.assertEqual(resp['headers']['Custom-Header'], self.assertEqual(resp['headers']['Custom-Header'],
'(),/:;<=>?@[\]{}\t !#$%&\'*+-.^_`|~', 'value chars custom header') '(),/:;<=>?@[\]{}\t !#$%&\'*+-.^_`|~', 'value chars custom header')
@unittest.expectedFailure
def test_http_header_value_chars_edge(self): def test_http_header_value_chars_edge(self):
self.load('custom_header') self.load('custom_header')