[BACK]Return to lond CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom

Diff for /loncom/lond between versions 1.489.2.43.2.6 and 1.489.2.45

version 1.489.2.43.2.6, 2023/01/23 03:43:33 version 1.489.2.45, 2022/02/27 02:13:24
Line 653  sub PushFile { Line 653  sub PushFile {
   
     if($filename eq "host") {      if($filename eq "host") {
  $contents = AdjustHostContents($contents);   $contents = AdjustHostContents($contents);
     } elsif (($filename eq 'dns_hosts') || ($filename eq 'dns_domain')) {      } elsif ($filename eq 'dns_host' || $filename eq 'dns_domain') {
         if ($contents eq '') {          if ($contents eq '') {
             &logthis('<font color="red"> Pushfile: unable to install '              &logthis('<font color="red"> Pushfile: unable to install '
                     .$tablefile." - no data received from push. </font>");                      .$tablefile." - no data received from push. </font>");
Line 3566  sub dump_with_regexp { Line 3566  sub dump_with_regexp {
 }  }
 &register_handler("dump", \&dump_with_regexp, 0, 1, 0);  &register_handler("dump", \&dump_with_regexp, 0, 1, 0);
   
 #  
 #  Process the encrypted dump request. Original call should  
 #  be from lonnet::dump() with seventh arg ($encrypt) set to  
 #  1, to ensure that both request and response are encrypted.  
 #  
 #  Parameters:  
 #     $cmd               - Command keyword of request (edump).  
 #     $tail              - Tail of the command.  
 #                          See &dump_with_regexp for more  
 #                          information about this.  
 #     $client            - File open on the client.  
 #  Returns:  
 #     1      - Continue processing  
 #     0      - server should exit.  
 #  
   
 sub encrypted_dump_with_regexp {  
     my ($cmd, $tail, $client) = @_;  
     my $res = LONCAPA::Lond::dump_with_regexp($tail, $clientversion);  
   
     if ($res =~ /^error:/) {  
         Failure($client, \$res, "$cmd:$tail");  
     } else {  
         if ($cipher) {  
             my $cmdlength=length($res);  
             $res.="         ";  
             my $encres='';  
             for (my $encidx=0;$encidx<=$cmdlength;$encidx+=8) {  
                 $encres.= unpack("H16",  
                                  $cipher->encrypt(substr($res,  
                                                          $encidx,  
                                                          8)));  
             }  
             &Reply( $client,"enc:$cmdlength:$encres\n","$cmd:$tail");  
         } else {  
             &Failure( $client, "error:no_key\n","$cmd:$tail");  
         }  
     }  
 }  
 &register_handler("edump", \&encrypted_dump_with_regexp, 0, 1, 0);  
   
 #  Store a set of key=value pairs associated with a versioned name.  #  Store a set of key=value pairs associated with a versioned name.
 #  #
 #  Parameters:  #  Parameters:
Line 4753  sub get_domain_handler { Line 4712  sub get_domain_handler {
     my $userinput = "$cmd:$tail";      my $userinput = "$cmd:$tail";
   
     my ($udom,$namespace,$what)=split(/:/,$tail,3);      my ($udom,$namespace,$what)=split(/:/,$tail,3);
     if (($namespace =~ /^enc/) || ($namespace eq 'private')) {      my $res = LONCAPA::Lond::get_dom($userinput);
         &Failure( $client, "refused\n", $userinput);  
     } else {  
         my $res = LONCAPA::Lond::get_dom($userinput);  
         if ($res =~ /^error:/) {  
             &Failure($client, \$res, $userinput);  
         } else {  
             &Reply($client, \$res, $userinput);  
         }  
     }  
   
     return 1;  
 }  
 &register_handler("getdom", \&get_domain_handler, 0, 1, 0);  
   
 sub encrypted_get_domain_handler {  
     my ($cmd, $tail, $client) = @_;  
   
     my $userinput = "$cmd:$tail";  
   
     my ($udom,$namespace,$what) = split(/:/,$tail,3);  
     if ($namespace eq 'private') {  
         &Failure( $client, "refused\n", $userinput);  
     } else {  
         my $res = LONCAPA::Lond::get_dom($userinput);  
         if ($res =~ /^error:/) {  
             &Failure($client, \$res, $userinput);  
         } else {  
             if ($cipher) {  
                 my $cmdlength=length($res);  
                 $res.="         ";  
                 my $encres='';  
                 for (my $encidx=0;$encidx<=$cmdlength;$encidx+=8) {  
                     $encres.= unpack("H16",  
                                      $cipher->encrypt(substr($res,  
                                                              $encidx,  
                                                              8)));  
                 }  
                 &Reply( $client,"enc:$cmdlength:$encres\n",$userinput);  
             } else {  
                 &Failure( $client, "error:no_key\n",$userinput);  
             }  
         }  
     }  
     return 1;  
 }  
 &register_handler("egetdom", \&encrypted_get_domain_handler, 1, 1, 0);  
   
 #  
 # Encrypted get from the namespace database file at the domain level.  
 # This function retrieves a keyed item from a specific named database in the  
 # domain directory.  
 #  
 # Parameters:  
 #   $cmd             - Command request keyword (lti).  
 #   $tail            - Tail of the command.  This is a colon-separated list  
 #                      consisting of the domain, coursenum, if for LTI-  
 #                      enabled deep-linking to course content using  
 #                      link protection configured within a course,  
 #                      context (=deeplink) if for LTI-enabled deep-linking  
 #                      to course content using LTI Provider settings  
 #                      configured within a course's domain, the (escaped)  
 #                      launch URL, the (escaped) method (typically POST),  
 #                      and a frozen hash of the LTI launch parameters  
 #                      from the LTI payload.  
 #   $client          - File descriptor open on the client.  
 # Returns:  
 #   1       - Continue processing.  
 #   0       - Exit.  
 #  Side effects:  
 #     The reply will contain an LTI itemID, if the signed LTI payload  
 #     could be verified using the consumer key and the shared secret  
 #     available for that key (for the itemID) for either the course or domain,  
 #     depending on values for cnum and context. The reply is encrypted before  
 #     being written to $client.  
 #  
 sub lti_handler {  
     my ($cmd, $tail, $client) = @_;  
   
     my $userinput = "$cmd:$tail";  
   
     my ($cdom,$cnum,$context,$escurl,$escmethod,$items) = split(/:/,$tail);  
     my $url = &unescape($escurl);  
     my $method = &unescape($escmethod);  
     my $params = &Apache::lonnet::thaw_unescape($items);  
     my $res;  
     if ($cnum ne '') {  
         $res = &LONCAPA::Lond::crslti_itemid($cdom,$cnum,$url,$method,$params,$perlvar{'lonVersion'});  
     } else {  
         $res = &LONCAPA::Lond::domlti_itemid($cdom,$context,$url,$method,$params,$perlvar{'lonVersion'});  
     }  
     if ($res =~ /^error:/) {      if ($res =~ /^error:/) {
         &Failure($client, \$res, $userinput);          &Failure($client, \$res, $userinput);
     } else {      } else {
         if ($cipher) {          &Reply($client, \$res, $userinput);
             my $cmdlength=length($res);  
             $res.="         ";  
             my $encres='';  
             for (my $encidx=0;$encidx<=$cmdlength;$encidx+=8) {  
                 $encres.= unpack("H16",  
                                  $cipher->encrypt(substr($res,  
                                                          $encidx,  
                                                          8)));  
             }  
             &Reply( $client,"enc:$cmdlength:$encres\n",$userinput);  
         } else {  
             &Failure( $client, "error:no_key\n",$userinput);  
         }  
     }      }
   
     return 1;      return 1;
 }  }
 &register_handler("lti", \&lti_handler, 1, 1, 0);  &register_handler("getdom", \&get_domain_handler, 0, 1, 0);
   
 #  #
 #  Puts an id to a domains id database.   #  Puts an id to a domains id database. 
Line 7811  sub validate_user { Line 7668  sub validate_user {
                      ($domdefaults{'auth_arg_def'} ne '')) {                       ($domdefaults{'auth_arg_def'} ne '')) {
                 #                  #
                 # Don't attempt authentication for username and password supplied                  # Don't attempt authentication for username and password supplied
                 # for user without an account if username contains @ to avoid                  # for user without an account if uername contains @ to avoid
                 # call to &Authen::Krb5::parse_name() which will result in con_lost                  # call to &Authen::Krb5::parse_name() which will result in con_lost
                 #                  #
                 unless ($user =~ /\@/) {                  unless ($user =~ /\@/) {
Removed from v.1.489.2.43.2.6  
changed lines
  Added in v.1.489.2.45

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>