Co-locate public_suffix_list.dat with sun.security.util.DomainName for hermetic support.

Author: jianglizhou

make/Images.gmk

@@ -84,8 +84,9 @@ ifeq ($(STATIC_JAVA), true)
   HERMETIC_PSFONT2D_PROPERTIES := /java.desktop/lib/psfontj2d.properties=/java.desktop/sun/print/psfontj2d.properties
   HERMETIC_BLOCKED_CERTS := /java.base/lib/security/blocked.certs=/java.base/sun/security/util/blocked.certs
   HERMETIC_CACERTS := /java.base/lib/security/cacerts=/java.base/sun/security/util/cacerts
+  HERMETIC_PUBLIC_SUFFIX_LIST_DAT := /java.base/lib/security/public_suffix_list.dat=/java.base/sun/security/util/public_suffix_list.dat
 
-  HERMETIC_RESOURCES := --hermetic-resources $(HERMETIC_JAVA_SECURITY),$(HERMETIC_LOGGING_PROPERTIES),$(HERMETIC_NET_PROPERTIES),$(HERMETIC_PSFONT_PROPERTIES_JA),$(HERMETIC_PSFONT2D_PROPERTIES),$(HERMETIC_BLOCKED_CERTS),$(HERMETIC_CACERTS)
+  HERMETIC_RESOURCES := --hermetic-resources $(HERMETIC_JAVA_SECURITY),$(HERMETIC_LOGGING_PROPERTIES),$(HERMETIC_NET_PROPERTIES),$(HERMETIC_PSFONT_PROPERTIES_JA),$(HERMETIC_PSFONT2D_PROPERTIES),$(HERMETIC_BLOCKED_CERTS),$(HERMETIC_CACERTS),$(HERMETIC_PUBLIC_SUFFIX_LIST_DAT)
 endif
 
 JLINK_TOOL := $(JLINK) -J-Djlink.debug=true \

src/java.base/share/classes/sun/security/util/DomainName.java

@@ -32,7 +32,6 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.IOException;
-import java.nio.file.Files;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.Arrays;
@@ -213,11 +212,14 @@ private static InputStream getPubSuffixStream() {
                     @Override
                     public InputStream run() {
                         try {
-                            return Files.newInputStream(
-                                JavaHome.getJDKResource(
-                                    System.getProperty("java.home"),
-                                    "lib", "security",
-                                    "public_suffix_list.dat"));
+                            if (JavaHome.isHermetic()) {
+                                return DomainName.class.getResourceAsStream(
+                                        "public_suffix_list.dat");
+                            } else {
+                                return new FileInputStream(
+                                    new File(System.getProperty("java.home"),
+                                        "lib/security/public_suffix_list.dat"));
+                            }
                         } catch (IOException e) {
                             return null;
                         }