Apply suggestions from code review

Co-authored-by: Remi Gacogne <github@coredump.fr>

diff --git a/pdns/recursordist/rec-rust-lib/rust/build.rs b/pdns/recursordist/rec-rust-lib/rust/build.rs
index b2e9b952eb2ce210d85f3f78f150e4500f1ff2e4..c9a07d3ae04cad08a31eec3ec094fa329c554c09 100644 (file)
--- a/pdns/recursordist/rec-rust-lib/rust/build.rs
+++ b/pdns/recursordist/rec-rust-lib/rust/build.rs
@@ -7,7 +7,7 @@ fn main() {
         .flag("-I../../..")
         .compile("settings");
 
-    // lib.rs is generated and take care of by parent Makefile
+    // lib.rs is generated and taken care of by parent Makefile
     println!("cargo:rerun-if-changed=src/misc.rs");
     println!("cargo:rerun-if-changed=src/web.rs");
 }

diff --git a/pdns/recursordist/rec-rust-lib/rust/src/web.rs b/pdns/recursordist/rec-rust-lib/rust/src/web.rs
index 703698cfde61b8cb730f5841917eb4841be394c2..aa0a7849fa2d55caf1dedd56f364e53c43375862 100644 (file)
--- a/pdns/recursordist/rec-rust-lib/rust/src/web.rs
+++ b/pdns/recursordist/rec-rust-lib/rust/src/web.rs
@@ -198,7 +198,7 @@ fn api_wrapper(
     if !auth_ok {
         for kv in &request.vars {
             cxx::let_cxx_string!(s = &kv.value);
-            if kv.key == "x-api-key" && ctx.api_ch.as_ref().unwrap().matches(&s) {
+            if kv.key == "api-key" && ctx.api_ch.as_ref().unwrap().matches(&s) {
                 auth_ok = true;
                 break;
             }

diff --git a/pdns/recursordist/ws-recursor.cc b/pdns/recursordist/ws-recursor.cc
index d09286caa3047177aafb6e77e81cd249f0b0222f..17a9eb5a799d6fc42a076015d683f4ab83ceb471 100644 (file)
--- a/pdns/recursordist/ws-recursor.cc
+++ b/pdns/recursordist/ws-recursor.cc
@@ -1066,7 +1066,7 @@ static void rustWrapper(const std::function<void(HttpRequest*, HttpResponse*)>&
     request.parameters[std::string(key)] = std::string(value);
   }
   // These two log objects are not used by the Rust code, as they take the logging object from the
-  // context, initalized from an argument to pdns::rust::web::rec::serveweb()
+  // context, initialized from an argument to pdns::rust::web::rec::serveweb()
   request.d_slog = g_slog;
   response.d_slog = g_slog;
   try {

diff --git a/regression-tests.api/runtests.py b/regression-tests.api/runtests.py
index 99932570d3eb726d792a431c292bcfd646dc5abb..b82c6237529c58025d76577f7dc2d87f511adec2 100755 (executable)
--- a/regression-tests.api/runtests.py
+++ b/regression-tests.api/runtests.py
@@ -284,7 +284,7 @@ for try_number in range(0, 10):
         if daemon == 'authoritative':
             res = requests.get('http://127.0.0.1:%s/' % WEBPORT)
         else:
-            res = requests.get('https://127.0.0.1:%s/' % WEBPORT, verify=False)
+            res = requests.get('https://127.0.0.1:%s/' % WEBPORT, verify='ca.pem')
         available = True
         break
     except HTTPError as http_err:

diff --git a/regression-tests.api/test_helper.py b/regression-tests.api/test_helper.py
index fe8272560fcb8b43f816d3217c4cddb394b1f62f..62651b8a2f5a9de4bf9e4b4509bdf96c91d3b845 100644 (file)
--- a/regression-tests.api/test_helper.py
+++ b/regression-tests.api/test_helper.py
@@ -40,7 +40,7 @@ class ApiTestCase(unittest.TestCase):
         self.session.headers = {'X-API-Key': os.environ.get('APIKEY', 'changeme-key'), 'Origin': 'http://%s:%s' % (self.server_address, self.server_port)}
         if is_recursor():
             self.server_url = 'https://%s:%s/' % (self.server_address, self.server_port)
-            self.session.verify = False
+            self.session.verify = 'ca.pem'
 
     def url(self, relative_url):
         return urljoin(self.server_url, relative_url)

diff --git a/regression-tests.recursor-dnssec/test_Prometheus.py b/regression-tests.recursor-dnssec/test_Prometheus.py
index 065c803e6d2e86be8ffc0ff8d2e8c13b2d1c7c6c..45730987551dcd72b4d17746c83a5cb5e5ae46a0 100644 (file)
--- a/regression-tests.recursor-dnssec/test_Prometheus.py
+++ b/regression-tests.recursor-dnssec/test_Prometheus.py
@@ -109,7 +109,7 @@ webservice:
     def testPrometheus(self):
         self.waitForTCPSocket("127.0.0.1", self._wsPort)
         url = 'https://user:' + self._wsPassword + '@127.0.0.1:' + str(self._wsPort) + '/metrics'
-        r = requests.get(url, timeout=self._wsTimeout, verify=False)
+        r = requests.get(url, timeout=self._wsTimeout, verify='ca.pem')
         self.assertTrue(r)
         self.assertEqual(r.status_code, 200)
         self.checkPrometheusContentBasic(r.text)