Make TACACS+ a separate protocol.

Use registered fields in both the TACACS and TACACS+ dissectors, and put
in Booleans for request vs. response in TACACS+, as it used to be there
(the request type determines that in TACACS).

svn path=/trunk/; revision=3689
This commit is contained in:
Guy Harris 2001-07-11 07:03:45 +00:00
parent bce90a4771
commit 0c18ef735c
1 changed files with 310 additions and 86 deletions

View File

@ -2,7 +2,7 @@
* Routines for cisco tacacs/xtacacs/tacacs+ packet dissection
* Copyright 2001, Paul Ionescu <paul@acorp.ro>
*
* $Id: packet-tacacs.c,v 1.13 2001/07/10 21:06:53 guy Exp $
* $Id: packet-tacacs.c,v 1.14 2001/07/11 07:03:45 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -49,22 +49,55 @@
#include "packet.h"
static int proto_tacacs = -1;
static int hf_tacacs_version = -1;
static int hf_tacacs_type = -1;
static int hf_tacacs_nonce = -1;
static int hf_tacacs_userlen = -1;
static int hf_tacacs_passlen = -1;
static int hf_tacacs_response = -1;
static int hf_tacacs_reason = -1;
static int hf_tacacs_result1 = -1;
static int hf_tacacs_destaddr = -1;
static int hf_tacacs_destport = -1;
static int hf_tacacs_line = -1;
static int hf_tacacs_result2 = -1;
static int hf_tacacs_result3 = -1;
static gint ett_tacacs = -1;
#define VERSION_TACACS 0x00
#define VERSION_XTACACS 0x80
static const value_string tacacs_version_vals[] = {
{ VERSION_TACACS, "TACACS" },
{ VERSION_XTACACS, "XTACACS" },
{ 0, NULL }
};
#define TACACS_LOGIN 1
#define TACACS_RESPONSE 2
#define TACACS_CHANGE 3
#define TACACS_FOLLOW 4
#define TACACS_CONNECT 5
#define TACACS_SUPERUSER 6
#define TACACS_LOGOUT 7
#define TACACS_RELOAD 8
#define TACACS_SLIP_ON 9
#define TACACS_SLIP_OFF 10
#define TACACS_SLIP_ADDR 11
static const value_string tacacs_type_vals[] = {
{ 1 , "Login" },
{ 2 , "Response" },
{ 3 , "Change" },
{ 4 , "Follow" },
{ 5 , "Connect" },
{ 6 , "Superuser" },
{ 7 , "Logout" },
{ 8 , "Reload" },
{ 9 , "SLIP on" },
{ 10 , "SLIP off" },
{ 11 , "SLIP Addr" },
{ 0 , NULL }};
{ TACACS_LOGIN, "Login" },
{ TACACS_RESPONSE, "Response" },
{ TACACS_CHANGE, "Change" },
{ TACACS_FOLLOW, "Follow" },
{ TACACS_CONNECT, "Connect" },
{ TACACS_SUPERUSER, "Superuser" },
{ TACACS_LOGOUT, "Logout" },
{ TACACS_RELOAD, "Reload" },
{ TACACS_SLIP_ON, "SLIP on" },
{ TACACS_SLIP_OFF, "SLIP off" },
{ TACACS_SLIP_ADDR, "SLIP Addr" },
{ 0, NULL }};
static const value_string tacacs_reason_vals[] = {
{ 0 , "none" },
@ -85,29 +118,31 @@ static const value_string tacacs_resp_vals[] = {
#define TAC_PLUS_AUTHOR 2
#define TAC_PLUS_ACCT 3
static const value_string tacplus_type_vals[] = {
{ TAC_PLUS_AUTHEN , "Authentication" },
{ TAC_PLUS_AUTHOR , "Authorization" },
{ TAC_PLUS_ACCT , "Accounting" },
{ 0 , NULL }};
#define UDP_PORT_TACACS 49
#define TCP_PORT_TACACS 49
static void
dissect_tacacs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
proto_tree *tacacs_tree, *ti;
proto_tree *tacacs_tree;
proto_item *ti;
guint8 txt_buff[256],version,type,userlen,passlen;
version = tvb_get_guint8(tvb,0);
type = tvb_get_guint8(tvb,1);
if (check_col(pinfo->fd, COL_PROTOCOL))
col_set_str(pinfo->fd, COL_PROTOCOL, version==0 ? "TACACS":"XTACACS");
col_set_str(pinfo->fd, COL_PROTOCOL, "TACACS");
if (check_col(pinfo->fd, COL_INFO))
col_add_str(pinfo->fd, COL_INFO, val_to_str(type, tacacs_type_vals, "Unknown Type"));
col_clear(pinfo->fd, COL_INFO);
version = tvb_get_guint8(tvb,0);
if (version != 0) {
if (check_col(pinfo->fd, COL_PROTOCOL))
col_set_str(pinfo->fd, COL_PROTOCOL, "XTACACS");
}
type = tvb_get_guint8(tvb,1);
if (check_col(pinfo->fd, COL_INFO))
col_add_str(pinfo->fd, COL_INFO,
val_to_str(type, tacacs_type_vals, "Unknown (0x%02x)"));
if (tree)
{
@ -115,64 +150,188 @@ dissect_tacacs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tvb, 0, tvb_length(tvb), version==0?"TACACS":"XTACACS");
tacacs_tree = proto_item_add_subtree(ti, ett_tacacs);
proto_tree_add_text(tacacs_tree, tvb, 0, 1, "Version = %s ",version==0?"TACACS":"XTACACS" );
proto_tree_add_text(tacacs_tree, tvb, 1, 1, "Type = %s ",val_to_str(type, tacacs_type_vals, "Unknown Type"));
proto_tree_add_text(tacacs_tree, tvb, 2, 2, "Nonce = 0x%04X ",tvb_get_ntohs(tvb,2));
proto_tree_add_uint(tacacs_tree, hf_tacacs_version, tvb, 0, 1,
version);
proto_tree_add_uint(tacacs_tree, hf_tacacs_type, tvb, 1, 1,
type);
proto_tree_add_item(tacacs_tree, hf_tacacs_nonce, tvb, 2, 2,
FALSE);
if (version==0)
{
if (type!=2)
if (type!=TACACS_RESPONSE)
{
userlen=tvb_get_guint8(tvb,4);
proto_tree_add_uint(tacacs_tree, hf_tacacs_userlen, tvb, 4, 1,
userlen);
passlen=tvb_get_guint8(tvb,5);
proto_tree_add_text(tacacs_tree, tvb, 4, 1, "Username length = %d ",userlen);
proto_tree_add_text(tacacs_tree, tvb, 5, 1, "Password length = %d ",passlen);
proto_tree_add_uint(tacacs_tree, hf_tacacs_passlen, tvb, 5, 1,
passlen);
tvb_get_nstringz0(tvb,6,userlen,txt_buff);
proto_tree_add_text(tacacs_tree, tvb, 6, userlen, "User = %s ",txt_buff);
proto_tree_add_text(tacacs_tree, tvb, 6, userlen, "Username: %s",txt_buff);
tvb_get_nstringz0(tvb,6+userlen,passlen,txt_buff);
proto_tree_add_text(tacacs_tree, tvb, 6+userlen, passlen, "Password = %s ",txt_buff);
proto_tree_add_text(tacacs_tree, tvb, 6+userlen, passlen, "Password: %s",txt_buff);
}
else
{
proto_tree_add_text(tacacs_tree, tvb, 4, 1, "Response = %s",
val_to_str(tvb_get_guint8(tvb,4), tacacs_resp_vals, "Unknown Response"));
proto_tree_add_text(tacacs_tree, tvb, 5, 1, "Reason = %s",
val_to_str(tvb_get_guint8(tvb,5), tacacs_reason_vals, "Unknown Reason"));
proto_tree_add_item(tacacs_tree, hf_tacacs_response, tvb, 4, 1,
FALSE);
proto_tree_add_item(tacacs_tree, hf_tacacs_reason, tvb, 5, 1,
FALSE);
}
}
else
{
userlen=tvb_get_guint8(tvb,4);
proto_tree_add_uint(tacacs_tree, hf_tacacs_userlen, tvb, 4, 1,
userlen);
passlen=tvb_get_guint8(tvb,5);
proto_tree_add_text(tacacs_tree, tvb, 4, 1, "Username length = %d ",userlen);
proto_tree_add_text(tacacs_tree, tvb, 5, 1, "Password length = %d ",passlen);
proto_tree_add_text(tacacs_tree, tvb, 6, 1, "Response = %s",
val_to_str(tvb_get_guint8(tvb,6), tacacs_resp_vals, "Unknown Response"));
proto_tree_add_text(tacacs_tree, tvb, 7, 1, "Reason = %s",
val_to_str(tvb_get_guint8(tvb,7), tacacs_reason_vals, "Unknown Reason"));
proto_tree_add_text(tacacs_tree, tvb, 8, 4, "Result1 = 0x%08X ",tvb_get_ntohl(tvb,8));
tvb_memcpy(tvb,txt_buff,12,4);
proto_tree_add_text(tacacs_tree, tvb, 12, 4, "IP addr = %s ",ip_to_str(txt_buff));
proto_tree_add_text(tacacs_tree, tvb, 16, 2, "Dst port = %d ",tvb_get_ntohs(tvb,16));
proto_tree_add_text(tacacs_tree, tvb, 18, 2, "Line = tty%d ",tvb_get_ntohs(tvb,18));
proto_tree_add_text(tacacs_tree, tvb, 20, 4, "Result2 = 0x%08X ",tvb_get_ntohl(tvb,20));
proto_tree_add_text(tacacs_tree, tvb, 24, 2, "Result3 = 0x%04X ",tvb_get_ntohs(tvb,24));
if (type!=2)
{
proto_tree_add_uint(tacacs_tree, hf_tacacs_passlen, tvb, 5, 1,
passlen);
proto_tree_add_item(tacacs_tree, hf_tacacs_response, tvb, 6, 1,
FALSE);
proto_tree_add_item(tacacs_tree, hf_tacacs_reason, tvb, 7, 1,
FALSE);
proto_tree_add_item(tacacs_tree, hf_tacacs_result1, tvb, 8, 4,
FALSE);
proto_tree_add_item(tacacs_tree, hf_tacacs_destaddr, tvb, 12, 4,
FALSE);
proto_tree_add_item(tacacs_tree, hf_tacacs_destport, tvb, 16, 2,
FALSE);
proto_tree_add_item(tacacs_tree, hf_tacacs_line, tvb, 18, 2,
FALSE);
proto_tree_add_item(tacacs_tree, hf_tacacs_result2, tvb, 20, 4,
FALSE);
proto_tree_add_item(tacacs_tree, hf_tacacs_result3, tvb, 24, 2,
FALSE);
if (type!=TACACS_RESPONSE)
{
tvb_get_nstringz0(tvb,26,userlen,txt_buff);
proto_tree_add_text(tacacs_tree, tvb, 26, userlen, "User = %s ",txt_buff);
proto_tree_add_text(tacacs_tree, tvb, 26, userlen, "Username: %s",txt_buff);
tvb_get_nstringz0(tvb,26+userlen,passlen,txt_buff);
proto_tree_add_text(tacacs_tree, tvb, 26+userlen, passlen, "Password = %s ",txt_buff);
proto_tree_add_text(tacacs_tree, tvb, 26+userlen, passlen, "Password; %s",txt_buff);
}
}
}
}
void
proto_register_tacacs(void)
{
static hf_register_info hf[] = {
{ &hf_tacacs_version,
{ "Version", "tacacs.version",
FT_UINT8, BASE_HEX, VALS(tacacs_version_vals), 0x0,
"Version", HFILL }},
{ &hf_tacacs_type,
{ "Type", "tacacs.type",
FT_UINT8, BASE_DEC, VALS(tacacs_type_vals), 0x0,
"Type", HFILL }},
{ &hf_tacacs_nonce,
{ "Nonce", "tacacs.nonce",
FT_UINT16, BASE_HEX, NULL, 0x0,
"Nonce", HFILL }},
{ &hf_tacacs_userlen,
{ "Username length", "tacacs.userlen",
FT_UINT8, BASE_DEC, NULL, 0x0,
"Username length", HFILL }},
{ &hf_tacacs_passlen,
{ "Password length", "tacacs.passlen",
FT_UINT8, BASE_DEC, NULL, 0x0,
"Password length", HFILL }},
{ &hf_tacacs_response,
{ "Response", "tacacs.response",
FT_UINT8, BASE_DEC, VALS(tacacs_resp_vals), 0x0,
"Response", HFILL }},
{ &hf_tacacs_reason,
{ "Reason", "tacacs.reason",
FT_UINT8, BASE_DEC, VALS(tacacs_reason_vals), 0x0,
"Reason", HFILL }},
{ &hf_tacacs_result1,
{ "Result 1", "tacacs.result1",
FT_UINT32, BASE_HEX, NULL, 0x0,
"Result 1", HFILL }},
{ &hf_tacacs_destaddr,
{ "Destination address", "tacacs.destaddr",
FT_IPv4, BASE_NONE, NULL, 0x0,
"Destination address", HFILL }},
{ &hf_tacacs_destport,
{ "Destination port", "tacacs.destport",
FT_UINT16, BASE_DEC, NULL, 0x0,
"Destination port", HFILL }},
{ &hf_tacacs_line,
{ "Line", "tacacs.line",
FT_UINT16, BASE_DEC, NULL, 0x0,
"Line", HFILL }},
{ &hf_tacacs_result2,
{ "Result 2", "tacacs.result2",
FT_UINT32, BASE_HEX, NULL, 0x0,
"Result 2", HFILL }},
{ &hf_tacacs_result3,
{ "Result 3", "tacacs.result3",
FT_UINT16, BASE_HEX, NULL, 0x0,
"Result 3", HFILL }},
};
static gint *ett[] = {
&ett_tacacs,
};
proto_tacacs = proto_register_protocol("TACACS", "TACACS", "tacacs");
proto_register_field_array(proto_tacacs, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
void
proto_reg_handoff_tacacs(void)
{
dissector_add("udp.port", UDP_PORT_TACACS, dissect_tacacs,
proto_tacacs);
}
static int proto_tacplus = -1;
static int hf_tacplus_response = -1;
static int hf_tacplus_request = -1;
static int hf_tacplus_majvers = -1;
static int hf_tacplus_minvers = -1;
static int hf_tacplus_type = -1;
static int hf_tacplus_seqno = -1;
static int hf_tacplus_flags = -1;
static int hf_tacplus_flags_payload_type = -1;
static int hf_tacplus_flags_connection_type = -1;
static int hf_tacplus_session_id = -1;
static int hf_tacplus_packet_len = -1;
static gint ett_tacplus = -1;
static gint ett_tacplus_flags = -1;
static const value_string tacplus_type_vals[] = {
{ TAC_PLUS_AUTHEN , "Authentication" },
{ TAC_PLUS_AUTHOR , "Authorization" },
{ TAC_PLUS_ACCT , "Accounting" },
{ 0 , NULL }};
#define FLAGS_UNENCRYPTED 0x01
static const true_false_string payload_type = {
"Unencrypted",
"Encrypted"
};
#define FLAGS_SINGLE 0x04
static const true_false_string connection_type = {
"Single",
"Multiple"
};
static void
dissect_tacplus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
proto_tree *tacacs_tree, *ti;
guint8 version,type,seq_no,flags;
proto_tree *tacplus_tree;
proto_item *ti;
guint8 version,flags;
proto_tree *flags_tree;
proto_item *tf;
guint32 len;
gboolean request=(pinfo->match_port == pinfo->destport);
@ -187,49 +346,114 @@ dissect_tacplus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (tree)
{
ti = proto_tree_add_protocol_format(tree, proto_tacacs,
ti = proto_tree_add_protocol_format(tree, proto_tacplus,
tvb, 0, tvb_length(tvb), "TACACS+");
version = tvb_get_guint8(tvb,0);
type = tvb_get_guint8(tvb,1);
seq_no = tvb_get_guint8(tvb,2);
flags = tvb_get_guint8(tvb,3);
len = tvb_get_ntohl(tvb,8);
tacacs_tree = proto_item_add_subtree(ti, ett_tacacs);
proto_tree_add_text(tacacs_tree, tvb, 0, 1, "Major version = %s ",(version&0xf0)==0xc0?"TACACS+":"Unknown Version" );
proto_tree_add_text(tacacs_tree, tvb, 0, 1, "Minor version = %d ",version&0xf);
proto_tree_add_text(tacacs_tree, tvb, 1, 1, "Type = %s ",val_to_str(type, tacplus_type_vals, "Unknown Type"));
proto_tree_add_text(tacacs_tree, tvb, 2, 1, "Seq. no = %d ",tvb_get_guint8(tvb,2));
proto_tree_add_text(tacacs_tree, tvb, 3, 1, "Flags = %s, %s ",
(flags&1)==0?"Encripted payload":"Unencripted payload",(flags&4)==0?"Multiple Connections":"Single connection");
proto_tree_add_text(tacacs_tree, tvb, 4, 4, "Session ID = %d ",tvb_get_ntohl(tvb,4));
proto_tree_add_text(tacacs_tree, tvb, 8, 4, "Packet len = %d ",len);
if ((flags&1)==0)
proto_tree_add_text(tacacs_tree, tvb, 12, len, "Encripted payload");
tacplus_tree = proto_item_add_subtree(ti, ett_tacplus);
if (pinfo->match_port == pinfo->destport)
{
proto_tree_add_boolean_hidden(tacplus_tree,
hf_tacplus_request, tvb, 0, 0, TRUE);
}
else
proto_tree_add_text(tacacs_tree, tvb, 12, len, "Payload");
{
proto_tree_add_boolean_hidden(tacplus_tree,
hf_tacplus_response, tvb, 0, 0, TRUE);
}
version = tvb_get_guint8(tvb,0);
proto_tree_add_uint_format(tacplus_tree, hf_tacplus_majvers, tvb, 0, 1,
version,
"Major version: %s",
(version&0xf0)==0xc0?"TACACS+":"Unknown Version");
proto_tree_add_uint(tacplus_tree, hf_tacplus_minvers, tvb, 0, 1,
version&0xf);
proto_tree_add_item(tacplus_tree, hf_tacplus_type, tvb, 1, 1,
FALSE);
proto_tree_add_item(tacplus_tree, hf_tacplus_seqno, tvb, 2, 1,
FALSE);
flags = tvb_get_guint8(tvb,3);
tf = proto_tree_add_uint(tacplus_tree, hf_tacplus_flags, tvb, 3, 1,
flags);
flags_tree = proto_item_add_subtree(tf, ett_tacplus_flags);
proto_tree_add_boolean(flags_tree, hf_tacplus_flags_payload_type,
tvb, 3, 1, flags);
proto_tree_add_boolean(flags_tree, hf_tacplus_flags_connection_type,
tvb, 3, 1, flags);
proto_tree_add_item(tacplus_tree, hf_tacplus_session_id, tvb, 4, 4,
FALSE);
len = tvb_get_ntohl(tvb,8);
proto_tree_add_uint(tacplus_tree, hf_tacplus_packet_len, tvb, 8, 4,
len);
if (flags&FLAGS_UNENCRYPTED)
proto_tree_add_text(tacplus_tree, tvb, 12, len, "Payload");
else
proto_tree_add_text(tacplus_tree, tvb, 12, len, "Encrypted payload");
}
}
void
proto_register_tacacs(void)
proto_register_tacplus(void)
{
static gint *ett[] = {
&ett_tacacs,
static hf_register_info hf[] = {
{ &hf_tacplus_response,
{ "Response", "tacplus.response",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
"TRUE if TACACS+ response", HFILL }},
{ &hf_tacplus_request,
{ "Request", "tacplus.request",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
"TRUE if TACACS+ request", HFILL }},
{ &hf_tacplus_majvers,
{ "Major version", "tacplus.majvers",
FT_UINT8, BASE_DEC, NULL, 0x0,
"Major version number", HFILL }},
{ &hf_tacplus_minvers,
{ "Minor version", "tacplus.minvers",
FT_UINT8, BASE_DEC, NULL, 0x0,
"Minor version number", HFILL }},
{ &hf_tacplus_type,
{ "Type", "tacplus.type",
FT_UINT8, BASE_DEC, VALS(tacplus_type_vals), 0x0,
"Type", HFILL }},
{ &hf_tacplus_seqno,
{ "Sequence number", "tacplus.seqno",
FT_UINT8, BASE_DEC, NULL, 0x0,
"Sequence number", HFILL }},
{ &hf_tacplus_flags,
{ "Flags", "tacplus.flags",
FT_UINT8, BASE_HEX, NULL, 0x0,
"Flags", HFILL }},
{ &hf_tacplus_flags_payload_type,
{ "Payload type", "tacplus.flags.payload_type",
FT_BOOLEAN, 8, TFS(&payload_type), FLAGS_UNENCRYPTED,
"Payload type (unencrypted or encrypted)", HFILL }},
{ &hf_tacplus_flags_connection_type,
{ "Connection type", "tacplus.flags.connection_type",
FT_BOOLEAN, 8, TFS(&connection_type), FLAGS_SINGLE,
"Connection type (single or multiple)", HFILL }},
{ &hf_tacplus_session_id,
{ "Session ID", "tacplus.session_id",
FT_UINT32, BASE_DEC, NULL, 0x0,
"Session ID", HFILL }},
{ &hf_tacplus_packet_len,
{ "Packet length", "tacplus.packet_len",
FT_UINT32, BASE_DEC, NULL, 0x0,
"Packet length", HFILL }}
};
proto_tacacs = proto_register_protocol("TACACS", "TACACS", "tacacs");
static gint *ett[] = {
&ett_tacplus,
&ett_tacplus_flags,
};
proto_tacplus = proto_register_protocol("TACACS+", "TACACS+", "tacplus");
proto_register_field_array(proto_tacplus, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
void
proto_reg_handoff_tacacs(void)
proto_reg_handoff_tacplus(void)
{
dissector_add("udp.port", UDP_PORT_TACACS, dissect_tacacs,
proto_tacacs);
dissector_add("tcp.port", TCP_PORT_TACACS, dissect_tacplus,
proto_tacacs);
proto_tacplus);
}