From f9de771cfa0f4e8bab54f8df7511a8d7ea271ebb Mon Sep 17 00:00:00 2001 From: stephb9959 Date: Mon, 27 Sep 2021 09:44:19 -0700 Subject: [PATCH] Fixing daemon reload. --- openpapi/ucentralsec/ucentralsec.yaml | 10 ++++++++++ src/RESTAPI_system_command.cpp | 18 ++++++++++-------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/openpapi/ucentralsec/ucentralsec.yaml b/openpapi/ucentralsec/ucentralsec.yaml index 19588e0..9861e02 100644 --- a/openpapi/ucentralsec/ucentralsec.yaml +++ b/openpapi/ucentralsec/ucentralsec.yaml @@ -399,6 +399,16 @@ components: type: integer hostname: type: string + certificates: + type: array + items: + type: object + properties: + filename: + type: string + expires: + type: integer + format: int64 ProfileAction: type: object diff --git a/src/RESTAPI_system_command.cpp b/src/RESTAPI_system_command.cpp index 83e1d2f..bf418f9 100644 --- a/src/RESTAPI_system_command.cpp +++ b/src/RESTAPI_system_command.cpp @@ -124,14 +124,16 @@ namespace OpenWifi { auto Hosts=i->HostSize(); for(uint64_t j=0;jHost(j).CertFile(); - auto InsertResult = CertNames.insert(CertFileName); - if( InsertResult.second ) { - Poco::JSON::Object Inner; - Inner.set("filename", CertFileName); - Poco::Crypto::X509Certificate C(CertFileName); - auto ExpiresOn = C.expiresOn(); - Inner.set("expiresOn",ExpiresOn.timestamp().epochTime()); - Certificates.add(Inner); + if(!CertFileName.empty()) { + auto InsertResult = CertNames.insert(CertFileName); + if(InsertResult.second) { + Poco::JSON::Object Inner; + Inner.set("filename", CertFileName); + Poco::Crypto::X509Certificate C(CertFileName); + auto ExpiresOn = C.expiresOn(); + Inner.set("expiresOn",ExpiresOn.timestamp().epochTime()); + Certificates.add(Inner); + } } } }