|
version 1.509, 2014/04/30 17:17:14
|
version 1.516, 2015/06/14 00:43:51
|
|
Line 621 sub ConfigFileFromSelector {
|
Line 621 sub ConfigFileFromSelector {
|
| # String to send to client ("ok" or "refused" if bad file). |
# String to send to client ("ok" or "refused" if bad file). |
| # |
# |
| sub PushFile { |
sub PushFile { |
| my $request = shift; |
my $request = shift; |
| my ($command, $filename, $contents) = split(":", $request, 3); |
my ($command, $filename, $contents) = split(":", $request, 3); |
| &Debug("PushFile"); |
&Debug("PushFile"); |
| |
|
|
Line 651 sub PushFile {
|
Line 651 sub PushFile {
|
| |
|
| if($filename eq "host") { |
if($filename eq "host") { |
| $contents = AdjustHostContents($contents); |
$contents = AdjustHostContents($contents); |
| |
} elsif ($filename eq 'dns_host' || $filename eq 'dns_domain') { |
| |
if ($contents eq '') { |
| |
&logthis('<font color="red"> Pushfile: unable to install ' |
| |
.$tablefile." - no data received from push. </font>"); |
| |
return 'error: push had no data'; |
| |
} |
| |
if (&Apache::lonnet::get_host_ip($clientname)) { |
| |
my $clienthost = &Apache::lonnet::hostname($clientname); |
| |
if ($managers{$clientip} eq $clientname) { |
| |
my $clientprotocol = $Apache::lonnet::protocol{$clientname}; |
| |
$clientprotocol = 'http' if ($clientprotocol ne 'https'); |
| |
my $url = '/adm/'.$filename; |
| |
$url =~ s{_}{/}; |
| |
my $ua=new LWP::UserAgent; |
| |
$ua->timeout(60); |
| |
my $request=new HTTP::Request('GET',"$clientprotocol://$clienthost$url"); |
| |
my $response=$ua->request($request); |
| |
if ($response->is_error()) { |
| |
&logthis('<font color="red"> Pushfile: unable to install ' |
| |
.$tablefile." - error attempting to pull data. </font>"); |
| |
return 'error: pull failed'; |
| |
} else { |
| |
my $result = $response->content; |
| |
chomp($result); |
| |
unless ($result eq $contents) { |
| |
&logthis('<font color="red"> Pushfile: unable to install ' |
| |
.$tablefile." - pushed data and pulled data differ. </font>"); |
| |
my $pushleng = length($contents); |
| |
my $pullleng = length($result); |
| |
if ($pushleng != $pullleng) { |
| |
return "error: $pushleng vs $pullleng bytes"; |
| |
} else { |
| |
return "error: mismatch push and pull"; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| } |
} |
| |
|
| # Install the new file: |
# Install the new file: |
|
Line 2770 sub newput_user_profile_entry {
|
Line 2808 sub newput_user_profile_entry {
|
| foreach my $pair (@pairs) { |
foreach my $pair (@pairs) { |
| my ($key,$value)=split(/=/,$pair); |
my ($key,$value)=split(/=/,$pair); |
| if (exists($hashref->{$key})) { |
if (exists($hashref->{$key})) { |
| &Failure($client, "key_exists: ".$key."\n",$userinput); |
if (!&untie_user_hash($hashref)) { |
| return 1; |
&logthis("error: ".($!+0)." untie (GDBM) failed ". |
| |
"while attempting newput - early out as key exists"); |
| |
} |
| |
&Failure($client, "key_exists: ".$key."\n",$userinput); |
| |
return 1; |
| } |
} |
| } |
} |
| |
|
|
Line 3284 sub dump_with_regexp {
|
Line 3326 sub dump_with_regexp {
|
| # namespace - Name of the database being modified |
# namespace - Name of the database being modified |
| # rid - Resource keyword to modify. |
# rid - Resource keyword to modify. |
| # what - new value associated with rid. |
# what - new value associated with rid. |
| |
# laststore - (optional) version=timestamp |
| |
# for most recent transaction for rid |
| |
# in namespace, when cstore was called |
| # |
# |
| # $client - Socket open on the client. |
# $client - Socket open on the client. |
| # |
# |
|
Line 3292 sub dump_with_regexp {
|
Line 3337 sub dump_with_regexp {
|
| # 1 (keep on processing). |
# 1 (keep on processing). |
| # Side-Effects: |
# Side-Effects: |
| # Writes to the client |
# Writes to the client |
| |
# Successful storage will cause either 'ok', or, if $laststore was included |
| |
# in the tail of the request, and the version number for the last transaction |
| |
# is larger than the version in $laststore, delay:$numtrans , where $numtrans |
| |
# is the number of store evevnts recorded for rid in namespace since |
| |
# lonnet::store() was called by the client. |
| |
# |
| sub store_handler { |
sub store_handler { |
| my ($cmd, $tail, $client) = @_; |
my ($cmd, $tail, $client) = @_; |
| |
|
| my $userinput = "$cmd:$tail"; |
my $userinput = "$cmd:$tail"; |
| |
chomp($tail); |
| my ($udom,$uname,$namespace,$rid,$what) =split(/:/,$tail); |
my ($udom,$uname,$namespace,$rid,$what,$laststore) =split(/:/,$tail); |
| if ($namespace ne 'roles') { |
if ($namespace ne 'roles') { |
| |
|
| chomp($what); |
|
| my @pairs=split(/\&/,$what); |
my @pairs=split(/\&/,$what); |
| my $hashref = &tie_user_hash($udom, $uname, $namespace, |
my $hashref = &tie_user_hash($udom, $uname, $namespace, |
| &GDBM_WRCREAT(), "S", |
&GDBM_WRCREAT(), "S", |
| "$rid:$what"); |
"$rid:$what"); |
| if ($hashref) { |
if ($hashref) { |
| my $now = time; |
my $now = time; |
| my @previouskeys=split(/&/,$hashref->{"keys:$rid"}); |
my $numtrans; |
| my $key; |
if ($laststore) { |
| |
my ($previousversion,$previoustime) = split(/\=/,$laststore); |
| |
my ($lastversion,$lasttime) = (0,0); |
| |
$lastversion = $hashref->{"version:$rid"}; |
| |
if ($lastversion) { |
| |
$lasttime = $hashref->{"$lastversion:$rid:timestamp"}; |
| |
} |
| |
if (($previousversion) && ($previousversion !~ /\D/)) { |
| |
if (($lastversion > $previousversion) && ($lasttime >= $previoustime)) { |
| |
$numtrans = $lastversion - $previousversion; |
| |
} |
| |
} elsif ($lastversion) { |
| |
$numtrans = $lastversion; |
| |
} |
| |
if ($numtrans) { |
| |
$numtrans =~ s/D//g; |
| |
} |
| |
} |
| $hashref->{"version:$rid"}++; |
$hashref->{"version:$rid"}++; |
| my $version=$hashref->{"version:$rid"}; |
my $version=$hashref->{"version:$rid"}; |
| my $allkeys=''; |
my $allkeys=''; |
|
Line 3321 sub store_handler {
|
Line 3388 sub store_handler {
|
| $allkeys.='timestamp'; |
$allkeys.='timestamp'; |
| $hashref->{"$version:keys:$rid"}=$allkeys; |
$hashref->{"$version:keys:$rid"}=$allkeys; |
| if (&untie_user_hash($hashref)) { |
if (&untie_user_hash($hashref)) { |
| &Reply($client, "ok\n", $userinput); |
my $msg = 'ok'; |
| |
if ($numtrans) { |
| |
$msg = 'delay:'.$numtrans; |
| |
} |
| |
&Reply($client, "$msg\n", $userinput); |
| } else { |
} else { |
| &Failure($client, "error: ".($!+0)." untie(GDBM) Failed ". |
&Failure($client, "error: ".($!+0)." untie(GDBM) Failed ". |
| "while attempting store\n", $userinput); |
"while attempting store\n", $userinput); |
|
Line 5339 sub crsreq_update_handler {
|
Line 5410 sub crsreq_update_handler {
|
| $title,$code,$accessstart,$accessend, |
$title,$code,$accessstart,$accessend, |
| $incoming,\%rtnhash); |
$incoming,\%rtnhash); |
| if ($outcome eq 'ok') { |
if ($outcome eq 'ok') { |
| my @posskeys = qw(createdweb createdmsg queuedweb queuedmsg formitems reviewweb); |
my @posskeys = qw(createdweb createdmsg createdcustomized createdactions queuedweb queuedmsg formitems reviewweb validationjs onload javascript); |
| foreach my $key (keys(%rtnhash)) { |
foreach my $key (keys(%rtnhash)) { |
| if (grep(/^\Q$key\E/,@posskeys)) { |
if (grep(/^\Q$key\E/,@posskeys)) { |
| $result .= &escape($key).'='.&Apache::lonnet::freeze_escape($rtnhash{$key}).'&'; |
$result .= &escape($key).'='.&Apache::lonnet::freeze_escape($rtnhash{$key}).'&'; |
|
Line 6556 sub make_new_child {
|
Line 6627 sub make_new_child {
|
| # my $tmpsnum=0; # Now global |
# my $tmpsnum=0; # Now global |
| #---------------------------------------------------- kerberos 5 initialization |
#---------------------------------------------------- kerberos 5 initialization |
| &Authen::Krb5::init_context(); |
&Authen::Krb5::init_context(); |
| unless (($dist eq 'fedora5') || ($dist eq 'fedora4') || |
|
| ($dist eq 'fedora6') || ($dist eq 'suse9.3') || |
my $no_ets; |
| ($dist eq 'suse12.2') || ($dist eq 'suse12.3') || |
if ($dist =~ /^(?:centos|rhes|scientific)(\d+)$/) { |
| ($dist eq 'suse13.1')) { |
if ($1 >= 7) { |
| |
$no_ets = 1; |
| |
} |
| |
} elsif ($dist =~ /^suse(\d+\.\d+)$/) { |
| |
if (($1 eq '9.3') || ($1 >= 12.2)) { |
| |
$no_ets = 1; |
| |
} |
| |
} elsif ($dist =~ /^sles(\d+)$/) { |
| |
if ($1 > 11) { |
| |
$no_ets = 1; |
| |
} |
| |
} elsif ($dist =~ /^fedora(\d+)$/) { |
| |
if ($1 < 7) { |
| |
$no_ets = 1; |
| |
} |
| |
} |
| |
unless ($no_ets) { |
| &Authen::Krb5::init_ets(); |
&Authen::Krb5::init_ets(); |
| } |
} |
| |
|
|
Line 6604 sub make_new_child {
|
Line 6691 sub make_new_child {
|
| # |
# |
| # If the remote is attempting a local init... give that a try: |
# If the remote is attempting a local init... give that a try: |
| # |
# |
| logthis("remotereq: $remotereq"); |
|
| (my $i, my $inittype, $clientversion) = split(/:/, $remotereq); |
(my $i, my $inittype, $clientversion) = split(/:/, $remotereq); |
| # For LON-CAPA 2.9, the client session will have sent its LON-CAPA |
# For LON-CAPA 2.9, the client session will have sent its LON-CAPA |
| # version when initiating the connection. For LON-CAPA 2.8 and older, |
# version when initiating the connection. For LON-CAPA 2.8 and older, |
![[BACK]](/icons/back.gif){kind=icon}
Return to lond CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [LON-CAPA] / loncom