graham/prop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(aprs): tighten Q-construct allowlist and broaden WIDE/TRACE alias regex

Browse source 
Q-construct now matches the explicit APRS-IS set (qAC/qAX/qAU/qAo/qAO/
qAS/qAr/qAR/qAZ/qAI) instead of any qA[A-Za-z]. WIDE/TRACE n-N now allows
n and N up to 7 per the APRS New-N paradigm (was [12]).
This commit is contained in:
Graham McIntire 2026-05-01 12:43:23 -05:00
parent 4759d1313e
commit f4a7696cf2
No known key found for this signature in database
GPG key ID: F4ABF488E6029E59
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/microwaveprop/aprs/path_parser.ex
View file

@ -36,9 +36,12 @@ defmodule Microwaveprop.Aprs.PathParser do
heard_at: DateTime.t()
}
@alias_regex ~r/^(WIDE[12](-[0-9])?|TRACE[12](-[0-9])?|RELAY|ECHO|GATE|NOGATE|RFONLY)$/
# WIDEn-N / TRACEn-N allow n and N up to 7 per the APRS New-N paradigm.
@alias_regex ~r/^(WIDE[1-7](-[1-7])?|TRACE[1-7](-[1-7])?|RELAY|ECHO|GATE|NOGATE|RFONLY)$/
@callsign_regex ~r/^[A-Z0-9]{1,2}[0-9][A-Z]{1,3}(-[0-9]{1,2})?$/
@q_construct_regex ~r/^qA[A-Za-z]$/
# Explicit allowlist of real APRS-IS Q-constructs (RFC qAR/qAC/qAo/etc.)
# rather than `qA[A-Za-z]` which would over-match `qAa`, `qAd`, …
@q_constructs ~w(qAC qAX qAU qAo qAO qAS qAr qAR qAZ qAI)
@spec parse_hops(
sender_callsign :: String.t(),
@ -72,7 +75,7 @@ defmodule Microwaveprop.Aprs.PathParser do
defp classify(token) do
cond do
Regex.match?(@q_construct_regex, token) -> :q_construct
token in @q_constructs -> :q_construct
token in ["TCPIP", "TCPXX"] -> :internet
Regex.match?(@alias_regex, token) -> :alias
Regex.match?(@callsign_regex, token) -> :callsign