Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cavern: fix inheritPermissions prop usage #242

Merged
merged 3 commits into from
Jun 10, 2024
Merged

cavern: fix inheritPermissions prop usage #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40a25b8
cavern: fix inheritPermissions prop usage
pdowler Jun 10, 2024
8361783
checkstyle fix
pdowler Jun 10, 2024
5543f4b
update libs to source compat java 11
pdowler Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cadc-test-vos/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ repositories {

apply from: '../opencadc.gradle'

sourceCompatibility = 1.8
sourceCompatibility = 11

group = 'org.opencadc'

version = '2.1.9'
version = '2.1.10'

description = 'OpenCADC VOSpace test library'
def git_url = 'https://github.com/opencadc/vos'
Expand Down
4 changes: 2 additions & 2 deletions cadc-vos-client/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ repositories {

apply from: '../opencadc.gradle'

sourceCompatibility = 1.8
sourceCompatibility = 11

group = 'org.opencadc'

version = '2.0.4'
version = '2.0.5'

description = 'OpenCADC VOSpace client library'
def git_url = 'https://github.com/opencadc/vos'
Expand Down
4 changes: 2 additions & 2 deletions cadc-vos-server/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ repositories {

apply from: '../opencadc.gradle'

sourceCompatibility = 1.8
sourceCompatibility = 11

group = 'org.opencadc'

version = '2.0.15'
version = '2.0.16'

description = 'OpenCADC VOSpace server'
def git_url = 'https://github.com/opencadc/vos'
Expand Down
2 changes: 1 addition & 1 deletion cavern/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## deployable containers have a semantic and build tag
# semantic version tag: major.minor
# build version tag: timestamp
VER=0.7.7
VER=0.7.8
TAGS="${VER} ${VER}-$(date -u +"%Y%m%dT%H%M%S")"
unset VER
5 changes: 2 additions & 3 deletions cavern/src/main/java/org/opencadc/cavern/CavernConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
******************* CANADIAN ASTRONOMY DATA CENTRE *******************
************** CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES **************
*
* (c) 2023. (c) 2023.
* (c) 2024. (c) 2024.
* Government of Canada Gouvernement du Canada
* National Research Council Conseil national de recherches
* Ottawa, Canada, K1A 0R6 Ottawa, Canada, K1A 0R6
Expand Down Expand Up @@ -76,6 +76,7 @@
import ca.nrc.cadc.util.InvalidConfigException;
import ca.nrc.cadc.util.MultiValuedProperties;
import ca.nrc.cadc.util.PropertiesReader;
import ca.nrc.cadc.util.StringUtil;
import java.io.File;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
Expand All @@ -85,8 +86,6 @@
import java.util.ArrayList;
import java.util.List;
import javax.security.auth.Subject;

import ca.nrc.cadc.util.StringUtil;
import org.apache.log4j.Logger;
import org.opencadc.cavern.nodes.NoQuotaPlugin;
import org.opencadc.cavern.nodes.QuotaPlugin;
Expand Down
33 changes: 14 additions & 19 deletions cavern/src/main/java/org/opencadc/cavern/nodes/NodeUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ class NodeUtil {
VOS.PROPERTY_URI_DATE,
VOS.PROPERTY_URI_GROUPREAD,
VOS.PROPERTY_URI_GROUPWRITE,
VOS.PROPERTY_URI_INHERIT_PERMISSIONS, // presence of default ACLs
VOS.PROPERTY_URI_ISLOCKED, // but not supported
VOS.PROPERTY_URI_ISPUBLIC,
VOS.PROPERTY_URI_QUOTA
Expand Down Expand Up @@ -533,18 +534,17 @@ Node pathToNode(Path p, boolean getAttrs)
ret.getProperties().add(new NodeProperty(VOS.PROPERTY_URI_DATE, df.format(modified)));

if (getAttrs && !attrs.isSymbolicLink()) {
Map<String,String> uda = ExtendedFileAttributes.getAttributes(p);
Map<String,String> uda = ExtendedFileAttributes.getAttributes(p); // no namespace: user attrs
for (Map.Entry<String,String> me : uda.entrySet()) {
try {
URI pk = new URI(me.getKey());
log.debug("found prop: " + pk + " = " + me.getValue());
if (VOS.PROPERTY_URI_INHERIT_PERMISSIONS.equals(pk)) {
if (ret instanceof ContainerNode) {
ContainerNode cn = (ContainerNode) ret;
cn.inheritPermissions = Boolean.parseBoolean(me.getValue());
} else {
log.error("found " + VOS.PROPERTY_URI_INHERIT_PERMISSIONS + " on a " + ret.getClass().getSimpleName());
}
// check if this prop should not be set and fix
// could happen is user set it manually or it was not in the restructed set
// in a previous version
if (FILESYSTEM_PROPS.contains(pk)) {
ExtendedFileAttributes.setFileAttribute(p, pk.toASCIIString(), null);
log.debug("removed bogus user prop: " + pk.toASCIIString() + " from " + p);
} else {
ret.getProperties().add(new NodeProperty(pk, me.getValue()));
}
Expand All @@ -557,27 +557,22 @@ Node pathToNode(Path p, boolean getAttrs)

Long quota = quotaImpl.getQuota(p);
if (quota != null) {
// This quota takes precedence.
ret.getProperties().remove(new NodeProperty(VOS.PROPERTY_URI_QUOTA));
ret.getProperties().add(new NodeProperty(VOS.PROPERTY_URI_QUOTA, quota.toString()));
}

boolean isDir = (ret instanceof ContainerNode);
AclCommandExecutor acl = new AclCommandExecutor(p, isDir);

// backwards compat: check for default ACLs and assume inheritPermission is true
// check for default ACLs aka inheritPermissions
if (ret instanceof ContainerNode) {
ContainerNode cn = (ContainerNode) ret;
if (cn.inheritPermissions == null || !cn.inheritPermissions) {
// check for inconsistency with default ACLs
Set<Integer> dro = acl.getReadOnlyACL(true);
Set<Integer> drw = acl.getReadWriteACL(true);
cn.inheritPermissions = !dro.isEmpty() || !drw.isEmpty();
log.debug("default ACLs imply inheritPermissions==" + cn.inheritPermissions);
}
// check for inconsistency with default ACLs
Set<Integer> dro = acl.getReadOnlyACL(true);
Set<Integer> drw = acl.getReadWriteACL(true);
cn.inheritPermissions = !dro.isEmpty() || !drw.isEmpty();
log.debug("default ACLs imply inheritPermissions==" + cn.inheritPermissions);
}


// TODO: could collect all gids from read-only and read-write and prime the gid cache in 1 call instead of 2
Set<Integer> rogids = acl.getReadOnlyACL();
if (!rogids.isEmpty()) {
Expand Down
Loading