Skip to content
This repository has been archived by the owner on Feb 28, 2024. It is now read-only.

Commit

Permalink
Merge branch 'master' of github.com:kravietz/pam_tacplus
Browse files Browse the repository at this point in the history
  • Loading branch information
@kravietz
kravietz committed Jan 14, 2020
2 parents 8cd254b + e5503c8 commit a21b05c
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 9 deletions.
2 changes: 1 addition & 1 deletion libtac/lib/magic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ magic()
exit(1);
}
if(ret < (ssize_t) sizeof(num)) {
TACSYSLOG(LOG_CRIT,"%s: getrandom less bytes than expected: %ld vs %lu", __FUNCTION__, ret, sizeof(num));
TACSYSLOG(LOG_CRIT,"%s: getrandom less bytes than expected: %zd vs %zu", __FUNCTION__, ret, sizeof(num));
exit(1);
}
return num;
Expand Down
13 changes: 13 additions & 0 deletions pam_tacplus.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
static tacplus_server_t active_server;
struct addrinfo active_addrinfo;
struct sockaddr active_sockaddr;
struct sockaddr_in6 active_sockaddr6;
char active_key[TAC_SECRET_MAX_LEN+1];

/* accounting task identifier */
Expand All @@ -60,9 +61,21 @@ static short int task_id = 0;
static void set_active_server (const tacplus_server_t *tac_svr)
{
active_addrinfo.ai_addr = &active_sockaddr;
memset(&active_server, 0, sizeof(tacplus_server_t));
memset(&active_addrinfo, 0, sizeof(struct addrinfo));
memset(&active_sockaddr, 0, sizeof(struct sockaddr));
memset(&active_sockaddr6, 0, sizeof(struct sockaddr_in6));

if ((tac_svr) && (tac_svr->addr->ai_family == AF_INET6)) {
active_addrinfo.ai_addr = (struct sockaddr *)&active_sockaddr6;
} else {
active_addrinfo.ai_addr = &active_sockaddr;
}
tac_copy_addr_info (&active_addrinfo, tac_svr->addr);
strncpy (active_key, tac_svr->key ? tac_svr->key : "", TAC_SECRET_MAX_LEN-1);
active_server.addr = &active_addrinfo;
syslog(LOG_DEBUG, "%s: active server set as [%s]", __FUNCTION__,
tac_ntop(active_server.addr->ai_addr));
active_server.key = active_key;
}

Expand Down
60 changes: 52 additions & 8 deletions support.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ char tac_protocol[64];
char tac_prompt[64];
struct addrinfo tac_srv_addr[TAC_PLUS_MAXSERVERS];
struct sockaddr tac_sock_addr[TAC_PLUS_MAXSERVERS];
char tac_srv_key[TAC_PLUS_MAXSERVERS][TAC_SECRET_MAX_LEN + 1];

struct sockaddr_in6 tac_sock6_addr[TAC_PLUS_MAXSERVERS];
char tac_srv_key[TAC_PLUS_MAXSERVERS][TAC_SECRET_MAX_LEN+1];

void _pam_log(int err, const char *format, ...) {
char msg[256];
Expand Down Expand Up @@ -182,19 +184,47 @@ void tac_copy_addr_info(struct addrinfo *p_dst, const struct addrinfo *p_src) {
p_dst->ai_socktype = p_src->ai_socktype;
p_dst->ai_protocol = p_src->ai_protocol;
p_dst->ai_addrlen = p_src->ai_addrlen;
memcpy(p_dst->ai_addr, p_src->ai_addr, sizeof(struct sockaddr));

/* ipv6 check */
if (p_dst->ai_family == AF_INET6) {
memcpy (p_dst->ai_addr, p_src->ai_addr, sizeof(struct sockaddr_in6));
memset ((struct sockaddr_in6*)p_dst->ai_addr, 0 , sizeof(struct sockaddr_in6));
memcpy ((struct sockaddr_in6*)p_dst->ai_addr, (struct sockaddr_in6*)p_src->ai_addr, sizeof(struct sockaddr_in6));
} else {
memcpy (p_dst->ai_addr, p_src->ai_addr, sizeof(struct sockaddr));
}

p_dst->ai_canonname = NULL; /* we do not care it */
p_dst->ai_next = NULL; /* no more chain */
}
}

