make code dry and update main radius module

Author: tverlaan

README.md

@@ -16,8 +16,8 @@ loop = fn(loop)->
 
   IO.puts "From #{inspect host} : \n#{inspect p, pretty: true}"
 
-  resp = %Radius.Packet{code: "Access-Reject", id: p.id, auth: p.auth, secret: p.secret}
-  Radius.send sk,host,resp
+  resp = %Radius.Packet{code: "Access-Reject", id: p.id, secret: p.secret}
+  Radius.send_reply(sk, host, resp, p.auth)
 
   loop.(loop)
 end

example.exs

@@ -65,8 +65,8 @@ loop = fn loop ->
 
   IO.puts("From #{inspect(host)} : \n#{inspect(p, pretty: true)}")
 
-  resp = %Radius.Packet{code: "Access-Reject", id: p.id, auth: p.auth, secret: p.secret}
-  Radius.send(sk, host, resp)
+  resp = %Radius.Packet{code: "Access-Reject", id: p.id, secret: p.secret}
+  Radius.send_reply(sk, host, resp, p.auth)
 
   loop.(loop)
 end

lib/radius.ex

@@ -31,8 +31,35 @@ defmodule Radius do
         sk :: socket
         packet:: %Radius.Packet{}
   """
+  @deprecated "Use send_reply/4 or send_request/3"
   def send(sk, {host, port}, packet) do
-    %{raw: data} = Packet.encode_reply(packet, packet.auth)
+    send_reply(sk, {host, port}, packet, packet.auth)
+  end
+
+  @doc """
+  encode and send reply packet
+  """
+  @spec send_reply(
+          socket :: port(),
+          {host :: :inet.ip_address(), port :: :inet.port_number()},
+          packet :: Packet.t(),
+          request_authenticator :: binary()
+        ) :: :ok | {:error, any()}
+  def send_reply(sk, {host, port}, packet, request_authenticator) do
+    %{raw: data} = Packet.encode_reply(packet, request_authenticator)
+    :gen_udp.send(sk, host, port, data)
+  end
+
+  @doc """
+  encode and send request packet
+  """
+  @spec send_request(
+          socket :: port(),
+          {host :: :inet.ip_address(), port :: :inet.port_number()},
+          packet :: Packet.t()
+        ) :: :ok | {:error, any()}
+  def send_request(sk, {host, port}, packet) do
+    %{raw: data} = Packet.encode_request(packet)
     :gen_udp.send(sk, host, port, data)
   end
 end

lib/radius/packet.ex

@@ -208,59 +208,14 @@ defmodule Radius.Packet do
   """
   @deprecated "Use encode_request/1-2 or encode_reply/1-2 instead"
   def encode(packet, options \\ []) do
-    sign? = options |> Keyword.get(:sign, false)
-    raw? = options |> Keyword.get(:raw, false)
-
-    {auth, reply?} =
-      if packet.auth == nil do
-        {:crypto.strong_rand_bytes(16), false}
-      else
-        {packet.auth, true}
-      end
-
-    packet = %{packet | auth: auth}
-
     packet =
-      if sign? do
-        attrs = packet.attrs ++ [{"Message-Authenticator", <<0::size(128)>>}]
-
-        %{packet | attrs: attrs}
-      else
-        packet
-      end
-
-    attrs = encode_attrs(packet)
-
-    code = encode_code(packet.code)
-    length = 20 + :erlang.iolist_size(attrs)
-    header = <<code, packet.id, length::size(16), auth::binary>>
-
-    attrs =
-      if sign? do
-        signature = :crypto.mac(:hmac, :md5, packet.secret, [header, attrs])
-        [last | attrs] = attrs |> Enum.reverse()
-        crop_len = byte_size(last) - 16
-        last = <<last::bytes-size(crop_len), signature::binary>>
-        [last | attrs] |> Enum.reverse()
-      else
-        attrs
-      end
-
-    header =
-      if reply? and raw? == false do
-        resp_auth =
-          :crypto.hash_init(:md5)
-          |> :crypto.hash_update(header)
-          |> :crypto.hash_update(attrs)
-          |> :crypto.hash_update(packet.secret)
-          |> :crypto.hash_final()
-
-        <<header::bytes-size(4), resp_auth::binary>>
+      if packet.auth == nil do
+        encode_request(packet, options)
       else
-        header
+        encode_reply(packet, packet.auth, options)
       end
 
-    [header, attrs]
+    packet.raw
   end
 
   @doc """

test/radius_packet_test.exs

@@ -86,6 +86,28 @@ defmodule Radius.PacketTest do
     assert packet.auth == @sample_req.auth
   end
 
+  test "encode request - deprecated" do
+    # cut authenticator as it will be generated on each encoding
+    <<before::size(32), _random::size(128), rest::binary>> =
+      @sample_req
+      |> Map.put(:auth, nil)
+      |> Radius.Packet.encode()
+      |> IO.iodata_to_binary()
+
+    <<sample_before::size(32), _random::size(128), sample_rest::binary>> = @sample_binary_req
+    assert <<before::size(32), rest::binary>> == <<sample_before::size(32), sample_rest::binary>>
+  end
+
+  test "encode reply - deprecated" do
+    reply =
+      @sample_rep
+      |> Map.put(:auth, @sample_req.auth)
+      |> Radius.Packet.encode()
+      |> IO.iodata_to_binary()
+
+    assert reply == @sample_binary_rep
+  end
+
   test "encode request" do
     # cut authenticator as it will be generated on each encoding
     <<before::size(32), _random::size(128), rest::binary>> =