--- loncom/publisher/lonupload.pm 2001/11/29 21:51:40 1.8 +++ loncom/publisher/lonupload.pm 2003/08/04 18:22:55 1.19 @@ -1,7 +1,8 @@ + # The LearningOnline Network with CAPA # Handler to upload files into construction space # -# $Id: lonupload.pm,v 1.8 2001/11/29 21:51:40 matthew Exp $ +# $Id: lonupload.pm,v 1.19 2003/08/04 18:22:55 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,31 +26,37 @@ # # http://www.lon-capa.org/ # -# (Handler to retrieve an old version of a file -# -# (Publication Handler -# -# (TeX Content Handler -# -# 05/29/00,05/30,10/11 Gerd Kortemeyer) -# -# 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer -# 03/23 Guy Albertelli -# 03/24,03/29 Gerd Kortemeyer) -# -# 03/31,04/03 Gerd Kortemeyer) -# -# 04/05,04/09,05/25,06/23,06/24,08/22 Gerd Kortemeyer -# 11/29 Matthew Hall +### package Apache::lonupload; use strict; use Apache::File; use File::Copy; +use File::Basename; use Apache::Constants qw(:common :http :methods); use Apache::loncacc; +use Apache::loncommon(); +use Apache::Log(); use Apache::lonnet; +use HTML::Entities(); + +my $DEBUG=0; + +sub Debug { + + # Marshall the parameters. + + my $r = shift; + my $log = $r->log; + my $message = shift; + + # Put out the indicated message butonly if DEBUG is false. + + if ($DEBUG) { + $log->debug($message); + } +} sub upfile_store { my $r=shift; @@ -57,7 +64,7 @@ sub upfile_store { my $fname=$ENV{'form.upfile.filename'}; $fname=~s/\W//g; - chop($ENV{'form.upfile'}); + chomp($ENV{'form.upfile'}); my $datatoken=$ENV{'user.name'}.'_'.$ENV{'user.domain'}. '_upload_'.$fname.'_'.time.'_'.$$; @@ -81,25 +88,37 @@ sub phaseone { $fn=~s/^\///; $fn=~s/(\/)+/\//g; +# Fn is the full path to the destination filename. +# + + &Debug($r, "Filename for upload: $fn"); if (($fn) && ($fn!~/\/$/)) { $r->print( '
'. ''. ''. + ''. 'Store uploaded file as '. - '
'. + '
'. '
'); - # Check for bad extension + # Check for bad extension and warn user if ($fn=~/\.(\w+)$/ && - (&Apache::lonnet::fileembstyle($1) eq 'hdn')) { + (&Apache::loncommon::fileembstyle($1) eq 'hdn')) { $r->print( ''. 'The extension on this file, "'.$1. '", is reserved internally by LON-CAPA.
'. 'Please change the extension.'. ''); - } + } elsif($fn=~/\.(\w+)$/ && + !defined(&Apache::loncommon::fileembstyle($1))) { + $r->print( + ''. + 'The extension on this file, "'.$1. + '", is not recognized by LON-CAPA.
'. + 'Please change the extension.'. + ''); + } } else { $r->print('Illegal filename.'); } @@ -109,11 +128,20 @@ sub phaseone { } sub phasetwo { - my ($r,$fn,$uname,$udom)=@_; - if ($fn=~/^\/priv\/$uname\//) { - my $tfn=$fn; - $tfn=~s/^\/(\~|priv)\/(\w+)//; + my ($r,$tfn,$uname,$udom)=@_; + my $fn='/priv/'.$uname.'/'.$tfn; + $fn=~s/\/+/\//g; + &Debug($r, "Filename is ".$tfn); + if ($tfn) { + &Debug($r, "Filename for tfn = ".$tfn); my $target='/home/'.$uname.'/public_html'.$tfn; + &Debug($r, "target -> ".$target); +# target is the full filesystem path of the destination file. + my $base = &File::Basename::basename($fn); + my $path = &File::Basename::dirname($fn); + $base = &HTML::Entities::encode($base); + my $url = $path."/".$base; + &Debug($r, "URL is now ".$url); my $datatoken=$ENV{'form.datatoken'}; if (($fn) && ($datatoken)) { if ((-e $target) && ($ENV{'form.override'} ne 'Yes')) { @@ -121,46 +149,77 @@ sub phasetwo { '
'. 'File '.$fn.' exists. Overwrite? '. ''. - ''. + ''. ''. '
'); } else { my $source=$r->dir_config('lonDaemons'). '/tmp/'.$datatoken.'.tmp'; - # Check for bad extension + # Check for bad extension and disallow upload if ($fn=~/\.(\w+)$/ && - (&Apache::lonnet::fileembstyle($1) eq 'hdn')) { + (&Apache::loncommon::fileembstyle($1) eq 'hdn')) { $r->print( 'File '.$fn.' could not be copied.
'. ''. 'The extension on this file is reserved internally by LON-CAPA.'. ''); + $r->print('

