TNC: Added preliminary TNC implementation for hostapd
This adds EAP-TNC method and TNCS (IF-IMV and IF-TNCCS) functionality. There is no integration with EAP-TTLS and EAP-FAST at this point, so this version is not yet suitable for real use (i.e., EAP-TNC can only be tested outside a tunnel which is not an allowed configuration for deployment). However, the basic TNCS functionality is more or less complete and this version seems to interoperate with wpa_supplicant.
This commit is contained in:
parent
8e888179e1
commit
da08a7c732
8 changed files with 1615 additions and 1 deletions
|
@ -258,6 +258,13 @@ OBJS += ../src/eap_common/eap_ikev2_common.o ../src/eap_common/ikev2_common.o
|
||||||
NEED_DH_GROUPS=y
|
NEED_DH_GROUPS=y
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifdef CONFIG_EAP_TNC
|
||||||
|
CFLAGS += -DEAP_TNC
|
||||||
|
OBJS += ../src/eap_server/eap_tnc.o
|
||||||
|
OBJS += ../src/eap_server/tncs.o
|
||||||
|
NEED_BASE64=y
|
||||||
|
endif
|
||||||
|
|
||||||
# Basic EAP functionality is needed for EAPOL
|
# Basic EAP functionality is needed for EAPOL
|
||||||
OBJS += ../src/eap_server/eap.o
|
OBJS += ../src/eap_server/eap.o
|
||||||
OBJS += ../src/eap_common/eap_common.o
|
OBJS += ../src/eap_common/eap_common.o
|
||||||
|
|
|
@ -1474,6 +1474,10 @@ struct hostapd_config * hostapd_config_read(const char *fname)
|
||||||
} else if (os_strcmp(buf, "eap_sim_aka_result_ind") == 0) {
|
} else if (os_strcmp(buf, "eap_sim_aka_result_ind") == 0) {
|
||||||
bss->eap_sim_aka_result_ind = atoi(pos);
|
bss->eap_sim_aka_result_ind = atoi(pos);
|
||||||
#endif /* EAP_SIM */
|
#endif /* EAP_SIM */
|
||||||
|
#ifdef EAP_TNC
|
||||||
|
} else if (os_strcmp(buf, "tnc") == 0) {
|
||||||
|
bss->tnc = atoi(pos);
|
||||||
|
#endif /* EAP_TNC */
|
||||||
#endif /* EAP_SERVER */
|
#endif /* EAP_SERVER */
|
||||||
} else if (os_strcmp(buf, "eap_message") == 0) {
|
} else if (os_strcmp(buf, "eap_message") == 0) {
|
||||||
char *term;
|
char *term;
|
||||||
|
|
|
@ -242,6 +242,7 @@ struct hostapd_bss_config {
|
||||||
u8 *pac_opaque_encr_key;
|
u8 *pac_opaque_encr_key;
|
||||||
char *eap_fast_a_id;
|
char *eap_fast_a_id;
|
||||||
int eap_sim_aka_result_ind;
|
int eap_sim_aka_result_ind;
|
||||||
|
int tnc;
|
||||||
|
|
||||||
char *radius_server_clients;
|
char *radius_server_clients;
|
||||||
int radius_server_auth_port;
|
int radius_server_auth_port;
|
||||||
|
|
|
@ -41,6 +41,7 @@
|
||||||
#include "tls.h"
|
#include "tls.h"
|
||||||
#include "eap_server/eap_sim_db.h"
|
#include "eap_server/eap_sim_db.h"
|
||||||
#include "eap_server/eap.h"
|
#include "eap_server/eap.h"
|
||||||
|
#include "eap_server/tncs.h"
|
||||||
#include "version.h"
|
#include "version.h"
|
||||||
#include "l2_packet/l2_packet.h"
|
#include "l2_packet/l2_packet.h"
|
||||||
|
|
||||||
|
@ -1854,7 +1855,7 @@ int main(int argc, char *argv[])
|
||||||
struct hapd_interfaces interfaces;
|
struct hapd_interfaces interfaces;
|
||||||
int ret = 1, k;
|
int ret = 1, k;
|
||||||
size_t i, j;
|
size_t i, j;
|
||||||
int c, debug = 0, daemonize = 0;
|
int c, debug = 0, daemonize = 0, tnc = 0;
|
||||||
const char *pid_file = NULL;
|
const char *pid_file = NULL;
|
||||||
|
|
||||||
hostapd_logger_register_cb(hostapd_logger_cb);
|
hostapd_logger_register_cb(hostapd_logger_cb);
|
||||||
|
@ -1940,7 +1941,19 @@ int main(int argc, char *argv[])
|
||||||
setup_interface_done);
|
setup_interface_done);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
|
for (k = 0; k < (int) interfaces.iface[i]->num_bss; k++) {
|
||||||
|
if (interfaces.iface[i]->bss[0]->conf->tnc)
|
||||||
|
tnc++;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef EAP_TNC
|
||||||
|
if (tnc && tncs_global_init() < 0) {
|
||||||
|
wpa_printf(MSG_ERROR, "Failed to initialize TNCS");
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
#endif /* EAP_TNC */
|
||||||
|
|
||||||
if (daemonize && os_daemonize(pid_file)) {
|
if (daemonize && os_daemonize(pid_file)) {
|
||||||
perror("daemon");
|
perror("daemon");
|
||||||
|
@ -1986,6 +1999,10 @@ int main(int argc, char *argv[])
|
||||||
}
|
}
|
||||||
os_free(interfaces.iface);
|
os_free(interfaces.iface);
|
||||||
|
|
||||||
|
#ifdef EAP_TNC
|
||||||
|
tncs_global_deinit();
|
||||||
|
#endif /* EAP_TNC */
|
||||||
|
|
||||||
eloop_destroy();
|
eloop_destroy();
|
||||||
|
|
||||||
#ifndef CONFIG_NATIVE_WINDOWS
|
#ifndef CONFIG_NATIVE_WINDOWS
|
||||||
|
|
|
@ -261,6 +261,13 @@ int eap_server_register_methods(void)
|
||||||
}
|
}
|
||||||
#endif /* EAP_IKEV2 */
|
#endif /* EAP_IKEV2 */
|
||||||
|
|
||||||
|
#ifdef EAP_TNC
|
||||||
|
if (ret == 0) {
|
||||||
|
int eap_server_tnc_register(void);
|
||||||
|
ret = eap_server_tnc_register();
|
||||||
|
}
|
||||||
|
#endif /* EAP_TNC */
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
301
src/eap_server/eap_tnc.c
Normal file
301
src/eap_server/eap_tnc.c
Normal file
|
@ -0,0 +1,301 @@
|
||||||
|
/*
|
||||||
|
* EAP server method: EAP-TNC (Trusted Network Connect)
|
||||||
|
* Copyright (c) 2007-2008, Jouni Malinen <j@w1.fi>
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License version 2 as
|
||||||
|
* published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* Alternatively, this software may be distributed under the terms of BSD
|
||||||
|
* license.
|
||||||
|
*
|
||||||
|
* See README and COPYING for more details.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "includes.h"
|
||||||
|
|
||||||
|
#include "common.h"
|
||||||
|
#include "base64.h"
|
||||||
|
#include "eap_i.h"
|
||||||
|
#include "tncs.h"
|
||||||
|
|
||||||
|
|
||||||
|
struct eap_tnc_data {
|
||||||
|
enum { START, CONTINUE, RECOMMENDATION, DONE, FAIL } state;
|
||||||
|
enum { ALLOW, ISOLATE, NO_ACCESS, NO_RECOMMENDATION } recommendation;
|
||||||
|
struct tncs_data *tncs;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
/* EAP-TNC Flags */
|
||||||
|
#define EAP_TNC_FLAGS_LENGTH_INCLUDED 0x80
|
||||||
|
#define EAP_TNC_FLAGS_MORE_FRAGMENTS 0x40
|
||||||
|
#define EAP_TNC_FLAGS_START 0x20
|
||||||
|
#define EAP_TNC_VERSION_MASK 0x07
|
||||||
|
|
||||||
|
#define EAP_TNC_VERSION 1
|
||||||
|
|
||||||
|
|
||||||
|
static void * eap_tnc_init(struct eap_sm *sm)
|
||||||
|
{
|
||||||
|
struct eap_tnc_data *data;
|
||||||
|
|
||||||
|
data = os_zalloc(sizeof(*data));
|
||||||
|
if (data == NULL)
|
||||||
|
return NULL;
|
||||||
|
data->state = START;
|
||||||
|
data->tncs = tncs_init();
|
||||||
|
if (data->tncs == NULL) {
|
||||||
|
os_free(data);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void eap_tnc_reset(struct eap_sm *sm, void *priv)
|
||||||
|
{
|
||||||
|
struct eap_tnc_data *data = priv;
|
||||||
|
tncs_deinit(data->tncs);
|
||||||
|
os_free(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static struct wpabuf * eap_tnc_build_start(struct eap_sm *sm,
|
||||||
|
struct eap_tnc_data *data, u8 id)
|
||||||
|
{
|
||||||
|
struct wpabuf *req;
|
||||||
|
|
||||||
|
req = eap_msg_alloc(EAP_VENDOR_IETF, EAP_TYPE_TNC, 1, EAP_CODE_REQUEST,
|
||||||
|
id);
|
||||||
|
if (req == NULL) {
|
||||||
|
wpa_printf(MSG_ERROR, "EAP-TNC: Failed to allocate memory for "
|
||||||
|
"request");
|
||||||
|
data->state = FAIL;
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
wpabuf_put_u8(req, EAP_TNC_FLAGS_START | EAP_TNC_VERSION);
|
||||||
|
|
||||||
|
data->state = CONTINUE;
|
||||||
|
|
||||||
|
return req;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static struct wpabuf * eap_tnc_build(struct eap_sm *sm,
|
||||||
|
struct eap_tnc_data *data, u8 id)
|
||||||
|
{
|
||||||
|
struct wpabuf *req;
|
||||||
|
u8 *rpos, *rpos1, *start;
|
||||||
|
size_t rlen;
|
||||||
|
char *start_buf, *end_buf;
|
||||||
|
size_t start_len, end_len;
|
||||||
|
size_t imv_len;
|
||||||
|
|
||||||
|
imv_len = tncs_total_send_len(data->tncs);
|
||||||
|
|
||||||
|
start_buf = tncs_if_tnccs_start(data->tncs);
|
||||||
|
if (start_buf == NULL)
|
||||||
|
return NULL;
|
||||||
|
start_len = os_strlen(start_buf);
|
||||||
|
end_buf = tncs_if_tnccs_end();
|
||||||
|
if (end_buf == NULL) {
|
||||||
|
os_free(start_buf);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
end_len = os_strlen(end_buf);
|
||||||
|
|
||||||
|
rlen = 1 + start_len + imv_len + end_len;
|
||||||
|
req = eap_msg_alloc(EAP_VENDOR_IETF, EAP_TYPE_TNC, rlen,
|
||||||
|
EAP_CODE_REQUEST, id);
|
||||||
|
if (req == NULL) {
|
||||||
|
os_free(start_buf);
|
||||||
|
os_free(end_buf);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
start = wpabuf_put(req, 0);
|
||||||
|
wpabuf_put_u8(req, EAP_TNC_VERSION);
|
||||||
|
wpabuf_put_data(req, start_buf, start_len);
|
||||||
|
os_free(start_buf);
|
||||||
|
|
||||||
|
rpos1 = wpabuf_put(req, 0);
|
||||||
|
rpos = tncs_copy_send_buf(data->tncs, rpos1);
|
||||||
|
wpabuf_put(req, rpos - rpos1);
|
||||||
|
|
||||||
|
wpabuf_put_data(req, end_buf, end_len);
|
||||||
|
os_free(end_buf);
|
||||||
|
|
||||||
|
wpa_hexdump_ascii(MSG_MSGDUMP, "EAP-TNC: Request", start, rlen);
|
||||||
|
|
||||||
|
return req;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static struct wpabuf * eap_tnc_build_recommendation(struct eap_sm *sm,
|
||||||
|
struct eap_tnc_data *data,
|
||||||
|
u8 id)
|
||||||
|
{
|
||||||
|
switch (data->recommendation) {
|
||||||
|
case ALLOW:
|
||||||
|
data->state = DONE;
|
||||||
|
break;
|
||||||
|
case ISOLATE:
|
||||||
|
data->state = FAIL;
|
||||||
|
/* TODO: support assignment to a different VLAN */
|
||||||
|
break;
|
||||||
|
case NO_ACCESS:
|
||||||
|
data->state = FAIL;
|
||||||
|
break;
|
||||||
|
case NO_RECOMMENDATION:
|
||||||
|
data->state = DONE;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
wpa_printf(MSG_DEBUG, "EAP-TNC: Unknown recommendation");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
return eap_tnc_build(sm, data, id);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static struct wpabuf * eap_tnc_buildReq(struct eap_sm *sm, void *priv, u8 id)
|
||||||
|
{
|
||||||
|
struct eap_tnc_data *data = priv;
|
||||||
|
|
||||||
|
switch (data->state) {
|
||||||
|
case START:
|
||||||
|
tncs_init_connection(data->tncs);
|
||||||
|
return eap_tnc_build_start(sm, data, id);
|
||||||
|
case CONTINUE:
|
||||||
|
return eap_tnc_build(sm, data, id);
|
||||||
|
case RECOMMENDATION:
|
||||||
|
return eap_tnc_build_recommendation(sm, data, id);
|
||||||
|
case DONE:
|
||||||
|
case FAIL:
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static Boolean eap_tnc_check(struct eap_sm *sm, void *priv,
|
||||||
|
struct wpabuf *respData)
|
||||||
|
{
|
||||||
|
const u8 *pos;
|
||||||
|
size_t len;
|
||||||
|
|
||||||
|
pos = eap_hdr_validate(EAP_VENDOR_IETF, EAP_TYPE_TNC, respData,
|
||||||
|
&len);
|
||||||
|
if (pos == NULL || len == 0) {
|
||||||
|
wpa_printf(MSG_INFO, "EAP-TNC: Invalid frame");
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((*pos & EAP_TNC_VERSION_MASK) != EAP_TNC_VERSION) {
|
||||||
|
wpa_printf(MSG_DEBUG, "EAP-TNC: Unsupported version %d",
|
||||||
|
*pos & EAP_TNC_VERSION_MASK);
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (*pos & EAP_TNC_FLAGS_START) {
|
||||||
|
wpa_printf(MSG_DEBUG, "EAP-TNC: Peer used Start flag");
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void eap_tnc_process(struct eap_sm *sm, void *priv,
|
||||||
|
struct wpabuf *respData)
|
||||||
|
{
|
||||||
|
struct eap_tnc_data *data = priv;
|
||||||
|
const u8 *pos;
|
||||||
|
size_t len;
|
||||||
|
enum tncs_process_res res;
|
||||||
|
|
||||||
|
pos = eap_hdr_validate(EAP_VENDOR_IETF, EAP_TYPE_TNC, respData, &len);
|
||||||
|
if (pos == NULL || len == 0)
|
||||||
|
return; /* Should not happen; message already verified */
|
||||||
|
|
||||||
|
wpa_hexdump_ascii(MSG_MSGDUMP, "EAP-TNC: Received payload", pos, len);
|
||||||
|
|
||||||
|
if (len == 1 && (data->state == DONE || data->state == FAIL)) {
|
||||||
|
wpa_printf(MSG_DEBUG, "EAP-TNC: Peer acknowledged the last "
|
||||||
|
"message");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
res = tncs_process_if_tnccs(data->tncs, pos + 1, len - 1);
|
||||||
|
switch (res) {
|
||||||
|
case TNCCS_RECOMMENDATION_ALLOW:
|
||||||
|
wpa_printf(MSG_DEBUG, "EAP-TNC: TNCS allowed access");
|
||||||
|
data->state = RECOMMENDATION;
|
||||||
|
data->recommendation = ALLOW;
|
||||||
|
break;
|
||||||
|
case TNCCS_RECOMMENDATION_NO_RECOMMENDATION:
|
||||||
|
wpa_printf(MSG_DEBUG, "EAP-TNC: TNCS has no recommendation");
|
||||||
|
data->state = RECOMMENDATION;
|
||||||
|
data->recommendation = NO_RECOMMENDATION;
|
||||||
|
break;
|
||||||
|
case TNCCS_RECOMMENDATION_ISOLATE:
|
||||||
|
wpa_printf(MSG_DEBUG, "EAP-TNC: TNCS requested isolation");
|
||||||
|
data->state = RECOMMENDATION;
|
||||||
|
data->recommendation = ISOLATE;
|
||||||
|
break;
|
||||||
|
case TNCCS_RECOMMENDATION_NO_ACCESS:
|
||||||
|
wpa_printf(MSG_DEBUG, "EAP-TNC: TNCS rejected access");
|
||||||
|
data->state = RECOMMENDATION;
|
||||||
|
data->recommendation = NO_ACCESS;
|
||||||
|
break;
|
||||||
|
case TNCCS_PROCESS_ERROR:
|
||||||
|
wpa_printf(MSG_DEBUG, "EAP-TNC: TNCS processing error");
|
||||||
|
data->state = FAIL;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static Boolean eap_tnc_isDone(struct eap_sm *sm, void *priv)
|
||||||
|
{
|
||||||
|
struct eap_tnc_data *data = priv;
|
||||||
|
return data->state == DONE;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static Boolean eap_tnc_isSuccess(struct eap_sm *sm, void *priv)
|
||||||
|
{
|
||||||
|
struct eap_tnc_data *data = priv;
|
||||||
|
return data->state == DONE;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
int eap_server_tnc_register(void)
|
||||||
|
{
|
||||||
|
struct eap_method *eap;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
eap = eap_server_method_alloc(EAP_SERVER_METHOD_INTERFACE_VERSION,
|
||||||
|
EAP_VENDOR_IETF, EAP_TYPE_TNC, "TNC");
|
||||||
|
if (eap == NULL)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
eap->init = eap_tnc_init;
|
||||||
|
eap->reset = eap_tnc_reset;
|
||||||
|
eap->buildReq = eap_tnc_buildReq;
|
||||||
|
eap->check = eap_tnc_check;
|
||||||
|
eap->process = eap_tnc_process;
|
||||||
|
eap->isDone = eap_tnc_isDone;
|
||||||
|
eap->isSuccess = eap_tnc_isSuccess;
|
||||||
|
|
||||||
|
ret = eap_server_method_register(eap);
|
||||||
|
if (ret)
|
||||||
|
eap_server_method_free(eap);
|
||||||
|
return ret;
|
||||||
|
}
|
1232
src/eap_server/tncs.c
Normal file
1232
src/eap_server/tncs.c
Normal file
File diff suppressed because it is too large
Load diff
45
src/eap_server/tncs.h
Normal file
45
src/eap_server/tncs.h
Normal file
|
@ -0,0 +1,45 @@
|
||||||
|
/*
|
||||||
|
* EAP-TNC - TNCS (IF-IMV and IF-TNCCS)
|
||||||
|
* Copyright (c) 2007-2008, Jouni Malinen <j@w1.fi>
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License version 2 as
|
||||||
|
* published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* Alternatively, this software may be distributed under the terms of BSD
|
||||||
|
* license.
|
||||||
|
*
|
||||||
|
* See README and COPYING for more details.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef TNCS_H
|
||||||
|
#define TNCS_H
|
||||||
|
|
||||||
|
struct tncs_data;
|
||||||
|
|
||||||
|
struct tncs_data * tncs_init(void);
|
||||||
|
void tncs_deinit(struct tncs_data *tncs);
|
||||||
|
void tncs_init_connection(struct tncs_data *tncs);
|
||||||
|
size_t tncs_total_send_len(struct tncs_data *tncs);
|
||||||
|
u8 * tncs_copy_send_buf(struct tncs_data *tncs, u8 *pos);
|
||||||
|
char * tncs_if_tnccs_start(struct tncs_data *tncs);
|
||||||
|
char * tncs_if_tnccs_end(void);
|
||||||
|
|
||||||
|
enum tncs_process_res {
|
||||||
|
TNCCS_PROCESS_ERROR = -1,
|
||||||
|
TNCCS_PROCESS_OK_NO_RECOMMENDATION = 0,
|
||||||
|
TNCCS_RECOMMENDATION_ERROR,
|
||||||
|
TNCCS_RECOMMENDATION_ALLOW,
|
||||||
|
TNCCS_RECOMMENDATION_NONE,
|
||||||
|
TNCCS_RECOMMENDATION_ISOLATE,
|
||||||
|
TNCCS_RECOMMENDATION_NO_ACCESS,
|
||||||
|
TNCCS_RECOMMENDATION_NO_RECOMMENDATION
|
||||||
|
};
|
||||||
|
|
||||||
|
enum tncs_process_res tncs_process_if_tnccs(struct tncs_data *tncs,
|
||||||
|
const u8 *msg, size_t len);
|
||||||
|
|
||||||
|
int tncs_global_init(void);
|
||||||
|
void tncs_global_deinit(void);
|
||||||
|
|
||||||
|
#endif /* TNCS_H */
|
Loading…
Reference in a new issue