[LON-CAPA-cvs] cvs: loncom /dns_checksums 2.11.5.tab /lonnet/perl lonnet.pm
raeburn
raeburn at source.lon-capa.org
Sat Jul 6 14:27:51 EDT 2024
raeburn Sat Jul 6 18:27:51 2024 EDT
Modified files:
/loncom/lonnet/perl lonnet.pm
/loncom/dns_checksums 2.11.5.tab
Log:
- Update versions/checksums.
-------------- next part --------------
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.1172.2.118.2.20 loncom/lonnet/perl/lonnet.pm:1.1172.2.118.2.21
--- loncom/lonnet/perl/lonnet.pm:1.1172.2.118.2.20 Sun Jun 20 18:54:07 2021
+++ loncom/lonnet/perl/lonnet.pm Sun Jun 20 19:53:37 2021
@@ -1,7 +1,7 @@
# The LearningOnline Network
# TCP networking package
#
-# $Id: lonnet.pm,v 1.1172.2.118.2.20 2021/06/20 18:54:07 raeburn Exp $
+# $Id: lonnet.pm,v 1.1172.2.118.2.21 2021/06/20 19:53:37 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -8002,8 +8002,8 @@
my $adom = $1;
foreach my $key (keys(%env)) {
if ($key =~ m{^user\.role\.(ca|aa)/\Q$adom\E}) {
- my ($start,$end) = split('.',$env{$key});
- if (($now >= $start) && (!$end || $end < $now)) {
+ my ($start,$end) = split(/\./,$env{$key});
+ if (($now >= $start) && (!$end || $end > $now)) {
$ownaccess = 1;
last;
}
@@ -8015,8 +8015,8 @@
foreach my $role ('ca','aa') {
if ($env{"user.role.$role./$adom/$aname"}) {
my ($start,$end) =
- split('.',$env{"user.role.$role./$adom/$aname"});
- if (($now >= $start) && (!$end || $end < $now)) {
+ split(/\./,$env{"user.role.$role./$adom/$aname"});
+ if (($now >= $start) && (!$end || $end > $now)) {
$ownaccess = 1;
last;
}
@@ -8281,16 +8281,48 @@
#
# Possibly locked functionality, check all courses
+# In roles.tab, L (unless locked) available for bre, pch, plc, pac and sma.
# Locks might take effect only after 10 minutes cache expiration for other
-# courses, and 2 minutes for current course
+# courses, and 2 minutes for current course, in which user has st or ta role
+# which is neither expired nor a future role (unless current course).
- my $envkey;
+ my ($needlockcheck,$now,$crsonly);
if ($thisallowed=~/L/) {
- foreach $envkey (keys(%env)) {
+ $now = time;
+ if ($priv eq 'bre') {
+ if ($uri ne '') {
+ if ($orguri =~ m{^/+res/}) {
+ if ($uri =~ m{^lib/templates/}) {
+ if ($env{'request.course.id'}) {
+ $crsonly = 1;
+ $needlockcheck = 1;
+ }
+ } else {
+ $needlockcheck = 1;
+ }
+ } elsif ($env{'request.course.id'}) {
+ my ($crsdom,$crsnum) = split('_',$env{'request.course.id'});
+ if (($uri =~ m{^(adm|uploaded|public)/$crsdom/$crsnum/}) ||
+ ($uri =~ m{^adm/$match_domain/$match_username/\d+/(smppg|bulletinboard)$})) {
+ $crsonly = 1;
+ }
+ $needlockcheck = 1;
+ }
+ }
+ } elsif (($priv eq 'pch') || ($priv eq 'plc') || ($priv eq 'pac') || ($priv eq 'sma')) {
+ $needlockcheck = 1;
+ }
+ }
+ if ($needlockcheck) {
+ foreach my $envkey (keys(%env)) {
if ($envkey=~/^user\.role\.(st|ta)\.([^\.]*)/) {
my $courseid=$2;
my $roleid=$1.'.'.$2;
$courseid=~s/^\///;
+ unless ($env{'request.role'} eq $roleid) {
+ my ($start,$end) = split(/\./,$env{$envkey});
+ next unless (($now >= $start) && (!$end || $end > $now));
+ }
my $expiretime=600;
if ($env{'request.role'} eq $roleid) {
$expiretime=120;
@@ -8313,7 +8345,7 @@
}
if (($env{$prefix.'priv.'.$priv.'.lock.sections'}=~/\,\Q$csec\E\,/)
|| ($env{$prefix.'priv.'.$priv.'.lock.sections'} eq 'all')) {
- if ($env{'priv.'.$priv.'.lock.expire'}>time) {
+ if ($env{$prefix.'priv.'.$priv.'.lock.expire'}>time) {
&log($env{'user.domain'},$env{'user.name'},
$env{'user.home'},
'Locked by priv: '.$priv.' for '.$uri.' due to '.
Index: loncom/dns_checksums/2.11.5.tab
diff -u loncom/dns_checksums/2.11.5.tab:1.1 loncom/dns_checksums/2.11.5.tab:1.2
--- loncom/dns_checksums/2.11.5.tab:1.1 Sat Jul 6 01:30:25 2024
+++ loncom/dns_checksums/2.11.5.tab Sat Jul 6 18:27:51 2024
@@ -1,5 +1,5 @@
2.11.5
-/etc/httpd/conf/loncapa_apache.conf,1.215.2.30,1e2b374490dea5d5d7213bea00c3bf423056df2d
+/etc/httpd/conf/loncapa_apache.conf,1.215.2.30,67846a8804b657e02ff71daf16f0830176315b35
/etc/httpd/conf/startup.pl,1.41.2.4,8cb3b45bcff51beffd02a02d9252fb8b53327e7e
/home/httpd/cgi-bin/barcode.png,1.12,57bb6c59faa8f28283e9a33fb978d96b076a1ecb
/home/httpd/cgi-bin/clusterstatus.pl,1.28,a81dbce03f04cecc9622058845d66ca73b2a4733
@@ -41,7 +41,7 @@
/home/httpd/lib/perl/Apache/classcalc.pm,1.32,a443ce39f8436399147e95d9bc7fa93c7f065d72
/home/httpd/lib/perl/Apache/coursecatalog.pm,1.88.2.9,65ef3dbb93297b6264495bd0653fd7e9a943aa1c
/home/httpd/lib/perl/Apache/courseclassifier.pm,1.30,7e21e84a9af4d98e76ea8cac2169505571515d80
-/home/httpd/lib/perl/Apache/courseprefs.pm,1.49.2.30,5926ffba130f161e3b68c5c2b84503766b45f4dd
+/home/httpd/lib/perl/Apache/courseprefs.pm,1.49.2.32,5926ffba130f161e3b68c5c2b84503766b45f4dd
/home/httpd/lib/perl/Apache/createaccount.pm,1.72.4.7,d86309056dd2538b405fc65e6d6ec4f7b4482476
/home/httpd/lib/perl/Apache/domainprefs.pm,1.160.6.123,b9d41803c5d8885e61dd92435cd4f7396c74601f
/home/httpd/lib/perl/Apache/domainstatus.pm,1.7,81d9992708398df541e117f49cfd8d89a10a8ea8
@@ -96,7 +96,7 @@
/home/httpd/lib/perl/Apache/lonclonecourse.pm,1.13.2.1,3978e825a038629aa7dd55bcfc1d816ee07bf733
/home/httpd/lib/perl/Apache/loncommon.pm,1.1075.2.167,bec3f5173ea0e900653a8b9a255e9e7ddd16d27d
/home/httpd/lib/perl/Apache/loncommunicate.pm,1.48,f8ff95384d23d2e137ef0f1f2befe769a99c9562
-/home/httpd/lib/perl/Apache/lonconfigsettings.pm,1.21.4.14,99750f6aed44d754b378e37a24eaf027cdd971fc
+/home/httpd/lib/perl/Apache/lonconfigsettings.pm,1.21.4.16,99750f6aed44d754b378e37a24eaf027cdd971fc
/home/httpd/lib/perl/Apache/loncorrectproblemplot.pm,1.28.2.1,fc3b683a9c9467b84de2d3ad178e5553787b590c
/home/httpd/lib/perl/Apache/loncoursedata.pm,1.201.2.6,9b24e9c3803e5e96a3d4cf522988df3fc64632b9
/home/httpd/lib/perl/Apache/loncoursegroups.pm,1.127.2.3,125bd3529dd0ca35ca9dfbfbedb61bab27d5deee
@@ -141,7 +141,7 @@
/home/httpd/lib/perl/Apache/lonmenu.pm,1.369.2.85,3a719986968ed82889968c225a8b285baded92d4
/home/httpd/lib/perl/Apache/lonmeta.pm,1.254,271c6438c9d50d432ae4bc69db3d83974a21d283
/home/httpd/lib/perl/Apache/lonmodifycourse.pm,1.79.2.9,7faf5552e076a82706c5c1bff8f4cce61c24a4ab
-/home/httpd/lib/perl/Apache/lonmsg.pm,1.239.2.4,3abae86a030e0b2a97e6a17a307264a1243916e4
+/home/httpd/lib/perl/Apache/lonmsg.pm,1.239.2.5,05344047baa0524cef4d240e15b7ea8c25f14ccd
/home/httpd/lib/perl/Apache/lonmsgdisplay.pm,1.181.2.12,b14ce2d3a6d2cde5e7321dfd30bde996aea88ff9
/home/httpd/lib/perl/Apache/lonmysql.pm,1.41,2ea9e2f11dda38fb1d83c8d07675d431d274f81a
/home/httpd/lib/perl/Apache/lonnavdisplay.pm,1.22.4.11,71f9c3619f58e116defea393faa9952c6deacd98
@@ -151,7 +151,7 @@
/home/httpd/lib/perl/Apache/lonnotify.pm,1.44,d44316c13b039b1ae205c378daf6fe30d766b523
/home/httpd/lib/perl/Apache/lonpage.pm,1.111.2.16,9515fcfbd236e57a8641da87ddd7267283443fad
/home/httpd/lib/perl/Apache/lonpageflip.pm,1.80.8.13,31da069ad59ef447efa5a834bd77a2cee604dab3
-/home/httpd/lib/perl/Apache/lonparmset.pm,1.522.2.31,d02b51f49e27e0a95f7d0f7538e787b32ab19049
+/home/httpd/lib/perl/Apache/lonparmset.pm,1.522.2.32,d02b51f49e27e0a95f7d0f7538e787b32ab19049
/home/httpd/lib/perl/Apache/lonpdfupload.pm,1.25,36c198985c199cbfa99d559379b2296fea6a423f
/home/httpd/lib/perl/Apache/lonpercentage.pm,1.12,0548f3ee8cde877a5472ce4fa46530ae9e76b75d
/home/httpd/lib/perl/Apache/lonpickauthor.pm,1.7,e3e4d89729c9179a0b959570950fa835d5280bce
@@ -168,7 +168,7 @@
/home/httpd/lib/perl/Apache/lonpubdir.pm,1.160.2.6,0e7f3b491437f8beb300eed79f1b83cb03774519
/home/httpd/lib/perl/Apache/lonpublisher.pm,1.295.2.3,25dad2d537b58f6140830833f93c103bd759e150
/home/httpd/lib/perl/Apache/lonquickgrades.pm,1.49.6.9,b0e78b1b5518f845402757f54c2d58f3df0e1375
-/home/httpd/lib/perl/Apache/lonr.pm,1.11,aa270cf67ea9e67756ee7f6fb580e6104db4a098
+/home/httpd/lib/perl/Apache/lonr.pm,1.12,3a4d863ef97433883c3c61b94851ded93c3ffe51
/home/httpd/lib/perl/Apache/lonracc.pm,1.24,d3ef424dc791a02dbcdec20872afc7d2e82ce087
/home/httpd/lib/perl/Apache/lonratedt.pm,1.105.2.7,0098cb5a8fc12f928ebc96616aaf6de551abd263
/home/httpd/lib/perl/Apache/lonratmenu.pm,1.18.8.4,ec87fc1640d671dba2d99266039dd5aa138fb2dc
@@ -254,10 +254,10 @@
/home/httpd/lib/perl/LONCAPA/ConfigFileEdit.pm,1.4,557c8df56791147bf1cbf46670da0b46bef5f279
/home/httpd/lib/perl/LONCAPA/Configuration.pm,1.14,e2e2fd9bd1e36310a6672c4cef1fb112d144ff29
/home/httpd/lib/perl/LONCAPA/Enrollment.pm,1.58,6a2ad4428f7d5f2936bd70109bdc1b17e798b008
-/home/httpd/lib/perl/LONCAPA/Firewall.pm,1.25,dd1b4bb589cb4fb7d3c5ae39bae547da16ae2410
+/home/httpd/lib/perl/LONCAPA/Firewall.pm,1.27,246e3d236e1411c0748d69cf28fe1811d0c6de67
/home/httpd/lib/perl/LONCAPA/HashIterator.pm,1.2,b7f8eee1af94c1a30b0d3f75f759808b9b8a7687
/home/httpd/lib/perl/LONCAPA/Lond.pm,1.8.2.3,7b74ea2146b0216d5c471d7a210665de375d13d3
-/home/httpd/lib/perl/LONCAPA/LondConnection.pm,1.53,83dbb1c52e3895cc53668063fc03d69878ec40a5
+/home/httpd/lib/perl/LONCAPA/LondConnection.pm,1.53.2.1,5038f7f8a11a400e9aa348783b0a819e518e1440
/home/httpd/lib/perl/LONCAPA/LondTransaction.pm,1.9,b3bdce763bbcc98bdacf4ef63075335b380c486d
/home/httpd/lib/perl/LONCAPA/Queue.pm,1.4,9a96f28d4843cd12e45c0f10e87cc7bb005c2de9
/home/httpd/lib/perl/LONCAPA/Stack.pm,1.4,d6c0c4d6a25143fd2bbc5538824aa51574059c11
@@ -291,7 +291,7 @@
/home/httpd/perl/debug/excise_from_db.pl,1.3,b0e10251e46bebef3461636fe1147fda548a5362
/home/httpd/perl/debug/login_count.pl,1.9,cd27518c0709a98a4fc1520bd48064dc9bf9e117
/home/httpd/perl/debug/memcached_dump.pl,1.2,9f9ad9ed20c871e9b7e92ae1f4923003d424767b
-/home/httpd/perl/debug/modify_config_files.pl,1.23,cf854d7d76eaf8c94a85a4499e3e5ebebd759ec6
+/home/httpd/perl/debug/modify_config_files.pl,1.24,dbd4cce395e50fb036c3fa0332d6ea4c658aec3a
/home/httpd/perl/debug/move_construction_spaces.pl,1.9,796d72c8ef4e2c7d1a96d8f668be58b814d6a657
/home/httpd/perl/debug/rebuild_db_from_hist.pl,1.6,0f8d50173cab41a34db0841c46f784ac749c91b3
/home/httpd/perl/debug/rebuild_lastlogin.pl,1.1,3ae12d51f441ddeb58f1c5a60e52ded017fa6246
@@ -310,13 +310,13 @@
/home/httpd/perl/lcpasswd,1.22,8177b5e14048233385ce3aa533557c315b3e4161
/home/httpd/perl/lcuserdel,1.16,6882842c8e034f3a11fd7fa3d1b95c3c44a56036
/home/httpd/perl/loncnew,1.100.10.2,e1fc83f18ddaa02b3f0a4ca0b8ece9dfced0c5b5
-/home/httpd/perl/loncron,1.103.2.12,ecce190dc063ba8dbb9ce26f55ec0285d31a353b
-/home/httpd/perl/lond,1.489.2.45,471a840975120ab836997fca894161eccd80825a
-/home/httpd/perl/lonmaxima,1.44,f547c2983f186077cd7191711db7efed04201635
+/home/httpd/perl/loncron,1.103.2.13,235f366422eece9b9ff7ea56921188ab2d83cff7
+/home/httpd/perl/lond,1.489.2.46,7e32dfdea4ba28a67aab543bd19f6a9eb7ee72a1
+/home/httpd/perl/lonmaxima,1.45,0dc29046a2ed9db5fded82b32d38f9d3721a7da0
/home/httpd/perl/lonmemcached,1.7,1aa57476b2bbc326f2b2af402a5f63ef627f38dc
-/home/httpd/perl/lonr,1.13,94af888fa4a5ae9c15abd30d99e5aaebdc3ac109
-/home/httpd/perl/lonsql,1.98,0e66448aa17eb4ffe44fe1d6f115adc8d7566a17
-/home/httpd/perl/modify_config_files.pl,1.23,cf854d7d76eaf8c94a85a4499e3e5ebebd759ec6
+/home/httpd/perl/lonr,1.14,ba6c0bacaf5d67bcb4474b36cc69ee1759b20466
+/home/httpd/perl/lonsql,1.99,7aec053c145709d6c968be6fdca0f4ccbd507a40
+/home/httpd/perl/modify_config_files.pl,1.24,dbd4cce395e50fb036c3fa0332d6ea4c658aec3a
/home/httpd/perl/parse_activity_log.pl,1.25,4fe85f2ac7ca707dea46adfbd201faa8598cb470
/home/httpd/perl/pwchange,1.10,2782dc0cf53d5ffb5a616479ae5e1ae9a22468af
/home/httpd/perl/refresh_courseids_db.pl,1.23,174e26e484beeb6586ecda28f293aa927edc3439
More information about the LON-CAPA-cvs
mailing list