summaryrefslogtreecommitdiffstats
path: root/phosphor-ldap-config
diff options
context:
space:
mode:
Diffstat (limited to 'phosphor-ldap-config')
-rw-r--r--phosphor-ldap-config/ldap_configuration.cpp41
-rw-r--r--phosphor-ldap-config/ldap_configuration.hpp15
-rw-r--r--phosphor-ldap-config/main.cpp3
3 files changed, 44 insertions, 15 deletions
diff --git a/phosphor-ldap-config/ldap_configuration.cpp b/phosphor-ldap-config/ldap_configuration.cpp
index 31e4e75..be6c1cc 100644
--- a/phosphor-ldap-config/ldap_configuration.cpp
+++ b/phosphor-ldap-config/ldap_configuration.cpp
@@ -24,13 +24,13 @@ using Val = std::string;
using ConfigInfo = std::map<Key, Val>;
Config::Config(sdbusplus::bus::bus& bus, const char* path, const char* filePath,
- bool secureLDAP, std::string lDAPServerURI,
- std::string lDAPBindDN, std::string lDAPBaseDN,
- std::string&& lDAPBindDNPassword,
+ const char* caCertFile, bool secureLDAP,
+ std::string lDAPServerURI, std::string lDAPBindDN,
+ std::string lDAPBaseDN, std::string&& lDAPBindDNPassword,
ldap_base::Config::SearchScope lDAPSearchScope,
ldap_base::Config::Type lDAPType, ConfigMgr& parent) :
ConfigIface(bus, path, true),
- secureLDAP(secureLDAP), configFilePath(filePath),
+ secureLDAP(secureLDAP), configFilePath(filePath), tlsCacertFile(caCertFile),
lDAPBindDNPassword(std::move(lDAPBindDNPassword)), bus(bus), parent(parent)
{
ConfigIface::lDAPServerURI(lDAPServerURI);
@@ -106,8 +106,8 @@ void Config::writeConfig()
if (secureLDAP == true)
{
confData << "ssl on\n";
- confData << "tls_reqcert allow\n";
- confData << "tls_cert /etc/nslcd/certs/cert.pem\n";
+ confData << "tls_reqcert hard\n";
+ confData << "tls_cacertFile " << tlsCacertFile.c_str() << "\n";
}
else
{
@@ -192,6 +192,13 @@ std::string Config::lDAPServerURI(std::string value)
elog<InvalidArgument>(Argument::ARGUMENT_NAME("lDAPServerURI"),
Argument::ARGUMENT_VALUE(value.c_str()));
}
+
+ if (secureLDAP && !fs::exists(tlsCacertFile.c_str()))
+ {
+ log<level::ERR>("LDAP server's CA certificate not provided",
+ entry("TLSCACERTFILE=%s", tlsCacertFile.c_str()));
+ elog<NoCACertificate>();
+ }
val = ConfigIface::lDAPServerURI(value);
writeConfig();
parent.restartService(nslcdService);
@@ -204,6 +211,10 @@ std::string Config::lDAPServerURI(std::string value)
{
throw;
}
+ catch (const NoCACertificate& e)
+ {
+ throw;
+ }
catch (const std::exception& e)
{
log<level::ERR>(e.what());
@@ -405,6 +416,13 @@ std::string
Argument::ARGUMENT_VALUE(lDAPServerURI.c_str()));
}
+ if (secureLDAP && !fs::exists(tlsCacertFile.c_str()))
+ {
+ log<level::ERR>("LDAP server's CA certificate not provided",
+ entry("TLSCACERTFILE=%s", tlsCacertFile.c_str()));
+ elog<NoCACertificate>();
+ }
+
if (lDAPBindDN.empty())
{
log<level::ERR>("Not a valid LDAP BINDDN",
@@ -438,8 +456,9 @@ std::string
auto objPath = std::string(LDAP_CONFIG_DBUS_OBJ_PATH);
configPtr = std::make_unique<Config>(
- bus, objPath.c_str(), configFilePath.c_str(), secureLDAP, lDAPServerURI,
- lDAPBindDN, lDAPBaseDN, std::move(lDAPBindDNPassword),
+ bus, objPath.c_str(), configFilePath.c_str(), tlsCacertFile.c_str(),
+ secureLDAP, lDAPServerURI, lDAPBindDN, lDAPBaseDN,
+ std::move(lDAPBindDNPassword),
static_cast<ldap_base::Config::SearchScope>(lDAPSearchScope),
static_cast<ldap_base::Config::Type>(lDAPType), *this);
@@ -571,6 +590,12 @@ void ConfigMgr::restore(const char* filePath)
// object upon finding empty values in config, as
// this can be a default config.
}
+ catch (const NoCACertificate& e)
+ {
+ // Don't throw - we don't want to create a D-Bus
+ // object upon finding "ssl on" without having tls_cacertFile in place,
+ // as this can be a default config.
+ }
catch (const InternalFailure& e)
{
throw;
diff --git a/phosphor-ldap-config/ldap_configuration.hpp b/phosphor-ldap-config/ldap_configuration.hpp
index 0dfb56d..0254d42 100644
--- a/phosphor-ldap-config/ldap_configuration.hpp
+++ b/phosphor-ldap-config/ldap_configuration.hpp
@@ -49,6 +49,7 @@ class Config : public ConfigIface
* @param[in] bus - Bus to attach to.
* @param[in] path - The D-Bus object path to attach at.
* @param[in] filePath - LDAP configuration file.
+ * @param[in] caCertFile - LDAP's CA certificate file.
* @param[in] secureLDAP - Specifies whether to use SSL or not.
* @param[in] lDAPServerURI - LDAP URI of the server.
* @param[in] lDAPBindDN - distinguished name with which to bind.
@@ -61,8 +62,9 @@ class Config : public ConfigIface
*/
Config(sdbusplus::bus::bus& bus, const char* path, const char* filePath,
- bool secureLDAP, std::string lDAPServerURI, std::string lDAPBindDN,
- std::string lDAPBaseDN, std::string&& lDAPBindDNPassword,
+ const char* caCertFile, bool secureLDAP, std::string lDAPServerURI,
+ std::string lDAPBindDN, std::string lDAPBaseDN,
+ std::string&& lDAPBindDNPassword,
ldap_base::Config::SearchScope lDAPSearchScope,
ldap_base::Config::Type lDAPType, ConfigMgr& parent);
@@ -112,6 +114,7 @@ class Config : public ConfigIface
private:
std::string configFilePath{};
+ std::string tlsCacertFile{};
std::string lDAPBindDNPassword{};
/** @brief Persistent sdbusplus D-Bus bus connection. */
@@ -144,10 +147,10 @@ class ConfigMgr : public CreateIface
* @param[in] bus - Bus to attach to.
* @param[in] path - Path to attach at.
* @param[in] filePath - LDAP configuration file.
- * @param[in] caCertfile - LDAP's CA certificate file.
+ * @param[in] caCertFile - LDAP's CA certificate file.
*/
- ConfigMgr(sdbusplus::bus::bus& bus, const char* path,
- const char* filePath) :
+ ConfigMgr(sdbusplus::bus::bus& bus, const char* path, const char* filePath,
+ const char* caCertFile) :
CreateIface(bus, path, true),
configFilePath(filePath), bus(bus)
{
@@ -198,7 +201,7 @@ class ConfigMgr : public CreateIface
protected:
std::string configFilePath{};
- std::string tlsCacertfile{};
+ std::string tlsCacertFile{};
/** @brief Persistent sdbusplus D-Bus bus connection. */
sdbusplus::bus::bus& bus;
diff --git a/phosphor-ldap-config/main.cpp b/phosphor-ldap-config/main.cpp
index e285786..adbfdd3 100644
--- a/phosphor-ldap-config/main.cpp
+++ b/phosphor-ldap-config/main.cpp
@@ -27,7 +27,8 @@ int main(int argc, char* argv[])
// Add sdbusplus ObjectManager for the 'root' path of the LDAP config.
sdbusplus::server::manager::manager objManager(bus, LDAP_CONFIG_ROOT);
- phosphor::ldap::ConfigMgr mgr(bus, LDAP_CONFIG_ROOT, LDAP_CONFIG_FILE);
+ phosphor::ldap::ConfigMgr mgr(bus, LDAP_CONFIG_ROOT, LDAP_CONFIG_FILE,
+ TLS_CACERT_FILE);
bus.request_name(LDAP_CONFIG_BUSNAME);
OpenPOWER on IntegriCloud