Graham McIntire
b56a988e52
Instead of playing whack-a-mole with individual fields, this implements a proper whitelist approach that only allows fields defined in the Packet schema. - Created PacketFieldWhitelist module with all 78 valid packet fields - Filters out ANY field not in the schema, preventing future errors - Handles both atom and string keys - Includes debug helpers to identify filtered fields This definitively fixes packet insertion failures by ensuring only valid database fields are passed to Repo.insert_all, regardless of what the APRS parser sends. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
118 lines
2.3 KiB
Elixir
118 lines
2.3 KiB
Elixir
defmodule Aprsme.PacketFieldWhitelist do
|
|
@moduledoc """
|
|
Maintains a whitelist of allowed fields for APRS packets based on the database schema.
|
|
This ensures only valid fields are passed to database operations.
|
|
"""
|
|
|
|
# Define all valid fields from the Packet schema
|
|
# This list is derived from the schema definition in lib/aprsme/packet.ex
|
|
# Using string list to handle both atom and string keys consistently
|
|
@allowed_fields ~w[
|
|
addressee
|
|
alive
|
|
altitude
|
|
aprs_messaging
|
|
base_callsign
|
|
body
|
|
comment
|
|
course
|
|
dao
|
|
data_type
|
|
destination
|
|
device_identifier
|
|
dstcallsign
|
|
equipment_type
|
|
format
|
|
has_position
|
|
has_weather
|
|
header
|
|
humidity
|
|
information_field
|
|
is_item
|
|
is_object
|
|
item_name
|
|
lat
|
|
location
|
|
lon
|
|
luminosity
|
|
manufacturer
|
|
message_number
|
|
message_text
|
|
messaging
|
|
object_name
|
|
origpacket
|
|
path
|
|
phg_directivity
|
|
phg_gain
|
|
phg_height
|
|
phg_power
|
|
posambiguity
|
|
position_ambiguity
|
|
posresolution
|
|
pressure
|
|
radiorange
|
|
rain_1h
|
|
rain_24h
|
|
rain_midnight
|
|
rain_since_midnight
|
|
raw_packet
|
|
received_at
|
|
region
|
|
sender
|
|
snow
|
|
speed
|
|
srccallsign
|
|
ssid
|
|
symbol_code
|
|
symbol_table_id
|
|
symbolcode
|
|
symboltable
|
|
telemetry_bits
|
|
telemetry_seq
|
|
telemetry_vals
|
|
temperature
|
|
timestamp
|
|
wind_direction
|
|
wind_gust
|
|
wind_speed
|
|
inserted_at
|
|
updated_at
|
|
]
|
|
|
|
@doc """
|
|
Returns the list of allowed field names as atoms.
|
|
"""
|
|
def allowed_fields, do: @allowed_fields
|
|
|
|
@doc """
|
|
Filters a map to only include allowed fields.
|
|
Handles both atom and string keys.
|
|
"""
|
|
def filter_fields(attrs) when is_map(attrs) do
|
|
attrs
|
|
|> Enum.filter(fn {key, _value} ->
|
|
key_str = to_string(key)
|
|
key_str in @allowed_fields
|
|
end)
|
|
|> Map.new()
|
|
end
|
|
|
|
@doc """
|
|
Checks if a field is allowed.
|
|
"""
|
|
def allowed?(field) when is_atom(field), do: to_string(field) in @allowed_fields
|
|
def allowed?(field) when is_binary(field), do: field in @allowed_fields
|
|
def allowed?(_), do: false
|
|
|
|
@doc """
|
|
Returns a list of fields that are not allowed from the given map.
|
|
Useful for debugging.
|
|
"""
|
|
def invalid_fields(attrs) when is_map(attrs) do
|
|
attrs
|
|
|> Map.keys()
|
|
|> Enum.reject(&allowed?/1)
|
|
|> Enum.map(&to_string/1)
|
|
|> Enum.sort()
|
|
end
|
|
end
|