--- loncom/interface/courseprefs.pm	2022/02/15 04:28:01	1.102
+++ loncom/interface/courseprefs.pm	2022/04/06 14:35:27	1.111
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set configuration settings for a course
 #
-# $Id: courseprefs.pm,v 1.102 2022/02/15 04:28:01 raeburn Exp $
+# $Id: courseprefs.pm,v 1.111 2022/04/06 14:35:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -224,6 +224,7 @@ use Apache::lonparmset;
 use Apache::courseclassifier;
 use Apache::lonlocal;
 use LONCAPA qw(:DEFAULT :match);
+use Crypt::CBC;
 
 my $registered_cleanup;
 my $modified_courses;
@@ -600,10 +601,14 @@ sub handler {
     );
     if (($phase eq 'process') && ($parm_permission->{'process'})) {
         my @allitems = &get_allitems(%prefs);
-        &Apache::lonconfigsettings::make_changes($r,$cdom,$phase,$context,
-                                                 \@prefs_order,\%prefs,\%values,
-                                                  $cnum,undef,\@allitems,
-                                                  'coursepref',$parm_permission);
+        my $result = &Apache::lonconfigsettings::make_changes($r,$cdom,$phase,$context,
+                                                              \@prefs_order,\%prefs,\%values,
+                                                              $cnum,undef,\@allitems,
+                                                              'coursepref',$parm_permission);
+        if ((ref($result) eq 'HASH') && (keys(%{$result}))) {
+            $r->rflush();
+            &devalidate_remote_courseprefs($cdom,$cnum,$result);
+        }
     } elsif (($phase eq 'display') && ($parm_permission->{'display'})) {
         my $noedit;
         if (ref($parm_permission) eq 'HASH') {
@@ -811,7 +816,7 @@ sub print_config_box {
 }
 
 sub process_changes {
-    my ($cdom,$cnum,$action,$values,$item,$changes,$allitems,$disallowed,$crstype) = @_;
+    my ($cdom,$cnum,$action,$values,$item,$changes,$allitems,$disallowed,$crstype,$lastactref) = @_;
     my (%newvalues,$errors);
     if (ref($item) eq 'HASH') {
         if (ref($changes) eq 'HASH') {
@@ -980,7 +985,7 @@ sub process_changes {
                     }
                 } elsif ($action eq 'linkprot') {
                     if (ref($values) eq 'HASH') {
-                        $errors = &process_linkprot($cdom,$cnum,$values->{$action},$changes,'course');
+                        $errors = &process_linkprot($cdom,$cnum,$values->{$action},$changes,'course',$lastactref);
                     }
                 } else {
                     foreach my $entry (@ordered) {
@@ -1476,8 +1481,8 @@ sub process_changes {
 }
 
 sub process_linkprot {
-    my ($cdom,$cnum,$values,$changes,$context) = @_;
-    my ($dest,$ltiauth,$errors,%linkprot);
+    my ($cdom,$cnum,$values,$changes,$context,$lastactref) = @_;
+    my ($home,$dest,$ltiauth,$privkey,$privnum,$cipher,$errors,%linkprot);
     if (ref($values) eq 'HASH') {
         foreach my $id (keys(%{$values})) {
             if ($id =~ /^\d+$/) {
@@ -1487,6 +1492,31 @@ sub process_linkprot {
             }
         }
     }
+    my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
+    my @ids=&Apache::lonnet::current_machine_ids();
+    if ($context eq 'domain') {
+        $home = &Apache::lonnet::domain($cdom,'primary');
+    } else {
+        $home = &Apache::lonnet::homeserver($cnum,$cdom);
+    }
+    if ((($context eq 'domain') && ($domdefs{'linkprotenc_dom'})) ||
+        (($context eq 'course') && ($domdefs{'linkprotenc_crs'}))) {
+        unless (($home eq 'no_host') || ($home eq '')) {
+            if (grep(/^\Q$home\E$/,@ids)) {
+                if (ref($domdefs{'privhosts'}) eq 'ARRAY') {
+                    if (grep(/^\Q$home\E$/,@{$domdefs{'privhosts'}})) {
+                        my %privhash  = &Apache::lonnet::restore_dom('lti','private',$cdom,$home,1);
+                        $privkey = $privhash{'key'};
+                        $privnum = $privhash{'version'};
+                        if (($privnum) && ($privkey ne '')) {
+                            $cipher = Crypt::CBC->new({'key'     => $privkey,
+                                                       'cipher'  => 'DES'});
+                        }
+                    }
+                }
+            }
+        }
+    }
     if ($context eq 'domain') {
         $dest = '/adm/domainprefs';
         $ltiauth = 1;
@@ -1518,7 +1548,7 @@ sub process_linkprot {
     if (ref($values) eq 'HASH') {
         my @todelete = &Apache::loncommon::get_env_multiple('form.linkprot_del');
         my $maxnum = $env{'form.linkprot_maxnum'};
-        for (my $i=0; $i<=$maxnum; $i++) {
+        for (my $i=0; $i<$maxnum; $i++) {
             my $itemid = $env{'form.linkprot_id_'.$i};
             $itemid =~ s/\D+//g;
             if ($itemid) {
@@ -1567,7 +1597,8 @@ sub process_linkprot {
             my $reqitem = 'form.linkprot_requser_'.$idx;
             $env{$reqitem} =~ s/(`)/'/g;
             unless ($idx eq 'add') {
-                if ($current{'requser'} ne $env{$reqitem}) {
+                if ((!$current{'requser'} && $env{$reqitem}) ||
+                    ($current{'requser'} && !$env{$reqitem})) {
                     $haschanges{$itemid} = 1;
                 }
             }
@@ -1619,14 +1650,25 @@ sub process_linkprot {
             if ($current{'usable'}) {
                 if ($env{'form.linkprot_changesecret_'.$idx}) {
                     if ($env{$secretitem} ne '') {
-                        $linkprot{$itemid}{'secret'} = $env{$secretitem};
+                        if ($privnum && $cipher) {
+                            $linkprot{$itemid}{'secret'} = $cipher->encrypt_hex($env{$secretitem});
+                            $linkprot{$itemid}{'cipher'} = $privnum;
+                        } else {
+                            $linkprot{$itemid}{'secret'} = $env{$secretitem};
+                        }
                         $haschanges{$itemid} = 1;
                     }
                 } else {
                     $linkprot{$itemid}{'secret'} = $current{'secret'};
+                    $linkprot{$itemid}{'cipher'} = $current{'cipher'};
                 }
             } elsif ($env{$secretitem} ne '') {
-                $linkprot{$itemid}{'secret'} = $env{$secretitem};
+                if ($privnum && $cipher) {
+                    $linkprot{$itemid}{'secret'} = $cipher->encrypt_hex($env{$secretitem});
+                    $linkprot{$itemid}{'cipher'} = $privnum;
+                } else {
+                    $linkprot{$itemid}{'secret'} = $env{$secretitem};
+                }
                 $haschanges{$itemid} = 1;
             }
         }
@@ -1635,6 +1677,9 @@ sub process_linkprot {
         foreach my $entry (keys(%haschanges)) {
             $changes->{$entry} = $linkprot{$entry};
         }
+        if (ref($lastactref) eq 'HASH') {
+            $lastactref->{'courselti'} = 1;
+        }
     }
     return $errors;
 }
@@ -2141,10 +2186,12 @@ sub store_changes {
 
 sub store_linkprot {
     my ($cdom,$cnum,$context,$changes,$oldlinkprot) = @_;
-    my ($ltiauth,$lti_save_error,$output,$error,%ltienc,@deletions);
+    my ($ltiauth,$home,$lti_save_error,$output,$error,%ltienc,@deletions);
     if ($context eq 'domain') {
         $ltiauth = 1;
+        $home = &Apache::lonnet::domain($cdom,'primary');
     } else {
+        $home = &Apache::lonnet::homeserver($cnum,$cdom);
         if (exists($env{'course.'.$env{'request.course.id'}.'.internal.ltiauth'})) {
             $ltiauth = $env{'course.'.$env{'request.course.id'}.'.internal.ltiauth'};
         } else {
@@ -2166,11 +2213,13 @@ sub store_linkprot {
                     if (exists($oldlinkprot->{$id}{'usable'})) {
                         $changes->{$id}->{'usable'} = 1;
                     }
+                    if (exists($oldlinkprot->{$id}{'cipher'})) {
+                        $changes->{$id}->{'cipher'} = $oldlinkprot->{$id}{'cipher'};
+                    }
                 }
             }
         }
     }
-    my $chome = &Apache::lonnet::homeserver($cnum,$cdom);
     my @ids=&Apache::lonnet::current_machine_ids();
     if (keys(%ltienc) > 0) {
         if ($context eq 'domain') {
@@ -2180,7 +2229,7 @@ sub store_linkprot {
                 }
             }
         } else {
-            unless (($chome eq 'no_host') || ($chome eq '')) {
+            unless (($home eq 'no_host') || ($home eq '')) {
                 my $allowed;
                 foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
                 if ($allowed) {
@@ -2202,8 +2251,8 @@ sub store_linkprot {
             if (&Apache::lonnet::put('lti',$changes,$cdom,$cnum,1) eq 'ok') {
                 my $hashid=$cdom.'_'.$cnum;
                 &Apache::lonnet::devalidate_cache_new('courselti',$hashid);
-                unless (($chome eq 'no_host') || ($chome eq '')) {
-                    if (grep(/^\Q$chome\E$/,@ids)) {
+                unless (($home eq 'no_host') || ($home eq '')) {
+                    if (grep(/^\Q$home\E$/,@ids)) {
                         &Apache::lonnet::devalidate_cache_new('courseltienc',$hashid);
                     }
                 }
@@ -2223,7 +2272,7 @@ sub store_linkprot {
                                 if (exists($ltienc{$id}{$title})) {
                                     if ($title eq 'secret') {
                                         my $length = length($ltienc{$id}{$title});
-                                        $display .= $desc{$title}.': '.('*' x $length).', ';
+                                        $display .= $desc{$title}.': ['.&mt('not shown').'], ';
                                     } else {
                                         $display .= $desc{$title}.': '.$ltienc{$id}{$title}.', ';
                                     }
@@ -2777,6 +2826,16 @@ function toggleLinkProtReqUser(form,item
     }
     return;
 }
+
+function uncheckLinkProtMakeVis(item,num) {
+    if (document.getElementById('linkprot_'+item+'_'+num)) {
+        var currtype = document.getElementById('linkprot_'+item+'_'+num).type;
+        if (currtype.toLowerCase() == 'checkbox') {
+            document.getElementById('linkprot_'+item+'_'+num).checked = false;
+        }
+    }
+    return;
+}
 ENDSCRIPT
 
 }
@@ -5585,9 +5644,6 @@ sub menucollections_display {
 
 sub print_linkprotection {
     my ($cdom,$cnum,$settings,$rowtotal,$crstype,$noedit,$context) = @_;
-    unless (ref($settings) eq 'HASH') {
-        return;
-    }
 
     my %linkprotection;
     my $count = 0;
@@ -5632,7 +5688,7 @@ sub print_linkprotection {
         }
     }
 
-    if (ref($settings->{'linkprot'}) eq 'HASH') {
+    if ((ref($settings) eq 'HASH') && (ref($settings->{'linkprot'}) eq 'HASH')) {
         if (keys(%{$settings->{'linkprot'}})) {
             my @current = sort { $a <=> $b } keys(%{$settings->{'linkprot'}});
             $next += $current[-1];
@@ -5718,6 +5774,7 @@ sub print_linkprotection {
                     } else {
                         $datatable .= '<span class="LC_nobreak">'.&mt('Secret required').' - '.$switchmessage.'</span>'."\n";
                     }
+                    $datatable .= '<input type="hidden" name="linkprot_id_'.$i.'" value="'.$num.'" />';
                 } else {
                     if ($values{'usable'} ne '') {
                         $datatable .= '<div id="linkprot_divcurrsecret_'.$i.'" style="display:inline-block" /><span class="LC_nobreak">'.
@@ -5729,13 +5786,13 @@ sub print_linkprotection {
                                       '</label>&nbsp;&nbsp;</span><div id="linkprot_divchgsecret_'.$i.'" style="display:none" />'.
                                       '<span class="LC_nobreak">'.&mt('New Secret').':'.
                                       '<input type="password" size="20" name="linkprot_secret_'.$i.'" value="" autocomplete="off"'.$disabled.' />'.
-                                      '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.linkprot_secret_'.$i.'.type='."'text'".' } else { this.form.linkprot_secret_'.$i.'.type='."'password'".' }"'.$disabled.' />'.&mt('Visible input').'</label>'.
+                                      '<label><input type="checkbox" name="linkprot_visible_'.$i.'" id="linkprot_visible_'.$i.'" onclick="if (this.checked) { this.form.linkprot_secret_'.$i.'.type='."'text'".' } else { this.form.linkprot_secret_'.$i.'.type='."'password'".' }"'.$disabled.' />'.&mt('Visible input').'</label>'.
                                       '<input type="hidden" name="linkprot_id_'.$i.'" value="'.$num.'" /></span></div>';
                     } else {
                         $datatable .=
                             '<span class="LC_nobreak">'.$desc{'secret'}.':'.
                             '<input type="password" size="20" name="linkprot_secret_'.$i.'" value="" autocomplete="off"'.$disabled.' />'.
-                            '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.linkprot_secret_'.$i.'.type='."'text'".' } else { this.form.linkprot_secret_'.$i.'.type='."'password'".' }"'.$disabled.' />'.&mt('Visible input').'</label>'.
+                            '<label><input type="checkbox" name="linkprot_visible_'.$i.'" id="linkprot_visible_'.$i.'" onclick="if (this.checked) { this.form.linkprot_secret_'.$i.'.type='."'text'".' } else { this.form.linkprot_secret_'.$i.'.type='."'password'".' }"'.$disabled.' />'.&mt('Visible input').'</label>'.
                             '<input type="hidden" name="linkprot_id_'.$i.'" value="'.$num.'" /></span>';
                     }
                 }
@@ -5755,7 +5812,7 @@ sub print_linkprotection {
     $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'."\n".
                   '<input type="hidden" name="linkprot_maxnum" value="'.$next.'" />'."\n".
                   '<input type="checkbox" name="linkprot_add" value="1"'.$disabled.' />'.&mt('Add').'</span></td>'."\n".
-                  '<td>';
+                  '<td width="100%">';
     my ($usersty,$onclickrequser,%checkedrequser);
     if ($ltiauth) {
         $usersty = 'display:none';
@@ -5787,7 +5844,7 @@ sub print_linkprotection {
         $datatable .= '<span class="LC_nobreak">'.$desc{'key'}.':<input type="text" size="25" name="linkprot_key_add" value="" autocomplete="off"'.$disabled.' /></span> '."\n".
                       ('&nbsp;'x2).
                       '<span class="LC_nobreak">'.$desc{'secret'}.':<input type="password" size="20" name="linkprot_secret_add" value="" autocomplete="off"'.$disabled.' />'.
-                      '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.linkprot_secret_add.type='."'text'".' } else { this.form.linkprot_secret_add.type='."'password'".' }"'.$disabled.' />'.&mt('Visible input').'</label></span> '."\n";
+                      '<label><input type="checkbox" name="linkprot_visible_add" id="linkprot_visible_add" onclick="if (this.checked) { this.form.linkprot_secret_add.type='."'text'".' } else { this.form.linkprot_secret_add.type='."'password'".' }"'.$disabled.' />'.&mt('Visible input').'</label></span> '."\n";
     }
     if ($ltiauth) {
         $datatable .= '</fieldset>'.
@@ -6505,6 +6562,30 @@ sub change_clone {
             }
         }
     }
+    return;
+}
+
+sub devalidate_remote_courseprefs {
+    my ($cdom,$cnum,$cachekeys) = @_;
+    return unless (ref($cachekeys) eq 'HASH');
+    my %servers = &Apache::lonnet::internet_dom_servers($cdom);
+    my %thismachine;
+    map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids();
+    my @posscached = ('courselti');
+    if (keys(%servers)) {
+        foreach my $server (keys(%servers)) {
+            next if ($thismachine{$server});
+            my @cached;
+            foreach my $name (@posscached) {
+                if ($cachekeys->{$name}) {
+                    push(@cached,&escape($name).':'.&escape($cdom.'_'.$cnum));
+                }
+            }
+            if (@cached) {
+                &Apache::lonnet::remote_devalidate_cache($server,\@cached);
+            }
+        }
+    }
     return;
 }