--- loncom/auth/lonacc.pm 2008/11/20 14:37:52 1.120 +++ loncom/auth/lonacc.pm 2009/04/14 23:52:07 1.125 @@ -1,7 +1,7 @@ # The LearningOnline Network # Cookie Based Access Handler # -# $Id: lonacc.pm,v 1.120 2008/11/20 14:37:52 jms Exp $ +# $Id: lonacc.pm,v 1.125 2009/04/14 23:52:07 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -27,6 +27,72 @@ # ### +=head1 NAME + +Apache::lonacc - Cookie Based Access Handler + +=head1 SYNOPSIS + +Invoked (for various locations) by /etc/httpd/conf/srm.conf: + + PerlAccessHandler Apache::lonacc + +=head1 INTRODUCTION + +This module enables cookie based authentication and is used +to control access for many different LON-CAPA URIs. + +Whenever the client sends the cookie back to the server, +this cookie is handled by either lonacc.pm or loncacc.pm +(see srm.conf for what is invoked when). If +the cookie is missing or invalid, the user is re-challenged +for login information. + +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 * + +transfer profile into environment + +=item * + +load POST parameters + +=item * + +check access + +=item * + +if allowed, get symb, log, generate course statistics if applicable + +=item * + +otherwise return error + +=item * + +see if public resource + +=item * + +store attempted access + +=back + +=head1 NOTABLE SUBROUTINES + +=over + +=cut + package Apache::lonacc; @@ -156,22 +222,27 @@ sub get_posted_cgi { $r->headers_in->unset('Content-length'); } -# -# Perform size checks for file uploads to essayresponse items in course context. -# -# Add form.HWFILESIZE.$part_$id to %env with file size (MB) -# If file exceeds maximum allowed size, add form.HWFILETOOBIG.$part_$id to %env. -# +=pod + +=item upload_size_allowed() + + Perform size checks for file uploads to essayresponse items in course context. + + Add form.HWFILESIZE.$part_$id to %env with file size (MB) + If file exceeds maximum allowed size, add form.HWFILETOOBIG.$part_$id to %env. + +=cut sub upload_size_allowed { my ($name,$size,$fname) = @_; if ($name =~ /^HWFILE(\w+)$/) { my $ident = $1; my $item = 'HWFILESIZE'.$ident; - &Apache::loncommon::add_to_env("form.$item",$size); + my $savesize = sprintf("%.6f",$size); + &Apache::loncommon::add_to_env("form.$item",$savesize); my $maxsize= &Apache::lonnet::EXT("resource.$ident.maxfilesize"); if (!$maxsize) { - $maxsize = 100.0; + $maxsize = 10.0; # FIXME This should become a domain configuration. } if ($size > $maxsize) { my $warn = 'HWFILETOOBIG'.$ident; @@ -182,11 +253,17 @@ sub upload_size_allowed { return 'ok'; } -# handle the case of the single sign on user, at this point $r->user -# will be set and valid now need to find the loncapa user info and possibly -# balance them -# returns OK if it was a SSO and user was handled -# undef if not SSO or no means to hanle the user +=pod + +=item sso_login() + + handle the case of the single sign on user, at this point $r->user + will be set and valid now need to find the loncapa user info and possibly + balance them + returns OK if it was a SSO and user was handled + undef if not SSO or no means to hanle the user + +=cut sub sso_login { my ($r,$handle) = @_; @@ -275,7 +352,10 @@ sub handler { return OK; } - + if ($requrl =~ m{^/res/adm/pages/[^/]+\.(gif|png)$}) { + return OK; + } + my $handle = &Apache::lonnet::check_for_valid_session($r); my $result = &sso_login($r,$handle); @@ -369,6 +449,7 @@ sub handler { if ($env{'request.course.id'}) { &Apache::lonnet::countacc($requrl); $requrl=~/\.(\w+)$/; + my $query=$r->args; if ((&Apache::loncommon::fileembstyle($1) eq 'ssi') || ($requrl=~/^\/adm\/.*\/(aboutme|navmaps|smppg|bulletinboard)(\?|$ )/x) || ($requrl=~/^\/adm\/wrapper\//) || @@ -376,7 +457,6 @@ sub handler { ($requrl=~m|\.problem/smpedit$|) || ($requrl=~/^\/public\/.*\/syllabus$/)) { # ------------------------------------- This is serious stuff, get symb and log - my $query=$r->args; my $symb; if ($query) { &Apache::loncommon::get_unprocessed_cgi($query,['symb']); @@ -423,6 +503,18 @@ sub handler { # ------------------------------------------------------- This is other content &Apache::lonnet::courseacclog($requrl); } + my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};; + my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};; + if ($requrl =~ m{^/+uploaded/\Q$cdom\E/\Q$cnum\E/docs/.+\.html?$}) { + if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { + if ($query) { + &Apache::loncommon::get_unprocessed_cgi($query,['forceedit']); + if ($env{'form.forceedit'}) { + $env{'request.state'} = 'edit'; + } + } + } + } } return OK; } @@ -461,65 +553,9 @@ sub handler { 1; __END__ - -=head1 NAME - -Apache::lonacc - Cookie Based Access Handler - -=head1 SYNOPSIS - -Invoked (for various locations) by /etc/httpd/conf/srm.conf: - - PerlAccessHandler Apache::lonacc - -=head1 INTRODUCTION - -This module enables cookie based authentication and is used -to control access for many different LON-CAPA URIs. - -Whenever the client sends the cookie back to the server, -this cookie is handled by either lonacc.pm or loncacc.pm -(see srm.conf for what is invoked when). If -the cookie is missing or invalid, the user is re-challenged -for login information. - -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 * - -transfer profile into environment - -=item * - -load POST parameters - -=item * - -check access - -=item * - -if allowed, get symb, log, generate course statistics if applicable - -=item * - -otherwise return error - -=item * - -see if public resource - -=item * - -store attempted access +=pod =back -=cut \ No newline at end of file +=cut +