diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/common/misbehavior.py b/monitoring/uss_qualifier/scenarios/astm/netrid/common/misbehavior.py
index a6fada8caf..abfa9db09c 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/common/misbehavior.py
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/common/misbehavior.py
@@ -1,23 +1,16 @@
import time
import traceback
-import uuid
from typing import List
import arrow
import s2sphere
-from implicitdict import ImplicitDict
from loguru import logger
from requests.exceptions import RequestException
-from uas_standards.interuss.automated_testing.rid.v1.injection import ChangeTestResponse
from monitoring.monitorlib import fetch
from monitoring.monitorlib.fetch import rid
from monitoring.monitorlib.infrastructure import UTMClientSession
from monitoring.monitorlib.rid import RIDVersion
-from monitoring.monitorlib.rid_automated_testing.injection_api import (
- CreateTestParameters,
-)
-from monitoring.monitorlib.rid_automated_testing.injection_api import TestFlight
from monitoring.uss_qualifier.common_data_definitions import Severity
from monitoring.uss_qualifier.resources.astm.f3411.dss import DSSInstancesResource
from monitoring.uss_qualifier.resources.netrid import (
@@ -25,18 +18,11 @@
NetRIDServiceProviders,
EvaluationConfigurationResource,
)
-from monitoring.uss_qualifier.scenarios.astm.netrid import display_data_evaluator
from monitoring.uss_qualifier.scenarios.astm.netrid.common import nominal_behavior
-from monitoring.uss_qualifier.scenarios.astm.netrid.injected_flight_collection import (
- InjectedFlightCollection,
-)
from monitoring.uss_qualifier.scenarios.astm.netrid.injection import (
InjectedFlight,
InjectedTest,
)
-from monitoring.uss_qualifier.scenarios.astm.netrid.virtual_observer import (
- VirtualObserver,
-)
from monitoring.uss_qualifier.scenarios.scenario import GenericTestScenario
@@ -167,52 +153,56 @@ def _evaluate_and_test_authentication(
no flights were yet returned by the authenticated queries.
"""
- with self.check("Missing credentials") as check:
- # We grab all flights from the SP's. This is authenticated
- # and is expected to succeed
- sp_observation = rid.all_flights(
- rect,
- include_recent_positions=True,
- get_details=True,
- rid_version=self._rid_version,
- session=self._dss.client,
- server_id=self._dss.participant_id,
- )
- # We fish out the queries that were used to grab the flights from the SP,
- # and attempt to re-query without credentials. This should fail.
- unauthenticated_session = UTMClientSession(
- prefix_url=self._dss.client.get_prefix_url(),
- auth_adapter=None,
- timeout_seconds=self._dss.client.timeout_seconds,
- )
+ # TODO smaller granularity check in here: we want to identify the exact participant that is failing
+ # to check credentials
- queries_to_repeat = list(sp_observation.uss_flight_queries.values()) + list(
- sp_observation.uss_flight_details_queries.values()
- )
+ # We grab all flights from the SP's. This is authenticated
+ # and is expected to succeed
+ sp_observation = rid.all_flights(
+ rect,
+ include_recent_positions=True,
+ get_details=True,
+ rid_version=self._rid_version,
+ session=self._dss.client,
+ server_id=self._dss.participant_id,
+ )
+ # We fish out the queries that were used to grab the flights from the SP,
+ # and attempt to re-query without credentials. This should fail.
- if len(queries_to_repeat) == 0:
- logger.debug("no flights queries to repeat at this point.")
- return False
+ unauthenticated_session = UTMClientSession(
+ prefix_url=self._dss.client.get_prefix_url(),
+ auth_adapter=None,
+ timeout_seconds=self._dss.client.timeout_seconds,
+ )
- logger.debug(
- f"about to repeat {len(queries_to_repeat)} flights queries without credentials"
- )
+ queries_to_repeat = list(sp_observation.uss_flight_queries.values()) + list(
+ sp_observation.uss_flight_details_queries.values()
+ )
- # Attempt to re-query the flights and flight details URLs:
- for fq in queries_to_repeat:
- failed_q = fetch.query_and_describe(
- client=unauthenticated_session,
- verb=fq.query.request.method,
- url=fq.query.request.url,
- json=fq.query.request.json,
- data=fq.query.request.body,
- server_id=self._dss.participant_id,
- )
- logger.info(
- f"Repeating query to {fq.query.request.url} without credentials"
- )
- server_id = fq.query.get("server_id", "unknown")
+ if len(queries_to_repeat) == 0:
+ logger.debug("no flights queries to repeat at this point.")
+ return False
+
+ logger.debug(
+ f"about to repeat {len(queries_to_repeat)} flights queries without credentials"
+ )
+
+ # Attempt to re-query the flights and flight details URLs:
+ for fq in queries_to_repeat:
+ failed_q = fetch.query_and_describe(
+ client=unauthenticated_session,
+ verb=fq.query.request.method,
+ url=fq.query.request.url,
+ json=fq.query.request.json,
+ data=fq.query.request.body,
+ server_id=self._dss.participant_id,
+ )
+ logger.info(
+ f"Repeating query to {fq.query.request.url} without credentials"
+ )
+ server_id = fq.query.get("server_id", "unknown")
+ with self.check("Missing credentials", [server_id]) as check:
if failed_q.response.code not in [401, 403]:
check.record_failed(
"unauthenticated request was fulfilled",
@@ -227,7 +217,7 @@ def _evaluate_and_test_authentication(
# Keep track of the failed queries, too
self.record_query(failed_q)
- return True
+ return True
def cleanup(self):
self.begin_cleanup()
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/v19/misbehavior.md b/monitoring/uss_qualifier/scenarios/astm/netrid/v19/misbehavior.md
index 0602647f31..537364b92f 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/v19/misbehavior.md
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/v19/misbehavior.md
@@ -48,7 +48,7 @@ It then repeats the exact same request while omitting the credentials, and expec
#### Missing credentials check
-This check ensures that all requests are properly authenticated, as required by **[astm.f3411.v19.NET0500](../../../../requirements/astm/f3411/v19.md)**,
+This check ensures that all requests are properly authenticated, as required by **[astm.f3411.v19.NET0210](../../../../requirements/astm/f3411/v19.md)**,
and that requests for existing flights that are executed with missing or incorrect credentials fail.
## Cleanup
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/misbehavior.md b/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/misbehavior.md
index d94a021a73..5089d9d23c 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/misbehavior.md
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/misbehavior.md
@@ -48,7 +48,7 @@ It then repeats the exact same request while omitting the credentials, and expec
#### Missing credentials check
-This check ensures that all requests are properly authenticated, as required by **[astm.f3411.v22a.NET0500](../../../../requirements/astm/f3411/v22a.md)**,
+This check ensures that all requests are properly authenticated, as required by **[astm.f3411.v22a.NET0210](../../../../requirements/astm/f3411/v22a.md)**,
and that requests for existing flights that are executed with missing or incorrect credentials fail.
## Cleanup
diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md b/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md
index 4a00bf06f7..c354bb768e 100644
--- a/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md
+++ b/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md
@@ -21,7 +21,7 @@
| Checked in |
- astm
.f3411
.v19 |
+ astm
.f3411
.v19 |
A2-6-1,1a |
Implemented |
ASTM F3411-19 NetRID DSS interoperability |
@@ -186,6 +186,11 @@
TODO |
ASTM NetRID: Operator interactions |
+
+ | NET0210 |
+ Implemented |
+ ASTM NetRID SP clients misbehavior handling |
+
| NET0220 |
Implemented |
diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md b/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md
index b0d5e2fbc9..d605e67cea 100644
--- a/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md
+++ b/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md
@@ -21,7 +21,7 @@
Checked in |
- astm
.f3411
.v22a |
+ astm
.f3411
.v22a |
A2-6-1,1a |
Implemented |
ASTM F3411-22a NetRID DSS interoperability |
@@ -186,6 +186,11 @@
TODO |
ASTM NetRID: Operator interactions |
+
+ | NET0210 |
+ Implemented |
+ ASTM NetRID SP clients misbehavior handling |
+
| NET0220 |
Implemented |
diff --git a/monitoring/uss_qualifier/suites/uspace/network_identification.md b/monitoring/uss_qualifier/suites/uspace/network_identification.md
index ddee175bc9..b9390d4cf8 100644
--- a/monitoring/uss_qualifier/suites/uspace/network_identification.md
+++ b/monitoring/uss_qualifier/suites/uspace/network_identification.md
@@ -16,7 +16,7 @@
Checked in |
- astm
.f3411
.v22a |
+ astm
.f3411
.v22a |
A2-6-1,1a |
Implemented |
ASTM F3411-22a NetRID DSS interoperability |
@@ -181,6 +181,11 @@
TODO |
ASTM NetRID: Operator interactions |
+
+ | NET0210 |
+ Implemented |
+ ASTM NetRID SP clients misbehavior handling |
+
| NET0220 |
Implemented |
diff --git a/monitoring/uss_qualifier/suites/uspace/required_services.md b/monitoring/uss_qualifier/suites/uspace/required_services.md
index a690bb7ab8..e12bff6a33 100644
--- a/monitoring/uss_qualifier/suites/uspace/required_services.md
+++ b/monitoring/uss_qualifier/suites/uspace/required_services.md
@@ -17,7 +17,7 @@
Checked in |
- astm
.f3411
.v22a |
+ astm
.f3411
.v22a |
A2-6-1,1a |
Implemented |
ASTM F3411-22a NetRID DSS interoperability |
@@ -182,6 +182,11 @@
TODO |
ASTM NetRID: Operator interactions |
+
+ | NET0210 |
+ Implemented |
+ ASTM NetRID SP clients misbehavior handling |
+
| NET0220 |
Implemented |