Skip to content

Convert http to https where possible and labeled with NOSONAR when not #33

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
jdw-creare merged 1 commit into from
Jun 9, 2026
Merged

Convert http to https where possible and labeled with NOSONAR when not #33

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
2 changes: 1 addition & 1 deletion ogc/edr/edr_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ def _instance_parameters(
"label": {"en": value["title"]},
"symbol": {
"value": value["x-ogc-unit"],
"type": "http://www.opengis.net/def/uom/UCUM/",
"type": "http://www.opengis.net/def/uom/UCUM/", # NOSONAR(S5332) - This is part of the EDR specification
},
},
}
Expand Down
6 changes: 3 additions & 3 deletions ogc/edr/test/test_edr_routes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def mock_request(request_args: Dict[str, Any] | None = None) -> APIRequest:
Mock API request for route testing.
"""
request_args = request_args if request_args is not None else {}
environ = create_environ(base_url="http://127.0.0.1:5000/ogc/edr")
environ = create_environ(base_url="https://127.0.0.1:5000/ogc/edr")
request = Request(environ)
request.args = ImmutableMultiDict(request_args.items())
return APIRequest(request, ["en"])
Expand Down Expand Up @@ -387,8 +387,8 @@ def test_edr_routes_collection_query_missing_parameter(

def test_edr_routes_request_url_updates_configuration_url():
"""Test the EDR routes request base URL updates the configuration URL."""
request_url = "http://test:5000/ogc/edr/static/img/logo.png"
expected_config_url = "http://test:5000/ogc/edr"
request_url = "https://test:5000/ogc/edr/static/img/logo.png"
expected_config_url = "https://test:5000/ogc/edr"
request = mock_request({"base_url": request_url})
edr_routes = EdrRoutes(layers=[])

Expand Down
12 changes: 9 additions & 3 deletions ogc/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,15 @@
# Settings applied around the OGC server package.
crs_84 = "crs:84"
epsg_4326 = "epsg:4326"
crs_84_uri_format = "http://www.opengis.net/def/crs/OGC/1.3/CRS84"
crs_84h_uri_format = "http://www.opengis.net/def/crs/OGC/0/CRS84h"
epsg_4326_uri_format = "http://www.opengis.net/def/crs/EPSG/0/4326"
crs_84_uri_format = (
"http://www.opengis.net/def/crs/OGC/1.3/CRS84" # NOSONAR(S5332) - This is part of the EDR specification
)
crs_84h_uri_format = (
"http://www.opengis.net/def/crs/OGC/0/CRS84h" # NOSONAR(S5332) - This is part of the EDR specification
)
epsg_4326_uri_format = (
"http://www.opengis.net/def/crs/EPSG/0/4326" # NOSONAR(S5332) - This is part of the EDR specification
)

# Default/Supported WMS CRS/SRS
WMS_CRS = {
Expand Down
Loading