[LON-CAPA-cvs] cvs: loncom / loncapa_apache.conf /auth checkauthen.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Thu, 01 Jun 2006 22:29:49 -0000
This is a MIME encoded message
--albertel1149200989
Content-Type: text/plain
albertel Thu Jun 1 18:29:49 2006 EDT
Modified files:
/loncom loncapa_apache.conf
/loncom/auth checkauthen.pm
Log:
- switching AuthType from Basic -> LONCAPA and chanign checkauthen to ignore Basic Auth modes, takes care of bug#4804
--albertel1149200989
Content-Type: text/plain
Content-Disposition: attachment; filename="albertel-20060601182949.txt"
Index: loncom/loncapa_apache.conf
diff -u loncom/loncapa_apache.conf:1.138 loncom/loncapa_apache.conf:1.139
--- loncom/loncapa_apache.conf:1.138 Thu May 18 16:01:22 2006
+++ loncom/loncapa_apache.conf Thu Jun 1 18:29:43 2006
@@ -1,7 +1,7 @@
##
## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
##
-## $Id: loncapa_apache.conf,v 1.138 2006/05/18 20:01:22 albertel Exp $
+## $Id: loncapa_apache.conf,v 1.139 2006/06/01 22:29:43 albertel Exp $
##
#
@@ -50,9 +50,8 @@
#PerlWarn On
<LocationMatch "^/+res.*">
-#AuthName "LON-CAPA Auth"
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAccessHandler Apache::publiccheck
@@ -79,7 +78,7 @@
</LocationMatch>
<Location /adm/portfolio>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -87,7 +86,7 @@
</Location>
<Location /adm/coursegrp_portfolio>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -101,7 +100,7 @@
</LocationMatch>
<LocationMatch "^/+uploaded.*">
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
PerlHeaderParserHandler Apache::lonuploadrep
@@ -112,7 +111,7 @@
</LocationMatch>
<LocationMatch "^/+editupload.*">
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
ErrorDocument 403 /adm/login
@@ -137,7 +136,7 @@
<LocationMatch "^/+public/.*/syllabus$">
PerlAccessHandler Apache::publiccheck
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -148,7 +147,7 @@
<LocationMatch "^/+(public|adm)/.*(\.rss|_rss\.html)$">
PerlAccessHandler Apache::publiccheck
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -158,7 +157,7 @@
</LocationMatch>
<LocationMatch "^/adm/.*/aboutme$">
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -169,7 +168,7 @@
</LocationMatch>
<LocationMatch "^/adm/.*/smppg$">
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -180,7 +179,7 @@
</LocationMatch>
<LocationMatch "^/adm/.*/grppg$">
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -191,7 +190,7 @@
</LocationMatch>
<LocationMatch "^/adm/.*/bulletinboard$">
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -203,7 +202,7 @@
</LocationMatch>
<LocationMatch "\.problem/smpedit$">
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -214,7 +213,7 @@
</LocationMatch>
<LocationMatch "^/+priv.*">
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::loncacc
SetHandler perl-script
@@ -230,7 +229,7 @@
</LocationMatch>
<LocationMatch "^/+\~.*">
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::loncacc
ErrorDocument 403 /adm/login
@@ -241,7 +240,7 @@
</LocationMatch>
<LocationMatch "^/adm/helper/.*\.helper$">
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -253,7 +252,7 @@
</LocationMatch>
<LocationMatch "/prtspool">
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
ErrorDocument 403 /adm/login
@@ -285,7 +284,7 @@
</LocationMatch>
<Location /adm/ratparms>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -326,7 +325,7 @@
</LocationMatch>
<LocationMatch "^/adm/bombs/">
-AuthType Basic
+AuthType LONCAPA
Require valid-user
SetHandler perl-script
PerlAuthzHandler Apache::lonacc
@@ -352,7 +351,7 @@
</LocationMatch>
<LocationMatch "^/adm/wrapper/">
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -362,7 +361,7 @@
</LocationMatch>
<LocationMatch "^/adm/source">
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -374,7 +373,7 @@
<LocationMatch "^/adm/localize/">
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -386,7 +385,7 @@
# -------------------------------------------------------------- Admin Programs
<Location /adm/randomlabel.png>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -396,7 +395,7 @@
</Location>
<Location /adm/imagechoice>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -406,7 +405,7 @@
</Location>
<Location /adm/statistics>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -417,7 +416,7 @@
</Location>
<Location /adm/trackstudent>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -428,7 +427,7 @@
</Location>
<Location /adm/roles>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -438,7 +437,7 @@
</Location>
<Location /adm/menu>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -448,7 +447,7 @@
</Location>
<Location /adm/remote>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -458,7 +457,7 @@
</Location>
<Location /adm/pickstudent>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -468,7 +467,7 @@
</Location>
<Location /adm/pickcourse>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -478,7 +477,7 @@
</Location>
<Location /adm/pickcode>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -493,7 +492,7 @@
</Location>
<Location /adm/logout>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -502,7 +501,7 @@
</Location>
<Location /adm/switchserver>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -521,7 +520,7 @@
</Location>
<Location /adm/annotations>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -531,7 +530,7 @@
</Location>
<Location /adm/spellcheck>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -541,7 +540,7 @@
</Location>
<Location /adm/bookmarks>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -551,7 +550,7 @@
</Location>
<Location /adm/flip>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -564,7 +563,7 @@
</Location>
<Location /adm/ambiguous>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -576,7 +575,7 @@
</Location>
<Location /adm/email>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -586,7 +585,7 @@
</Location>
<Location /adm/notify>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -596,7 +595,7 @@
</Location>
<Location /adm/parmset>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -607,7 +606,7 @@
</Location>
<Location /adm/slotrequest>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -618,7 +617,7 @@
</Location>
<Location /adm/wizard>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -629,7 +628,7 @@
</Location>
<Location /adm/grades>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -640,7 +639,7 @@
</Location>
<Location /adm/createcourse>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -651,7 +650,7 @@
</Location>
<Location /adm/modifycourse>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -662,7 +661,7 @@
</Location>
<Location /adm/createuser>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -673,7 +672,7 @@
</Location>
<Location /adm/publish>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -685,7 +684,7 @@
</Location>
<LocationMatch "^/+\~.*/$">
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::loncacc
SetHandler perl-script
@@ -697,7 +696,7 @@
</LocationMatch>
<Location /adm/pubdir>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -709,7 +708,7 @@
</Location>
<Location /adm/unauthorized>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -720,7 +719,7 @@
</Location>
<Location /adm/retrieve>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -732,7 +731,7 @@
</Location>
<Location /adm/cleanup>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -744,7 +743,7 @@
</Location>
<Location /adm/cfile>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -756,7 +755,7 @@
</Location>
<Location /adm/diff>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -768,7 +767,7 @@
</Location>
<Location /adm/upload>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -780,7 +779,7 @@
</Location>
<Location /adm/imsimport>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -792,7 +791,7 @@
</Location>
<Location /adm/testbank>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -804,7 +803,7 @@
</Location>
<Location /adm/assesscalc>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -816,7 +815,7 @@
</Location>
<Location /adm/studentcalc>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -828,7 +827,7 @@
</Location>
<Location /adm/classcalc>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -840,7 +839,7 @@
</Location>
<Location /adm/dropadd>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -851,7 +850,7 @@
</Location>
<Location /adm/viewclasslist>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -862,7 +861,7 @@
</Location>
<Location /adm/coursegroups>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -873,7 +872,7 @@
</Location>
<Location /adm/whatsnew>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -884,7 +883,7 @@
</Location>
<Location /adm/populate>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -895,7 +894,7 @@
</Location>
<Location /adm/managekeys>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -906,7 +905,7 @@
</Location>
<Location /adm/printout>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -917,7 +916,7 @@
</Location>
<Location /adm/feedback>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -927,7 +926,7 @@
</Location>
<Location /adm/coursedocs>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -939,7 +938,7 @@
</Location>
<Location /adm/imsimportdocs>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -949,7 +948,7 @@
</Location>
<LocationMatch "^/adm/announcements">
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -959,7 +958,7 @@
</LocationMatch>
<Location /adm/chat>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -968,7 +967,7 @@
</Location>
<Location /adm/chatfetch>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -978,7 +977,7 @@
</Location>
<Location /adm/groupchat>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -988,7 +987,7 @@
</Location>
<Location /adm/evaluate>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -998,7 +997,7 @@
</Location>
<Location /adm/preferences>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -1008,7 +1007,7 @@
</Location>
<Location /adm/communicate>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -1018,7 +1017,7 @@
</Location>
<Location /adm/searchcat>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -1031,7 +1030,7 @@
</Location>
<Location /adm/navmaps>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -1042,7 +1041,7 @@
</Location>
<Location /adm/quickgrades>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -1053,7 +1052,7 @@
</Location>
<Location /adm/groupsort>
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -1070,7 +1069,7 @@
</Location>
<LocationMatch "^/adm/help/.*\.hlp$">
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -1078,7 +1077,7 @@
</LocationMatch>
<LocationMatch "^/adm/helpmenu">
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
@@ -1086,7 +1085,7 @@
</LocationMatch>
<LocationMatch "^/adm/support">
-AuthType Basic
+AuthType LONCAPA
Require valid-user
PerlAuthzHandler Apache::lonacc
SetHandler perl-script
Index: loncom/auth/checkauthen.pm
diff -u loncom/auth/checkauthen.pm:1.1 loncom/auth/checkauthen.pm:1.2
--- loncom/auth/checkauthen.pm:1.1 Tue Nov 29 16:02:50 2005
+++ loncom/auth/checkauthen.pm Thu Jun 1 18:29:49 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network
# checks for a cokkie to authenticate a user
#
-# $Id: checkauthen.pm,v 1.1 2005/11/29 21:02:50 albertel Exp $
+# $Id: checkauthen.pm,v 1.2 2006/06/01 22:29:49 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,9 +36,12 @@
sub handler {
my ($r) = @_;
+ if ($r->type ne 'Basic') {
+ return DECLINED;
+ }
my $fail = FORBIDDEN;
if ($r->dir_config('lonOtherAuthen') eq 'yes') {
- &Apache::lonnet::logthis("other authen");
+ #&Apache::lonnet::logthis("other authen");
$fail = DECLINED;
}
--albertel1149200989--