From db3f25c5556c0867a997ab511ddba61a86d95d34 Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Sun, 12 Feb 2017 10:32:27 +0200 Subject: [PATCH 1/4] remotebackend: Fix incorrect parameter name (cherry picked from commit 1fa27e370ba1560f3c1a9967715182a5314abc1d) --- modules/remotebackend/remotebackend.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/remotebackend/remotebackend.cc b/modules/remotebackend/remotebackend.cc index 436b23293f03..5a83063e0a88 100644 --- a/modules/remotebackend/remotebackend.cc +++ b/modules/remotebackend/remotebackend.cc @@ -214,8 +214,8 @@ bool RemoteBackend::list(const DNSName& target, int domain_id, bool include_disa { "method", "list" }, { "parameters", Json::object{ { "zonename", target.toString() }, - { "domain-id", domain_id }, - { "include-disabled", include_disabled } + { "domain_id", domain_id }, + { "include_disabled", include_disabled } }} }; From 62f324ef33a06d7dde989bf38fd75c9bfceeefb5 Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Sun, 12 Feb 2017 10:32:55 +0200 Subject: [PATCH 2/4] remotebackend: Treat NULL as empty string in POST parameters asString() cannot convert NULL to "" (cherry picked from commit 4b8967c5f793810ad8ce399d155946c93e909bef) --- modules/remotebackend/httpconnector.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/remotebackend/httpconnector.cc b/modules/remotebackend/httpconnector.cc index bdafa3a80c84..a154da134d51 100644 --- a/modules/remotebackend/httpconnector.cc +++ b/modules/remotebackend/httpconnector.cc @@ -80,10 +80,11 @@ std::string HTTPConnector::buildMemberListArgs(std::string prefix, const Json& a for(const auto& pair: args.object_items()) { if (pair.second.is_bool()) { stream << (pair.second.bool_value()?"1":"0"); + } else if (pair.second.is_null()) { + stream << prefix << "[" << pair.first << "]="; } else { stream << prefix << "[" << pair.first << "]=" << this->asString(pair.second); } - stream << "&"; } From 8a677bb6e4cf730ffeb40fdc12c30052bcc11bf3 Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Sun, 12 Feb 2017 10:33:19 +0200 Subject: [PATCH 3/4] remotebackend: Update unit test to notice domain id on do_list (cherry picked from commit dd598a1adc34e7967d1f23c3c04d8264aed5e724) --- modules/remotebackend/unittest_http.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/remotebackend/unittest_http.rb b/modules/remotebackend/unittest_http.rb index 99dfe0f65540..21beaa3f26ab 100755 --- a/modules/remotebackend/unittest_http.rb +++ b/modules/remotebackend/unittest_http.rb @@ -50,6 +50,7 @@ def parse_url(url) } when "list" { + "id" => url.shift, "zonename" => url.shift } when "getbeforeandafternamesabsolute", "getbeforeandafternames" From 75c04e9fc9ccb0826bedf6dc3e388e8108426d09 Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Sun, 12 Feb 2017 11:19:52 +0200 Subject: [PATCH 4/4] remotebackend: Update regression test to notice domain id on do_list (cherry picked from commit 2449d3a010df4d8cf63d137bbb382e47a5be3308) --- modules/remotebackend/regression-tests/dnsbackend.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/remotebackend/regression-tests/dnsbackend.rb b/modules/remotebackend/regression-tests/dnsbackend.rb index ee5b35960b57..83a90cc021e7 100644 --- a/modules/remotebackend/regression-tests/dnsbackend.rb +++ b/modules/remotebackend/regression-tests/dnsbackend.rb @@ -47,6 +47,7 @@ def parse_url(url) } when "list" { + "id" => url.shift, "zonename" => url.shift } when "getbeforeandafternamesabsolute", "getbeforeandafternames"