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

Bugfix/return chain error add #73

Merged
merged 3 commits into from
May 15, 2024
Merged

Bugfix/return chain error add #73

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e0faf8
Added extra logging for leaf retrieval
AssemblyJohn May 15, 2024
9cac535
Updated to optional value instead of empty string
AssemblyJohn May 15, 2024
a255c14
Updated for optional paths instead of empty path
AssemblyJohn May 15, 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
40 changes: 26 additions & 14 deletions lib/evse_security/evse_security.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1125,6 +1125,7 @@ GetCertificateInfoResult EvseSecurity::get_leaf_certificate_info_internal(LeafCe
found_private_key_path = priv_key_path;

// We found, break
EVLOG_info << "Found valid leaf: [" << chain.at(0).get_file().value() << "]";
return false;
} catch (const NoPrivateKeyException& e) {
}
Expand Down Expand Up @@ -1158,8 +1159,8 @@ GetCertificateInfoResult EvseSecurity::get_leaf_certificate_info_internal(LeafCe
auto& certificate = latest_valid.value();

// Paths to search
fs::path certificate_file;
fs::path chain_file;
std::optional<fs::path> certificate_file;
std::optional<fs::path> chain_file;

X509CertificateBundle leaf_directory(cert_dir, EncodingFormat::PEM);

Expand Down Expand Up @@ -1191,29 +1192,31 @@ GetCertificateInfoResult EvseSecurity::get_leaf_certificate_info_internal(LeafCe

std::vector<CertificateOCSP> certificate_ocsp{};

// None were found
if (leaf_single == nullptr && leaf_fullchain == nullptr) {
EVLOG_error << "Could not find any leaf certificate for:"
<< conversions::leaf_certificate_type_to_string(certificate_type);

result.status = GetCertificateInfoStatus::NotFound;
return result;
}

if (leaf_fullchain != nullptr) {
chain_file = leaf_fullchain->at(0).get_file().value();
chain_file = leaf_fullchain->at(0).get_file();
EVLOG_debug << "Leaf fullchain: [" << chain_file.value_or("INVALID") << "]";
} else {
EVLOG_warning << conversions::leaf_certificate_type_to_string(certificate_type)
<< " leaf requires full bundle, but full bundle not found at path: " << cert_dir;
}

if (leaf_single != nullptr) {
certificate_file = leaf_single->at(0).get_file().value();
certificate_file = leaf_single->at(0).get_file();
EVLOG_debug << "Leaf single: [" << certificate_file.value_or("INVALID") << "]";
} else {
EVLOG_warning << conversions::leaf_certificate_type_to_string(certificate_type)
<< " single leaf not found at path: " << cert_dir;
}

if (leaf_single == nullptr && leaf_fullchain == nullptr) {
// None were found
EVLOG_error << "Could not find any leaf certificate for:"
<< conversions::leaf_certificate_type_to_string(certificate_type);

result.status = GetCertificateInfoStatus::NotFound;
return result;
}

// Include OCSP data if possible
if (include_ocsp && (leaf_fullchain != nullptr || leaf_single != nullptr)) {
X509CertificateBundle root_bundle(root_dir, EncodingFormat::PEM); // Required for hierarchy
Expand Down Expand Up @@ -1244,7 +1247,16 @@ GetCertificateInfoResult EvseSecurity::get_leaf_certificate_info_internal(LeafCe
}
}

result.info = {key_file, chain_file, certificate_file, chain_len, this->private_key_password, certificate_ocsp};
CertificateInfo info;

info.key = key_file;
info.certificate = chain_file;
info.certificate_single = certificate_file;
info.certificate_count = chain_len;
info.password = this->private_key_password;
info.ocsp = certificate_ocsp;

result.info = info;
result.status = GetCertificateInfoStatus::Accepted;

return result;
Expand Down
Loading