ggershinsky commented on code in PR #6884: URL: https://github.com/apache/iceberg/pull/6884#discussion_r1321449232
########## core/src/main/java/org/apache/iceberg/encryption/StandardEncryptionManagerFactory.java: ########## @@ -0,0 +1,110 @@ +/* + * 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.apache.iceberg.encryption; + +import static org.apache.iceberg.TableProperties.DEFAULT_FILE_FORMAT; +import static org.apache.iceberg.TableProperties.DEFAULT_FILE_FORMAT_DEFAULT; + +import java.io.IOException; +import java.util.Map; +import org.apache.iceberg.FileFormat; +import org.apache.iceberg.TableMetadata; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.apache.iceberg.util.PropertyUtil; + +public class StandardEncryptionManagerFactory implements EncryptionManagerFactory { + private KeyManagementClient kmsClient; + private Map<String, String> catalogPropertyMap; + + @Override + public void initialize(Map<String, String> catalogProperties) { + this.catalogPropertyMap = catalogProperties; + } + + @Override + public EncryptionManager create(TableMetadata tableMetadata) { + if (tableMetadata == null) { + return PlaintextEncryptionManager.instance(); + } + + Map<String, String> tableProperties = tableMetadata.properties(); + + final Map<String, String> encryptionProperties = Maps.newHashMap(); + encryptionProperties.putAll(tableProperties); + + // Important: put catalog properties after table properties. Former overrides the latter. Review Comment: In certain usecases and threat models (where an attacker can remove the table key from the metadata.json file), it'd be good to set the table key in the catalog properties - so the writer won't start producing unencrypted data files. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org For additional commands, e-mail: issues-h...@iceberg.apache.org