mirror of
https://github.com/ipmitool/ipmitool.git
synced 2025-05-10 18:47:22 +00:00
Hook ipmi_print_user_list() and friends to _ipmi_* functions
Commit hooks ipmi_print_user_list() and related functions to new _ipmi_* functions. It also removes old/unused functions and user_access_rsp struct.
This commit is contained in:
Zdenek Styblik
parent
bcb96209c5
commit
d6deeb264e
@ -43,55 +43,6 @@
|
|||||||
#define IPMI_USER_ENABLE_DISABLED 0x80
|
#define IPMI_USER_ENABLE_DISABLED 0x80
|
||||||
#define IPMI_USER_ENABLE_RESERVED 0xC0
|
#define IPMI_USER_ENABLE_RESERVED 0xC0
|
||||||
|
|
||||||
/*
|
|
||||||
* The GET USER ACCESS response from table 22-32 of the IPMI v2.0 spec
|
|
||||||
*/
|
|
||||||
struct user_access_rsp {
|
|
||||||
#if WORDS_BIGENDIAN
|
|
||||||
uint8_t __reserved1 : 2;
|
|
||||||
uint8_t maximum_ids : 6;
|
|
||||||
#else
|
|
||||||
uint8_t maximum_ids : 6;
|
|
||||||
uint8_t __reserved1 : 2;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if WORDS_BIGENDIAN
|
|
||||||
uint8_t __reserved2 : 2;
|
|
||||||
uint8_t enabled_user_count : 6;
|
|
||||||
#else
|
|
||||||
uint8_t enabled_user_count : 6;
|
|
||||||
uint8_t __reserved2 : 2;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if WORDS_BIGENDIAN
|
|
||||||
uint8_t __reserved3 : 2;
|
|
||||||
uint8_t fixed_name_count : 6;
|
|
||||||
#else
|
|
||||||
uint8_t fixed_name_count : 6;
|
|
||||||
uint8_t __reserved3 : 2;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_PRAGMA_PACK
|
|
||||||
#pragma pack(1)
|
|
||||||
#endif
|
|
||||||
#if WORDS_BIGENDIAN
|
|
||||||
uint8_t __reserved4 : 1;
|
|
||||||
uint8_t no_callin_access : 1;
|
|
||||||
uint8_t link_auth_access : 1;
|
|
||||||
uint8_t ipmi_messaging_access : 1;
|
|
||||||
uint8_t channel_privilege_limit : 4;
|
|
||||||
#else
|
|
||||||
uint8_t channel_privilege_limit : 4;
|
|
||||||
uint8_t ipmi_messaging_access : 1;
|
|
||||||
uint8_t link_auth_access : 1;
|
|
||||||
uint8_t no_callin_access : 1;
|
|
||||||
uint8_t __reserved4 : 1;
|
|
||||||
#endif
|
|
||||||
} ATTRIBUTE_PACKING;
|
|
||||||
#ifdef HAVE_PRAGMA_PACK
|
|
||||||
#pragma pack(0)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* (22.27) Get and (22.26) Set User Access */
|
/* (22.27) Get and (22.26) Set User Access */
|
||||||
struct user_access_t {
|
struct user_access_t {
|
||||||
uint8_t callin_callback;
|
uint8_t callin_callback;
|
||||||
|
|||||||
223
lib/ipmi_user.c
223
lib/ipmi_user.c
@ -179,204 +179,85 @@ _ipmi_set_user_access(struct ipmi_intf *intf,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* ipmi_get_user_access
|
|
||||||
*
|
|
||||||
* param intf [in]
|
|
||||||
* param channel_number [in]
|
|
||||||
* param user_id [in]
|
|
||||||
* param user_access [out]
|
|
||||||
*
|
|
||||||
* return 0 on succes
|
|
||||||
* 1 on failure
|
|
||||||
*/
|
|
||||||
static int
|
|
||||||
ipmi_get_user_access(
|
|
||||||
struct ipmi_intf *intf,
|
|
||||||
uint8_t channel_number,
|
|
||||||
uint8_t user_id,
|
|
||||||
struct user_access_rsp *user_access)
|
|
||||||
{
|
|
||||||
struct ipmi_rs * rsp;
|
|
||||||
struct ipmi_rq req;
|
|
||||||
uint8_t msg_data[2];
|
|
||||||
|
|
||||||
memset(&req, 0, sizeof(req));
|
|
||||||
req.msg.netfn = IPMI_NETFN_APP; /* 0x06 */
|
|
||||||
req.msg.cmd = IPMI_GET_USER_ACCESS; /* 0x44 */
|
|
||||||
req.msg.data = msg_data;
|
|
||||||
req.msg.data_len = 2;
|
|
||||||
|
|
||||||
|
|
||||||
/* The channel number will remain constant throughout this function */
|
|
||||||
msg_data[0] = channel_number;
|
|
||||||
msg_data[1] = user_id;
|
|
||||||
|
|
||||||
rsp = intf->sendrecv(intf, &req);
|
|
||||||
|
|
||||||
if (rsp == NULL) {
|
|
||||||
lprintf(LOG_ERR, "Get User Access command failed "
|
|
||||||
"(channel %d, user %d)", channel_number, user_id);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
if (rsp->ccode > 0) {
|
|
||||||
lprintf(LOG_ERR, "Get User Access command failed "
|
|
||||||
"(channel %d, user %d): %s", channel_number, user_id,
|
|
||||||
val2str(rsp->ccode, completion_code_vals));
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
memcpy(user_access,
|
|
||||||
rsp->data,
|
|
||||||
sizeof(struct user_access_rsp));
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* ipmi_get_user_name
|
|
||||||
*
|
|
||||||
* param intf [in]
|
|
||||||
* param channel_number [in]
|
|
||||||
* param user_id [in]
|
|
||||||
* param user_name [out]
|
|
||||||
*
|
|
||||||
* return 0 on succes
|
|
||||||
* 1 on failure
|
|
||||||
*/
|
|
||||||
static int
|
|
||||||
ipmi_get_user_name(
|
|
||||||
struct ipmi_intf *intf,
|
|
||||||
uint8_t user_id,
|
|
||||||
char *user_name)
|
|
||||||
{
|
|
||||||
struct ipmi_rs * rsp;
|
|
||||||
struct ipmi_rq req;
|
|
||||||
uint8_t msg_data[1];
|
|
||||||
|
|
||||||
memset(user_name, 0, 17);
|
|
||||||
|
|
||||||
memset(&req, 0, sizeof(req));
|
|
||||||
req.msg.netfn = IPMI_NETFN_APP; /* 0x06 */
|
|
||||||
req.msg.cmd = IPMI_GET_USER_NAME; /* 0x45 */
|
|
||||||
req.msg.data = msg_data;
|
|
||||||
req.msg.data_len = 1;
|
|
||||||
|
|
||||||
msg_data[0] = user_id;
|
|
||||||
|
|
||||||
rsp = intf->sendrecv(intf, &req);
|
|
||||||
|
|
||||||
if (rsp == NULL) {
|
|
||||||
lprintf(LOG_ERR, "Get User Name command failed (user %d)",
|
|
||||||
user_id);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
if (rsp->ccode > 0) {
|
|
||||||
if (rsp->ccode == 0xcc)
|
|
||||||
return 0;
|
|
||||||
lprintf(LOG_ERR, "Get User Name command failed (user %d): %s",
|
|
||||||
user_id, val2str(rsp->ccode, completion_code_vals));
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
memcpy(user_name, rsp->data, 16);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
dump_user_access(
|
dump_user_access(const char *user_name,
|
||||||
uint8_t user_id,
|
struct user_access_t *user_access)
|
||||||
const char * user_name,
|
|
||||||
struct user_access_rsp * user_access)
|
|
||||||
{
|
{
|
||||||
static int printed_header = 0;
|
static int printed_header = 0;
|
||||||
|
if (!printed_header) {
|
||||||
if (! printed_header)
|
|
||||||
{
|
|
||||||
printf("ID Name Callin Link Auth IPMI Msg "
|
printf("ID Name Callin Link Auth IPMI Msg "
|
||||||
"Channel Priv Limit\n");
|
"Channel Priv Limit\n");
|
||||||
printed_header = 1;
|
printed_header = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
printf("%-4d%-17s%-8s%-11s%-11s%-s\n",
|
printf("%-4d%-17s%-8s%-11s%-11s%-s\n",
|
||||||
user_id,
|
user_access->user_id,
|
||||||
user_name,
|
user_name,
|
||||||
user_access->no_callin_access? "false": "true ",
|
user_access->callin_callback? "false": "true ",
|
||||||
user_access->link_auth_access? "true ": "false",
|
user_access->link_auth? "true ": "false",
|
||||||
user_access->ipmi_messaging_access? "true ": "false",
|
user_access->ipmi_messaging? "true ": "false",
|
||||||
val2str(user_access->channel_privilege_limit,
|
val2str(user_access->privilege_limit,
|
||||||
ipmi_privlvl_vals));
|
ipmi_privlvl_vals));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
dump_user_access_csv(
|
dump_user_access_csv(const char *user_name,
|
||||||
uint8_t user_id,
|
struct user_access_t *user_access)
|
||||||
const char *user_name,
|
|
||||||
struct user_access_rsp *user_access)
|
|
||||||
{
|
{
|
||||||
printf("%d,%s,%s,%s,%s,%s\n",
|
printf("%d,%s,%s,%s,%s,%s\n",
|
||||||
user_id,
|
user_access->user_id,
|
||||||
user_name,
|
user_name,
|
||||||
user_access->no_callin_access? "false": "true",
|
user_access->callin_callback? "false": "true",
|
||||||
user_access->link_auth_access? "true": "false",
|
user_access->link_auth? "true": "false",
|
||||||
user_access->ipmi_messaging_access? "true": "false",
|
user_access->ipmi_messaging? "true": "false",
|
||||||
val2str(user_access->channel_privilege_limit,
|
val2str(user_access->privilege_limit,
|
||||||
ipmi_privlvl_vals));
|
ipmi_privlvl_vals));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* ipmi_print_user_list - List IPMI Users and their ACLs for given channel.
|
||||||
|
*
|
||||||
|
* @intf - IPMI interface
|
||||||
|
* @channel_number - IPMI channel
|
||||||
|
*
|
||||||
|
* returns - 0 on success, (-1) on error
|
||||||
|
*/
|
||||||
static int
|
static int
|
||||||
ipmi_print_user_list(
|
ipmi_print_user_list(struct ipmi_intf *intf, uint8_t channel_number)
|
||||||
struct ipmi_intf *intf,
|
|
||||||
uint8_t channel_number)
|
|
||||||
{
|
{
|
||||||
/* This is where you were! */
|
struct user_access_t user_access = {0};
|
||||||
char user_name[17];
|
struct user_name_t user_name = {0};
|
||||||
struct user_access_rsp user_access;
|
int ccode = 0;
|
||||||
uint8_t current_user_id = 1;
|
uint8_t current_user_id = 1;
|
||||||
|
do {
|
||||||
|
memset(&user_access, 0, sizeof(user_access));
|
||||||
do
|
user_access.user_id = current_user_id;
|
||||||
{
|
user_access.channel = channel_number;
|
||||||
if (ipmi_get_user_access(intf,
|
ccode = _ipmi_get_user_access(intf, &user_access);
|
||||||
channel_number,
|
if (eval_ccode(ccode) != 0) {
|
||||||
current_user_id,
|
return (-1);
|
||||||
&user_access))
|
}
|
||||||
return -1;
|
memset(&user_name, 0, sizeof(user_name));
|
||||||
|
user_name.user_id = current_user_id;
|
||||||
|
ccode = _ipmi_get_user_name(intf, &user_name);
|
||||||
if (ipmi_get_user_name(intf,
|
if (eval_ccode(ccode) != 0) {
|
||||||
current_user_id,
|
return (-1);
|
||||||
user_name))
|
}
|
||||||
return -1;
|
if ((current_user_id == 0)
|
||||||
|
|| user_access.link_auth
|
||||||
if ((current_user_id == 0) ||
|
|| user_access.ipmi_messaging
|
||||||
user_access.link_auth_access ||
|
|| strcmp("", (char *)user_name.user_name)) {
|
||||||
user_access.ipmi_messaging_access ||
|
if (csv_output) {
|
||||||
strcmp("", user_name))
|
dump_user_access_csv((char *)user_name.user_name,
|
||||||
{
|
&user_access);
|
||||||
if (csv_output)
|
} else {
|
||||||
dump_user_access_csv(current_user_id,
|
dump_user_access((char *)user_name.user_name,
|
||||||
user_name, &user_access);
|
|
||||||
else
|
|
||||||
dump_user_access(current_user_id,
|
|
||||||
user_name,
|
|
||||||
&user_access);
|
&user_access);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
++current_user_id;
|
++current_user_id;
|
||||||
} while((current_user_id <= user_access.maximum_ids) &&
|
} while ((current_user_id <= user_access.max_user_ids)
|
||||||
(current_user_id <= IPMI_UID_MAX)); /* Absolute maximum allowed by spec */
|
&& (current_user_id <= IPMI_UID_MAX));
|
||||||
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user