Skip to content

Upstream merge 2026-09-28 - #323

Merged
miles-grant-ibigroup merged 86 commits into
ibi-dev-2.xfrom
upstream-merge-2026-09-28
Sep 28, 2026
Merged

miles-grant-ibigroup merged 86 commits into
ibi-dev-2.xfrom
upstream-merge-2026-09-28

Conversation

@leonardehrenfried

Copy link
Copy Markdown

This one add changes to the ORCA fare calculator courtesy of @daniel-heppner-ibigroup.

ricardovargasri and others added 30 commits September 2, 2026 18:38
The TRIAS endpoint ran the request body through an XSLT transformer built
from an unhardened TransformerFactory, so a DOCTYPE declaring an external
entity was resolved while parsing: an anonymous caller could read local
files and make the server issue requests to internal services (XXE).

Requests are now read through a SAX reader that rejects a document type
declaration outright, which neither the OJP nor the TRIAS profile allows.
The OJP endpoint only avoided the same problem because of a default in the
JAXB implementation; it now goes through the same reader.
…/test-dependencies

Update Test dependencies
Anyone with triage access to the upstream repository can label a PR, and a
labeled PR is merged, built and released by a fork's release workflow
without further review.

The GraphQL query that lists the labeled PRs now also reads the labeling
events, and a new optional config `include_prs_labelers` lists the GitHub
logins allowed to set the `include_prs_label`. The release stops before
anything is merged if the last user who set the label on a PR is not in the
list. The head read together with the label is verified when the PR is
fetched, so the code merged is the code that was listed. The API token is
removed from the environment after the query, so Maven does not inherit it
when testing the merged PRs.

Omitting the config keeps the current behaviour, with a warning.
…-trias-xxe

Harden XML document parsing in OJP and TRIAS requests
…el-osm-decoding

Decode OSM PBF data in parallel
…-file

Verify who labeled the PRs merged by the custom release script
…up-island-pruning

Use custom collections to speed up island pruning
t2gran and others added 26 commits September 22, 2026 14:46
…imes-usage

Add wildcard type parameter to `TripTimes` usages across codebase
Graph.countEdges() walks all 4.3M vertices of the Norwegian graph and
dereferences every outgoing edge array, only to format the |E| value of
the "Graph loaded." log line. Measured on 8 tst pods, this takes 248-306
ms (median 265 ms) on the main thread during startup, with 218 of 218
JFR samples in that window landing in countEdges().

The deserialized edge collection is already at hand in
SerializedGraphObject, and its size is by construction the same number,
so use it instead. The log method only reads state of the object it is
called on, so make it an instance method.
…ly-application

Only build the container image from the application module
…unt-edges

Avoid counting edges when logging the graph load status
(cherry picked from commit 7e6063c)
(cherry picked from commit d7d3c6d)
(cherry picked from commit 9b22cfb)
(cherry picked from commit 7eb8191)
…/debug-ui-dependencies-(non-major)

Update Debug UI dependencies (non-major)
…week

(sandbox) ORCA fares: add CT free fares week oct 2026
…fares

(sandbox) ORCA Fare Module: enable Monorail fares

@miles-grant-ibigroup miles-grant-ibigroup left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It works beautifully

@miles-grant-ibigroup
miles-grant-ibigroup merged commit 0b7558d into ibi-dev-2.x Sep 28, 2026
16 checks passed
@miles-grant-ibigroup
miles-grant-ibigroup deleted the upstream-merge-2026-09-28 branch September 28, 2026 16:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.