[LON-CAPA-cvs] cvs: loncom /auth lonshibacc.pm

[raeburn]

raeburn		Fri Jan 23 15:57:27 2015 EDT

  Modified files:              
    /loncom/auth	lonshibacc.pm 
  Log:
  - Shibboleth SSO - regexp used for extraction of <username> from eppn 
    (for which format is <username>@somewhere.edu) made consistent with
    $LONCAPA::match_username regexp (aside from @ separator). 
  
  
Index: loncom/auth/lonshibacc.pm
diff -u loncom/auth/lonshibacc.pm:1.1 loncom/auth/lonshibacc.pm:1.2
--- loncom/auth/lonshibacc.pm:1.1	Mon Mar  5 20:51:29 2012
+++ loncom/auth/lonshibacc.pm	Fri Jan 23 15:57:27 2015
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Authorization handler for Shibboleth authenticated users
 #
-# $Id: lonshibacc.pm,v 1.1 2012/03/05 20:51:29 raeburn Exp $
+# $Id: lonshibacc.pm,v 1.2 2015/01/23 15:57:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -72,7 +72,7 @@
         if ($udom ne '') {
             my $uprimary_id = &Apache::lonnet::domain($udom,'primary');
             my $uint_dom = &Apache::lonnet::internet_dom($uprimary_id);
-            if ($user =~ /^(\w+)\@\Q$uint_dom\E$/i) {
+            if ($user =~ /^(\w[a-zA-Z0-9_\-.]+)\@\Q$uint_dom\E$/i) {
                 my $username = $1;
                 $user = $r->user($username);
             }