dsmiley commented on code in PR #106: URL: https://github.com/apache/solr-sandbox/pull/106#discussion_r1591733443
########## encryption/src/main/java/org/apache/solr/encryption/EncryptionBackupRepository.java: ########## @@ -0,0 +1,98 @@ +/* + * 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.solr.encryption; + +import org.apache.lucene.codecs.CodecUtil; +import org.apache.lucene.store.ChecksumIndexInput; +import org.apache.lucene.store.Directory; +import org.apache.lucene.store.FilterDirectory; +import org.apache.solr.common.util.NamedList; +import org.apache.solr.core.DirectoryFactory; +import org.apache.solr.core.backup.repository.DelegatingBackupRepository; + +import java.io.IOException; +import java.net.URI; + +import static org.apache.solr.core.backup.repository.AbstractBackupRepository.PARAM_VERIFY_CHECKSUM; + +/** + * Encryption {@link org.apache.solr.core.backup.repository.BackupRepository} that delegates + * to another {@link org.apache.solr.core.backup.repository.BackupRepository} and intercepts + * index files copy to check their checksum in the decrypted from, but to copy them in their Review Comment: The wording seems off; maybe a grammar mistake / accidental extra "copy" word. ########## encryption/src/main/java/org/apache/solr/encryption/EncryptionBackupRepository.java: ########## @@ -0,0 +1,98 @@ +/* + * 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.solr.encryption; + +import org.apache.lucene.codecs.CodecUtil; +import org.apache.lucene.store.ChecksumIndexInput; +import org.apache.lucene.store.Directory; +import org.apache.lucene.store.FilterDirectory; +import org.apache.solr.common.util.NamedList; +import org.apache.solr.core.DirectoryFactory; +import org.apache.solr.core.backup.repository.DelegatingBackupRepository; + +import java.io.IOException; +import java.net.URI; + +import static org.apache.solr.core.backup.repository.AbstractBackupRepository.PARAM_VERIFY_CHECKSUM; + +/** + * Encryption {@link org.apache.solr.core.backup.repository.BackupRepository} that delegates + * to another {@link org.apache.solr.core.backup.repository.BackupRepository} and intercepts + * index files copy to check their checksum in the decrypted from, but to copy them in their + * encrypted form. + */ +public class EncryptionBackupRepository extends DelegatingBackupRepository { + + @Override + public void init(NamedList<?> args) { + if (delegate != null) { + delegate.init(args); + } + } + + @Override + protected NamedList<?> getDelegateInitArgs(NamedList<?> initArgs) { + NamedList<Object> newInitArgs = new NamedList<>(initArgs.size() + 1); + // Ensure the delegate does not verify the checksum, otherwise it would fail since we back up encrypted files. + newInitArgs.add(PARAM_VERIFY_CHECKSUM, Boolean.FALSE.toString()); + newInitArgs.addAll(initArgs); + return newInitArgs; + } + + @Override + public void copyIndexFileFrom( + Directory sourceDir, String sourceFileName, Directory destDir, String destFileName) + throws IOException { + // Read and verify the checksum with the potentially decrypting directory. + verifyChecksum(sourceDir, sourceFileName); + // Copy the index file with the unwrapped (delegate) directory to keep encryption. + super.copyIndexFileFrom(FilterDirectory.unwrap(sourceDir), sourceFileName, destDir, destFileName); + } + + @Override + public void copyIndexFileFrom( + Directory sourceDir, String sourceFileName, URI destUri, String destFileName) + throws IOException { + // Read and verify the checksum with the potentially decrypting directory. + verifyChecksum(sourceDir, sourceFileName); Review Comment: if the delegate initArgs explicitly was configured to not check the checksum, then we shouldn't do so here -- 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...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
