Skip to content

Improve logging in RADIUS server and client #244

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
0xAX merged 1 commit into from
Apr 29, 2025
Merged

Improve logging in RADIUS server and client #244

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
12 changes: 10 additions & 2 deletions src/eradius_client.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,8 +435,15 @@ store_upstream_servers(Server) ->
store_radius_server_from_pool(Addr, Port, Retries) when is_tuple(Addr) and is_integer(Port) and is_integer(Retries) ->
ets:insert(?MODULE, {{Addr, Port}, Retries, Retries});
store_radius_server_from_pool(Addr, Port, Retries) when is_list(Addr) and is_integer(Port) and is_integer(Retries) ->
IP = get_ip(Addr),
ets:insert(?MODULE, {{IP, Port}, Retries, Retries});
try
IP = get_ip(Addr),
ets:insert(?MODULE, {{IP, Port}, Retries, Retries})
catch error:badarg ->
?LOG(error, "Can't resolve hostname - ~p", [Addr]),
% Throw again badarg as it was before to catch non-resolvable hostname during eradius start-up
% and exit early to not lost secondary pools.
error(badarg)
end;
store_radius_server_from_pool(Addr, Port, Retries) ->
?LOG(error, "bad RADIUS upstream server specified in RADIUS servers pool configuration ~p", [{Addr, Port, Retries}]),
error(badarg).
Expand Down Expand Up @@ -630,6 +637,7 @@ find_suitable_peer([{Host, Port, Secret, Opts} | Pool]) when is_list(Host) ->
IP = get_ip(Host),
find_suitable_peer([{IP, Port, Secret, Opts} | Pool])
catch _:_ ->
?LOG(error, "Can't resolve hostname - ~p", [Host]),
% can't resolve ip by some reasons, just ignore it
find_suitable_peer(Pool)
end;
Expand Down
6 changes: 2 additions & 4 deletions src/eradius_server.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,6 @@ do_radius(ServerPid, ServerName, ReqKey, Handler = {HandlerMod, _}, NasProp, {ud
Nodes = eradius_node_mon:get_module_nodes(HandlerMod),
case run_handler(Nodes, NasProp, Handler, EncRequest) of
{reply, EncReply, {ReqCmd, RespCmd}, Request} ->
?LOG(debug, "~s From: ~s INF: Sending response for request ~p",
[printable_peer(ServerIP, Port), printable_peer(FromIP, FromPort), ReqKey]),
TS2 = erlang:monotonic_time(),
inc_counter({ReqCmd, RespCmd}, ServerName, NasProp, TS2 - TS1, Request),
gen_udp:send(Socket, FromIP, FromPort, EncReply),
Expand Down Expand Up @@ -301,7 +299,7 @@ handle_request({HandlerMod, HandlerArg}, NasProp = #nas_prop{secret = Secret, na
case eradius_lib:decode_request(EncRequest, Secret) of
Request = #radius_request{} ->
Sender = {ServerIP, Port, Request#radius_request.reqid},
?LOG(info, "~s", [eradius_log:collect_message(Sender, Request)],
?LOG(debug, "~s", [eradius_log:collect_message(Sender, Request)],
maps:from_list(eradius_log:collect_meta(Sender, Request))),
eradius_log:write_request(Sender, Request),
apply_handler_mod(HandlerMod, HandlerArg, Request, NasProp);
Expand Down Expand Up @@ -336,7 +334,7 @@ apply_handler_mod(HandlerMod, HandlerArg, Request, NasProp) ->
EncReply = eradius_lib:encode_reply(Request#radius_request{cmd = ReplyCmd, attrs = ReplyAttrs,
msg_hmac = Request#radius_request.msg_hmac or MsgHMAC or (size(EAPmsg) > 0),
eap_msg = EAPmsg}),
?LOG(info, "~s", [eradius_log:collect_message(Sender, Reply)],
?LOG(debug, "~s", [eradius_log:collect_message(Sender, Reply)],
maps:from_list(eradius_log:collect_meta(Sender, Reply))),
eradius_log:write_request(Sender, Reply),
{reply, EncReply, {Request#radius_request.cmd, ReplyCmd}, Request};
Expand Down
Loading