github_mirrors/openappsec
3
0
Fork 1
mirror of https://github.com/openappsec/openappsec.git synced 2025-06-28 16:41:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Checking for empty strings

Browse Source
This commit is contained in:
Ned Wright 2023-12-18 15:44:16 +00:00
parent a3014ab381
commit 2649b84207
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/security_apps/orchestration/details_resolver/details_resolver.cc
View File

@ -127,7 +127,7 @@ DetailsResolver::Impl::isReverseProxy()
{
#if defined(gaia) || defined(smb)
auto is_reverse_proxy = DetailsResolvingHanlder::getCommandOutput("cpprod_util CPPROD_IsConfigured CPwaap");
if (is_reverse_proxy.ok()) {
if (is_reverse_proxy.ok() && !is_reverse_proxy.unpack().empty()) {
return is_reverse_proxy.unpack().front() == '1';
}
#endif
@ -142,7 +142,7 @@ DetailsResolver::Impl::isKernelVersion3OrHigher()
"| cut -d '.' -f 1 | awk -F: '{ if ( $1 >= 3 ) {print 1} else {print 0}}'";
auto is_gogo = DetailsResolvingHanlder::getCommandOutput(cmd);
if (is_gogo.ok()) {
if (is_gogo.ok() && !is_gogo.unpack().empty()) {
return is_gogo.unpack().front() == '1';
}
return false;
@ -155,7 +155,7 @@ DetailsResolver::Impl::isGwNotVsx()
static const string is_vsx_cmd = "cpprod_util FWisVSX";
auto is_gw = DetailsResolvingHanlder::getCommandOutput(is_gw_cmd);
auto is_vsx = DetailsResolvingHanlder::getCommandOutput(is_vsx_cmd);
if (is_gw.ok() && is_vsx.ok()) {
if (is_gw.ok() && is_vsx.ok() && !is_gw.unpack().empty() && !is_vsx.unpack().empty()) {
return is_gw.unpack().front() == '1' && is_vsx.unpack().front() == '0';
}
return false;

2
components/security_apps/orchestration/details_resolver/details_resolving_handler.cc
View File

@ -108,7 +108,7 @@ DetailsResolvingHanlder::Impl::getCommandOutput(const string &cmd)
if (!result.ok()) return result;
auto unpacked_result = result.unpack();
if (unpacked_result.back() == '\n') unpacked_result.pop_back();
if (!unpacked_result.empty() && unpacked_result.back() == '\n') unpacked_result.pop_back();
return unpacked_result;
}

1
components/security_apps/orchestration/orchestration_comp.cc
View File

@ -1893,6 +1893,7 @@ private:
auto result = i_shell_cmd->getExecOutput(openssl_dir_cmd);
if (result.ok()) {
string val_openssl_dir = result.unpack();
if (val_openssl_dir.empty()) return;
if (val_openssl_dir.back() == '\n') val_openssl_dir.pop_back();
dbgTrace(D_ORCHESTRATOR)
<< "Adding OpenSSL default directory to agent details. Directory: "