diff --git a/src/ldap/ldap-config-keys.h b/src/ldap/ldap-config-keys.h
index b792ea9ba04f5d601803175421f60b93d98b1b50..547d1cff332e66017663b0a3f1f2c12167bc731f 100644
--- a/src/ldap/ldap-config-keys.h
+++ b/src/ldap/ldap-config-keys.h
@@ -39,56 +39,77 @@ public:
* An instance store a configuration value in order to customize attributes.
*
* Available Keys : default.
+ *
* - "server" : "ldap:///", Required.
* LDAP Server. eg: ldap:/// for a localhost server or ldap://ldap.example.org/
+ *
* - "bind_dn" : "".
* Bind DN to use for bindings. The bindDN DN is the credential that is used to authenticate against an LDAP. If
*empty, the connection will be Anonymous. eg: cn=ausername,ou=people,dc=bc,dc=com
+ *
* - "base_object" : "dc=example,dc=com", Required.
* BaseObject is a specification for LDAP Search Scopes that specifies that the Search Request should only be
*performed against the entry specified as the search base DN. No entries above it will be considered.
+ *
* - "timeout" : "5".
* Timeout in seconds
+ *
* - "timeout_tls_ms" : "1000".
* Timeout in milliseconds
+ *
* - "min_chars" : "0"
* The minimum characters needed for doing a search.
+ *
* - "max_results" : "5".
* The max results when requesting searches.
+ *
* - "delay" : "500".
* The delay between each search in milliseconds.
+ *
* - "auth_method" : "SIMPLE".
* Authentification method. Only "SIMPLE" and "ANONYMOUS" are supported.
+ *
* - "password" : "".
* Password to pass to server when binding.
+ *
* - "filter" : "(sn=*%s*)".
* The search is based on this filter to search contacts.
+ * Multiple criteria can be write as (|(sn=*%s*)(cn=*%s*))
+ *
* - "name_attribute" : "sn".
* Check these attributes to build Name Friend, separated by a comma and the first is the highest priority.
+ * Name concatenation is specified with '+' like "cn+sn"
+ *
* - "sip_attribute" : "mobile,telephoneNumber,homePhone,sn".
* Check these attributes to build the SIP username in address of Friend. Attributes are separated by a comma.
+ *
* - "sip_domain" : "".
* Add the domain to the sip address(sip:username@domain). If empty, the domain will be specify while searching on
*the current proxy account.
+ *
* - "enable" : "0".
* If this config is enabled.
+ *
* - "use_sal" : "0".
* The dns resolution is done by Linphone using Sal. It will pass an IP to LDAP. By doing that, the TLS negociation
*could not check the hostname. You may deactivate the verifications if wanted to force the connection.
+ *
* - "use_tls" : "1".
* Encrypt transactions by LDAP over TLS(StartTLS). You must use \'ldap\' scheme. \'ldaps\' for LDAP over SSL is
*non-standardized and deprecated. StartTLS in an extension to the LDAP protocol which uses the TLS protocol to
*encrypt communication. It works by establishing a normal - i.e. unsecured - connection with the LDAP server before
*a handshake negotiation between the server and the web services is carried out. Here, the server sends its
*certificate to prove its identity before the secure connection is established.
+ *
* - "debug" : "0".
* Debug mode
+ *
* - "verify_server_certificates" : "-1". values: -1:auto from core, 0:deactivate, 1:activate
* Specify whether the tls server certificate must be verified when connecting to a LDAP server.
**/
std::string mValue;
-
+
/**
* Specify the separator character if splittable. Use null character ('\0') to disable the feature.
**/
@@ -103,7 +124,7 @@ public:
* Get the default LdapConfigKeys from key.
* @param key the key configuration.
* @return The associated LdapConfigKeys
- **/
+ **/
static LdapConfigKeys getConfigKeys(const std::string &key);
/**
@@ -113,7 +134,7 @@ public:
* @return An array of string
**/
static std::vector<std::string> split(const std::string &key, const std::string &value);
-
+
/**
* Join an array of string into a string using ',' separator by default or the separator coming from config key.
* @param key the key configuration that is used to retrieve separator from keys list.
@@ -130,24 +151,27 @@ public:
**/
static bool validConfig(const std::map<std::string, std::vector<std::string>> &config);
static bool validConfig(const std::map<std::string, std::string> &config);
-
+
/**
* Parse Ldap configuration coming from loadConfig to retrieve all keys and return all unique attributes.
* @param splittedConfig The configuration <name,<value>>
* @param keys Keys to check
* @return The unique attributes
**/
- std::unordered_set<std::string> getUniqueAttributes(const std::map<std::string, std::vector<std::string>> &splittedConfig, const std::vector<std::string> &keys);
-
+ std::unordered_set<std::string>
+ getUniqueAttributes(const std::map<std::string, std::vector<std::string>> &splittedConfig,
+ const std::vector<std::string> &keys);
+
/**
* Load a full configuration from an existant. The return value is the config with default value and a parsing is
*done to give attributes arrays.
* @param config The configuration <name,value>
* @return The configuration map keys.
**/
- static std::map<std::string, std::vector<std::string> > loadConfig(const std::map<std::string, std::vector<std::string>> &config = std::map<std::string, std::vector<std::string>>());
+ static std::map<std::string, std::vector<std::string>>
+ loadConfig(const std::map<std::string, std::vector<std::string>> &config =
+ std::map<std::string, std::vector<std::string>>());
static std::map<std::string, std::string> loadConfig(const std::map<std::string, std::string> &config);
-
};
LINPHONE_END_NAMESPACE
diff --git a/src/ldap/ldap-contact-provider.cpp b/src/ldap/ldap-contact-provider.cpp
index ce38d19643021f5d3ee17a77fe96e306f6149abd..4a662352ed614a036ce7111e14eda34662511fcd 100644
--- a/src/ldap/ldap-contact-provider.cpp
+++ b/src/ldap/ldap-contact-provider.cpp
@@ -42,7 +42,8 @@
LINPHONE_BEGIN_NAMESPACE
#ifdef _WIN32
-// someone does include the evil windef.h so we must undef the min and max macros to be able to use std::min and std::max
+// someone does include the evil windef.h so we must undef the min and max macros to be able to use std::min and
+// std::max
#undef min
#undef max
#endif
@@ -50,7 +51,9 @@ LINPHONE_BEGIN_NAMESPACE
//******************************************* CREATION
-LdapContactProvider::LdapContactProvider(const std::shared_ptr<Core> &core, std::shared_ptr<Ldap> ldap, int maxResults) {
+LdapContactProvider::LdapContactProvider(const std::shared_ptr<Core> &core,
+ std::shared_ptr<Ldap> ldap,
+ int maxResults) {
mAwaitingMessageId = 0;
mConnected = false;
mCore = core;
@@ -78,7 +81,7 @@ LdapContactProvider::~LdapContactProvider() {
cleanLdap();
}
-void LdapContactProvider::cleanLdap(){
+void LdapContactProvider::cleanLdap() {
if (mSalContext) {
belle_sip_resolver_context_cancel(mSalContext);
belle_sip_object_unref(mSalContext);
@@ -94,7 +97,8 @@ void LdapContactProvider::cleanLdap(){
mLd = nullptr;
}
-std::vector<std::shared_ptr<LdapContactProvider>> LdapContactProvider::create(const std::shared_ptr<Core> &core, int maxResults) {
+std::vector<std::shared_ptr<LdapContactProvider>> LdapContactProvider::create(const std::shared_ptr<Core> &core,
+ int maxResults) {
std::vector<std::shared_ptr<LdapContactProvider>> providers;
auto ldapList = core->getLdapList();
@@ -102,26 +106,26 @@ std::vector<std::shared_ptr<LdapContactProvider>> LdapContactProvider::create(co
for (auto itLdap : ldapList) {
auto params = itLdap->getLdapParams();
- if(params->getEnabled())
- providers.push_back(std::make_shared<LdapContactProvider>(core, itLdap, maxResults));
+ if (params->getEnabled()) providers.push_back(std::make_shared<LdapContactProvider>(core, itLdap, maxResults));
}
return providers;
}
-void LdapContactProvider::fallbackToNextServerUrl(){
+void LdapContactProvider::fallbackToNextServerUrl() {
lDebug() << "[LDAP] fallbackToNextServerUrl (" << mServerUrlIndex << "," << mServerUrl.size() << ")";
- if(++mServerUrlIndex >= mServerUrl.size()){ // ServerUrl comes from SRV or config. Check if there are more for next url in config.
+ if (++mServerUrlIndex >=
+ mServerUrl.size()) { // ServerUrl comes from SRV or config. Check if there are more for next url in config.
mServerUrl.clear();
mServerUrlIndex = 0;
- if(++mConfigServerIndex >= mConfig["server"].size())// No more urls
+ if (++mConfigServerIndex >= mConfig["server"].size()) // No more urls
mCurrentAction = ACTION_ERROR;
else {
lDebug() << "[LDAP] fallback to next config : " << mConfig["server"][mConfigServerIndex];
- mCurrentAction = ACTION_INIT;// Restart with sal for new config url
+ mCurrentAction = ACTION_INIT; // Restart with sal for new config url
}
- }else{
+ } else {
lDebug() << "[LDAP] fallback to next url : " << mServerUrl[mServerUrlIndex];
- mCurrentAction = ACTION_INITIALIZE;// No need to check with sal.
+ mCurrentAction = ACTION_INITIALIZE; // No need to check with sal.
}
cleanLdap();
}
@@ -137,25 +141,29 @@ void LdapContactProvider::ldapTlsConnection() {
ldap_set_option(mLd, LDAP_OPT_CONNECT_ASYNC, value); // If not Async, ldap_start_tls can block on connect.
ldapReturnStatus = ldap_start_tls(mLd, NULL, NULL, &mTlsConnectionId); // Try to open a socket.
if (ldapReturnStatus != LDAP_SUCCESS) {
- lError() << "[LDAP] Cannot start TLS connection (" << ldap_err2string(ldapReturnStatus) << ") for " << mServerUrl[mServerUrlIndex];
+ lError() << "[LDAP] Cannot start TLS connection (" << ldap_err2string(ldapReturnStatus) << ") for "
+ << mServerUrl[mServerUrlIndex];
fallbackToNextServerUrl();
mTlsConnectionId = -1;
- }else // mTlsConnectionId is not -1 only on success.
+ } else // mTlsConnectionId is not -1 only on success.
lDebug() << "[LDAP] ldap_start_tls success";
- } // Not 'else' : we try to get a result without having to wait an iteration
- // 2) Wait for connection
+ } // Not 'else' : we try to get a result without having to wait an iteration
+ // 2) Wait for connection
if (mTlsConnectionId >= 0) {
LDAPMessage *resultMessage = NULL;
struct timeval tv = {0, 0}; // Do not block
ldapReturnStatus = ldap_result(mLd, mTlsConnectionId, LDAP_MSG_ALL, &tv, &resultMessage);
switch (ldapReturnStatus) {
case -1:
- lError() << "[LDAP] Cannot start TLS connection : Remote server is down at " << mServerUrl[mServerUrlIndex];
+ lError() << "[LDAP] Cannot start TLS connection : Remote server is down at "
+ << mServerUrl[mServerUrlIndex];
fallbackToNextServerUrl();
break;
case 0: { // Retry on the next iteration.
- if (1000*difftime(time(NULL), mTlsConnectionTimeout) > timeout) {
- lError() << "[LDAP] Tls was starting with success but the remote server doesn't respond to ldap_result. TLS timeout has been reached [" << timeout << "] at " << mServerUrl[mServerUrlIndex];
+ if (1000 * difftime(time(NULL), mTlsConnectionTimeout) > timeout) {
+ lError() << "[LDAP] Tls was starting with success but the remote server doesn't respond to "
+ "ldap_result. TLS timeout has been reached ["
+ << timeout << "] at " << mServerUrl[mServerUrlIndex];
fallbackToNextServerUrl();
}
return;
@@ -165,7 +173,7 @@ void LdapContactProvider::ldapTlsConnection() {
lDebug() << "[LDAP] ldap_parse_extended_result: " << ldapReturnStatus;
if (ldapReturnStatus == LDAP_SUCCESS) {
ldapReturnStatus = ldap_parse_result(mLd, resultMessage, &resultStatus, NULL, NULL, NULL, NULL, 1);
- lDebug() << "[LDAP] ldap_parse_result: " <<ldapReturnStatus;
+ lDebug() << "[LDAP] ldap_parse_result: " << ldapReturnStatus;
resultMessage = NULL; // Freed by ldap_parse_result
if (ldapReturnStatus == LDAP_SUCCESS) {
@@ -178,7 +186,9 @@ void LdapContactProvider::ldapTlsConnection() {
mCurrentAction = ACTION_BIND;
} else {
ldap_get_option(mLd, LDAP_OPT_RESULT_CODE, &resultStatus);
- lError() << "[LDAP] Cannot install the TLS handler (" << ldap_err2string(ldapReturnStatus) << "), resultStatus " << resultStatus << " (" << ldap_err2string(resultStatus) << ")";
+ lError() << "[LDAP] Cannot install the TLS handler (" << ldap_err2string(ldapReturnStatus)
+ << "), resultStatus " << resultStatus << " (" << ldap_err2string(resultStatus)
+ << ")";
fallbackToNextServerUrl();
}
@@ -206,60 +216,69 @@ void LdapContactProvider::initializeLdap() {
mCurrentAction = ACTION_NONE;
if (ret != LDAP_SUCCESS)
- lError() << "[LDAP] Problem initializing default Protocol version to 3 : " << ret <<", (" << ldap_err2string(ret) << ")";
+ lError() << "[LDAP] Problem initializing default Protocol version to 3 : " << ret << ", ("
+ << ldap_err2string(ret) << ")";
ret = ldap_set_option(NULL, LDAP_OPT_NETWORK_TIMEOUT, &timeout);
if (ret != LDAP_SUCCESS)
- lError() << "[LDAP] Problem initializing default timeout to " << timeout.tv_sec << " : " << ret << " (" << ldap_err2string(ret) << ")";
+ lError() << "[LDAP] Problem initializing default timeout to " << timeout.tv_sec << " : " << ret << " ("
+ << ldap_err2string(ret) << ")";
// Setting global options for the next initialization. These options cannot be done with the LDAP instance directly.
if (mConfig.count("debug") > 0 &&
LinphoneLdapDebugLevelVerbose == static_cast<LinphoneLdapDebugLevel>(atoi(mConfig["debug"][0].c_str())))
debLevel = 7;
ret = ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, &debLevel);
if (ret != LDAP_SUCCESS)
- lError() << "[LDAP] Problem initializing debug options to mode 7 : " << ret << " (" << ldap_err2string(ret) << ")";
+ lError() << "[LDAP] Problem initializing debug options to mode 7 : " << ret << " (" << ldap_err2string(ret)
+ << ")";
if (mConfig.count("use_tls") > 0 && mConfig["use_tls"][0] == "1") {
std::string caFile = linphone_core_get_root_ca(mCore->getCCore());
bool enableVerification = true;
if (mConfig.count("verify_server_certificates") > 0) {
auto mode = mConfig["verify_server_certificates"][0];
- if ( mode == "-1")
- enableVerification = linphone_core_is_verify_server_certificates(mCore->getCCore());
+ if (mode == "-1") enableVerification = linphone_core_is_verify_server_certificates(mCore->getCCore());
else if (mode == "0") enableVerification = false;
}
int reqcert = (enableVerification ? LDAP_OPT_X_TLS_DEMAND : LDAP_OPT_X_TLS_ALLOW);
int reqsan = LDAP_OPT_X_TLS_ALLOW;
ret = ldap_set_option(NULL, LDAP_OPT_X_TLS_REQUIRE_CERT, &reqcert);
if (ret != LDAP_SUCCESS)
- lError() << "[LDAP] Problem initializing TLS on setting require certification '" << mServerUrl[mServerUrlIndex] << "': " << ret << " (" << ldap_err2string(ret) << ")";
+ lError() << "[LDAP] Problem initializing TLS on setting require certification '"
+ << mServerUrl[mServerUrlIndex] << "': " << ret << " (" << ldap_err2string(ret) << ")";
ret = ldap_set_option(NULL, LDAP_OPT_X_TLS_CACERTFILE, caFile.c_str());
if (ret != LDAP_SUCCESS)
- lError() << "[LDAP] Problem initializing TLS on setting CA Certification file '" << mServerUrl[mServerUrlIndex] << "': " << ret << " (" << ldap_err2string(ret) << ")";
+ lError() << "[LDAP] Problem initializing TLS on setting CA Certification file '"
+ << mServerUrl[mServerUrlIndex] << "': " << ret << " (" << ldap_err2string(ret) << ")";
ret = ldap_set_option(NULL, LDAP_OPT_X_TLS_REQUIRE_SAN, &reqsan);
if (ret != LDAP_SUCCESS)
- lError() << "[LDAP] Problem initializing TLS on setting require SAN '" << mServerUrl[mServerUrlIndex] << "': " << ret << " (" << ldap_err2string(ret) << ")";
+ lError() << "[LDAP] Problem initializing TLS on setting require SAN '" << mServerUrl[mServerUrlIndex]
+ << "': " << ret << " (" << ldap_err2string(ret) << ")";
}
ret = ldap_initialize(&mLd, mServerUrl[mServerUrlIndex].c_str()); // Trying to connect even on error on options
if (ret != LDAP_SUCCESS) {
- lError() << "[LDAP] Problem initializing ldap on url '" << mServerUrl[mServerUrlIndex] << "': " <<ret << " (" << ldap_err2string(ret) << ")";
+ lError() << "[LDAP] Problem initializing ldap on url '" << mServerUrl[mServerUrlIndex] << "': " << ret << " ("
+ << ldap_err2string(ret) << ")";
fallbackToNextServerUrl();
} else if ((ret = ldap_set_option(mLd, LDAP_OPT_PROTOCOL_VERSION, &proto_version)) != LDAP_SUCCESS) {
- lError() << "[LDAP] Problem setting protocol version " << proto_version << ": " << ret << " (" << ldap_err2string(ret) << ")";
+ lError() << "[LDAP] Problem setting protocol version " << proto_version << ": " << ret << " ("
+ << ldap_err2string(ret) << ")";
fallbackToNextServerUrl();
} else if (ret != LDAP_SUCCESS) {
int err;
ldap_get_option(mLd, LDAP_OPT_RESULT_CODE, &err);
- lError () << "[LDAP] Cannot initialize address to " << mServerUrl[mServerUrlIndex] << " : " << ret << " (" << ldap_err2string(ret) << "), err " << err << " (" << ldap_err2string(err) << ")";
+ lError() << "[LDAP] Cannot initialize address to " << mServerUrl[mServerUrlIndex] << " : " << ret << " ("
+ << ldap_err2string(ret) << "), err " << err << " (" << ldap_err2string(err) << ")";
fallbackToNextServerUrl();
} else if (mConfig.count("use_tls") > 0 && mConfig["use_tls"][0] == "1") {
if (mConfig.count("use_sal") > 0 &&
- mConfig["use_sal"][0] == "1") { // Using Sal give an IP for a domain. So check the domain rather than the IP.
- belle_generic_uri_t *serverUri = belle_generic_uri_parse(mConfig["server"][mConfigServerIndex].c_str()); // mServer are results of sal. Use the root urls.
- const char * cHost = belle_generic_uri_get_host(serverUri);
+ mConfig["use_sal"][0] ==
+ "1") { // Using Sal give an IP for a domain. So check the domain rather than the IP.
+ belle_generic_uri_t *serverUri = belle_generic_uri_parse(
+ mConfig["server"][mConfigServerIndex].c_str()); // mServer are results of sal. Use the root urls.
+ const char *cHost = belle_generic_uri_get_host(serverUri);
std::string hostname = cHost ? cHost : "";
ldap_set_option(mLd, LDAP_OPT_X_TLS_PEER_CN, &hostname[0]);
- if(serverUri)
- belle_sip_object_unref(serverUri);
+ if (serverUri) belle_sip_object_unref(serverUri);
}
mTlsConnectionId = -1;
mCurrentAction = ACTION_WAIT_TLS_CONNECT;
@@ -270,12 +289,15 @@ void LdapContactProvider::initializeLdap() {
}
}
-int LdapContactProvider::configValueToInt(const std::string &key) const{
- return atoi( (mConfig.count(key) > 0 ? mConfig.at(key)[0] : LdapConfigKeys::split(key, LdapConfigKeys::getConfigKeys(key).mValue)[0]).c_str());
+int LdapContactProvider::configValueToInt(const std::string &key) const {
+ return atoi((mConfig.count(key) > 0 ? mConfig.at(key)[0]
+ : LdapConfigKeys::split(key, LdapConfigKeys::getConfigKeys(key).mValue)[0])
+ .c_str());
}
-std::string LdapContactProvider::configValueToStr(const std::string &key) const{
- return mConfig.count(key) > 0 ? mConfig.at(key)[0] : LdapConfigKeys::split(key, LdapConfigKeys::getConfigKeys(key).mValue)[0];
+std::string LdapContactProvider::configValueToStr(const std::string &key) const {
+ return mConfig.count(key) > 0 ? mConfig.at(key)[0]
+ : LdapConfigKeys::split(key, LdapConfigKeys::getConfigKeys(key).mValue)[0];
}
int LdapContactProvider::getCurrentAction() const {
@@ -302,8 +324,8 @@ void LdapContactProvider::computeLastRequestTime(const std::list<SearchRequest>
else {
uint64_t t = itRequest->getStartTime();
if (t - mLastRequestTime >
- (uint64_t)
- configValueToInt("delay")) // This last search should be start as it's superior from timeout. Take it account.
+ (uint64_t)configValueToInt(
+ "delay")) // This last search should be start as it's superior from timeout. Take it account.
mLastRequestTime = t;
}
// Continue with the next LDAP search
@@ -345,7 +367,7 @@ int LdapContactProvider::search(std::shared_ptr<LdapContactSearch> request) {
&timeout, // server timeout for the search
maxResults, &request->mMsgId);
if (ret != LDAP_SUCCESS) {
- lError() << "[LDAP] Error ldap_search_ext returned " << ret << " ("<< ldap_err2string(ret) << ")";
+ lError() << "[LDAP] Error ldap_search_ext returned " << ret << " (" << ldap_err2string(ret) << ")";
} else {
lDebug() << "[LDAP] LinphoneLdapContactSearch created @" << request.get() << " : msgid " << request->mMsgId;
}
@@ -371,7 +393,8 @@ std::list<std::shared_ptr<LdapContactSearch>>::iterator LdapContactProvider::can
}
listEntry = mRequests.erase(listEntry);
} else {
- lWarning() << "[LDAP] Couldn't find ldap request " << request << " (id " << request->mMsgId << ") in monitoring.";
+ lWarning() << "[LDAP] Couldn't find ldap request " << request << " (id " << request->mMsgId
+ << ") in monitoring.";
}
return listEntry;
}
@@ -383,36 +406,52 @@ LdapContactSearch *LdapContactProvider::requestSearch(int msgid) {
else return NULL;
}
-int LdapContactProvider::completeContact(LdapContactFields *contact, const char *attrName, const char *attrValue) {
- // These loops follow the priority rule on position in attributes array. The first item is better than the last.
- std::string attributeValueLocale = Utils::utf8ToLocale(attrValue);
- for (size_t attributeIndex = 0;
- attributeIndex < mConfig["name_attribute"].size() &&
- (contact->mName.second < 0 || (attributeValueLocale != "" && contact->mName.second > (int)attributeIndex));
- ++attributeIndex) {
- if (attrName == mConfig["name_attribute"][attributeIndex]) {
- contact->mName.first = attributeValueLocale;
- contact->mName.second = (int)attributeIndex;
+int LdapContactProvider::buildContact(LdapContactFields *contact,
+ const std::vector<std::pair<std::string, std::string>> &attributes) {
+ for (size_t configIndex = 0; contact->mName.second < 0 && configIndex < mConfig["name_attribute"].size();
+ ++configIndex) {
+ std::istringstream parser(mConfig["name_attribute"][configIndex]);
+ std::string requestedAttribute;
+ auto attributesIt =
+ attributes.begin(); // If no attributes, we don't do anything. Each loop must have an attribute or the
+ // contact cannot be build because of missing attributes.
+ while (attributesIt != attributes.end() && std::getline(parser, requestedAttribute, '+')) {
+ attributesIt =
+ std::find_if(attributes.begin(), attributes.end(),
+ // Attributes have been lowered so it doesn't need to to insensitive case comparaison
+ [requestedAttribute](const std::pair<std::string, std::string> &p) {
+ return p.first == requestedAttribute;
+ });
+ if (attributesIt != attributes.end()) {
+ if (contact->mName.first != "") contact->mName.first += " ";
+ contact->mName.first += attributesIt->second;
+ }
}
+ if (attributesIt != attributes.end()) contact->mName.second = (int)configIndex;
+ else contact->mName.first = ""; // Reset result
}
- for (size_t attributeIndex = 0; attributeIndex < mConfig["sip_attribute"].size(); ++attributeIndex) {
- if (attrName == mConfig["sip_attribute"][attributeIndex]) { // Complete SIP with custom data (scheme and domain)
- std::string sip;
- sip += attributeValueLocale;
- // Test if this sip is ok
- LinphoneAddress *la = linphone_core_interpret_url(mCore->getCCore(), sip.c_str());
- if (!la) {
- } else {
- if (mConfig.count("sip_domain") > 0 && mConfig.at("sip_domain")[0] != "")
- linphone_address_set_domain(la, mConfig.at("sip_domain")[0].c_str());
- char *newSip = linphone_address_as_string(la);
- char *phoneNumber = linphone_account_normalize_phone_number(
- linphone_core_get_default_account(mCore->getCCore()), attributeValueLocale.c_str());
- if (contact->mSip.count(newSip) == 0 || contact->mSip[newSip] == "")
- contact->mSip[newSip] = (phoneNumber ? phoneNumber : "");
- if (phoneNumber) ms_free(phoneNumber);
- ms_free(newSip);
- linphone_address_unref(la);
+ for (size_t attributeIndex = 0; attributeIndex < attributes.size(); ++attributeIndex) {
+ for (size_t configIndex = 0; configIndex < mConfig["sip_attribute"].size(); ++configIndex) {
+ if (attributes[attributeIndex].first ==
+ mConfig["sip_attribute"][configIndex]) { // Complete SIP with custom data (scheme and domain)
+ std::string sip;
+ sip += attributes[attributeIndex].second;
+ // Test if this sip is ok
+ LinphoneAddress *la = linphone_core_interpret_url(mCore->getCCore(), sip.c_str());
+ if (!la) {
+ } else {
+ if (mConfig.count("sip_domain") > 0 && mConfig.at("sip_domain")[0] != "")
+ linphone_address_set_domain(la, mConfig.at("sip_domain")[0].c_str());
+ char *newSip = linphone_address_as_string(la);
+ char *phoneNumber =
+ linphone_account_normalize_phone_number(linphone_core_get_default_account(mCore->getCCore()),
+ attributes[attributeIndex].second.c_str());
+ if (contact->mSip.count(newSip) == 0 || contact->mSip[newSip] == "")
+ contact->mSip[newSip] = (phoneNumber ? phoneNumber : "");
+ if (phoneNumber) ms_free(phoneNumber);
+ ms_free(newSip);
+ linphone_address_unref(la);
+ }
}
}
}
@@ -422,8 +461,8 @@ int LdapContactProvider::completeContact(LdapContactFields *contact, const char
}
//******************************************* ASYNC PROCESSING
-// ACTION_NONE => ACTION_INIT => (ACTION_WAIT_DNS) => ACTION_INITIALIZE => (ACTION_WAIT_TLS_CONNECT) => ACTION_BIND =>
-// ACTION_WAIT_BIND => ACTION_WAIT_REQUEST
+// ACTION_NONE => ACTION_INIT => (ACTION_WAIT_DNS) => ACTION_INITIALIZE => (ACTION_WAIT_TLS_CONNECT) => ACTION_BIND
+// => ACTION_WAIT_BIND => ACTION_WAIT_REQUEST
bool LdapContactProvider::iterate(void *data) {
struct timeval pollTimeout = {0, 0};
LDAPMessage *results = NULL;
@@ -449,13 +488,16 @@ bool LdapContactProvider::iterate(void *data) {
lDebug() << "[LDAP] ACTION_INIT";
if (provider->mConfig["use_sal"][0] == "0") {
provider->mServerUrl = provider->mConfig["server"];
- provider->mConfigServerIndex = provider->mConfig.size() - 1; // we don't use sal, so mConfigServerIndex doesn't need to correspond to the current mConfig (for TLS resolution)
+ provider->mConfigServerIndex =
+ provider->mConfig.size() - 1; // we don't use sal, so mConfigServerIndex doesn't need to
+ // correspond to the current mConfig (for TLS resolution)
provider->mCurrentAction = ACTION_INITIALIZE;
} else {
- belle_generic_uri_t * uri = belle_generic_uri_parse(provider->mConfig["server"][provider->mConfigServerIndex].c_str());
+ belle_generic_uri_t *uri =
+ belle_generic_uri_parse(provider->mConfig["server"][provider->mConfigServerIndex].c_str());
if (uri) {
belle_sip_object_ref(uri);
- const char * cHost = belle_generic_uri_get_host(uri);
+ const char *cHost = belle_generic_uri_get_host(uri);
std::string domain = cHost ? cHost : "localhost";
int port = belle_generic_uri_get_port(uri);
if (port <= 0) {
@@ -470,14 +512,21 @@ bool LdapContactProvider::iterate(void *data) {
belle_sip_object_unref(provider->mSalContext);
provider->mSalContext = NULL;
}
- provider->mSalContext = provider->mCore->getCCore()->sal->resolve("ldap", "tcp", domain.c_str(), port, (linphone_core_ipv6_enabled(provider->mCore->getCCore()) ? AF_INET6 : AF_INET) ,ldapServerResolved, provider);
+ provider->mSalContext = provider->mCore->getCCore()->sal->resolve(
+ "ldap", "tcp", domain.c_str(), port,
+ (linphone_core_ipv6_enabled(provider->mCore->getCCore()) ? AF_INET6 : AF_INET),
+ ldapServerResolved, provider);
if (provider->mSalContext) {
belle_sip_object_ref(provider->mSalContext);
provider->mCurrentAction = ACTION_WAIT_DNS;
- } else if(provider->mCurrentAction == ACTION_INIT) // //Sal is NULL : we cannot use it or it could be done synchonously. In the last case, mCurrentAction will be changed directly from callback. Try another iteration to use it by not setting any new action.
+ } else if (provider->mCurrentAction ==
+ ACTION_INIT) // //Sal is NULL : we cannot use it or it could be done synchonously. In
+ // the last case, mCurrentAction will be changed directly from callback.
+ // Try another iteration to use it by not setting any new action.
lError() << "[LDAP] Cannot request DNS : no context for Sal. Retry on next iteration.";
} else {
- lError () << "[LDAP] Cannot parse the server to URI : " << provider->mConfig["server"][provider->mConfigServerIndex];
+ lError() << "[LDAP] Cannot parse the server to URI : "
+ << provider->mConfig["server"][provider->mConfigServerIndex];
provider->fallbackToNextServerUrl();
}
}
@@ -494,7 +543,7 @@ bool LdapContactProvider::iterate(void *data) {
provider->initializeLdap();
}
- if (provider->mCurrentAction == ACTION_WAIT_TLS_CONNECT){
+ if (provider->mCurrentAction == ACTION_WAIT_TLS_CONNECT) {
lDebug() << "[LDAP] ACTION_WAIT_TLS_CONNECT";
provider->ldapTlsConnection();
}
@@ -520,7 +569,8 @@ bool LdapContactProvider::iterate(void *data) {
} else {
int err = 0;
ldap_get_option(provider->mLd, LDAP_OPT_RESULT_CODE, &err);
- lError() << "[LDAP] ldap_sasl_bind error returned " << ret << ", err " << err << " (" << ldap_err2string(err) << "), auth_method: " << auth_mechanism;
+ lError() << "[LDAP] ldap_sasl_bind error returned " << ret << ", err " << err << " ("
+ << ldap_err2string(err) << "), auth_method: " << auth_mechanism;
provider->mCurrentAction = ACTION_ERROR;
provider->mAwaitingMessageId = 0;
}
@@ -558,7 +608,8 @@ bool LdapContactProvider::iterate(void *data) {
if (!(*it)) it = provider->mRequests.erase(it);
else if ((*it)->mMsgId == 0) {
int ret;
- lInfo() << "[LDAP] Found pending search " << it->get() << " (for " << (*it)->mFilter << "), launching...";
+ lInfo() << "[LDAP] Found pending search " << it->get() << " (for " << (*it)->mFilter
+ << "), launching...";
ret = provider->search(*it);
if (ret != LDAP_SUCCESS) {
it = provider->cancelSearch(it->get());
@@ -573,7 +624,8 @@ bool LdapContactProvider::iterate(void *data) {
switch (ret) {
case -1: {
int lastError = errno;
- lWarning() << "[LDAP] : Error in ldap_result : returned -1 (req_count " << requestSize << "): " << ldap_err2string(lastError);
+ lWarning() << "[LDAP] : Error in ldap_result : returned -1 (req_count " << requestSize
+ << "): " << ldap_err2string(lastError);
break;
}
case 0:
@@ -613,24 +665,22 @@ void LdapContactProvider::ldapServerResolved(void *data, belle_sip_resolver_resu
provider->mServerUrl.clear();
provider->mServerUrlIndex = 0;
auto addr = belle_sip_resolver_results_get_addrinfos(results);
- if(!addr){
+ if (!addr) {
lError() << "[LDAP] Server resolution failed, no address can be found.";
- }else
- lDebug() << "[LDAP] Server resolution successful.";
- while(addr) {
+ } else lDebug() << "[LDAP] Server resolution successful.";
+ while (addr) {
const struct addrinfo *ai = addr;
int err;
char ipstring[64];
err = bctbx_addrinfo_to_printable_ip_address(ai, ipstring, sizeof(ipstring));
- if (err != 0) lError() << "[LDAP] DNS resolver: bctbx_addrinfo_to_printable_ip_address error " << gai_strerror(err);
+ if (err != 0)
+ lError() << "[LDAP] DNS resolver: bctbx_addrinfo_to_printable_ip_address error " << gai_strerror(err);
else lDebug() << "[LDAP] find : " << ipstring;
- provider->mServerUrl.push_back("ldap://"+std::string(ipstring));
+ provider->mServerUrl.push_back("ldap://" + std::string(ipstring));
addr = addr->ai_next;
}
- if(provider->mServerUrl.size() == 0)
- provider->fallbackToNextServerUrl();
- else
- provider->mCurrentAction = ACTION_INITIALIZE;
+ if (provider->mServerUrl.size() == 0) provider->fallbackToNextServerUrl();
+ else provider->mCurrentAction = ACTION_INITIALIZE;
}
void LdapContactProvider::handleSearchResult(LDAPMessage *message) {
@@ -650,17 +700,19 @@ void LdapContactProvider::handleSearchResult(LDAPMessage *message) {
char *attr = ldap_first_attribute(mLd, entry, &ber);
// Each entry is about a contact. Loop on all attributes and fill contact. We do not stop when
// contact is completed to know if there are better attributes
+ std::vector<std::pair<std::string, std::string>> attributes;
while (attr) {
struct berval **values = ldap_get_values_len(mLd, entry, attr);
struct berval **it = values;
while (values && *it && (*it)->bv_val && (*it)->bv_len) {
- contact_complete = (completeContact(&ldapData, attr, (*it)->bv_val) == 1);
+ attributes.push_back({Utils::stringToLower(attr), Utils::utf8ToLocale((*it)->bv_val)});
it++;
}
if (values) ldap_value_free_len(values);
ldap_memfree(attr);
attr = ldap_next_attribute(mLd, entry, ber);
}
+ contact_complete = buildContact(&ldapData, attributes);
if (contact_complete) {
LinphoneFriend *lfriend = linphone_core_create_friend(lc);
linphone_friend_set_name(lfriend, ldapData.mName.first.c_str());
diff --git a/src/ldap/ldap-contact-provider.h b/src/ldap/ldap-contact-provider.h
index 16c839e532e466f2d548db813f3971bdc99b1918..35a3990211f8787ce56b2d7b9f5740662f473e97 100644
--- a/src/ldap/ldap-contact-provider.h
+++ b/src/ldap/ldap-contact-provider.h
@@ -34,8 +34,8 @@
#include <string>
#include <vector>
-#include "../search/search-request.h"
#include "../search/magic-search.h"
+#include "../search/search-request.h"
#include "ldap.h" // Linphone
#include <ldap.h> // OpenLDAP
@@ -72,7 +72,6 @@ public:
LdapContactProvider(const std::shared_ptr<Core> &core, std::shared_ptr<Ldap> ldap, int maxResults);
-
virtual ~LdapContactProvider();
/**
@@ -91,13 +90,13 @@ public:
void initializeLdap();
// CONFIGURATION
-
+
/**
* @brief configValueToInt get the first value of key and convert it to integer.
* @return the first value
*/
int configValueToInt(const std::string &key) const;
-
+
/**
* @brief configValueToString get the first value of key.
* @return the first string
@@ -156,16 +155,13 @@ public:
LdapContactSearch *requestSearch(int msgid);
/**
- * @brief completeContact Fill LdapContactFields with the attribute. This function has to be call for each
- * attributes. The function use 'sip_domain' to complete the SIP attribute (attr_value@domain). These options can be
- * empty to avoid this behaviour.
+ * @brief buildContact Fill LdapContactFields with the attributes. The function use 'sip_domain' to complete the SIP
+ * attribute (attr_value@domain). These options can be empty to avoid this behaviour.
* @param lf the contact to fill
- * @param attr_name The attribute name from LDAP.
- * @param attr_value The value from LDAP.
+ * @param attributes the vector of attributes/values froml LDAP
* @return 1 if all contact's fields are filled. 0 if some fields are missing.
*/
- int completeContact(LdapContactFields *lf, const char *attr_name, const char *attr_value);
-
+ int buildContact(LdapContactFields *contact, const std::vector<std::pair<std::string, std::string>> &attributes);
// ASYNC PROCESSING
/**
@@ -183,9 +179,8 @@ public:
static void ldapServerResolved(void *data, belle_sip_resolver_results_t *results);
private:
-
void cleanLdap();
-
+
/**
* @brief handleSearchResult Parse the LDAPMessage to get contacts and fill Search entries.
* @param message LDAPMessage to parse
@@ -206,7 +201,7 @@ private:
* @brief computeLastRequestTime Compute the last request time on LDAP servers, from a list of request.
*/
void computeLastRequestTime(const std::list<SearchRequest> &requestHistory);
-
+
/**
* @brief fallbackToNextServerUrl Increment server Url and change action
*/
@@ -220,7 +215,7 @@ private:
int mMaxResults;
int mAwaitingMessageId; // Waiting Message for ldap_abandon_ext on bind
- bool mConnected; // If we are connected to server (bind)
+ bool mConnected; // If we are connected to server (bind)
int mCurrentAction; // Iteration action
belle_sip_source_t *mIteration; // Iteration loop
belle_sip_resolver_context_t *mSalContext; // Sal Context for DNS
@@ -232,7 +227,8 @@ private:
int mTlsConnectionId = -1; // Used for getting async results from a start_tls
time_t mTlsConnectionTimeout;
- uint64_t mLastRequestTime; // Store bctbx_get_cur_time_ms and use it as reference to make a delay between LDAP requests.
+ uint64_t
+ mLastRequestTime; // Store bctbx_get_cur_time_ms and use it as reference to make a delay between LDAP requests.
};
LINPHONE_END_NAMESPACE
diff --git a/src/ldap/ldap-params.cpp b/src/ldap/ldap-params.cpp
index f54d4f5d5d26be94696002656fc4bba5f13ef506..851ae8e273e53b5dd7a6a46ad9981b2e38569e0b 100644
--- a/src/ldap/ldap-params.cpp
+++ b/src/ldap/ldap-params.cpp
@@ -37,8 +37,8 @@ LINPHONE_BEGIN_NAMESPACE
// -----------------------------------------------------------------------------
LdapParams::LdapParams() {
- auto config = LdapConfigKeys::loadConfig();
- for(auto it = config.begin() ; it != config.end() ; ++it){
+ auto config = LdapConfigKeys::loadConfig();
+ for (auto it = config.begin(); it != config.end(); ++it) {
mConfig[it->first] = LdapConfigKeys::join(it->first, it->second);
}
}
@@ -109,11 +109,11 @@ void LdapParams::setFilter(const std::string &filter) {
}
void LdapParams::setNameAttribute(const std::string &nameAttribute) {
- setCustomValue("name_attribute", nameAttribute);
+ setCustomValue("name_attribute", Utils::stringToLower(nameAttribute));
}
void LdapParams::setSipAttribute(const std::string &sipAttribute) {
- setCustomValue("sip_attribute", sipAttribute);
+ setCustomValue("sip_attribute", Utils::stringToLower(sipAttribute));
}
void LdapParams::setSipDomain(const std::string &sipDomain) {
@@ -151,13 +151,12 @@ std::string &LdapParams::getCustomValue(const std::string &key) {
else return itValue->second;
}
-const std::string &LdapParams::getCustomValue(const std::string &key) const{
+const std::string &LdapParams::getCustomValue(const std::string &key) const {
auto itValue = mConfig.find(key);
if (itValue == mConfig.end()) return mDummyTxt;
else return itValue->second;
}
-
const std::string &LdapParams::getServer() const {
return getCustomValue("server");
}
@@ -236,7 +235,7 @@ LinphoneLdapCertVerificationMode LdapParams::getServerCertificatesVerificationMo
std::map<std::string, std::vector<std::string>> LdapParams::getConfig() const {
std::map<std::string, std::vector<std::string>> result;
- for(auto it = mConfig.begin() ; it != mConfig.end() ; ++it){
+ for (auto it = mConfig.begin(); it != mConfig.end(); ++it) {
result[it->first] = LdapConfigKeys::split(it->first, it->second);
}
return result;
@@ -256,7 +255,7 @@ int LdapParams::checkServer() const {
auto servers = LdapConfigKeys::split("server", getServer());
if (servers.size() == 0) checkResult |= LinphoneLdapCheckServerEmpty;
else {
- for(size_t i = 0 ; i < servers.size() ; ++i){
+ for (size_t i = 0; i < servers.size(); ++i) {
SalAddress *addr = sal_address_new(servers[i].c_str());
if (!addr) checkResult |= LinphoneLdapCheckServerNotUrl;
else {
diff --git a/tester/group_chat_tester.c b/tester/group_chat_tester.c
index 2b75aa91e52a5f4655838da27ae30929f7eb7429..05c8be1a17021c338fc0660886af4d24c1cf8f35 100644
--- a/tester/group_chat_tester.c
+++ b/tester/group_chat_tester.c
@@ -7260,8 +7260,8 @@ static void search_friend_chat_room_participants(void) {
resultList = linphone_magic_search_get_contact_list_from_filter(magicSearch, "", "");
if (BC_ASSERT_PTR_NOT_NULL(resultList)) {
BC_ASSERT_EQUAL((int)bctbx_list_size(resultList), 2, int, "%d");
- _check_friend_result_list_2(pauline->lc, resultList, 0, laureI, NULL, LinphoneMagicSearchSourceChatRooms);
- _check_friend_result_list_2(pauline->lc, resultList, 1, marieI, NULL, LinphoneMagicSearchSourceChatRooms);
+ _check_friend_result_list_2(pauline->lc, resultList, 0, laureI, NULL, NULL, LinphoneMagicSearchSourceChatRooms);
+ _check_friend_result_list_2(pauline->lc, resultList, 1, marieI, NULL, NULL, LinphoneMagicSearchSourceChatRooms);
bctbx_list_free_with_data(resultList, (bctbx_list_free_func)linphone_magic_search_unref);
}
diff --git a/tester/liblinphone_tester.h b/tester/liblinphone_tester.h
index eb9def6ebfec1025e8b518a1d8158a3b12e4fc15..3395edd9e1e29b58134594903c915c8ebc835906 100644
--- a/tester/liblinphone_tester.h
+++ b/tester/liblinphone_tester.h
@@ -992,7 +992,14 @@ void _check_friend_result_list_2(LinphoneCore *lc,
const unsigned int index,
const char *uri,
const char *phone,
+ const char *name,
int expected_flags);
+void _check_friend_result_list_3(LinphoneCore *lc,
+ const bctbx_list_t *resultList,
+ const unsigned int index,
+ const char *uri,
+ const char *phone,
+ const char *name);
/*Convenience function providing the path to the "empty_rc" config file*/
const char *liblinphone_tester_get_empty_rc(void);
diff --git a/tester/setup_tester.c b/tester/setup_tester.c
index 1a665aa52ef287fc737fc01a421be6aabc1f181e..13b4b57c1002350e1e4174358f538b3001083bc4 100644
--- a/tester/setup_tester.c
+++ b/tester/setup_tester.c
@@ -1011,15 +1011,15 @@ static void search_friend_in_alphabetical_order(void) {
if (BC_ASSERT_PTR_NOT_NULL(resultList)) {
BC_ASSERT_EQUAL((int)bctbx_list_size(resultList), 5, int, "%d");
- _check_friend_result_list_2(manager->lc, resultList, 0, name3SipUri, NULL,
+ _check_friend_result_list_2(manager->lc, resultList, 0, name3SipUri, NULL, NULL,
LinphoneMagicSearchSourceFriends); //"sip:stephanie@sip.example.org"
- _check_friend_result_list_2(manager->lc, resultList, 1, name2SipUri, NULL,
+ _check_friend_result_list_2(manager->lc, resultList, 1, name2SipUri, NULL, NULL,
LinphoneMagicSearchSourceFriends); //"sip:alber@sip.example.org"
- _check_friend_result_list_2(manager->lc, resultList, 2, name5SipUri, NULL,
+ _check_friend_result_list_2(manager->lc, resultList, 2, name5SipUri, NULL, NULL,
LinphoneMagicSearchSourceFriends); //"sip:gal@sip.test.org"
- _check_friend_result_list_2(manager->lc, resultList, 3, name4SipUri, NULL,
+ _check_friend_result_list_2(manager->lc, resultList, 3, name4SipUri, NULL, NULL,
LinphoneMagicSearchSourceFriends); //"sip:gauthier@sip.example.org"
- _check_friend_result_list_2(manager->lc, resultList, 4, name1SipUri, NULL,
+ _check_friend_result_list_2(manager->lc, resultList, 4, name1SipUri, NULL, NULL,
LinphoneMagicSearchSourceFriends); //"sip:toto@sip.example.org"
bctbx_list_free_with_data(resultList, (bctbx_list_free_func)linphone_search_result_unref);
}
@@ -2351,7 +2351,7 @@ static void search_friend_chat_room_remote_with_fallback(bool_t check_ldap_fallb
NULL); // "Marie" mobile
_check_friend_result_list(marie->lc, resultList, 5, "sip:Marie@ldap.example.org", NULL); // "Marie" sn
_check_friend_result_list(marie->lc, resultList, 6, "sip:Pauline@ldap.example.org", NULL); //"Pauline" sn
- _check_friend_result_list_2(marie->lc, resultList, 7, addr, NULL,
+ _check_friend_result_list_2(marie->lc, resultList, 7, addr, NULL, NULL,
LinphoneMagicSearchSourceChatRooms); // "pauline_***" *** is dynamic
_check_friend_result_list(marie->lc, resultList, 8, "sip:pauline@sip.example.org", NULL); // "Paupoche"
// marie_rc has an hardcoded friend for pauline
@@ -2717,20 +2717,20 @@ static void async_search_friend_in_sources(void) {
if (linphone_core_ldap_available(manager->lc)) {
BC_ASSERT_EQUAL((int)bctbx_list_size(resultList), 5, int, "%d");
_check_friend_result_list_2(
- manager->lc, resultList, 0, "sip:+33655667788@ldap.example.org", NULL,
+ manager->lc, resultList, 0, "sip:+33655667788@ldap.example.org", NULL, NULL,
LinphoneMagicSearchSourceLdapServers); // Laure. Note : we get it as an address because of
// linphone_ldap_params_set_sip_attribute(params,
// "mobile,telephoneNumber,homePhone,sn");
_check_friend_result_list(manager->lc, resultList, 1, "sip:Laure@ldap.example.org", "+33655667788");
_check_friend_result_list(manager->lc, resultList, 2, "sip:Pauline@ldap.example.org", NULL);
_check_friend_result_list(manager->lc, resultList, 3, "sip:pauline@sip.example.org", NULL);
- _check_friend_result_list_2(manager->lc, resultList, 4, "sip:u@sip.example.org", NULL,
+ _check_friend_result_list_2(manager->lc, resultList, 4, "sip:u@sip.example.org", NULL, NULL,
LinphoneMagicSearchSourceRequest);
} else {
BC_ASSERT_EQUAL((int)bctbx_list_size(resultList), 3, int, "%d");
_check_friend_result_list(manager->lc, resultList, 0, "sip:Laure@ldap.example.org", "+33655667788");
_check_friend_result_list(manager->lc, resultList, 1, "sip:pauline@sip.example.org", NULL);
- _check_friend_result_list_2(manager->lc, resultList, 2, "sip:u@sip.example.org", NULL,
+ _check_friend_result_list_2(manager->lc, resultList, 2, "sip:u@sip.example.org", NULL, NULL,
LinphoneMagicSearchSourceRequest);
}
bctbx_list_free_with_data(resultList, (bctbx_list_free_func)linphone_search_result_unref);
@@ -2907,23 +2907,34 @@ static void ldap_search(void) {
} else BC_ASSERT_EQUAL((int)bctbx_list_size(resultList), 0, int, "%d");
bctbx_list_free_with_data(resultList, (bctbx_list_free_func)linphone_search_result_unref);
-
if (linphone_core_ldap_available(manager->lc)) {
// Test on complex filters
LinphoneLdapParams *params = linphone_ldap_params_clone(linphone_ldap_get_params(ldap));
linphone_ldap_params_set_filter(params, "(|(sn=*%s*)(cn=*%s*))");
+ linphone_ldap_params_set_name_attribute(
+ params, "givenName+sn"); // Note: do not use gn as it seems to be rewrite with givenName by server
linphone_ldap_set_params(ldap, params);
linphone_ldap_params_unref(params);
}
- linphone_magic_search_get_contacts_list_async(magicSearch, "", "", LinphoneMagicSearchSourceLdapServers,
+ linphone_magic_search_get_contacts_list_async(magicSearch, "la", "", LinphoneMagicSearchSourceLdapServers,
LinphoneMagicSearchAggregationNone);
BC_ASSERT_TRUE(wait_for(manager->lc, NULL, &stat->number_of_LinphoneMagicSearchResultReceived, 1));
stat->number_of_LinphoneMagicSearchResultReceived = 0;
resultList = linphone_magic_search_get_last_search(magicSearch);
- check_results(manager, resultList, LinphoneMagicSearchSourceLdapServers);
+ BC_ASSERT_EQUAL((int)bctbx_list_size(resultList), 5, int, "%d");
+ _check_friend_result_list_3(manager->lc, resultList, 0, "sip:+33655667788@ldap.example.org", NULL,
+ "Ardy Laure"); // Laure:mobile
+ _check_friend_result_list_3(manager->lc, resultList, 1, "sip:Laure@ldap.example.org", "+33655667788",
+ "Ardy Laure"); // Laure:sn
+ _check_friend_result_list_3(manager->lc, resultList, 2, "sip:0212345678@ldap.example.org", NULL,
+ "Laroueverte Marie"); // Marie:telephonenumber
+ _check_friend_result_list_3(manager->lc, resultList, 3, "sip:0601234567@ldap.example.org", NULL,
+ "Laroueverte Marie"); // Marie:mobile
+ _check_friend_result_list_3(manager->lc, resultList, 4, "sip:Marie@ldap.example.org", NULL,
+ "Laroueverte Marie"); // Marie:sn
bctbx_list_free_with_data(resultList, (bctbx_list_free_func)linphone_search_result_unref);
-
+
//------------------------------------------------------------------------
linphone_magic_search_cbs_unref(searchHandler);
linphone_magic_search_unref(magicSearch);
diff --git a/tester/tester.c b/tester/tester.c
index e74f6dbf62c4b8a1cf06ccd5e48832c0c5973a54..97f02feee501e24e6a2c6f6a1763543546f948d5 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -3500,7 +3500,7 @@ void notify_presence_received_for_uri_or_tel(LinphoneCore *lc,
void _check_friend_result_list(
LinphoneCore *lc, const bctbx_list_t *resultList, const unsigned int index, const char *uri, const char *phone) {
- _check_friend_result_list_2(lc, resultList, index, uri, phone, LinphoneMagicSearchSourceAll);
+ _check_friend_result_list_2(lc, resultList, index, uri, phone, NULL, LinphoneMagicSearchSourceAll);
}
void _check_friend_result_list_2(LinphoneCore *lc,
@@ -3508,7 +3508,9 @@ void _check_friend_result_list_2(LinphoneCore *lc,
const unsigned int index,
const char *uri,
const char *phone,
+ const char *name,
int expected_flags) {
+ bool assertError = true;
if (index >= (unsigned int)bctbx_list_size(resultList)) {
ms_error("Attempt to access result to an outbound index");
return;
@@ -3529,19 +3531,24 @@ void _check_friend_result_list_2(LinphoneCore *lc,
char *fa = linphone_address_as_string_uri_only(la);
BC_ASSERT_STRING_EQUAL(fa, uri);
free(fa);
- return;
+ assertError = false;
} else if (phone) {
const LinphonePresenceModel *presence = linphone_friend_get_presence_model_for_uri_or_tel(lf, phone);
if (BC_ASSERT_PTR_NOT_NULL(presence)) {
char *contact = linphone_presence_model_get_contact(presence);
BC_ASSERT_STRING_EQUAL(contact, uri);
free(contact);
- return;
+ assertError = false;
}
}
} else if (phone) { // Check on phone number
BC_ASSERT_STRING_EQUAL(linphone_search_result_get_phone_number(sr), phone);
- return;
+ assertError = false;
+ }
+ if (name) {
+ const char *display_name = linphone_address_get_display_name(la);
+ BC_ASSERT_STRING_EQUAL(display_name, name);
+ assertError = false;
}
} else {
const bctbx_list_t *callLog = linphone_core_get_call_logs(lc);
@@ -3561,8 +3568,19 @@ void _check_friend_result_list_2(LinphoneCore *lc,
}
}
}
- BC_ASSERT(FALSE);
- ms_error("Address NULL and Presence NULL");
+ if (assertError) {
+ BC_ASSERT(FALSE);
+ ms_error("Address NULL and Presence NULL");
+ }
+}
+
+void _check_friend_result_list_3(LinphoneCore *lc,
+ const bctbx_list_t *resultList,
+ const unsigned int index,
+ const char *uri,
+ const char *phone,
+ const char *name) {
+ _check_friend_result_list_2(lc, resultList, index, uri, phone, name, LinphoneMagicSearchSourceAll);
}
void linphone_transfer_state_changed(LinphoneCore *lc, LinphoneCall *transfered, LinphoneCallState new_call_state) {