[BACK]Return to ltiutils.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / lti

Diff for /loncom/lti/ltiutils.pm between versions 1.15 and 1.21

version 1.15, 2018/08/14 21:42:36 version 1.21, 2024/02/27 04:04:06
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # Utility functions for managing LON-CAPA LTI interactions   # Utility functions for managing LON-CAPA LTI interactions
 #  #
 # $Id$  # $Id$
 #  #
Line 31  package LONCAPA::ltiutils; Line 31  package LONCAPA::ltiutils;
 use strict;  use strict;
 use Net::OAuth;  use Net::OAuth;
 use Digest::SHA;  use Digest::SHA;
   use Digest::MD5 qw(md5_hex);
   use Encode;
 use UUID::Tiny ':std';  use UUID::Tiny ':std';
 use Apache::lonnet;  use Apache::lonnet;
 use Apache::loncommon;  use Apache::loncommon;
Line 40  use Apache::lonenc(); Line 42  use Apache::lonenc();
 use Apache::longroup();  use Apache::longroup();
 use Apache::lonlocal;  use Apache::lonlocal;
 use Math::Round();  use Math::Round();
   use LONCAPA::Lond;
 use LONCAPA qw(:DEFAULT :match);  use LONCAPA qw(:DEFAULT :match);
   
 #  #
Line 51  use LONCAPA qw(:DEFAULT :match); Line 54  use LONCAPA qw(:DEFAULT :match);
 # When LON-CAPA is operating as a Consumer, nonce checking  # When LON-CAPA is operating as a Consumer, nonce checking
 # occurs when a Tool Provider launched from an instance of  # occurs when a Tool Provider launched from an instance of
 # an external tool in a LON-CAPA course makes a request to  # an external tool in a LON-CAPA course makes a request to
 # (a) /adm/service/roster or (b) /adm/service/passback to,   # (a) /adm/service/roster or (b) /adm/service/passback to,
 # respectively, retrieve a roster or store the grade for   # respectively, retrieve a roster or store the grade for
 # the original launch by a specific user.  # the original launch by a specific user.
 #  #
 # When LON-CAPA is operating as a Provider, nonce checking   # When LON-CAPA is operating as a Provider, nonce checking
 # occurs when a user in course context in another LMS (the   # occurs when a user in course context in another LMS (the
 # Consumer) launches an external tool to access a LON-CAPA URL:   # Consumer) launches an external tool to access a LON-CAPA URL:
 # /adm/lti/ with LON-CAPA symb, map, or deep-link ID appended.  # /adm/lti/ with LON-CAPA symb, map, or deep-link ID appended.
 #  #
   
