hasnain-db commented on code in PR #46515:
URL: https://github.com/apache/spark/pull/46515#discussion_r1600437374
##########
common/network-common/src/main/java/org/apache/spark/network/crypto/AuthEngine.java:
##########
@@ -227,12 +229,18 @@ private TransportCipher generateTransportCipher(
OUTPUT_IV_INFO, // This is the HKDF info field used to differentiate
IV values
AES_GCM_KEY_SIZE_BYTES);
SecretKeySpec sessionKey = new SecretKeySpec(derivedKey, "AES");
- return new TransportCipher(
- cryptoConf,
- conf.cipherTransformation(),
- sessionKey,
- isClient ? clientIv : serverIv, // If it's the client, use the client
IV first
- isClient ? serverIv : clientIv);
+ if (LEGACY_CIPHER_ALGORITHM.equalsIgnoreCase(conf.cipherTransformation()))
{
+ return new CtrTransportCipher(
+ cryptoConf,
+ sessionKey,
+ isClient ? clientIv : serverIv, // If it's the client, use the
client IV first
+ isClient ? serverIv : clientIv);
+ } else if (CIPHER_ALGORITHM.equalsIgnoreCase(conf.cipherTransformation()))
{
+ return new GcmTransportCipher(sessionKey);
+ } else {
+ throw new IllegalArgumentException(
+ "Unsupported cipher transformation: " +
conf.cipherTransformation());
Review Comment:
Can we update this error message to also just list the supported algorithms?
So something like "Unsupported cipher transformation: foo. Please use
AES/CTR/NoPadding or AES/GCM/NoPadding"
##########
common/network-common/src/main/java/org/apache/spark/network/crypto/CtrTransportCipher.java:
##########
@@ -0,0 +1,372 @@
+/*
+ * 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.spark.network.crypto;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
+import java.util.Properties;
+import javax.crypto.spec.SecretKeySpec;
+import javax.crypto.spec.IvParameterSpec;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.*;
+import org.apache.commons.crypto.stream.CryptoInputStream;
+import org.apache.commons.crypto.stream.CryptoOutputStream;
+
+import org.apache.spark.network.util.AbstractFileRegion;
+import org.apache.spark.network.util.ByteArrayReadableChannel;
+import org.apache.spark.network.util.ByteArrayWritableChannel;
+
+/**
+ * Cipher for encryption and decryption.
+ */
+public class CtrTransportCipher implements TransportCipher {
Review Comment:
this may be difficult to do after the fact but could you recreate this PR
with `git mv TransportCipher.java CtrTransportCipher.java`? helps for future
history tracking but also makes it easier to review this PR to see what changed
(I suspect this file didn't change much)
--
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: reviews-unsubscr...@spark.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
