Implement dsn~usubscription-fetch-subscribers-invalid-topic (eclipse-uprotocol#22)

* update to use latest up-spec version
* Implement dsn~usubscription-fetch-subscribers-invalid-topic

Author: AnotherDaniel

up-subscription/src/common/helpers.rs

@@ -89,3 +89,31 @@ pub(crate) fn duration_until_timestamp(future_timestamp_millis: u128) -> Option<
         None // Timestamp is in the past
     }
 }
+
+// Validate that a topic URI
+//  * is a valid uProtocol URI and
+//  * does not contain a _wildcard_ authority and
+//  * does not contain a _wildcard_ uEntity instance (`ue_id`) and
+//  * does not contain a _wildcard_ resource ID
+pub(crate) fn validate_uri(topic: &UUri) -> Result<(), ServiceInvocationError> {
+    topic
+        .check_validity()
+        .map_err(|e| ServiceInvocationError::InvalidArgument(format!("Invalid topic URI {e}")))?;
+    if topic.has_wildcard_authority() {
+        return Err(ServiceInvocationError::InvalidArgument(
+            "Topic URI with wildcard authority".to_string(),
+        ));
+    };
+    if topic.has_wildcard_entity_instance() {
+        return Err(ServiceInvocationError::InvalidArgument(
+            "Topic URI with wildcard entity instance".to_string(),
+        ));
+    };
+    if topic.has_wildcard_resource_id() {
+        return Err(ServiceInvocationError::InvalidArgument(
+            "Topic URI with wildcard resource id".to_string(),
+        ));
+    };
+
+    Ok(())
+}

up-subscription/src/handlers/fetch_subscribers.rs

@@ -64,6 +64,10 @@ impl RequestHandler for FetchSubscribersRequestHandler {
             ));
         };
 
+        // topic input validation
+        // [impl->dsn~usubscription-fetch-subscribers-invalid-topic~1]
+        helpers::validate_uri(&topic)?;
+
         // Interact with subscription manager backend
         let (respond_to, receive_from) = oneshot::channel::<SubscribersResponse>();
         let se = SubscriptionEvent::FetchSubscribers {
@@ -111,8 +115,11 @@ impl RequestHandler for FetchSubscribersRequestHandler {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use test_case::test_case;
     use tokio::sync::mpsc::{self};
 
+    use up_rust::UUri;
+
     use crate::{helpers, tests::test_lib};
 
     // [utest->dsn~usubscription-fetch-subscribers-protobuf~1]
@@ -123,7 +130,6 @@ mod tests {
         // create request and other required object(s)
         let fetch_subscribers_request = FetchSubscribersRequest {
             topic: Some(test_lib::helpers::local_topic1_uri()).into(),
-            offset: Some(42),
             ..Default::default()
         };
         let request_payload =
@@ -156,13 +162,9 @@ mod tests {
         let subscription_event = subscription_receiver.recv().await.unwrap();
         match subscription_event {
             SubscriptionEvent::FetchSubscribers {
-                topic,
-                offset,
-                respond_to,
+                topic, respond_to, ..
             } => {
                 assert_eq!(topic, test_lib::helpers::local_topic1_uri());
-                assert_eq!(offset, Some(42));
-
                 let _ = respond_to.send(SubscribersResponse::default());
             }
             _ => panic!("Wrong event type"),
@@ -288,4 +290,58 @@ mod tests {
             _ => panic!("Wrong error type"),
         }
     }
+
+    // [utest->dsn~usubscription-fetch-subscribers-invalid-topic~1]
+    #[test_case(UUri::default(); "Bad topic UUri")]
+    #[test_case(UUri {
+            authority_name: String::from("*"),
+            ue_id: test_lib::helpers::TOPIC_LOCAL1_ID,
+            ue_version_major: test_lib::helpers::TOPIC_LOCAL1_VERSION as u32,
+            resource_id: test_lib::helpers::TOPIC_LOCAL1_RESOURCE as u32,
+            ..Default::default()
+        }; "Wildcard authority in topic UUri")]
+    #[test_case(UUri {
+            authority_name: test_lib::helpers::LOCAL_AUTHORITY.into(),
+            ue_id: 0xFFFF_0000,
+            ue_version_major: test_lib::helpers::TOPIC_LOCAL1_VERSION as u32,
+            resource_id: test_lib::helpers::TOPIC_LOCAL1_RESOURCE as u32,
+            ..Default::default()
+        }; "Wildcard entity id in topic UUri")]
+    #[test_case(UUri {
+            authority_name: test_lib::helpers::LOCAL_AUTHORITY.into(),
+            ue_id: test_lib::helpers::TOPIC_LOCAL1_ID,
+            ue_version_major: test_lib::helpers::TOPIC_LOCAL1_VERSION as u32,
+            resource_id: 0x0000_FFFF,
+            ..Default::default()
+        }; "Wildcard resource id in topic UUri")]
+    #[tokio::test]
+    async fn test_invalid_topic_uri(topic: UUri) {
+        helpers::init_once();
+
+        // create request and other required object(s)
+        let subscribe_request = test_lib::helpers::subscription_request(topic, None);
+        let request_payload = UPayload::try_from_protobuf(subscribe_request.clone()).unwrap();
+        let message_attributes = UAttributes {
+            source: Some(test_lib::helpers::subscriber_uri1()).into(),
+            ..Default::default()
+        };
+        let (subscription_sender, _) = mpsc::channel::<SubscriptionEvent>(1);
+
+        // create handler and perform tested operation
+        let request_handler = FetchSubscribersRequestHandler::new(subscription_sender);
+
+        let result = request_handler
+            .handle_request(
+                up_rust::core::usubscription::RESOURCE_ID_FETCH_SUBSCRIBERS,
+                &message_attributes,
+                Some(request_payload),
+            )
+            .await;
+
+        assert!(result.is_err());
+        match result.unwrap_err() {
+            ServiceInvocationError::InvalidArgument(_) => {}
+            _ => panic!("Wrong error type"),
+        }
+    }
 }

