[LON-CAPA-cvs] cvs: loncom /auth lonacc.pm /interface createaccount.pm

[raeburn]

raeburn		Thu Jan 30 12:15:12 2014 EDT

  Modified files:              
    /loncom/interface	createaccount.pm 
    /loncom/auth	lonacc.pm 
  Log:
  - Support access to Shibboleth environment variables defined in 
    attribute-map.xml via %ENV, when user without a LON-CAPA account
    authenticates via Shibboleth SSO.
  
  
Index: loncom/interface/createaccount.pm
diff -u loncom/interface/createaccount.pm:1.56 loncom/interface/createaccount.pm:1.57
--- loncom/interface/createaccount.pm:1.56	Wed Jun  5 12:46:39 2013
+++ loncom/interface/createaccount.pm	Thu Jan 30 12:15:06 2014
@@ -3,7 +3,7 @@
 # institutional log-in ID (institutional authentication required - localauth
 #  or kerberos) or an e-mail address.
 #
-# $Id: createaccount.pm,v 1.56 2013/06/05 12:46:39 raeburn Exp $
+# $Id: createaccount.pm,v 1.57 2014/01/30 12:15:06 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -56,8 +56,8 @@
 
     my $domain;
 
-    my $sso_username = $r->subprocess_env->get('REDIRECT_SSOUserUnknown');
-    my $sso_domain = $r->subprocess_env->get('REDIRECT_SSOUserDomain');
+    my $sso_username = $r->subprocess_env->get('SSOUserUnknown');
+    my $sso_domain = $r->subprocess_env->get('SSOUserDomain');
 
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['token','courseid','domain']);
Index: loncom/auth/lonacc.pm
diff -u loncom/auth/lonacc.pm:1.152 loncom/auth/lonacc.pm:1.153
--- loncom/auth/lonacc.pm:1.152	Fri Jan 24 04:38:14 2014
+++ loncom/auth/lonacc.pm	Thu Jan 30 12:15:12 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.152 2014/01/24 04:38:14 raeburn Exp $
+# $Id: lonacc.pm,v 1.153 2014/01/30 12:15:12 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -402,11 +402,13 @@
             }
         }
         if (grep(/^sso$/, at cancreate)) {
-            $r->internal_redirect('/adm/createaccount');
+            $r->set_handlers('PerlHandler'=>
+                     [\&Apache::createaccount::handler]);
+            $r->handler('perl-script');
         } else {
 	    $r->internal_redirect($r->dir_config('lonSSOUserUnknownRedirect'));
+            $r->set_handlers('PerlHandler'=> undef);
         }
-	$r->set_handlers('PerlHandler'=> undef);
 	return OK;
     }
     return undef;