Skip to content

Ngwpc 9962 sanitize routes #73

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
dylanlee merged 3 commits into from
Mar 23, 2026
Merged

Ngwpc 9962 sanitize routes #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed6819c
fix: remove user-controlled data from temp file path expression
dylanlee Mar 23, 2026
c709bb1
sanitize geopackage path and change print statements to log statments
danielcumpton Mar 13, 2026
6a6f720
fix: update trivy-action to v0.35.0
dylanlee Mar 23, 2026
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 .github/workflows/cicd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ jobs:
load: true
tags: ${{ needs.setup.outputs.image_base }}/api:${{ needs.setup.outputs.test_image_tag }}
- name: Scan API container with Trivy
uses: aquasecurity/trivy-action@0.20.0
uses: aquasecurity/trivy-action@v0.35.0
with:
# Scan the locally available image
image-ref: ${{ needs.setup.outputs.image_base }}/api:${{ needs.setup.outputs.test_image_tag }}
Expand Down Expand Up @@ -158,7 +158,7 @@ jobs:
load: true
tags: ${{ needs.setup.outputs.image_base }}/dashboard:${{ needs.setup.outputs.test_image_tag }}
- name: Scan dashboard container with Trivy
uses: aquasecurity/trivy-action@0.20.0
uses: aquasecurity/trivy-action@v0.35.0
with:
# Scan the locally available image
image-ref: ${{ needs.setup.outputs.image_base }}/dashboard:${{ needs.setup.outputs.test_image_tag }}
Expand Down
15 changes: 10 additions & 5 deletions app/routers/hydrofabric/router.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import logging
import pathlib
import sqlite3
import tempfile
Expand Down Expand Up @@ -34,6 +35,9 @@
QueryIdType,
)

logger = logging.getLogger(__name__)
logger.setLevel(logging.INFO)

api_router = APIRouter(prefix="/hydrofabric")


Expand Down Expand Up @@ -94,8 +98,9 @@ async def get_hydrofabric_subset_gpkg(
**Returns:** Geopackage file (.gpkg) containing the subset data
"""
unique_id = str(uuid.uuid4())[:8]
temp_dir = pathlib.Path(tempfile.gettempdir())
tmp_path = temp_dir / f"subset_{identifier}_{unique_id}.gpkg"
temp_dir = pathlib.Path(tempfile.gettempdir()).resolve()
# Use only the UUID in the filename to avoid user-controlled data in path expressions
tmp_path = temp_dir / f"subset_{unique_id}.gpkg"

# Resolve namespace from domain/source combination (outside try block for error handling access)
try:
Expand Down Expand Up @@ -182,21 +187,21 @@ async def get_hydrofabric_subset_gpkg(
else:
nonspatial_layers[table_name] = layer_data
else:
print(f"Warning: {table_name} layer is empty")
logger.warning(f"Warning: {table_name} layer is empty")

# Write spatial layers first with pyogrio
for table_name, layer_data in spatial_layers.items():
pyogrio.write_dataframe(layer_data, tmp_path, layer=table_name)
layers_written += 1
print(f"Written spatial layer '{table_name}' with {len(layer_data)} records")
logger.info(f"Written spatial layer '{table_name}' with {len(layer_data)} records")

# Then write non-spatial layers with sqlite3
if nonspatial_layers:
conn = sqlite3.connect(tmp_path)
for table_name, layer_data in nonspatial_layers.items():
layer_data.to_sql(table_name, conn, if_exists="replace", index=False)
layers_written += 1
print(f"Written non-spatial layer '{table_name}' with {len(layer_data)} records")
logger.info(f"Written non-spatial layer '{table_name}' with {len(layer_data)} records")
conn.close()

if layers_written == 0:
Expand Down
Loading