zcore: add logon_np ZRPC

References: GXL-487, GXH-129, DESK-1731, DESK-2542, DESK-3393, DESK-3799

Author: jengelh

exch/zcore/names.cpp

@@ -103,14 +103,15 @@ static constexpr const char *zcore_rpc_names[] = {
 	E(logon_token),
 	E(getuserfreebusy),
 	E(getuserfreebusyical),
+	E(logon_np),
 };
 #undef E
 #undef EXP
 
 const char *zcore_rpc_idtoname(zcore_callid i)
 {
 	auto j = static_cast<uint8_t>(i);
-	static_assert(std::size(zcore_rpc_names) == static_cast<uint8_t>(zcore_callid::getuserfreebusyical) + 1);
+	static_assert(std::size(zcore_rpc_names) == static_cast<uint8_t>(zcore_callid::logon_np) + 1);
 	auto s = j < std::size(zcore_rpc_names) ? zcore_rpc_names[j] : nullptr;
 	return znul(s);
 }

exch/zcore/rpc_ext.cpp

@@ -1712,6 +1712,7 @@ pack_result rpc_ext_pull_request(const BINARY *pbin_in,
 	E(logon_token)
 	E(getuserfreebusy)
 	E(getuserfreebusyical)
+	E(logon_np)
 #undef E
 	default:
 		return pack_result::bad_switch;
@@ -1831,6 +1832,7 @@ pack_result rpc_ext_push_response(const zcresp *presponse, BINARY *pbin_out)
 	E(logon_token)
 	E(getuserfreebusy)
 	E(getuserfreebusyical)
+	E(logon_np)
 #undef E
 	default:
 		return pack_result::bad_switch;

exch/zcore/zserver.cpp

@@ -636,6 +636,19 @@ ec_error_t zs_logon(const char *username, const char *password,
 	return zs_logon_phase2(std::move(mres), phsession);
 }
 
+ec_error_t zs_logon_np(const char *username, const char *password,
+    const char *rhost, uint32_t flags, GUID *phsession)
+{
+	sql_meta_result mres{};
+	auto ret = mysql_adaptor_meta(username, WANTPRIV_METAONLY, mres);
+	if (ret != 0) {
+		mlog(LV_WARN, "rhost=[%s]:0 user=%s zs_logon_np rejected: %s",
+			znul(rhost), username, mres.errstr.c_str());
+		return ecLoginFailure;
+	}
+	return zs_logon_phase2(std::move(mres), phsession);
+}
+
 ec_error_t zs_logon_token(const char *token, const char *rhost, GUID *phsession)
 {
 	sql_meta_result mres{};

exch/zcore/zserver.hpp

@@ -60,6 +60,7 @@ extern void zs_notification_proc(const char *dir, BOOL table, uint32_t notify_id
 extern USER_INFO *zs_get_info();
 extern USER_INFO_REF zs_query_session(GUID);
 extern ec_error_t zs_logon_token(const char *token, const char *rhost, GUID *ses);
+extern ec_error_t zs_logon_np(const char *username, const char *password, const char *rhost, uint32_t flags, GUID *ses);
 extern ec_error_t zs_logon(const char *username, const char *password, const char *rhost, uint32_t flags, GUID *ses);
 extern ec_error_t zs_checksession(GUID ses);
 extern ec_error_t zs_uinfo(const char *username, BINARY *entryid, char **dispname, char **x500dn, uint32_t *priv_bits);

include/gromox/zcore_client.hpp

@@ -101,5 +101,6 @@ ZCIDL(essdn_to_username, (const char *essdn, IDLOUT char **username))
 ZCIDL(logon_token, (const char *token, const char *rhost, IDLOUT GUID *hsession))
 ZCIDL(getuserfreebusy, (GUID hsession, BINARY entryid, time_t starttime, time_t endtime, IDLOUT std::vector<freebusy_event> *fb_events))
 ZCIDL(getuserfreebusyical, (GUID hsession, BINARY entryid, time_t starttime, time_t endtime, IDLOUT BINARY *ical_bin))
+ZCIDL(logon_np, (const char *username, const char *password, const char *rhost, uint32_t flags, IDLOUT GUID *hsession))
 #undef ZCIDL
 #undef IDLOUT

include/gromox/zcore_rpc.hpp

@@ -104,6 +104,7 @@ enum class zcore_callid : uint8_t {
 	logon_token = 0x5a,
 	getuserfreebusy = 0x5b,
 	getuserfreebusyical = 0x5c,
+	logon_np = 0x5d,
 	/* update exch/zcore/names.cpp! */
 };
 
@@ -124,6 +125,7 @@ struct zcreq_logon final : public zcreq {
 	char *rhost;
 	uint32_t flags;
 };
+using zcreq_logon_np = zcreq_logon;
 
 struct zcreq_checksession final : public zcreq {
 	GUID hsession;
@@ -926,6 +928,7 @@ using zcresp_submitmessage = zcresp;
 using zcresp_unadvise = zcresp;
 using zcresp_unloadobject = zcresp;
 using zcresp_vcftomessage = zcresp;
+using zcresp_logon_np = zcresp_logon;
 
 enum {
 	MXF_UNWRAP_SMIME_CLEARSIGNED = 0x1U,