--- loncom/lond 2023/05/22 21:10:56 1.577 +++ loncom/lond 2024/12/27 01:04:00 1.582 @@ -2,7 +2,7 @@ # The LearningOnline Network # lond "LON Daemon" Server (port "LOND" 5663) # -# $Id: lond,v 1.577 2023/05/22 21:10:56 raeburn Exp $ +# $Id: lond,v 1.582 2024/12/27 01:04:00 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -65,7 +65,7 @@ my $DEBUG = 0; # Non zero to ena my $status=''; my $lastlog=''; -my $VERSION='$Revision: 1.577 $'; #' stupid emacs +my $VERSION='$Revision: 1.582 $'; #' stupid emacs my $remoteVERSION; my $currenthostid="default"; my $currentdomainid; @@ -5265,9 +5265,9 @@ sub encrypted_get_domain_handler { # 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 +# 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 { @@ -5308,21 +5308,25 @@ sub lti_handler { ®ister_handler("lti", \<i_handler, 1, 1, 0); # -# LTI data for launch payload (received encrypted) are unencrypted and +# Data for LTI payload (received encrypted) are unencrypted and # then signed with the appropriate key and secret, before re-encrypting -# for sending as the signed payload to the client (caller lonnet::sign_lti()). +# the signed payload which is sent to the client for unencryption by +# the caller: lonnet::sign_lti()) before dispatch either to a web browser +# (launch) or to a remote web service (roster, logout, or grade). # # Parameters: # $cmd - Command request keyword (signlti). # $tail - Tail of the command. This is a colon-separated list # consisting of the domain, coursenum (if for an External -# Tool defined in a course), crstool (true if defined in -# a course), escaped launch URL, numeric ID of external tool +# Tool defined in a course), crsdef (true if defined in +# a course), type (linkprot or lti) +# context (launch, roster, logout, or grade), +# escaped launch URL, numeric ID of external tool, # version number for encryption key (if tool's LTI secret was -# encrypted before storing), post (true if signed data are -# to be returned from Net::OAuth, as a post_body), -# a frozen hash of LTI launch parameters, and a frozen hash -# of LTI config data (i.e., method => signature method). +# encrypted before storing), a frozen hash of LTI launch +# parameters, and a frozen hash of LTI information, +# (e.g., method => 'HMAC-SHA1', +# respfmt => 'to_authorization_header'). # $client - File descriptor open on the client. # Returns: # 1 - Continue processing. @@ -5330,8 +5334,8 @@ sub lti_handler { # Side effects: # The reply will contain the LTI payload, as & separated key=value pairs, # where value is itself a frozen hash, if the required key and secret -# for the apecific tool ID are available. The payload data are retrived from -# a call to Lond::sign_params(), and the reply is encrypted before being +# for the specific tool ID are available. The payload data are retrieved from +# a call to Lond::sign_lti_payload(), and the reply is encrypted before being # written to $client. # sub sign_lti_handler { @@ -5339,13 +5343,14 @@ sub sign_lti_handler { my $userinput = "$cmd:$tail"; - my ($cdom,$cnum,$crstool,$escurl,$idx,$keynum,$post,$paramsref,$inforef) = split(/:/,$tail); + my ($cdom,$cnum,$crsdef,$type,$context,$escurl, + $ltinum,$keynum,$paramsref,$inforef) = split(/:/,$tail); my $url = &unescape($escurl); my $params = &Apache::lonnet::thaw_unescape($paramsref); my $info = &Apache::lonnet::thaw_unescape($inforef); my $res = - &LONCAPA::Lond::sign_params($cdom,$cnum,$crstool,$url,$idx,$keynum, - $post,$perlvar{'lonVersion'},$params,$info); + &LONCAPA::Lond::sign_lti_payload($cdom,$cnum,$crsdef,$type,$context,$url,$ltinum, + $keynum,$perlvar{'lonVersion'},$params,$info); my $result; if (ref($res) eq 'HASH') { foreach my $key (keys(%{$res})) { @@ -6145,12 +6150,13 @@ sub enrollment_enabled_handler { my ($cmd, $tail, $client) = @_; my $userinput = $cmd.":".$tail; # For logging purposes. - my ($cdom) = split(/:/, $tail, 2); # Domain we're asking about. - - my $outcome = &localenroll::run($cdom); + my $outcome; + eval { + local($SIG{__DIE__})='DEFAULT'; + $outcome = &localenroll::run($cdom); + }; &Reply($client, \$outcome, $userinput); - return 1; } ®ister_handler("autorun", \&enrollment_enabled_handler, 0, 1, 0); @@ -6183,8 +6189,12 @@ sub validate_instcode_handler { my ($dom,$instcode,$owner) = split(/:/, $tail); $instcode = &unescape($instcode); $owner = &unescape($owner); - my ($outcome,$description,$credits) = - &localenroll::validate_instcode($dom,$instcode,$owner); + my ($outcome,$description,$credits); + eval { + local($SIG{__DIE__})='DEFAULT'; + ($outcome,$description,$credits) = + &localenroll::validate_instcode($dom,$instcode,$owner); + }; my $result = &escape($outcome).'&'.&escape($description).'&'. &escape($credits); &Reply($client, \$result, $userinput); @@ -6218,10 +6228,14 @@ sub validate_instcrosslist_handler { $instcode = &unescape($instcode); $inst_xlist = &unescape($inst_xlist); $coowner = &unescape($coowner); - my $outcome = &localenroll::validate_crosslist_access($dom,$instcode, - $inst_xlist,$coowner); - &Reply($client, \$outcome, $userinput); + my $outcome; + eval { + local($SIG{__DIE__})='DEFAULT'; + $outcome = &localenroll::validate_crosslist_access($dom,$instcode, + $inst_xlist,$coowner); + }; + &Reply($client, \$outcome, $userinput); return 1; } ®ister_handler("autovalidateinstcrosslist", \&validate_instcrosslist_handler, 0, 1, 0); @@ -6244,12 +6258,13 @@ sub get_sections_handler { my $userinput = "$cmd:$tail"; my ($coursecode, $cdom) = split(/:/, $tail); - my @secs = &localenroll::get_sections($coursecode,$cdom); - my $seclist = &escape(join(':',@secs)); - + my $seclist; + eval { + local($SIG{__DIE__})='DEFAULT'; + my @secs = &localenroll::get_sections($coursecode,$cdom); + $seclist = &escape(join(':',@secs)); + }; &Reply($client, \$seclist, $userinput); - - return 1; } ®ister_handler("autogetsections", \&get_sections_handler, 0, 1, 0); @@ -6269,6 +6284,7 @@ sub get_sections_handler { # Returns: # 1 - Processing should continue. # + sub validate_course_owner_handler { my ($cmd, $tail, $client) = @_; my $userinput = "$cmd:$tail"; @@ -6276,11 +6292,12 @@ sub validate_course_owner_handler { $owner = &unescape($owner); $coowners = &unescape($coowners); - my $outcome = &localenroll::new_course($inst_course_id,$owner,$cdom,$coowners); + my $outcome; + eval { + local($SIG{__DIE__})='DEFAULT'; + $outcome = &localenroll::new_course($inst_course_id,$owner,$cdom,$coowners); + }; &Reply($client, \$outcome, $userinput); - - - return 1; } ®ister_handler("autonewcourse", \&validate_course_owner_handler, 0, 1, 0); @@ -6306,11 +6323,12 @@ sub validate_course_section_handler { my ($cmd, $tail, $client) = @_; my $userinput = "$cmd:$tail"; my ($inst_course_id, $cdom) = split(/:/, $tail); - - my $outcome=&localenroll::validate_courseID($inst_course_id,$cdom); + my $outcome; + eval { + local($SIG{__DIE__})='DEFAULT'; + $outcome=&localenroll::validate_courseID($inst_course_id,$cdom); + }; &Reply($client, \$outcome, $userinput); - - return 1; } ®ister_handler("autovalidatecourse", \&validate_course_section_handler, 0, 1, 0); @@ -6344,7 +6362,6 @@ sub validate_class_access_handler { $outcome=&localenroll::check_section($inst_class,$owners,$cdom); }; &Reply($client,\$outcome, $userinput); - return 1; } ®ister_handler("autovalidateclass_sec", \&validate_class_access_handler, 0, 1, 0); @@ -6477,10 +6494,11 @@ sub create_auto_enroll_password_handler my ($authparam, $cdom) = split(/:/, $userinput); my ($create_passwd,$authchk); - ($authparam, - $create_passwd, - $authchk) = &localenroll::create_password($authparam,$cdom); - + eval { + local($SIG{__DIE__})='DEFAULT'; + ($authparam,$create_passwd,$create_passwd,$authchk) = + &localenroll::create_password($authparam,$cdom); + }; &Reply($client, &escape($authparam.':'.$create_passwd.':'.$authchk)."\n", $userinput); @@ -6716,12 +6734,16 @@ sub get_institutional_code_format_handle my ($key,$value) = split/=/,$_; $instcodes{&unescape($key)} = &unescape($value); } - my $formatreply = &localenroll::instcode_format($cdom, - \%instcodes, - \%codes, - \@codetitles, - \%cat_titles, - \%cat_order); + my $formatreply; + eval { + local($SIG{__DIE__})='DEFAULT'; + $formatreply = &localenroll::instcode_format($cdom, + \%instcodes, + \%codes, + \@codetitles, + \%cat_titles, + \%cat_order); + }; if ($formatreply eq 'ok') { my $codes_str = &Apache::lonnet::hash2str(%codes); my $codetitles_str = &Apache::lonnet::array2str(@codetitles); @@ -6781,11 +6803,15 @@ sub get_possible_instcodes_handler { my $reply; my $cdom = $tail; my (@codetitles,%cat_titles,%cat_order,@code_order); - my $formatreply = &localenroll::possible_instcodes($cdom, - \@codetitles, - \%cat_titles, - \%cat_order, - \@code_order); + my $formatreply; + eval { + local($SIG{__DIE__})='DEFAULT'; + $formatreply = &localenroll::possible_instcodes($cdom, + \@codetitles, + \%cat_titles, + \%cat_order, + \@code_order); + }; if ($formatreply eq 'ok') { my $result = join('&',map {&escape($_);} (@codetitles)).':'; $result .= join('&',map {&escape($_);} (@code_order)).':'; @@ -7520,7 +7546,7 @@ undef $perlvarref; # ----------------------------- Make sure this process is running from user=www my $wwwid=getpwnam('www'); if ($wwwid!=$<) { - my $emailto="$perlvar{'lonAdmEMail'},$perlvar{'lonSysEMail'}"; + my $emailto="$perlvar{'lonAdmEMail'} $perlvar{'lonSysEMail'}"; my $subj="LON: $currenthostid User ID mismatch"; system("echo 'User ID mismatch. lond must be run as user www.' |". " mail -s '$subj' $emailto > /dev/null"); @@ -8875,6 +8901,9 @@ sub currentversion { if (-e $ulsdir) { if(-d $ulsdir) { if (opendir(LSDIR,$ulsdir)) { + if (-e $fname) { + $version=0; + } my $ulsfn; while ($ulsfn=readdir(LSDIR)) { # see if this is a regular file (ignore links produced earlier)