Skip to content

Santizing error messages #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BAyotte merged 1 commit into from
May 15, 2026
Merged

Santizing error messages #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 10 additions & 5 deletions ogc/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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":
Expand All @@ -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()
Expand Down Expand Up @@ -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":
Expand All @@ -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.
Expand Down
12 changes: 8 additions & 4 deletions ogc/wmts/wmts_routes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
Loading