Skip to content

Commit

Permalink
Replace deprecated bcopy() by memcpy()
Browse files Browse the repository at this point in the history
  • Loading branch information
@kravietz
kravietz committed Oct 17, 2021
1 parent 47389ed commit 6380c5a
Show file tree
Hide file tree
Showing 8 changed files with 294 additions and 251 deletions.
130 changes: 73 additions & 57 deletions libtac/lib/acct_r.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,31 +32,34 @@
* LIBTAC_STATUS_PROTOCOL_ERR
* >= 0 : server response, see TAC_PLUS_AUTHEN_STATUS_...
*/
int tac_acct_read_timeout(int fd, struct areply *re, unsigned long timeout) {
int tac_acct_read_timeout(int fd, struct areply *re, unsigned long timeout)
{
HDR th;
struct acct_reply *tb = NULL;
size_t ulen_from_header, len_from_body;
ssize_t spacket_read;
char *msg = NULL;
int timeleft = 0;
int timeleft = 0;
re->attr = NULL; /* unused */
re->msg = NULL;

if (tac_readtimeout_enable &&
tac_read_wait(fd,timeout*1000, TAC_PLUS_HDR_SIZE,&timeleft) < 0 ) {
TACSYSLOG(LOG_ERR,\
"%s: reply timeout after %lu secs", __FUNCTION__, timeout);
tac_read_wait(fd, timeout * 1000, TAC_PLUS_HDR_SIZE, &timeleft) < 0)
{
TACSYSLOG(LOG_ERR,
"%s: reply timeout after %lu secs", __FUNCTION__, timeout);
re->msg = xstrdup(acct_syserr_msg);
re->status = LIBTAC_STATUS_READ_TIMEOUT;
free(tb);
return re->status;
}

spacket_read = read(fd, &th, TAC_PLUS_HDR_SIZE);
if(spacket_read < TAC_PLUS_HDR_SIZE) {
TACSYSLOG(LOG_ERR,\
"%s: short reply header, read %zd of %u expected: %m", __FUNCTION__,\
spacket_read, TAC_PLUS_HDR_SIZE);
if (spacket_read < TAC_PLUS_HDR_SIZE)
{
TACSYSLOG(LOG_ERR,
"%s: short reply header, read %zd of %u expected: %m", __FUNCTION__,
spacket_read, TAC_PLUS_HDR_SIZE);
re->msg = xstrdup(acct_syserr_msg);
re->status = LIBTAC_STATUS_SHORT_HDR;
free(tb);
Expand All @@ -65,107 +68,120 @@ int tac_acct_read_timeout(int fd, struct areply *re, unsigned long timeout) {

/* check the reply fields in header */
msg = _tac_check_header(&th, TAC_PLUS_ACCT);
if(msg != NULL) {
if (msg != NULL)
{
re->msg = xstrdup(msg);
re->status = LIBTAC_STATUS_PROTOCOL_ERR;
free(tb);
TACDEBUG(LOG_DEBUG, "%s: exit status=%d, status message \"%s\"",\
__FUNCTION__, re->status, re->msg != NULL ? re->msg : "");
TACDEBUG(LOG_DEBUG, "%s: exit status=%d, status message \"%s\"",
__FUNCTION__, re->status, re->msg != NULL ? re->msg : "");
return re->status;
}

ulen_from_header = ntohl(th.datalength);
if (ulen_from_header > TAC_PLUS_MAX_PACKET_SIZE) {
TACSYSLOG(LOG_ERR,\
"%s: length declared in the packet %zu exceeds max allowed packet size %d",\
__FUNCTION__,\
ulen_from_header, TAC_PLUS_MAX_PACKET_SIZE);
re->status=LIBTAC_STATUS_SHORT_HDR;
if (ulen_from_header > TAC_PLUS_MAX_PACKET_SIZE)
{
TACSYSLOG(LOG_ERR,
"%s: length declared in the packet %zu exceeds max allowed packet size %d",
__FUNCTION__,
ulen_from_header, TAC_PLUS_MAX_PACKET_SIZE);
re->status = LIBTAC_STATUS_SHORT_HDR;
free(tb);
return re->status;
}
tb=(struct acct_reply *) xcalloc(1, ulen_from_header);
tb = (struct acct_reply *)xcalloc(1, ulen_from_header);

/* read reply packet body */
if (tac_readtimeout_enable &&
tac_read_wait(fd,timeleft,ulen_from_header,NULL) < 0 ) {
TACSYSLOG(LOG_ERR,\
"%s: reply timeout after %lu secs", __FUNCTION__, timeout);
tac_read_wait(fd, timeleft, ulen_from_header, NULL) < 0)
{
TACSYSLOG(LOG_ERR,
"%s: reply timeout after %lu secs", __FUNCTION__, timeout);
re->msg = xstrdup(acct_syserr_msg);
re->status = LIBTAC_STATUS_READ_TIMEOUT;
free(tb);
return re->status;
}

spacket_read = read(fd, tb, ulen_from_header);
if(spacket_read < (ssize_t) ulen_from_header) {
TACSYSLOG(LOG_ERR,\
"%s: short reply body, read %zd of %zu: %m",\
__FUNCTION__,\
spacket_read, ulen_from_header);
if (spacket_read < (ssize_t)ulen_from_header)
{
TACSYSLOG(LOG_ERR,
"%s: short reply body, read %zd of %zu: %m",
__FUNCTION__,
spacket_read, ulen_from_header);
re->msg = xstrdup(acct_syserr_msg);
re->status = LIBTAC_STATUS_SHORT_BODY;
free(tb);
return re->status;
}

/* decrypt the body */
_tac_crypt((unsigned char *) tb, &th);
_tac_crypt((unsigned char *)tb, &th);

/* Convert network byte order to host byte order */
tb->msg_len = ntohs(tb->msg_len);
tb->msg_len = ntohs(tb->msg_len);
tb->data_len = ntohs(tb->data_len);

/* check the length fields */
len_from_body=sizeof(tb->msg_len) + sizeof(tb->data_len) +
sizeof(tb->status) + tb->msg_len + tb->data_len;

if(ulen_from_header != len_from_body) {
TACSYSLOG(LOG_ERR,\
"%s: inconsistent reply body, incorrect key?",\
__FUNCTION__);
len_from_body = sizeof(tb->msg_len) + sizeof(tb->data_len) +
sizeof(tb->status) + tb->msg_len + tb->data_len;

if (ulen_from_header != len_from_body)
{
TACSYSLOG(LOG_ERR,
"%s: inconsistent reply body, incorrect key?",
__FUNCTION__);
re->msg = xstrdup(acct_syserr_msg);
re->status = LIBTAC_STATUS_PROTOCOL_ERR;
free(tb);
return re->status;
}

/* save status and clean up */
if(tb->msg_len) {
msg=(char *) xcalloc(1, tb->msg_len+1);
bcopy((unsigned char *) tb+TAC_ACCT_REPLY_FIXED_FIELDS_SIZE, msg, tb->msg_len);
if (tb->msg_len)
{
msg = (char *)xcalloc(1, tb->msg_len + 1);
memcpy(msg, (unsigned char *)tb + TAC_ACCT_REPLY_FIXED_FIELDS_SIZE, tb->msg_len);
msg[(int)tb->msg_len] = '\0';
re->msg = msg; /* Freed by caller */
re->msg = msg;
free(msg);
}

/* server logged our request successfully */
if (tb->status == TAC_PLUS_ACCT_STATUS_SUCCESS) {
if (tb->status == TAC_PLUS_ACCT_STATUS_SUCCESS)
{
TACDEBUG(LOG_DEBUG, "%s: accounted ok", __FUNCTION__);
if (!re->msg) re->msg = xstrdup(acct_ok_msg);
if (!re->msg)
re->msg = xstrdup(acct_ok_msg);
re->status = tb->status;
free(tb);
return re->status;
}

TACDEBUG(LOG_DEBUG, "%s: accounting failed, server reply status=%d",\
__FUNCTION__, tb->status);
switch(tb->status) {
case TAC_PLUS_ACCT_STATUS_FOLLOW:
re->status = tb->status;
if (!re->msg) re->msg=xstrdup(acct_fail_msg);
break;

case TAC_PLUS_ACCT_STATUS_ERROR:
default:
re->status = tb->status;
if (!re->msg) re->msg=xstrdup(acct_err_msg);
break;
TACDEBUG(LOG_DEBUG, "%s: accounting failed, server reply status=%d",
__FUNCTION__, tb->status);
switch (tb->status)
{
case TAC_PLUS_ACCT_STATUS_FOLLOW:
re->status = tb->status;
if (!re->msg)
re->msg = xstrdup(acct_fail_msg);
break;

case TAC_PLUS_ACCT_STATUS_ERROR:
default:
re->status = tb->status;
if (!re->msg)
re->msg = xstrdup(acct_err_msg);
break;
}

free(tb);
return re->status;
}

int tac_acct_read(int fd, struct areply *re) {
return tac_acct_read_timeout(fd, re, tac_timeout);
int tac_acct_read(int fd, struct areply *re)
{
return tac_acct_read_timeout(fd, re, tac_timeout);
}
Loading

0 comments on commit 6380c5a

Please sign in to comment.