# scripts.mit.edu openafs patch # Copyright (C) 2006 Jeff Arnold # with modifications by Joe Presbrey # and Anders Kaseorg # and Edward Z. Yang # # This file is available under both the MIT license and the GPL. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: # # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. # # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA # # See /COPYRIGHT in this repository for more information. # diff -ur openafs-1.4/src/afs/afs_analyze.c openafs-1.4+scripts/src/afs/afs_analyze.c --- openafs-1.4/src/afs/afs_analyze.c +++ openafs-1.4+scripts/src/afs/afs_analyze.c @@ -585,7 +585,7 @@ (afid ? afid->Fid.Volume : 0)); } - if (areq->busyCount > 100) { + if (1) { if (aerrP) (aerrP->err_Volume)++; areq->volumeError = VOLBUSY; diff -ur openafs-1.4/src/afs/LINUX/osi_vnodeops.c openafs-1.4+scripts/src/afs/LINUX/osi_vnodeops.c --- openafs-1.4/src/afs/LINUX/osi_vnodeops.c +++ openafs-1.4+scripts/src/afs/LINUX/osi_vnodeops.c @@ -875,6 +875,28 @@ /* should we always update the attributes at this point? */ /* unlikely--the vcache entry hasn't changed */ + /* [scripts] This code makes hardlinks work correctly. + * + * We want Apache to be able to read a file with hardlinks + * named .htaccess and foo to be able to read it via .htaccess + * and not via foo, regardless of which name was looked up + * (remember, inodes do not have filenames associated with them.) + * + * It is important that we modify the existing cache entry even + * if it is otherwise totally valid and would not be reloaded. + * Otherwise, it won't recover from repeatedly reading the same + * inode via multiple hardlinks or different names. Specifically, + * Apache will be able to read both names if it was first looked + * up (by anyone!) via .htaccess, and neither if it was first + * looked up via foo. + * + * With regards to performance, the strncmp() is bounded by + * three characters, so it takes O(3) operations. If this code + * is extended to all static-cat extensions, we'll want to do + * some clever hashing using gperf here. + */ + vcp->apache_access = strncmp(dp->d_name.name, ".ht", 3) == 0; + } else { #ifdef notyet pvcp = VTOAFS(dp->d_parent->d_inode); /* dget_parent()? */ diff -ur openafs-1.4/src/afs/VNOPS/afs_vnop_lookup.c openafs-1.4+scripts/src/afs/VNOPS/afs_vnop_lookup.c --- openafs-1.4/src/afs/VNOPS/afs_vnop_lookup.c +++ openafs-1.4+scripts/src/afs/VNOPS/afs_vnop_lookup.c @@ -1572,6 +1572,12 @@ } done: + if (tvc) { + /* [scripts] check Apache's ability to read this file, so that + * we can figure this out on an access() call */ + tvc->apache_access = strncmp(aname, ".ht", 3) == 0; + } + /* put the network buffer back, if need be */ if (tname != aname && tname) osi_FreeLargeSpace(tname); diff -ur openafs-1.4/src/afs/afs.h openafs-1.4+scripts/src/afs/afs.h --- openafs-1.4/src/afs/afs.h +++ openafs-1.4+scripts/src/afs/afs.h @@ -208,8 +208,16 @@ #define QTOC(e) QEntry(e, struct cell, lruq) #define QTOVH(e) QEntry(e, struct vcache, vhashq) +#define AFSAGENT_UID (101) +#define SIGNUP_UID (102) +#define HTTPD_UID (48) +#define POSTFIX_UID (89) +#define DAEMON_SCRIPTS_PTSID (33554596) +extern afs_int32 globalpag; + struct vrequest { afs_int32 uid; /* user id making the request */ + afs_int32 realuid; afs_int32 busyCount; /* how many busies we've seen so far */ afs_int32 flags; /* things like O_SYNC, O_NONBLOCK go here */ char initd; /* if non-zero, Error fields meaningful */ @@ -743,6 +751,7 @@ #ifdef AFS_SUN5_ENV short multiPage; /* count of multi-page getpages in progress */ #endif + bool apache_access; /* whether or not Apache has access to a file */ }; #define DONT_CHECK_MODE_BITS 0 diff -ur openafs-1.4/src/afs/afs_osi_pag.c openafs-1.4+scripts/src/afs/afs_osi_pag.c --- openafs-1.4/src/afs/afs_osi_pag.c +++ openafs-1.4+scripts/src/afs/afs_osi_pag.c @@ -51,6 +51,8 @@ #endif /* Local variables */ +afs_int32 globalpag = 0; + /* * Pags are implemented as follows: the set of groups whose long * representation is '41XXXXXX' hex are used to represent the pags. @@ -458,6 +460,15 @@ av->uid = acred->cr_ruid; /* default when no pag is set */ #endif } + + av->realuid = acred->cr_ruid; + if(!globalpag && acred->cr_ruid == AFSAGENT_UID) { + globalpag = av->uid; + } + else if (globalpag && av->uid == acred->cr_ruid) { + av->uid = globalpag; + } + av->initd = 0; return 0; } diff -ur openafs-1.4/src/afs/afs_pioctl.c openafs-1.4+scripts/src/afs/afs_pioctl.c --- openafs-1.4/src/afs/afs_pioctl.c +++ openafs-1.4+scripts/src/afs/afs_pioctl.c @@ -1217,6 +1217,10 @@ struct AFSFetchStatus OutStatus; XSTATS_DECLS; + if (areq->uid == globalpag && areq->realuid != AFSAGENT_UID) { + return EACCES; + } + AFS_STATCNT(PSetAcl); if (!avc) return EINVAL; @@ -1437,6 +1441,10 @@ struct vrequest treq; afs_int32 flag, set_parent_pag = 0; + if (areq->uid == globalpag && areq->realuid != AFSAGENT_UID) { + return 0; + } + AFS_STATCNT(PSetTokens); if (!afs_resourceinit_flag) { return EIO; @@ -1796,6 +1804,10 @@ afs_int32 iterator; int newStyle; + if (areq->uid == globalpag && areq->realuid != AFSAGENT_UID && + areq->realuid != 0 && areq->realuid != SIGNUP_UID) + return 0; + AFS_STATCNT(PGetTokens); if (!afs_resourceinit_flag) /* afs daemons haven't started yet */ return EIO; /* Inappropriate ioctl for device */ @@ -1879,6 +1891,10 @@ register afs_int32 i; register struct unixuser *tu; + if (areq->uid == globalpag && areq->realuid != AFSAGENT_UID) { + return 0; + } + AFS_STATCNT(PUnlog); if (!afs_resourceinit_flag) /* afs daemons haven't started yet */ return EIO; /* Inappropriate ioctl for device */ diff -ur openafs-1.4/src/afs/VNOPS/afs_vnop_access.c openafs-1.4+scripts/src/afs/VNOPS/afs_vnop_access.c --- openafs-1.4/src/afs/VNOPS/afs_vnop_access.c +++ openafs-1.4+scripts/src/afs/VNOPS/afs_vnop_access.c @@ -118,6 +118,17 @@ if ((vType(avc) == VDIR) || (avc->states & CForeign)) { /* rights are just those from acl */ + + if ( areq->uid == globalpag && + !(areq->realuid == avc->fid.Fid.Volume) && + !((avc->anyAccess | arights) == avc->anyAccess) && + !(((arights & ~(PRSFS_LOOKUP|PRSFS_READ)) == 0) && areq->realuid == HTTPD_UID) && + !(((arights & ~(PRSFS_LOOKUP|PRSFS_READ)) == 0) && areq->realuid == POSTFIX_UID) && + !(areq->realuid == 0 && PRSFS_USR3 == afs_GetAccessBits(avc, PRSFS_USR3, areq)) && + !((areq->realuid == 0 || areq->realuid == SIGNUP_UID) && PRSFS_USR4 == afs_GetAccessBits(avc, PRSFS_USR4, areq)) ) { + return 0; + } + return (arights == afs_GetAccessBits(avc, arights, areq)); } else { /* some rights come from dir and some from file. Specifically, you @@ -171,6 +182,19 @@ fileBits |= PRSFS_READ; } } + + if ( areq->uid == globalpag && + !(areq->realuid == avc->fid.Fid.Volume) && + !((avc->anyAccess | arights) == avc->anyAccess) && + !(arights == PRSFS_LOOKUP && areq->realuid == HTTPD_UID) && + !(arights == PRSFS_LOOKUP && areq->realuid == POSTFIX_UID) && + !(arights == PRSFS_READ && areq->realuid == HTTPD_UID && + (avc->m.Mode == 0100777 || avc->apache_access)) && + !(areq->realuid == 0 && PRSFS_USR3 == afs_GetAccessBits(avc, PRSFS_USR3, areq)) && + !((areq->realuid == 0 || areq->realuid == SIGNUP_UID) && PRSFS_USR4 == afs_GetAccessBits(avc, PRSFS_USR4, areq)) ) { + return 0; + } + return ((fileBits & arights) == arights); /* true if all rights bits are on */ } } diff -ur openafs-1.4/src/afs/VNOPS/afs_vnop_attrs.c openafs-1.4+scripts/src/afs/VNOPS/afs_vnop_attrs.c --- openafs-1.4/src/afs/VNOPS/afs_vnop_attrs.c +++ openafs-1.4+scripts/src/afs/VNOPS/afs_vnop_attrs.c @@ -87,8 +87,8 @@ } } #endif /* AFS_DARWIN_ENV */ - attrs->va_uid = fakedir ? 0 : avc->m.Owner; - attrs->va_gid = fakedir ? 0 : avc->m.Group; /* yeah! */ + attrs->va_uid = fakedir ? 0 : avc->fid.Fid.Volume; + attrs->va_gid = (avc->m.Owner == DAEMON_SCRIPTS_PTSID ? avc->m.Group : avc->m.Owner); #if defined(AFS_SUN56_ENV) attrs->va_fsid = avc->v.v_vfsp->vfs_fsid.val[0]; #elif defined(AFS_OSF_ENV)