static void set_tac_srv_addr(unsigned int srv_no, const struct addrinfo *addr) {
static void set_tac_srv_addr (unsigned int srv_no, const struct addrinfo *addr)
{
_pam_log(LOG_DEBUG, "%s: server [%s]", __FUNCTION__,
tac_ntop(addr->ai_addr));

if (srv_no < TAC_PLUS_MAXSERVERS) {
if (addr) {
if (addr->ai_family == AF_INET6) {
tac_srv_addr[srv_no].ai_addr = (struct sockaddr *)&tac_sock6_addr[srv_no];
} else {
tac_srv_addr[srv_no].ai_addr = &tac_sock_addr[srv_no];
tac_copy_addr_info(&tac_srv_addr[srv_no], addr);
tac_srv[srv_no].addr = &tac_srv_addr[srv_no];
} else {
}
tac_copy_addr_info (&tac_srv_addr[srv_no], addr);
tac_srv[srv_no].addr = &tac_srv_addr[srv_no];

/*this code will copy the ipv6 address to a temp variable */
/*and copies to global tac_srv array*/
if (addr->ai_family == AF_INET6) {
memset (&tac_sock6_addr[srv_no], 0, sizeof(struct sockaddr_in6));
memcpy (&tac_sock6_addr[srv_no], (struct sockaddr_in6*)addr->ai_addr, sizeof(struct sockaddr_in6));
tac_srv[srv_no].addr->ai_addr = (struct sockaddr *)&tac_sock6_addr[srv_no];
}
_pam_log(LOG_DEBUG, "%s: server %d after copy [%s]", __FUNCTION__, srv_no,
tac_ntop(tac_srv[srv_no].addr->ai_addr));
}
else {
tac_srv[srv_no].addr = NULL;
}
}
Expand All @@ -205,7 +235,10 @@ static void set_tac_srv_key(unsigned int srv_no, const char *key) {
if (key) {
strncpy(tac_srv_key[srv_no], key, TAC_SECRET_MAX_LEN - 1);
tac_srv[srv_no].key = tac_srv_key[srv_no];
} else {
}
else {
_pam_log(LOG_DEBUG, "%s: server %d key is null; address [%s]", __FUNCTION__,srv_no,
tac_ntop(tac_srv[srv_no].addr->ai_addr));
tac_srv[srv_no].key = NULL;
}
}
Expand All @@ -217,6 +250,9 @@ int _pam_parse(int argc, const char **argv) {

/* otherwise the list will grow with each call */
memset(tac_srv, 0, sizeof(tacplus_server_t) * TAC_PLUS_MAXSERVERS);
memset(&tac_srv_addr, 0, sizeof(struct addrinfo) * TAC_PLUS_MAXSERVERS);
memset(&tac_sock_addr, 0, sizeof(struct sockaddr) * TAC_PLUS_MAXSERVERS);
memset(&tac_sock6_addr, 0, sizeof(struct sockaddr_in6) * TAC_PLUS_MAXSERVERS);
tac_srv_no = 0;

tac_service[0] = 0;
Expand Down Expand Up @@ -255,6 +291,7 @@ int _pam_parse(int argc, const char **argv) {
char *close_bracket, *server_name, *port, server_buf[256];

memset(&hints, 0, sizeof hints);
memset(&server_buf, 0, sizeof(server_buf));
hints.ai_family = AF_UNSPEC; /* use IPv4 or IPv6, whichever */
hints.ai_socktype = SOCK_STREAM;

Expand All @@ -267,6 +304,9 @@ int _pam_parse(int argc, const char **argv) {
if (*server_buf == '[' &&
(close_bracket = strchr(server_buf, ']')) != NULL) { /* Check for URI syntax */
server_name = server_buf + 1;
_pam_log (LOG_ERR,
"reading server address as: %s ",
server_name);
port = strchr(close_bracket, ':');
*close_bracket = '\0';
} else { /* Fall back to traditional syntax */
Expand All @@ -277,14 +317,18 @@ int _pam_parse(int argc, const char **argv) {
*port = '\0';
port++;
}
_pam_log (LOG_DEBUG,
"sending server address to getaddrinfo as: %s ",
server_name);
if ((rv = getaddrinfo(server_name, (port == NULL) ? "49" : port, &hints, &servers)) == 0) {
for (server = servers;
server != NULL && tac_srv_no < TAC_PLUS_MAXSERVERS; server = server->ai_next) {
set_tac_srv_addr(tac_srv_no, server);
set_tac_srv_key(tac_srv_no, current_secret);
tac_srv_no++;
}
freeaddrinfo(servers);
_pam_log(LOG_DEBUG, "%s: server index %d ", __FUNCTION__, tac_srv_no);
freeaddrinfo (servers);
} else {
_pam_log(LOG_ERR,
"skip invalid server: %s (getaddrinfo: %s)",
Expand Down

0 comments on commit a21b05c

Please sign in to comment.