-
Notifications
You must be signed in to change notification settings - Fork 138
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
JCLOUDS-1644: Create AWS S3 buckets with ownership and public access …
…block AWS changed the defaults when creating buckets to prevent public-read and other canned ACLs. Background: https://stackoverflow.com/a/76102067/2800111
- Loading branch information
Showing
11 changed files
with
258 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 62 additions & 0 deletions
62
apis/s3/src/main/java/org/jclouds/s3/binders/BindOwnershipControlsToXMLPayload.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.jclouds.s3.binders; | ||
|
|
||
| import static org.jclouds.s3.binders.XMLHelper.asString; | ||
| import static org.jclouds.s3.binders.XMLHelper.createDocument; | ||
| import static org.jclouds.s3.binders.XMLHelper.elem; | ||
| import static org.jclouds.s3.binders.XMLHelper.elemWithText; | ||
|
|
||
| import jakarta.inject.Singleton; | ||
| import jakarta.ws.rs.core.MediaType; | ||
| import javax.xml.parsers.FactoryConfigurationError; | ||
| import javax.xml.parsers.ParserConfigurationException; | ||
| import javax.xml.transform.TransformerException; | ||
|
|
||
| import org.jclouds.http.HttpRequest; | ||
| import org.jclouds.rest.Binder; | ||
| import org.jclouds.s3.reference.S3Constants; | ||
| import org.w3c.dom.Document; | ||
| import org.w3c.dom.Element; | ||
|
|
||
| import com.google.common.base.Throwables; | ||
|
|
||
| @Singleton | ||
| public final class BindOwnershipControlsToXMLPayload implements Binder { | ||
| @Override | ||
| public <R extends HttpRequest> R bindToRequest(R request, Object payload) { | ||
| String from = (String) payload; | ||
| try { | ||
| request.setPayload(generatePayload(from)); | ||
| request.getPayload().getContentMetadata().setContentType(MediaType.TEXT_XML); | ||
| return request; | ||
| } catch (Exception e) { | ||
| Throwables.propagateIfPossible(e); | ||
| throw new RuntimeException("error transforming acl: " + from, e); | ||
| } | ||
| } | ||
|
|
||
| protected String generatePayload(String objectOwnership) | ||
| throws ParserConfigurationException, FactoryConfigurationError, TransformerException { | ||
| Document document = createDocument(); | ||
| Element rootNode = elem(document, "OwnershipControls", document); | ||
| rootNode.setAttribute("xmlns", S3Constants.S3_REST_API_XML_NAMESPACE); | ||
| Element ruleNode = elem(rootNode, "Rule", document); | ||
| elemWithText(ruleNode, "ObjectOwnership", objectOwnership, document); | ||
| return asString(document); | ||
| } | ||
| } |
65 changes: 65 additions & 0 deletions
65
.../src/main/java/org/jclouds/s3/binders/BindPublicAccessBlockConfigurationToXMLPayload.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.jclouds.s3.binders; | ||
|
|
||
| import static org.jclouds.s3.binders.XMLHelper.asString; | ||
| import static org.jclouds.s3.binders.XMLHelper.createDocument; | ||
| import static org.jclouds.s3.binders.XMLHelper.elem; | ||
| import static org.jclouds.s3.binders.XMLHelper.elemWithText; | ||
|
|
||
| import jakarta.inject.Singleton; | ||
| import jakarta.ws.rs.core.MediaType; | ||
| import javax.xml.parsers.FactoryConfigurationError; | ||
| import javax.xml.parsers.ParserConfigurationException; | ||
| import javax.xml.transform.TransformerException; | ||
|
|
||
| import org.jclouds.http.HttpRequest; | ||
| import org.jclouds.rest.Binder; | ||
| import org.jclouds.s3.domain.PublicAccessBlockConfiguration; | ||
| import org.jclouds.s3.reference.S3Constants; | ||
| import org.w3c.dom.Document; | ||
| import org.w3c.dom.Element; | ||
|
|
||
| import com.google.common.base.Throwables; | ||
|
|
||
| @Singleton | ||
| public final class BindPublicAccessBlockConfigurationToXMLPayload implements Binder { | ||
| @Override | ||
| public <R extends HttpRequest> R bindToRequest(R request, Object payload) { | ||
| PublicAccessBlockConfiguration configuration = (PublicAccessBlockConfiguration) payload; | ||
| try { | ||
| request.setPayload(generatePayload(configuration)); | ||
| request.getPayload().getContentMetadata().setContentType(MediaType.TEXT_XML); | ||
| return request; | ||
| } catch (Exception e) { | ||
| Throwables.propagateIfPossible(e); | ||
| throw new RuntimeException("error transforming configuration: " + configuration, e); | ||
| } | ||
| } | ||
|
|
||
| protected String generatePayload(PublicAccessBlockConfiguration configuration) | ||
| throws ParserConfigurationException, FactoryConfigurationError, TransformerException { | ||
| Document document = createDocument(); | ||
| Element rootNode = elem(document, "PublicAccessBlockConfiguration", document); | ||
| rootNode.setAttribute("xmlns", S3Constants.S3_REST_API_XML_NAMESPACE); | ||
| elemWithText(rootNode, "BlockPublicAcls", String.valueOf(configuration.blockPublicAcls()), document); | ||
| elemWithText(rootNode, "IgnorePublicAcls", String.valueOf(configuration.ignorePublicAcls()), document); | ||
| elemWithText(rootNode, "BlockPublicPolicy", String.valueOf(configuration.blockPublicPolicy()), document); | ||
| elemWithText(rootNode, "RestrictPublicBuckets", String.valueOf(configuration.restrictPublicBuckets()), document); | ||
| return asString(document); | ||
| } | ||
| } |
33 changes: 33 additions & 0 deletions
33
apis/s3/src/main/java/org/jclouds/s3/domain/PublicAccessBlockConfiguration.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.jclouds.s3.domain; | ||
|
|
||
| import com.google.auto.value.AutoValue; | ||
| import com.google.common.annotations.Beta; | ||
|
|
||
| @AutoValue | ||
| @Beta | ||
| public abstract class PublicAccessBlockConfiguration { | ||
| public abstract boolean blockPublicAcls(); | ||
| public abstract boolean ignorePublicAcls(); | ||
| public abstract boolean blockPublicPolicy(); | ||
| public abstract boolean restrictPublicBuckets(); | ||
|
|
||
| public static PublicAccessBlockConfiguration create(boolean blockPublicAcls, boolean ignorePublicAcls, boolean blockPublicPolicy, boolean restrictPublicBuckets) { | ||
| return new AutoValue_PublicAccessBlockConfiguration(blockPublicAcls, ignorePublicAcls, blockPublicPolicy, restrictPublicBuckets); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.