--- loncom/interface/lonuserutils.pm 2019/08/22 19:31:20 1.184.4.4
+++ loncom/interface/lonuserutils.pm 2017/11/04 16:13:31 1.191
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Utility functions for managing LON-CAPA user accounts
#
-# $Id: lonuserutils.pm,v 1.184.4.4 2019/08/22 19:31:20 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.191 2017/11/04 16:13:31 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -438,7 +438,7 @@ sub javascript_validations {
} elsif ($context eq 'domain') {
$setsection_call = 'setCourse()';
$setsections_js = &dc_setcourse_js($param{'formname'},$mode,
- $context,$showcredits,$domain);
+ $context,$showcredits);
}
$finish = " var checkSec = $setsection_call\n".
" if (checkSec == 'ok') {\n".
@@ -531,24 +531,20 @@ END
/* regexp here to check for non \d \. in credits */
END
} else {
- my ($numrules,$intargjs) =
- &passwd_validation_js('vf.elements[current.argfield].value',$domain);
$auth_checks .= (<<END);
foundatype=1;
if (current.argfield == null || current.argfield == '') {
- // The login radiobutton checked does not have an associated textbox
- } else if (vf.elements[current.argfield].value == '') {
var alertmsg = '';
switch (current.radiovalue) {
case 'krb':
alertmsg = '$alert{'krb'}';
break;
case 'loc':
- case 'int':
+ case 'fsys':
alertmsg = '$alert{'ipass'}';
break;
case 'fsys':
- alertmsg = '$alert{'ipass'}';
+ alertmsg = '';
break;
default:
alertmsg = '';
@@ -557,10 +553,6 @@ END
alert(alertmsg);
return;
}
- } else if (current.radiovalue == 'int') {
- if ($numrules > 0) {
-$intargjs
- }
}
END
}
@@ -649,136 +641,6 @@ END
$section_checks.$authheader;
return $result;
}
-
-sub passwd_validation_js {
- my ($currpasswdval,$domain) = @_;
- my %passwdconf = &Apache::lonnet::get_passwdconf($domain);
- my ($min,$max,@chars,$numrules,$intargjs,%alert);
- $numrules = 0;
- if (ref($passwdconf{'chars'}) eq 'ARRAY') {
- if ($passwdconf{'min'} =~ /^\d+$/) {
- $min = $passwdconf{'min'};
- $numrules ++;
- }
- if ($passwdconf{'max'} =~ /^\d+$/) {
- $max = $passwdconf{'max'};
- $numrules ++;
- }
- @chars = @{$passwdconf{'chars'}};
- if (@chars) {
- $numrules ++;
- }
- } else {
- $min = 7;
- $numrules ++;
- }
- if (($min ne '') || ($max ne '') || (@chars > 0)) {
- my $alertmsg = &mt('Initial password did not satisfy requirement(s):').'\n\n';
- if ($min) {
- $alert{'min'} = &mt('minimum [quant,_1,character]',$min).'\n';
- }
- if ($max) {
- $alert{'max'} = &mt('maximum [quant,_1,character]',$max).'\n';
- }
- my (@charalerts,@charrules);
- if (@chars) {
- if (grep(/^uc$/,@chars)) {
- push(@charalerts,&mt('contain at least one upper case letter'));
- push(@charrules,'uc');
- }
- if (grep(/^lc$/,@chars)) {
- push(@charalerts,&mt('contain at least one lower case letter'));
- push(@charrules,'lc');
- }
- if (grep(/^num$/,@chars)) {
- push(@charalerts,&mt('contain at least one number'));
- push(@charrules,'num');
- }
- if (grep(/^spec$/,@chars)) {
- push(@charalerts,&mt('contain at least one non-alphanumeric'));
- push(@charrules,'spec');
- }
- }
- $intargjs = qq| var rulesmsg = '';\n|.
- qq| var currpwval = $currpasswdval;\n|;
- if ($min) {
- $intargjs .= qq|
- if (currpwval.length < $min) {
- rulesmsg += ' - $alert{min}';
- }
-|;
- }
- if ($max) {
- $intargjs .= qq|
- if (currpwval.length > $max) {
- rulesmsg += ' - $alert{max}';
- }
-|;
- }
- if (@chars > 0) {
- my $charrulestr = '"'.join('","',@charrules).'"';
- my $charalertstr = '"'.join('","',@charalerts).'"';
- $intargjs .= qq| var brokerules = new Array();\n|.
- qq| var charrules = new Array($charrulestr);\n|.
- qq| var charalerts = new Array($charalertstr);\n|;
- my %rules;
- map { $rules{$_} = 1; } @chars;
- if ($rules{'uc'}) {
- $intargjs .= qq|
- var ucRegExp = /[A-Z]/;
- if (!ucRegExp.test(currpwval)) {
- brokerules.push('uc');
- }
-|;
- }
- if ($rules{'lc'}) {
- $intargjs .= qq|
- var lcRegExp = /[a-z]/;
- if (!lcRegExp.test(currpwval)) {
- brokerules.push('lc');
- }
-|;
- }
- if ($rules{'num'}) {
- $intargjs .= qq|
- var numRegExp = /[0-9]/;
- if (!numRegExp.test(currpwval)) {
- brokerules.push('num');
- }
-|;
- }
- if ($rules{'spec'}) {
- $intargjs .= q|
- var specRegExp = /[!"#$%&'()*+,\-.\/:;<=>?@[\\^\]_`{\|}~]/;
- if (!specRegExp.test(currpwval)) {
- brokerules.push('spec');
- }
-|;
- }
- $intargjs .= qq|
- if (brokerules.length > 0) {
- for (var i=0; i<brokerules.length; i++) {
- for (var j=0; j<charrules.length; j++) {
- if (brokerules[i] == charrules[j]) {
- rulesmsg += ' - '+charalerts[j]+'\\n';
- break;
- }
- }
- }
- }
-|;
- }
- $intargjs .= qq|
- if (rulesmsg != '') {
- rulesmsg = '$alertmsg'+rulesmsg;
- alert(rulesmsg);
- return false;
- }
-|;
- }
- return ($numrules,$intargjs);
-}
-
###############################################################
###############################################################
sub upload_manager_javascript_forward_associate {
@@ -1081,8 +943,14 @@ sub print_upload_manager_footer {
&Apache::lonhtmlcommon::row_closure();
}
+ my ($trusted,$untrusted);
+ if ($context eq 'course') {
+ ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('enroll',$defdom);
+ } elsif ($context eq 'author') {
+ ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('othcoau',$defdom);
+ }
$Str .= &Apache::lonhtmlcommon::row_title(&mt('Default domain'))
- .&Apache::loncommon::select_dom_form($defdom,'defaultdomain',undef,1)
+ .&Apache::loncommon::select_dom_form($defdom,'defaultdomain',undef,1,undef,$trusted,$untrusted)
.&Apache::lonhtmlcommon::row_closure();
$Str .= &Apache::lonhtmlcommon::row_title(&mt('Starting and Ending Dates'))
@@ -1264,11 +1132,6 @@ sub print_upload_manager_form {
&Apache::loncommon::load_tmp_file($r,$datatoken);
}
}
- if ($datatoken eq '') {
- $r->print('<p class="LC_error">'.&mt('Error').': '.
- &mt('Invalid datatoken').'</p>');
- return 'missingdata';
- }
my @records=&Apache::loncommon::upfile_record_sep();
if($env{'form.noFirstLine'}){
$firstLine=shift(@records);
@@ -1351,7 +1214,6 @@ sub print_upload_manager_form {
}
&print_upload_manager_footer($r,$i,$keyfields,$defdom,$today,$halfyear,
$context,$permission,$crstype,$showcredits);
- return 'ok';
}
sub setup_date_selectors {
@@ -2425,6 +2287,7 @@ sub build_user_record {
sub courses_selector {
my ($cdom,$formname) = @_;
+ my %coursecodes = ();
my %codes = ();
my @codetitles = ();
my %cat_titles = ();
@@ -2437,15 +2300,14 @@ sub courses_selector {
my $jscript = '';
my $totcodes = 0;
- my $instcats = &Apache::lonnet::get_dom_instcats($cdom);
- if (ref($instcats) eq 'HASH') {
- if ((ref($instcats->{'codetitles'}) eq 'ARRAY') && (ref($instcats->{'codes'}) eq 'HASH') &&
- (ref($instcats->{'cat_titles'}) eq 'HASH') && (ref($instcats->{'cat_order'}) eq 'HASH')) {
- %codes = %{$instcats->{'codes'}};
- @codetitles = @{$instcats->{'codetitles'}};
- %cat_titles = %{$instcats->{'cat_titles'}};
- %cat_order = %{$instcats->{'cat_order'}};
- $totcodes = scalar(keys(%codes));
+ $totcodes =
+ &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,
+ $cdom,$totcodes);
+ if ($totcodes > 0) {
+ $format_reply =
+ &Apache::lonnet::auto_instcode_format($caller,$cdom,\%coursecodes,
+ \%codes,\@codetitles,\%cat_titles,\%cat_order);
+ if ($format_reply eq 'ok') {
my $numtypes = @codetitles;
&Apache::courseclassifier::build_code_selections(\%codes,\@codetitles,\%cat_titles,\%cat_order,\%idlist,\%idnums,\%idlist_titles);
my ($scripttext,$longtitles) = &Apache::courseclassifier::javascript_definitions(\@codetitles,\%idlist,\%idlist_titles,\%idnums,\%cat_titles);
@@ -4243,7 +4105,7 @@ sub print_first_users_upload_form {
.&Apache::lonhtmlcommon::end_pick_box();
$str .= '<p>'
- .'<input type="button" name="fileupload" value="'.&mt('Next').'"'
+ .'<input type="submit" name="fileupload" value="'.&mt('Next').'"'
.' onclick="javascript:checkUpload(this.form);" />'
.'</p>';
@@ -4271,6 +4133,10 @@ sub upfile_drop_add {
$fields{$env{'form.f'.$i}}=$keyfields[$i];
}
}
+ if ($env{'form.fullup'} ne 'yes') {
+ $r->print('<form name="studentform" method="post" action="/adm/createuser">'."\n".
+ '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />');
+ }
#
# Store the field choices away
my @storefields = qw/username names fname mname lname gen id
@@ -4284,17 +4150,19 @@ sub upfile_drop_add {
$fieldstype{$field.'_choice'} = 'scalar';
}
&Apache::loncommon::store_course_settings('enrollment_upload',\%fieldstype);
- my ($cid,$crstype,$setting);
+ my ($cid,$crstype,$setting,$crsdom);
if ($context eq 'domain') {
$setting = $env{'form.roleaction'};
}
if ($env{'request.course.id'} ne '') {
$cid = $env{'request.course.id'};
$crstype = &Apache::loncommon::course_type();
+ $crsdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
} elsif ($setting eq 'course') {
if (&Apache::lonnet::is_course($env{'form.dcdomain'},$env{'form.dccourse'})) {
$cid = $env{'form.dcdomain'}.'_'.$env{'form.dccourse'};
$crstype = &Apache::loncommon::course_type($cid);
+ $crsdom = $env{'form.dcdomain'};
}
}
my ($startdate,$enddate) = &get_dates_from_form();
@@ -4305,7 +4173,56 @@ sub upfile_drop_add {
my $defdom=$env{'request.role.domain'};
my $domain;
if ($env{'form.defaultdomain'} ne '') {
- $domain = $env{'form.defaultdomain'};
+ if (($context eq 'course') || ($setting eq 'course')) {
+ if ($env{'form.defaultdomain'} eq $crsdom) {
+ $domain = $env{'form.defaultdomain'};
+ } else {
+ if (&Apache::lonnet::will_trust('enroll',$crsdom,$env{'form.defaultdomain'})) {
+ $domain = $env{'form.defaultdomain'};
+ } else {
+ $r->print('<span class="LC_error">'.&mt('Error').
+ &mt('Enrollment of users not permitted for specified default domain: [_1].',
+ &Apache::lonnet::domain($env{'form.defaultdomain'},'description')).'</span>');
+ if ($env{'form.fullup'} ne 'yes') {
+ $r->print('</form>');
+ }
+ return;
+ }
+ }
+ } elsif ($context eq 'author') {
+ if ($env{'form.defaultdomain'} eq $defdom) {
+ $domain = $env{'form.defaultdomain'};
+ } else {
+ if ((&Apache::lonnet::will_trust('othcoau',$defdom,$env{'form.defaultdomain'})) &&
+ (&Apache::lonnet::will_trust('coaurem',$env{'form.defaultdomain'},$defdom))) {
+ $domain = $env{'form.defaultdomain'};
+ } else {
+ $r->print('<span class="LC_error">'.&mt('Error').
+ &mt('Addition of users not permitted for specified default domain: [_1].',
+ &Apache::lonnet::domain($env{'form.defaultdomain'},'description')).'</span>');
+ if ($env{'form.fullup'} ne 'yes') {
+ $r->print('</form>');
+ }
+ return;
+ }
+ }
+ } elsif (($context eq 'domain') && ($setting eq 'domain')) {
+ if ($env{'form.defaultdomain'} eq $defdom) {
+ $domain = $env{'form.defaultdomain'};
+ } else {
+ if (&Apache::lonnet::will_trust('domroles',$defdom,$env{'form.defaultdomain'})) {
+ $domain = $env{'form.defaultdomain'};
+ } else {
+ $r->print('<span class="LC_error">'.&mt('Error').
+ &mt('Addition of users not permitted for specified default domain: [_1].',
+ &Apache::lonnet::domain($env{'form.defaultdomain'},'description')).'</span>');
+ if ($env{'form.fullup'} ne 'yes') {
+ $r->print('</form>');
+ }
+ return;
+ }
+ }
+ }
} else {
$domain = $defdom;
}
@@ -4315,10 +4232,12 @@ sub upfile_drop_add {
} else {
my %home_servers = &Apache::lonnet::get_servers($defdom,'library');
if (! exists($home_servers{$desiredhost})) {
- $r->print('<p class="LC_error">'.&mt('Error').': '.
- &mt('Invalid home server specified').'</p>');
- $r->print(&Apache::loncommon::end_page());
- return 'invalidhome';
+ $r->print('<span class="LC_error">'.&mt('Error').
+ &mt('Invalid home server specified').'</span>');
+ if ($env{'form.fullup'} ne 'yes') {
+ $r->print('</form>');
+ }
+ return;
}
}
# Determine authentication mechanism
@@ -4328,7 +4247,6 @@ sub upfile_drop_add {
}
my $amode = '';
my $genpwd = '';
- my @genpwdfail;
if ($env{'form.login'} eq 'krb') {
$amode='krb';
$amode.=$env{'form.krbver'};
@@ -4337,8 +4255,6 @@ sub upfile_drop_add {
$amode='internal';
if ((defined($env{'form.intarg'})) && ($env{'form.intarg'})) {
$genpwd=$env{'form.intarg'};
- @genpwdfail =
- &Apache::loncommon::check_passwd_rules($domain,$genpwd);
}
} elsif ($env{'form.login'} eq 'loc') {
$amode='localauth';
@@ -4417,14 +4333,10 @@ sub upfile_drop_add {
\@statuses,\@poss_roles);
&gather_userinfo($context,'view',\%userlist,$indexhash,\%info,
\%cstr_roles,$permission);
+
}
}
}
- if ($datatoken eq '') {
- $r->print('<p class="LC_error">'.&mt('Error').': '.
- &mt('Invalid datatoken').'</p>');
- return 'missingdata';
- }
if ( $domain eq &LONCAPA::clean_domain($domain)
&& ($amode ne '')) {
#######################################
@@ -4494,9 +4406,9 @@ sub upfile_drop_add {
my $newuserdom = $env{'request.role.domain'};
map { $cancreate{$_} = &can_create_user($newuserdom,$context,$_); } keys(%longtypes);
# Get new users list
- my (%existinguser,%userinfo,%disallow,%rulematch,%inst_results,%alerts,%checkuname,
- %showpasswdrules,$haspasswdmap);
+ my (%existinguser,%userinfo,%disallow,%rulematch,%inst_results,%alerts,%checkuname);
my $counter = -1;
+ my (%willtrust,%trustchecked);
foreach my $line (@userdata) {
$counter ++;
my @secs;
@@ -4544,6 +4456,28 @@ sub upfile_drop_add {
'"<b>'.$entries{$fields{'domain'}}.'</b>"',
$fname,$mname,$lname,$gen);
next;
+ } elsif ($entries{$fields{'domain'}} ne $domain) {
+ my $possdom = $entries{$fields{'domain'}};
+ if ($context eq 'course' || $setting eq 'course') {
+ unless ($trustchecked{$possdom}) {
+ $willtrust{$possdom} = &Apache::lonnet::will_trust('enroll',$domain,$possdom);
+ $trustchecked{$possdom} = 1;
+ }
+ } elsif ($context eq 'author') {
+ unless ($trustchecked{$possdom}) {
+ $willtrust{$possdom} = &Apache::lonnet::will_trust('othcoau',$domain,$possdom);
+ }
+ if ($willtrust{$possdom}) {
+ $willtrust{$possdom} = &Apache::lonnet::will_trust('coaurem',$possdom,$domain);
+ }
+ }
+ unless ($willtrust{$possdom}) {
+ $disallow{$counter} =
+ &mt('Unacceptable domain [_1] for user [_2] [_3] [_4] [_5]',
+ '"<b>'.$possdom.'</b>"',
+ $fname,$mname,$lname,$gen);
+ next;
+ }
}
my $username = $entries{$fields{'username'}};
my $userdomain = $entries{$fields{'domain'}};
@@ -4623,44 +4557,12 @@ sub upfile_drop_add {
}
}
# determine user password
- my $password;
- my $passwdfromfile;
+ my $password = $genpwd;
if (defined($fields{'ipwd'})) {
if ($entries{$fields{'ipwd'}}) {
$password=$entries{$fields{'ipwd'}};
- $passwdfromfile = 1;
- if ($env{'form.login'} eq 'int') {
- my $uhome=&Apache::lonnet::homeserver($username,$userdomain);
- if (($uhome eq 'no_host') || ($changeauth)) {
- my @brokepwdrules =
- &Apache::loncommon::check_passwd_rules($domain,$password);
- if (@brokepwdrules) {
- $disallow{$counter} = &mt('[_1]: Password included in file for this user did not meet requirements.',
- '<b>'.$username.'</b>');
- map { $showpasswdrules{$_} = 1; } @brokepwdrules;
- next;
- }
- }
- }
}
}
- unless ($passwdfromfile) {
- if ($env{'form.login'} eq 'int') {
- if (@genpwdfail) {
- my $uhome=&Apache::lonnet::homeserver($username,$userdomain);
- if (($uhome eq 'no_host') || ($changeauth)) {
- $disallow{$counter} = &mt('[_1]: No specific password in file for this user; default password did not meet requirements',
- '<b>'.$username.'</b>');
- unless ($haspasswdmap) {
- map { $showpasswdrules{$_} = 1; } @genpwdfail;
- $haspasswdmap = 1;
- }
- }
- next;
- }
- }
- $password = $genpwd;
- }
# determine user role
my $role = '';
if (defined($fields{'role'})) {
@@ -5010,9 +4912,7 @@ sub upfile_drop_add {
"</p>\n");
if ($counts{'role'} > 0) {
$r->print("<p>\n".
- &mt('Roles added for [quant,_1,user].',$counts{'role'}).' '.
- &mt('If a user is currently logged-in to LON-CAPA, any new roles which are active will be available when the user next logs in.').
- "</p>\n");
+ &mt('Roles added for [quant,_1,user].',$counts{'role'}).' '.&mt('If a user is currently logged-in to LON-CAPA, any new roles which are active will be available when the user next logs in.')."</p>\n");
} else {
$r->print('<p>'.&mt('No roles added').'</p>');
}
@@ -5022,7 +4922,6 @@ sub upfile_drop_add {
$counts{'auth'})."</p>\n");
}
$r->print(&print_namespacing_alerts($domain,\%alerts,\%curr_rules));
- $r->print(&passwdrule_alerts($domain,\%showpasswdrules));
#####################################
# Display list of students to drop #
#####################################
@@ -5031,9 +4930,10 @@ sub upfile_drop_add {
# Get current classlist
my $classlist = &Apache::loncoursedata::get_classlist();
if (! defined($classlist)) {
- $r->print('<p class="LC_info">'.
- &mt('There are no students with current/future access to the course.').
- '</p>'."\n");
+ $r->print('<form name="studentform" method="post" action="/adm/createuser">'.
+ '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'.
+ '<p class="LC_info">'.&mt('There are no students with current/future access to the course.').'</p>'.
+ '</form>'."\n");
} elsif (ref($classlist) eq 'HASH') {
# Remove the students we just added from the list of students.
foreach my $line (@userdata) {
@@ -5049,7 +4949,9 @@ sub upfile_drop_add {
}
}
} # end of unless
- return 'ok';
+ if ($env{'form.fullup'} ne 'yes') {
+ $r->print('</form>');
+ }
}
sub print_namespacing_alerts {
@@ -5092,38 +4994,6 @@ sub print_namespacing_alerts {
}
}
-sub passwdrule_alerts {
- my ($domain,$passwdrules) = @_;
- my $warning;
- if (ref($passwdrules) eq 'HASH') {
- my %showrules = %{$passwdrules};
- if (keys(%showrules)) {
- my %passwdconf = &Apache::lonnet::get_passwdconf($domain);
- $warning = '<b>'.&mt('Password requirement(s) unmet for one or more users:').'</b><ul>';
- if ($showrules{'min'}) {
- $warning .= '<li>'.&mt('minimum [quant,_1,character]',$passwdconf{'min'}).'</li>';
- }
- if ($showrules{'max'}) {
- $warning .= '<li>'.&mt('maximum [quant,_1,character]',$passwdconf{'max'}).'</li>';
- }
- if ($showrules{'uc'}) {
- $warning .= '<li>'.&mt('contain at least one upper case letter').'</li>';
- }
- if ($showrules{'lc'}) {
- $warning .= '<li>'.&mt('contain at least one lower case letter').'</li>';
- }
- if ($showrules{'num'}) {
- $warning .= '<li>'.&mt('contain at least one number').'</li>';
- }
- if ($showrules{'spec'}) {
- $warning .= '<li>'.&mt('contain at least one non-alphanumeric').'</li>';
- }
- $warning .= '</ul>';
- }
- }
- return $warning;
-}
-
sub user_change_result {
my ($r,$userresult,$authresult,$roleresult,$idresult,$counts,$flushc,
$username,$userdomain,$userchg) = @_;
@@ -6205,7 +6075,7 @@ sub get_course_identity {
}
sub dc_setcourse_js {
- my ($formname,$mode,$context,$showcredits,$domain) = @_;
+ my ($formname,$mode,$context,$showcredits) = @_;
my ($dc_setcourse_code,$authen_check);
my $cctext = &Apache::lonnet::plaintext('cc');
my $cotext = &Apache::lonnet::plaintext('co');
@@ -6214,7 +6084,7 @@ sub dc_setcourse_js {
if ($mode eq 'upload') {
$role = 'courserole';
} else {
- $authen_check = &verify_authen($formname,$context,$domain);
+ $authen_check = &verify_authen($formname,$context);
}
$dc_setcourse_code = (<<"SCRIPTTOP");
$authen_check
@@ -6358,14 +6228,12 @@ ENDSCRIPT
}
sub verify_authen {
- my ($formname,$context,$domain) = @_;
+ my ($formname,$context) = @_;
my %alerts = &authcheck_alerts();
my $finish = "return 'ok';";
if ($context eq 'author') {
$finish = "document.$formname.submit();";
}
- my ($numrules,$intargjs) =
- &passwd_validation_js('argpicked',$domain);
my $outcome = <<"ENDSCRIPT";
function auth_check() {
@@ -6399,7 +6267,6 @@ function auth_check() {
break;
case 'int':
alertmsg = '$alerts{'ipass'}';
- break;
case 'fsys':
alertmsg = '$alerts{'ipass'}';
break;
@@ -6413,11 +6280,6 @@ function auth_check() {
alert(alertmsg);
return;
}
- } else if (logintype == 'int') {
- var numrules = $numrules;
- if (numrules > 0) {
-$intargjs
- }
}
$finish
}