lint

Author: cataphract

Makefile

@@ -122,7 +122,7 @@ build-musl-aux build-musl-cov-aux:
 		-DCMAKE_TOOLCHAIN_FILE=/sysroot/$(ARCH)-none-linux-musl/Toolchain.cmake \
 		-DNGINX_PATCH_AWAY_LIBC=ON \
 		-DCMAKE_BUILD_TYPE=$(BUILD_TYPE) \
- 		-DNGINX_VERSION="$(NGINX_VERSION)" \
+		-DNGINX_VERSION="$(NGINX_VERSION)" \
 		-DNGINX_DATADOG_ASM_ENABLED="$(WAF)" . \
 		-DNGINX_DATADOG_RUM_ENABLED="$(RUM)" . \
 		-DNGINX_COVERAGE=$(COVERAGE) \

src/security/blocking.cpp

@@ -304,7 +304,8 @@ void BlockingService::initialize(std::optional<std::string_view> templ_html,
       new BlockingService(templ_html, templ_json));
 }
 
-ngx_int_t BlockingService::block(BlockSpecification spec, ngx_http_request_t &req) {
+ngx_int_t BlockingService::block(BlockSpecification spec,
+                                 ngx_http_request_t &req) {
   BlockResponse const resp = BlockResponse::resolve_content_type(spec, req);
   ngx_str_t *templ{};
   if (resp.ct == BlockResponse::ContentType::HTML) {
@@ -346,8 +347,8 @@ ngx_int_t BlockingService::block(BlockSpecification spec, ngx_http_request_t &re
   //     req.headers_out.content_length_n = 0;
   //   }
   if (req.header_only) {
-     req.headers_out.content_length_n = 0;
-     req.chunked = 0;
+    req.headers_out.content_length_n = 0;
+    req.chunked = 0;
   }
   req.keepalive = 0;
   req.lingering_close = 0;

src/security/blocking.h

@@ -1,10 +1,8 @@
 #pragma once
 
-#include <fstream>
 #include <memory>
 #include <optional>
-#include <sstream>
-#include <stdexcept>
+#include <string>
 #include <string_view>
 
 extern "C" {
@@ -37,7 +35,8 @@ class BlockingService {
 
   static BlockingService *get_instance() { return instance.get(); }
 
-  [[nodiscard]] ngx_int_t block(BlockSpecification spec, ngx_http_request_t &req);
+  [[nodiscard]] ngx_int_t block(BlockSpecification spec,
+                                ngx_http_request_t &req);
 
  private:
   BlockingService(std::optional<std::string_view> templ_html_path,

src/security/context.cpp

@@ -1087,7 +1087,7 @@ ngx_int_t Context::buffer_chain(FilterCtx &filter_ctx, ngx_pool_t &pool,
           size = buf->last - buf->pos;
           new_buf->temporary = 1;
           if (size > 0) {
-            new_buf->pos = static_cast<u_char*>(ngx_palloc(&pool, size));
+            new_buf->pos = static_cast<u_char *>(ngx_palloc(&pool, size));
             if (!new_buf->pos) {
               return NGX_ERROR;
             }

test/cases/sec_blocking/test_sec_blocking.py

@@ -141,13 +141,15 @@ def test_html_action(self):
 
     def test_html_action_http2(self):
         status, headers, body, _ = self.run_with_ua('block_html',
-                                                    'application/json', http_version=2)
+                                                    'application/json',
+                                                    http_version=2)
         self.assertEqual(status, 403)
         self.assertEqual(headers['content-type'], 'text/html;charset=utf-8')
 
     def test_html_action_http3(self):
         status, headers, body, _ = self.run_with_ua('block_html',
-                                                    'application/json', http_version=3)
+                                                    'application/json',
+                                                    http_version=3)
         self.assertEqual(status, 403)
         self.assertEqual(headers['content-type'], 'text/html;charset=utf-8')
 
@@ -167,12 +169,16 @@ def test_redirect_action(self):
         self.assertEqual(headers['location'], 'https://www.cloudflare.com')
 
     def test_redirect_action_http2(self):
-        status, headers, _, _ = self.run_with_ua('redirect', '*/*', http_version=2)
+        status, headers, _, _ = self.run_with_ua('redirect',
+                                                 '*/*',
+                                                 http_version=2)
         self.assertEqual(status, 301)
         self.assertEqual(headers['location'], 'https://www.cloudflare.com')
 
     def test_redirect_action_http3(self):
-        status, headers, _, _ = self.run_with_ua('redirect', '*/*', http_version=3)
+        status, headers, _, _ = self.run_with_ua('redirect',
+                                                 '*/*',
+                                                 http_version=3)
         self.assertEqual(status, 301)
         self.assertEqual(headers['location'], 'https://www.cloudflare.com')
 
@@ -197,14 +203,16 @@ def test_block_body_json_long(self):
     def test_block_body_json_long_http2(self):
         status, _, _, log_lines = self.run_with_body(
             'application/json',
-            '{"a": "block_default", "b": "' + ('a' * 1024 * 1024), http_version=2)
+            '{"a": "block_default", "b": "' + ('a' * 1024 * 1024),
+            http_version=2)
         self.assertEqual(status, 403)
         self.assert_has_report(log_lines)
 
     def test_block_body_json_long_http3(self):
         status, _, _, log_lines = self.run_with_body(
             'application/json',
-            '{"a": "block_default", "b": "' + ('a' * 1024 * 1024), http_version=3)
+            '{"a": "block_default", "b": "' + ('a' * 1024 * 1024),
+            http_version=3)
         self.assertEqual(status, 403)
         self.assert_has_report(log_lines)
 
@@ -232,7 +240,6 @@ def test_block_on_status_http2(self):
     def test_block_on_status_http3(self):
         self.block_on_status(3)
 
-
     def block_on_status_redirect(self, http_version):
         if http_version != 3:
             status, headers, body = self.orch.send_nginx_http_request(