From 8b95942a2be4a65222b1758f2cb63b9dd86ea69d Mon Sep 17 00:00:00 2001 From: Victor Shyba Date: Thu, 13 Aug 2015 15:10:37 -0300 Subject: [bug] process put after last BadRequest check If we check for a BadRequest after calling meth_put we will end up on a scenario where the server replies with an error, but everything got processed. --- server/src/leap/soledad/server/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'server') diff --git a/server/src/leap/soledad/server/__init__.py b/server/src/leap/soledad/server/__init__.py index 7a03f6fb..1b795016 100644 --- a/server/src/leap/soledad/server/__init__.py +++ b/server/src/leap/soledad/server/__init__.py @@ -238,6 +238,7 @@ class HTTPInvocationByMethodWithBody( if content_type == 'application/x-soledad-sync-put': meth_put = self._lookup('%s_put' % method) meth_end = self._lookup('%s_end' % method) + entries = [] while True: line = body_getline() entry = line.strip() @@ -246,9 +247,11 @@ class HTTPInvocationByMethodWithBody( if not entry or not comma: # empty or no prec comma raise http_app.BadRequest entry, comma = utils.check_and_strip_comma(entry) - meth_put({}, entry) + entries.append(entry) if comma or body_getline(): # extra comma or data raise http_app.BadRequest + for entry in entries: + meth_put({}, entry) return meth_end() # handle outgoing documents elif content_type == 'application/x-soledad-sync-get': -- cgit v1.2.3 From 057f9c02894c05de4d1d4fc1f93ba86ec6bea96d Mon Sep 17 00:00:00 2001 From: Victor Shyba Date: Wed, 26 Aug 2015 17:48:57 -0300 Subject: [tests] fix variable name from refactor From: [refactor] removing getters and setters from couch.py _couch_url was a private variable with getter and setter doing the same as a public variable. It is accessed all over the code, so being private with getters and setters didnt make sense. This commit fixes the tests to also follow this style from now on. --- server/changes/bug_badrequest | 1 + 1 file changed, 1 insertion(+) create mode 100644 server/changes/bug_badrequest (limited to 'server') diff --git a/server/changes/bug_badrequest b/server/changes/bug_badrequest new file mode 100644 index 00000000..74901476 --- /dev/null +++ b/server/changes/bug_badrequest @@ -0,0 +1 @@ + o Fix a bug where BadRequest could be raised after everything was persisted -- cgit v1.2.3 From 4be6f05d91891122e83f74d21c83c5f8fcd3a618 Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Mon, 21 Sep 2015 19:06:51 -0300 Subject: [pkg] fold in changes --- server/changes/bug_badrequest | 1 - 1 file changed, 1 deletion(-) delete mode 100644 server/changes/bug_badrequest (limited to 'server') diff --git a/server/changes/bug_badrequest b/server/changes/bug_badrequest deleted file mode 100644 index 74901476..00000000 --- a/server/changes/bug_badrequest +++ /dev/null @@ -1 +0,0 @@ - o Fix a bug where BadRequest could be raised after everything was persisted -- cgit v1.2.3