up-subscription/src/tests/test_lib.rs

@@ -160,9 +160,9 @@ pub(crate) mod helpers {
     pub(crate) const LOCAL_AUTHORITY: &str = "LOCAL";
     pub(crate) const REMOTE_AUTHORITY: &str = "REMOTE";
 
-    const SUBSCRIBER1_ID: u32 = 0x0000_1000;
-    const SUBSCRIBER1_VERSION: u8 = 0x01;
-    const SUBSCRIBER1_RESOURCE: u16 = 0x1000;
+    pub(crate) const SUBSCRIBER1_ID: u32 = 0x0000_1000;
+    pub(crate) const SUBSCRIBER1_VERSION: u8 = 0x01;
+    pub(crate) const SUBSCRIBER1_RESOURCE: u16 = 0x1000;
 
     const SUBSCRIBER2_ID: u32 = 0x0000_2000;
     const SUBSCRIBER2_VERSION: u8 = 0x01;
@@ -179,9 +179,9 @@ pub(crate) mod helpers {
     #[allow(dead_code)] // final decision on removing this to happen after functional spec alignment is complete
     const NOTIFICATION_TOPIC_RESOURCE: u16 = 0x8001;
 
-    const TOPIC_LOCAL1_ID: u32 = 0x0010_0000;
-    const TOPIC_LOCAL1_VERSION: u8 = 0x01;
-    const TOPIC_LOCAL1_RESOURCE: u16 = 0x8AC7;
+    pub(crate) const TOPIC_LOCAL1_ID: u32 = 0x0010_0000;
+    pub(crate) const TOPIC_LOCAL1_VERSION: u8 = 0x01;
+    pub(crate) const TOPIC_LOCAL1_RESOURCE: u16 = 0x8AC7;
 
     const TOPIC_LOCAL2_ID: u32 = 0x0020_0000;
     const TOPIC_LOCAL2_VERSION: u8 = 0x01;