mirror of
https://dev.iopsys.eu/feed/iopsys.git
synced 2025-12-10 07:44:50 +01:00
118 lines
4.2 KiB
Diff
118 lines
4.2 KiB
Diff
diff --git a/src/core/device.h b/src/core/device.h
|
|
index 5e367b7..db154a5 100644
|
|
--- a/src/core/device.h
|
|
+++ b/src/core/device.h
|
|
@@ -330,6 +330,10 @@ int DEVICE_MTP_ValidateMqttReference(dm_req_t *req, char *value);
|
|
void DEVICE_CONTROLLER_SetRolesFromMqtt(int mqtt_instance, int role_instance);
|
|
char *DEVICE_CONTROLLER_GetControllerTopic(int mqtt_instance);
|
|
|
|
+#ifdef OBUSPA_CONTROLLER_MTP_VERIFY
|
|
+bool DEVICE_CONTROLLER_IsMTPAllowed(char *endpoint_id, mtp_reply_to_t *mrt);
|
|
+#endif
|
|
+
|
|
#ifndef REMOVE_USP_BROKER
|
|
int DEVICE_SUBSCRIPTION_RouteNotification(Usp__Msg *usp, int instance);
|
|
bool DEVICE_SUBSCRIPTION_MarkVendorLayerSubs(int broker_instance, subs_notify_t notify_type, char *path, int group_id);
|
|
diff --git a/src/core/device_controller.c b/src/core/device_controller.c
|
|
index 97ca11d..19c91f1 100644
|
|
--- a/src/core/device_controller.c
|
|
+++ b/src/core/device_controller.c
|
|
@@ -952,6 +952,78 @@ int DEVICE_CONTROLLER_QueueBinaryMessage(mtp_send_item_t *msi, char *endpoint_id
|
|
return USP_ERR_OK;
|
|
}
|
|
|
|
+#ifdef OBUSPA_CONTROLLER_MTP_VERIFY
|
|
+/*********************************************************************//**
|
|
+**
|
|
+** DEVICE_CONTROLLER_IsMTPAllowed
|
|
+**
|
|
+** Determines whether an MTP is allowed to be used by the specified controller
|
|
+** This function is used by ValidateUspRecord() to determine whether to process a received USP message
|
|
+**
|
|
+** \param endpoint_id - Endpoint ID of controller that sent a USP message
|
|
+** \param mrt - pointer to structure specifying on which MTP the message was received
|
|
+**
|
|
+** \return true if the MTP is allowed, false otherwise
|
|
+**
|
|
+**************************************************************************/
|
|
+bool DEVICE_CONTROLLER_IsMTPAllowed(char *endpoint_id, mtp_reply_to_t *mrt)
|
|
+{
|
|
+ controller_t *cont = FindEnabledControllerByEndpointId(endpoint_id);
|
|
+ controller_mtp_t *mtp;
|
|
+
|
|
+ // Disallow if no controller instance is found
|
|
+ if (cont == NULL)
|
|
+ {
|
|
+ return false;
|
|
+ }
|
|
+
|
|
+ mtp = FindFirstEnabledMtp(cont, mrt->protocol);
|
|
+
|
|
+#ifdef ENABLE_WEBSOCKETS
|
|
+ // Allow websocket server if no other MTP is configured
|
|
+ if ((mrt->protocol == kMtpProtocol_WebSockets) && (mrt->wsserv_conn_id != INVALID))
|
|
+ {
|
|
+ return mtp == NULL;
|
|
+ }
|
|
+#endif
|
|
+
|
|
+ // Disallow if there is no MTP configured with matching protocol
|
|
+ if ((mtp == NULL) || (mtp->protocol != mrt->protocol))
|
|
+ {
|
|
+ return false;
|
|
+ }
|
|
+
|
|
+ // Check that the configured MTP matches the MTP on which the message was received
|
|
+ switch(mtp->protocol)
|
|
+ {
|
|
+#ifndef DISABLE_STOMP
|
|
+ case kMtpProtocol_STOMP:
|
|
+ return mtp->stomp_connection_instance == mrt->stomp_instance;
|
|
+#endif
|
|
+
|
|
+#ifdef ENABLE_COAP
|
|
+ case kMtpProtocol_CoAP:
|
|
+ return true; // More detailed checks are not implemented for CoAP
|
|
+#endif
|
|
+
|
|
+#ifdef ENABLE_MQTT
|
|
+ case kMtpProtocol_MQTT:
|
|
+ return mtp->mqtt_connection_instance == mrt->mqtt_instance;
|
|
+#endif
|
|
+
|
|
+#ifdef ENABLE_WEBSOCKETS
|
|
+ case kMtpProtocol_WebSockets:
|
|
+ return (mrt->wsclient_cont_instance == cont->instance) && (mrt->wsclient_mtp_instance == mtp->instance);
|
|
+#endif
|
|
+ default:
|
|
+ TERMINATE_BAD_CASE(mtp->protocol);
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ return false;
|
|
+}
|
|
+#endif
|
|
+
|
|
/*********************************************************************//**
|
|
**
|
|
** DEVICE_CONTROLLER_IsMTPConfigured
|
|
diff --git a/src/core/msg_handler.c b/src/core/msg_handler.c
|
|
index 2a04d39..0b3074b 100644
|
|
--- a/src/core/msg_handler.c
|
|
+++ b/src/core/msg_handler.c
|
|
@@ -1206,6 +1206,15 @@ int ValidateUspRecord(UspRecord__Record *rec, mtp_conn_t *mtpc)
|
|
usp_service_instance = USP_BROKER_GetUspServiceInstance(rec->from_id, 0);
|
|
#endif
|
|
|
|
+#ifdef OBUSPA_CONTROLLER_MTP_VERIFY
|
|
+ // Exit if the controller is not allowed to use the MTP on which the message was received
|
|
+ if (DEVICE_CONTROLLER_IsMTPAllowed(rec->from_id, mrt) == false)
|
|
+ {
|
|
+ USP_ERR_SetMessage("%s: Ignoring message from endpoint_id=%s (unauthorized MTP)", __FUNCTION__, rec->from_id);
|
|
+ return USP_ERR_PERMISSION_DENIED;
|
|
+ }
|
|
+#endif
|
|
+
|
|
// Exit if the endpoint sending the message is unknown
|
|
cur_msg_controller_instance = DEVICE_CONTROLLER_FindInstanceByEndpointId(rec->from_id);
|
|
if ((cur_msg_controller_instance == INVALID) && (usp_service_instance == INVALID))
|