nsp: disable OneOff synthesis for non-existing GAL objects

When the NSPI ResolveNames RPC is called with an SMTP address for
which there is no match in the Global Address List, NSP normally
reports an "unresolvable" status, and the MAPI client-side
addressbook root implementation will subsequently generate a OneOff
entryid for the MAPI application with ten properties.

	(PR_ADDRTYPE, PR_DISPLAY_NAME, PR_DISPLAY_TYPE,
	PR_EMAIL_ADDRESS, PR_ENTRYID, PR_OBJECT_TYPE, PR_RECORD_KEY,
	PR_SEARCH_KEY, PR_SEND_INTERNET_ENCODING, PR_SEND_RICH_INFO)

Our NSP instead report "resolved" and provided a fake contact with a
OneOff entryid itself. This is the primary bug.

As a result, the EMSMDB connector presents the contact to the MAPI
application with 15 properties.

	(Above list plus PR_7BIT_DISPLAY_NAME, PR_AB_PROVIDERS,
	PR_DISPLAY_TYPE, PR_SMTP_ADDRESS,
	PR_TRANSMITTABLE_DISPLAY_NAME)

Our NSP module does not send along PR_SMTP_ADDRESS in the
ResolveNames response, which is the second bug.

This patch temporarily adds a configuration directive to control the
behavior of OneOff synthesis. Ultimately, synthesis should just be
deleted completely because it is wrong.

References: DESK-359

Author: grammmike

exch/nsp/main.cpp

@@ -49,6 +49,7 @@ static DCERPC_ENDPOINT *ep_6001, *ep_6004;
 static constexpr cfg_directive nsp_cfg_defaults[] = {
 	{"cache_interval", "5min", CFG_TIME, "1s", "1d"},
 	{"hash_table_size", "3000", CFG_SIZE, "1"},
+	{"nsp_synthesize_oneoff", "0", CFG_BOOL},
 	{"nsp_trace", "0", CFG_BOOL},
 	{"session_check", "1", CFG_BOOL},
 	{"x500_org_name", "Gromox default"},
@@ -66,6 +67,7 @@ static bool exch_nsp_reload(std::shared_ptr<CONFIG_FILE> cfg)
 		return false;
 	}
 	g_nsp_trace = cfg->get_ll("nsp_trace");
+	g_nsp_synthesize_oneoff = cfg->get_ll("nsp_synthesize_oneoff");
 	return true;
 }
 

exch/nsp/nsp_interface.cpp

@@ -63,7 +63,7 @@ enum {
 	TI_SCRIPT = 0x4,
 };
 
-unsigned int g_nsp_trace;
+unsigned int g_nsp_trace, g_nsp_synthesize_oneoff;
 static BOOL g_session_check;
 static bool (*verify_cpid)(uint32_t cpid);
 static decltype(mysql_adaptor_get_domain_ids) *get_domain_ids;
@@ -2493,6 +2493,8 @@ static uint32_t nsp_interface_fetch_smtp_property(
 		break;
 	case PR_EMAIL_ADDRESS:
 	case PR_EMAIL_ADDRESS_A:
+	case PR_SMTP_ADDRESS:
+	case PR_SMTP_ADDRESS_A:
 		pprop->value.pv = ndr_stack_alloc(
 			NDR_STACK_OUT, strlen(paddress) + 1);
 		if (NULL == pprop->value.pstr) {
@@ -2658,7 +2660,8 @@ int nsp_interface_resolve_namesw(NSPI_HANDLE handle, uint32_t reserved,
 			if (NULL == pnode) {
 				if (b_ambiguous) {
 					*pproptag = MID_AMBIGUOUS;
-				} else if (strncasecmp(pstrs->ppstr[i], "=SMTP:", 6) == 0) {
+				} else if (g_nsp_synthesize_oneoff &&
+				    strncasecmp(pstrs->ppstr[i], "=SMTP:", 6) == 0) {
 					prow = common_util_proprowset_enlarge(*pprows);
 					if (NULL == prow || NULL ==
 					    common_util_propertyrow_init(prow)) {

exch/nsp/nsp_interface.hpp

@@ -28,4 +28,4 @@ extern int nsp_interface_resolve_namesw(NSPI_HANDLE, uint32_t reserved, const ST
 /* clean NSPI_HANDLE by system, not operation of interface */
 void nsp_interface_unbind_rpc_handle(uint64_t hrpc);
 
-extern unsigned int g_nsp_trace;
+extern unsigned int g_nsp_trace, g_nsp_synthesize_oneoff;