github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-11-15 17:12:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: SonarCloud issues

Browse Source
This commit is contained in:
A13501350
2025-10-21 00:02:29 +08:00
parent a273cd1912
commit 65546f0a19
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/test-ci-windows.yml vendored
View File

@@ -84,6 +84,8 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
prefix: vcpkg-iis-module-${{ matrix.arch }}/ prefix: vcpkg-iis-module-${{ matrix.arch }}/
- uses: ammaraskar/msvc-problem-matcher@master
- name: Configure CMake for IIS Module - name: Configure CMake for IIS Module
env: env:
VCPKG_FEATURE_FLAGS: "binarycaching" VCPKG_FEATURE_FLAGS: "binarycaching"
@@ -248,6 +250,7 @@ jobs:
Restart-Service W3SVC -Force Restart-Service W3SVC -Force
$modules = & "$env:SystemRoot\system32\inetsrv\appcmd.exe" list modules $modules = & "$env:SystemRoot\system32\inetsrv\appcmd.exe" list modules
Write-Host "IIS modules: $modules"
if ($LASTEXITCODE -ne 0) { if ($LASTEXITCODE -ne 0) {
Write-Error "appcmd failed with exit code $LASTEXITCODE" Write-Error "appcmd failed with exit code $LASTEXITCODE"
exit 1 exit 1

23
iis/mymodule.cpp
View File

@@ -18,7 +18,6 @@
#define inline inline #define inline inline
#include "winsock2.h" #include "winsock2.h"
#include <Ws2tcpip.h>
// IIS7 Server API header file // IIS7 Server API header file
#include <Windows.h> #include <Windows.h>
@@ -91,19 +90,19 @@ class REQUEST_STORED_CONTEXT : public IHttpStoredContext
char *GetIpAddr(apr_pool_t *pool, PSOCKADDR pAddr) char *GetIpAddr(apr_pool_t *pool, PSOCKADDR pAddr)
{ {
if (pAddr == NULL) { if (pAddr == nullptr) {
return ""; return apr_pstrdup(pool, "");
} }
DWORD addrSize = pAddr->sa_family == AF_INET ? sizeof(SOCKADDR_IN) : sizeof(SOCKADDR_IN6); DWORD addrSize = pAddr->sa_family == AF_INET ? sizeof(SOCKADDR_IN) : sizeof(SOCKADDR_IN6);
char* buf = (char*)apr_palloc(pool, NI_MAXHOST); auto buf = (char*)apr_palloc(pool, NI_MAXHOST);
if (buf == NULL) { if (buf == nullptr) {
return ""; return apr_pstrdup(pool, "");
} }
buf[0] = '\0'; buf[0] = '\0';
if (GetNameInfo(pAddr, addrSize, buf, NI_MAXHOST, NULL, 0, NI_NUMERICHOST) != 0) { if (GetNameInfo(pAddr, addrSize, buf, NI_MAXHOST, nullptr, 0, NI_NUMERICHOST) != 0) {
return ""; return apr_pstrdup(pool, "");
} }
return buf; return buf;
@@ -119,18 +118,18 @@ apr_sockaddr_t *CopySockAddr(apr_pool_t *pool, PSOCKADDR pAddr)
addr->family = AF_UNSPEC; addr->family = AF_UNSPEC;
addr->addr_str_len = 0; addr->addr_str_len = 0;
addr->ipaddr_len = 0; addr->ipaddr_len = 0;
addr->ipaddr_ptr = NULL; addr->ipaddr_ptr = nullptr;
addr->salen = 0; addr->salen = 0;
addr->port = 0; addr->port = 0;
if (pAddr == NULL) { if (pAddr == nullptr) {
return addr; return addr;
} }
addr->family = pAddr->sa_family; addr->family = pAddr->sa_family;
if (pAddr->sa_family == AF_INET) { if (pAddr->sa_family == AF_INET) {
SOCKADDR_IN *sin = (SOCKADDR_IN *)pAddr; auto sin = (SOCKADDR_IN *)pAddr;
addr->addr_str_len = INET_ADDRSTRLEN; addr->addr_str_len = INET_ADDRSTRLEN;
addr->ipaddr_len = sizeof(struct in_addr); addr->ipaddr_len = sizeof(struct in_addr);
addr->ipaddr_ptr = &addr->sa.sin.sin_addr; addr->ipaddr_ptr = &addr->sa.sin.sin_addr;
@@ -141,7 +140,7 @@ apr_sockaddr_t *CopySockAddr(apr_pool_t *pool, PSOCKADDR pAddr)
addr->salen = sizeof(addr->sa); addr->salen = sizeof(addr->sa);
addr->port = ntohs(sin->sin_port); addr->port = ntohs(sin->sin_port);
} else if (pAddr->sa_family == AF_INET6) { } else if (pAddr->sa_family == AF_INET6) {
SOCKADDR_IN6 *sin6 = (SOCKADDR_IN6 *)pAddr; auto sin6 = (SOCKADDR_IN6 *)pAddr;
addr->addr_str_len = INET6_ADDRSTRLEN; addr->addr_str_len = INET6_ADDRSTRLEN;
addr->ipaddr_len = sizeof(struct in6_addr); addr->ipaddr_len = sizeof(struct in6_addr);
addr->ipaddr_ptr = &addr->sa.sin6.sin6_addr; addr->ipaddr_ptr = &addr->sa.sin6.sin6_addr;