Line 95  sub check_nonce { Line 98  sub check_nonce {
 # LON-CAPA as LTI Consumer  # LON-CAPA as LTI Consumer
 #  #
 # Determine the domain and the courseID of the LON-CAPA course  # Determine the domain and the courseID of the LON-CAPA course
 # for which access is needed by a Tool Provider -- either to   # for which access is needed by a Tool Provider -- either to
 # retrieve a roster or store the grade for an instance of an   # retrieve a roster or store the grade for an instance of an
 # external tool in the course.  # external tool in the course.
 #  #
   
Line 141  sub get_loncapa_course { Line 144  sub get_loncapa_course {
 #  #
 # LON-CAPA as LTI Consumer  # LON-CAPA as LTI Consumer
 #  #
 # Determine the symb and (optionally) LON-CAPA user for an   # Determine the symb and (optionally) LON-CAPA user for an
 # instance of an external tool in a course -- either to   # instance of an external tool in a course -- either to
 # to retrieve a roster or store a grade.  # to retrieve a roster or store a grade.
 #  #
 # Use the digested symb to lookup the real symb in exttools.db  # Use the digested symb to lookup the real symb in exttools.db
Line 154  sub get_tool_instance { Line 157  sub get_tool_instance {
     my ($cdom,$cnum,$digsymb,$diguser,$errors) = @_;      my ($cdom,$cnum,$digsymb,$diguser,$errors) = @_;
     return unless (ref($errors) eq 'HASH');      return unless (ref($errors) eq 'HASH');
     my ($marker,$symb,$uname,$udom);      my ($marker,$symb,$uname,$udom);
     my @keys = ($digsymb);       my @keys = ($digsymb);
     if ($diguser) {      if ($diguser) {
         push(@keys,$diguser);          push(@keys,$diguser);
     }      }
Line 185  sub get_tool_instance { Line 188  sub get_tool_instance {
 # LON-CAPA as LTI Consumer  # LON-CAPA as LTI Consumer
 #  #
 # Retrieve data needed to validate a request from a Tool Provider  # Retrieve data needed to validate a request from a Tool Provider
 # for a roster or to store a grade for an instance of an external   # for a roster or to store a grade for an instance of an external
 # tool in a LON-CAPA course.  # tool in a LON-CAPA course.
 #  #
 # Retrieve the Consumer key and Consumer secret from the domain   # Retrieve the Consumer key and Consumer secret from the domain
 # configuration or the Tool Provider ID stored in the  # configuration or the Tool Provider ID stored in the
 # exttool_$marker db file and compare the Consumer key with the  # exttool_$marker db file and compare the Consumer key with the
 # one in the POSTed data.  # one in the POSTed data.
 #  #
 # Side effect is to populate the $toolsettings hashref with the   # Side effect is to populate the $toolsettings hashref with the
 # contents of the .db file (instance of tool in course) and the  # contents of the .db file (instance of tool in course) and the
 # $ltitools hashref with the configuration for the tool (at  # $ltitools hashref with the configuration for the tool (at
 # domain level).  # domain level).
Line 208  sub get_tool_secret { Line 211  sub get_tool_secret {
         %{$toolsettings}=&Apache::lonnet::dump('exttool_'.$marker,$cdom,$cnum);          %{$toolsettings}=&Apache::lonnet::dump('exttool_'.$marker,$cdom,$cnum);
         if ($toolsettings->{'id'}) {          if ($toolsettings->{'id'}) {
             my $idx = $toolsettings->{'id'};              my $idx = $toolsettings->{'id'};
             my %lti = &Apache::lonnet::get_domain_lti($cdom,'consumer');              my ($crsdef,$ltinum);
             if (ref($lti{$idx}) eq 'HASH') {              if ($idx =~ /^c(\d+)$/) {
                 %{$ltitools} = %{$lti{$idx}};                  $ltinum = $1;
                 if ($ltitools->{'key'} eq $key) {                  $crsdef = 1;
                     $consumer_secret = $ltitools->{'secret'};                  my %crslti = &Apache::lonnet::get_course_lti($cnum,$cdom,'consumer');
                   if (ref($crslti{$ltinum}) eq 'HASH') {
                       %{$ltitools} = %{$crslti{$ltinum}};
                   } else {
                       undef($ltinum);
                   }
               } elsif ($idx =~ /^\d+$/) {
                   my %lti = &Apache::lonnet::get_domain_lti($cdom,'consumer');
                   if (ref($lti{$idx}) eq 'HASH') {
                       %{$ltitools} = %{$lti{$idx}};
                       $ltinum = $idx;
                   }
               }
               if ($ltinum ne '') {
                   my $loncaparev = &Apache::lonnet::get_server_loncaparev($cdom);
                   my $keynum = $ltitools->{'cipher'};
                   my ($poss_key,$poss_secret) =
                       &LONCAPA::Lond::get_lti_credentials($cdom,$cnum,$crsdef,'tools',$ltinum,$keynum,$loncaparev);
                   if ($poss_key eq $key) {
                       $consumer_secret = $poss_secret;
                     $nonce_lifetime = $ltitools->{'lifetime'};                      $nonce_lifetime = $ltitools->{'lifetime'};
                 } else {                  } else {
                     $errors->{11} = 1;                      $errors->{11} = 1;
Line 240  sub get_tool_secret { Line 262  sub get_tool_secret {
 # secret for the specific LTI Provider.  # secret for the specific LTI Provider.
 #  #
   
   # FIXME Move to Lond.pm and perform on course's homeserver
   
 sub verify_request {  sub verify_request {
     my ($oauthtype,$protocol,$hostname,$requri,$reqmethod,$consumer_secret,$params,      my ($oauthtype,$protocol,$hostname,$requri,$reqmethod,$consumer_secret,$params,
         $authheaders,$errors) = @_;          $authheaders,$errors) = @_;
Line 285  sub verify_request { Line 309  sub verify_request {
   
 sub verify_lis_item {  sub verify_lis_item {
     my ($sigrec,$context,$digsymb,$diguser,$cdom,$cnum,$toolsettings,$ltitools,$errors) = @_;      my ($sigrec,$context,$digsymb,$diguser,$cdom,$cnum,$toolsettings,$ltitools,$errors) = @_;
     return unless ((ref($toolsettings) eq 'HASH') && (ref($ltitools) eq 'HASH') &&       return unless ((ref($toolsettings) eq 'HASH') && (ref($ltitools) eq 'HASH') &&
                    (ref($errors) eq 'HASH'));                     (ref($errors) eq 'HASH'));
     my ($has_action, $valid_for);      my ($has_action, $valid_for);
     if ($context eq 'grade') {      if ($context eq 'grade') {
Line 306  sub verify_lis_item { Line 330  sub verify_lis_item {
             my $expected_sig;              my $expected_sig;
             if ($context eq 'grade') {              if ($context eq 'grade') {
                 my $uniqid = $digsymb.':::'.$diguser.':::'.$cdom.'_'.$cnum;                  my $uniqid = $digsymb.':::'.$diguser.':::'.$cdom.'_'.$cnum;
                 $expected_sig = (split(/:::/,&get_service_id($secret,$uniqid)))[0];                   $expected_sig = (split(/:::/,&get_service_id($secret,$uniqid)))[0];
                 if ($expected_sig eq $sigrec) {                  if ($expected_sig eq $sigrec) {
                     return 1;                      return 1;
                 } else {                  } else {
Line 314  sub verify_lis_item { Line 338  sub verify_lis_item {
                 }                  }
             } elsif ($context eq 'roster') {              } elsif ($context eq 'roster') {
                 my $uniqid = $digsymb.':::'.$cdom.'_'.$cnum;                  my $uniqid = $digsymb.':::'.$cdom.'_'.$cnum;
                 $expected_sig = (split(/:::/,&get_service_id($secret,$uniqid)))[0];                   $expected_sig = (split(/:::/,&get_service_id($secret,$uniqid)))[0];
                 if ($expected_sig eq $sigrec) {                  if ($expected_sig eq $sigrec) {
                     return 1;                      return 1;
                 } else {                  } else {
Line 334  sub verify_lis_item { Line 358  sub verify_lis_item {
 # LON-CAPA as LTI Consumer  # LON-CAPA as LTI Consumer
 #  #
 # Sign a request used to launch an instance of an external  # Sign a request used to launch an instance of an external
 # tool in a LON-CAPA course, using the key and secret supplied   # tool in a LON-CAPA course, using the key and secret supplied
 # by the Tool Provider.  # by the Tool Provider.
 #   #
   
 sub sign_params {  sub sign_params {
     my ($url,$key,$secret,$sigmethod,$paramsref) = @_;      my ($url,$key,$secret,$paramsref,$sigmethod,$type,$callback,$post) = @_;
     return unless (ref($paramsref) eq 'HASH');      return unless (ref($paramsref) eq 'HASH');
     if ($sigmethod eq '') {      if ($sigmethod eq '') {
         $sigmethod = 'HMAC-SHA1';          $sigmethod = 'HMAC-SHA1';
     }      }
       if ($type eq '') {
           $type = 'request token';
       }
       if ($callback eq '') {
           $callback = 'about:blank',
       }
     srand( time() ^ ($$ + ($$ << 15))  ); # Seed rand.      srand( time() ^ ($$ + ($$ << 15))  ); # Seed rand.
     my $nonce = Digest::SHA::sha1_hex(sprintf("%06x%06x",rand(0xfffff0),rand(0xfffff0)));      my $nonce = Digest::SHA::sha1_hex(sprintf("%06x%06x",rand(0xfffff0),rand(0xfffff0)));
     my $request = Net::OAuth->request("request token")->new(      my $request = Net::OAuth->request($type)->new(
             consumer_key => $key,              consumer_key => $key,
             consumer_secret => $secret,              consumer_secret => $secret,
             request_url => $url,              request_url => $url,
Line 354  sub sign_params { Line 384  sub sign_params {
             signature_method => $sigmethod,              signature_method => $sigmethod,
             timestamp => time,              timestamp => time,
             nonce => $nonce,              nonce => $nonce,
             callback => 'about:blank',              callback => $callback,
             extra_params => $paramsref,              extra_params => $paramsref,
             version      => '1.0',              version      => '1.0',
             );              );
     $request->sign();      $request->sign();
     return $request->to_hash();      if ($post) {
           return $request->to_post_body();
       } else {
           return $request->to_hash();
       }
 }  }
   
 #  #
Line 383  sub get_service_id { Line 417  sub get_service_id {
 # grade store). An existing secret past its expiration date  # grade store). An existing secret past its expiration date
 # will be stored as old<service name>secret, and a new secret  # will be stored as old<service name>secret, and a new secret
 # <service name>secret will be stored.  # <service name>secret will be stored.
 #   #
 # Secrets are specific to service name and to the tool instance   # Secrets are specific to service name and to the tool instance
 # (and are stored in the exttool_$marker db file).  # (and are stored in the exttool_$marker db file).
 # The time period a secret remains valid is determined by the   # The time period a secret remains valid is determined by the
 # domain configuration for the specific tool and the service.  # domain configuration for the specific tool and the service.
 #   #
   
 sub set_service_secret {  sub set_service_secret {
     my ($cdom,$cnum,$marker,$name,$now,$toolsettings,$ltitools) = @_;      my ($cdom,$cnum,$marker,$name,$now,$toolsettings,$ltitools) = @_;
Line 438  sub set_service_secret { Line 472  sub set_service_secret {
 #  #
 # LON-CAPA as LTI Consumer  # LON-CAPA as LTI Consumer
 #  #
 # Add a lock key to exttools.db for the instance of an external tool   # Add a lock key to exttools.db for the instance of an external tool
 # when generating and storing a service secret.  # when generating and storing a service secret.
 #  #
   
Line 505  sub parse_grade_xml { Line 539  sub parse_grade_xml {
                 my ($text) = @_;                  my ($text) = @_;
                 if ("@state" eq "imsx_POXEnvelopeRequest imsx_POXBody replaceResultRequest resultRecord sourcedGUID sourcedId") {                  if ("@state" eq "imsx_POXEnvelopeRequest imsx_POXBody replaceResultRequest resultRecord sourcedGUID sourcedId") {
                     $data{$count}{sourcedid} = $text;                      $data{$count}{sourcedid} = $text;
                 } elsif ("@state" eq "imsx_POXEnvelopeRequest imsx_POXBody replaceResultRequest resultRecord result resultScore textString") {                                                 } elsif ("@state" eq "imsx_POXEnvelopeRequest imsx_POXBody replaceResultRequest resultRecord result resultScore textString") {
                     $data{$count}{score} = $text;                      $data{$count}{score} = $text;
                 }                  }
             }, "dtext"],              }, "dtext"],
Line 641  sub lti_provider_scope { Line 675  sub lti_provider_scope {
 #  #
   
 sub get_roster {  sub get_roster {
     my ($id,$url,$ckey,$secret) = @_;      my ($cdom,$cnum,$ltinum,$keynum,$id,$url) = @_;
     my %ltiparams = (      my %ltiparams = (
         lti_version                => 'LTI-1p0',          lti_version                => 'LTI-1p0',
         lti_message_type           => 'basic-lis-readmembershipsforcontext',          lti_message_type           => 'basic-lis-readmembershipsforcontext',
         ext_ims_lis_memberships_id => $id,          ext_ims_lis_memberships_id => $id,
     );      );
     my $hashref = &sign_params($url,$ckey,$secret,'',\%ltiparams);      my %info = ();
     if (ref($hashref) eq 'HASH') {      my ($status,$hashref) =
           &Apache::lonnet::sign_lti($cdom,$cnum,'','lti','roster',$url,$ltinum,$keynum,\%ltiparams,\%info);
       if (($status eq 'ok') && (ref($hashref) eq 'HASH')) {
         my $request=new HTTP::Request('POST',$url);          my $request=new HTTP::Request('POST',$url);
         $request->content(join('&',map {          $request->content(join('&',map {
                           my $name = escape($_);                            my $name = escape($_);
Line 706  sub get_roster { Line 742  sub get_roster {
 #  #
   
 sub send_grade {  sub send_grade {
     my ($id,$url,$ckey,$secret,$scoretype,$sigmethod,$msgformat,$total,$possible) = @_;      my ($cdom,$cnum,$crsdef,$type,$ltinum,$keynum,$id,$url,$scoretype,$sigmethod,$msgformat,$total,$possible) = @_;
     my $score;      my $score;
     if ($possible > 0) {      if ($possible > 0) {
         if ($scoretype eq 'ratio') {          if ($scoretype eq 'ratio') {
Line 716  sub send_grade { Line 752  sub send_grade {
             $score = Math::Round::round($score);              $score = Math::Round::round($score);
         } else {          } else {
             $score = $total/$possible;              $score = $total/$possible;
             $score = sprintf("%.2f",$score);              $score = sprintf("%.4f",$score);
         }          }
     }      }
     if ($sigmethod eq '') {      if ($sigmethod eq '') {
Line 735  sub send_grade { Line 771  sub send_grade {
             result_statusofresult         => 'final',              result_statusofresult         => 'final',
             result_date                   => $date,              result_date                   => $date,
         );          );
         my $hashref = &sign_params($url,$ckey,$secret,$sigmethod,\%ltiparams);          my %info = (
         if (ref($hashref) eq 'HASH') {                          method => $sigmethod,
                      );
           my ($status,$hashref) =
               &Apache::lonnet::sign_lti($cdom,$cnum,$crsdef,$type,'grade',$url,$ltinum,$keynum,
                                         \%ltiparams,\%info);
           if (($status eq 'ok') && (ref($hashref) eq 'HASH')) {
             $request=new HTTP::Request('POST',$url);              $request=new HTTP::Request('POST',$url);
             $request->content(join('&',map {              $request->content(join('&',map {
                               my $name = escape($_);                                my $name = escape($_);
Line 744  sub send_grade { Line 785  sub send_grade {
                               ? join("&$name=", map {escape($_) } @{$hashref->{$_}})                                ? join("&$name=", map {escape($_) } @{$hashref->{$_}})
                               : &escape($hashref->{$_}) );                                : &escape($hashref->{$_}) );
                               } keys(%{$hashref})));                                } keys(%{$hashref})));
   #FIXME Need to handle case where passback failed.
         }          }
     } else {      } else {
         srand( time() ^ ($$ + ($$ << 15))  ); # Seed rand.          srand( time() ^ ($$ + ($$ << 15))  ); # Seed rand.
         my $nonce = Digest::SHA::sha1_hex(sprintf("%06x%06x",rand(0xfffff0),rand(0xfffff0)));  
         my $uniqmsgid = int(rand(2**32));          my $uniqmsgid = int(rand(2**32));
         my $gradexml = <<END;          my $gradexml = <<END;
 <?xml version = "1.0" encoding = "UTF-8"?>  <?xml version = "1.0" encoding = "UTF-8"?>
Line 761  sub send_grade { Line 802  sub send_grade {
   <imsx_POXBody>    <imsx_POXBody>
     <replaceResultRequest>      <replaceResultRequest>
       <resultRecord>        <resultRecord>
  <sourcedGUID>          <sourcedGUID>
   <sourcedId>$id</sourcedId>            <sourcedId>$id</sourcedId>
  </sourcedGUID>          </sourcedGUID>
  <result>          <result>
   <resultScore>            <resultScore>
     <language>en</language>              <language>en</language>
     <textString>$score</textString>              <textString>$score</textString>
   </resultScore>            </resultScore>
  </result>          </result>
       </resultRecord>        </resultRecord>
     </replaceResultRequest>      </replaceResultRequest>
   </imsx_POXBody>    </imsx_POXBody>
Line 780  END Line 821  END
         while (length($bodyhash) % 4) {          while (length($bodyhash) % 4) {
             $bodyhash .= '=';              $bodyhash .= '=';
         }          }
         my $gradereq = Net::OAuth->request('consumer')->new(          my $reqmethod = 'POST';
                            consumer_key => $ckey,          my %info = (
                            consumer_secret => $secret,                        body_hash => $bodyhash,
                            request_url => $url,                        method => $sigmethod,
                            request_method => 'POST',                        reqtype => 'consumer',
                            signature_method => $sigmethod,                        reqmethod => $reqmethod,
                            timestamp => time(),                        respfmt => 'to_authorization_header',
                            nonce => $nonce,                     );
                            body_hash => $bodyhash,          my %params;
         );          my ($status,$authheader) =
         $gradereq->sign();              &Apache::lonnet::sign_lti($cdom,$cnum,$crsdef,$type,'grade',$url,$ltinum,$keynum,\%params,\%info);
         $request = HTTP::Request->new(          if (($status eq 'ok') && ($authheader ne '')) {
                $gradereq->request_method,              $request = HTTP::Request->new(
                $gradereq->request_url,                             $reqmethod,
                [                             $url,
            'Authorization' => $gradereq->to_authorization_header,                             [
            'Content-Type'  => 'application/xml',                                'Authorization' => $authheader,
                ],                                'Content-Type'  => 'application/xml',
                $gradexml,                             ],
         );                             $gradexml,
     }              );
     my $response = &LONCAPA::LWPReq::makerequest('',$request,'','',10);              my $response = &LONCAPA::LWPReq::makerequest('',$request,'','',10);
     my $message=$response->status_line;              my $message=$response->status_line;
 #FIXME Handle case where pass back of score to LTI Consumer failed.  #FIXME Handle case where pass back of score to LTI Consumer failed.
           }
       }
   }
   
   sub setup_logout_callback {
       my ($cdom,$cnum,$crstool,$idx,$keynum,$uname,$udom,$server,$service_url,$idsdir,$protocol,$hostname) = @_;
       if ($service_url =~ m{^https?://[^/]+/}) {
           my $digest_user = &Encode::decode('UTF-8',$uname.':'.$udom);
           my $loginfile = &Digest::SHA::sha1_hex($digest_user).&md5_hex(&md5_hex(time.{}.rand().$$));
           if ((-d $idsdir) && (open(my $fh,'>',"$idsdir/$loginfile"))) {
               print $fh "$uname,$udom,$server\n";
               close($fh);
               my $callback = 'http://'.$hostname.'/adm/service/logout/'.$loginfile;
               my %ltiparams = (
                   callback   => $callback,
               );
               my %info = (
                   respfmt => 'to_post_body',
               );
               my ($status,$post) =
                   &Apache::lonnet::sign_lti($cdom,$cnum,$crstool,'lti','logout',$service_url,$idx,
                                             $keynum,\%ltiparams,\%info);
               if (($status eq 'ok') && ($post ne '')) {
                   my $request=new HTTP::Request('POST',$service_url);
                   $request->content($post);
                   my $response = &LONCAPA::LWPReq::makerequest('',$request,'','',10);
               }
           }
       }
       return;
 }  }
   
 #  #
 # LON-CAPA as LTI Provider  # LON-CAPA as LTI Provider
 #  #
 # Create a new user in LON-CAPA. If the domain's configuration   # Create a new user in LON-CAPA. If the domain's configuration
 # includes rules for format of "official" usernames, those rules  # includes rules for format of "official" usernames, those rules
 # will apply when determining if a user is to be created.  In  # will apply when determining if a user is to be created.  In
 # additional if institutional user information is available that  # additional if institutional user information is available that
Line 950  sub create_passwd { Line 1021  sub create_passwd {
 # in the Consumer, user privs will be added to the user's environment for  # in the Consumer, user privs will be added to the user's environment for
 # the new role.  # the new role.
 #  #
 # If this is a self-enroll case, a Course Coordinator role will only be assigned   # If this is a self-enroll case, a Course Coordinator role will only be assigned
 # if the current user is also the course owner.  # if the current user is also the course owner.
 #  #
   
Line 994  sub enrolluser { Line 1065  sub enrolluser {
 # with LTI Instructor status.  # with LTI Instructor status.
 #  #
 # A list of users is obtained by a call to get_roster()  # A list of users is obtained by a call to get_roster()
 # if the calling Consumer support the LTI extension:   # if the calling Consumer support the LTI extension:
 # Context Memberships Service.   # Context Memberships Service.
 #  #
 # If a user included in the retrieved list does not currently  # If a user included in the retrieved list does not currently
 # have a user account in LON-CAPA, an account will be created.  # have a user account in LON-CAPA, an account will be created.
Line 1031  sub enrolluser { Line 1102  sub enrolluser {
   
 sub batchaddroster {  sub batchaddroster {
     my ($item) = @_;      my ($item) = @_;
     return unless(ref($item) eq 'HASH');      return unless((ref($item) eq 'HASH') &&
     return unless (ref($item->{'ltiref'}) eq 'HASH');                    (ref($item->{'ltiref'}) eq 'HASH'));
     my ($cdom,$cnum) = split(/_/,$item->{'cid'});      my ($cdom,$cnum) = split(/_/,$item->{'cid'});
       return if (($cdom eq '') || ($cnum eq ''));
     my $udom = $cdom;      my $udom = $cdom;
     my $id = $item->{'id'};      my $id = $item->{'id'};
     my $url = $item->{'url'};      my $url = $item->{'url'};
       my $ltinum = $item->{'lti'};
       my $keynum = $item->{'ltiref'}->{'cipher'};
     my @intdoms;      my @intdoms;
     my $intdomsref = $item->{'intdoms'};      my $intdomsref = $item->{'intdoms'};
     if (ref($intdomsref) eq 'ARRAY') {      if (ref($intdomsref) eq 'ARRAY') {
         @intdoms = @{$intdomsref};          @intdoms = @{$intdomsref};
     }      }
     my $uriscope = $item->{'uriscope'};      my $uriscope = $item->{'uriscope'};
     my $ckey = $item->{'ltiref'}->{'key'};  
     my $secret = $item->{'ltiref'}->{'secret'};  
     my $section = $item->{'ltiref'}->{'section'};      my $section = $item->{'ltiref'}->{'section'};
     $section =~ s/\W//g;      $section =~ s/\W//g;
     if ($section eq 'none') {      if ($section eq 'none') {
Line 1063  sub batchaddroster { Line 1135  sub batchaddroster {
     if (ref($item->{'possroles'}) eq 'ARRAY') {      if (ref($item->{'possroles'}) eq 'ARRAY') {
         @possroles = @{$item->{'possroles'}};          @possroles = @{$item->{'possroles'}};
     }      }
     if (($ckey ne '') && ($secret ne '') && ($id ne '') && ($url ne '')) {      if (($id ne '') && ($url ne '')) {
         my %data = &get_roster($id,$url,$ckey,$secret);          my %data = &get_roster($cdom,$cnum,$ltinum,$keynum,$id,$url);
         if (keys(%data) > 0) {          if (keys(%data) > 0) {
             my (%rulematch,%inst_results,%curr_rules,%got_rules,%alerts,%info);              my (%rulematch,%inst_results,%curr_rules,%got_rules,%alerts,%info);
             my %coursehash = &Apache::lonnet::coursedescription($cdom.'_'.$cnum);              my %coursehash = &Apache::lonnet::coursedescription($cdom.'_'.$cnum);
Line 1241  sub batchaddroster { Line 1313  sub batchaddroster {
 #  #
 # Which LON-CAPA roles are assignable by the current user  # Which LON-CAPA roles are assignable by the current user
 # and how LTI roles map to LON-CAPA roles (as defined in  # and how LTI roles map to LON-CAPA roles (as defined in
 # the domain configuration for the specific Consumer) are   # the domain configuration for the specific Consumer) are
 # factored in when compiling the list of available roles.  # factored in when compiling the list of available roles.
 #  #
 # Inputs: 3  # Inputs: 3
Line 1298  sub get_lc_roles { Line 1370  sub get_lc_roles {
 # LON-CAPA as LTI Provider  # LON-CAPA as LTI Provider
 #  #
 # Compares current start and dates for a user's role  # Compares current start and dates for a user's role
 # with dates to apply for the same user/role to   # with dates to apply for the same user/role to
 # determine if there is a change between the current  # determine if there is a change between the current
 # ones and the updated ones.  # ones and the updated ones.
 #   #
   
 sub datechange_check {  sub datechange_check {
     my ($oldstart,$oldend,$startdate,$enddate) = @_;      my ($oldstart,$oldend,$startdate,$enddate) = @_;
Removed from v.1.15  
changed lines
  Added in v.1.21

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