Back to Directory'); + } elsif ($fn=~/\.(\w+)$/ && + !defined(&Apache::loncommon::fileembstyle($1))) { + $r->print( + 'File '.$fn.' could not be copied.
'. + ''. + 'The extension on this file is not recognized by LON-CAPA.'. + ''); + $r->print('

Back to Directory'); + } elsif (-d $target) { + $r->print( + 'File '.$fn.' could not be copied.
'. + ''. + 'The target is an existing directory.'. + ''); + $r->print('

Back to Directory'); } elsif (copy($source,$target)) { + chmod(0660, $target); # Set permissions to rw-rw---. $r->print('File copied.'); - $r->print('

View file'); + $r->print('

Back to Directory'); } else { $r->print('Failed to copy: '.$!); + $r->print('

Back to Directory'); } } } else { $r->print( - 'Please pick a filename

'); - &phaseone($r,$fn,$uname,$udom); + 'Please use browser "Back" button and pick a filename

'); } } else { $r->print( - 'Please pick a filename

'); - &phaseone($r,$fn,$uname,$udom); + 'Please use browser "Back" button and pick a filename

'); } } +# ---------------------------------------------------------------- Main Handler sub handler { my $r=shift; my $uname; my $udom; +# +# phase two: re-attach user +# + if ($ENV{'form.uploaduname'}) { + $ENV{'form.filename'}='/priv/'.$ENV{'form.uploaduname'}.'/'. + $ENV{'form.filename'}; + } +# ($uname,$udom)= &Apache::loncacc::constructaccess( @@ -174,10 +233,12 @@ sub handler { } my $fn; - if ($ENV{'form.filename'}) { $fn=$ENV{'form.filename'}; - $fn=~s/^http\:\/\/[^\/]+\/(\~|priv\/)(\w+)//; + $fn=~s/^http\:\/\/[^\/]+\///; + $fn=~s/^\///; + $fn=~s/(\~|priv\/)(\w+)//; + $fn=~s/\/+/\//g; } else { $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}. ' unspecified filename for upload', $r->filename); @@ -192,11 +253,7 @@ sub handler { $r->print('LON-CAPA Construction Space'); - $r->print( - ''); - - - $r->print('

Upload file to Construction Space

'); + $r->print(&Apache::loncommon::bodytag('Upload file to Construction Space')); if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) { $r->print('

Co-Author: '.$uname.' at '.$udom. @@ -216,3 +273,76 @@ sub handler { 1; __END__ + +=head1 NAME + +Apache::lonupload - upload files into construction space + +=head1 SYNOPSIS + +Invoked by /etc/httpd/conf/srm.conf: + + + PerlAccessHandler Apache::lonacc + SetHandler perl-script + PerlHandler Apache::lonupload + ErrorDocument 403 /adm/login + ErrorDocument 404 /adm/notfound.html + ErrorDocument 406 /adm/unauthorized.html + ErrorDocument 500 /adm/errorhandler + + +=head1 INTRODUCTION + +This module uploads a file sitting on a client computer into +library server construction space. + +This is part of the LearningOnline Network with CAPA project +described at http://www.lon-capa.org. + +=head1 HANDLER SUBROUTINE + +This routine is called by Apache and mod_perl. + +=over 4 + +=item * + +Initialize variables + +=item * + +Start page output + +=item * + +output relevant interface phase (phaseone or phasetwo) + +=item * + +(phase one is to specify upload file; phase two is to handle conditions +subsequent to specification--like overwriting an existing file) + +=back + +=head1 OTHER SUBROUTINES + +=over 4 + +=item * + +phaseone() : Interface for specifying file to upload. + +=item * + +phasetwo() : Interface for handling post-conditions about uploading (such +as overwriting an existing file). + +=item * + +upfile_store() : Store contents of uploaded file into temporary space. Invoked +by phaseone subroutine. + +=back + +=cut