denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use username part of RFC822 IDs for PAM authentication

Browse Source
This commit is contained in:
Martin Willi
2008-08-25 07:47:16 +00:00
parent 822901061b
commit 1995f79f10
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/plugins/eap_gtc/eap_gtc.c
+9 -3
View File
@@ -23,7 +23,7 @@
#include <security/pam_appl.h> #include <security/pam_appl.h>
#define GTC_REQUEST_MSG "login" #define GTC_REQUEST_MSG "password"
#define GTC_PAM_SERVICE "login" #define GTC_PAM_SERVICE "login"
typedef struct private_eap_gtc_t private_eap_gtc_t; typedef struct private_eap_gtc_t private_eap_gtc_t;
@@ -166,7 +166,7 @@ static status_t process_peer(private_eap_gtc_t *this,
if (shared == NULL) if (shared == NULL)
{ {
DBG1(DBG_IKE, "no EAP key found for '%D' - '%D'", DBG1(DBG_IKE, "no EAP key found for '%D' - '%D'",
this->server, this->peer); this->peer, this->server);
return FAILED; return FAILED;
} }
key = shared->get_key(shared); key = shared->get_key(shared);
@@ -195,7 +195,7 @@ static status_t process_server(private_eap_gtc_t *this,
eap_payload_t *in, eap_payload_t **out) eap_payload_t *in, eap_payload_t **out)
{ {
chunk_t data, encoding; chunk_t data, encoding;
char *user, *password, *service; char *user, *password, *service, *pos;
data = chunk_skip(in->get_data(in), 5); data = chunk_skip(in->get_data(in), 5);
if (this->identifier != in->get_identifier(in) || !data.len) if (this->identifier != in->get_identifier(in) || !data.len)
@@ -205,6 +205,12 @@ static status_t process_server(private_eap_gtc_t *this,
} }
encoding = this->peer->get_encoding(this->peer); encoding = this->peer->get_encoding(this->peer);
/* if a RFC822_ADDR id is provided, we use the username part only */
pos = memchr(encoding.ptr, '@', encoding.len);
if (pos)
{
encoding.len = (u_char*)pos - encoding.ptr;
}
user = alloca(encoding.len + 1); user = alloca(encoding.len + 1);
memcpy(user, encoding.ptr, encoding.len); memcpy(user, encoding.ptr, encoding.len);
user[encoding.len] = '\0'; user[encoding.len] = '\0';