diff --git a/ogc/core.py b/ogc/core.py index 043d90d..6d1444e 100755 --- a/ogc/core.py +++ b/ogc/core.py @@ -86,10 +86,11 @@ def get_coverage_from_id(self, identifier): for coverage in self.wcs_capabilities.coverages: if coverage.identifier == identifier: return coverage + logger.warning("OGC: get_coverage_from_id invalid identifier: %r", identifier) raise WCSException( exception_code="InvalidParameterValue", locator="COVERAGE", - exception_text="Invalid coverage {}".format(identifier), + exception_text="Invalid coverage identifier", ) def get_capabilities_wcs(self, args): @@ -172,10 +173,11 @@ def handle_wcs_kv(self, args): wcs_response = wcs_response_1_0_0 wcs_request = wcs_request_1_0_0 else: + logger.warning("OGC: handle_wcs_kv unsupported version: %r", args.get("version")) raise WCSException( exception_code="InvalidParameterValue", locator="VERSION", - exception_text="Unsupported version: %s" % (args["version"] if "version" in args else "None"), + exception_text="Unsupported version", ) if args["request"] == "DescribeCoverage": @@ -184,7 +186,8 @@ def handle_wcs_kv(self, args): elif args["request"] == "GetCoverage": return self.get_coverage_wcs(args, wcs_request) - raise WCSException(exception_text="KV Request not handled properly: " + str(args)) + logger.warning("OGC: handle_wcs_kv unhandled request args: %r", args) + raise WCSException(exception_text=INVALID_ARGUMENTS) def get_capabilities_wms(self, args): get_capabilities = wms_request_1_3_0.GetCapabilities() @@ -280,10 +283,11 @@ def handle_wms_kv(self, args): if "version" in args and args["version"] == "1.3.0": wms_request = wms_request_1_3_0 else: + logger.warning("OGC: handle_wms_kv unsupported version: %r", args.get("version")) raise WCSException( exception_code="InvalidParameterValue", locator="VERSION", - exception_text="Unsupported version: %s" % (args["version"] if "version" in args else "None"), + exception_text="Unsupported version", ) if args["request"].lower() == "getlegendgraphic": @@ -292,7 +296,8 @@ def handle_wms_kv(self, args): if args["request"].lower() == "getmap": return self.get_map(args, wms_request) - raise WCSException(exception_text="KV Request not handled properly: " + str(args)) + logger.warning("OGC: handle_wms_kv unhandled request args: %r", args) + raise WCSException(exception_text=INVALID_ARGUMENTS) def handle_wmts_kv(self, args: Dict[str, Any]) -> Dict[str, Any] | str: """Handle WMTS key value server requests if support is enabled. diff --git a/ogc/wmts/wmts_routes.py b/ogc/wmts/wmts_routes.py index 299d93a..6314c16 100644 --- a/ogc/wmts/wmts_routes.py +++ b/ogc/wmts/wmts_routes.py @@ -59,7 +59,8 @@ def handle_kv(self, args: Dict[str, Any]) -> Dict[str, Any] | str: if args["request"].lower() == "gettile": return self.get_tile(args) - raise WMTSException(exception_text="KV Request not handled properly: " + str(args)) + logger.warning("OGC: handle_kv unhandled request args: %r", args) + raise WMTSException(exception_text=INVALID_ARGUMENTS) def get_coverage_from_id(self, identifier: str) -> Coverage: """Find the coverage for a given identifier. @@ -82,10 +83,11 @@ def get_coverage_from_id(self, identifier: str) -> Coverage: for coverage in self.coverages: if coverage.identifier == identifier: return coverage + logger.warning("OGC: get_coverage_from_id invalid identifier: %r", identifier) raise WMTSException( exception_code="InvalidParameterValue", locator="COVERAGE", - exception_text="Invalid coverage {}".format(identifier), + exception_text="Invalid coverage identifier", ) def get_capabilities(self, args: Dict[str, Any]) -> str: @@ -122,10 +124,11 @@ def get_capabilities(self, args: Dict[str, Any]) -> str: service_group_title=self.service_group_title, ) else: + logger.warning("OGC: get_capabilities unsupported version: %r", args.get("version")) raise WMTSException( exception_code="InvalidParameterValue", locator="VERSION", - exception_text="Unsupported version: %s" % (args["version"]), + exception_text="Unsupported version", ) try: @@ -162,10 +165,11 @@ def get_tile(self, args: Dict[str, Any]) -> Dict[str, Any]: if "version" in args and args["version"] == "1.0.0": get_tile = wmts_request_1_0_0.GetTile() else: + logger.warning("OGC: get_tile unsupported version: %r", args.get("version")) raise WMTSException( exception_code="InvalidParameterValue", locator="VERSION", - exception_text="Unsupported version: %s" % (args["version"] if "version" in args else "None"), + exception_text="Unsupported version", ) try: