--- loncom/interface/lonuserutils.pm 2019/08/27 13:26:02 1.184.4.6
+++ loncom/interface/lonuserutils.pm 2019/05/04 19:57:29 1.196
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Utility functions for managing LON-CAPA user accounts
#
-# $Id: lonuserutils.pm,v 1.184.4.6 2019/08/27 13:26:02 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.196 2019/05/04 19:57:29 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -550,6 +550,7 @@ END
case 'fsys':
alertmsg = '$alert{'ipass'}';
break;
+ case 'lti':
default:
alertmsg = '';
}
@@ -655,12 +656,10 @@ sub passwd_validation_js {
my %passwdconf = &Apache::lonnet::get_passwdconf($domain);
my ($min,$max,@chars,$numrules,$intargjs,%alert);
$numrules = 0;
- $min = $Apache::lonnet::passwdmin;
if (ref($passwdconf{'chars'}) eq 'ARRAY') {
if ($passwdconf{'min'} =~ /^\d+$/) {
- if ($passwdconf{'min'} > $min) {
- $min = $passwdconf{'min'};
- }
+ $min = $passwdconf{'min'};
+ $numrules ++;
}
if ($passwdconf{'max'} =~ /^\d+$/) {
$max = $passwdconf{'max'};
@@ -670,11 +669,11 @@ sub passwd_validation_js {
if (@chars) {
$numrules ++;
}
- }
- if ($min > 0) {
+ } else {
+ $min = 7;
$numrules ++;
}
- if (($min > 0) || ($max ne '') || (@chars > 0)) {
+ 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';
@@ -751,7 +750,7 @@ sub passwd_validation_js {
}
if ($rules{'spec'}) {
$intargjs .= q|
- var specRegExp = /[!"#$%&'()*+,\-.\/:;<=>?@[\\^\]_`{\|}~]/;
+ var specRegExp = /[!"#$%&'()*+,\-.\/:;<=>?@[\\\]^_`{\|}~]/;
if (!specRegExp.test(currpwval)) {
brokerules.push('spec');
}
@@ -774,7 +773,7 @@ sub passwd_validation_js {
if (rulesmsg != '') {
rulesmsg = '$alertmsg'+rulesmsg;
alert(rulesmsg);
- return false;
+ return;
}
|;
}
@@ -1038,6 +1037,7 @@ sub print_upload_manager_footer {
my $krbform = &Apache::loncommon::authform_kerberos(%param);
my $intform = &Apache::loncommon::authform_internal(%param);
my $locform = &Apache::loncommon::authform_local(%param);
+ my $ltiform = &Apache::loncommon::authform_lti(%param);
my $date_table = &date_setting_table(undef,undef,$context,undef,
$formname,$permission,$crstype);
@@ -1066,7 +1066,7 @@ sub print_upload_manager_footer {
&Apache::loncommon::help_open_topic('Auth_Options').
"</p>\n";
}
- $Str .= &set_login($defdom,$krbform,$intform,$locform);
+ $Str .= &set_login($defdom,$krbform,$intform,$locform,$ltiform);
my ($home_server_pick,$numlib) =
&Apache::loncommon::home_server_form_item($defdom,'lcserver',
@@ -1083,8 +1083,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'))
@@ -2427,6 +2433,7 @@ sub build_user_record {
sub courses_selector {
my ($cdom,$formname) = @_;
+ my %coursecodes = ();
my %codes = ();
my @codetitles = ();
my %cat_titles = ();
@@ -2439,15 +2446,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);
@@ -4245,7 +4251,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>';
@@ -4286,17 +4292,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();
@@ -4307,7 +4315,47 @@ 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>');
+ return 'untrusted';
+ }
+ }
+ } 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>');
+ return 'untrusted';
+ }
+ }
+ } 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>');
+ return 'untrusted';
+ }
+ }
+ }
} else {
$domain = $defdom;
}
@@ -4319,7 +4367,6 @@ sub upfile_drop_add {
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';
}
}
@@ -4330,7 +4377,6 @@ sub upfile_drop_add {
}
my $amode = '';
my $genpwd = '';
- my @genpwdfail;
if ($env{'form.login'} eq 'krb') {
$amode='krb';
$amode.=$env{'form.krbver'};
@@ -4339,14 +4385,14 @@ 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';
if ((defined($env{'form.locarg'})) && ($env{'form.locarg'})) {
$genpwd=$env{'form.locarg'};
}
+ } elsif ($env{'form.login'} eq 'lti') {
+ $amode='lti';
}
if ($amode =~ /^krb/) {
if (! defined($genpwd) || $genpwd eq '') {
@@ -4419,6 +4465,7 @@ sub upfile_drop_add {
\@statuses,\@poss_roles);
&gather_userinfo($context,'view',\%userlist,$indexhash,\%info,
\%cstr_roles,$permission);
+
}
}
}
@@ -4496,9 +4543,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;
@@ -4546,6 +4593,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'}};
@@ -4625,43 +4694,11 @@ 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 = '';
@@ -4730,7 +4767,7 @@ sub upfile_drop_add {
&mt('The user does not already exist, and you may not create a new user in a different domain.');
next;
} else {
- unless ($password || $env{'form.login'} eq 'loc') {
+ unless (($password ne '') || ($env{'form.login'} eq 'loc') || ($env{'form.login'} eq 'lti')) {
$disallow{$counter} =
&mt('[_1]: This is a new user but no default password was provided, and the authentication type requires one.',
'<b>'.$username.'</b>');
@@ -5024,7 +5061,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 #
#####################################
@@ -5094,38 +5130,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) = @_;
@@ -5629,7 +5633,7 @@ END
}
sub set_login {
- my ($dom,$authformkrb,$authformint,$authformloc) = @_;
+ my ($dom,$authformkrb,$authformint,$authformloc,$authformlti) = @_;
my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom);
my $response;
my ($authnum,%can_assign) =
@@ -5651,6 +5655,11 @@ sub set_login {
'<td>'.$authformloc.'</td>'.
&Apache::loncommon::end_data_table_row()."\n";
}
+ if ($can_assign{'lti'}) {
+ $response .= &Apache::loncommon::start_data_table_row().
+ '<td>'.$authformlti.'</td>'.
+ &Apache::loncommon::end_data_table_row()."\n";
+ }
$response .= &Apache::loncommon::end_data_table();
}
return $response;
@@ -6005,26 +6014,7 @@ sub can_change_internalpass {
unless ($env{'course.'.$env{'request.course.id'}.'.internal.nopasswdchg'}) {
my ($cnum,$cdom) = &get_course_identity();
if ((&Apache::lonnet::is_course_owner($cdom,$cnum)) && ($udom eq $env{'user.domain'})) {
- my @userstatuses = ('default');
- my %userenv = &Apache::lonnet::userenvironment($udom,$uname,'inststatus');
- if ($userenv{'inststatus'} ne '') {
- @userstatuses = split(/:/,$userenv{'inststatus'});
- }
- my $noupdate = 1;
- my %passwdconf = &Apache::lonnet::get_passwdconf($cdom);
- if (ref($passwdconf{'crsownerchg'}) eq 'HASH') {
- if (ref($passwdconf{'crsownerchg'}{'for'}) eq 'ARRAY') {
- foreach my $status (@userstatuses) {
- if (grep(/^\Q$status\E$/,@{$passwdconf{'crsownerchg'}{'for'}})) {
- undef($noupdate);
- last;
- }
- }
- }
- }
- if ($noupdate) {
- return;
- }
+ my $noupdate;
my %owned = &Apache::lonnet::courseiddump($cdom,'.',1,'.',
$env{'user.name'}.':'.$env{'user.domain'},
undef,undef,undef,'.');