deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-11 19:17:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Constrain User ID between 1 and 63. ID - 3519225

Browse Source 
Fix and testing done by Duncan Idaho
This commit is contained in:
Jim Mankovich 2012-04-27 12:12:56 +00:00
parent 373e4fe28d
commit fbd0c88ae6
1 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
ipmitool/lib/ipmi_user.c
View File

@ -57,7 +57,9 @@ extern int csv_output;
#define IPMI_PASSWORD_ENABLE_USER 0x01 #define IPMI_PASSWORD_ENABLE_USER 0x01
#define IPMI_PASSWORD_SET_PASSWORD 0x02 #define IPMI_PASSWORD_SET_PASSWORD 0x02
#define IPMI_PASSWORD_TEST_PASSWORD 0x03 #define IPMI_PASSWORD_TEST_PASSWORD 0x03
/* IPMI spec. - UID 0 reserved, 63 maximum UID that can be used */
#define IPMI_UID_MIN 1
#define IPMI_UID_MAX 63
/* /*
* ipmi_get_user_access * ipmi_get_user_access
@ -212,7 +214,27 @@ dump_user_access_csv(
ipmi_privlvl_vals)); ipmi_privlvl_vals));
} }
/* get_ipmi_user_id - convert str to uint8_t and make sure value is within UID
* limits
*
* @arg: string we are converting from, usually argv[]
* @user_id: pointer at uint8_t to store converted value.
* returns: 0 on success, (-1) null args or conv. err/range issue
*/
int
get_ipmi_user_id(const char * arg, uint8_t * user_id)
{
if (arg && user_id)
{
if ((str2uchar(arg, user_id) == 0) && *user_id >= IPMI_UID_MIN
&& *user_id <= IPMI_UID_MAX)
{
return 0;
}
} /* if (arg && user_id) */
lprintf(LOG_ERR, "User ID is limited to range <1..63>.");
return (-1);
} /* get_ipmi_user_id(...) */
static int static int
ipmi_print_user_list( ipmi_print_user_list(
@ -256,7 +278,7 @@ ipmi_print_user_list(
++current_user_id; ++current_user_id;
} while((current_user_id <= user_access.maximum_ids) && } while((current_user_id <= user_access.maximum_ids) &&
(current_user_id <= 63)); /* Absolute maximum allowed by spec */ (current_user_id <= IPMI_UID_MAX)); /* Absolute maximum allowed by spec */
return 0; return 0;
@ -596,11 +618,8 @@ ipmi_user_main(struct ipmi_intf * intf, int argc, char ** argv)
char * password = NULL; char * password = NULL;
int password_length = atoi(argv[2]); int password_length = atoi(argv[2]);
uint8_t user_id = 0; uint8_t user_id = 0;
if (str2uchar(argv[1], &user_id) != 0 || user_id == 0) if (get_ipmi_user_id(argv[1], &user_id))
{
lprintf(LOG_ERR, "Invalid user ID: %s", argv[1]);
return (-1); return (-1);
}
if (argc == 3) if (argc == 3)
{ {
@ -652,11 +671,8 @@ ipmi_user_main(struct ipmi_intf * intf, int argc, char ** argv)
{ {
char * password = NULL; char * password = NULL;
uint8_t user_id = 0; uint8_t user_id = 0;
if (str2uchar(argv[2], &user_id) != 0 || user_id == 0) if (get_ipmi_user_id(argv[2], &user_id))
{
lprintf(LOG_ERR, "Invalid user ID: %s", argv[2]);
return (-1); return (-1);
}
if (argc == 3) if (argc == 3)
{ {
@ -727,11 +743,9 @@ ipmi_user_main(struct ipmi_intf * intf, int argc, char ** argv)
print_user_usage(); print_user_usage();
return -1; return -1;
} }
if (str2uchar(argv[2], &user_id) != 0) if (get_ipmi_user_id(argv[2], &user_id))
{ return (-1);
lprintf(LOG_ERR, "Invalid user ID: %s", argv[2]);
return (-1);
}
retval = ipmi_user_set_username(intf, user_id, argv[3]); retval = ipmi_user_set_username(intf, user_id, argv[3]);
} }
else else
@ -770,11 +784,8 @@ ipmi_user_main(struct ipmi_intf * intf, int argc, char ** argv)
} }
priv_level = (priv_level & 0x0f); priv_level = (priv_level & 0x0f);
if (str2uchar(argv[1], &user_id) != 0 || user_id == 0) if (get_ipmi_user_id(argv[1], &user_id))
{
lprintf(LOG_ERR, "Invalid user ID: %s", argv[1]);
return (-1); return (-1);
}
retval = ipmi_user_set_userpriv(intf,channel,user_id,priv_level); retval = ipmi_user_set_userpriv(intf,channel,user_id,priv_level);
} }
@ -797,11 +808,8 @@ ipmi_user_main(struct ipmi_intf * intf, int argc, char ** argv)
return -1; return -1;
} }
if (str2uchar(argv[1], &user_id) != 0 || user_id == 0) if (get_ipmi_user_id(argv[1], &user_id))
{
lprintf(LOG_ERR, "Invalid user ID: %s", user_id);
return (-1); return (-1);
}
operation = (strncmp(argv[0], "disable", 7) == 0) ? operation = (strncmp(argv[0], "disable", 7) == 0) ?
IPMI_PASSWORD_DISABLE_USER : IPMI_PASSWORD_ENABLE_USER; IPMI_PASSWORD_DISABLE_USER : IPMI_PASSWORD_ENABLE_USER;