Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix appsec pipeline #2982

Merged
merged 4 commits into from
Dec 4, 2024
Merged

Fix appsec pipeline #2982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6317710
Update appsec ubuntu docker images to 24:04
estringana Dec 3, 2024
c33182c
Point to a newer version of php on coverage
estringana Dec 3, 2024
f583b67
Fix helper tests
estringana Dec 4, 2024
42062a8
Fix lint issues
estringana Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .circleci/continue_config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1386,7 +1386,7 @@ jobs:
keys:
- hunter-cache-ubuntu-<< parameters.resource_class >>-
- setup_docker:
docker_image: ubuntu:23.10
docker_image: ubuntu:24.04
- run:
name: Install dependencies
command: |
Expand Down Expand Up @@ -1421,13 +1421,13 @@ jobs:
keys:
- hunter-cache-ubuntu-<< parameters.resource_class >>-
- setup_docker:
docker_image: ubuntu:23.10
docker_image: ubuntu:24.04
- run:
name: Install dependencies
command: |
export DEBIAN_FRONTEND=noninteractive
apt update
apt install -y wget sudo git g++ gcc gcovr cmake make curl libcurl4-gnutls-dev clang clang-tidy clang-format git php-dev php8.2-xml php-cgi
apt install -y wget sudo git g++ gcc gcovr cmake make curl libcurl4-gnutls-dev clang clang-tidy clang-format git php-dev php8.3-xml php-cgi
- run:
name: Install rust
command: |
Expand Down Expand Up @@ -1494,7 +1494,7 @@ jobs:
keys:
- hunter-cache-ubuntu-<< parameters.resource_class >>-
- setup_docker:
docker_image: ubuntu:23.10
docker_image: ubuntu:24.04
- run:
name: Install dependencies
command: |
Expand Down Expand Up @@ -1532,7 +1532,7 @@ jobs:
keys:
- hunter-cache-ubuntu-<< parameters.resource_class >>-
- setup_docker:
docker_image: ubuntu:23.10
docker_image: ubuntu:24.04
- run:
name: Install dependencies
command: |
Expand Down Expand Up @@ -1572,7 +1572,7 @@ jobs:
keys:
- hunter-cache-ubuntu-<< parameters.resource_class >>-
- setup_docker:
docker_image: ubuntu:23.10
docker_image: ubuntu:24.04
- run:
name: Install dependencies
command: |
Expand Down
2 changes: 1 addition & 1 deletion appsec/src/extension/configuration.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ bool dd_config_minit(int module_number)
{
// We have to disable remote config by default on lambda due to issues with
// the sidecar there. We'll eventually fix it though.
if (getenv("AWS_LAMBDA_FUNCTION_NAME")) {
if (getenv("AWS_LAMBDA_FUNCTION_NAME")) { // NOLINT
config_entries[DDAPPSEC_CONFIG_DD_REMOTE_CONFIG_ENABLED]
.default_encoded_value = (zai_str)ZAI_STR_FROM_CSTR("false");
}
Expand Down
2 changes: 1 addition & 1 deletion appsec/src/helper/subscriber/waf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ void instance::listener::call(dds::parameter_view &data, event &event)
derivatives_.emplace(
derivative.key(), std::move(parameter_to_json(derivative)));
} else {
derivatives_.emplace(derivative.key(), std::move(derivative));
derivatives_.emplace(derivative.key(), derivative);
}
}

Expand Down
16 changes: 9 additions & 7 deletions appsec/tests/helper/client_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,8 +559,9 @@ TEST(ClientTest, RequestInitLimiter)
{
network::request_init::request msg;
msg.data = parameter::map();
msg.data.add("server.request.headers.no_cookies",
parameter::string("acunetix-product"sv));
auto headers = parameter::map();
headers.add("user-agent", parameter::string("acunetix-product"sv));
msg.data.add("server.request.headers.no_cookies", std::move(headers));

network::request req(std::move(msg));

Expand Down Expand Up @@ -763,9 +764,9 @@ TEST(ClientTest, RequestInitBrokerThrows)
{
network::request_init::request msg;
msg.data = parameter::map();
msg.data.add("server.request.headers.no_cookies",
parameter::string("acunetix-product"sv));

auto headers = parameter::map();
headers.add("user-agent", parameter::string("acunetix-product"sv));
msg.data.add("server.request.headers.no_cookies", std::move(headers));
network::request req(std::move(msg));

std::shared_ptr<network::base_response> res;
Expand Down Expand Up @@ -2602,8 +2603,9 @@ TEST(ClientTest, SchemasAreNotAddedOnRequestShutdownWhenDisabled)
{ // Request Shutdown
network::request_shutdown::request msg;
msg.data = parameter::map();
msg.data.add("server.request.headers.no_cookies",
parameter::string("acunetix-product"sv));
auto headers = parameter::map();
headers.add("user-agent", parameter::string("acunetix-product"sv));
msg.data.add("server.request.headers.no_cookies", std::move(headers));

network::request req(std::move(msg));

Expand Down
Loading