-/* See the file COPYING for licensing information. */
+/* Copyright 2010, 2011 NORDUnet A/S. All rights reserved.
+ See LICENSE for licensing information. */
+
+#if defined HAVE_CONFIG_H
+#include <config.h>
+#endif
-#include <string.h>
#include <assert.h>
-#include <freeradius/libradius.h>
-#include <event2/event.h>
+#include <radius/client.h>
#include <event2/bufferevent.h>
-#include "libradsec.h"
-#include "libradsec-impl.h"
-#if defined DEBUG
+#include <radsec/radsec.h>
+#include <radsec/radsec-impl.h>
+#include "conn.h"
#include "debug.h"
+#include "packet.h"
+
+#if defined (DEBUG)
+#include <netdb.h>
+#include <sys/socket.h>
+#include <event2/buffer.h>
#endif
-static int
-_packet_create (struct rs_connection *conn, struct rs_packet **pkt_out)
+int
+packet_verify_response (struct rs_connection *conn,
+ struct rs_packet *response,
+ struct rs_packet *request)
+{
+ int err;
+
+ assert (conn);
+ assert (conn->active_peer);
+ assert (conn->active_peer->secret);
+ assert (response);
+ assert (response->rpkt);
+ assert (request);
+ assert (request->rpkt);
+
+ response->rpkt->secret = conn->active_peer->secret;
+ response->rpkt->sizeof_secret = strlen (conn->active_peer->secret);
+
+ /* Verify header and message authenticator. */
+ err = nr_packet_verify (response->rpkt, request->rpkt);
+ if (err)
+ {
+ if (conn->is_connected)
+ rs_conn_disconnect(conn);
+ return rs_err_conn_push_fl (conn, -err, __FILE__, __LINE__,
+ "nr_packet_verify");
+ }
+
+ /* Decode and decrypt. */
+ err = nr_packet_decode (response->rpkt, request->rpkt);
+ if (err)
+ {
+ if (conn->is_connected)
+ rs_conn_disconnect(conn);
+ return rs_err_conn_push_fl (conn, -err, __FILE__, __LINE__,
+ "nr_packet_decode");
+ }
+
+ return RSE_OK;
+}
+
+
+/* Badly named function for preparing a RADIUS message and queue it.
+ FIXME: Rename. */
+int
+packet_do_send (struct rs_packet *pkt)
+{
+ int err;
+
+ assert (pkt);
+ assert (pkt->conn);
+ assert (pkt->conn->active_peer);
+ assert (pkt->conn->active_peer->secret);
+ assert (pkt->rpkt);
+
+ pkt->rpkt->secret = pkt->conn->active_peer->secret;
+ pkt->rpkt->sizeof_secret = strlen (pkt->rpkt->secret);
+
+ /* Encode message. */
+ err = nr_packet_encode (pkt->rpkt, NULL);
+ if (err < 0)
+ return rs_err_conn_push_fl (pkt->conn, -err, __FILE__, __LINE__,
+ "nr_packet_encode");
+ /* Sign message. */
+ err = nr_packet_sign (pkt->rpkt, NULL);
+ if (err < 0)
+ return rs_err_conn_push_fl (pkt->conn, -err, __FILE__, __LINE__,
+ "nr_packet_sign");
+#if defined (DEBUG)
+ {
+ char host[80], serv[80];
+
+ getnameinfo (pkt->conn->active_peer->addr_cache->ai_addr,
+ pkt->conn->active_peer->addr_cache->ai_addrlen,
+ host, sizeof(host), serv, sizeof(serv),
+ 0 /* NI_NUMERICHOST|NI_NUMERICSERV*/);
+ rs_debug (("%s: about to send this to %s:%s:\n", __func__, host, serv));
+ rs_dump_packet (pkt);
+ }
+#endif
+
+ /* Put message in output buffer. */
+ if (pkt->conn->bev) /* TCP. */
+ {
+ int err = bufferevent_write (pkt->conn->bev, pkt->rpkt->data,
+ pkt->rpkt->length);
+ if (err < 0)
+ return rs_err_conn_push_fl (pkt->conn, RSE_EVENT, __FILE__, __LINE__,
+ "bufferevent_write: %s",
+ evutil_gai_strerror (err));
+ }
+ else /* UDP. */
+ {
+ struct rs_packet **pp = &pkt->conn->out_queue;
+
+ while (*pp && (*pp)->next)
+ *pp = (*pp)->next;
+ *pp = pkt;
+ }
+
+ return RSE_OK;
+}
+
+/* Public functions. */
+int
+rs_packet_create (struct rs_connection *conn, struct rs_packet **pkt_out)
{
struct rs_packet *p;
RADIUS_PACKET *rpkt;
+ int err;
*pkt_out = NULL;
- rpkt = rad_alloc (1);
- if (!rpkt)
- return rs_conn_err_push (conn, RSE_NOMEM, __func__);
- rpkt->id = -1;
+ rpkt = rs_malloc (conn->ctx, sizeof(*rpkt) + RS_MAX_PACKET_LEN);
+ if (rpkt == NULL)
+ return rs_err_conn_push (conn, RSE_NOMEM, __func__);
- p = (struct rs_packet *) malloc (sizeof (struct rs_packet));
- if (!p)
+ err = nr_packet_init (rpkt, NULL, NULL,
+ PW_ACCESS_REQUEST,
+ rpkt + 1, RS_MAX_PACKET_LEN);
+ if (err < 0)
+ return rs_err_conn_push (conn, -err, __func__);
+
+ p = (struct rs_packet *) rs_calloc (conn->ctx, 1, sizeof (*p));
+ if (p == NULL)
{
- rad_free (&rpkt);
- return rs_conn_err_push (conn, RSE_NOMEM, __func__);
+ rs_free (conn->ctx, rpkt);
+ return rs_err_conn_push (conn, RSE_NOMEM, __func__);
}
- memset (p, 0, sizeof (struct rs_packet));
p->conn = conn;
p->rpkt = rpkt;
}
int
-rs_packet_create_acc_request (struct rs_connection *conn,
- struct rs_packet **pkt_out,
- const char *user_name, const char *user_pw)
+rs_packet_create_authn_request (struct rs_connection *conn,
+ struct rs_packet **pkt_out,
+ const char *user_name, const char *user_pw)
{
struct rs_packet *pkt;
- struct rs_attr *attr;
+ int err;
- if (_packet_create (conn, pkt_out))
+ if (rs_packet_create (conn, pkt_out))
return -1;
+
pkt = *pkt_out;
- pkt->rpkt->code = PW_AUTHENTICATION_REQUEST;
+ pkt->rpkt->code = PW_ACCESS_REQUEST;
- if (rs_attr_create (conn, &attr, "User-Name", user_name))
- return -1;
- rs_packet_add_attr (pkt, attr);
+ if (user_name)
+ {
+ err = rs_packet_add_avp (pkt, PW_USER_NAME, 0, user_name,
+ strlen (user_name));
+ if (err)
+ return err;
+ }
- if (rs_attr_create (conn, &attr, "User-Password", user_pw))
- return -1;
- /* FIXME: need this too? rad_pwencode(user_pw, &pwlen, SECRET, reqauth) */
- rs_packet_add_attr (pkt, attr);
+ if (user_pw)
+ {
+ err = rs_packet_add_avp (pkt, PW_USER_PASSWORD, 0, user_pw,
+ strlen (user_pw));
+ if (err)
+ return err;
+ }
return RSE_OK;
}
-static void
-_event_cb (struct bufferevent *bev, short events, void *ctx)
+void
+rs_packet_destroy (struct rs_packet *pkt)
{
- struct rs_packet *pkt = (struct rs_packet *) ctx;
- struct rs_connection *conn;
- struct rs_peer *p;
-
assert (pkt);
assert (pkt->conn);
- assert (pkt->conn->active_peer);
- conn = pkt->conn;
- p = conn->active_peer;
-
- p->is_connecting = 0;
- if (events & BEV_EVENT_CONNECTED)
- {
- p->is_connected = 1;
-#if defined (DEBUG)
- fprintf (stderr, "%s: connected\n", __func__);
-#endif
- rad_encode (pkt->rpkt, NULL, pkt->conn->active_peer->secret);
- assert (pkt->rpkt);
-#if defined (DEBUG)
- fprintf (stderr, "%s: about to send this to %s:\n", __func__, "<fixme>");
- rs_dump_packet (pkt);
-#endif
- if (bufferevent_write(bev, pkt->rpkt->data, pkt->rpkt->data_len))
- rs_conn_err_push_fl (pkt->conn, RSE_EVENT, __FILE__, __LINE__,
- "bufferevent_write");
- /* Packet will be freed in write callback. */
- }
- else if (events & BEV_EVENT_ERROR)
- rs_conn_err_push_fl (pkt->conn, RSE_CONNERR, __FILE__, __LINE__, NULL);
-}
+ assert (pkt->conn->ctx);
-void
-rs_packet_destroy(struct rs_packet *pkt)
-{
- rad_free (&pkt->rpkt);
+ rs_avp_free (&pkt->rpkt->vps);
+ rs_free (pkt->conn->ctx, pkt->rpkt);
rs_free (pkt->conn->ctx, pkt);
}
-static void
-_write_cb (struct bufferevent *bev, void *ctx)
-{
- struct rs_packet *pkt = (struct rs_packet *) ctx;
-
- assert (pkt);
- assert (pkt->conn);
-#if defined (DEBUG)
- fprintf (stderr, "%s: packet written, breaking event loop\n", __func__);
-#endif
- if (event_base_loopbreak (pkt->conn->evb) < 0)
- abort (); /* FIXME */
- rs_packet_destroy (pkt);
-}
+int
+rs_packet_add_avp (struct rs_packet *pkt,
+ unsigned int attr, unsigned int vendor,
+ const void *data, size_t data_len)
-static void
-_read_cb (struct bufferevent *bev, void *ctx)
{
- struct rs_packet *pkt = (struct rs_packet *) ctx;
- size_t n;
+ const DICT_ATTR *da;
+ VALUE_PAIR *vp;
+ int err;
assert (pkt);
assert (pkt->conn);
- if (!pkt->hdr_read_flag)
+ assert (pkt->conn->ctx);
+
+ da = nr_dict_attr_byvalue (attr, vendor);
+ if (da == NULL)
+ return rs_err_conn_push (pkt->conn, RSE_ATTR_TYPE_UNKNOWN,
+ "nr_dict_attr_byvalue");
+ vp = rs_malloc (pkt->conn->ctx, sizeof(*vp));
+ if (vp == NULL)
+ return rs_err_conn_push (pkt->conn, RSE_NOMEM, NULL);
+ if (nr_vp_init (vp, da) == NULL)
{
- n = bufferevent_read (pkt->conn->bev, pkt->hdr, RS_HEADER_LEN;
- if (n == RS_HEADER_LEN)
- {
- uint16_t len = (pkt->hdr[2] << 8) + pkt->hdr[3];
- uint8_t *buf = rs_malloc (pkt->conn->ctx, len);
-
- pkt->hdr_read_flag = 1;
- if (!buf)
- {
- rs_conn_err_push_fl (pkt->conn, RSE_NOMEM, __FILE__,
- __LINE__, NULL);
- abort (); /* FIXME: recovering takes reading of packet */
- }
- pkt->rpkt->data = buf;
- pkt->rpkt->data_len = len;
- bufferevent_setwatermark (pkt->conn->bev, EV_READ,
- len - RS_HEADER_LEN, 0);
-#if defined (DEBUG)
- fprintf (stderr, "%s: packet header read, pkt len=%d\n", __func__,
- len);
-#endif
- }
- else if (n < 0)
- return; /* Buffer frozen, i suppose. Let's hope it thaws. */
- else
- {
- assert (n < RS_HEADER_LEN);
- return; /* Need more to complete header. */
- }
+ nr_vp_free (&vp);
+ return rs_err_conn_push (pkt->conn, RSE_INTERNAL, NULL);
}
-
- printf ("%s: trying to read %d octets of packet data\n", __func__, pkt->rpkt->data_len - RS_HEADER_LEN;
- n = bufferevent_read (pkt->conn->bev, pkt->rpkt->data,
- pkt->rpkt->data_len - RS_HEADER_LEN);
- printf ("%s: read %d octets of packet data\n", __func__, n);
- if (n == pkt->rpkt->data_len - RS_HEADER_LEN)
+ err = nr_vp_set_data (vp, data, data_len);
+ if (err < 0)
{
- bufferevent_disable (pkt->conn->bev, EV_READ);
- pkt->hdr_read_flag = 0;
- memset (pkt->hdr, 0, sizeof(*pkt->hdr));
-#if defined (DEBUG)
- fprintf (stderr, "%s: complete packet read\n", __func__);
-#endif
- if (event_base_loopbreak (pkt->conn->evb) < 0)
- abort (); /* FIXME */
+ nr_vp_free (&vp);
+ return rs_err_conn_push (pkt->conn, -err, "nr_vp_set_data");
}
-}
+ nr_vps_append (&pkt->rpkt->vps, vp);
-static int
-_init_evb (struct rs_connection *conn)
-{
- if (!conn->evb)
- {
-#if defined (DEBUG)
- event_enable_debug_mode ();
-#endif
- conn->evb = event_base_new ();
- if (!conn->evb)
- return rs_conn_err_push_fl (conn, RSE_EVENT, __FILE__, __LINE__,
- "event_base_new");
- }
return RSE_OK;
}
-static int
-_init_socket (struct rs_connection *conn, struct rs_peer *p)
+/* TODO: Rename rs_packet_append_avp, indicating that encoding is
+ being done. */
+int
+rs_packet_append_avp (struct rs_packet *pkt,
+ unsigned int attr, unsigned int vendor,
+ const void *data, size_t data_len)
{
- if (p->s < 0)
- {
- assert (p->addr);
- p->s = socket (p->addr->ai_family, p->addr->ai_socktype,
- p->addr->ai_protocol);
- if (p->s < 0)
- return rs_conn_err_push_fl (conn, RSE_SOME_ERROR, __FILE__, __LINE__,
- strerror (errno));
- }
- return RSE_OK;
-}
+ const DICT_ATTR *da;
+ int err;
-static struct rs_peer *
-_pick_peer (struct rs_connection *conn)
-{
- if (!conn->active_peer)
- conn->active_peer = conn->peers;
- return conn->active_peer;
-}
+ assert (pkt);
+
+ da = nr_dict_attr_byvalue (attr, vendor);
+ if (da == NULL)
+ return RSE_ATTR_TYPE_UNKNOWN;
+
+ err = nr_packet_attr_append (pkt->rpkt, NULL, da, data, data_len);
+ if (err < 0)
+ return rs_err_conn_push (pkt->conn, -err, __func__);
-static int
-_init_bev (struct rs_connection *conn, struct rs_peer *peer)
-{
- if (!conn->bev)
- {
- conn->bev = bufferevent_socket_new (conn->evb, peer->s, 0);
- if (!conn->bev)
- return rs_conn_err_push_fl (conn, RSE_EVENT, __FILE__, __LINE__,
- "bufferevent_socket_new");
- }
return RSE_OK;
}
-static void
-_do_connect (struct rs_peer *p)
+void
+rs_packet_avps (struct rs_packet *pkt, rs_avp ***vps)
{
- if (bufferevent_socket_connect (p->conn->bev, p->addr->ai_addr,
- p->addr->ai_addrlen) < 0)
- rs_conn_err_push_fl (p->conn, RSE_EVENT, __FILE__, __LINE__,
- "bufferevent_socket_connect");
- else
- p->is_connecting = 1;
+ assert (pkt);
+ *vps = &pkt->rpkt->vps;
}
-static int
-_conn_open(struct rs_connection *conn, struct rs_packet *pkt)
+unsigned int
+rs_packet_code (struct rs_packet *pkt)
{
- struct rs_peer *p;
-
- if (_init_evb (conn))
- return -1;
-
- p = _pick_peer (conn);
- if (!p)
- return rs_conn_err_push_fl (conn, RSE_NOPEER, __FILE__, __LINE__, NULL);
-
- if (_init_socket (conn, p))
- return -1;
-
- if (_init_bev (conn, p))
- return -1;
- bufferevent_setcb (conn->bev, _read_cb, _write_cb, _event_cb, pkt);
-
- if (!p->is_connected)
- if (!p->is_connecting)
- _do_connect (p);
-
- return RSE_OK;
+ assert (pkt);
+ return pkt->rpkt->code;
}
-int
-rs_packet_send (struct rs_connection *conn, struct rs_packet *pkt, void *data)
+rs_const_avp *
+rs_packet_find_avp (struct rs_packet *pkt, unsigned int attr, unsigned int vendor)
{
- assert (conn);
- assert (pkt->rpkt);
-
- if (_conn_open (conn, pkt))
- return -1;
- assert (conn->evb);
- assert (conn->bev);
- assert (conn->active_peer);
- assert (conn->active_peer->s >= 0);
-
- event_base_dispatch (conn->evb);
-
-#if defined (DEBUG)
- fprintf (stderr, "%s: event loop done\n", __func__);
- assert (event_base_got_break(conn->evb));
-#endif
-
- return RSE_OK;
+ assert (pkt);
+ return rs_avp_find_const (pkt->rpkt->vps, attr, vendor);
}
int
-rs_packet_receive(struct rs_connection *conn, struct rs_packet **pkt_out)
+rs_packet_set_id (struct rs_packet *pkt, int id)
{
- struct rs_packet *pkt;
-
- assert (conn);
+ int old = pkt->rpkt->id;
- if (_packet_create (conn, pkt_out))
- return -1;
- pkt = *pkt_out;
- pkt->conn = conn;
-
- if (_conn_open (conn, pkt))
- return -1;
- assert (conn->evb);
- assert (conn->bev);
- assert (conn->active_peer);
- assert (conn->active_peer->s >= 0);
-
- bufferevent_setwatermark (conn->bev, EV_READ, RS_HEADER_LEN, 0);
- bufferevent_enable (conn->bev, EV_READ);
- event_base_dispatch (conn->evb);
-#if defined (DEBUG)
- fprintf (stderr, "%s: event loop done\n", __func__);
- assert (event_base_got_break(conn->evb));
-#endif
+ pkt->rpkt->id = id;
-#if defined (DEBUG)
- fprintf (stderr, "%s: got this:\n", __func__);
- rs_dump_packet (pkt);
-#endif
-
- return RSE_OK;
-}
-
-void
-rs_packet_add_attr(struct rs_packet *pkt, struct rs_attr *attr)
-{
- pairadd (&pkt->rpkt->vps, attr->vp);
- attr->pkt = pkt;
+ return old;
}
projects / radsecproxy.git / blobdiff