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

xauth-pam: Make trimming of email addresses optional

Browse Source 
Fixes #430.
This commit is contained in:
Tobias Brunner
2013-10-04 10:49:54 +02:00
parent d2e4dd75b7
commit 3e3db3743e
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
man/strongswan.conf.5.in
+4
View File
@@ -757,6 +757,10 @@ EAP plugin to be used as backend for XAuth credential verification
.TP .TP
.BR charon.plugins.xauth-pam.pam_service " [login]" .BR charon.plugins.xauth-pam.pam_service " [login]"
PAM service to be used for authentication PAM service to be used for authentication
.TP
.BR charon.plugins.xauth-pam.trim_email " [yes]"
If an email address is given as an XAuth username, trim it to just the
username part.
.SS libstrongswan section .SS libstrongswan section
.TP .TP
.BR libstrongswan.cert_cache " [yes]" .BR libstrongswan.cert_cache " [yes]"
src/libcharon/plugins/xauth_pam/xauth_pam.c
+9 -4
View File
@@ -134,12 +134,17 @@ METHOD(xauth_method_t, process, status_t,
switch (attr->get_type(attr)) switch (attr->get_type(attr))
{ {
case XAUTH_USER_NAME: case XAUTH_USER_NAME:
/* trim to username part if email address given */
chunk = attr->get_chunk(attr); chunk = attr->get_chunk(attr);
pos = memchr(chunk.ptr, '@', chunk.len); /* trim to username part if email address given */
if (pos) if (lib->settings->get_bool(lib->settings,
"%s.plugins.xauth-pam.trim_email",
TRUE, charon->name))
{ {
chunk.len = (u_char*)pos - chunk.ptr; pos = memchr(chunk.ptr, '@', chunk.len);
if (pos)
{
chunk.len = (u_char*)pos - chunk.ptr;
}
} }
attr2string(user, sizeof(user), chunk); attr2string(user, sizeof(user), chunk);
break; break;