vrjdev commented on code in PR #58016: URL: https://github.com/apache/spark/pull/58016#discussion_r4329488285
########## launcher/src/test/java/org/apache/spark/launcher/FilteredObjectInputStreamSuite.java: ########## @@ -0,0 +1,185 @@ +/* + * 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.launcher; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.ObjectOutputStream; +import java.io.ObjectStreamClass; + +import org.apache.spark.launcher.testpkg.SubpackageAllowed; +import org.apache.spark.launchermalicious.LauncherPrefixSpoof; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; + +/** + * Tests for {@link FilteredObjectInputStream} - the SPARK-20922 allow-list + * guarding the launcher's local socket protocol. Covers the security-relevant + * {@code resolveClass} path that previously had zero direct tests. + */ +public class FilteredObjectInputStreamSuite extends BaseSuite { + + @Test + public void testAllowedJavaLangStringIsAccepted() throws Exception { + String original = "hello"; + Object deserialized = roundTrip(original); + assertEquals(original, deserialized); + } + + @Test + public void testAllowedJavaLangIntegerIsAccepted() throws Exception { + Integer original = 42; + Object deserialized = roundTrip(original); + assertEquals(original, deserialized); + } + + @Test + public void testAllowedLauncherMessageIsAccepted() throws Exception { + LauncherProtocol.Hello original = new LauncherProtocol.Hello("secret", "3.5.0"); + LauncherProtocol.Hello deserialized = + (LauncherProtocol.Hello) roundTrip(original); + assertEquals(original.secret, deserialized.secret); + assertEquals(original.sparkVersion, deserialized.sparkVersion); + } + + @Test + public void testAllowedLauncherSetAppIdIsAccepted() throws Exception { + LauncherProtocol.SetAppId original = new LauncherProtocol.SetAppId("app-123"); + LauncherProtocol.SetAppId deserialized = + (LauncherProtocol.SetAppId) roundTrip(original); + assertEquals(original.appId, deserialized.appId); + } + + // resolveClass rejects purely on desc.getName() failing both allowed-prefix checks, so a + // class in any unrelated package - HashMap, ArrayList, File, or anything else - takes the + // same path; one representative case is enough. See + // testDisallowedLauncherPrefixSpoofIsRejected below for the one genuinely different rejection + // path: a user-defined class spoofing the allow-listed prefix rather than an unrelated one. + @Test + public void testDisallowedJavaIoFileIsRejected() throws Exception { + File payload = new File("/tmp/evil"); + byte[] bytes = serialize(payload); + IllegalArgumentException thrown = assertThrows( + IllegalArgumentException.class, + () -> deserializeFiltered(bytes)); + assertTrue(thrown.getMessage().contains("Unexpected class in stream")); + assertTrue(thrown.getMessage().contains("java.io.File")); + } + + // ALLOWED_PACKAGES entries end in a literal dot, so a class merely sharing the + // "org.apache.spark.launcher" text without being in that package must still be + // rejected: LauncherPrefixSpoof (org.apache.spark.launchermalicious.LauncherPrefixSpoof) + // pins down that boundary, since startsWith("org.apache.spark.launcher.") is false + // once the character after the prefix is "M" rather than ".". A matching spoof of + // the "java.lang." prefix (e.g. java.langfoo.Bar) can't be tested the same way: the + // JVM refuses to define any class whose package starts with "java.", so no real + // Class backs that name. + @Test + public void testDisallowedLauncherPrefixSpoofIsRejected() throws Exception { + LauncherPrefixSpoof payload = new LauncherPrefixSpoof(); + byte[] bytes = serialize(payload); + IllegalArgumentException thrown = assertThrows( + IllegalArgumentException.class, + () -> deserializeFiltered(bytes)); + assertTrue(thrown.getMessage().contains("Unexpected class in stream")); + assertTrue(thrown.getMessage().contains( + "org.apache.spark.launchermalicious.LauncherPrefixSpoof")); + } + + // The three tests below document CURRENT resolveClass behavior for classes in + // java.lang.* subpackages (java.lang.reflect, java.lang.invoke, java.lang.ref). + // desc.getName().startsWith("java.lang.") matches these too, since a subpackage's + // fully-qualified name still starts with the literal string "java.lang." - not just + // the java.lang package itself. The original SPARK-20922 PR's stated intent was "just + // two packages" (an exact-package match), so this is a real gap between intent and + // implementation, not a design choice made in this PR; fixing resolveClass itself is + // intentionally out of scope here and tracked as a follow-up in SPARK-59544. + // + // None of Field, MethodHandle, or WeakReference are actually serializable (constructing + // them for a round-trip throws NotSerializableException), so this boundary can't be + // exercised the way the tests above are; resolveClass is called directly against a + // synthetic descriptor instead. That gap in reachability - not just missing tests - is + // why this went uncovered by LauncherServerSuite's indirect coverage for 9 years. Review Comment: Switched the three tests to normal round trips of `Field.class`, `MethodHandle.class` and `WeakReference.class`, removed the incorrect paragraph (including the 9-years sentence), dropped `newFilteredStream()` and the `ObjectStreamClass` import, and removed the "instead of a synthetic descriptor" sentence above `testLauncherSubpackageIsCurrentlyAllowed`. In place of the old paragraph I kept a short note explaining why these tests round-trip the `Class` object rather than an instance. -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
