Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions rust/MANIFEST.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

95 changes: 67 additions & 28 deletions rust/generated/src__video__onvif_detection.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions src/video/onvif_detection.c
Original file line number Diff line number Diff line change
Expand Up @@ -611,6 +611,19 @@ static bool extract_subscription_endpoint_reference(const char *response,
const char *name = node->attr[i];
if (strcmp(name, "xmlns") != 0 && strncmp(name, "xmlns:", 6) != 0)
continue;
/* Keep SOAP and WS-Addressing header names bound to their
* required namespaces. Camera-supplied bindings may only
* provide namespaces for reference parameter children. */
if (strcmp(name, "xmlns:s") == 0 ||
strcmp(name, "xmlns:wsa") == 0) {
const char *expected = strcmp(name, "xmlns:s") == 0 ?
"http://www.w3.org/2003/05/soap-envelope" :
"http://www.w3.org/2005/08/addressing";
if (strcmp(node->attr[i + 1], expected) != 0) ok = false;
continue;
}
if (strcmp(name, "xmlns:xml") == 0 ||
strcmp(name, "xmlns:xmlns") == 0) continue;
bool seen = false;
for (size_t j = 0; j < count; j++)
if (strcmp(name, names[j]) == 0) seen = true;
Expand Down
21 changes: 21 additions & 0 deletions tests/unit/test_onvif_transport.c
Original file line number Diff line number Diff line change
Expand Up @@ -665,13 +665,33 @@ static void test_subscription_reference_parameters_become_soap_headers(void) {
ezxml_t parsed = ezxml_parse_str(request, strlen(request));
TEST_ASSERT_NOT_NULL(parsed);
TEST_ASSERT_EQUAL_STRING("", ezxml_error(parsed));
TEST_ASSERT_NOT_NULL(child_by_local_name(child_by_local_name(parsed, "Header"),
"Token"));
ezxml_free(parsed);
free(request);
free(namespaces);
free(params);
free(address);
}

static void test_subscription_reference_cannot_rebind_soap_namespace(void) {
const char *reply =
"<s:Envelope xmlns:s=\"http://www.w3.org/2003/05/soap-envelope\" "
"xmlns:wsa=\"http://www.w3.org/2005/08/addressing\"><s:Body>"
"<CreatePullPointSubscriptionResponse><SubscriptionReference>"
"<wsa:Address>http://camera/onvif/pull</wsa:Address>"
"<wsa:ReferenceParameters xmlns:s=\"urn:wrong-soap-namespace\">"
"<s:Token>abc</s:Token></wsa:ReferenceParameters>"
"</SubscriptionReference></CreatePullPointSubscriptionResponse>"
"</s:Body></s:Envelope>";
char *address = NULL, *params = NULL, *namespaces = NULL;
TEST_ASSERT_FALSE(extract_subscription_endpoint_reference(reply, &address,
&params, &namespaces));
TEST_ASSERT_NULL(address);
TEST_ASSERT_NULL(params);
TEST_ASSERT_NULL(namespaces);
}

static void test_motion_requires_asserted_state_not_truthy_metadata(void) {
char label[32];
const char *metadata_only =
Expand Down Expand Up @@ -741,6 +761,7 @@ int main(void) {
RUN_TEST(test_motorcycle_class_precedes_bicycle_substrings);
RUN_TEST(test_malformed_motion_message_uses_truthy_fallback);
RUN_TEST(test_subscription_reference_parameters_become_soap_headers);
RUN_TEST(test_subscription_reference_cannot_rebind_soap_namespace);
RUN_TEST(test_motion_requires_asserted_state_not_truthy_metadata);
RUN_TEST(test_class_flags_ignore_camera_metadata);
return UNITY_END();
Expand Down
Loading