Skip to content

Commit

Permalink
add support for VFS path to S3 metadata and ACL functions
Browse files Browse the repository at this point in the history
  • Loading branch information
@michaeloffner
michaeloffner committed Oct 5, 2023
1 parent a9127e6 commit 7a74764
Show file tree
Hide file tree
Showing 7 changed files with 56 additions and 18 deletions.
4 changes: 2 additions & 2 deletions build.number
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit!
#Thu Oct 05 16:42:25 CEST 2023
build.number=23
#Thu Oct 05 21:05:38 CEST 2023
build.number=24
6 changes: 4 additions & 2 deletions source/java/src/org/lucee/extension/resource/s3/function/S3AddACL.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,12 @@ public Object invoke(final PageContext pc, final Object[] args) throws PageExcep
String host = args.length > 5 && args[5] != null ? cast.toString(args[5]) : null;
double timeout = args.length > 6 && !isEmpty(args[6]) ? cast.toDoubleValue(args[6]) : 0;

PropsAndEndpoint pae = extractFromPath(eng, bucketName, objectName, accessKeyId, secretAccessKey, host);

try {
// create S3 Instance
S3 s3 = S3.getInstance(toS3Properties(pc, accessKeyId, secretAccessKey, host), toTimeout(timeout));
s3.addAccessControlList(bucketName, objectName, objACL);
S3 s3 = S3.getInstance(pae.props != null ? pae.props : toS3Properties(pc, accessKeyId, secretAccessKey, host), toTimeout(timeout));
s3.addAccessControlList(pae.bucketName, pae.objectName, objACL);
return null;
}
catch (Exception e) {
Expand Down
32 changes: 32 additions & 0 deletions source/java/src/org/lucee/extension/resource/s3/function/S3Function.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,12 @@

import org.lucee.extension.resource.s3.S3Properties;
import org.lucee.extension.resource.s3.S3Resource;
import org.lucee.extension.resource.s3.S3ResourceProvider;
import org.lucee.extension.resource.s3.S3Util;

import lucee.commons.io.res.Resource;
import lucee.commons.io.res.ResourceProvider;
import lucee.commons.lang.types.RefString;
import lucee.loader.engine.CFMLEngine;
import lucee.loader.engine.CFMLEngineFactory;
import lucee.loader.util.Util;
Expand Down Expand Up @@ -133,4 +135,34 @@ public boolean isEmpty(Object object) {
if (object instanceof CharSequence) Util.isEmpty(object.toString(), true);
return object == null;
}

PropsAndEndpoint extractFromPath(CFMLEngine eng, String bucketName, String objectName, String accessKeyId, String secretAccessKey, String host) {
S3Properties props = null;
// handle if the bucketName is a VFS path
if (Util.isEmpty(objectName) && bucketName != null && bucketName.toLowerCase().startsWith("s3://")) {
props = new S3Properties();
props.setAccessKeyId(accessKeyId);
props.setSecretAccessKey(secretAccessKey);
props.setHost(host);
RefString location = eng.getCreationUtil().createRefString(null);
String[] bo = S3Resource.toBO(S3ResourceProvider.loadWithNewPattern(props, location, bucketName.substring(5), Util.isEmpty(accessKeyId)));
bucketName = bo[0];
objectName = bo[1];

if (objectName != null && objectName.endsWith("/")) objectName = objectName.substring(0, objectName.length() - 1);
}
return new PropsAndEndpoint(props, bucketName, objectName);
}

static class PropsAndEndpoint {
S3Properties props;
String bucketName;
String objectName;

public PropsAndEndpoint(S3Properties props, String bucketName, String objectName) {
this.props = props;
this.bucketName = bucketName;
this.objectName = objectName;
}
}
}
9 changes: 5 additions & 4 deletions source/java/src/org/lucee/extension/resource/s3/function/S3GetACL.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
package org.lucee.extension.resource.s3.function;

import org.lucee.extension.resource.s3.S3;
import org.lucee.extension.resource.s3.S3ResourceProvider;

