X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/dc2c85188fd4d2113b0ae694e2917ced6b7665cc..HEAD:/print-radius.c diff --git a/print-radius.c b/print-radius.c index 158c3a6e..598db8e6 100644 --- a/print-radius.c +++ b/print-radius.c @@ -82,9 +82,7 @@ * TODO: Among other things to print ok MacIntosh and Vendor values */ -#ifdef HAVE_CONFIG_H #include -#endif #include "netdissect-stdinc.h" @@ -92,13 +90,13 @@ #include "netdissect-ctype.h" +#define ND_LONGJMP_FROM_TCHECK #include "netdissect.h" #include "addrtoname.h" #include "extract.h" #include "oui.h" #include "ntp.h" - #define TAM_SIZE(x) (sizeof(x)/sizeof(x[0]) ) #define PRINT_HEX(bytes_len, ptr_data) \ @@ -109,41 +107,40 @@ bytes_len--; \ } - /* Radius packet codes */ /* https://www.iana.org/assignments/radius-types/radius-types.xhtml#radius-types-27 */ -#define RADCMD_ACCESS_REQ 1 /* Access-Request */ -#define RADCMD_ACCESS_ACC 2 /* Access-Accept */ -#define RADCMD_ACCESS_REJ 3 /* Access-Reject */ -#define RADCMD_ACCOUN_REQ 4 /* Accounting-Request */ -#define RADCMD_ACCOUN_RES 5 /* Accounting-Response */ -#define RADCMD_ACCESS_CHA 11 /* Access-Challenge */ -#define RADCMD_STATUS_SER 12 /* Status-Server */ -#define RADCMD_STATUS_CLI 13 /* Status-Client */ -#define RADCMD_DISCON_REQ 40 /* Disconnect-Request */ -#define RADCMD_DISCON_ACK 41 /* Disconnect-ACK */ -#define RADCMD_DISCON_NAK 42 /* Disconnect-NAK */ -#define RADCMD_COA_REQ 43 /* CoA-Request */ -#define RADCMD_COA_ACK 44 /* CoA-ACK */ -#define RADCMD_COA_NAK 45 /* CoA-NAK */ -#define RADCMD_RESERVED 255 /* Reserved */ +#define RADCMD_ACCESS_REQ 1 /* Access-Request */ +#define RADCMD_ACCESS_ACC 2 /* Access-Accept */ +#define RADCMD_ACCESS_REJ 3 /* Access-Reject */ +#define RADCMD_ACCOUNT_REQ 4 /* Accounting-Request */ +#define RADCMD_ACCOUNT_RES 5 /* Accounting-Response */ +#define RADCMD_ACCESS_CHA 11 /* Access-Challenge */ +#define RADCMD_STATUS_SER 12 /* Status-Server */ +#define RADCMD_STATUS_CLI 13 /* Status-Client */ +#define RADCMD_DISCON_REQ 40 /* Disconnect-Request */ +#define RADCMD_DISCON_ACK 41 /* Disconnect-ACK */ +#define RADCMD_DISCON_NAK 42 /* Disconnect-NAK */ +#define RADCMD_COA_REQ 43 /* CoA-Request */ +#define RADCMD_COA_ACK 44 /* CoA-ACK */ +#define RADCMD_COA_NAK 45 /* CoA-NAK */ +#define RADCMD_RESERVED 255 /* Reserved */ static const struct tok radius_command_values[] = { - { RADCMD_ACCESS_REQ, "Access-Request" }, - { RADCMD_ACCESS_ACC, "Access-Accept" }, - { RADCMD_ACCESS_REJ, "Access-Reject" }, - { RADCMD_ACCOUN_REQ, "Accounting-Request" }, - { RADCMD_ACCOUN_RES, "Accounting-Response" }, - { RADCMD_ACCESS_CHA, "Access-Challenge" }, - { RADCMD_STATUS_SER, "Status-Server" }, - { RADCMD_STATUS_CLI, "Status-Client" }, - { RADCMD_DISCON_REQ, "Disconnect-Request" }, - { RADCMD_DISCON_ACK, "Disconnect-ACK" }, - { RADCMD_DISCON_NAK, "Disconnect-NAK" }, - { RADCMD_COA_REQ, "CoA-Request" }, - { RADCMD_COA_ACK, "CoA-ACK" }, - { RADCMD_COA_NAK, "CoA-NAK" }, - { RADCMD_RESERVED, "Reserved" }, + { RADCMD_ACCESS_REQ, "Access-Request" }, + { RADCMD_ACCESS_ACC, "Access-Accept" }, + { RADCMD_ACCESS_REJ, "Access-Reject" }, + { RADCMD_ACCOUNT_REQ, "Accounting-Request" }, + { RADCMD_ACCOUNT_RES, "Accounting-Response" }, + { RADCMD_ACCESS_CHA, "Access-Challenge" }, + { RADCMD_STATUS_SER, "Status-Server" }, + { RADCMD_STATUS_CLI, "Status-Client" }, + { RADCMD_DISCON_REQ, "Disconnect-Request" }, + { RADCMD_DISCON_ACK, "Disconnect-ACK" }, + { RADCMD_DISCON_NAK, "Disconnect-NAK" }, + { RADCMD_COA_REQ, "CoA-Request" }, + { RADCMD_COA_ACK, "CoA-ACK" }, + { RADCMD_COA_NAK, "CoA-NAK" }, + { RADCMD_RESERVED, "Reserved" }, { 0, NULL} }; @@ -201,7 +198,6 @@ static const struct tok rfc4675_tagged[] = { { 0, NULL} }; - static void print_attr_string(netdissect_options *, const u_char *, u_int, u_short ); static void print_attr_num(netdissect_options *, const u_char *, u_int, u_short ); static void print_vendor_attr(netdissect_options *, const u_char *, u_int, u_short ); @@ -217,7 +213,6 @@ static void print_attr_time(netdissect_options *, const u_char *, u_int, u_short static void print_attr_vector64(netdissect_options *, const u_char *, u_int, u_short); static void print_attr_strange(netdissect_options *, const u_char *, u_int, u_short); - struct radius_hdr { nd_uint8_t code; /* Radius packet code */ nd_uint8_t id; /* Radius packet id */ nd_uint16_t len; /* Radius total length */ @@ -230,7 +225,6 @@ struct radius_attr { nd_uint8_t type; /* Attribute type */ nd_uint8_t len; /* Attribute length */ }; - /* Service-Type Attribute standard values */ /* https://www.iana.org/assignments/radius-types/radius-types.xhtml#radius-types-4 */ static const char *serv_type[]={ NULL, @@ -298,7 +292,6 @@ static const char *login_serv[]={ "Telnet", "TCP Clear Quiet", }; - /* Termination-Action Attribute standard values */ /* https://www.iana.org/assignments/radius-types/radius-types.xhtml#radius-types-9 */ static const char *term_action[]={ "Default", @@ -757,7 +750,6 @@ static const struct attrtype { /* ^ [120, 129] ^ */ }; - /*****************************/ /* Print an attribute string */ /* value pointed by 'data' */ @@ -771,13 +763,9 @@ print_attr_string(netdissect_options *ndo, { u_int i; - ND_TCHECK_LEN(data, length); - - switch(attr_code) - { + switch(attr_code) { case TUNNEL_PASS: - if (length < 3) - goto trunc; + ND_ICHECK_U(length, <, 3); if (GET_U_1(data) && (GET_U_1(data) <= 0x1F)) ND_PRINT("Tag[%u] ", GET_U_1(data)); else @@ -794,10 +782,8 @@ print_attr_string(netdissect_options *ndo, case TUNNEL_ASSIGN_ID: case TUNNEL_CLIENT_AUTH: case TUNNEL_SERVER_AUTH: - if (GET_U_1(data) <= 0x1F) - { - if (length < 1) - goto trunc; + if (GET_U_1(data) <= 0x1F) { + ND_ICHECK_U(length, <, 1); if (GET_U_1(data)) ND_PRINT("Tag[%u] ", GET_U_1(data)); else @@ -807,8 +793,7 @@ print_attr_string(netdissect_options *ndo, } break; case EGRESS_VLAN_NAME: - if (length < 1) - goto trunc; + ND_ICHECK_U(length, <, 1); ND_PRINT("%s (0x%02x) ", tok2str(rfc4675_tagged,"Unknown tag",GET_U_1(data)), GET_U_1(data)); @@ -816,8 +801,7 @@ print_attr_string(netdissect_options *ndo, length--; break; case EAP_MESSAGE: - if (length < 1) - goto trunc; + ND_ICHECK_U(length, <, 1); eap_print(ndo, data, length); return; } @@ -827,8 +811,8 @@ print_attr_string(netdissect_options *ndo, return; - trunc: - nd_print_trunc(ndo); +invalid: + nd_print_invalid(ndo); } /* @@ -843,8 +827,7 @@ print_vendor_attr(netdissect_options *ndo, u_int vendor_type; u_int vendor_length; - if (length < 4) - goto trunc; + ND_ICHECK_U(length, <, 4); vendor_id = GET_BE_U_4(data); data+=4; length-=4; @@ -857,36 +840,23 @@ print_vendor_attr(netdissect_options *ndo, vendor_type = GET_U_1(data); vendor_length = GET_U_1(data + 1); - if (vendor_length < 2) - { - ND_PRINT("\n\t Vendor Attribute: %u, Length: %u (bogus, must be >= 2)", - vendor_type, - vendor_length); - return; - } - if (vendor_length > length) - { - ND_PRINT("\n\t Vendor Attribute: %u, Length: %u (bogus, goes past end of vendor-specific attribute)", - vendor_type, - vendor_length); - return; - } + ND_PRINT("\n\t Vendor Attribute: %u, length: %u", + vendor_type, vendor_length); + ND_ICHECKMSG_U("length", vendor_length, <, 2); + ND_ICHECKMSG_U("length", vendor_length, >, length); data+=2; vendor_length-=2; length-=2; - ND_TCHECK_LEN(data, vendor_length); - ND_PRINT("\n\t Vendor Attribute: %u, Length: %u, Value: ", - vendor_type, - vendor_length); + ND_PRINT(", value: "); for (idx = 0; idx < vendor_length ; idx++, data++) ND_PRINT("%c", ND_ASCII_ISPRINT(GET_U_1(data)) ? GET_U_1(data) : '.'); length-=vendor_length; } return; - trunc: - nd_print_trunc(ndo); +invalid: + nd_print_invalid(ndo); } /******************************/ @@ -902,30 +872,22 @@ print_attr_num(netdissect_options *ndo, { uint32_t timeout; - if (length != 4) - { - ND_PRINT("ERROR: length %u != 4", length); - return; - } + ND_ICHECK_U(length, !=, 4); /* This attribute has standard values */ - if (attr_type[attr_code].siz_subtypes) - { + if (attr_type[attr_code].siz_subtypes) { static const char **table; uint32_t data_value; table = attr_type[attr_code].subtypes; - if ( (attr_code == TUNNEL_TYPE) || (attr_code == TUNNEL_MEDIUM) ) - { + if ( (attr_code == TUNNEL_TYPE) || (attr_code == TUNNEL_MEDIUM) ) { if (!GET_U_1(data)) ND_PRINT("Tag[Unused] "); else ND_PRINT("Tag[%u] ", GET_U_1(data)); data++; data_value = GET_BE_U_3(data); - } - else - { + } else { data_value = GET_BE_U_4(data); } if ( data_value <= (uint32_t)(attr_type[attr_code].siz_subtypes - 1 + @@ -934,9 +896,7 @@ print_attr_num(netdissect_options *ndo, ND_PRINT("%s", table[data_value]); else ND_PRINT("#%u", data_value); - } - else - { + } else { switch(attr_code) /* Be aware of special cases... */ { case FRM_IPX: @@ -954,8 +914,7 @@ print_attr_num(netdissect_options *ndo, timeout = GET_BE_U_4(data); if ( timeout < 60 ) ND_PRINT("%02d secs", timeout); - else - { + else { if ( timeout < 3600 ) ND_PRINT("%02d:%02d min", timeout / 60, timeout % 60); @@ -1004,6 +963,10 @@ print_attr_num(netdissect_options *ndo, } /* switch */ } /* if-else */ + return; + +invalid: + nd_print_invalid(ndo); } /*****************************/ @@ -1017,14 +980,9 @@ static void print_attr_address(netdissect_options *ndo, const u_char *data, u_int length, u_short attr_code) { - if (length != 4) - { - ND_PRINT("ERROR: length %u != 4", length); - return; - } + ND_ICHECK_U(length, !=, 4); - switch(attr_code) - { + switch(attr_code) { case FRM_IPADDR: case LOG_IPHOST: if (GET_BE_U_4(data) == 0xFFFFFFFF ) @@ -1040,6 +998,10 @@ print_attr_address(netdissect_options *ndo, ND_PRINT("%s", GET_IPADDR_STRING(data)); break; } + return; + +invalid: + nd_print_invalid(ndo); } /*****************************/ @@ -1053,13 +1015,13 @@ static void print_attr_address6(netdissect_options *ndo, const u_char *data, u_int length, u_short attr_code _U_) { - if (length != 16) - { - ND_PRINT("ERROR: length %u != 16", length); - return; - } + ND_ICHECK_U(length, !=, 16); ND_PRINT("%s", GET_IP6ADDR_STRING(data)); + return; + +invalid: + nd_print_invalid(ndo); } static void @@ -1067,56 +1029,42 @@ print_attr_netmask6(netdissect_options *ndo, const u_char *data, u_int length, u_short attr_code _U_) { u_char data2[16]; - - if (length < 2 || length > 18) - { - ND_PRINT("ERROR: length %u not in range (2..18)", length); - return; - } - ND_TCHECK_LEN(data, length); - if (GET_U_1(data + 1) > 128) - { - ND_PRINT("ERROR: netmask %u not in range (0..128)", GET_U_1(data + 1)); - return; - } - + u_int reserved_mbz, prefix_length; + + ND_ICHECK_U(length, <, 2); + ND_ICHECK_U(length, >, 18); + reserved_mbz = GET_U_1(data); + if (reserved_mbz) + ND_PRINT("[reserved-MBZ %u] ", reserved_mbz); + prefix_length = GET_U_1(data + 1); + ND_ICHECKMSG_U("prefix length", prefix_length, >, 128); memset(data2, 0, sizeof(data2)); if (length > 2) - memcpy(data2, data+2, length-2); + GET_CPY_BYTES(data2, data+2, length-2); - ND_PRINT("%s/%u", ip6addr_string(ndo, data2), GET_U_1(data + 1)); /* local buffer, not packet data; don't use GET_IP6ADDR_STRING() */ + ND_PRINT("%s/%u", ip6addr_string(ndo, data2), prefix_length); /* local buffer, not packet data; don't use GET_IP6ADDR_STRING() */ - if (GET_U_1(data + 1) > 8 * (length - 2)) - ND_PRINT(" (inconsistent prefix length)"); + ND_ICHECKMSG_U("inconsistent prefix length", prefix_length, >, 8 * (length - 2)); return; - trunc: - nd_print_trunc(ndo); +invalid: + nd_print_invalid(ndo); } static void print_attr_mip6_home_link_prefix(netdissect_options *ndo, const u_char *data, u_int length, u_short attr_code _U_) { - if (length != 17) - { - ND_PRINT("ERROR: length %u != 17", length); - return; - } - ND_TCHECK_LEN(data, length); - if (GET_U_1(data) > 128) - { - ND_PRINT("ERROR: netmask %u not in range (0..128)", GET_U_1(data)); - return; - } + ND_ICHECK_U(length, !=, 17); + ND_ICHECKMSG_U("prefix length", GET_U_1(data), >, 128); ND_PRINT("%s/%u", GET_IP6ADDR_STRING(data + 1), GET_U_1(data)); return; - trunc: - nd_print_trunc(ndo); +invalid: + nd_print_invalid(ndo); } static void @@ -1125,12 +1073,7 @@ print_attr_operator_name(netdissect_options *ndo, { u_int namespace_value; - ND_TCHECK_LEN(data, length); - if (length < 2) - { - ND_PRINT("ERROR: length %u < 2", length); - return; - } + ND_ICHECK_U(length, <, 2); namespace_value = GET_U_1(data); data++; ND_PRINT("[%s] ", tok2str(operator_name_vector, "unknown namespace %u", namespace_value)); @@ -1139,8 +1082,8 @@ print_attr_operator_name(netdissect_options *ndo, return; - trunc: - nd_print_trunc(ndo); +invalid: + nd_print_invalid(ndo); } static void @@ -1150,12 +1093,7 @@ print_attr_location_information(netdissect_options *ndo, uint16_t index; uint8_t code, entity; - ND_TCHECK_LEN(data, length); - if (length < 21) - { - ND_PRINT("ERROR: length %u < 21", length); - return; - } + ND_ICHECK_U(length, <, 21); index = GET_BE_U_2(data); data += 2; @@ -1188,8 +1126,8 @@ print_attr_location_information(netdissect_options *ndo, return; - trunc: - nd_print_trunc(ndo); +invalid: + nd_print_invalid(ndo); } static void @@ -1198,12 +1136,7 @@ print_attr_location_data(netdissect_options *ndo, { uint16_t index; - ND_TCHECK_LEN(data, length); - if (length < 3) - { - ND_PRINT("ERROR: length %u < 3", length); - return; - } + ND_ICHECK_U(length, <, 3); index = GET_BE_U_2(data); data += 2; @@ -1220,8 +1153,8 @@ print_attr_location_data(netdissect_options *ndo, return; - trunc: - nd_print_trunc(ndo); +invalid: + nd_print_invalid(ndo); } static void @@ -1230,12 +1163,7 @@ print_basic_location_policy_rules(netdissect_options *ndo, { uint16_t flags; - ND_TCHECK_LEN(data, length); - if (length < 10) - { - ND_PRINT("ERROR: length %u < 10", length); - return; - } + ND_ICHECK_U(length, <, 10); flags = GET_BE_U_2(data); data += 2; @@ -1253,11 +1181,10 @@ print_basic_location_policy_rules(netdissect_options *ndo, return; - trunc: - nd_print_trunc(ndo); +invalid: + nd_print_invalid(ndo); } - /*************************************/ /* Print an attribute of 'secs since */ /* January 1, 1970 00:00 UTC' value */ @@ -1273,17 +1200,17 @@ print_attr_time(netdissect_options *ndo, time_t attr_time; char string[26]; - if (length != 4) - { - ND_PRINT("ERROR: length %u != 4", length); - return; - } + ND_ICHECK_U(length, !=, 4); attr_time = GET_BE_U_4(data); strlcpy(string, ctime(&attr_time), sizeof(string)); /* Get rid of the newline */ string[24] = '\0'; ND_PRINT("%.24s", string); + return; + +invalid: + nd_print_invalid(ndo); } static void @@ -1293,11 +1220,7 @@ print_attr_vector64(netdissect_options *ndo, uint64_t data_value, i; const char *sep = ""; - if (length != 8) - { - ND_PRINT("ERROR: length %u != 8", length); - return; - } + ND_ICHECK_U(length, !=, 8); ND_PRINT("["); @@ -1314,6 +1237,10 @@ print_attr_vector64(netdissect_options *ndo, } ND_PRINT("]"); + return; + +invalid: + nd_print_invalid(ndo); } /***********************************/ @@ -1330,14 +1257,9 @@ print_attr_strange(netdissect_options *ndo, u_short len_data; u_int error_cause_value; - switch(attr_code) - { + switch(attr_code) { case ARAP_PASS: - if (length != 16) - { - ND_PRINT("ERROR: length %u != 16", length); - return; - } + ND_ICHECK_U(length, !=, 16); ND_PRINT("User_challenge ("); len_data = 8; PRINT_HEX(len_data, data); @@ -1348,11 +1270,7 @@ print_attr_strange(netdissect_options *ndo, break; case ARAP_FEATURES: - if (length != 14) - { - ND_PRINT("ERROR: length %u != 14", length); - return; - } + ND_ICHECK_U(length, !=, 14); if (GET_U_1(data)) ND_PRINT("User can change password"); else @@ -1372,27 +1290,21 @@ print_attr_strange(netdissect_options *ndo, break; case ARAP_CHALLENGE_RESP: - if (length < 8) - { - ND_PRINT("ERROR: length %u != 8", length); - return; - } + ND_ICHECK_U(length, !=, 8); len_data = 8; PRINT_HEX(len_data, data); break; case ERROR_CAUSE: - if (length != 4) - { - ND_PRINT("Error: length %u != 4", length); - return; - } - + ND_ICHECK_U(length, !=, 4); error_cause_value = GET_BE_U_4(data); ND_PRINT("Error cause %u: %s", error_cause_value, tok2str(errorcausetype, "Error-Cause %u not known", error_cause_value)); break; } return; + +invalid: + nd_print_invalid(ndo); } static void @@ -1403,10 +1315,8 @@ radius_attrs_print(netdissect_options *ndo, const char *attr_string; uint8_t type, len; - while (length > 0) { - if (length < 2) - goto trunc; - ND_TCHECK_SIZE(rad_attr); + while (length != 0) { + ND_ICHECK_U(length, <, 2); type = GET_U_1(rad_attr->type); len = GET_U_1(rad_attr->len); @@ -1419,22 +1329,12 @@ radius_attrs_print(netdissect_options *ndo, attr_string, type, len); - if (len < 2) - { - ND_PRINT(" (bogus, must be >= 2)"); - return; - } - if (len > length) - { - ND_PRINT(" (bogus, goes past end of packet)"); - return; - } + ND_ICHECKMSG_U("length", len, <, 2); + ND_ICHECKMSG_U("length", len, >, length); ND_PRINT(", Value: "); - if (type < TAM_SIZE(attr_type)) - { - if (len > 2) - { + if (type < TAM_SIZE(attr_type)) { + if (len > 2) { if ( attr_type[type].print_func ) (*attr_type[type].print_func)( ndo, ((const u_char *)(rad_attr+1)), @@ -1450,54 +1350,50 @@ radius_attrs_print(netdissect_options *ndo, } return; -trunc: - nd_print_trunc(ndo); +invalid: + nd_print_invalid(ndo); } void radius_print(netdissect_options *ndo, - const u_char *dat, u_int length) + const u_char *dat, const u_int length) { const struct radius_hdr *rad; u_int len, auth_idx; ndo->ndo_protocol = "radius"; - ND_TCHECK_LEN(dat, MIN_RADIUS_LEN); + nd_print_protocol_caps(ndo); + ND_ICHECK_U(length, <, MIN_RADIUS_LEN); rad = (const struct radius_hdr *)dat; len = GET_BE_U_2(rad->len); - if (len < MIN_RADIUS_LEN) - { - nd_print_trunc(ndo); - return; - } - - if (len > length) - len = length; + ND_ICHECKMSG_U("length", len, <, MIN_RADIUS_LEN); + ND_ICHECKMSG_U("length", len, >, 4096); + ND_ICHECKMSG_U("length", len, >, length); if (ndo->ndo_vflag < 1) { - ND_PRINT("RADIUS, %s (%u), id: 0x%02x length: %u", + ND_PRINT(", %s (%u), id: 0x%02x, length: %u", tok2str(radius_command_values,"Unknown Command",GET_U_1(rad->code)), GET_U_1(rad->code), GET_U_1(rad->id), len); + ND_TCHECK_LEN(dat, MIN_RADIUS_LEN); return; - } - else { - ND_PRINT("RADIUS, length: %u\n\t%s (%u), id: 0x%02x, Authenticator: ", + } else { + ND_PRINT(", length: %u\n\t%s (%u), id: 0x%02x, Authenticator: ", len, tok2str(radius_command_values,"Unknown Command",GET_U_1(rad->code)), GET_U_1(rad->code), GET_U_1(rad->id)); for(auth_idx=0; auth_idx < 16; auth_idx++) - ND_PRINT("%02x", rad->auth[auth_idx]); + ND_PRINT("%02x", GET_U_1((rad->auth + auth_idx))); } if (len > MIN_RADIUS_LEN) radius_attrs_print(ndo, dat + MIN_RADIUS_LEN, len - MIN_RADIUS_LEN); return; -trunc: - nd_print_trunc(ndo); +invalid: + nd_print_invalid(ndo); }