Merge pull request #6880 from Icinga/bugfix/pki-requestcertificate-no…

…-cert pki::RequestCertificate: handle missing certificate/CSR
Icinga · Jan 9, 2019 · e1a941e · e1a941e
2 parents 2e1b6bd + 4a7960f
commit e1a941e
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/lib/remote/jsonrpcconnection-pki.cpp b/lib/remote/jsonrpcconnection-pki.cpp
@@ -52,6 +52,15 @@ Value RequestCertificateHandler(const MessageOrigin::Ptr& origin, const Dictiona
 	else
 		cert = StringToCertificate(certText);
 
+	if (!cert) {
+		Log(LogWarning, "JsonRpcConnection") << "No certificate or CSR received";
+
+		result->Set("status_code", 1);
+		result->Set("error", "No certificate or CSR received.");
+
+		return result;
+	}
+
 	ApiListener::Ptr listener = ApiListener::GetInstance();
 	std::shared_ptr<X509> cacert = GetX509Certificate(listener->GetDefaultCaPath());