import lucee.loader.engine.CFMLEngine;
import lucee.loader.engine.CFMLEngineFactory;
Expand All @@ -35,7 +34,7 @@ public class S3GetACL extends S3Function {
public Object invoke(PageContext pc, Object[] args) throws PageException {
CFMLEngine eng = CFMLEngineFactory.getInstance();
Cast cast = eng.getCastUtil();
if (args.length > 6 || args.length < 2) throw eng.getExceptionUtil().createFunctionException(pc, "S3GetACL", 1, 6, args.length);
if (args.length > 6 || args.length < 1) throw eng.getExceptionUtil().createFunctionException(pc, "S3GetACL", 1, 6, args.length);

// required
String bucketName = cast.toString(args[0]);
Expand All @@ -47,10 +46,12 @@ public Object invoke(PageContext pc, Object[] args) throws PageException {
String host = args.length > 4 && args[4] != null ? cast.toString(args[4]) : null;
double timeout = args.length > 5 && !isEmpty(args[5]) ? cast.toDoubleValue(args[5]) : 0;

PropsAndEndpoint pae = extractFromPath(eng, bucketName, objectName, accessKeyId, secretAccessKey, host);

try {
// create S3 Instance
S3 s3 = S3.getInstance(toS3Properties(pc, accessKeyId, secretAccessKey, host), toTimeout(timeout));
return s3.getAccessControlList(bucketName, objectName);
S3 s3 = S3.getInstance(pae.props != null ? pae.props : toS3Properties(pc, accessKeyId, secretAccessKey, host), toTimeout(timeout));
return s3.getAccessControlList(pae.bucketName, pae.objectName);
}
catch (Exception e) {
throw eng.getCastUtil().toPageException(e);
Expand Down
9 changes: 5 additions & 4 deletions source/java/src/org/lucee/extension/resource/s3/function/S3GetMetaData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
package org.lucee.extension.resource.s3.function;

import org.lucee.extension.resource.s3.S3;
import org.lucee.extension.resource.s3.S3ResourceProvider;

import lucee.loader.engine.CFMLEngine;
import lucee.loader.engine.CFMLEngineFactory;
Expand All @@ -35,7 +34,7 @@ public class S3GetMetaData extends S3Function {
public Object invoke(PageContext pc, Object[] args) throws PageException {
CFMLEngine eng = CFMLEngineFactory.getInstance();
Cast cast = eng.getCastUtil();
if (args.length > 6 || args.length < 2) throw eng.getExceptionUtil().createFunctionException(pc, "S3GetMetaData", 1, 6, args.length);
if (args.length > 6 || args.length < 1) throw eng.getExceptionUtil().createFunctionException(pc, "S3GetMetaData", 1, 6, args.length);

// required
String bucketName = cast.toString(args[0]);
Expand All @@ -47,10 +46,12 @@ public Object invoke(PageContext pc, Object[] args) throws PageException {
String host = args.length > 4 && args[4] != null ? cast.toString(args[4]) : null;
double timeout = args.length > 5 && !isEmpty(args[5]) ? cast.toDoubleValue(args[5]) : 0;

PropsAndEndpoint pae = extractFromPath(eng, bucketName, objectName, accessKeyId, secretAccessKey, host);

try {
// create S3 Instance
S3 s3 = S3.getInstance(toS3Properties(pc, accessKeyId, secretAccessKey, host), toTimeout(timeout));
return s3.getMetaData(bucketName, objectName);
S3 s3 = S3.getInstance(pae.props != null ? pae.props : toS3Properties(pc, accessKeyId, secretAccessKey, host), toTimeout(timeout));
return s3.getMetaData(pae.bucketName, pae.objectName);
}
catch (Exception e) {
throw eng.getCastUtil().toPageException(e);
Expand Down
7 changes: 4 additions & 3 deletions source/java/src/org/lucee/extension/resource/s3/function/S3SetACL.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
package org.lucee.extension.resource.s3.function;

import org.lucee.extension.resource.s3.S3;
import org.lucee.extension.resource.s3.S3ResourceProvider;

import lucee.loader.engine.CFMLEngine;
import lucee.loader.engine.CFMLEngineFactory;
Expand Down Expand Up @@ -49,10 +48,12 @@ public Object invoke(PageContext pc, Object[] args) throws PageException {
String host = args.length > 5 && args[5] != null ? cast.toString(args[5]) : null;
double timeout = args.length > 6 && !isEmpty(args[6]) ? cast.toDoubleValue(args[6]) : 0;

PropsAndEndpoint pae = extractFromPath(eng, bucketName, objectName, accessKeyId, secretAccessKey, host);

try {
// create S3 Instance
S3 s3 = S3.getInstance(toS3Properties(pc, accessKeyId, secretAccessKey, host), toTimeout(timeout));
s3.setAccessControlList(null, bucketName, objectName, objACL);
S3 s3 = S3.getInstance(pae.props != null ? pae.props : toS3Properties(pc, accessKeyId, secretAccessKey, host), toTimeout(timeout));
s3.setAccessControlList(null, pae.bucketName, pae.objectName, objACL);
return null;
}
catch (Exception e) {
Expand Down
7 changes: 4 additions & 3 deletions source/java/src/org/lucee/extension/resource/s3/function/S3SetMetaData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
package org.lucee.extension.resource.s3.function;

import org.lucee.extension.resource.s3.S3;
import org.lucee.extension.resource.s3.S3ResourceProvider;

import lucee.loader.engine.CFMLEngine;
import lucee.loader.engine.CFMLEngineFactory;
Expand Down Expand Up @@ -50,10 +49,12 @@ public Object invoke(PageContext pc, Object[] args) throws PageException {
String host = args.length > 5 && args[5] != null ? cast.toString(args[5]) : null;
double timeout = args.length > 6 && !isEmpty(args[6]) ? cast.toDoubleValue(args[6]) : 0;

PropsAndEndpoint pae = extractFromPath(eng, bucketName, objectName, accessKeyId, secretAccessKey, host);

try {
// create S3 Instance
S3 s3 = S3.getInstance(toS3Properties(pc, accessKeyId, secretAccessKey, host), toTimeout(timeout));
s3.setMetaData(bucketName, objectName, metadata);
S3 s3 = S3.getInstance(pae.props != null ? pae.props : toS3Properties(pc, accessKeyId, secretAccessKey, host), toTimeout(timeout));
s3.setMetaData(pae.bucketName, pae.objectName, metadata);
return null;
}
catch (Exception e) {
Expand Down

0 comments on commit 7a74764

Please sign in to comment.