From e044ce6d25e22f3b506d96412319b806eecc84a5 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Thu, 8 Jun 2023 12:48:48 +0200 Subject: [PATCH 001/134] Update submodule --- openjdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openjdk b/openjdk index c6480a5dc5..f9ea0a32c0 160000 --- a/openjdk +++ b/openjdk @@ -1 +1 @@ -Subproject commit c6480a5dc5340f4e191ac6bb8dc8b173ad44096e +Subproject commit f9ea0a32c0b37c20a0e060768c2bd104932b8465 From 36e553f50a5ceffa43d27ba422179b55dbf05d5d Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Thu, 8 Jun 2023 12:52:46 +0200 Subject: [PATCH 002/134] Update version info --- openjdk.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openjdk.props b/openjdk.props index 3ddef87e68..1bd53e4f6c 100644 --- a/openjdk.props +++ b/openjdk.props @@ -1,8 +1,8 @@  $(MSBuildThisFileDirectory)openjdk\ - OpenJDK 8u92 b34 - 1.8.0_92-b34 + OpenJDK 8u152 b16 + 1.8.0_152-b16 Oracle 1.8.0 Oracle Corporation From a1c791a36e9144ab7901acb6f82a7e205b87a44e Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Thu, 8 Jun 2023 13:37:19 +0200 Subject: [PATCH 003/134] First pass --- openjdk.props | 7 +- .../ikvm/any/any/lib/security/java.security | 344 ++++++++++++++++-- .../ikvm/lib/security/java.security | 344 ++++++++++++++++-- 3 files changed, 632 insertions(+), 63 deletions(-) diff --git a/openjdk.props b/openjdk.props index 1bd53e4f6c..ba54600e52 100644 --- a/openjdk.props +++ b/openjdk.props @@ -1427,11 +1427,6 @@ - - - - - @@ -1604,6 +1599,7 @@ + @@ -1614,6 +1610,7 @@ + diff --git a/src/IKVM.Image/ikvm/any/any/lib/security/java.security b/src/IKVM.Image/ikvm/any/any/lib/security/java.security index 12d1fd8efd..0d6c53ed22 100644 --- a/src/IKVM.Image/ikvm/any/any/lib/security/java.security +++ b/src/IKVM.Image/ikvm/any/any/lib/security/java.security @@ -209,6 +209,8 @@ package.access=sun.,\ com.sun.org.apache.xalan.internal.xsltc.trax.,\ com.sun.org.apache.xalan.internal.xsltc.util.,\ com.sun.org.apache.xml.internal.res.,\ + com.sun.org.apache.xml.internal.resolver.helpers.,\ + com.sun.org.apache.xml.internal.resolver.readers.,\ com.sun.org.apache.xml.internal.security.,\ com.sun.org.apache.xml.internal.serializer.utils.,\ com.sun.org.apache.xml.internal.utils.,\ @@ -220,7 +222,8 @@ package.access=sun.,\ jdk.internal.,\ jdk.nashorn.internal.,\ jdk.nashorn.tools.,\ - com.sun.activation.registries. + com.sun.activation.registries.,\ + com.sun.java.accessibility. # # List of comma-separated packages that start with or equal this string @@ -256,6 +259,8 @@ package.definition=sun.,\ com.sun.org.apache.xalan.internal.xsltc.trax.,\ com.sun.org.apache.xalan.internal.xsltc.util.,\ com.sun.org.apache.xml.internal.res.,\ + com.sun.org.apache.xml.internal.resolver.helpers.,\ + com.sun.org.apache.xml.internal.resolver.readers.,\ com.sun.org.apache.xml.internal.security.,\ com.sun.org.apache.xml.internal.serializer.utils.,\ com.sun.org.apache.xml.internal.utils.,\ @@ -267,7 +272,8 @@ package.definition=sun.,\ jdk.internal.,\ jdk.nashorn.internal.,\ jdk.nashorn.tools.,\ - com.sun.activation.registries. + com.sun.activation.registries.,\ + com.sun.java.accessibility. # # Determines whether this properties file can be appended to @@ -422,35 +428,37 @@ krb5.kdc.bad.policy = tryLast # describes the mechanism for disabling algorithms based on algorithm name # and/or key length. This includes algorithms used in certificates, as well # as revocation information such as CRLs and signed OCSP Responses. -# -# The syntax of the disabled algorithm string is described as this Java -# BNF-style: +# The syntax of the disabled algorithm string is described as follows: # DisabledAlgorithms: # " DisabledAlgorithm { , DisabledAlgorithm } " # # DisabledAlgorithm: -# AlgorithmName [Constraint] +# AlgorithmName [Constraint] { '&' Constraint } # # AlgorithmName: # (see below) # # Constraint: -# KeySizeConstraint +# KeySizeConstraint | CAConstraint | DenyAfterConstraint | +# UsageConstraint # # KeySizeConstraint: -# keySize Operator DecimalInteger +# keySize Operator KeyLength # # Operator: # <= | < | == | != | >= | > # -# DecimalInteger: -# DecimalDigits +# KeyLength: +# Integer value of the algorithm's key length in bits +# +# CAConstraint: +# jdkCA # -# DecimalDigits: -# DecimalDigit {DecimalDigit} +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD # -# DecimalDigit: one of -# 1 2 3 4 5 6 7 8 9 0 +# UsageConstraint: +# usage [TLSServer] [TLSClient] [SignedJAR] # # The "AlgorithmName" is the standard algorithm name of the disabled # algorithm. See "Java Cryptography Architecture Standard Algorithm Name @@ -464,15 +472,69 @@ krb5.kdc.bad.policy = tryLast # that rely on DSA, such as NONEwithDSA, SHA1withDSA. However, the assertion # will not disable algorithms related to "ECDSA". # -# A "Constraint" provides further guidance for the algorithm being specified. -# The "KeySizeConstraint" requires a key of a valid size range if the -# "AlgorithmName" is of a key algorithm. The "DecimalInteger" indicates the -# key size specified in number of bits. For example, "RSA keySize <= 1024" -# indicates that any RSA key with key size less than or equal to 1024 bits -# should be disabled, and "RSA keySize < 1024, RSA keySize > 2048" indicates -# that any RSA key with key size less than 1024 or greater than 2048 should -# be disabled. Note that the "KeySizeConstraint" only makes sense to key -# algorithms. +# A "Constraint" defines restrictions on the keys and/or certificates for +# a specified AlgorithmName: +# +# KeySizeConstraint: +# keySize Operator KeyLength +# The constraint requires a key of a valid size range if the +# "AlgorithmName" is of a key algorithm. The "KeyLength" indicates +# the key size specified in number of bits. For example, +# "RSA keySize <= 1024" indicates that any RSA key with key size less +# than or equal to 1024 bits should be disabled, and +# "RSA keySize < 1024, RSA keySize > 2048" indicates that any RSA key +# with key size less than 1024 or greater than 2048 should be disabled. +# This constraint is only used on algorithms that have a key size. +# +# CAConstraint: +# jdkCA +# This constraint prohibits the specified algorithm only if the +# algorithm is used in a certificate chain that terminates at a marked +# trust anchor in the lib/security/cacerts keystore. If the jdkCA +# constraint is not set, then all chains using the specified algorithm +# are restricted. jdkCA may only be used once in a DisabledAlgorithm +# expression. +# Example: To apply this constraint to SHA-1 certificates, include +# the following: "SHA1 jdkCA" +# +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD +# This constraint prohibits a certificate with the specified algorithm +# from being used after the date regardless of the certificate's +# validity. JAR files that are signed and timestamped before the +# constraint date with certificates containing the disabled algorithm +# will not be restricted. The date is processed in the UTC timezone. +# This constraint can only be used once in a DisabledAlgorithm +# expression. +# Example: To deny usage of RSA 2048 bit certificates after Feb 3 2020, +# use the following: "RSA keySize == 2048 & denyAfter 2020-02-03" +# +# UsageConstraint: +# usage [TLSServer] [TLSClient] [SignedJAR] +# This constraint prohibits the specified algorithm for +# a specified usage. This should be used when disabling an algorithm +# for all usages is not practical. 'TLSServer' restricts the algorithm +# in TLS server certificate chains when server authentication is +# performed. 'TLSClient' restricts the algorithm in TLS client +# certificate chains when client authentication is performed. +# 'SignedJAR' constrains use of certificates in signed jar files. +# The usage type follows the keyword and more than one usage type can +# be specified with a whitespace delimiter. +# Example: "SHA1 usage TLSServer TLSClient" +# +# When an algorithm must satisfy more than one constraint, it must be +# delimited by an ampersand '&'. For example, to restrict certificates in a +# chain that terminate at a distribution provided trust anchor and contain +# RSA keys that are less than or equal to 1024 bits, add the following +# constraint: "RSA keySize <= 1024 & jdkCA". +# +# All DisabledAlgorithms expressions are processed in the order defined in the +# property. This requires lower keysize constraints to be specified +# before larger keysize constraints of the same algorithm. For example: +# "RSA keySize < 1024 & jdkCA, RSA keySize < 2048". +# +# Note: The algorithm restrictions do not apply to trust anchors or +# self-signed certificates. # # Note: This property is currently used by Oracle's PKIX implementation. It # is not guaranteed to be examined and used by other implementations. @@ -481,8 +543,53 @@ krb5.kdc.bad.policy = tryLast # jdk.certpath.disabledAlgorithms=MD2, DSA, RSA keySize < 2048 # # -jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 +jdk.certpath.disabledAlgorithms=MD2, MD5, SHA1 jdkCA & usage TLSServer, \ + RSA keySize < 1024, DSA keySize < 1024, EC keySize < 224 +# +# Algorithm restrictions for signed JAR files +# +# In some environments, certain algorithms or key lengths may be undesirable +# for signed JAR validation. For example, "MD2" is generally no longer +# considered to be a secure hash algorithm. This section describes the +# mechanism for disabling algorithms based on algorithm name and/or key length. +# JARs signed with any of the disabled algorithms or key sizes will be treated +# as unsigned. +# +# The syntax of the disabled algorithm string is described as follows: +# DisabledAlgorithms: +# " DisabledAlgorithm { , DisabledAlgorithm } " +# +# DisabledAlgorithm: +# AlgorithmName [Constraint] { '&' Constraint } +# +# AlgorithmName: +# (see below) +# +# Constraint: +# KeySizeConstraint | DenyAfterConstraint +# +# KeySizeConstraint: +# keySize Operator KeyLength +# +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD +# +# Operator: +# <= | < | == | != | >= | > +# +# KeyLength: +# Integer value of the algorithm's key length in bits +# +# Note: This property is currently used by the JDK Reference +# implementation. It is not guaranteed to be examined and used by other +# implementations. +# +# See "jdk.certpath.disabledAlgorithms" for syntax descriptions. +# +jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 + +# # Algorithm restrictions for Secure Socket Layer/Transport Layer Security # (SSL/TLS) processing # @@ -504,12 +611,16 @@ jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 # See the specification of "jdk.certpath.disabledAlgorithms" for the # syntax of the disabled algorithm string. # -# Note: This property is currently used by Oracle's JSSE implementation. +# Note: The algorithm restrictions do not apply to trust anchors or +# self-signed certificates. +# +# Note: This property is currently used by the JDK Reference implementation. # It is not guaranteed to be examined and used by other implementations. # # Example: # jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048 -jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 +jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768, \ + EC keySize < 224 # Legacy algorithms for Secure Socket Layer/Transport Layer Security (SSL/TLS) # processing in JSSE implementation. @@ -523,7 +634,7 @@ jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 # During SSL/TLS security parameters negotiation, legacy algorithms will # not be negotiated unless there are no other candidates. # -# The syntax of the disabled algorithm string is described as this Java +# The syntax of the legacy algorithms string is described as this Java # BNF-style: # LegacyAlgorithms: # " LegacyAlgorithm { , LegacyAlgorithm } " @@ -553,7 +664,7 @@ jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 # See SSL/TLS specifications and "Java Cryptography Architecture Standard # Algorithm Name Documentation" for information about the algorithm names. # -# Note: This property is currently used by Oracle's JSSE implementation. +# Note: This property is currently used by the JDK Reference implementation. # It is not guaranteed to be examined and used by other implementations. # There is no guarantee the property will continue to exist or be of the # same syntax in future releases. @@ -566,7 +677,8 @@ jdk.tls.legacyAlgorithms= \ DHE_DSS_EXPORT, DHE_RSA_EXPORT, DH_anon_EXPORT, DH_DSS_EXPORT, \ DH_RSA_EXPORT, RSA_EXPORT, \ DH_anon, ECDH_anon, \ - RC4_128, RC4_40, DES_CBC, DES40_CBC + RC4_128, RC4_40, DES_CBC, DES40_CBC, \ + 3DES_EDE_CBC # The pre-defined default finite field Diffie-Hellman ephemeral (DHE) # parameters for Transport Layer Security (SSL/TLS/DTLS) processing. @@ -624,3 +736,177 @@ jdk.tls.legacyAlgorithms= \ # E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED \ # EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE65381 \ # FFFFFFFF FFFFFFFF, 2} + +# Cryptographic Jurisdiction Policy defaults +# +# Due to the import control restrictions of some countries, the default +# JCE policy files allow for strong but "limited" cryptographic key +# lengths to be used. If your country's cryptographic regulations allow, +# the "unlimited" strength policy files can be used instead, which contain +# no restrictions on cryptographic strengths. +# +# YOU ARE ADVISED TO CONSULT YOUR EXPORT/IMPORT CONTROL COUNSEL OR ATTORNEY +# TO DETERMINE THE EXACT REQUIREMENTS. +# +# (below) refers to the directory where the JRE was +# installed. It is determined based on whether you are running JCE +# on a JRE or a JRE contained within the Java Development Kit, or +# JDK(TM). The JDK contains the JRE, but at a different level in the +# file hierarchy. For example, if the JDK is installed in +# /home/user1/jdk1.8.0 on Unix or in C:\jdk1.8.0 on Windows, then +# is: +# +# /home/user1/jdk1.8.0/jre [Unix] +# C:\jdk1.8.0\jre [Windows] +# +# If on the other hand the JRE is installed in /home/user1/jre1.8.0 +# on Unix or in C:\jre1.8.0 on Windows, and the JDK is not +# installed, then is: +# +# /home/user1/jre1.8.0 [Unix] +# C:\jre1.8.0 [Windows] +# +# On Windows, for each JDK installation, there may be additional +# JREs installed under the "Program Files" directory. Please make +# sure that you install the unlimited strength policy JAR files +# for all JREs that you plan to use. +# +# The policy files are jar files organized into subdirectories of +# /lib/security/policy. Each directory contains a complete +# set of policy files. +# +# The "crypto.policy" Security property controls the directory selection, +# and thus the effective cryptographic policy. +# +# The default set of directories is: +# +# limited | unlimited +# +# however other directories can be created and configured. +# +# To support older JDK Update releases, the crypto.policy property +# is not defined by default. When the property is not defined, an +# update release binary aware of the new property will use the following +# logic to decide what crypto policy files get used : +# +# * If the US_export_policy.jar and local_policy.jar files are located +# in the (legacy) /lib/security directory, then the rules +# embedded in those jar files will be used. This helps preserve compatibility +# for users upgrading from an older installation. +# +# * If crypto.policy is not defined and no such jar files are present in +# the legacy locations, then the JDK will use the limited settings +# (equivalent to crypto.policy=limited) +# +# Please see the JCA documentation for additional information on these +# files and formats. +#crypto.policy=unlimited + +# +# The policy for the XML Signature secure validation mode. The mode is +# enabled by setting the property "org.jcp.xml.dsig.secureValidation" to +# true with the javax.xml.crypto.XMLCryptoContext.setProperty() method, +# or by running the code with a SecurityManager. +# +# Policy: +# Constraint {"," Constraint } +# Constraint: +# AlgConstraint | MaxTransformsConstraint | MaxReferencesConstraint | +# ReferenceUriSchemeConstraint | KeySizeConstraint | OtherConstraint +# AlgConstraint +# "disallowAlg" Uri +# MaxTransformsConstraint: +# "maxTransforms" Integer +# MaxReferencesConstraint: +# "maxReferences" Integer +# ReferenceUriSchemeConstraint: +# "disallowReferenceUriSchemes" String { String } +# KeySizeConstraint: +# "minKeySize" KeyAlg Integer +# OtherConstraint: +# "noDuplicateIds" | "noRetrievalMethodLoops" +# +# For AlgConstraint, Uri is the algorithm URI String that is not allowed. +# See the XML Signature Recommendation for more information on algorithm +# URI Identifiers. For KeySizeConstraint, KeyAlg is the standard algorithm +# name of the key type (ex: "RSA"). If the MaxTransformsConstraint, +# MaxReferencesConstraint or KeySizeConstraint (for the same key type) is +# specified more than once, only the last entry is enforced. +# +# Note: This property is currently used by the JDK Reference implementation. It +# is not guaranteed to be examined and used by other implementations. +# +jdk.xml.dsig.secureValidationPolicy=\ + disallowAlg http://www.w3.org/TR/1999/REC-xslt-19991116,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#rsa-md5,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#hmac-md5,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#md5,\ + maxTransforms 5,\ + maxReferences 30,\ + disallowReferenceUriSchemes file http https,\ + minKeySize RSA 1024,\ + minKeySize DSA 1024,\ + noDuplicateIds,\ + noRetrievalMethodLoops + +# +# Serialization process-wide filter +# +# A filter, if configured, is used by java.io.ObjectInputStream during +# deserialization to check the contents of the stream. +# A filter is configured as a sequence of patterns, each pattern is either +# matched against the name of a class in the stream or defines a limit. +# Patterns are separated by ";" (semicolon). +# Whitespace is significant and is considered part of the pattern. +# +# If a pattern includes a "=", it sets a limit. +# If a limit appears more than once the last value is used. +# Limits are checked before classes regardless of the order in the sequence of patterns. +# If any of the limits are exceeded, the filter status is REJECTED. +# +# maxdepth=value - the maximum depth of a graph +# maxrefs=value - the maximum number of internal references +# maxbytes=value - the maximum number of bytes in the input stream +# maxarray=value - the maximum array length allowed +# +# Other patterns, from left to right, match the class or package name as +# returned from Class.getName. +# If the class is an array type, the class or package to be matched is the element type. +# Arrays of any number of dimensions are treated the same as the element type. +# For example, a pattern of "!example.Foo", rejects creation of any instance or +# array of example.Foo. +# +# If the pattern starts with "!", the status is REJECTED if the remaining pattern +# is matched; otherwise the status is ALLOWED if the pattern matches. +# If the pattern ends with ".**" it matches any class in the package and all subpackages. +# If the pattern ends with ".*" it matches any class in the package. +# If the pattern ends with "*", it matches any class with the pattern as a prefix. +# If the pattern is equal to the class name, it matches. +# Otherwise, the status is UNDECIDED. +# +#jdk.serialFilter=pattern;pattern + +# +# RMI Registry Serial Filter +# +# The filter pattern uses the same format as jdk.serialFilter. +# This filter can override the builtin filter if additional types need to be +# allowed or rejected from the RMI Registry. +# +#sun.rmi.registry.registryFilter=pattern;pattern + +# +# RMI Distributed Garbage Collector (DGC) Serial Filter +# +# The filter pattern uses the same format as jdk.serialFilter. +# This filter can override the builtin filter if additional types need to be +# allowed or rejected from the RMI DGC. +# +# The builtin DGC filter can approximately be represented as the filter pattern: +# +#sun.rmi.transport.dgcFilter=\ +# java.rmi.server.ObjID;\ +# java.rmi.server.UID;\ +# java.rmi.dgc.VMID;\ +# java.rmi.dgc.Lease;\ +# maxdepth=5;maxarray=10000 diff --git a/src/dist-image/ikvm/lib/security/java.security b/src/dist-image/ikvm/lib/security/java.security index 12d1fd8efd..0d6c53ed22 100644 --- a/src/dist-image/ikvm/lib/security/java.security +++ b/src/dist-image/ikvm/lib/security/java.security @@ -209,6 +209,8 @@ package.access=sun.,\ com.sun.org.apache.xalan.internal.xsltc.trax.,\ com.sun.org.apache.xalan.internal.xsltc.util.,\ com.sun.org.apache.xml.internal.res.,\ + com.sun.org.apache.xml.internal.resolver.helpers.,\ + com.sun.org.apache.xml.internal.resolver.readers.,\ com.sun.org.apache.xml.internal.security.,\ com.sun.org.apache.xml.internal.serializer.utils.,\ com.sun.org.apache.xml.internal.utils.,\ @@ -220,7 +222,8 @@ package.access=sun.,\ jdk.internal.,\ jdk.nashorn.internal.,\ jdk.nashorn.tools.,\ - com.sun.activation.registries. + com.sun.activation.registries.,\ + com.sun.java.accessibility. # # List of comma-separated packages that start with or equal this string @@ -256,6 +259,8 @@ package.definition=sun.,\ com.sun.org.apache.xalan.internal.xsltc.trax.,\ com.sun.org.apache.xalan.internal.xsltc.util.,\ com.sun.org.apache.xml.internal.res.,\ + com.sun.org.apache.xml.internal.resolver.helpers.,\ + com.sun.org.apache.xml.internal.resolver.readers.,\ com.sun.org.apache.xml.internal.security.,\ com.sun.org.apache.xml.internal.serializer.utils.,\ com.sun.org.apache.xml.internal.utils.,\ @@ -267,7 +272,8 @@ package.definition=sun.,\ jdk.internal.,\ jdk.nashorn.internal.,\ jdk.nashorn.tools.,\ - com.sun.activation.registries. + com.sun.activation.registries.,\ + com.sun.java.accessibility. # # Determines whether this properties file can be appended to @@ -422,35 +428,37 @@ krb5.kdc.bad.policy = tryLast # describes the mechanism for disabling algorithms based on algorithm name # and/or key length. This includes algorithms used in certificates, as well # as revocation information such as CRLs and signed OCSP Responses. -# -# The syntax of the disabled algorithm string is described as this Java -# BNF-style: +# The syntax of the disabled algorithm string is described as follows: # DisabledAlgorithms: # " DisabledAlgorithm { , DisabledAlgorithm } " # # DisabledAlgorithm: -# AlgorithmName [Constraint] +# AlgorithmName [Constraint] { '&' Constraint } # # AlgorithmName: # (see below) # # Constraint: -# KeySizeConstraint +# KeySizeConstraint | CAConstraint | DenyAfterConstraint | +# UsageConstraint # # KeySizeConstraint: -# keySize Operator DecimalInteger +# keySize Operator KeyLength # # Operator: # <= | < | == | != | >= | > # -# DecimalInteger: -# DecimalDigits +# KeyLength: +# Integer value of the algorithm's key length in bits +# +# CAConstraint: +# jdkCA # -# DecimalDigits: -# DecimalDigit {DecimalDigit} +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD # -# DecimalDigit: one of -# 1 2 3 4 5 6 7 8 9 0 +# UsageConstraint: +# usage [TLSServer] [TLSClient] [SignedJAR] # # The "AlgorithmName" is the standard algorithm name of the disabled # algorithm. See "Java Cryptography Architecture Standard Algorithm Name @@ -464,15 +472,69 @@ krb5.kdc.bad.policy = tryLast # that rely on DSA, such as NONEwithDSA, SHA1withDSA. However, the assertion # will not disable algorithms related to "ECDSA". # -# A "Constraint" provides further guidance for the algorithm being specified. -# The "KeySizeConstraint" requires a key of a valid size range if the -# "AlgorithmName" is of a key algorithm. The "DecimalInteger" indicates the -# key size specified in number of bits. For example, "RSA keySize <= 1024" -# indicates that any RSA key with key size less than or equal to 1024 bits -# should be disabled, and "RSA keySize < 1024, RSA keySize > 2048" indicates -# that any RSA key with key size less than 1024 or greater than 2048 should -# be disabled. Note that the "KeySizeConstraint" only makes sense to key -# algorithms. +# A "Constraint" defines restrictions on the keys and/or certificates for +# a specified AlgorithmName: +# +# KeySizeConstraint: +# keySize Operator KeyLength +# The constraint requires a key of a valid size range if the +# "AlgorithmName" is of a key algorithm. The "KeyLength" indicates +# the key size specified in number of bits. For example, +# "RSA keySize <= 1024" indicates that any RSA key with key size less +# than or equal to 1024 bits should be disabled, and +# "RSA keySize < 1024, RSA keySize > 2048" indicates that any RSA key +# with key size less than 1024 or greater than 2048 should be disabled. +# This constraint is only used on algorithms that have a key size. +# +# CAConstraint: +# jdkCA +# This constraint prohibits the specified algorithm only if the +# algorithm is used in a certificate chain that terminates at a marked +# trust anchor in the lib/security/cacerts keystore. If the jdkCA +# constraint is not set, then all chains using the specified algorithm +# are restricted. jdkCA may only be used once in a DisabledAlgorithm +# expression. +# Example: To apply this constraint to SHA-1 certificates, include +# the following: "SHA1 jdkCA" +# +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD +# This constraint prohibits a certificate with the specified algorithm +# from being used after the date regardless of the certificate's +# validity. JAR files that are signed and timestamped before the +# constraint date with certificates containing the disabled algorithm +# will not be restricted. The date is processed in the UTC timezone. +# This constraint can only be used once in a DisabledAlgorithm +# expression. +# Example: To deny usage of RSA 2048 bit certificates after Feb 3 2020, +# use the following: "RSA keySize == 2048 & denyAfter 2020-02-03" +# +# UsageConstraint: +# usage [TLSServer] [TLSClient] [SignedJAR] +# This constraint prohibits the specified algorithm for +# a specified usage. This should be used when disabling an algorithm +# for all usages is not practical. 'TLSServer' restricts the algorithm +# in TLS server certificate chains when server authentication is +# performed. 'TLSClient' restricts the algorithm in TLS client +# certificate chains when client authentication is performed. +# 'SignedJAR' constrains use of certificates in signed jar files. +# The usage type follows the keyword and more than one usage type can +# be specified with a whitespace delimiter. +# Example: "SHA1 usage TLSServer TLSClient" +# +# When an algorithm must satisfy more than one constraint, it must be +# delimited by an ampersand '&'. For example, to restrict certificates in a +# chain that terminate at a distribution provided trust anchor and contain +# RSA keys that are less than or equal to 1024 bits, add the following +# constraint: "RSA keySize <= 1024 & jdkCA". +# +# All DisabledAlgorithms expressions are processed in the order defined in the +# property. This requires lower keysize constraints to be specified +# before larger keysize constraints of the same algorithm. For example: +# "RSA keySize < 1024 & jdkCA, RSA keySize < 2048". +# +# Note: The algorithm restrictions do not apply to trust anchors or +# self-signed certificates. # # Note: This property is currently used by Oracle's PKIX implementation. It # is not guaranteed to be examined and used by other implementations. @@ -481,8 +543,53 @@ krb5.kdc.bad.policy = tryLast # jdk.certpath.disabledAlgorithms=MD2, DSA, RSA keySize < 2048 # # -jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 +jdk.certpath.disabledAlgorithms=MD2, MD5, SHA1 jdkCA & usage TLSServer, \ + RSA keySize < 1024, DSA keySize < 1024, EC keySize < 224 +# +# Algorithm restrictions for signed JAR files +# +# In some environments, certain algorithms or key lengths may be undesirable +# for signed JAR validation. For example, "MD2" is generally no longer +# considered to be a secure hash algorithm. This section describes the +# mechanism for disabling algorithms based on algorithm name and/or key length. +# JARs signed with any of the disabled algorithms or key sizes will be treated +# as unsigned. +# +# The syntax of the disabled algorithm string is described as follows: +# DisabledAlgorithms: +# " DisabledAlgorithm { , DisabledAlgorithm } " +# +# DisabledAlgorithm: +# AlgorithmName [Constraint] { '&' Constraint } +# +# AlgorithmName: +# (see below) +# +# Constraint: +# KeySizeConstraint | DenyAfterConstraint +# +# KeySizeConstraint: +# keySize Operator KeyLength +# +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD +# +# Operator: +# <= | < | == | != | >= | > +# +# KeyLength: +# Integer value of the algorithm's key length in bits +# +# Note: This property is currently used by the JDK Reference +# implementation. It is not guaranteed to be examined and used by other +# implementations. +# +# See "jdk.certpath.disabledAlgorithms" for syntax descriptions. +# +jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 + +# # Algorithm restrictions for Secure Socket Layer/Transport Layer Security # (SSL/TLS) processing # @@ -504,12 +611,16 @@ jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 # See the specification of "jdk.certpath.disabledAlgorithms" for the # syntax of the disabled algorithm string. # -# Note: This property is currently used by Oracle's JSSE implementation. +# Note: The algorithm restrictions do not apply to trust anchors or +# self-signed certificates. +# +# Note: This property is currently used by the JDK Reference implementation. # It is not guaranteed to be examined and used by other implementations. # # Example: # jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048 -jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 +jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768, \ + EC keySize < 224 # Legacy algorithms for Secure Socket Layer/Transport Layer Security (SSL/TLS) # processing in JSSE implementation. @@ -523,7 +634,7 @@ jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 # During SSL/TLS security parameters negotiation, legacy algorithms will # not be negotiated unless there are no other candidates. # -# The syntax of the disabled algorithm string is described as this Java +# The syntax of the legacy algorithms string is described as this Java # BNF-style: # LegacyAlgorithms: # " LegacyAlgorithm { , LegacyAlgorithm } " @@ -553,7 +664,7 @@ jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 # See SSL/TLS specifications and "Java Cryptography Architecture Standard # Algorithm Name Documentation" for information about the algorithm names. # -# Note: This property is currently used by Oracle's JSSE implementation. +# Note: This property is currently used by the JDK Reference implementation. # It is not guaranteed to be examined and used by other implementations. # There is no guarantee the property will continue to exist or be of the # same syntax in future releases. @@ -566,7 +677,8 @@ jdk.tls.legacyAlgorithms= \ DHE_DSS_EXPORT, DHE_RSA_EXPORT, DH_anon_EXPORT, DH_DSS_EXPORT, \ DH_RSA_EXPORT, RSA_EXPORT, \ DH_anon, ECDH_anon, \ - RC4_128, RC4_40, DES_CBC, DES40_CBC + RC4_128, RC4_40, DES_CBC, DES40_CBC, \ + 3DES_EDE_CBC # The pre-defined default finite field Diffie-Hellman ephemeral (DHE) # parameters for Transport Layer Security (SSL/TLS/DTLS) processing. @@ -624,3 +736,177 @@ jdk.tls.legacyAlgorithms= \ # E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED \ # EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE65381 \ # FFFFFFFF FFFFFFFF, 2} + +# Cryptographic Jurisdiction Policy defaults +# +# Due to the import control restrictions of some countries, the default +# JCE policy files allow for strong but "limited" cryptographic key +# lengths to be used. If your country's cryptographic regulations allow, +# the "unlimited" strength policy files can be used instead, which contain +# no restrictions on cryptographic strengths. +# +# YOU ARE ADVISED TO CONSULT YOUR EXPORT/IMPORT CONTROL COUNSEL OR ATTORNEY +# TO DETERMINE THE EXACT REQUIREMENTS. +# +# (below) refers to the directory where the JRE was +# installed. It is determined based on whether you are running JCE +# on a JRE or a JRE contained within the Java Development Kit, or +# JDK(TM). The JDK contains the JRE, but at a different level in the +# file hierarchy. For example, if the JDK is installed in +# /home/user1/jdk1.8.0 on Unix or in C:\jdk1.8.0 on Windows, then +# is: +# +# /home/user1/jdk1.8.0/jre [Unix] +# C:\jdk1.8.0\jre [Windows] +# +# If on the other hand the JRE is installed in /home/user1/jre1.8.0 +# on Unix or in C:\jre1.8.0 on Windows, and the JDK is not +# installed, then is: +# +# /home/user1/jre1.8.0 [Unix] +# C:\jre1.8.0 [Windows] +# +# On Windows, for each JDK installation, there may be additional +# JREs installed under the "Program Files" directory. Please make +# sure that you install the unlimited strength policy JAR files +# for all JREs that you plan to use. +# +# The policy files are jar files organized into subdirectories of +# /lib/security/policy. Each directory contains a complete +# set of policy files. +# +# The "crypto.policy" Security property controls the directory selection, +# and thus the effective cryptographic policy. +# +# The default set of directories is: +# +# limited | unlimited +# +# however other directories can be created and configured. +# +# To support older JDK Update releases, the crypto.policy property +# is not defined by default. When the property is not defined, an +# update release binary aware of the new property will use the following +# logic to decide what crypto policy files get used : +# +# * If the US_export_policy.jar and local_policy.jar files are located +# in the (legacy) /lib/security directory, then the rules +# embedded in those jar files will be used. This helps preserve compatibility +# for users upgrading from an older installation. +# +# * If crypto.policy is not defined and no such jar files are present in +# the legacy locations, then the JDK will use the limited settings +# (equivalent to crypto.policy=limited) +# +# Please see the JCA documentation for additional information on these +# files and formats. +#crypto.policy=unlimited + +# +# The policy for the XML Signature secure validation mode. The mode is +# enabled by setting the property "org.jcp.xml.dsig.secureValidation" to +# true with the javax.xml.crypto.XMLCryptoContext.setProperty() method, +# or by running the code with a SecurityManager. +# +# Policy: +# Constraint {"," Constraint } +# Constraint: +# AlgConstraint | MaxTransformsConstraint | MaxReferencesConstraint | +# ReferenceUriSchemeConstraint | KeySizeConstraint | OtherConstraint +# AlgConstraint +# "disallowAlg" Uri +# MaxTransformsConstraint: +# "maxTransforms" Integer +# MaxReferencesConstraint: +# "maxReferences" Integer +# ReferenceUriSchemeConstraint: +# "disallowReferenceUriSchemes" String { String } +# KeySizeConstraint: +# "minKeySize" KeyAlg Integer +# OtherConstraint: +# "noDuplicateIds" | "noRetrievalMethodLoops" +# +# For AlgConstraint, Uri is the algorithm URI String that is not allowed. +# See the XML Signature Recommendation for more information on algorithm +# URI Identifiers. For KeySizeConstraint, KeyAlg is the standard algorithm +# name of the key type (ex: "RSA"). If the MaxTransformsConstraint, +# MaxReferencesConstraint or KeySizeConstraint (for the same key type) is +# specified more than once, only the last entry is enforced. +# +# Note: This property is currently used by the JDK Reference implementation. It +# is not guaranteed to be examined and used by other implementations. +# +jdk.xml.dsig.secureValidationPolicy=\ + disallowAlg http://www.w3.org/TR/1999/REC-xslt-19991116,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#rsa-md5,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#hmac-md5,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#md5,\ + maxTransforms 5,\ + maxReferences 30,\ + disallowReferenceUriSchemes file http https,\ + minKeySize RSA 1024,\ + minKeySize DSA 1024,\ + noDuplicateIds,\ + noRetrievalMethodLoops + +# +# Serialization process-wide filter +# +# A filter, if configured, is used by java.io.ObjectInputStream during +# deserialization to check the contents of the stream. +# A filter is configured as a sequence of patterns, each pattern is either +# matched against the name of a class in the stream or defines a limit. +# Patterns are separated by ";" (semicolon). +# Whitespace is significant and is considered part of the pattern. +# +# If a pattern includes a "=", it sets a limit. +# If a limit appears more than once the last value is used. +# Limits are checked before classes regardless of the order in the sequence of patterns. +# If any of the limits are exceeded, the filter status is REJECTED. +# +# maxdepth=value - the maximum depth of a graph +# maxrefs=value - the maximum number of internal references +# maxbytes=value - the maximum number of bytes in the input stream +# maxarray=value - the maximum array length allowed +# +# Other patterns, from left to right, match the class or package name as +# returned from Class.getName. +# If the class is an array type, the class or package to be matched is the element type. +# Arrays of any number of dimensions are treated the same as the element type. +# For example, a pattern of "!example.Foo", rejects creation of any instance or +# array of example.Foo. +# +# If the pattern starts with "!", the status is REJECTED if the remaining pattern +# is matched; otherwise the status is ALLOWED if the pattern matches. +# If the pattern ends with ".**" it matches any class in the package and all subpackages. +# If the pattern ends with ".*" it matches any class in the package. +# If the pattern ends with "*", it matches any class with the pattern as a prefix. +# If the pattern is equal to the class name, it matches. +# Otherwise, the status is UNDECIDED. +# +#jdk.serialFilter=pattern;pattern + +# +# RMI Registry Serial Filter +# +# The filter pattern uses the same format as jdk.serialFilter. +# This filter can override the builtin filter if additional types need to be +# allowed or rejected from the RMI Registry. +# +#sun.rmi.registry.registryFilter=pattern;pattern + +# +# RMI Distributed Garbage Collector (DGC) Serial Filter +# +# The filter pattern uses the same format as jdk.serialFilter. +# This filter can override the builtin filter if additional types need to be +# allowed or rejected from the RMI DGC. +# +# The builtin DGC filter can approximately be represented as the filter pattern: +# +#sun.rmi.transport.dgcFilter=\ +# java.rmi.server.ObjID;\ +# java.rmi.server.UID;\ +# java.rmi.dgc.VMID;\ +# java.rmi.dgc.Lease;\ +# maxdepth=5;maxarray=10000 From a8a8942e3f7250c5145d7a6df252c7893a797975 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Thu, 8 Jun 2023 13:38:18 +0200 Subject: [PATCH 004/134] Reenable test --- src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt index 7e881764e3..30b58825bc 100644 --- a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt +++ b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt @@ -3364,6 +3364,3 @@ javax/swing/plaf/nimbus/8041642/ScrollBarThumbVisibleTest.java # mscapi / Windows-MY Keystore usage sun/security/mscapi/IterateWindowsRootStore.java generic-all sun/security/mscapi/CastError.java generic-all - -# TODO: Reenable after 8u112 is integrated -java/lang/invoke/CustomizedLambdaFormTest.java generic-all From 4ea558e2e7e888fd39f4c8459e35713e37b24455 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Tue, 13 Jun 2023 16:24:57 +0200 Subject: [PATCH 005/134] Removed RMI stubs --- openjdk.props | 2 -- 1 file changed, 2 deletions(-) diff --git a/openjdk.props b/openjdk.props index 4239cc9758..1f760f88ae 100644 --- a/openjdk.props +++ b/openjdk.props @@ -1763,8 +1763,6 @@ - - From aa1fd7174dafceda8c3a4b72b89d81347ee3014f Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Tue, 13 Jun 2023 16:25:29 +0200 Subject: [PATCH 006/134] Port --- .../local/java/security/ProtectionDomain.java | 144 ++++++++++++++++-- .../local/sun/misc/SharedSecrets.java | 13 ++ .../Java/Externs/java/io/FileInputStream.cs | 8 +- 3 files changed, 146 insertions(+), 19 deletions(-) diff --git a/src/IKVM.Java/local/java/security/ProtectionDomain.java b/src/IKVM.Java/local/java/security/ProtectionDomain.java index 920ac3d633..3a583ec2df 100644 --- a/src/IKVM.Java/local/java/security/ProtectionDomain.java +++ b/src/IKVM.Java/local/java/security/ProtectionDomain.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,12 +25,16 @@ package java.security; +import java.lang.ref.Reference; +import java.lang.ref.ReferenceQueue; +import java.lang.ref.SoftReference; +import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.Collections; import java.util.Enumeration; import java.util.List; import java.util.Map; -import java.util.WeakHashMap; +import java.util.concurrent.ConcurrentHashMap; import sun.misc.JavaSecurityProtectionDomainAccess; import static sun.misc.JavaSecurityProtectionDomainAccess.ProtectionDomainCache; import sun.security.util.Debug; @@ -518,25 +522,135 @@ public PermissionCollection run() { /** * Used for storing ProtectionDomains as keys in a Map. */ - final class Key {} + static final class Key {} static { SharedSecrets.setJavaSecurityProtectionDomainAccess( new JavaSecurityProtectionDomainAccess() { + @Override public ProtectionDomainCache getProtectionDomainCache() { - return new ProtectionDomainCache() { - private final Map map = - Collections.synchronizedMap - (new WeakHashMap()); - public void put(ProtectionDomain pd, - PermissionCollection pc) { - map.put((pd == null ? null : pd.key), pc); - } - public PermissionCollection get(ProtectionDomain pd) { - return pd == null ? map.get(null) : map.get(pd.key); - } - }; + return new PDCache(); + } + + @Override + public boolean getStaticPermissionsField(ProtectionDomain pd) { + return pd.staticPermissions; } }); } + + /** + * A cache of ProtectionDomains and their Permissions. + * + * This class stores ProtectionDomains as weak keys in a ConcurrentHashMap + * with additional support for checking and removing weak keys that are no + * longer in use. There can be cases where the permission collection may + * have a chain of strong references back to the ProtectionDomain, which + * ordinarily would prevent the entry from being removed from the map. To + * address that, we wrap the permission collection in a SoftReference so + * that it can be reclaimed by the garbage collector due to memory demand. + */ + private static class PDCache implements ProtectionDomainCache { + private final ConcurrentHashMap> + pdMap = new ConcurrentHashMap<>(); + private final ReferenceQueue queue = new ReferenceQueue<>(); + + @Override + public void put(ProtectionDomain pd, PermissionCollection pc) { + processQueue(queue, pdMap); + WeakProtectionDomainKey weakPd = + new WeakProtectionDomainKey(pd, queue); + pdMap.put(weakPd, new SoftReference<>(pc)); + } + + @Override + public PermissionCollection get(ProtectionDomain pd) { + processQueue(queue, pdMap); + WeakProtectionDomainKey weakPd = new WeakProtectionDomainKey(pd); + SoftReference sr = pdMap.get(weakPd); + return (sr == null) ? null : sr.get(); + } + + /** + * Removes weak keys from the map that have been enqueued + * on the reference queue and are no longer in use. + */ + private static void processQueue(ReferenceQueue queue, + ConcurrentHashMap, ?> pdMap) { + Reference ref; + while ((ref = queue.poll()) != null) { + pdMap.remove(ref); + } + } + } + + /** + * A weak key for a ProtectionDomain. + */ + private static class WeakProtectionDomainKey extends WeakReference { + /** + * Saved value of the referent's identity hash code, to maintain + * a consistent hash code after the referent has been cleared + */ + private final int hash; + + /** + * A key representing a null ProtectionDomain. + */ + private static final Key NULL_KEY = new Key(); + + /** + * Create a new WeakProtectionDomain with the specified domain and + * registered with a queue. + */ + WeakProtectionDomainKey(ProtectionDomain pd, ReferenceQueue rq) { + this((pd == null ? NULL_KEY : pd.key), rq); + } + + WeakProtectionDomainKey(ProtectionDomain pd) { + this(pd == null ? NULL_KEY : pd.key); + } + + private WeakProtectionDomainKey(Key key, ReferenceQueue rq) { + super(key, rq); + hash = key.hashCode(); + } + + private WeakProtectionDomainKey(Key key) { + super(key); + hash = key.hashCode(); + } + + /** + * Returns the identity hash code of the original referent. + */ + @Override + public int hashCode() { + return hash; + } + + /** + * Returns true if the given object is an identical + * WeakProtectionDomainKey instance, or, if this object's referent + * has not been cleared and the given object is another + * WeakProtectionDomainKey instance with an identical non-null + * referent as this one. + */ + @Override + public boolean equals(Object obj) { + if (obj == this) { + return true; + } + + if (obj instanceof WeakProtectionDomainKey) { + Object referent = get(); + return (referent != null) && + (referent == ((WeakProtectionDomainKey)obj).get()); + } else { + return false; + } + } + } } diff --git a/src/IKVM.Java/local/sun/misc/SharedSecrets.java b/src/IKVM.Java/local/sun/misc/SharedSecrets.java index 091fcfafe9..5a147ffba6 100644 --- a/src/IKVM.Java/local/sun/misc/SharedSecrets.java +++ b/src/IKVM.Java/local/sun/misc/SharedSecrets.java @@ -25,6 +25,7 @@ package sun.misc; +import java.io.ObjectInputStream; import java.util.jar.JarFile; import java.io.Console; import java.io.FileDescriptor; @@ -56,6 +57,7 @@ public class SharedSecrets { private static JavaSecurityAccess javaSecurityAccess; private static JavaUtilZipFileAccess javaUtilZipFileAccess; private static JavaAWTAccess javaAWTAccess; + private static JavaOISAccess javaOISAccess; private static JavaObjectInputStreamAccess javaObjectInputStreamAccess; public static JavaUtilJarAccess javaUtilJarAccess() { @@ -142,6 +144,17 @@ public static JavaIOFileDescriptorAccess getJavaIOFileDescriptorAccess() { return javaIOFileDescriptorAccess; } + public static void setJavaOISAccess(JavaOISAccess access) { + javaOISAccess = access; + } + + public static JavaOISAccess getJavaOISAccess() { + if (javaOISAccess == null) + unsafe.ensureClassInitialized(ObjectInputStream.class); + + return javaOISAccess; + } + public static void setJavaSecurityProtectionDomainAccess (JavaSecurityProtectionDomainAccess jspda) { javaSecurityProtectionDomainAccess = jspda; diff --git a/src/IKVM.Runtime/Java/Externs/java/io/FileInputStream.cs b/src/IKVM.Runtime/Java/Externs/java/io/FileInputStream.cs index 7d74cacd26..827e0f716a 100644 --- a/src/IKVM.Runtime/Java/Externs/java/io/FileInputStream.cs +++ b/src/IKVM.Runtime/Java/Externs/java/io/FileInputStream.cs @@ -169,12 +169,12 @@ public static int readBytes(object self, byte[] b, int off, int len) } /// - /// Implements the native method 'skip'. + /// Implements the native method 'skip0'. /// /// /// /// - public static long skip(object self, long n) + public static long skip0(object self, long n) { #if FIRST_PASS throw new NotImplementedException(); @@ -211,11 +211,11 @@ public static long skip(object self, long n) } /// - /// Implements the native method 'available'. + /// Implements the native method 'available0'. /// /// /// - public static int available(object self) + public static int available0(object self) { #if FIRST_PASS throw new NotImplementedException(); From 4f763dda40ead8d4bc5f620a7c857ddafb81da39 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Tue, 13 Jun 2023 16:25:33 +0200 Subject: [PATCH 007/134] Add new --- openjdk.props | 1 + 1 file changed, 1 insertion(+) diff --git a/openjdk.props b/openjdk.props index 1f760f88ae..a0da7d6ad6 100644 --- a/openjdk.props +++ b/openjdk.props @@ -1508,6 +1508,7 @@ + From 6c455410adc25eedb6339d80b65cfbf797ead8d4 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Wed, 14 Jun 2023 09:56:33 +0200 Subject: [PATCH 008/134] Disable tests --- src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt index 30b58825bc..830d4f22f1 100644 --- a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt +++ b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt @@ -3364,3 +3364,55 @@ javax/swing/plaf/nimbus/8041642/ScrollBarThumbVisibleTest.java # mscapi / Windows-MY Keystore usage sun/security/mscapi/IterateWindowsRootStore.java generic-all sun/security/mscapi/CastError.java generic-all + +## JDK8u152-b16 +# awt/swing +com/sun/java/swing/plaf/windows/Test8173145.java generic-all +java/awt/Container/MoveToOtherScreenTest/MoveToOtherScreenTest.java generic-all +java/awt/Dialog/DialogAboveFrame/DialogAboveFrameTest.java generic-all +java/awt/EventQueue/6980209/bug6980209.java generic-all +java/awt/Focus/ModalDialogActivationTest/ModalDialogActivationTest.java generic-all +java/awt/font/TextLayout/DiacriticsDrawingTest.java generic-all +java/awt/Frame/FrameResize/ShowChildWhileResizingTest.java generic-all +java/awt/Frame/NormalToIconified/NormalToIconifiedTest.java generic-all +java/awt/Frame/ObscuredFrame/ObscuredFrameTest.java generic-all +java/awt/geom/AffineTransform/InvalidTransformParameterTest.java generic-all +java/awt/image/VolatileImage/VolatileImageBug.java generic-all +java/awt/Mouse/EnterExitEvents/ModalDialogEnterExitEventsTest.java generic-all +java/awt/MouseInfo/GetPointerInfoTest.java generic-all +java/awt/MouseInfo/MultiscreenPointerInfo.java generic-all +java/awt/Paint/ComponentIsNotDrawnAfterRemoveAddTest/ComponentIsNotDrawnAfterRemoveAddTest.java generic-all +java/awt/print/PrinterJob/PrintCrashTest.java generic-all +java/awt/TextArea/TextAreaEditing/TextAreaEditing.java generic-all +java/awt/Window/WindowDeadlockTest/WindowDeadlockTest.java generic-all +java/awt/Window/WindowJumpingTest/WindowJumpingTest.java generic-all +javax/swing/JComboBox/8136998/bug8136998.java generic-all +javax/swing/JMenuItem/8152981/MenuItemIconTest.java generic-all +javax/swing/JProgressBar/8161664/ProgressBarMemoryLeakTest.java generic-all +javax/swing/plaf/basic/BasicComboPopup/8154069/Bug8154069.java generic-all +javax/swing/plaf/basic/BasicLabelUI/bug7172652.java generic-all +javax/swing/plaf/nimbus/8057791/bug8057791.java generic-all +javax/swing/text/FlowView/LayoutTest.java generic-all +javax/swing/text/html/parser/Parser/HtmlCommentTagParseTest/HtmlCommentTagParseTest.java generic-all +sun/java2d/ClassCastExceptionForInvalidSurface.java generic-all + +# mscapi/sunec/Windows-PRNG SecureRandom +java/security/SecureRandom/DefaultProvider.java generic-all +java/security/Signature/SignatureLength.java generic-all +sun/security/ec/NSASuiteB/TestSHAwithECDSASignatureOids.java generic-all +sun/security/ec/SignatureOffsets.java generic-all +sun/security/tools/jarsigner/DefaultSigalg.java generic-all +sun/security/x509/X509CertImpl/V3Certificate.java generic-all + +# pkcs11 +sun/security/pkcs11/Mac/MacKAT.java generic-all +sun/security/pkcs11/Mac/MacSameTest.java generic-all +sun/security/pkcs11/Secmod/LoadKeystore.java generic-all + +# JPS +sun/tools/jps/TestJpsClass.java generic-all +sun/tools/jps/TestJpsJar.java generic-all +sun/tools/jps/TestJpsSanity.java generic-all + +# jcmd +sun/tools/jcmd/TestJcmdDefaults.java generic-all From 02fb55a2fc9a3fa0b2eddbbe1d0612a5ff568de1 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Tue, 20 Jun 2023 11:11:01 +0200 Subject: [PATCH 009/134] Copy java.security --- .../any/linux-arm/lib/security/java.security | 339 +++++++++++++++-- .../linux-arm64/lib/security/java.security | 339 +++++++++++++++-- .../linux-musl-arm/lib/security/java.security | 339 +++++++++++++++-- .../lib/security/java.security | 339 +++++++++++++++-- .../linux-musl-x64/lib/security/java.security | 339 +++++++++++++++-- .../any/linux-x64/lib/security/java.security | 339 +++++++++++++++-- .../any/osx-x64/lib/security/java.security | 4 +- .../any/win7-x64/lib/security/java.security | 344 ++++++++++++++++-- .../any/win7-x86/lib/security/java.security | 344 ++++++++++++++++-- .../any/win81-arm/lib/security/java.security | 344 ++++++++++++++++-- .../ikvm/lib/security/java.security | 7 +- 11 files changed, 2822 insertions(+), 255 deletions(-) diff --git a/src/IKVM.Image/ikvm/any/linux-arm/lib/security/java.security b/src/IKVM.Image/ikvm/any/linux-arm/lib/security/java.security index 12d1fd8efd..659f8a3e6b 100644 --- a/src/IKVM.Image/ikvm/any/linux-arm/lib/security/java.security +++ b/src/IKVM.Image/ikvm/any/linux-arm/lib/security/java.security @@ -209,6 +209,8 @@ package.access=sun.,\ com.sun.org.apache.xalan.internal.xsltc.trax.,\ com.sun.org.apache.xalan.internal.xsltc.util.,\ com.sun.org.apache.xml.internal.res.,\ + com.sun.org.apache.xml.internal.resolver.helpers.,\ + com.sun.org.apache.xml.internal.resolver.readers.,\ com.sun.org.apache.xml.internal.security.,\ com.sun.org.apache.xml.internal.serializer.utils.,\ com.sun.org.apache.xml.internal.utils.,\ @@ -256,6 +258,8 @@ package.definition=sun.,\ com.sun.org.apache.xalan.internal.xsltc.trax.,\ com.sun.org.apache.xalan.internal.xsltc.util.,\ com.sun.org.apache.xml.internal.res.,\ + com.sun.org.apache.xml.internal.resolver.helpers.,\ + com.sun.org.apache.xml.internal.resolver.readers.,\ com.sun.org.apache.xml.internal.security.,\ com.sun.org.apache.xml.internal.serializer.utils.,\ com.sun.org.apache.xml.internal.utils.,\ @@ -422,35 +426,37 @@ krb5.kdc.bad.policy = tryLast # describes the mechanism for disabling algorithms based on algorithm name # and/or key length. This includes algorithms used in certificates, as well # as revocation information such as CRLs and signed OCSP Responses. -# -# The syntax of the disabled algorithm string is described as this Java -# BNF-style: +# The syntax of the disabled algorithm string is described as follows: # DisabledAlgorithms: # " DisabledAlgorithm { , DisabledAlgorithm } " # # DisabledAlgorithm: -# AlgorithmName [Constraint] +# AlgorithmName [Constraint] { '&' Constraint } # # AlgorithmName: # (see below) # # Constraint: -# KeySizeConstraint +# KeySizeConstraint | CAConstraint | DenyAfterConstraint | +# UsageConstraint # # KeySizeConstraint: -# keySize Operator DecimalInteger +# keySize Operator KeyLength # # Operator: # <= | < | == | != | >= | > # -# DecimalInteger: -# DecimalDigits +# KeyLength: +# Integer value of the algorithm's key length in bits +# +# CAConstraint: +# jdkCA # -# DecimalDigits: -# DecimalDigit {DecimalDigit} +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD # -# DecimalDigit: one of -# 1 2 3 4 5 6 7 8 9 0 +# UsageConstraint: +# usage [TLSServer] [TLSClient] [SignedJAR] # # The "AlgorithmName" is the standard algorithm name of the disabled # algorithm. See "Java Cryptography Architecture Standard Algorithm Name @@ -464,15 +470,69 @@ krb5.kdc.bad.policy = tryLast # that rely on DSA, such as NONEwithDSA, SHA1withDSA. However, the assertion # will not disable algorithms related to "ECDSA". # -# A "Constraint" provides further guidance for the algorithm being specified. -# The "KeySizeConstraint" requires a key of a valid size range if the -# "AlgorithmName" is of a key algorithm. The "DecimalInteger" indicates the -# key size specified in number of bits. For example, "RSA keySize <= 1024" -# indicates that any RSA key with key size less than or equal to 1024 bits -# should be disabled, and "RSA keySize < 1024, RSA keySize > 2048" indicates -# that any RSA key with key size less than 1024 or greater than 2048 should -# be disabled. Note that the "KeySizeConstraint" only makes sense to key -# algorithms. +# A "Constraint" defines restrictions on the keys and/or certificates for +# a specified AlgorithmName: +# +# KeySizeConstraint: +# keySize Operator KeyLength +# The constraint requires a key of a valid size range if the +# "AlgorithmName" is of a key algorithm. The "KeyLength" indicates +# the key size specified in number of bits. For example, +# "RSA keySize <= 1024" indicates that any RSA key with key size less +# than or equal to 1024 bits should be disabled, and +# "RSA keySize < 1024, RSA keySize > 2048" indicates that any RSA key +# with key size less than 1024 or greater than 2048 should be disabled. +# This constraint is only used on algorithms that have a key size. +# +# CAConstraint: +# jdkCA +# This constraint prohibits the specified algorithm only if the +# algorithm is used in a certificate chain that terminates at a marked +# trust anchor in the lib/security/cacerts keystore. If the jdkCA +# constraint is not set, then all chains using the specified algorithm +# are restricted. jdkCA may only be used once in a DisabledAlgorithm +# expression. +# Example: To apply this constraint to SHA-1 certificates, include +# the following: "SHA1 jdkCA" +# +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD +# This constraint prohibits a certificate with the specified algorithm +# from being used after the date regardless of the certificate's +# validity. JAR files that are signed and timestamped before the +# constraint date with certificates containing the disabled algorithm +# will not be restricted. The date is processed in the UTC timezone. +# This constraint can only be used once in a DisabledAlgorithm +# expression. +# Example: To deny usage of RSA 2048 bit certificates after Feb 3 2020, +# use the following: "RSA keySize == 2048 & denyAfter 2020-02-03" +# +# UsageConstraint: +# usage [TLSServer] [TLSClient] [SignedJAR] +# This constraint prohibits the specified algorithm for +# a specified usage. This should be used when disabling an algorithm +# for all usages is not practical. 'TLSServer' restricts the algorithm +# in TLS server certificate chains when server authentication is +# performed. 'TLSClient' restricts the algorithm in TLS client +# certificate chains when client authentication is performed. +# 'SignedJAR' constrains use of certificates in signed jar files. +# The usage type follows the keyword and more than one usage type can +# be specified with a whitespace delimiter. +# Example: "SHA1 usage TLSServer TLSClient" +# +# When an algorithm must satisfy more than one constraint, it must be +# delimited by an ampersand '&'. For example, to restrict certificates in a +# chain that terminate at a distribution provided trust anchor and contain +# RSA keys that are less than or equal to 1024 bits, add the following +# constraint: "RSA keySize <= 1024 & jdkCA". +# +# All DisabledAlgorithms expressions are processed in the order defined in the +# property. This requires lower keysize constraints to be specified +# before larger keysize constraints of the same algorithm. For example: +# "RSA keySize < 1024 & jdkCA, RSA keySize < 2048". +# +# Note: The algorithm restrictions do not apply to trust anchors or +# self-signed certificates. # # Note: This property is currently used by Oracle's PKIX implementation. It # is not guaranteed to be examined and used by other implementations. @@ -481,8 +541,53 @@ krb5.kdc.bad.policy = tryLast # jdk.certpath.disabledAlgorithms=MD2, DSA, RSA keySize < 2048 # # -jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 +jdk.certpath.disabledAlgorithms=MD2, MD5, SHA1 jdkCA & usage TLSServer, \ + RSA keySize < 1024, DSA keySize < 1024, EC keySize < 224 + +# +# Algorithm restrictions for signed JAR files +# +# In some environments, certain algorithms or key lengths may be undesirable +# for signed JAR validation. For example, "MD2" is generally no longer +# considered to be a secure hash algorithm. This section describes the +# mechanism for disabling algorithms based on algorithm name and/or key length. +# JARs signed with any of the disabled algorithms or key sizes will be treated +# as unsigned. +# +# The syntax of the disabled algorithm string is described as follows: +# DisabledAlgorithms: +# " DisabledAlgorithm { , DisabledAlgorithm } " +# +# DisabledAlgorithm: +# AlgorithmName [Constraint] { '&' Constraint } +# +# AlgorithmName: +# (see below) +# +# Constraint: +# KeySizeConstraint | DenyAfterConstraint +# +# KeySizeConstraint: +# keySize Operator KeyLength +# +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD +# +# Operator: +# <= | < | == | != | >= | > +# +# KeyLength: +# Integer value of the algorithm's key length in bits +# +# Note: This property is currently used by the JDK Reference +# implementation. It is not guaranteed to be examined and used by other +# implementations. +# +# See "jdk.certpath.disabledAlgorithms" for syntax descriptions. +# +jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 +# # Algorithm restrictions for Secure Socket Layer/Transport Layer Security # (SSL/TLS) processing # @@ -504,12 +609,16 @@ jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 # See the specification of "jdk.certpath.disabledAlgorithms" for the # syntax of the disabled algorithm string. # -# Note: This property is currently used by Oracle's JSSE implementation. +# Note: The algorithm restrictions do not apply to trust anchors or +# self-signed certificates. +# +# Note: This property is currently used by the JDK Reference implementation. # It is not guaranteed to be examined and used by other implementations. # # Example: # jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048 -jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 +jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768, \ + EC keySize < 224 # Legacy algorithms for Secure Socket Layer/Transport Layer Security (SSL/TLS) # processing in JSSE implementation. @@ -523,7 +632,7 @@ jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 # During SSL/TLS security parameters negotiation, legacy algorithms will # not be negotiated unless there are no other candidates. # -# The syntax of the disabled algorithm string is described as this Java +# The syntax of the legacy algorithms string is described as this Java # BNF-style: # LegacyAlgorithms: # " LegacyAlgorithm { , LegacyAlgorithm } " @@ -553,7 +662,7 @@ jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 # See SSL/TLS specifications and "Java Cryptography Architecture Standard # Algorithm Name Documentation" for information about the algorithm names. # -# Note: This property is currently used by Oracle's JSSE implementation. +# Note: This property is currently used by the JDK Reference implementation. # It is not guaranteed to be examined and used by other implementations. # There is no guarantee the property will continue to exist or be of the # same syntax in future releases. @@ -566,7 +675,8 @@ jdk.tls.legacyAlgorithms= \ DHE_DSS_EXPORT, DHE_RSA_EXPORT, DH_anon_EXPORT, DH_DSS_EXPORT, \ DH_RSA_EXPORT, RSA_EXPORT, \ DH_anon, ECDH_anon, \ - RC4_128, RC4_40, DES_CBC, DES40_CBC + RC4_128, RC4_40, DES_CBC, DES40_CBC, \ + 3DES_EDE_CBC # The pre-defined default finite field Diffie-Hellman ephemeral (DHE) # parameters for Transport Layer Security (SSL/TLS/DTLS) processing. @@ -624,3 +734,178 @@ jdk.tls.legacyAlgorithms= \ # E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED \ # EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE65381 \ # FFFFFFFF FFFFFFFF, 2} + +# Cryptographic Jurisdiction Policy defaults +# +# Due to the import control restrictions of some countries, the default +# JCE policy files allow for strong but "limited" cryptographic key +# lengths to be used. If your country's cryptographic regulations allow, +# the "unlimited" strength policy files can be used instead, which contain +# no restrictions on cryptographic strengths. +# +# YOU ARE ADVISED TO CONSULT YOUR EXPORT/IMPORT CONTROL COUNSEL OR ATTORNEY +# TO DETERMINE THE EXACT REQUIREMENTS. +# +# (below) refers to the directory where the JRE was +# installed. It is determined based on whether you are running JCE +# on a JRE or a JRE contained within the Java Development Kit, or +# JDK(TM). The JDK contains the JRE, but at a different level in the +# file hierarchy. For example, if the JDK is installed in +# /home/user1/jdk1.8.0 on Unix or in C:\jdk1.8.0 on Windows, then +# is: +# +# /home/user1/jdk1.8.0/jre [Unix] +# C:\jdk1.8.0\jre [Windows] +# +# If on the other hand the JRE is installed in /home/user1/jre1.8.0 +# on Unix or in C:\jre1.8.0 on Windows, and the JDK is not +# installed, then is: +# +# /home/user1/jre1.8.0 [Unix] +# C:\jre1.8.0 [Windows] +# +# On Windows, for each JDK installation, there may be additional +# JREs installed under the "Program Files" directory. Please make +# sure that you install the unlimited strength policy JAR files +# for all JREs that you plan to use. +# +# The policy files are jar files organized into subdirectories of +# /lib/security/policy. Each directory contains a complete +# set of policy files. +# +# The "crypto.policy" Security property controls the directory selection, +# and thus the effective cryptographic policy. +# +# The default set of directories is: +# +# limited | unlimited +# +# however other directories can be created and configured. +# +# To support older JDK Update releases, the crypto.policy property +# is not defined by default. When the property is not defined, an +# update release binary aware of the new property will use the following +# logic to decide what crypto policy files get used : +# +# * If the US_export_policy.jar and local_policy.jar files are located +# in the (legacy) /lib/security directory, then the rules +# embedded in those jar files will be used. This helps preserve compatibility +# for users upgrading from an older installation. +# +# * If crypto.policy is not defined and no such jar files are present in +# the legacy locations, then the JDK will use the limited settings +# (equivalent to crypto.policy=limited) +# +# Please see the JCA documentation for additional information on these +# files and formats. +#crypto.policy=unlimited + +# +# The policy for the XML Signature secure validation mode. The mode is +# enabled by setting the property "org.jcp.xml.dsig.secureValidation" to +# true with the javax.xml.crypto.XMLCryptoContext.setProperty() method, +# or by running the code with a SecurityManager. +# +# Policy: +# Constraint {"," Constraint } +# Constraint: +# AlgConstraint | MaxTransformsConstraint | MaxReferencesConstraint | +# ReferenceUriSchemeConstraint | KeySizeConstraint | OtherConstraint +# AlgConstraint +# "disallowAlg" Uri +# MaxTransformsConstraint: +# "maxTransforms" Integer +# MaxReferencesConstraint: +# "maxReferences" Integer +# ReferenceUriSchemeConstraint: +# "disallowReferenceUriSchemes" String { String } +# KeySizeConstraint: +# "minKeySize" KeyAlg Integer +# OtherConstraint: +# "noDuplicateIds" | "noRetrievalMethodLoops" +# +# For AlgConstraint, Uri is the algorithm URI String that is not allowed. +# See the XML Signature Recommendation for more information on algorithm +# URI Identifiers. For KeySizeConstraint, KeyAlg is the standard algorithm +# name of the key type (ex: "RSA"). If the MaxTransformsConstraint, +# MaxReferencesConstraint or KeySizeConstraint (for the same key type) is +# specified more than once, only the last entry is enforced. +# +# Note: This property is currently used by the JDK Reference implementation. It +# is not guaranteed to be examined and used by other implementations. +# +jdk.xml.dsig.secureValidationPolicy=\ + disallowAlg http://www.w3.org/TR/1999/REC-xslt-19991116,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#rsa-md5,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#hmac-md5,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#md5,\ + maxTransforms 5,\ + maxReferences 30,\ + disallowReferenceUriSchemes file http https,\ + minKeySize RSA 1024,\ + minKeySize DSA 1024,\ + noDuplicateIds,\ + noRetrievalMethodLoops + +# +# Serialization process-wide filter +# +# A filter, if configured, is used by java.io.ObjectInputStream during +# deserialization to check the contents of the stream. +# A filter is configured as a sequence of patterns, each pattern is either +# matched against the name of a class in the stream or defines a limit. +# Patterns are separated by ";" (semicolon). +# Whitespace is significant and is considered part of the pattern. +# +# If a pattern includes a "=", it sets a limit. +# If a limit appears more than once the last value is used. +# Limits are checked before classes regardless of the order in the sequence of patterns. +# If any of the limits are exceeded, the filter status is REJECTED. +# +# maxdepth=value - the maximum depth of a graph +# maxrefs=value - the maximum number of internal references +# maxbytes=value - the maximum number of bytes in the input stream +# maxarray=value - the maximum array length allowed +# +# Other patterns, from left to right, match the class or package name as +# returned from Class.getName. +# If the class is an array type, the class or package to be matched is the element type. +# Arrays of any number of dimensions are treated the same as the element type. +# For example, a pattern of "!example.Foo", rejects creation of any instance or +# array of example.Foo. +# +# If the pattern starts with "!", the status is REJECTED if the remaining pattern +# is matched; otherwise the status is ALLOWED if the pattern matches. +# If the pattern ends with ".**" it matches any class in the package and all subpackages. +# If the pattern ends with ".*" it matches any class in the package. +# If the pattern ends with "*", it matches any class with the pattern as a prefix. +# If the pattern is equal to the class name, it matches. +# Otherwise, the status is UNDECIDED. +# +#jdk.serialFilter=pattern;pattern + +# +# RMI Registry Serial Filter +# +# The filter pattern uses the same format as jdk.serialFilter. +# This filter can override the builtin filter if additional types need to be +# allowed or rejected from the RMI Registry. +# +#sun.rmi.registry.registryFilter=pattern;pattern + +# +# RMI Distributed Garbage Collector (DGC) Serial Filter +# +# The filter pattern uses the same format as jdk.serialFilter. +# This filter can override the builtin filter if additional types need to be +# allowed or rejected from the RMI DGC. +# +# The builtin DGC filter can approximately be represented as the filter pattern: +# +#sun.rmi.transport.dgcFilter=\ +# java.rmi.server.ObjID;\ +# java.rmi.server.UID;\ +# java.rmi.dgc.VMID;\ +# java.rmi.dgc.Lease;\ +# maxdepth=5;maxarray=10000 + diff --git a/src/IKVM.Image/ikvm/any/linux-arm64/lib/security/java.security b/src/IKVM.Image/ikvm/any/linux-arm64/lib/security/java.security index 12d1fd8efd..659f8a3e6b 100644 --- a/src/IKVM.Image/ikvm/any/linux-arm64/lib/security/java.security +++ b/src/IKVM.Image/ikvm/any/linux-arm64/lib/security/java.security @@ -209,6 +209,8 @@ package.access=sun.,\ com.sun.org.apache.xalan.internal.xsltc.trax.,\ com.sun.org.apache.xalan.internal.xsltc.util.,\ com.sun.org.apache.xml.internal.res.,\ + com.sun.org.apache.xml.internal.resolver.helpers.,\ + com.sun.org.apache.xml.internal.resolver.readers.,\ com.sun.org.apache.xml.internal.security.,\ com.sun.org.apache.xml.internal.serializer.utils.,\ com.sun.org.apache.xml.internal.utils.,\ @@ -256,6 +258,8 @@ package.definition=sun.,\ com.sun.org.apache.xalan.internal.xsltc.trax.,\ com.sun.org.apache.xalan.internal.xsltc.util.,\ com.sun.org.apache.xml.internal.res.,\ + com.sun.org.apache.xml.internal.resolver.helpers.,\ + com.sun.org.apache.xml.internal.resolver.readers.,\ com.sun.org.apache.xml.internal.security.,\ com.sun.org.apache.xml.internal.serializer.utils.,\ com.sun.org.apache.xml.internal.utils.,\ @@ -422,35 +426,37 @@ krb5.kdc.bad.policy = tryLast # describes the mechanism for disabling algorithms based on algorithm name # and/or key length. This includes algorithms used in certificates, as well # as revocation information such as CRLs and signed OCSP Responses. -# -# The syntax of the disabled algorithm string is described as this Java -# BNF-style: +# The syntax of the disabled algorithm string is described as follows: # DisabledAlgorithms: # " DisabledAlgorithm { , DisabledAlgorithm } " # # DisabledAlgorithm: -# AlgorithmName [Constraint] +# AlgorithmName [Constraint] { '&' Constraint } # # AlgorithmName: # (see below) # # Constraint: -# KeySizeConstraint +# KeySizeConstraint | CAConstraint | DenyAfterConstraint | +# UsageConstraint # # KeySizeConstraint: -# keySize Operator DecimalInteger +# keySize Operator KeyLength # # Operator: # <= | < | == | != | >= | > # -# DecimalInteger: -# DecimalDigits +# KeyLength: +# Integer value of the algorithm's key length in bits +# +# CAConstraint: +# jdkCA # -# DecimalDigits: -# DecimalDigit {DecimalDigit} +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD # -# DecimalDigit: one of -# 1 2 3 4 5 6 7 8 9 0 +# UsageConstraint: +# usage [TLSServer] [TLSClient] [SignedJAR] # # The "AlgorithmName" is the standard algorithm name of the disabled # algorithm. See "Java Cryptography Architecture Standard Algorithm Name @@ -464,15 +470,69 @@ krb5.kdc.bad.policy = tryLast # that rely on DSA, such as NONEwithDSA, SHA1withDSA. However, the assertion # will not disable algorithms related to "ECDSA". # -# A "Constraint" provides further guidance for the algorithm being specified. -# The "KeySizeConstraint" requires a key of a valid size range if the -# "AlgorithmName" is of a key algorithm. The "DecimalInteger" indicates the -# key size specified in number of bits. For example, "RSA keySize <= 1024" -# indicates that any RSA key with key size less than or equal to 1024 bits -# should be disabled, and "RSA keySize < 1024, RSA keySize > 2048" indicates -# that any RSA key with key size less than 1024 or greater than 2048 should -# be disabled. Note that the "KeySizeConstraint" only makes sense to key -# algorithms. +# A "Constraint" defines restrictions on the keys and/or certificates for +# a specified AlgorithmName: +# +# KeySizeConstraint: +# keySize Operator KeyLength +# The constraint requires a key of a valid size range if the +# "AlgorithmName" is of a key algorithm. The "KeyLength" indicates +# the key size specified in number of bits. For example, +# "RSA keySize <= 1024" indicates that any RSA key with key size less +# than or equal to 1024 bits should be disabled, and +# "RSA keySize < 1024, RSA keySize > 2048" indicates that any RSA key +# with key size less than 1024 or greater than 2048 should be disabled. +# This constraint is only used on algorithms that have a key size. +# +# CAConstraint: +# jdkCA +# This constraint prohibits the specified algorithm only if the +# algorithm is used in a certificate chain that terminates at a marked +# trust anchor in the lib/security/cacerts keystore. If the jdkCA +# constraint is not set, then all chains using the specified algorithm +# are restricted. jdkCA may only be used once in a DisabledAlgorithm +# expression. +# Example: To apply this constraint to SHA-1 certificates, include +# the following: "SHA1 jdkCA" +# +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD +# This constraint prohibits a certificate with the specified algorithm +# from being used after the date regardless of the certificate's +# validity. JAR files that are signed and timestamped before the +# constraint date with certificates containing the disabled algorithm +# will not be restricted. The date is processed in the UTC timezone. +# This constraint can only be used once in a DisabledAlgorithm +# expression. +# Example: To deny usage of RSA 2048 bit certificates after Feb 3 2020, +# use the following: "RSA keySize == 2048 & denyAfter 2020-02-03" +# +# UsageConstraint: +# usage [TLSServer] [TLSClient] [SignedJAR] +# This constraint prohibits the specified algorithm for +# a specified usage. This should be used when disabling an algorithm +# for all usages is not practical. 'TLSServer' restricts the algorithm +# in TLS server certificate chains when server authentication is +# performed. 'TLSClient' restricts the algorithm in TLS client +# certificate chains when client authentication is performed. +# 'SignedJAR' constrains use of certificates in signed jar files. +# The usage type follows the keyword and more than one usage type can +# be specified with a whitespace delimiter. +# Example: "SHA1 usage TLSServer TLSClient" +# +# When an algorithm must satisfy more than one constraint, it must be +# delimited by an ampersand '&'. For example, to restrict certificates in a +# chain that terminate at a distribution provided trust anchor and contain +# RSA keys that are less than or equal to 1024 bits, add the following +# constraint: "RSA keySize <= 1024 & jdkCA". +# +# All DisabledAlgorithms expressions are processed in the order defined in the +# property. This requires lower keysize constraints to be specified +# before larger keysize constraints of the same algorithm. For example: +# "RSA keySize < 1024 & jdkCA, RSA keySize < 2048". +# +# Note: The algorithm restrictions do not apply to trust anchors or +# self-signed certificates. # # Note: This property is currently used by Oracle's PKIX implementation. It # is not guaranteed to be examined and used by other implementations. @@ -481,8 +541,53 @@ krb5.kdc.bad.policy = tryLast # jdk.certpath.disabledAlgorithms=MD2, DSA, RSA keySize < 2048 # # -jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 +jdk.certpath.disabledAlgorithms=MD2, MD5, SHA1 jdkCA & usage TLSServer, \ + RSA keySize < 1024, DSA keySize < 1024, EC keySize < 224 + +# +# Algorithm restrictions for signed JAR files +# +# In some environments, certain algorithms or key lengths may be undesirable +# for signed JAR validation. For example, "MD2" is generally no longer +# considered to be a secure hash algorithm. This section describes the +# mechanism for disabling algorithms based on algorithm name and/or key length. +# JARs signed with any of the disabled algorithms or key sizes will be treated +# as unsigned. +# +# The syntax of the disabled algorithm string is described as follows: +# DisabledAlgorithms: +# " DisabledAlgorithm { , DisabledAlgorithm } " +# +# DisabledAlgorithm: +# AlgorithmName [Constraint] { '&' Constraint } +# +# AlgorithmName: +# (see below) +# +# Constraint: +# KeySizeConstraint | DenyAfterConstraint +# +# KeySizeConstraint: +# keySize Operator KeyLength +# +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD +# +# Operator: +# <= | < | == | != | >= | > +# +# KeyLength: +# Integer value of the algorithm's key length in bits +# +# Note: This property is currently used by the JDK Reference +# implementation. It is not guaranteed to be examined and used by other +# implementations. +# +# See "jdk.certpath.disabledAlgorithms" for syntax descriptions. +# +jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 +# # Algorithm restrictions for Secure Socket Layer/Transport Layer Security # (SSL/TLS) processing # @@ -504,12 +609,16 @@ jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 # See the specification of "jdk.certpath.disabledAlgorithms" for the # syntax of the disabled algorithm string. # -# Note: This property is currently used by Oracle's JSSE implementation. +# Note: The algorithm restrictions do not apply to trust anchors or +# self-signed certificates. +# +# Note: This property is currently used by the JDK Reference implementation. # It is not guaranteed to be examined and used by other implementations. # # Example: # jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048 -jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 +jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768, \ + EC keySize < 224 # Legacy algorithms for Secure Socket Layer/Transport Layer Security (SSL/TLS) # processing in JSSE implementation. @@ -523,7 +632,7 @@ jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 # During SSL/TLS security parameters negotiation, legacy algorithms will # not be negotiated unless there are no other candidates. # -# The syntax of the disabled algorithm string is described as this Java +# The syntax of the legacy algorithms string is described as this Java # BNF-style: # LegacyAlgorithms: # " LegacyAlgorithm { , LegacyAlgorithm } " @@ -553,7 +662,7 @@ jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 # See SSL/TLS specifications and "Java Cryptography Architecture Standard # Algorithm Name Documentation" for information about the algorithm names. # -# Note: This property is currently used by Oracle's JSSE implementation. +# Note: This property is currently used by the JDK Reference implementation. # It is not guaranteed to be examined and used by other implementations. # There is no guarantee the property will continue to exist or be of the # same syntax in future releases. @@ -566,7 +675,8 @@ jdk.tls.legacyAlgorithms= \ DHE_DSS_EXPORT, DHE_RSA_EXPORT, DH_anon_EXPORT, DH_DSS_EXPORT, \ DH_RSA_EXPORT, RSA_EXPORT, \ DH_anon, ECDH_anon, \ - RC4_128, RC4_40, DES_CBC, DES40_CBC + RC4_128, RC4_40, DES_CBC, DES40_CBC, \ + 3DES_EDE_CBC # The pre-defined default finite field Diffie-Hellman ephemeral (DHE) # parameters for Transport Layer Security (SSL/TLS/DTLS) processing. @@ -624,3 +734,178 @@ jdk.tls.legacyAlgorithms= \ # E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED \ # EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE65381 \ # FFFFFFFF FFFFFFFF, 2} + +# Cryptographic Jurisdiction Policy defaults +# +# Due to the import control restrictions of some countries, the default +# JCE policy files allow for strong but "limited" cryptographic key +# lengths to be used. If your country's cryptographic regulations allow, +# the "unlimited" strength policy files can be used instead, which contain +# no restrictions on cryptographic strengths. +# +# YOU ARE ADVISED TO CONSULT YOUR EXPORT/IMPORT CONTROL COUNSEL OR ATTORNEY +# TO DETERMINE THE EXACT REQUIREMENTS. +# +# (below) refers to the directory where the JRE was +# installed. It is determined based on whether you are running JCE +# on a JRE or a JRE contained within the Java Development Kit, or +# JDK(TM). The JDK contains the JRE, but at a different level in the +# file hierarchy. For example, if the JDK is installed in +# /home/user1/jdk1.8.0 on Unix or in C:\jdk1.8.0 on Windows, then +# is: +# +# /home/user1/jdk1.8.0/jre [Unix] +# C:\jdk1.8.0\jre [Windows] +# +# If on the other hand the JRE is installed in /home/user1/jre1.8.0 +# on Unix or in C:\jre1.8.0 on Windows, and the JDK is not +# installed, then is: +# +# /home/user1/jre1.8.0 [Unix] +# C:\jre1.8.0 [Windows] +# +# On Windows, for each JDK installation, there may be additional +# JREs installed under the "Program Files" directory. Please make +# sure that you install the unlimited strength policy JAR files +# for all JREs that you plan to use. +# +# The policy files are jar files organized into subdirectories of +# /lib/security/policy. Each directory contains a complete +# set of policy files. +# +# The "crypto.policy" Security property controls the directory selection, +# and thus the effective cryptographic policy. +# +# The default set of directories is: +# +# limited | unlimited +# +# however other directories can be created and configured. +# +# To support older JDK Update releases, the crypto.policy property +# is not defined by default. When the property is not defined, an +# update release binary aware of the new property will use the following +# logic to decide what crypto policy files get used : +# +# * If the US_export_policy.jar and local_policy.jar files are located +# in the (legacy) /lib/security directory, then the rules +# embedded in those jar files will be used. This helps preserve compatibility +# for users upgrading from an older installation. +# +# * If crypto.policy is not defined and no such jar files are present in +# the legacy locations, then the JDK will use the limited settings +# (equivalent to crypto.policy=limited) +# +# Please see the JCA documentation for additional information on these +# files and formats. +#crypto.policy=unlimited + +# +# The policy for the XML Signature secure validation mode. The mode is +# enabled by setting the property "org.jcp.xml.dsig.secureValidation" to +# true with the javax.xml.crypto.XMLCryptoContext.setProperty() method, +# or by running the code with a SecurityManager. +# +# Policy: +# Constraint {"," Constraint } +# Constraint: +# AlgConstraint | MaxTransformsConstraint | MaxReferencesConstraint | +# ReferenceUriSchemeConstraint | KeySizeConstraint | OtherConstraint +# AlgConstraint +# "disallowAlg" Uri +# MaxTransformsConstraint: +# "maxTransforms" Integer +# MaxReferencesConstraint: +# "maxReferences" Integer +# ReferenceUriSchemeConstraint: +# "disallowReferenceUriSchemes" String { String } +# KeySizeConstraint: +# "minKeySize" KeyAlg Integer +# OtherConstraint: +# "noDuplicateIds" | "noRetrievalMethodLoops" +# +# For AlgConstraint, Uri is the algorithm URI String that is not allowed. +# See the XML Signature Recommendation for more information on algorithm +# URI Identifiers. For KeySizeConstraint, KeyAlg is the standard algorithm +# name of the key type (ex: "RSA"). If the MaxTransformsConstraint, +# MaxReferencesConstraint or KeySizeConstraint (for the same key type) is +# specified more than once, only the last entry is enforced. +# +# Note: This property is currently used by the JDK Reference implementation. It +# is not guaranteed to be examined and used by other implementations. +# +jdk.xml.dsig.secureValidationPolicy=\ + disallowAlg http://www.w3.org/TR/1999/REC-xslt-19991116,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#rsa-md5,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#hmac-md5,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#md5,\ + maxTransforms 5,\ + maxReferences 30,\ + disallowReferenceUriSchemes file http https,\ + minKeySize RSA 1024,\ + minKeySize DSA 1024,\ + noDuplicateIds,\ + noRetrievalMethodLoops + +# +# Serialization process-wide filter +# +# A filter, if configured, is used by java.io.ObjectInputStream during +# deserialization to check the contents of the stream. +# A filter is configured as a sequence of patterns, each pattern is either +# matched against the name of a class in the stream or defines a limit. +# Patterns are separated by ";" (semicolon). +# Whitespace is significant and is considered part of the pattern. +# +# If a pattern includes a "=", it sets a limit. +# If a limit appears more than once the last value is used. +# Limits are checked before classes regardless of the order in the sequence of patterns. +# If any of the limits are exceeded, the filter status is REJECTED. +# +# maxdepth=value - the maximum depth of a graph +# maxrefs=value - the maximum number of internal references +# maxbytes=value - the maximum number of bytes in the input stream +# maxarray=value - the maximum array length allowed +# +# Other patterns, from left to right, match the class or package name as +# returned from Class.getName. +# If the class is an array type, the class or package to be matched is the element type. +# Arrays of any number of dimensions are treated the same as the element type. +# For example, a pattern of "!example.Foo", rejects creation of any instance or +# array of example.Foo. +# +# If the pattern starts with "!", the status is REJECTED if the remaining pattern +# is matched; otherwise the status is ALLOWED if the pattern matches. +# If the pattern ends with ".**" it matches any class in the package and all subpackages. +# If the pattern ends with ".*" it matches any class in the package. +# If the pattern ends with "*", it matches any class with the pattern as a prefix. +# If the pattern is equal to the class name, it matches. +# Otherwise, the status is UNDECIDED. +# +#jdk.serialFilter=pattern;pattern + +# +# RMI Registry Serial Filter +# +# The filter pattern uses the same format as jdk.serialFilter. +# This filter can override the builtin filter if additional types need to be +# allowed or rejected from the RMI Registry. +# +#sun.rmi.registry.registryFilter=pattern;pattern + +# +# RMI Distributed Garbage Collector (DGC) Serial Filter +# +# The filter pattern uses the same format as jdk.serialFilter. +# This filter can override the builtin filter if additional types need to be +# allowed or rejected from the RMI DGC. +# +# The builtin DGC filter can approximately be represented as the filter pattern: +# +#sun.rmi.transport.dgcFilter=\ +# java.rmi.server.ObjID;\ +# java.rmi.server.UID;\ +# java.rmi.dgc.VMID;\ +# java.rmi.dgc.Lease;\ +# maxdepth=5;maxarray=10000 + diff --git a/src/IKVM.Image/ikvm/any/linux-musl-arm/lib/security/java.security b/src/IKVM.Image/ikvm/any/linux-musl-arm/lib/security/java.security index 12d1fd8efd..659f8a3e6b 100644 --- a/src/IKVM.Image/ikvm/any/linux-musl-arm/lib/security/java.security +++ b/src/IKVM.Image/ikvm/any/linux-musl-arm/lib/security/java.security @@ -209,6 +209,8 @@ package.access=sun.,\ com.sun.org.apache.xalan.internal.xsltc.trax.,\ com.sun.org.apache.xalan.internal.xsltc.util.,\ com.sun.org.apache.xml.internal.res.,\ + com.sun.org.apache.xml.internal.resolver.helpers.,\ + com.sun.org.apache.xml.internal.resolver.readers.,\ com.sun.org.apache.xml.internal.security.,\ com.sun.org.apache.xml.internal.serializer.utils.,\ com.sun.org.apache.xml.internal.utils.,\ @@ -256,6 +258,8 @@ package.definition=sun.,\ com.sun.org.apache.xalan.internal.xsltc.trax.,\ com.sun.org.apache.xalan.internal.xsltc.util.,\ com.sun.org.apache.xml.internal.res.,\ + com.sun.org.apache.xml.internal.resolver.helpers.,\ + com.sun.org.apache.xml.internal.resolver.readers.,\ com.sun.org.apache.xml.internal.security.,\ com.sun.org.apache.xml.internal.serializer.utils.,\ com.sun.org.apache.xml.internal.utils.,\ @@ -422,35 +426,37 @@ krb5.kdc.bad.policy = tryLast # describes the mechanism for disabling algorithms based on algorithm name # and/or key length. This includes algorithms used in certificates, as well # as revocation information such as CRLs and signed OCSP Responses. -# -# The syntax of the disabled algorithm string is described as this Java -# BNF-style: +# The syntax of the disabled algorithm string is described as follows: # DisabledAlgorithms: # " DisabledAlgorithm { , DisabledAlgorithm } " # # DisabledAlgorithm: -# AlgorithmName [Constraint] +# AlgorithmName [Constraint] { '&' Constraint } # # AlgorithmName: # (see below) # # Constraint: -# KeySizeConstraint +# KeySizeConstraint | CAConstraint | DenyAfterConstraint | +# UsageConstraint # # KeySizeConstraint: -# keySize Operator DecimalInteger +# keySize Operator KeyLength # # Operator: # <= | < | == | != | >= | > # -# DecimalInteger: -# DecimalDigits +# KeyLength: +# Integer value of the algorithm's key length in bits +# +# CAConstraint: +# jdkCA # -# DecimalDigits: -# DecimalDigit {DecimalDigit} +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD # -# DecimalDigit: one of -# 1 2 3 4 5 6 7 8 9 0 +# UsageConstraint: +# usage [TLSServer] [TLSClient] [SignedJAR] # # The "AlgorithmName" is the standard algorithm name of the disabled # algorithm. See "Java Cryptography Architecture Standard Algorithm Name @@ -464,15 +470,69 @@ krb5.kdc.bad.policy = tryLast # that rely on DSA, such as NONEwithDSA, SHA1withDSA. However, the assertion # will not disable algorithms related to "ECDSA". # -# A "Constraint" provides further guidance for the algorithm being specified. -# The "KeySizeConstraint" requires a key of a valid size range if the -# "AlgorithmName" is of a key algorithm. The "DecimalInteger" indicates the -# key size specified in number of bits. For example, "RSA keySize <= 1024" -# indicates that any RSA key with key size less than or equal to 1024 bits -# should be disabled, and "RSA keySize < 1024, RSA keySize > 2048" indicates -# that any RSA key with key size less than 1024 or greater than 2048 should -# be disabled. Note that the "KeySizeConstraint" only makes sense to key -# algorithms. +# A "Constraint" defines restrictions on the keys and/or certificates for +# a specified AlgorithmName: +# +# KeySizeConstraint: +# keySize Operator KeyLength +# The constraint requires a key of a valid size range if the +# "AlgorithmName" is of a key algorithm. The "KeyLength" indicates +# the key size specified in number of bits. For example, +# "RSA keySize <= 1024" indicates that any RSA key with key size less +# than or equal to 1024 bits should be disabled, and +# "RSA keySize < 1024, RSA keySize > 2048" indicates that any RSA key +# with key size less than 1024 or greater than 2048 should be disabled. +# This constraint is only used on algorithms that have a key size. +# +# CAConstraint: +# jdkCA +# This constraint prohibits the specified algorithm only if the +# algorithm is used in a certificate chain that terminates at a marked +# trust anchor in the lib/security/cacerts keystore. If the jdkCA +# constraint is not set, then all chains using the specified algorithm +# are restricted. jdkCA may only be used once in a DisabledAlgorithm +# expression. +# Example: To apply this constraint to SHA-1 certificates, include +# the following: "SHA1 jdkCA" +# +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD +# This constraint prohibits a certificate with the specified algorithm +# from being used after the date regardless of the certificate's +# validity. JAR files that are signed and timestamped before the +# constraint date with certificates containing the disabled algorithm +# will not be restricted. The date is processed in the UTC timezone. +# This constraint can only be used once in a DisabledAlgorithm +# expression. +# Example: To deny usage of RSA 2048 bit certificates after Feb 3 2020, +# use the following: "RSA keySize == 2048 & denyAfter 2020-02-03" +# +# UsageConstraint: +# usage [TLSServer] [TLSClient] [SignedJAR] +# This constraint prohibits the specified algorithm for +# a specified usage. This should be used when disabling an algorithm +# for all usages is not practical. 'TLSServer' restricts the algorithm +# in TLS server certificate chains when server authentication is +# performed. 'TLSClient' restricts the algorithm in TLS client +# certificate chains when client authentication is performed. +# 'SignedJAR' constrains use of certificates in signed jar files. +# The usage type follows the keyword and more than one usage type can +# be specified with a whitespace delimiter. +# Example: "SHA1 usage TLSServer TLSClient" +# +# When an algorithm must satisfy more than one constraint, it must be +# delimited by an ampersand '&'. For example, to restrict certificates in a +# chain that terminate at a distribution provided trust anchor and contain +# RSA keys that are less than or equal to 1024 bits, add the following +# constraint: "RSA keySize <= 1024 & jdkCA". +# +# All DisabledAlgorithms expressions are processed in the order defined in the +# property. This requires lower keysize constraints to be specified +# before larger keysize constraints of the same algorithm. For example: +# "RSA keySize < 1024 & jdkCA, RSA keySize < 2048". +# +# Note: The algorithm restrictions do not apply to trust anchors or +# self-signed certificates. # # Note: This property is currently used by Oracle's PKIX implementation. It # is not guaranteed to be examined and used by other implementations. @@ -481,8 +541,53 @@ krb5.kdc.bad.policy = tryLast # jdk.certpath.disabledAlgorithms=MD2, DSA, RSA keySize < 2048 # # -jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 +jdk.certpath.disabledAlgorithms=MD2, MD5, SHA1 jdkCA & usage TLSServer, \ + RSA keySize < 1024, DSA keySize < 1024, EC keySize < 224 + +# +# Algorithm restrictions for signed JAR files +# +# In some environments, certain algorithms or key lengths may be undesirable +# for signed JAR validation. For example, "MD2" is generally no longer +# considered to be a secure hash algorithm. This section describes the +# mechanism for disabling algorithms based on algorithm name and/or key length. +# JARs signed with any of the disabled algorithms or key sizes will be treated +# as unsigned. +# +# The syntax of the disabled algorithm string is described as follows: +# DisabledAlgorithms: +# " DisabledAlgorithm { , DisabledAlgorithm } " +# +# DisabledAlgorithm: +# AlgorithmName [Constraint] { '&' Constraint } +# +# AlgorithmName: +# (see below) +# +# Constraint: +# KeySizeConstraint | DenyAfterConstraint +# +# KeySizeConstraint: +# keySize Operator KeyLength +# +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD +# +# Operator: +# <= | < | == | != | >= | > +# +# KeyLength: +# Integer value of the algorithm's key length in bits +# +# Note: This property is currently used by the JDK Reference +# implementation. It is not guaranteed to be examined and used by other +# implementations. +# +# See "jdk.certpath.disabledAlgorithms" for syntax descriptions. +# +jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 +# # Algorithm restrictions for Secure Socket Layer/Transport Layer Security # (SSL/TLS) processing # @@ -504,12 +609,16 @@ jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 # See the specification of "jdk.certpath.disabledAlgorithms" for the # syntax of the disabled algorithm string. # -# Note: This property is currently used by Oracle's JSSE implementation. +# Note: The algorithm restrictions do not apply to trust anchors or +# self-signed certificates. +# +# Note: This property is currently used by the JDK Reference implementation. # It is not guaranteed to be examined and used by other implementations. # # Example: # jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048 -jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 +jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768, \ + EC keySize < 224 # Legacy algorithms for Secure Socket Layer/Transport Layer Security (SSL/TLS) # processing in JSSE implementation. @@ -523,7 +632,7 @@ jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 # During SSL/TLS security parameters negotiation, legacy algorithms will # not be negotiated unless there are no other candidates. # -# The syntax of the disabled algorithm string is described as this Java +# The syntax of the legacy algorithms string is described as this Java # BNF-style: # LegacyAlgorithms: # " LegacyAlgorithm { , LegacyAlgorithm } " @@ -553,7 +662,7 @@ jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 # See SSL/TLS specifications and "Java Cryptography Architecture Standard # Algorithm Name Documentation" for information about the algorithm names. # -# Note: This property is currently used by Oracle's JSSE implementation. +# Note: This property is currently used by the JDK Reference implementation. # It is not guaranteed to be examined and used by other implementations. # There is no guarantee the property will continue to exist or be of the # same syntax in future releases. @@ -566,7 +675,8 @@ jdk.tls.legacyAlgorithms= \ DHE_DSS_EXPORT, DHE_RSA_EXPORT, DH_anon_EXPORT, DH_DSS_EXPORT, \ DH_RSA_EXPORT, RSA_EXPORT, \ DH_anon, ECDH_anon, \ - RC4_128, RC4_40, DES_CBC, DES40_CBC + RC4_128, RC4_40, DES_CBC, DES40_CBC, \ + 3DES_EDE_CBC # The pre-defined default finite field Diffie-Hellman ephemeral (DHE) # parameters for Transport Layer Security (SSL/TLS/DTLS) processing. @@ -624,3 +734,178 @@ jdk.tls.legacyAlgorithms= \ # E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED \ # EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE65381 \ # FFFFFFFF FFFFFFFF, 2} + +# Cryptographic Jurisdiction Policy defaults +# +# Due to the import control restrictions of some countries, the default +# JCE policy files allow for strong but "limited" cryptographic key +# lengths to be used. If your country's cryptographic regulations allow, +# the "unlimited" strength policy files can be used instead, which contain +# no restrictions on cryptographic strengths. +# +# YOU ARE ADVISED TO CONSULT YOUR EXPORT/IMPORT CONTROL COUNSEL OR ATTORNEY +# TO DETERMINE THE EXACT REQUIREMENTS. +# +# (below) refers to the directory where the JRE was +# installed. It is determined based on whether you are running JCE +# on a JRE or a JRE contained within the Java Development Kit, or +# JDK(TM). The JDK contains the JRE, but at a different level in the +# file hierarchy. For example, if the JDK is installed in +# /home/user1/jdk1.8.0 on Unix or in C:\jdk1.8.0 on Windows, then +# is: +# +# /home/user1/jdk1.8.0/jre [Unix] +# C:\jdk1.8.0\jre [Windows] +# +# If on the other hand the JRE is installed in /home/user1/jre1.8.0 +# on Unix or in C:\jre1.8.0 on Windows, and the JDK is not +# installed, then is: +# +# /home/user1/jre1.8.0 [Unix] +# C:\jre1.8.0 [Windows] +# +# On Windows, for each JDK installation, there may be additional +# JREs installed under the "Program Files" directory. Please make +# sure that you install the unlimited strength policy JAR files +# for all JREs that you plan to use. +# +# The policy files are jar files organized into subdirectories of +# /lib/security/policy. Each directory contains a complete +# set of policy files. +# +# The "crypto.policy" Security property controls the directory selection, +# and thus the effective cryptographic policy. +# +# The default set of directories is: +# +# limited | unlimited +# +# however other directories can be created and configured. +# +# To support older JDK Update releases, the crypto.policy property +# is not defined by default. When the property is not defined, an +# update release binary aware of the new property will use the following +# logic to decide what crypto policy files get used : +# +# * If the US_export_policy.jar and local_policy.jar files are located +# in the (legacy) /lib/security directory, then the rules +# embedded in those jar files will be used. This helps preserve compatibility +# for users upgrading from an older installation. +# +# * If crypto.policy is not defined and no such jar files are present in +# the legacy locations, then the JDK will use the limited settings +# (equivalent to crypto.policy=limited) +# +# Please see the JCA documentation for additional information on these +# files and formats. +#crypto.policy=unlimited + +# +# The policy for the XML Signature secure validation mode. The mode is +# enabled by setting the property "org.jcp.xml.dsig.secureValidation" to +# true with the javax.xml.crypto.XMLCryptoContext.setProperty() method, +# or by running the code with a SecurityManager. +# +# Policy: +# Constraint {"," Constraint } +# Constraint: +# AlgConstraint | MaxTransformsConstraint | MaxReferencesConstraint | +# ReferenceUriSchemeConstraint | KeySizeConstraint | OtherConstraint +# AlgConstraint +# "disallowAlg" Uri +# MaxTransformsConstraint: +# "maxTransforms" Integer +# MaxReferencesConstraint: +# "maxReferences" Integer +# ReferenceUriSchemeConstraint: +# "disallowReferenceUriSchemes" String { String } +# KeySizeConstraint: +# "minKeySize" KeyAlg Integer +# OtherConstraint: +# "noDuplicateIds" | "noRetrievalMethodLoops" +# +# For AlgConstraint, Uri is the algorithm URI String that is not allowed. +# See the XML Signature Recommendation for more information on algorithm +# URI Identifiers. For KeySizeConstraint, KeyAlg is the standard algorithm +# name of the key type (ex: "RSA"). If the MaxTransformsConstraint, +# MaxReferencesConstraint or KeySizeConstraint (for the same key type) is +# specified more than once, only the last entry is enforced. +# +# Note: This property is currently used by the JDK Reference implementation. It +# is not guaranteed to be examined and used by other implementations. +# +jdk.xml.dsig.secureValidationPolicy=\ + disallowAlg http://www.w3.org/TR/1999/REC-xslt-19991116,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#rsa-md5,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#hmac-md5,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#md5,\ + maxTransforms 5,\ + maxReferences 30,\ + disallowReferenceUriSchemes file http https,\ + minKeySize RSA 1024,\ + minKeySize DSA 1024,\ + noDuplicateIds,\ + noRetrievalMethodLoops + +# +# Serialization process-wide filter +# +# A filter, if configured, is used by java.io.ObjectInputStream during +# deserialization to check the contents of the stream. +# A filter is configured as a sequence of patterns, each pattern is either +# matched against the name of a class in the stream or defines a limit. +# Patterns are separated by ";" (semicolon). +# Whitespace is significant and is considered part of the pattern. +# +# If a pattern includes a "=", it sets a limit. +# If a limit appears more than once the last value is used. +# Limits are checked before classes regardless of the order in the sequence of patterns. +# If any of the limits are exceeded, the filter status is REJECTED. +# +# maxdepth=value - the maximum depth of a graph +# maxrefs=value - the maximum number of internal references +# maxbytes=value - the maximum number of bytes in the input stream +# maxarray=value - the maximum array length allowed +# +# Other patterns, from left to right, match the class or package name as +# returned from Class.getName. +# If the class is an array type, the class or package to be matched is the element type. +# Arrays of any number of dimensions are treated the same as the element type. +# For example, a pattern of "!example.Foo", rejects creation of any instance or +# array of example.Foo. +# +# If the pattern starts with "!", the status is REJECTED if the remaining pattern +# is matched; otherwise the status is ALLOWED if the pattern matches. +# If the pattern ends with ".**" it matches any class in the package and all subpackages. +# If the pattern ends with ".*" it matches any class in the package. +# If the pattern ends with "*", it matches any class with the pattern as a prefix. +# If the pattern is equal to the class name, it matches. +# Otherwise, the status is UNDECIDED. +# +#jdk.serialFilter=pattern;pattern + +# +# RMI Registry Serial Filter +# +# The filter pattern uses the same format as jdk.serialFilter. +# This filter can override the builtin filter if additional types need to be +# allowed or rejected from the RMI Registry. +# +#sun.rmi.registry.registryFilter=pattern;pattern + +# +# RMI Distributed Garbage Collector (DGC) Serial Filter +# +# The filter pattern uses the same format as jdk.serialFilter. +# This filter can override the builtin filter if additional types need to be +# allowed or rejected from the RMI DGC. +# +# The builtin DGC filter can approximately be represented as the filter pattern: +# +#sun.rmi.transport.dgcFilter=\ +# java.rmi.server.ObjID;\ +# java.rmi.server.UID;\ +# java.rmi.dgc.VMID;\ +# java.rmi.dgc.Lease;\ +# maxdepth=5;maxarray=10000 + diff --git a/src/IKVM.Image/ikvm/any/linux-musl-arm64/lib/security/java.security b/src/IKVM.Image/ikvm/any/linux-musl-arm64/lib/security/java.security index 12d1fd8efd..659f8a3e6b 100644 --- a/src/IKVM.Image/ikvm/any/linux-musl-arm64/lib/security/java.security +++ b/src/IKVM.Image/ikvm/any/linux-musl-arm64/lib/security/java.security @@ -209,6 +209,8 @@ package.access=sun.,\ com.sun.org.apache.xalan.internal.xsltc.trax.,\ com.sun.org.apache.xalan.internal.xsltc.util.,\ com.sun.org.apache.xml.internal.res.,\ + com.sun.org.apache.xml.internal.resolver.helpers.,\ + com.sun.org.apache.xml.internal.resolver.readers.,\ com.sun.org.apache.xml.internal.security.,\ com.sun.org.apache.xml.internal.serializer.utils.,\ com.sun.org.apache.xml.internal.utils.,\ @@ -256,6 +258,8 @@ package.definition=sun.,\ com.sun.org.apache.xalan.internal.xsltc.trax.,\ com.sun.org.apache.xalan.internal.xsltc.util.,\ com.sun.org.apache.xml.internal.res.,\ + com.sun.org.apache.xml.internal.resolver.helpers.,\ + com.sun.org.apache.xml.internal.resolver.readers.,\ com.sun.org.apache.xml.internal.security.,\ com.sun.org.apache.xml.internal.serializer.utils.,\ com.sun.org.apache.xml.internal.utils.,\ @@ -422,35 +426,37 @@ krb5.kdc.bad.policy = tryLast # describes the mechanism for disabling algorithms based on algorithm name # and/or key length. This includes algorithms used in certificates, as well # as revocation information such as CRLs and signed OCSP Responses. -# -# The syntax of the disabled algorithm string is described as this Java -# BNF-style: +# The syntax of the disabled algorithm string is described as follows: # DisabledAlgorithms: # " DisabledAlgorithm { , DisabledAlgorithm } " # # DisabledAlgorithm: -# AlgorithmName [Constraint] +# AlgorithmName [Constraint] { '&' Constraint } # # AlgorithmName: # (see below) # # Constraint: -# KeySizeConstraint +# KeySizeConstraint | CAConstraint | DenyAfterConstraint | +# UsageConstraint # # KeySizeConstraint: -# keySize Operator DecimalInteger +# keySize Operator KeyLength # # Operator: # <= | < | == | != | >= | > # -# DecimalInteger: -# DecimalDigits +# KeyLength: +# Integer value of the algorithm's key length in bits +# +# CAConstraint: +# jdkCA # -# DecimalDigits: -# DecimalDigit {DecimalDigit} +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD # -# DecimalDigit: one of -# 1 2 3 4 5 6 7 8 9 0 +# UsageConstraint: +# usage [TLSServer] [TLSClient] [SignedJAR] # # The "AlgorithmName" is the standard algorithm name of the disabled # algorithm. See "Java Cryptography Architecture Standard Algorithm Name @@ -464,15 +470,69 @@ krb5.kdc.bad.policy = tryLast # that rely on DSA, such as NONEwithDSA, SHA1withDSA. However, the assertion # will not disable algorithms related to "ECDSA". # -# A "Constraint" provides further guidance for the algorithm being specified. -# The "KeySizeConstraint" requires a key of a valid size range if the -# "AlgorithmName" is of a key algorithm. The "DecimalInteger" indicates the -# key size specified in number of bits. For example, "RSA keySize <= 1024" -# indicates that any RSA key with key size less than or equal to 1024 bits -# should be disabled, and "RSA keySize < 1024, RSA keySize > 2048" indicates -# that any RSA key with key size less than 1024 or greater than 2048 should -# be disabled. Note that the "KeySizeConstraint" only makes sense to key -# algorithms. +# A "Constraint" defines restrictions on the keys and/or certificates for +# a specified AlgorithmName: +# +# KeySizeConstraint: +# keySize Operator KeyLength +# The constraint requires a key of a valid size range if the +# "AlgorithmName" is of a key algorithm. The "KeyLength" indicates +# the key size specified in number of bits. For example, +# "RSA keySize <= 1024" indicates that any RSA key with key size less +# than or equal to 1024 bits should be disabled, and +# "RSA keySize < 1024, RSA keySize > 2048" indicates that any RSA key +# with key size less than 1024 or greater than 2048 should be disabled. +# This constraint is only used on algorithms that have a key size. +# +# CAConstraint: +# jdkCA +# This constraint prohibits the specified algorithm only if the +# algorithm is used in a certificate chain that terminates at a marked +# trust anchor in the lib/security/cacerts keystore. If the jdkCA +# constraint is not set, then all chains using the specified algorithm +# are restricted. jdkCA may only be used once in a DisabledAlgorithm +# expression. +# Example: To apply this constraint to SHA-1 certificates, include +# the following: "SHA1 jdkCA" +# +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD +# This constraint prohibits a certificate with the specified algorithm +# from being used after the date regardless of the certificate's +# validity. JAR files that are signed and timestamped before the +# constraint date with certificates containing the disabled algorithm +# will not be restricted. The date is processed in the UTC timezone. +# This constraint can only be used once in a DisabledAlgorithm +# expression. +# Example: To deny usage of RSA 2048 bit certificates after Feb 3 2020, +# use the following: "RSA keySize == 2048 & denyAfter 2020-02-03" +# +# UsageConstraint: +# usage [TLSServer] [TLSClient] [SignedJAR] +# This constraint prohibits the specified algorithm for +# a specified usage. This should be used when disabling an algorithm +# for all usages is not practical. 'TLSServer' restricts the algorithm +# in TLS server certificate chains when server authentication is +# performed. 'TLSClient' restricts the algorithm in TLS client +# certificate chains when client authentication is performed. +# 'SignedJAR' constrains use of certificates in signed jar files. +# The usage type follows the keyword and more than one usage type can +# be specified with a whitespace delimiter. +# Example: "SHA1 usage TLSServer TLSClient" +# +# When an algorithm must satisfy more than one constraint, it must be +# delimited by an ampersand '&'. For example, to restrict certificates in a +# chain that terminate at a distribution provided trust anchor and contain +# RSA keys that are less than or equal to 1024 bits, add the following +# constraint: "RSA keySize <= 1024 & jdkCA". +# +# All DisabledAlgorithms expressions are processed in the order defined in the +# property. This requires lower keysize constraints to be specified +# before larger keysize constraints of the same algorithm. For example: +# "RSA keySize < 1024 & jdkCA, RSA keySize < 2048". +# +# Note: The algorithm restrictions do not apply to trust anchors or +# self-signed certificates. # # Note: This property is currently used by Oracle's PKIX implementation. It # is not guaranteed to be examined and used by other implementations. @@ -481,8 +541,53 @@ krb5.kdc.bad.policy = tryLast # jdk.certpath.disabledAlgorithms=MD2, DSA, RSA keySize < 2048 # # -jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 +jdk.certpath.disabledAlgorithms=MD2, MD5, SHA1 jdkCA & usage TLSServer, \ + RSA keySize < 1024, DSA keySize < 1024, EC keySize < 224 + +# +# Algorithm restrictions for signed JAR files +# +# In some environments, certain algorithms or key lengths may be undesirable +# for signed JAR validation. For example, "MD2" is generally no longer +# considered to be a secure hash algorithm. This section describes the +# mechanism for disabling algorithms based on algorithm name and/or key length. +# JARs signed with any of the disabled algorithms or key sizes will be treated +# as unsigned. +# +# The syntax of the disabled algorithm string is described as follows: +# DisabledAlgorithms: +# " DisabledAlgorithm { , DisabledAlgorithm } " +# +# DisabledAlgorithm: +# AlgorithmName [Constraint] { '&' Constraint } +# +# AlgorithmName: +# (see below) +# +# Constraint: +# KeySizeConstraint | DenyAfterConstraint +# +# KeySizeConstraint: +# keySize Operator KeyLength +# +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD +# +# Operator: +# <= | < | == | != | >= | > +# +# KeyLength: +# Integer value of the algorithm's key length in bits +# +# Note: This property is currently used by the JDK Reference +# implementation. It is not guaranteed to be examined and used by other +# implementations. +# +# See "jdk.certpath.disabledAlgorithms" for syntax descriptions. +# +jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 +# # Algorithm restrictions for Secure Socket Layer/Transport Layer Security # (SSL/TLS) processing # @@ -504,12 +609,16 @@ jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 # See the specification of "jdk.certpath.disabledAlgorithms" for the # syntax of the disabled algorithm string. # -# Note: This property is currently used by Oracle's JSSE implementation. +# Note: The algorithm restrictions do not apply to trust anchors or +# self-signed certificates. +# +# Note: This property is currently used by the JDK Reference implementation. # It is not guaranteed to be examined and used by other implementations. # # Example: # jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048 -jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 +jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768, \ + EC keySize < 224 # Legacy algorithms for Secure Socket Layer/Transport Layer Security (SSL/TLS) # processing in JSSE implementation. @@ -523,7 +632,7 @@ jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 # During SSL/TLS security parameters negotiation, legacy algorithms will # not be negotiated unless there are no other candidates. # -# The syntax of the disabled algorithm string is described as this Java +# The syntax of the legacy algorithms string is described as this Java # BNF-style: # LegacyAlgorithms: # " LegacyAlgorithm { , LegacyAlgorithm } " @@ -553,7 +662,7 @@ jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 # See SSL/TLS specifications and "Java Cryptography Architecture Standard # Algorithm Name Documentation" for information about the algorithm names. # -# Note: This property is currently used by Oracle's JSSE implementation. +# Note: This property is currently used by the JDK Reference implementation. # It is not guaranteed to be examined and used by other implementations. # There is no guarantee the property will continue to exist or be of the # same syntax in future releases. @@ -566,7 +675,8 @@ jdk.tls.legacyAlgorithms= \ DHE_DSS_EXPORT, DHE_RSA_EXPORT, DH_anon_EXPORT, DH_DSS_EXPORT, \ DH_RSA_EXPORT, RSA_EXPORT, \ DH_anon, ECDH_anon, \ - RC4_128, RC4_40, DES_CBC, DES40_CBC + RC4_128, RC4_40, DES_CBC, DES40_CBC, \ + 3DES_EDE_CBC # The pre-defined default finite field Diffie-Hellman ephemeral (DHE) # parameters for Transport Layer Security (SSL/TLS/DTLS) processing. @@ -624,3 +734,178 @@ jdk.tls.legacyAlgorithms= \ # E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED \ # EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE65381 \ # FFFFFFFF FFFFFFFF, 2} + +# Cryptographic Jurisdiction Policy defaults +# +# Due to the import control restrictions of some countries, the default +# JCE policy files allow for strong but "limited" cryptographic key +# lengths to be used. If your country's cryptographic regulations allow, +# the "unlimited" strength policy files can be used instead, which contain +# no restrictions on cryptographic strengths. +# +# YOU ARE ADVISED TO CONSULT YOUR EXPORT/IMPORT CONTROL COUNSEL OR ATTORNEY +# TO DETERMINE THE EXACT REQUIREMENTS. +# +# (below) refers to the directory where the JRE was +# installed. It is determined based on whether you are running JCE +# on a JRE or a JRE contained within the Java Development Kit, or +# JDK(TM). The JDK contains the JRE, but at a different level in the +# file hierarchy. For example, if the JDK is installed in +# /home/user1/jdk1.8.0 on Unix or in C:\jdk1.8.0 on Windows, then +# is: +# +# /home/user1/jdk1.8.0/jre [Unix] +# C:\jdk1.8.0\jre [Windows] +# +# If on the other hand the JRE is installed in /home/user1/jre1.8.0 +# on Unix or in C:\jre1.8.0 on Windows, and the JDK is not +# installed, then is: +# +# /home/user1/jre1.8.0 [Unix] +# C:\jre1.8.0 [Windows] +# +# On Windows, for each JDK installation, there may be additional +# JREs installed under the "Program Files" directory. Please make +# sure that you install the unlimited strength policy JAR files +# for all JREs that you plan to use. +# +# The policy files are jar files organized into subdirectories of +# /lib/security/policy. Each directory contains a complete +# set of policy files. +# +# The "crypto.policy" Security property controls the directory selection, +# and thus the effective cryptographic policy. +# +# The default set of directories is: +# +# limited | unlimited +# +# however other directories can be created and configured. +# +# To support older JDK Update releases, the crypto.policy property +# is not defined by default. When the property is not defined, an +# update release binary aware of the new property will use the following +# logic to decide what crypto policy files get used : +# +# * If the US_export_policy.jar and local_policy.jar files are located +# in the (legacy) /lib/security directory, then the rules +# embedded in those jar files will be used. This helps preserve compatibility +# for users upgrading from an older installation. +# +# * If crypto.policy is not defined and no such jar files are present in +# the legacy locations, then the JDK will use the limited settings +# (equivalent to crypto.policy=limited) +# +# Please see the JCA documentation for additional information on these +# files and formats. +#crypto.policy=unlimited + +# +# The policy for the XML Signature secure validation mode. The mode is +# enabled by setting the property "org.jcp.xml.dsig.secureValidation" to +# true with the javax.xml.crypto.XMLCryptoContext.setProperty() method, +# or by running the code with a SecurityManager. +# +# Policy: +# Constraint {"," Constraint } +# Constraint: +# AlgConstraint | MaxTransformsConstraint | MaxReferencesConstraint | +# ReferenceUriSchemeConstraint | KeySizeConstraint | OtherConstraint +# AlgConstraint +# "disallowAlg" Uri +# MaxTransformsConstraint: +# "maxTransforms" Integer +# MaxReferencesConstraint: +# "maxReferences" Integer +# ReferenceUriSchemeConstraint: +# "disallowReferenceUriSchemes" String { String } +# KeySizeConstraint: +# "minKeySize" KeyAlg Integer +# OtherConstraint: +# "noDuplicateIds" | "noRetrievalMethodLoops" +# +# For AlgConstraint, Uri is the algorithm URI String that is not allowed. +# See the XML Signature Recommendation for more information on algorithm +# URI Identifiers. For KeySizeConstraint, KeyAlg is the standard algorithm +# name of the key type (ex: "RSA"). If the MaxTransformsConstraint, +# MaxReferencesConstraint or KeySizeConstraint (for the same key type) is +# specified more than once, only the last entry is enforced. +# +# Note: This property is currently used by the JDK Reference implementation. It +# is not guaranteed to be examined and used by other implementations. +# +jdk.xml.dsig.secureValidationPolicy=\ + disallowAlg http://www.w3.org/TR/1999/REC-xslt-19991116,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#rsa-md5,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#hmac-md5,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#md5,\ + maxTransforms 5,\ + maxReferences 30,\ + disallowReferenceUriSchemes file http https,\ + minKeySize RSA 1024,\ + minKeySize DSA 1024,\ + noDuplicateIds,\ + noRetrievalMethodLoops + +# +# Serialization process-wide filter +# +# A filter, if configured, is used by java.io.ObjectInputStream during +# deserialization to check the contents of the stream. +# A filter is configured as a sequence of patterns, each pattern is either +# matched against the name of a class in the stream or defines a limit. +# Patterns are separated by ";" (semicolon). +# Whitespace is significant and is considered part of the pattern. +# +# If a pattern includes a "=", it sets a limit. +# If a limit appears more than once the last value is used. +# Limits are checked before classes regardless of the order in the sequence of patterns. +# If any of the limits are exceeded, the filter status is REJECTED. +# +# maxdepth=value - the maximum depth of a graph +# maxrefs=value - the maximum number of internal references +# maxbytes=value - the maximum number of bytes in the input stream +# maxarray=value - the maximum array length allowed +# +# Other patterns, from left to right, match the class or package name as +# returned from Class.getName. +# If the class is an array type, the class or package to be matched is the element type. +# Arrays of any number of dimensions are treated the same as the element type. +# For example, a pattern of "!example.Foo", rejects creation of any instance or +# array of example.Foo. +# +# If the pattern starts with "!", the status is REJECTED if the remaining pattern +# is matched; otherwise the status is ALLOWED if the pattern matches. +# If the pattern ends with ".**" it matches any class in the package and all subpackages. +# If the pattern ends with ".*" it matches any class in the package. +# If the pattern ends with "*", it matches any class with the pattern as a prefix. +# If the pattern is equal to the class name, it matches. +# Otherwise, the status is UNDECIDED. +# +#jdk.serialFilter=pattern;pattern + +# +# RMI Registry Serial Filter +# +# The filter pattern uses the same format as jdk.serialFilter. +# This filter can override the builtin filter if additional types need to be +# allowed or rejected from the RMI Registry. +# +#sun.rmi.registry.registryFilter=pattern;pattern + +# +# RMI Distributed Garbage Collector (DGC) Serial Filter +# +# The filter pattern uses the same format as jdk.serialFilter. +# This filter can override the builtin filter if additional types need to be +# allowed or rejected from the RMI DGC. +# +# The builtin DGC filter can approximately be represented as the filter pattern: +# +#sun.rmi.transport.dgcFilter=\ +# java.rmi.server.ObjID;\ +# java.rmi.server.UID;\ +# java.rmi.dgc.VMID;\ +# java.rmi.dgc.Lease;\ +# maxdepth=5;maxarray=10000 + diff --git a/src/IKVM.Image/ikvm/any/linux-musl-x64/lib/security/java.security b/src/IKVM.Image/ikvm/any/linux-musl-x64/lib/security/java.security index 12d1fd8efd..659f8a3e6b 100644 --- a/src/IKVM.Image/ikvm/any/linux-musl-x64/lib/security/java.security +++ b/src/IKVM.Image/ikvm/any/linux-musl-x64/lib/security/java.security @@ -209,6 +209,8 @@ package.access=sun.,\ com.sun.org.apache.xalan.internal.xsltc.trax.,\ com.sun.org.apache.xalan.internal.xsltc.util.,\ com.sun.org.apache.xml.internal.res.,\ + com.sun.org.apache.xml.internal.resolver.helpers.,\ + com.sun.org.apache.xml.internal.resolver.readers.,\ com.sun.org.apache.xml.internal.security.,\ com.sun.org.apache.xml.internal.serializer.utils.,\ com.sun.org.apache.xml.internal.utils.,\ @@ -256,6 +258,8 @@ package.definition=sun.,\ com.sun.org.apache.xalan.internal.xsltc.trax.,\ com.sun.org.apache.xalan.internal.xsltc.util.,\ com.sun.org.apache.xml.internal.res.,\ + com.sun.org.apache.xml.internal.resolver.helpers.,\ + com.sun.org.apache.xml.internal.resolver.readers.,\ com.sun.org.apache.xml.internal.security.,\ com.sun.org.apache.xml.internal.serializer.utils.,\ com.sun.org.apache.xml.internal.utils.,\ @@ -422,35 +426,37 @@ krb5.kdc.bad.policy = tryLast # describes the mechanism for disabling algorithms based on algorithm name # and/or key length. This includes algorithms used in certificates, as well # as revocation information such as CRLs and signed OCSP Responses. -# -# The syntax of the disabled algorithm string is described as this Java -# BNF-style: +# The syntax of the disabled algorithm string is described as follows: # DisabledAlgorithms: # " DisabledAlgorithm { , DisabledAlgorithm } " # # DisabledAlgorithm: -# AlgorithmName [Constraint] +# AlgorithmName [Constraint] { '&' Constraint } # # AlgorithmName: # (see below) # # Constraint: -# KeySizeConstraint +# KeySizeConstraint | CAConstraint | DenyAfterConstraint | +# UsageConstraint # # KeySizeConstraint: -# keySize Operator DecimalInteger +# keySize Operator KeyLength # # Operator: # <= | < | == | != | >= | > # -# DecimalInteger: -# DecimalDigits +# KeyLength: +# Integer value of the algorithm's key length in bits +# +# CAConstraint: +# jdkCA # -# DecimalDigits: -# DecimalDigit {DecimalDigit} +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD # -# DecimalDigit: one of -# 1 2 3 4 5 6 7 8 9 0 +# UsageConstraint: +# usage [TLSServer] [TLSClient] [SignedJAR] # # The "AlgorithmName" is the standard algorithm name of the disabled # algorithm. See "Java Cryptography Architecture Standard Algorithm Name @@ -464,15 +470,69 @@ krb5.kdc.bad.policy = tryLast # that rely on DSA, such as NONEwithDSA, SHA1withDSA. However, the assertion # will not disable algorithms related to "ECDSA". # -# A "Constraint" provides further guidance for the algorithm being specified. -# The "KeySizeConstraint" requires a key of a valid size range if the -# "AlgorithmName" is of a key algorithm. The "DecimalInteger" indicates the -# key size specified in number of bits. For example, "RSA keySize <= 1024" -# indicates that any RSA key with key size less than or equal to 1024 bits -# should be disabled, and "RSA keySize < 1024, RSA keySize > 2048" indicates -# that any RSA key with key size less than 1024 or greater than 2048 should -# be disabled. Note that the "KeySizeConstraint" only makes sense to key -# algorithms. +# A "Constraint" defines restrictions on the keys and/or certificates for +# a specified AlgorithmName: +# +# KeySizeConstraint: +# keySize Operator KeyLength +# The constraint requires a key of a valid size range if the +# "AlgorithmName" is of a key algorithm. The "KeyLength" indicates +# the key size specified in number of bits. For example, +# "RSA keySize <= 1024" indicates that any RSA key with key size less +# than or equal to 1024 bits should be disabled, and +# "RSA keySize < 1024, RSA keySize > 2048" indicates that any RSA key +# with key size less than 1024 or greater than 2048 should be disabled. +# This constraint is only used on algorithms that have a key size. +# +# CAConstraint: +# jdkCA +# This constraint prohibits the specified algorithm only if the +# algorithm is used in a certificate chain that terminates at a marked +# trust anchor in the lib/security/cacerts keystore. If the jdkCA +# constraint is not set, then all chains using the specified algorithm +# are restricted. jdkCA may only be used once in a DisabledAlgorithm +# expression. +# Example: To apply this constraint to SHA-1 certificates, include +# the following: "SHA1 jdkCA" +# +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD +# This constraint prohibits a certificate with the specified algorithm +# from being used after the date regardless of the certificate's +# validity. JAR files that are signed and timestamped before the +# constraint date with certificates containing the disabled algorithm +# will not be restricted. The date is processed in the UTC timezone. +# This constraint can only be used once in a DisabledAlgorithm +# expression. +# Example: To deny usage of RSA 2048 bit certificates after Feb 3 2020, +# use the following: "RSA keySize == 2048 & denyAfter 2020-02-03" +# +# UsageConstraint: +# usage [TLSServer] [TLSClient] [SignedJAR] +# This constraint prohibits the specified algorithm for +# a specified usage. This should be used when disabling an algorithm +# for all usages is not practical. 'TLSServer' restricts the algorithm +# in TLS server certificate chains when server authentication is +# performed. 'TLSClient' restricts the algorithm in TLS client +# certificate chains when client authentication is performed. +# 'SignedJAR' constrains use of certificates in signed jar files. +# The usage type follows the keyword and more than one usage type can +# be specified with a whitespace delimiter. +# Example: "SHA1 usage TLSServer TLSClient" +# +# When an algorithm must satisfy more than one constraint, it must be +# delimited by an ampersand '&'. For example, to restrict certificates in a +# chain that terminate at a distribution provided trust anchor and contain +# RSA keys that are less than or equal to 1024 bits, add the following +# constraint: "RSA keySize <= 1024 & jdkCA". +# +# All DisabledAlgorithms expressions are processed in the order defined in the +# property. This requires lower keysize constraints to be specified +# before larger keysize constraints of the same algorithm. For example: +# "RSA keySize < 1024 & jdkCA, RSA keySize < 2048". +# +# Note: The algorithm restrictions do not apply to trust anchors or +# self-signed certificates. # # Note: This property is currently used by Oracle's PKIX implementation. It # is not guaranteed to be examined and used by other implementations. @@ -481,8 +541,53 @@ krb5.kdc.bad.policy = tryLast # jdk.certpath.disabledAlgorithms=MD2, DSA, RSA keySize < 2048 # # -jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 +jdk.certpath.disabledAlgorithms=MD2, MD5, SHA1 jdkCA & usage TLSServer, \ + RSA keySize < 1024, DSA keySize < 1024, EC keySize < 224 + +# +# Algorithm restrictions for signed JAR files +# +# In some environments, certain algorithms or key lengths may be undesirable +# for signed JAR validation. For example, "MD2" is generally no longer +# considered to be a secure hash algorithm. This section describes the +# mechanism for disabling algorithms based on algorithm name and/or key length. +# JARs signed with any of the disabled algorithms or key sizes will be treated +# as unsigned. +# +# The syntax of the disabled algorithm string is described as follows: +# DisabledAlgorithms: +# " DisabledAlgorithm { , DisabledAlgorithm } " +# +# DisabledAlgorithm: +# AlgorithmName [Constraint] { '&' Constraint } +# +# AlgorithmName: +# (see below) +# +# Constraint: +# KeySizeConstraint | DenyAfterConstraint +# +# KeySizeConstraint: +# keySize Operator KeyLength +# +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD +# +# Operator: +# <= | < | == | != | >= | > +# +# KeyLength: +# Integer value of the algorithm's key length in bits +# +# Note: This property is currently used by the JDK Reference +# implementation. It is not guaranteed to be examined and used by other +# implementations. +# +# See "jdk.certpath.disabledAlgorithms" for syntax descriptions. +# +jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 +# # Algorithm restrictions for Secure Socket Layer/Transport Layer Security # (SSL/TLS) processing # @@ -504,12 +609,16 @@ jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 # See the specification of "jdk.certpath.disabledAlgorithms" for the # syntax of the disabled algorithm string. # -# Note: This property is currently used by Oracle's JSSE implementation. +# Note: The algorithm restrictions do not apply to trust anchors or +# self-signed certificates. +# +# Note: This property is currently used by the JDK Reference implementation. # It is not guaranteed to be examined and used by other implementations. # # Example: # jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048 -jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 +jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768, \ + EC keySize < 224 # Legacy algorithms for Secure Socket Layer/Transport Layer Security (SSL/TLS) # processing in JSSE implementation. @@ -523,7 +632,7 @@ jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 # During SSL/TLS security parameters negotiation, legacy algorithms will # not be negotiated unless there are no other candidates. # -# The syntax of the disabled algorithm string is described as this Java +# The syntax of the legacy algorithms string is described as this Java # BNF-style: # LegacyAlgorithms: # " LegacyAlgorithm { , LegacyAlgorithm } " @@ -553,7 +662,7 @@ jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 # See SSL/TLS specifications and "Java Cryptography Architecture Standard # Algorithm Name Documentation" for information about the algorithm names. # -# Note: This property is currently used by Oracle's JSSE implementation. +# Note: This property is currently used by the JDK Reference implementation. # It is not guaranteed to be examined and used by other implementations. # There is no guarantee the property will continue to exist or be of the # same syntax in future releases. @@ -566,7 +675,8 @@ jdk.tls.legacyAlgorithms= \ DHE_DSS_EXPORT, DHE_RSA_EXPORT, DH_anon_EXPORT, DH_DSS_EXPORT, \ DH_RSA_EXPORT, RSA_EXPORT, \ DH_anon, ECDH_anon, \ - RC4_128, RC4_40, DES_CBC, DES40_CBC + RC4_128, RC4_40, DES_CBC, DES40_CBC, \ + 3DES_EDE_CBC # The pre-defined default finite field Diffie-Hellman ephemeral (DHE) # parameters for Transport Layer Security (SSL/TLS/DTLS) processing. @@ -624,3 +734,178 @@ jdk.tls.legacyAlgorithms= \ # E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED \ # EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE65381 \ # FFFFFFFF FFFFFFFF, 2} + +# Cryptographic Jurisdiction Policy defaults +# +# Due to the import control restrictions of some countries, the default +# JCE policy files allow for strong but "limited" cryptographic key +# lengths to be used. If your country's cryptographic regulations allow, +# the "unlimited" strength policy files can be used instead, which contain +# no restrictions on cryptographic strengths. +# +# YOU ARE ADVISED TO CONSULT YOUR EXPORT/IMPORT CONTROL COUNSEL OR ATTORNEY +# TO DETERMINE THE EXACT REQUIREMENTS. +# +# (below) refers to the directory where the JRE was +# installed. It is determined based on whether you are running JCE +# on a JRE or a JRE contained within the Java Development Kit, or +# JDK(TM). The JDK contains the JRE, but at a different level in the +# file hierarchy. For example, if the JDK is installed in +# /home/user1/jdk1.8.0 on Unix or in C:\jdk1.8.0 on Windows, then +# is: +# +# /home/user1/jdk1.8.0/jre [Unix] +# C:\jdk1.8.0\jre [Windows] +# +# If on the other hand the JRE is installed in /home/user1/jre1.8.0 +# on Unix or in C:\jre1.8.0 on Windows, and the JDK is not +# installed, then is: +# +# /home/user1/jre1.8.0 [Unix] +# C:\jre1.8.0 [Windows] +# +# On Windows, for each JDK installation, there may be additional +# JREs installed under the "Program Files" directory. Please make +# sure that you install the unlimited strength policy JAR files +# for all JREs that you plan to use. +# +# The policy files are jar files organized into subdirectories of +# /lib/security/policy. Each directory contains a complete +# set of policy files. +# +# The "crypto.policy" Security property controls the directory selection, +# and thus the effective cryptographic policy. +# +# The default set of directories is: +# +# limited | unlimited +# +# however other directories can be created and configured. +# +# To support older JDK Update releases, the crypto.policy property +# is not defined by default. When the property is not defined, an +# update release binary aware of the new property will use the following +# logic to decide what crypto policy files get used : +# +# * If the US_export_policy.jar and local_policy.jar files are located +# in the (legacy) /lib/security directory, then the rules +# embedded in those jar files will be used. This helps preserve compatibility +# for users upgrading from an older installation. +# +# * If crypto.policy is not defined and no such jar files are present in +# the legacy locations, then the JDK will use the limited settings +# (equivalent to crypto.policy=limited) +# +# Please see the JCA documentation for additional information on these +# files and formats. +#crypto.policy=unlimited + +# +# The policy for the XML Signature secure validation mode. The mode is +# enabled by setting the property "org.jcp.xml.dsig.secureValidation" to +# true with the javax.xml.crypto.XMLCryptoContext.setProperty() method, +# or by running the code with a SecurityManager. +# +# Policy: +# Constraint {"," Constraint } +# Constraint: +# AlgConstraint | MaxTransformsConstraint | MaxReferencesConstraint | +# ReferenceUriSchemeConstraint | KeySizeConstraint | OtherConstraint +# AlgConstraint +# "disallowAlg" Uri +# MaxTransformsConstraint: +# "maxTransforms" Integer +# MaxReferencesConstraint: +# "maxReferences" Integer +# ReferenceUriSchemeConstraint: +# "disallowReferenceUriSchemes" String { String } +# KeySizeConstraint: +# "minKeySize" KeyAlg Integer +# OtherConstraint: +# "noDuplicateIds" | "noRetrievalMethodLoops" +# +# For AlgConstraint, Uri is the algorithm URI String that is not allowed. +# See the XML Signature Recommendation for more information on algorithm +# URI Identifiers. For KeySizeConstraint, KeyAlg is the standard algorithm +# name of the key type (ex: "RSA"). If the MaxTransformsConstraint, +# MaxReferencesConstraint or KeySizeConstraint (for the same key type) is +# specified more than once, only the last entry is enforced. +# +# Note: This property is currently used by the JDK Reference implementation. It +# is not guaranteed to be examined and used by other implementations. +# +jdk.xml.dsig.secureValidationPolicy=\ + disallowAlg http://www.w3.org/TR/1999/REC-xslt-19991116,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#rsa-md5,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#hmac-md5,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#md5,\ + maxTransforms 5,\ + maxReferences 30,\ + disallowReferenceUriSchemes file http https,\ + minKeySize RSA 1024,\ + minKeySize DSA 1024,\ + noDuplicateIds,\ + noRetrievalMethodLoops + +# +# Serialization process-wide filter +# +# A filter, if configured, is used by java.io.ObjectInputStream during +# deserialization to check the contents of the stream. +# A filter is configured as a sequence of patterns, each pattern is either +# matched against the name of a class in the stream or defines a limit. +# Patterns are separated by ";" (semicolon). +# Whitespace is significant and is considered part of the pattern. +# +# If a pattern includes a "=", it sets a limit. +# If a limit appears more than once the last value is used. +# Limits are checked before classes regardless of the order in the sequence of patterns. +# If any of the limits are exceeded, the filter status is REJECTED. +# +# maxdepth=value - the maximum depth of a graph +# maxrefs=value - the maximum number of internal references +# maxbytes=value - the maximum number of bytes in the input stream +# maxarray=value - the maximum array length allowed +# +# Other patterns, from left to right, match the class or package name as +# returned from Class.getName. +# If the class is an array type, the class or package to be matched is the element type. +# Arrays of any number of dimensions are treated the same as the element type. +# For example, a pattern of "!example.Foo", rejects creation of any instance or +# array of example.Foo. +# +# If the pattern starts with "!", the status is REJECTED if the remaining pattern +# is matched; otherwise the status is ALLOWED if the pattern matches. +# If the pattern ends with ".**" it matches any class in the package and all subpackages. +# If the pattern ends with ".*" it matches any class in the package. +# If the pattern ends with "*", it matches any class with the pattern as a prefix. +# If the pattern is equal to the class name, it matches. +# Otherwise, the status is UNDECIDED. +# +#jdk.serialFilter=pattern;pattern + +# +# RMI Registry Serial Filter +# +# The filter pattern uses the same format as jdk.serialFilter. +# This filter can override the builtin filter if additional types need to be +# allowed or rejected from the RMI Registry. +# +#sun.rmi.registry.registryFilter=pattern;pattern + +# +# RMI Distributed Garbage Collector (DGC) Serial Filter +# +# The filter pattern uses the same format as jdk.serialFilter. +# This filter can override the builtin filter if additional types need to be +# allowed or rejected from the RMI DGC. +# +# The builtin DGC filter can approximately be represented as the filter pattern: +# +#sun.rmi.transport.dgcFilter=\ +# java.rmi.server.ObjID;\ +# java.rmi.server.UID;\ +# java.rmi.dgc.VMID;\ +# java.rmi.dgc.Lease;\ +# maxdepth=5;maxarray=10000 + diff --git a/src/IKVM.Image/ikvm/any/linux-x64/lib/security/java.security b/src/IKVM.Image/ikvm/any/linux-x64/lib/security/java.security index 12d1fd8efd..659f8a3e6b 100644 --- a/src/IKVM.Image/ikvm/any/linux-x64/lib/security/java.security +++ b/src/IKVM.Image/ikvm/any/linux-x64/lib/security/java.security @@ -209,6 +209,8 @@ package.access=sun.,\ com.sun.org.apache.xalan.internal.xsltc.trax.,\ com.sun.org.apache.xalan.internal.xsltc.util.,\ com.sun.org.apache.xml.internal.res.,\ + com.sun.org.apache.xml.internal.resolver.helpers.,\ + com.sun.org.apache.xml.internal.resolver.readers.,\ com.sun.org.apache.xml.internal.security.,\ com.sun.org.apache.xml.internal.serializer.utils.,\ com.sun.org.apache.xml.internal.utils.,\ @@ -256,6 +258,8 @@ package.definition=sun.,\ com.sun.org.apache.xalan.internal.xsltc.trax.,\ com.sun.org.apache.xalan.internal.xsltc.util.,\ com.sun.org.apache.xml.internal.res.,\ + com.sun.org.apache.xml.internal.resolver.helpers.,\ + com.sun.org.apache.xml.internal.resolver.readers.,\ com.sun.org.apache.xml.internal.security.,\ com.sun.org.apache.xml.internal.serializer.utils.,\ com.sun.org.apache.xml.internal.utils.,\ @@ -422,35 +426,37 @@ krb5.kdc.bad.policy = tryLast # describes the mechanism for disabling algorithms based on algorithm name # and/or key length. This includes algorithms used in certificates, as well # as revocation information such as CRLs and signed OCSP Responses. -# -# The syntax of the disabled algorithm string is described as this Java -# BNF-style: +# The syntax of the disabled algorithm string is described as follows: # DisabledAlgorithms: # " DisabledAlgorithm { , DisabledAlgorithm } " # # DisabledAlgorithm: -# AlgorithmName [Constraint] +# AlgorithmName [Constraint] { '&' Constraint } # # AlgorithmName: # (see below) # # Constraint: -# KeySizeConstraint +# KeySizeConstraint | CAConstraint | DenyAfterConstraint | +# UsageConstraint # # KeySizeConstraint: -# keySize Operator DecimalInteger +# keySize Operator KeyLength # # Operator: # <= | < | == | != | >= | > # -# DecimalInteger: -# DecimalDigits +# KeyLength: +# Integer value of the algorithm's key length in bits +# +# CAConstraint: +# jdkCA # -# DecimalDigits: -# DecimalDigit {DecimalDigit} +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD # -# DecimalDigit: one of -# 1 2 3 4 5 6 7 8 9 0 +# UsageConstraint: +# usage [TLSServer] [TLSClient] [SignedJAR] # # The "AlgorithmName" is the standard algorithm name of the disabled # algorithm. See "Java Cryptography Architecture Standard Algorithm Name @@ -464,15 +470,69 @@ krb5.kdc.bad.policy = tryLast # that rely on DSA, such as NONEwithDSA, SHA1withDSA. However, the assertion # will not disable algorithms related to "ECDSA". # -# A "Constraint" provides further guidance for the algorithm being specified. -# The "KeySizeConstraint" requires a key of a valid size range if the -# "AlgorithmName" is of a key algorithm. The "DecimalInteger" indicates the -# key size specified in number of bits. For example, "RSA keySize <= 1024" -# indicates that any RSA key with key size less than or equal to 1024 bits -# should be disabled, and "RSA keySize < 1024, RSA keySize > 2048" indicates -# that any RSA key with key size less than 1024 or greater than 2048 should -# be disabled. Note that the "KeySizeConstraint" only makes sense to key -# algorithms. +# A "Constraint" defines restrictions on the keys and/or certificates for +# a specified AlgorithmName: +# +# KeySizeConstraint: +# keySize Operator KeyLength +# The constraint requires a key of a valid size range if the +# "AlgorithmName" is of a key algorithm. The "KeyLength" indicates +# the key size specified in number of bits. For example, +# "RSA keySize <= 1024" indicates that any RSA key with key size less +# than or equal to 1024 bits should be disabled, and +# "RSA keySize < 1024, RSA keySize > 2048" indicates that any RSA key +# with key size less than 1024 or greater than 2048 should be disabled. +# This constraint is only used on algorithms that have a key size. +# +# CAConstraint: +# jdkCA +# This constraint prohibits the specified algorithm only if the +# algorithm is used in a certificate chain that terminates at a marked +# trust anchor in the lib/security/cacerts keystore. If the jdkCA +# constraint is not set, then all chains using the specified algorithm +# are restricted. jdkCA may only be used once in a DisabledAlgorithm +# expression. +# Example: To apply this constraint to SHA-1 certificates, include +# the following: "SHA1 jdkCA" +# +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD +# This constraint prohibits a certificate with the specified algorithm +# from being used after the date regardless of the certificate's +# validity. JAR files that are signed and timestamped before the +# constraint date with certificates containing the disabled algorithm +# will not be restricted. The date is processed in the UTC timezone. +# This constraint can only be used once in a DisabledAlgorithm +# expression. +# Example: To deny usage of RSA 2048 bit certificates after Feb 3 2020, +# use the following: "RSA keySize == 2048 & denyAfter 2020-02-03" +# +# UsageConstraint: +# usage [TLSServer] [TLSClient] [SignedJAR] +# This constraint prohibits the specified algorithm for +# a specified usage. This should be used when disabling an algorithm +# for all usages is not practical. 'TLSServer' restricts the algorithm +# in TLS server certificate chains when server authentication is +# performed. 'TLSClient' restricts the algorithm in TLS client +# certificate chains when client authentication is performed. +# 'SignedJAR' constrains use of certificates in signed jar files. +# The usage type follows the keyword and more than one usage type can +# be specified with a whitespace delimiter. +# Example: "SHA1 usage TLSServer TLSClient" +# +# When an algorithm must satisfy more than one constraint, it must be +# delimited by an ampersand '&'. For example, to restrict certificates in a +# chain that terminate at a distribution provided trust anchor and contain +# RSA keys that are less than or equal to 1024 bits, add the following +# constraint: "RSA keySize <= 1024 & jdkCA". +# +# All DisabledAlgorithms expressions are processed in the order defined in the +# property. This requires lower keysize constraints to be specified +# before larger keysize constraints of the same algorithm. For example: +# "RSA keySize < 1024 & jdkCA, RSA keySize < 2048". +# +# Note: The algorithm restrictions do not apply to trust anchors or +# self-signed certificates. # # Note: This property is currently used by Oracle's PKIX implementation. It # is not guaranteed to be examined and used by other implementations. @@ -481,8 +541,53 @@ krb5.kdc.bad.policy = tryLast # jdk.certpath.disabledAlgorithms=MD2, DSA, RSA keySize < 2048 # # -jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 +jdk.certpath.disabledAlgorithms=MD2, MD5, SHA1 jdkCA & usage TLSServer, \ + RSA keySize < 1024, DSA keySize < 1024, EC keySize < 224 + +# +# Algorithm restrictions for signed JAR files +# +# In some environments, certain algorithms or key lengths may be undesirable +# for signed JAR validation. For example, "MD2" is generally no longer +# considered to be a secure hash algorithm. This section describes the +# mechanism for disabling algorithms based on algorithm name and/or key length. +# JARs signed with any of the disabled algorithms or key sizes will be treated +# as unsigned. +# +# The syntax of the disabled algorithm string is described as follows: +# DisabledAlgorithms: +# " DisabledAlgorithm { , DisabledAlgorithm } " +# +# DisabledAlgorithm: +# AlgorithmName [Constraint] { '&' Constraint } +# +# AlgorithmName: +# (see below) +# +# Constraint: +# KeySizeConstraint | DenyAfterConstraint +# +# KeySizeConstraint: +# keySize Operator KeyLength +# +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD +# +# Operator: +# <= | < | == | != | >= | > +# +# KeyLength: +# Integer value of the algorithm's key length in bits +# +# Note: This property is currently used by the JDK Reference +# implementation. It is not guaranteed to be examined and used by other +# implementations. +# +# See "jdk.certpath.disabledAlgorithms" for syntax descriptions. +# +jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 +# # Algorithm restrictions for Secure Socket Layer/Transport Layer Security # (SSL/TLS) processing # @@ -504,12 +609,16 @@ jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 # See the specification of "jdk.certpath.disabledAlgorithms" for the # syntax of the disabled algorithm string. # -# Note: This property is currently used by Oracle's JSSE implementation. +# Note: The algorithm restrictions do not apply to trust anchors or +# self-signed certificates. +# +# Note: This property is currently used by the JDK Reference implementation. # It is not guaranteed to be examined and used by other implementations. # # Example: # jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048 -jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 +jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768, \ + EC keySize < 224 # Legacy algorithms for Secure Socket Layer/Transport Layer Security (SSL/TLS) # processing in JSSE implementation. @@ -523,7 +632,7 @@ jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 # During SSL/TLS security parameters negotiation, legacy algorithms will # not be negotiated unless there are no other candidates. # -# The syntax of the disabled algorithm string is described as this Java +# The syntax of the legacy algorithms string is described as this Java # BNF-style: # LegacyAlgorithms: # " LegacyAlgorithm { , LegacyAlgorithm } " @@ -553,7 +662,7 @@ jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 # See SSL/TLS specifications and "Java Cryptography Architecture Standard # Algorithm Name Documentation" for information about the algorithm names. # -# Note: This property is currently used by Oracle's JSSE implementation. +# Note: This property is currently used by the JDK Reference implementation. # It is not guaranteed to be examined and used by other implementations. # There is no guarantee the property will continue to exist or be of the # same syntax in future releases. @@ -566,7 +675,8 @@ jdk.tls.legacyAlgorithms= \ DHE_DSS_EXPORT, DHE_RSA_EXPORT, DH_anon_EXPORT, DH_DSS_EXPORT, \ DH_RSA_EXPORT, RSA_EXPORT, \ DH_anon, ECDH_anon, \ - RC4_128, RC4_40, DES_CBC, DES40_CBC + RC4_128, RC4_40, DES_CBC, DES40_CBC, \ + 3DES_EDE_CBC # The pre-defined default finite field Diffie-Hellman ephemeral (DHE) # parameters for Transport Layer Security (SSL/TLS/DTLS) processing. @@ -624,3 +734,178 @@ jdk.tls.legacyAlgorithms= \ # E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED \ # EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE65381 \ # FFFFFFFF FFFFFFFF, 2} + +# Cryptographic Jurisdiction Policy defaults +# +# Due to the import control restrictions of some countries, the default +# JCE policy files allow for strong but "limited" cryptographic key +# lengths to be used. If your country's cryptographic regulations allow, +# the "unlimited" strength policy files can be used instead, which contain +# no restrictions on cryptographic strengths. +# +# YOU ARE ADVISED TO CONSULT YOUR EXPORT/IMPORT CONTROL COUNSEL OR ATTORNEY +# TO DETERMINE THE EXACT REQUIREMENTS. +# +# (below) refers to the directory where the JRE was +# installed. It is determined based on whether you are running JCE +# on a JRE or a JRE contained within the Java Development Kit, or +# JDK(TM). The JDK contains the JRE, but at a different level in the +# file hierarchy. For example, if the JDK is installed in +# /home/user1/jdk1.8.0 on Unix or in C:\jdk1.8.0 on Windows, then +# is: +# +# /home/user1/jdk1.8.0/jre [Unix] +# C:\jdk1.8.0\jre [Windows] +# +# If on the other hand the JRE is installed in /home/user1/jre1.8.0 +# on Unix or in C:\jre1.8.0 on Windows, and the JDK is not +# installed, then is: +# +# /home/user1/jre1.8.0 [Unix] +# C:\jre1.8.0 [Windows] +# +# On Windows, for each JDK installation, there may be additional +# JREs installed under the "Program Files" directory. Please make +# sure that you install the unlimited strength policy JAR files +# for all JREs that you plan to use. +# +# The policy files are jar files organized into subdirectories of +# /lib/security/policy. Each directory contains a complete +# set of policy files. +# +# The "crypto.policy" Security property controls the directory selection, +# and thus the effective cryptographic policy. +# +# The default set of directories is: +# +# limited | unlimited +# +# however other directories can be created and configured. +# +# To support older JDK Update releases, the crypto.policy property +# is not defined by default. When the property is not defined, an +# update release binary aware of the new property will use the following +# logic to decide what crypto policy files get used : +# +# * If the US_export_policy.jar and local_policy.jar files are located +# in the (legacy) /lib/security directory, then the rules +# embedded in those jar files will be used. This helps preserve compatibility +# for users upgrading from an older installation. +# +# * If crypto.policy is not defined and no such jar files are present in +# the legacy locations, then the JDK will use the limited settings +# (equivalent to crypto.policy=limited) +# +# Please see the JCA documentation for additional information on these +# files and formats. +#crypto.policy=unlimited + +# +# The policy for the XML Signature secure validation mode. The mode is +# enabled by setting the property "org.jcp.xml.dsig.secureValidation" to +# true with the javax.xml.crypto.XMLCryptoContext.setProperty() method, +# or by running the code with a SecurityManager. +# +# Policy: +# Constraint {"," Constraint } +# Constraint: +# AlgConstraint | MaxTransformsConstraint | MaxReferencesConstraint | +# ReferenceUriSchemeConstraint | KeySizeConstraint | OtherConstraint +# AlgConstraint +# "disallowAlg" Uri +# MaxTransformsConstraint: +# "maxTransforms" Integer +# MaxReferencesConstraint: +# "maxReferences" Integer +# ReferenceUriSchemeConstraint: +# "disallowReferenceUriSchemes" String { String } +# KeySizeConstraint: +# "minKeySize" KeyAlg Integer +# OtherConstraint: +# "noDuplicateIds" | "noRetrievalMethodLoops" +# +# For AlgConstraint, Uri is the algorithm URI String that is not allowed. +# See the XML Signature Recommendation for more information on algorithm +# URI Identifiers. For KeySizeConstraint, KeyAlg is the standard algorithm +# name of the key type (ex: "RSA"). If the MaxTransformsConstraint, +# MaxReferencesConstraint or KeySizeConstraint (for the same key type) is +# specified more than once, only the last entry is enforced. +# +# Note: This property is currently used by the JDK Reference implementation. It +# is not guaranteed to be examined and used by other implementations. +# +jdk.xml.dsig.secureValidationPolicy=\ + disallowAlg http://www.w3.org/TR/1999/REC-xslt-19991116,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#rsa-md5,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#hmac-md5,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#md5,\ + maxTransforms 5,\ + maxReferences 30,\ + disallowReferenceUriSchemes file http https,\ + minKeySize RSA 1024,\ + minKeySize DSA 1024,\ + noDuplicateIds,\ + noRetrievalMethodLoops + +# +# Serialization process-wide filter +# +# A filter, if configured, is used by java.io.ObjectInputStream during +# deserialization to check the contents of the stream. +# A filter is configured as a sequence of patterns, each pattern is either +# matched against the name of a class in the stream or defines a limit. +# Patterns are separated by ";" (semicolon). +# Whitespace is significant and is considered part of the pattern. +# +# If a pattern includes a "=", it sets a limit. +# If a limit appears more than once the last value is used. +# Limits are checked before classes regardless of the order in the sequence of patterns. +# If any of the limits are exceeded, the filter status is REJECTED. +# +# maxdepth=value - the maximum depth of a graph +# maxrefs=value - the maximum number of internal references +# maxbytes=value - the maximum number of bytes in the input stream +# maxarray=value - the maximum array length allowed +# +# Other patterns, from left to right, match the class or package name as +# returned from Class.getName. +# If the class is an array type, the class or package to be matched is the element type. +# Arrays of any number of dimensions are treated the same as the element type. +# For example, a pattern of "!example.Foo", rejects creation of any instance or +# array of example.Foo. +# +# If the pattern starts with "!", the status is REJECTED if the remaining pattern +# is matched; otherwise the status is ALLOWED if the pattern matches. +# If the pattern ends with ".**" it matches any class in the package and all subpackages. +# If the pattern ends with ".*" it matches any class in the package. +# If the pattern ends with "*", it matches any class with the pattern as a prefix. +# If the pattern is equal to the class name, it matches. +# Otherwise, the status is UNDECIDED. +# +#jdk.serialFilter=pattern;pattern + +# +# RMI Registry Serial Filter +# +# The filter pattern uses the same format as jdk.serialFilter. +# This filter can override the builtin filter if additional types need to be +# allowed or rejected from the RMI Registry. +# +#sun.rmi.registry.registryFilter=pattern;pattern + +# +# RMI Distributed Garbage Collector (DGC) Serial Filter +# +# The filter pattern uses the same format as jdk.serialFilter. +# This filter can override the builtin filter if additional types need to be +# allowed or rejected from the RMI DGC. +# +# The builtin DGC filter can approximately be represented as the filter pattern: +# +#sun.rmi.transport.dgcFilter=\ +# java.rmi.server.ObjID;\ +# java.rmi.server.UID;\ +# java.rmi.dgc.VMID;\ +# java.rmi.dgc.Lease;\ +# maxdepth=5;maxarray=10000 + diff --git a/src/IKVM.Image/ikvm/any/osx-x64/lib/security/java.security b/src/IKVM.Image/ikvm/any/osx-x64/lib/security/java.security index 0d6c53ed22..22dc0d2d1a 100644 --- a/src/IKVM.Image/ikvm/any/osx-x64/lib/security/java.security +++ b/src/IKVM.Image/ikvm/any/osx-x64/lib/security/java.security @@ -223,7 +223,7 @@ package.access=sun.,\ jdk.nashorn.internal.,\ jdk.nashorn.tools.,\ com.sun.activation.registries.,\ - com.sun.java.accessibility. + apple. # # List of comma-separated packages that start with or equal this string @@ -273,7 +273,7 @@ package.definition=sun.,\ jdk.nashorn.internal.,\ jdk.nashorn.tools.,\ com.sun.activation.registries.,\ - com.sun.java.accessibility. + apple. # # Determines whether this properties file can be appended to diff --git a/src/IKVM.Image/ikvm/any/win7-x64/lib/security/java.security b/src/IKVM.Image/ikvm/any/win7-x64/lib/security/java.security index 12d1fd8efd..0d6c53ed22 100644 --- a/src/IKVM.Image/ikvm/any/win7-x64/lib/security/java.security +++ b/src/IKVM.Image/ikvm/any/win7-x64/lib/security/java.security @@ -209,6 +209,8 @@ package.access=sun.,\ com.sun.org.apache.xalan.internal.xsltc.trax.,\ com.sun.org.apache.xalan.internal.xsltc.util.,\ com.sun.org.apache.xml.internal.res.,\ + com.sun.org.apache.xml.internal.resolver.helpers.,\ + com.sun.org.apache.xml.internal.resolver.readers.,\ com.sun.org.apache.xml.internal.security.,\ com.sun.org.apache.xml.internal.serializer.utils.,\ com.sun.org.apache.xml.internal.utils.,\ @@ -220,7 +222,8 @@ package.access=sun.,\ jdk.internal.,\ jdk.nashorn.internal.,\ jdk.nashorn.tools.,\ - com.sun.activation.registries. + com.sun.activation.registries.,\ + com.sun.java.accessibility. # # List of comma-separated packages that start with or equal this string @@ -256,6 +259,8 @@ package.definition=sun.,\ com.sun.org.apache.xalan.internal.xsltc.trax.,\ com.sun.org.apache.xalan.internal.xsltc.util.,\ com.sun.org.apache.xml.internal.res.,\ + com.sun.org.apache.xml.internal.resolver.helpers.,\ + com.sun.org.apache.xml.internal.resolver.readers.,\ com.sun.org.apache.xml.internal.security.,\ com.sun.org.apache.xml.internal.serializer.utils.,\ com.sun.org.apache.xml.internal.utils.,\ @@ -267,7 +272,8 @@ package.definition=sun.,\ jdk.internal.,\ jdk.nashorn.internal.,\ jdk.nashorn.tools.,\ - com.sun.activation.registries. + com.sun.activation.registries.,\ + com.sun.java.accessibility. # # Determines whether this properties file can be appended to @@ -422,35 +428,37 @@ krb5.kdc.bad.policy = tryLast # describes the mechanism for disabling algorithms based on algorithm name # and/or key length. This includes algorithms used in certificates, as well # as revocation information such as CRLs and signed OCSP Responses. -# -# The syntax of the disabled algorithm string is described as this Java -# BNF-style: +# The syntax of the disabled algorithm string is described as follows: # DisabledAlgorithms: # " DisabledAlgorithm { , DisabledAlgorithm } " # # DisabledAlgorithm: -# AlgorithmName [Constraint] +# AlgorithmName [Constraint] { '&' Constraint } # # AlgorithmName: # (see below) # # Constraint: -# KeySizeConstraint +# KeySizeConstraint | CAConstraint | DenyAfterConstraint | +# UsageConstraint # # KeySizeConstraint: -# keySize Operator DecimalInteger +# keySize Operator KeyLength # # Operator: # <= | < | == | != | >= | > # -# DecimalInteger: -# DecimalDigits +# KeyLength: +# Integer value of the algorithm's key length in bits +# +# CAConstraint: +# jdkCA # -# DecimalDigits: -# DecimalDigit {DecimalDigit} +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD # -# DecimalDigit: one of -# 1 2 3 4 5 6 7 8 9 0 +# UsageConstraint: +# usage [TLSServer] [TLSClient] [SignedJAR] # # The "AlgorithmName" is the standard algorithm name of the disabled # algorithm. See "Java Cryptography Architecture Standard Algorithm Name @@ -464,15 +472,69 @@ krb5.kdc.bad.policy = tryLast # that rely on DSA, such as NONEwithDSA, SHA1withDSA. However, the assertion # will not disable algorithms related to "ECDSA". # -# A "Constraint" provides further guidance for the algorithm being specified. -# The "KeySizeConstraint" requires a key of a valid size range if the -# "AlgorithmName" is of a key algorithm. The "DecimalInteger" indicates the -# key size specified in number of bits. For example, "RSA keySize <= 1024" -# indicates that any RSA key with key size less than or equal to 1024 bits -# should be disabled, and "RSA keySize < 1024, RSA keySize > 2048" indicates -# that any RSA key with key size less than 1024 or greater than 2048 should -# be disabled. Note that the "KeySizeConstraint" only makes sense to key -# algorithms. +# A "Constraint" defines restrictions on the keys and/or certificates for +# a specified AlgorithmName: +# +# KeySizeConstraint: +# keySize Operator KeyLength +# The constraint requires a key of a valid size range if the +# "AlgorithmName" is of a key algorithm. The "KeyLength" indicates +# the key size specified in number of bits. For example, +# "RSA keySize <= 1024" indicates that any RSA key with key size less +# than or equal to 1024 bits should be disabled, and +# "RSA keySize < 1024, RSA keySize > 2048" indicates that any RSA key +# with key size less than 1024 or greater than 2048 should be disabled. +# This constraint is only used on algorithms that have a key size. +# +# CAConstraint: +# jdkCA +# This constraint prohibits the specified algorithm only if the +# algorithm is used in a certificate chain that terminates at a marked +# trust anchor in the lib/security/cacerts keystore. If the jdkCA +# constraint is not set, then all chains using the specified algorithm +# are restricted. jdkCA may only be used once in a DisabledAlgorithm +# expression. +# Example: To apply this constraint to SHA-1 certificates, include +# the following: "SHA1 jdkCA" +# +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD +# This constraint prohibits a certificate with the specified algorithm +# from being used after the date regardless of the certificate's +# validity. JAR files that are signed and timestamped before the +# constraint date with certificates containing the disabled algorithm +# will not be restricted. The date is processed in the UTC timezone. +# This constraint can only be used once in a DisabledAlgorithm +# expression. +# Example: To deny usage of RSA 2048 bit certificates after Feb 3 2020, +# use the following: "RSA keySize == 2048 & denyAfter 2020-02-03" +# +# UsageConstraint: +# usage [TLSServer] [TLSClient] [SignedJAR] +# This constraint prohibits the specified algorithm for +# a specified usage. This should be used when disabling an algorithm +# for all usages is not practical. 'TLSServer' restricts the algorithm +# in TLS server certificate chains when server authentication is +# performed. 'TLSClient' restricts the algorithm in TLS client +# certificate chains when client authentication is performed. +# 'SignedJAR' constrains use of certificates in signed jar files. +# The usage type follows the keyword and more than one usage type can +# be specified with a whitespace delimiter. +# Example: "SHA1 usage TLSServer TLSClient" +# +# When an algorithm must satisfy more than one constraint, it must be +# delimited by an ampersand '&'. For example, to restrict certificates in a +# chain that terminate at a distribution provided trust anchor and contain +# RSA keys that are less than or equal to 1024 bits, add the following +# constraint: "RSA keySize <= 1024 & jdkCA". +# +# All DisabledAlgorithms expressions are processed in the order defined in the +# property. This requires lower keysize constraints to be specified +# before larger keysize constraints of the same algorithm. For example: +# "RSA keySize < 1024 & jdkCA, RSA keySize < 2048". +# +# Note: The algorithm restrictions do not apply to trust anchors or +# self-signed certificates. # # Note: This property is currently used by Oracle's PKIX implementation. It # is not guaranteed to be examined and used by other implementations. @@ -481,8 +543,53 @@ krb5.kdc.bad.policy = tryLast # jdk.certpath.disabledAlgorithms=MD2, DSA, RSA keySize < 2048 # # -jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 +jdk.certpath.disabledAlgorithms=MD2, MD5, SHA1 jdkCA & usage TLSServer, \ + RSA keySize < 1024, DSA keySize < 1024, EC keySize < 224 +# +# Algorithm restrictions for signed JAR files +# +# In some environments, certain algorithms or key lengths may be undesirable +# for signed JAR validation. For example, "MD2" is generally no longer +# considered to be a secure hash algorithm. This section describes the +# mechanism for disabling algorithms based on algorithm name and/or key length. +# JARs signed with any of the disabled algorithms or key sizes will be treated +# as unsigned. +# +# The syntax of the disabled algorithm string is described as follows: +# DisabledAlgorithms: +# " DisabledAlgorithm { , DisabledAlgorithm } " +# +# DisabledAlgorithm: +# AlgorithmName [Constraint] { '&' Constraint } +# +# AlgorithmName: +# (see below) +# +# Constraint: +# KeySizeConstraint | DenyAfterConstraint +# +# KeySizeConstraint: +# keySize Operator KeyLength +# +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD +# +# Operator: +# <= | < | == | != | >= | > +# +# KeyLength: +# Integer value of the algorithm's key length in bits +# +# Note: This property is currently used by the JDK Reference +# implementation. It is not guaranteed to be examined and used by other +# implementations. +# +# See "jdk.certpath.disabledAlgorithms" for syntax descriptions. +# +jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 + +# # Algorithm restrictions for Secure Socket Layer/Transport Layer Security # (SSL/TLS) processing # @@ -504,12 +611,16 @@ jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 # See the specification of "jdk.certpath.disabledAlgorithms" for the # syntax of the disabled algorithm string. # -# Note: This property is currently used by Oracle's JSSE implementation. +# Note: The algorithm restrictions do not apply to trust anchors or +# self-signed certificates. +# +# Note: This property is currently used by the JDK Reference implementation. # It is not guaranteed to be examined and used by other implementations. # # Example: # jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048 -jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 +jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768, \ + EC keySize < 224 # Legacy algorithms for Secure Socket Layer/Transport Layer Security (SSL/TLS) # processing in JSSE implementation. @@ -523,7 +634,7 @@ jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 # During SSL/TLS security parameters negotiation, legacy algorithms will # not be negotiated unless there are no other candidates. # -# The syntax of the disabled algorithm string is described as this Java +# The syntax of the legacy algorithms string is described as this Java # BNF-style: # LegacyAlgorithms: # " LegacyAlgorithm { , LegacyAlgorithm } " @@ -553,7 +664,7 @@ jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 # See SSL/TLS specifications and "Java Cryptography Architecture Standard # Algorithm Name Documentation" for information about the algorithm names. # -# Note: This property is currently used by Oracle's JSSE implementation. +# Note: This property is currently used by the JDK Reference implementation. # It is not guaranteed to be examined and used by other implementations. # There is no guarantee the property will continue to exist or be of the # same syntax in future releases. @@ -566,7 +677,8 @@ jdk.tls.legacyAlgorithms= \ DHE_DSS_EXPORT, DHE_RSA_EXPORT, DH_anon_EXPORT, DH_DSS_EXPORT, \ DH_RSA_EXPORT, RSA_EXPORT, \ DH_anon, ECDH_anon, \ - RC4_128, RC4_40, DES_CBC, DES40_CBC + RC4_128, RC4_40, DES_CBC, DES40_CBC, \ + 3DES_EDE_CBC # The pre-defined default finite field Diffie-Hellman ephemeral (DHE) # parameters for Transport Layer Security (SSL/TLS/DTLS) processing. @@ -624,3 +736,177 @@ jdk.tls.legacyAlgorithms= \ # E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED \ # EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE65381 \ # FFFFFFFF FFFFFFFF, 2} + +# Cryptographic Jurisdiction Policy defaults +# +# Due to the import control restrictions of some countries, the default +# JCE policy files allow for strong but "limited" cryptographic key +# lengths to be used. If your country's cryptographic regulations allow, +# the "unlimited" strength policy files can be used instead, which contain +# no restrictions on cryptographic strengths. +# +# YOU ARE ADVISED TO CONSULT YOUR EXPORT/IMPORT CONTROL COUNSEL OR ATTORNEY +# TO DETERMINE THE EXACT REQUIREMENTS. +# +# (below) refers to the directory where the JRE was +# installed. It is determined based on whether you are running JCE +# on a JRE or a JRE contained within the Java Development Kit, or +# JDK(TM). The JDK contains the JRE, but at a different level in the +# file hierarchy. For example, if the JDK is installed in +# /home/user1/jdk1.8.0 on Unix or in C:\jdk1.8.0 on Windows, then +# is: +# +# /home/user1/jdk1.8.0/jre [Unix] +# C:\jdk1.8.0\jre [Windows] +# +# If on the other hand the JRE is installed in /home/user1/jre1.8.0 +# on Unix or in C:\jre1.8.0 on Windows, and the JDK is not +# installed, then is: +# +# /home/user1/jre1.8.0 [Unix] +# C:\jre1.8.0 [Windows] +# +# On Windows, for each JDK installation, there may be additional +# JREs installed under the "Program Files" directory. Please make +# sure that you install the unlimited strength policy JAR files +# for all JREs that you plan to use. +# +# The policy files are jar files organized into subdirectories of +# /lib/security/policy. Each directory contains a complete +# set of policy files. +# +# The "crypto.policy" Security property controls the directory selection, +# and thus the effective cryptographic policy. +# +# The default set of directories is: +# +# limited | unlimited +# +# however other directories can be created and configured. +# +# To support older JDK Update releases, the crypto.policy property +# is not defined by default. When the property is not defined, an +# update release binary aware of the new property will use the following +# logic to decide what crypto policy files get used : +# +# * If the US_export_policy.jar and local_policy.jar files are located +# in the (legacy) /lib/security directory, then the rules +# embedded in those jar files will be used. This helps preserve compatibility +# for users upgrading from an older installation. +# +# * If crypto.policy is not defined and no such jar files are present in +# the legacy locations, then the JDK will use the limited settings +# (equivalent to crypto.policy=limited) +# +# Please see the JCA documentation for additional information on these +# files and formats. +#crypto.policy=unlimited + +# +# The policy for the XML Signature secure validation mode. The mode is +# enabled by setting the property "org.jcp.xml.dsig.secureValidation" to +# true with the javax.xml.crypto.XMLCryptoContext.setProperty() method, +# or by running the code with a SecurityManager. +# +# Policy: +# Constraint {"," Constraint } +# Constraint: +# AlgConstraint | MaxTransformsConstraint | MaxReferencesConstraint | +# ReferenceUriSchemeConstraint | KeySizeConstraint | OtherConstraint +# AlgConstraint +# "disallowAlg" Uri +# MaxTransformsConstraint: +# "maxTransforms" Integer +# MaxReferencesConstraint: +# "maxReferences" Integer +# ReferenceUriSchemeConstraint: +# "disallowReferenceUriSchemes" String { String } +# KeySizeConstraint: +# "minKeySize" KeyAlg Integer +# OtherConstraint: +# "noDuplicateIds" | "noRetrievalMethodLoops" +# +# For AlgConstraint, Uri is the algorithm URI String that is not allowed. +# See the XML Signature Recommendation for more information on algorithm +# URI Identifiers. For KeySizeConstraint, KeyAlg is the standard algorithm +# name of the key type (ex: "RSA"). If the MaxTransformsConstraint, +# MaxReferencesConstraint or KeySizeConstraint (for the same key type) is +# specified more than once, only the last entry is enforced. +# +# Note: This property is currently used by the JDK Reference implementation. It +# is not guaranteed to be examined and used by other implementations. +# +jdk.xml.dsig.secureValidationPolicy=\ + disallowAlg http://www.w3.org/TR/1999/REC-xslt-19991116,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#rsa-md5,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#hmac-md5,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#md5,\ + maxTransforms 5,\ + maxReferences 30,\ + disallowReferenceUriSchemes file http https,\ + minKeySize RSA 1024,\ + minKeySize DSA 1024,\ + noDuplicateIds,\ + noRetrievalMethodLoops + +# +# Serialization process-wide filter +# +# A filter, if configured, is used by java.io.ObjectInputStream during +# deserialization to check the contents of the stream. +# A filter is configured as a sequence of patterns, each pattern is either +# matched against the name of a class in the stream or defines a limit. +# Patterns are separated by ";" (semicolon). +# Whitespace is significant and is considered part of the pattern. +# +# If a pattern includes a "=", it sets a limit. +# If a limit appears more than once the last value is used. +# Limits are checked before classes regardless of the order in the sequence of patterns. +# If any of the limits are exceeded, the filter status is REJECTED. +# +# maxdepth=value - the maximum depth of a graph +# maxrefs=value - the maximum number of internal references +# maxbytes=value - the maximum number of bytes in the input stream +# maxarray=value - the maximum array length allowed +# +# Other patterns, from left to right, match the class or package name as +# returned from Class.getName. +# If the class is an array type, the class or package to be matched is the element type. +# Arrays of any number of dimensions are treated the same as the element type. +# For example, a pattern of "!example.Foo", rejects creation of any instance or +# array of example.Foo. +# +# If the pattern starts with "!", the status is REJECTED if the remaining pattern +# is matched; otherwise the status is ALLOWED if the pattern matches. +# If the pattern ends with ".**" it matches any class in the package and all subpackages. +# If the pattern ends with ".*" it matches any class in the package. +# If the pattern ends with "*", it matches any class with the pattern as a prefix. +# If the pattern is equal to the class name, it matches. +# Otherwise, the status is UNDECIDED. +# +#jdk.serialFilter=pattern;pattern + +# +# RMI Registry Serial Filter +# +# The filter pattern uses the same format as jdk.serialFilter. +# This filter can override the builtin filter if additional types need to be +# allowed or rejected from the RMI Registry. +# +#sun.rmi.registry.registryFilter=pattern;pattern + +# +# RMI Distributed Garbage Collector (DGC) Serial Filter +# +# The filter pattern uses the same format as jdk.serialFilter. +# This filter can override the builtin filter if additional types need to be +# allowed or rejected from the RMI DGC. +# +# The builtin DGC filter can approximately be represented as the filter pattern: +# +#sun.rmi.transport.dgcFilter=\ +# java.rmi.server.ObjID;\ +# java.rmi.server.UID;\ +# java.rmi.dgc.VMID;\ +# java.rmi.dgc.Lease;\ +# maxdepth=5;maxarray=10000 diff --git a/src/IKVM.Image/ikvm/any/win7-x86/lib/security/java.security b/src/IKVM.Image/ikvm/any/win7-x86/lib/security/java.security index 12d1fd8efd..0d6c53ed22 100644 --- a/src/IKVM.Image/ikvm/any/win7-x86/lib/security/java.security +++ b/src/IKVM.Image/ikvm/any/win7-x86/lib/security/java.security @@ -209,6 +209,8 @@ package.access=sun.,\ com.sun.org.apache.xalan.internal.xsltc.trax.,\ com.sun.org.apache.xalan.internal.xsltc.util.,\ com.sun.org.apache.xml.internal.res.,\ + com.sun.org.apache.xml.internal.resolver.helpers.,\ + com.sun.org.apache.xml.internal.resolver.readers.,\ com.sun.org.apache.xml.internal.security.,\ com.sun.org.apache.xml.internal.serializer.utils.,\ com.sun.org.apache.xml.internal.utils.,\ @@ -220,7 +222,8 @@ package.access=sun.,\ jdk.internal.,\ jdk.nashorn.internal.,\ jdk.nashorn.tools.,\ - com.sun.activation.registries. + com.sun.activation.registries.,\ + com.sun.java.accessibility. # # List of comma-separated packages that start with or equal this string @@ -256,6 +259,8 @@ package.definition=sun.,\ com.sun.org.apache.xalan.internal.xsltc.trax.,\ com.sun.org.apache.xalan.internal.xsltc.util.,\ com.sun.org.apache.xml.internal.res.,\ + com.sun.org.apache.xml.internal.resolver.helpers.,\ + com.sun.org.apache.xml.internal.resolver.readers.,\ com.sun.org.apache.xml.internal.security.,\ com.sun.org.apache.xml.internal.serializer.utils.,\ com.sun.org.apache.xml.internal.utils.,\ @@ -267,7 +272,8 @@ package.definition=sun.,\ jdk.internal.,\ jdk.nashorn.internal.,\ jdk.nashorn.tools.,\ - com.sun.activation.registries. + com.sun.activation.registries.,\ + com.sun.java.accessibility. # # Determines whether this properties file can be appended to @@ -422,35 +428,37 @@ krb5.kdc.bad.policy = tryLast # describes the mechanism for disabling algorithms based on algorithm name # and/or key length. This includes algorithms used in certificates, as well # as revocation information such as CRLs and signed OCSP Responses. -# -# The syntax of the disabled algorithm string is described as this Java -# BNF-style: +# The syntax of the disabled algorithm string is described as follows: # DisabledAlgorithms: # " DisabledAlgorithm { , DisabledAlgorithm } " # # DisabledAlgorithm: -# AlgorithmName [Constraint] +# AlgorithmName [Constraint] { '&' Constraint } # # AlgorithmName: # (see below) # # Constraint: -# KeySizeConstraint +# KeySizeConstraint | CAConstraint | DenyAfterConstraint | +# UsageConstraint # # KeySizeConstraint: -# keySize Operator DecimalInteger +# keySize Operator KeyLength # # Operator: # <= | < | == | != | >= | > # -# DecimalInteger: -# DecimalDigits +# KeyLength: +# Integer value of the algorithm's key length in bits +# +# CAConstraint: +# jdkCA # -# DecimalDigits: -# DecimalDigit {DecimalDigit} +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD # -# DecimalDigit: one of -# 1 2 3 4 5 6 7 8 9 0 +# UsageConstraint: +# usage [TLSServer] [TLSClient] [SignedJAR] # # The "AlgorithmName" is the standard algorithm name of the disabled # algorithm. See "Java Cryptography Architecture Standard Algorithm Name @@ -464,15 +472,69 @@ krb5.kdc.bad.policy = tryLast # that rely on DSA, such as NONEwithDSA, SHA1withDSA. However, the assertion # will not disable algorithms related to "ECDSA". # -# A "Constraint" provides further guidance for the algorithm being specified. -# The "KeySizeConstraint" requires a key of a valid size range if the -# "AlgorithmName" is of a key algorithm. The "DecimalInteger" indicates the -# key size specified in number of bits. For example, "RSA keySize <= 1024" -# indicates that any RSA key with key size less than or equal to 1024 bits -# should be disabled, and "RSA keySize < 1024, RSA keySize > 2048" indicates -# that any RSA key with key size less than 1024 or greater than 2048 should -# be disabled. Note that the "KeySizeConstraint" only makes sense to key -# algorithms. +# A "Constraint" defines restrictions on the keys and/or certificates for +# a specified AlgorithmName: +# +# KeySizeConstraint: +# keySize Operator KeyLength +# The constraint requires a key of a valid size range if the +# "AlgorithmName" is of a key algorithm. The "KeyLength" indicates +# the key size specified in number of bits. For example, +# "RSA keySize <= 1024" indicates that any RSA key with key size less +# than or equal to 1024 bits should be disabled, and +# "RSA keySize < 1024, RSA keySize > 2048" indicates that any RSA key +# with key size less than 1024 or greater than 2048 should be disabled. +# This constraint is only used on algorithms that have a key size. +# +# CAConstraint: +# jdkCA +# This constraint prohibits the specified algorithm only if the +# algorithm is used in a certificate chain that terminates at a marked +# trust anchor in the lib/security/cacerts keystore. If the jdkCA +# constraint is not set, then all chains using the specified algorithm +# are restricted. jdkCA may only be used once in a DisabledAlgorithm +# expression. +# Example: To apply this constraint to SHA-1 certificates, include +# the following: "SHA1 jdkCA" +# +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD +# This constraint prohibits a certificate with the specified algorithm +# from being used after the date regardless of the certificate's +# validity. JAR files that are signed and timestamped before the +# constraint date with certificates containing the disabled algorithm +# will not be restricted. The date is processed in the UTC timezone. +# This constraint can only be used once in a DisabledAlgorithm +# expression. +# Example: To deny usage of RSA 2048 bit certificates after Feb 3 2020, +# use the following: "RSA keySize == 2048 & denyAfter 2020-02-03" +# +# UsageConstraint: +# usage [TLSServer] [TLSClient] [SignedJAR] +# This constraint prohibits the specified algorithm for +# a specified usage. This should be used when disabling an algorithm +# for all usages is not practical. 'TLSServer' restricts the algorithm +# in TLS server certificate chains when server authentication is +# performed. 'TLSClient' restricts the algorithm in TLS client +# certificate chains when client authentication is performed. +# 'SignedJAR' constrains use of certificates in signed jar files. +# The usage type follows the keyword and more than one usage type can +# be specified with a whitespace delimiter. +# Example: "SHA1 usage TLSServer TLSClient" +# +# When an algorithm must satisfy more than one constraint, it must be +# delimited by an ampersand '&'. For example, to restrict certificates in a +# chain that terminate at a distribution provided trust anchor and contain +# RSA keys that are less than or equal to 1024 bits, add the following +# constraint: "RSA keySize <= 1024 & jdkCA". +# +# All DisabledAlgorithms expressions are processed in the order defined in the +# property. This requires lower keysize constraints to be specified +# before larger keysize constraints of the same algorithm. For example: +# "RSA keySize < 1024 & jdkCA, RSA keySize < 2048". +# +# Note: The algorithm restrictions do not apply to trust anchors or +# self-signed certificates. # # Note: This property is currently used by Oracle's PKIX implementation. It # is not guaranteed to be examined and used by other implementations. @@ -481,8 +543,53 @@ krb5.kdc.bad.policy = tryLast # jdk.certpath.disabledAlgorithms=MD2, DSA, RSA keySize < 2048 # # -jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 +jdk.certpath.disabledAlgorithms=MD2, MD5, SHA1 jdkCA & usage TLSServer, \ + RSA keySize < 1024, DSA keySize < 1024, EC keySize < 224 +# +# Algorithm restrictions for signed JAR files +# +# In some environments, certain algorithms or key lengths may be undesirable +# for signed JAR validation. For example, "MD2" is generally no longer +# considered to be a secure hash algorithm. This section describes the +# mechanism for disabling algorithms based on algorithm name and/or key length. +# JARs signed with any of the disabled algorithms or key sizes will be treated +# as unsigned. +# +# The syntax of the disabled algorithm string is described as follows: +# DisabledAlgorithms: +# " DisabledAlgorithm { , DisabledAlgorithm } " +# +# DisabledAlgorithm: +# AlgorithmName [Constraint] { '&' Constraint } +# +# AlgorithmName: +# (see below) +# +# Constraint: +# KeySizeConstraint | DenyAfterConstraint +# +# KeySizeConstraint: +# keySize Operator KeyLength +# +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD +# +# Operator: +# <= | < | == | != | >= | > +# +# KeyLength: +# Integer value of the algorithm's key length in bits +# +# Note: This property is currently used by the JDK Reference +# implementation. It is not guaranteed to be examined and used by other +# implementations. +# +# See "jdk.certpath.disabledAlgorithms" for syntax descriptions. +# +jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 + +# # Algorithm restrictions for Secure Socket Layer/Transport Layer Security # (SSL/TLS) processing # @@ -504,12 +611,16 @@ jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 # See the specification of "jdk.certpath.disabledAlgorithms" for the # syntax of the disabled algorithm string. # -# Note: This property is currently used by Oracle's JSSE implementation. +# Note: The algorithm restrictions do not apply to trust anchors or +# self-signed certificates. +# +# Note: This property is currently used by the JDK Reference implementation. # It is not guaranteed to be examined and used by other implementations. # # Example: # jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048 -jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 +jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768, \ + EC keySize < 224 # Legacy algorithms for Secure Socket Layer/Transport Layer Security (SSL/TLS) # processing in JSSE implementation. @@ -523,7 +634,7 @@ jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 # During SSL/TLS security parameters negotiation, legacy algorithms will # not be negotiated unless there are no other candidates. # -# The syntax of the disabled algorithm string is described as this Java +# The syntax of the legacy algorithms string is described as this Java # BNF-style: # LegacyAlgorithms: # " LegacyAlgorithm { , LegacyAlgorithm } " @@ -553,7 +664,7 @@ jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 # See SSL/TLS specifications and "Java Cryptography Architecture Standard # Algorithm Name Documentation" for information about the algorithm names. # -# Note: This property is currently used by Oracle's JSSE implementation. +# Note: This property is currently used by the JDK Reference implementation. # It is not guaranteed to be examined and used by other implementations. # There is no guarantee the property will continue to exist or be of the # same syntax in future releases. @@ -566,7 +677,8 @@ jdk.tls.legacyAlgorithms= \ DHE_DSS_EXPORT, DHE_RSA_EXPORT, DH_anon_EXPORT, DH_DSS_EXPORT, \ DH_RSA_EXPORT, RSA_EXPORT, \ DH_anon, ECDH_anon, \ - RC4_128, RC4_40, DES_CBC, DES40_CBC + RC4_128, RC4_40, DES_CBC, DES40_CBC, \ + 3DES_EDE_CBC # The pre-defined default finite field Diffie-Hellman ephemeral (DHE) # parameters for Transport Layer Security (SSL/TLS/DTLS) processing. @@ -624,3 +736,177 @@ jdk.tls.legacyAlgorithms= \ # E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED \ # EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE65381 \ # FFFFFFFF FFFFFFFF, 2} + +# Cryptographic Jurisdiction Policy defaults +# +# Due to the import control restrictions of some countries, the default +# JCE policy files allow for strong but "limited" cryptographic key +# lengths to be used. If your country's cryptographic regulations allow, +# the "unlimited" strength policy files can be used instead, which contain +# no restrictions on cryptographic strengths. +# +# YOU ARE ADVISED TO CONSULT YOUR EXPORT/IMPORT CONTROL COUNSEL OR ATTORNEY +# TO DETERMINE THE EXACT REQUIREMENTS. +# +# (below) refers to the directory where the JRE was +# installed. It is determined based on whether you are running JCE +# on a JRE or a JRE contained within the Java Development Kit, or +# JDK(TM). The JDK contains the JRE, but at a different level in the +# file hierarchy. For example, if the JDK is installed in +# /home/user1/jdk1.8.0 on Unix or in C:\jdk1.8.0 on Windows, then +# is: +# +# /home/user1/jdk1.8.0/jre [Unix] +# C:\jdk1.8.0\jre [Windows] +# +# If on the other hand the JRE is installed in /home/user1/jre1.8.0 +# on Unix or in C:\jre1.8.0 on Windows, and the JDK is not +# installed, then is: +# +# /home/user1/jre1.8.0 [Unix] +# C:\jre1.8.0 [Windows] +# +# On Windows, for each JDK installation, there may be additional +# JREs installed under the "Program Files" directory. Please make +# sure that you install the unlimited strength policy JAR files +# for all JREs that you plan to use. +# +# The policy files are jar files organized into subdirectories of +# /lib/security/policy. Each directory contains a complete +# set of policy files. +# +# The "crypto.policy" Security property controls the directory selection, +# and thus the effective cryptographic policy. +# +# The default set of directories is: +# +# limited | unlimited +# +# however other directories can be created and configured. +# +# To support older JDK Update releases, the crypto.policy property +# is not defined by default. When the property is not defined, an +# update release binary aware of the new property will use the following +# logic to decide what crypto policy files get used : +# +# * If the US_export_policy.jar and local_policy.jar files are located +# in the (legacy) /lib/security directory, then the rules +# embedded in those jar files will be used. This helps preserve compatibility +# for users upgrading from an older installation. +# +# * If crypto.policy is not defined and no such jar files are present in +# the legacy locations, then the JDK will use the limited settings +# (equivalent to crypto.policy=limited) +# +# Please see the JCA documentation for additional information on these +# files and formats. +#crypto.policy=unlimited + +# +# The policy for the XML Signature secure validation mode. The mode is +# enabled by setting the property "org.jcp.xml.dsig.secureValidation" to +# true with the javax.xml.crypto.XMLCryptoContext.setProperty() method, +# or by running the code with a SecurityManager. +# +# Policy: +# Constraint {"," Constraint } +# Constraint: +# AlgConstraint | MaxTransformsConstraint | MaxReferencesConstraint | +# ReferenceUriSchemeConstraint | KeySizeConstraint | OtherConstraint +# AlgConstraint +# "disallowAlg" Uri +# MaxTransformsConstraint: +# "maxTransforms" Integer +# MaxReferencesConstraint: +# "maxReferences" Integer +# ReferenceUriSchemeConstraint: +# "disallowReferenceUriSchemes" String { String } +# KeySizeConstraint: +# "minKeySize" KeyAlg Integer +# OtherConstraint: +# "noDuplicateIds" | "noRetrievalMethodLoops" +# +# For AlgConstraint, Uri is the algorithm URI String that is not allowed. +# See the XML Signature Recommendation for more information on algorithm +# URI Identifiers. For KeySizeConstraint, KeyAlg is the standard algorithm +# name of the key type (ex: "RSA"). If the MaxTransformsConstraint, +# MaxReferencesConstraint or KeySizeConstraint (for the same key type) is +# specified more than once, only the last entry is enforced. +# +# Note: This property is currently used by the JDK Reference implementation. It +# is not guaranteed to be examined and used by other implementations. +# +jdk.xml.dsig.secureValidationPolicy=\ + disallowAlg http://www.w3.org/TR/1999/REC-xslt-19991116,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#rsa-md5,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#hmac-md5,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#md5,\ + maxTransforms 5,\ + maxReferences 30,\ + disallowReferenceUriSchemes file http https,\ + minKeySize RSA 1024,\ + minKeySize DSA 1024,\ + noDuplicateIds,\ + noRetrievalMethodLoops + +# +# Serialization process-wide filter +# +# A filter, if configured, is used by java.io.ObjectInputStream during +# deserialization to check the contents of the stream. +# A filter is configured as a sequence of patterns, each pattern is either +# matched against the name of a class in the stream or defines a limit. +# Patterns are separated by ";" (semicolon). +# Whitespace is significant and is considered part of the pattern. +# +# If a pattern includes a "=", it sets a limit. +# If a limit appears more than once the last value is used. +# Limits are checked before classes regardless of the order in the sequence of patterns. +# If any of the limits are exceeded, the filter status is REJECTED. +# +# maxdepth=value - the maximum depth of a graph +# maxrefs=value - the maximum number of internal references +# maxbytes=value - the maximum number of bytes in the input stream +# maxarray=value - the maximum array length allowed +# +# Other patterns, from left to right, match the class or package name as +# returned from Class.getName. +# If the class is an array type, the class or package to be matched is the element type. +# Arrays of any number of dimensions are treated the same as the element type. +# For example, a pattern of "!example.Foo", rejects creation of any instance or +# array of example.Foo. +# +# If the pattern starts with "!", the status is REJECTED if the remaining pattern +# is matched; otherwise the status is ALLOWED if the pattern matches. +# If the pattern ends with ".**" it matches any class in the package and all subpackages. +# If the pattern ends with ".*" it matches any class in the package. +# If the pattern ends with "*", it matches any class with the pattern as a prefix. +# If the pattern is equal to the class name, it matches. +# Otherwise, the status is UNDECIDED. +# +#jdk.serialFilter=pattern;pattern + +# +# RMI Registry Serial Filter +# +# The filter pattern uses the same format as jdk.serialFilter. +# This filter can override the builtin filter if additional types need to be +# allowed or rejected from the RMI Registry. +# +#sun.rmi.registry.registryFilter=pattern;pattern + +# +# RMI Distributed Garbage Collector (DGC) Serial Filter +# +# The filter pattern uses the same format as jdk.serialFilter. +# This filter can override the builtin filter if additional types need to be +# allowed or rejected from the RMI DGC. +# +# The builtin DGC filter can approximately be represented as the filter pattern: +# +#sun.rmi.transport.dgcFilter=\ +# java.rmi.server.ObjID;\ +# java.rmi.server.UID;\ +# java.rmi.dgc.VMID;\ +# java.rmi.dgc.Lease;\ +# maxdepth=5;maxarray=10000 diff --git a/src/IKVM.Image/ikvm/any/win81-arm/lib/security/java.security b/src/IKVM.Image/ikvm/any/win81-arm/lib/security/java.security index 12d1fd8efd..0d6c53ed22 100644 --- a/src/IKVM.Image/ikvm/any/win81-arm/lib/security/java.security +++ b/src/IKVM.Image/ikvm/any/win81-arm/lib/security/java.security @@ -209,6 +209,8 @@ package.access=sun.,\ com.sun.org.apache.xalan.internal.xsltc.trax.,\ com.sun.org.apache.xalan.internal.xsltc.util.,\ com.sun.org.apache.xml.internal.res.,\ + com.sun.org.apache.xml.internal.resolver.helpers.,\ + com.sun.org.apache.xml.internal.resolver.readers.,\ com.sun.org.apache.xml.internal.security.,\ com.sun.org.apache.xml.internal.serializer.utils.,\ com.sun.org.apache.xml.internal.utils.,\ @@ -220,7 +222,8 @@ package.access=sun.,\ jdk.internal.,\ jdk.nashorn.internal.,\ jdk.nashorn.tools.,\ - com.sun.activation.registries. + com.sun.activation.registries.,\ + com.sun.java.accessibility. # # List of comma-separated packages that start with or equal this string @@ -256,6 +259,8 @@ package.definition=sun.,\ com.sun.org.apache.xalan.internal.xsltc.trax.,\ com.sun.org.apache.xalan.internal.xsltc.util.,\ com.sun.org.apache.xml.internal.res.,\ + com.sun.org.apache.xml.internal.resolver.helpers.,\ + com.sun.org.apache.xml.internal.resolver.readers.,\ com.sun.org.apache.xml.internal.security.,\ com.sun.org.apache.xml.internal.serializer.utils.,\ com.sun.org.apache.xml.internal.utils.,\ @@ -267,7 +272,8 @@ package.definition=sun.,\ jdk.internal.,\ jdk.nashorn.internal.,\ jdk.nashorn.tools.,\ - com.sun.activation.registries. + com.sun.activation.registries.,\ + com.sun.java.accessibility. # # Determines whether this properties file can be appended to @@ -422,35 +428,37 @@ krb5.kdc.bad.policy = tryLast # describes the mechanism for disabling algorithms based on algorithm name # and/or key length. This includes algorithms used in certificates, as well # as revocation information such as CRLs and signed OCSP Responses. -# -# The syntax of the disabled algorithm string is described as this Java -# BNF-style: +# The syntax of the disabled algorithm string is described as follows: # DisabledAlgorithms: # " DisabledAlgorithm { , DisabledAlgorithm } " # # DisabledAlgorithm: -# AlgorithmName [Constraint] +# AlgorithmName [Constraint] { '&' Constraint } # # AlgorithmName: # (see below) # # Constraint: -# KeySizeConstraint +# KeySizeConstraint | CAConstraint | DenyAfterConstraint | +# UsageConstraint # # KeySizeConstraint: -# keySize Operator DecimalInteger +# keySize Operator KeyLength # # Operator: # <= | < | == | != | >= | > # -# DecimalInteger: -# DecimalDigits +# KeyLength: +# Integer value of the algorithm's key length in bits +# +# CAConstraint: +# jdkCA # -# DecimalDigits: -# DecimalDigit {DecimalDigit} +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD # -# DecimalDigit: one of -# 1 2 3 4 5 6 7 8 9 0 +# UsageConstraint: +# usage [TLSServer] [TLSClient] [SignedJAR] # # The "AlgorithmName" is the standard algorithm name of the disabled # algorithm. See "Java Cryptography Architecture Standard Algorithm Name @@ -464,15 +472,69 @@ krb5.kdc.bad.policy = tryLast # that rely on DSA, such as NONEwithDSA, SHA1withDSA. However, the assertion # will not disable algorithms related to "ECDSA". # -# A "Constraint" provides further guidance for the algorithm being specified. -# The "KeySizeConstraint" requires a key of a valid size range if the -# "AlgorithmName" is of a key algorithm. The "DecimalInteger" indicates the -# key size specified in number of bits. For example, "RSA keySize <= 1024" -# indicates that any RSA key with key size less than or equal to 1024 bits -# should be disabled, and "RSA keySize < 1024, RSA keySize > 2048" indicates -# that any RSA key with key size less than 1024 or greater than 2048 should -# be disabled. Note that the "KeySizeConstraint" only makes sense to key -# algorithms. +# A "Constraint" defines restrictions on the keys and/or certificates for +# a specified AlgorithmName: +# +# KeySizeConstraint: +# keySize Operator KeyLength +# The constraint requires a key of a valid size range if the +# "AlgorithmName" is of a key algorithm. The "KeyLength" indicates +# the key size specified in number of bits. For example, +# "RSA keySize <= 1024" indicates that any RSA key with key size less +# than or equal to 1024 bits should be disabled, and +# "RSA keySize < 1024, RSA keySize > 2048" indicates that any RSA key +# with key size less than 1024 or greater than 2048 should be disabled. +# This constraint is only used on algorithms that have a key size. +# +# CAConstraint: +# jdkCA +# This constraint prohibits the specified algorithm only if the +# algorithm is used in a certificate chain that terminates at a marked +# trust anchor in the lib/security/cacerts keystore. If the jdkCA +# constraint is not set, then all chains using the specified algorithm +# are restricted. jdkCA may only be used once in a DisabledAlgorithm +# expression. +# Example: To apply this constraint to SHA-1 certificates, include +# the following: "SHA1 jdkCA" +# +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD +# This constraint prohibits a certificate with the specified algorithm +# from being used after the date regardless of the certificate's +# validity. JAR files that are signed and timestamped before the +# constraint date with certificates containing the disabled algorithm +# will not be restricted. The date is processed in the UTC timezone. +# This constraint can only be used once in a DisabledAlgorithm +# expression. +# Example: To deny usage of RSA 2048 bit certificates after Feb 3 2020, +# use the following: "RSA keySize == 2048 & denyAfter 2020-02-03" +# +# UsageConstraint: +# usage [TLSServer] [TLSClient] [SignedJAR] +# This constraint prohibits the specified algorithm for +# a specified usage. This should be used when disabling an algorithm +# for all usages is not practical. 'TLSServer' restricts the algorithm +# in TLS server certificate chains when server authentication is +# performed. 'TLSClient' restricts the algorithm in TLS client +# certificate chains when client authentication is performed. +# 'SignedJAR' constrains use of certificates in signed jar files. +# The usage type follows the keyword and more than one usage type can +# be specified with a whitespace delimiter. +# Example: "SHA1 usage TLSServer TLSClient" +# +# When an algorithm must satisfy more than one constraint, it must be +# delimited by an ampersand '&'. For example, to restrict certificates in a +# chain that terminate at a distribution provided trust anchor and contain +# RSA keys that are less than or equal to 1024 bits, add the following +# constraint: "RSA keySize <= 1024 & jdkCA". +# +# All DisabledAlgorithms expressions are processed in the order defined in the +# property. This requires lower keysize constraints to be specified +# before larger keysize constraints of the same algorithm. For example: +# "RSA keySize < 1024 & jdkCA, RSA keySize < 2048". +# +# Note: The algorithm restrictions do not apply to trust anchors or +# self-signed certificates. # # Note: This property is currently used by Oracle's PKIX implementation. It # is not guaranteed to be examined and used by other implementations. @@ -481,8 +543,53 @@ krb5.kdc.bad.policy = tryLast # jdk.certpath.disabledAlgorithms=MD2, DSA, RSA keySize < 2048 # # -jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 +jdk.certpath.disabledAlgorithms=MD2, MD5, SHA1 jdkCA & usage TLSServer, \ + RSA keySize < 1024, DSA keySize < 1024, EC keySize < 224 +# +# Algorithm restrictions for signed JAR files +# +# In some environments, certain algorithms or key lengths may be undesirable +# for signed JAR validation. For example, "MD2" is generally no longer +# considered to be a secure hash algorithm. This section describes the +# mechanism for disabling algorithms based on algorithm name and/or key length. +# JARs signed with any of the disabled algorithms or key sizes will be treated +# as unsigned. +# +# The syntax of the disabled algorithm string is described as follows: +# DisabledAlgorithms: +# " DisabledAlgorithm { , DisabledAlgorithm } " +# +# DisabledAlgorithm: +# AlgorithmName [Constraint] { '&' Constraint } +# +# AlgorithmName: +# (see below) +# +# Constraint: +# KeySizeConstraint | DenyAfterConstraint +# +# KeySizeConstraint: +# keySize Operator KeyLength +# +# DenyAfterConstraint: +# denyAfter YYYY-MM-DD +# +# Operator: +# <= | < | == | != | >= | > +# +# KeyLength: +# Integer value of the algorithm's key length in bits +# +# Note: This property is currently used by the JDK Reference +# implementation. It is not guaranteed to be examined and used by other +# implementations. +# +# See "jdk.certpath.disabledAlgorithms" for syntax descriptions. +# +jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 + +# # Algorithm restrictions for Secure Socket Layer/Transport Layer Security # (SSL/TLS) processing # @@ -504,12 +611,16 @@ jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 # See the specification of "jdk.certpath.disabledAlgorithms" for the # syntax of the disabled algorithm string. # -# Note: This property is currently used by Oracle's JSSE implementation. +# Note: The algorithm restrictions do not apply to trust anchors or +# self-signed certificates. +# +# Note: This property is currently used by the JDK Reference implementation. # It is not guaranteed to be examined and used by other implementations. # # Example: # jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048 -jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 +jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768, \ + EC keySize < 224 # Legacy algorithms for Secure Socket Layer/Transport Layer Security (SSL/TLS) # processing in JSSE implementation. @@ -523,7 +634,7 @@ jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 # During SSL/TLS security parameters negotiation, legacy algorithms will # not be negotiated unless there are no other candidates. # -# The syntax of the disabled algorithm string is described as this Java +# The syntax of the legacy algorithms string is described as this Java # BNF-style: # LegacyAlgorithms: # " LegacyAlgorithm { , LegacyAlgorithm } " @@ -553,7 +664,7 @@ jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 768 # See SSL/TLS specifications and "Java Cryptography Architecture Standard # Algorithm Name Documentation" for information about the algorithm names. # -# Note: This property is currently used by Oracle's JSSE implementation. +# Note: This property is currently used by the JDK Reference implementation. # It is not guaranteed to be examined and used by other implementations. # There is no guarantee the property will continue to exist or be of the # same syntax in future releases. @@ -566,7 +677,8 @@ jdk.tls.legacyAlgorithms= \ DHE_DSS_EXPORT, DHE_RSA_EXPORT, DH_anon_EXPORT, DH_DSS_EXPORT, \ DH_RSA_EXPORT, RSA_EXPORT, \ DH_anon, ECDH_anon, \ - RC4_128, RC4_40, DES_CBC, DES40_CBC + RC4_128, RC4_40, DES_CBC, DES40_CBC, \ + 3DES_EDE_CBC # The pre-defined default finite field Diffie-Hellman ephemeral (DHE) # parameters for Transport Layer Security (SSL/TLS/DTLS) processing. @@ -624,3 +736,177 @@ jdk.tls.legacyAlgorithms= \ # E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED \ # EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE65381 \ # FFFFFFFF FFFFFFFF, 2} + +# Cryptographic Jurisdiction Policy defaults +# +# Due to the import control restrictions of some countries, the default +# JCE policy files allow for strong but "limited" cryptographic key +# lengths to be used. If your country's cryptographic regulations allow, +# the "unlimited" strength policy files can be used instead, which contain +# no restrictions on cryptographic strengths. +# +# YOU ARE ADVISED TO CONSULT YOUR EXPORT/IMPORT CONTROL COUNSEL OR ATTORNEY +# TO DETERMINE THE EXACT REQUIREMENTS. +# +# (below) refers to the directory where the JRE was +# installed. It is determined based on whether you are running JCE +# on a JRE or a JRE contained within the Java Development Kit, or +# JDK(TM). The JDK contains the JRE, but at a different level in the +# file hierarchy. For example, if the JDK is installed in +# /home/user1/jdk1.8.0 on Unix or in C:\jdk1.8.0 on Windows, then +# is: +# +# /home/user1/jdk1.8.0/jre [Unix] +# C:\jdk1.8.0\jre [Windows] +# +# If on the other hand the JRE is installed in /home/user1/jre1.8.0 +# on Unix or in C:\jre1.8.0 on Windows, and the JDK is not +# installed, then is: +# +# /home/user1/jre1.8.0 [Unix] +# C:\jre1.8.0 [Windows] +# +# On Windows, for each JDK installation, there may be additional +# JREs installed under the "Program Files" directory. Please make +# sure that you install the unlimited strength policy JAR files +# for all JREs that you plan to use. +# +# The policy files are jar files organized into subdirectories of +# /lib/security/policy. Each directory contains a complete +# set of policy files. +# +# The "crypto.policy" Security property controls the directory selection, +# and thus the effective cryptographic policy. +# +# The default set of directories is: +# +# limited | unlimited +# +# however other directories can be created and configured. +# +# To support older JDK Update releases, the crypto.policy property +# is not defined by default. When the property is not defined, an +# update release binary aware of the new property will use the following +# logic to decide what crypto policy files get used : +# +# * If the US_export_policy.jar and local_policy.jar files are located +# in the (legacy) /lib/security directory, then the rules +# embedded in those jar files will be used. This helps preserve compatibility +# for users upgrading from an older installation. +# +# * If crypto.policy is not defined and no such jar files are present in +# the legacy locations, then the JDK will use the limited settings +# (equivalent to crypto.policy=limited) +# +# Please see the JCA documentation for additional information on these +# files and formats. +#crypto.policy=unlimited + +# +# The policy for the XML Signature secure validation mode. The mode is +# enabled by setting the property "org.jcp.xml.dsig.secureValidation" to +# true with the javax.xml.crypto.XMLCryptoContext.setProperty() method, +# or by running the code with a SecurityManager. +# +# Policy: +# Constraint {"," Constraint } +# Constraint: +# AlgConstraint | MaxTransformsConstraint | MaxReferencesConstraint | +# ReferenceUriSchemeConstraint | KeySizeConstraint | OtherConstraint +# AlgConstraint +# "disallowAlg" Uri +# MaxTransformsConstraint: +# "maxTransforms" Integer +# MaxReferencesConstraint: +# "maxReferences" Integer +# ReferenceUriSchemeConstraint: +# "disallowReferenceUriSchemes" String { String } +# KeySizeConstraint: +# "minKeySize" KeyAlg Integer +# OtherConstraint: +# "noDuplicateIds" | "noRetrievalMethodLoops" +# +# For AlgConstraint, Uri is the algorithm URI String that is not allowed. +# See the XML Signature Recommendation for more information on algorithm +# URI Identifiers. For KeySizeConstraint, KeyAlg is the standard algorithm +# name of the key type (ex: "RSA"). If the MaxTransformsConstraint, +# MaxReferencesConstraint or KeySizeConstraint (for the same key type) is +# specified more than once, only the last entry is enforced. +# +# Note: This property is currently used by the JDK Reference implementation. It +# is not guaranteed to be examined and used by other implementations. +# +jdk.xml.dsig.secureValidationPolicy=\ + disallowAlg http://www.w3.org/TR/1999/REC-xslt-19991116,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#rsa-md5,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#hmac-md5,\ + disallowAlg http://www.w3.org/2001/04/xmldsig-more#md5,\ + maxTransforms 5,\ + maxReferences 30,\ + disallowReferenceUriSchemes file http https,\ + minKeySize RSA 1024,\ + minKeySize DSA 1024,\ + noDuplicateIds,\ + noRetrievalMethodLoops + +# +# Serialization process-wide filter +# +# A filter, if configured, is used by java.io.ObjectInputStream during +# deserialization to check the contents of the stream. +# A filter is configured as a sequence of patterns, each pattern is either +# matched against the name of a class in the stream or defines a limit. +# Patterns are separated by ";" (semicolon). +# Whitespace is significant and is considered part of the pattern. +# +# If a pattern includes a "=", it sets a limit. +# If a limit appears more than once the last value is used. +# Limits are checked before classes regardless of the order in the sequence of patterns. +# If any of the limits are exceeded, the filter status is REJECTED. +# +# maxdepth=value - the maximum depth of a graph +# maxrefs=value - the maximum number of internal references +# maxbytes=value - the maximum number of bytes in the input stream +# maxarray=value - the maximum array length allowed +# +# Other patterns, from left to right, match the class or package name as +# returned from Class.getName. +# If the class is an array type, the class or package to be matched is the element type. +# Arrays of any number of dimensions are treated the same as the element type. +# For example, a pattern of "!example.Foo", rejects creation of any instance or +# array of example.Foo. +# +# If the pattern starts with "!", the status is REJECTED if the remaining pattern +# is matched; otherwise the status is ALLOWED if the pattern matches. +# If the pattern ends with ".**" it matches any class in the package and all subpackages. +# If the pattern ends with ".*" it matches any class in the package. +# If the pattern ends with "*", it matches any class with the pattern as a prefix. +# If the pattern is equal to the class name, it matches. +# Otherwise, the status is UNDECIDED. +# +#jdk.serialFilter=pattern;pattern + +# +# RMI Registry Serial Filter +# +# The filter pattern uses the same format as jdk.serialFilter. +# This filter can override the builtin filter if additional types need to be +# allowed or rejected from the RMI Registry. +# +#sun.rmi.registry.registryFilter=pattern;pattern + +# +# RMI Distributed Garbage Collector (DGC) Serial Filter +# +# The filter pattern uses the same format as jdk.serialFilter. +# This filter can override the builtin filter if additional types need to be +# allowed or rejected from the RMI DGC. +# +# The builtin DGC filter can approximately be represented as the filter pattern: +# +#sun.rmi.transport.dgcFilter=\ +# java.rmi.server.ObjID;\ +# java.rmi.server.UID;\ +# java.rmi.dgc.VMID;\ +# java.rmi.dgc.Lease;\ +# maxdepth=5;maxarray=10000 diff --git a/src/dist-image/ikvm/lib/security/java.security b/src/dist-image/ikvm/lib/security/java.security index 0d6c53ed22..659f8a3e6b 100644 --- a/src/dist-image/ikvm/lib/security/java.security +++ b/src/dist-image/ikvm/lib/security/java.security @@ -222,8 +222,7 @@ package.access=sun.,\ jdk.internal.,\ jdk.nashorn.internal.,\ jdk.nashorn.tools.,\ - com.sun.activation.registries.,\ - com.sun.java.accessibility. + com.sun.activation.registries. # # List of comma-separated packages that start with or equal this string @@ -272,8 +271,7 @@ package.definition=sun.,\ jdk.internal.,\ jdk.nashorn.internal.,\ jdk.nashorn.tools.,\ - com.sun.activation.registries.,\ - com.sun.java.accessibility. + com.sun.activation.registries. # # Determines whether this properties file can be appended to @@ -910,3 +908,4 @@ jdk.xml.dsig.secureValidationPolicy=\ # java.rmi.dgc.VMID;\ # java.rmi.dgc.Lease;\ # maxdepth=5;maxarray=10000 + From e2ee8dfc764bb7bf0b74007ac832aeeb80edbeea Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Tue, 20 Jun 2023 11:11:44 +0200 Subject: [PATCH 010/134] New native methods --- openjdk.lib.props | 2 ++ openjdk.lib.targets | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/openjdk.lib.props b/openjdk.lib.props index 239552b4fc..45667e514b 100644 --- a/openjdk.lib.props +++ b/openjdk.lib.props @@ -78,10 +78,12 @@ %(Compile.IncludeDirectories);$(OpenJdkDir)jdk\src\share\native\common + %(Compile.IncludeDirectories);$(OpenJdkDir)jdk\src\share\native\java\io %(Compile.IncludeDirectories);$(OpenJdkDir)jdk\src\share\javavm\export %(Compile.IncludeDirectories);$(OpenJdkDir)build\linux-x86_64-normal-server-release\jdk\gensrc_headers %(Compile.IncludeDirectories);$(OpenJdkDir)jdk\src\$(OpenJdkTargetOsApiDir)\native\common + %(Compile.IncludeDirectories);$(OpenJdkDir)jdk\src\$(OpenJdkTargetOsApiDir)\native\java\io %(Compile.IncludeDirectories);$(OpenJdkDir)jdk\src\$(OpenJdkTargetOsApiDir)\javavm\export diff --git a/openjdk.lib.targets b/openjdk.lib.targets index 0e776a72a7..96cfe6f4dc 100644 --- a/openjdk.lib.targets +++ b/openjdk.lib.targets @@ -21,8 +21,12 @@ + + + + From 249c3e250c46fbdb1e0244a2a1efd392bf78338a Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Wed, 21 Jun 2023 00:35:29 +0200 Subject: [PATCH 011/134] Enable tests --- src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt index daa30f1184..43d35fbd79 100644 --- a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt +++ b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt @@ -3393,13 +3393,8 @@ javax/swing/text/FlowView/LayoutTest.java javax/swing/text/html/parser/Parser/HtmlCommentTagParseTest/HtmlCommentTagParseTest.java generic-all sun/java2d/ClassCastExceptionForInvalidSurface.java generic-all -# mscapi/sunec/Windows-PRNG SecureRandom +# Windows-PRNG SecureRandom java/security/SecureRandom/DefaultProvider.java generic-all -java/security/Signature/SignatureLength.java generic-all -sun/security/ec/NSASuiteB/TestSHAwithECDSASignatureOids.java generic-all -sun/security/ec/SignatureOffsets.java generic-all -sun/security/tools/jarsigner/DefaultSigalg.java generic-all -sun/security/x509/X509CertImpl/V3Certificate.java generic-all # pkcs11 sun/security/pkcs11/Mac/MacKAT.java generic-all From bd54f0e048d92972815d88f7ac444fafe6c0e068 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Wed, 21 Jun 2023 00:43:51 +0200 Subject: [PATCH 012/134] Fix WeakAlg keytool uses "changeit" as default password for cacerts --- src/IKVM.Runtime/Vfs/VfsCacertsFile.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/IKVM.Runtime/Vfs/VfsCacertsFile.cs b/src/IKVM.Runtime/Vfs/VfsCacertsFile.cs index aab046aeba..8530bc20a7 100644 --- a/src/IKVM.Runtime/Vfs/VfsCacertsFile.cs +++ b/src/IKVM.Runtime/Vfs/VfsCacertsFile.cs @@ -92,7 +92,7 @@ byte[] GenerateCacertsFile() } var baos = new java.io.ByteArrayOutputStream(); - jstore.store(baos, new char[0]); + jstore.store(baos, "changeit".ToCharArray()); return baos.toByteArray(); #endif } From f84a580b3d9426c63f3301bb9b9516117cc22636 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Wed, 21 Jun 2023 12:07:56 +0200 Subject: [PATCH 013/134] Jdi is not testable --- src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt index 43d35fbd79..f7f82e1c6f 100644 --- a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt +++ b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt @@ -3408,3 +3408,6 @@ sun/tools/jps/TestJpsSanity.java # jcmd sun/tools/jcmd/TestJcmdDefaults.java generic-all + +# jdi +com/sun/jdi/oom/OomDebugTest.java generic-all From e3e7d54771d2697ea2c13d80df9da2636716794f Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Wed, 21 Jun 2023 13:47:07 +0200 Subject: [PATCH 014/134] Port ReflectionFactory --- .../local/sun/reflect/ReflectionFactory.java | 277 ++++++++++++++++++ 1 file changed, 277 insertions(+) diff --git a/src/IKVM.Java/local/sun/reflect/ReflectionFactory.java b/src/IKVM.Java/local/sun/reflect/ReflectionFactory.java index 35cae84cc3..76456056c7 100644 --- a/src/IKVM.Java/local/sun/reflect/ReflectionFactory.java +++ b/src/IKVM.Java/local/sun/reflect/ReflectionFactory.java @@ -31,16 +31,28 @@ package sun.reflect; +import java.io.Externalizable; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.ObjectStreamClass; +import java.io.OptionalDataException; +import java.io.Serializable; +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; import java.lang.reflect.Field; import java.lang.reflect.Executable; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; import java.security.AccessController; import java.security.Permission; import java.security.PrivilegedAction; +import java.util.Objects; + import sun.reflect.misc.ReflectUtil; + /**

The master factory for all reflective objects, both those in java.lang.reflect (Fields, Methods, Constructors) as well as their delegates (FieldAccessors, MethodAccessors, ConstructorAccessors). @@ -61,6 +73,9 @@ public class ReflectionFactory { // Provides access to package-private mechanisms in java.lang.reflect private static volatile LangReflectAccess langReflectAccess; + /* Method for static class initializer , or null */ + private static volatile Method hasStaticInitializerMethod; + private ReflectionFactory() { } @@ -282,6 +297,42 @@ public byte[] getExecutableTypeAnnotationBytes(Executable ex) { if (constructorToCall.getDeclaringClass() == classToInstantiate) { return constructorToCall; } + return generateConstructor(classToInstantiate, constructorToCall); + } + + /** + * Returns an accessible constructor capable of creating instances + * of the given class, initialized by the given constructor. + * + * @param classToInstantiate the class to instantiate + * @param constructorToCall the constructor to call + * @return an accessible constructor + */ + public final Constructor newConstructorForSerialization(Class cl) { + Class initCl = cl; + while (Serializable.class.isAssignableFrom(initCl)) { + if ((initCl = initCl.getSuperclass()) == null) { + return null; + } + } + Constructor constructorToCall; + try { + constructorToCall = initCl.getDeclaredConstructor(); + int mods = constructorToCall.getModifiers(); + if ((mods & Modifier.PRIVATE) != 0 || + ((mods & (Modifier.PUBLIC | Modifier.PROTECTED)) == 0 && + !packageEquals(cl, initCl))) { + return null; + } + } catch (NoSuchMethodException ex) { + return null; + } + return generateConstructor(cl, constructorToCall); + } + + private final Constructor generateConstructor(Class classToInstantiate, + Constructor constructorToCall) { + ConstructorAccessor acc = newConstructorAccessorForSerialization(classToInstantiate, constructorToCall); Constructor c = newConstructor(constructorToCall.getDeclaringClass(), @@ -297,9 +348,222 @@ public byte[] getExecutableTypeAnnotationBytes(Executable ex) { langReflectAccess(). getConstructorParameterAnnotations(constructorToCall)); setConstructorAccessor(c, acc); + c.setAccessible(true); return c; } + /** + * Returns an accessible no-arg constructor for an externalizable class to be + * initialized using a public no-argument constructor. + * + * @param cl the class to instantiate + * @return A no-arg constructor for the class; returns {@code null} if + * the class does not implement {@link java.io.Externalizable} + */ + public final Constructor newConstructorForExternalization(Class cl) { + if (!Externalizable.class.isAssignableFrom(cl)) { + return null; + } + try { + Constructor cons = cl.getConstructor(); + cons.setAccessible(true); + return cons; + } catch (NoSuchMethodException ex) { + return null; + } + } + + /** + * Returns a direct MethodHandle for the {@code readObject} method on + * a Serializable class. + * The first argument of {@link MethodHandle#invoke} is the serializable + * object and the second argument is the {@code ObjectInputStream} passed to + * {@code readObject}. + * + * @param cl a Serializable class + * @return a direct MethodHandle for the {@code readObject} method of the class or + * {@code null} if the class does not have a {@code readObject} method + */ + public final MethodHandle readObjectForSerialization(Class cl) { + return findReadWriteObjectForSerialization(cl, "readObject", ObjectInputStream.class); + } + + /** + * Returns a direct MethodHandle for the {@code readObjectNoData} method on + * a Serializable class. + * The first argument of {@link MethodHandle#invoke} is the serializable + * object and the second argument is the {@code ObjectInputStream} passed to + * {@code readObjectNoData}. + * + * @param cl a Serializable class + * @return a direct MethodHandle for the {@code readObjectNoData} method + * of the class or {@code null} if the class does not have a + * {@code readObjectNoData} method + */ + public final MethodHandle readObjectNoDataForSerialization(Class cl) { + return findReadWriteObjectForSerialization(cl, "readObjectNoData", ObjectInputStream.class); + } + + /** + * Returns a direct MethodHandle for the {@code writeObject} method on + * a Serializable class. + * The first argument of {@link MethodHandle#invoke} is the serializable + * object and the second argument is the {@code ObjectOutputStream} passed to + * {@code writeObject}. + * + * @param cl a Serializable class + * @return a direct MethodHandle for the {@code writeObject} method of the class or + * {@code null} if the class does not have a {@code writeObject} method + */ + public final MethodHandle writeObjectForSerialization(Class cl) { + return findReadWriteObjectForSerialization(cl, "writeObject", ObjectOutputStream.class); + } + + private final MethodHandle findReadWriteObjectForSerialization(Class cl, + String methodName, + Class streamClass) { + if (!Serializable.class.isAssignableFrom(cl)) { + return null; + } + + try { + Method meth = cl.getDeclaredMethod(methodName, streamClass); + int mods = meth.getModifiers(); + if (meth.getReturnType() != Void.TYPE || + Modifier.isStatic(mods) || + !Modifier.isPrivate(mods)) { + return null; + } + meth.setAccessible(true); + return MethodHandles.lookup().unreflect(meth); + } catch (NoSuchMethodException ex) { + return null; + } catch (IllegalAccessException ex1) { + throw new InternalError("Error", ex1); + } + } + + /** + * Returns a direct MethodHandle for the {@code readResolve} method on + * a serializable class. + * The single argument of {@link MethodHandle#invoke} is the serializable + * object. + * + * @param cl the Serializable class + * @return a direct MethodHandle for the {@code readResolve} method of the class or + * {@code null} if the class does not have a {@code readResolve} method + */ + public final MethodHandle readResolveForSerialization(Class cl) { + return getReplaceResolveForSerialization(cl, "readResolve"); + } + + /** + * Returns a direct MethodHandle for the {@code writeReplace} method on + * a serializable class. + * The single argument of {@link MethodHandle#invoke} is the serializable + * object. + * + * @param cl the Serializable class + * @return a direct MethodHandle for the {@code writeReplace} method of the class or + * {@code null} if the class does not have a {@code writeReplace} method + */ + public final MethodHandle writeReplaceForSerialization(Class cl) { + return getReplaceResolveForSerialization(cl, "writeReplace"); + } + + /** + * Returns a direct MethodHandle for the {@code writeReplace} method on + * a serializable class. + * The single argument of {@link MethodHandle#invoke} is the serializable + * object. + * + * @param cl the Serializable class + * @return a direct MethodHandle for the {@code writeReplace} method of the class or + * {@code null} if the class does not have a {@code writeReplace} method + */ + private MethodHandle getReplaceResolveForSerialization(Class cl, + String methodName) { + if (!Serializable.class.isAssignableFrom(cl)) { + return null; + } + + Class defCl = cl; + while (defCl != null) { + try { + Method m = defCl.getDeclaredMethod(methodName); + if (m.getReturnType() != Object.class) { + return null; + } + int mods = m.getModifiers(); + if (Modifier.isStatic(mods) | Modifier.isAbstract(mods)) { + return null; + } else if (Modifier.isPublic(mods) | Modifier.isProtected(mods)) { + // fall through + } else if (Modifier.isPrivate(mods) && (cl != defCl)) { + return null; + } else if (!packageEquals(cl, defCl)) { + return null; + } + try { + // Normal return + m.setAccessible(true); + return MethodHandles.lookup().unreflect(m); + } catch (IllegalAccessException ex0) { + // setAccessible should prevent IAE + throw new InternalError("Error", ex0); + } + } catch (NoSuchMethodException ex) { + defCl = defCl.getSuperclass(); + } + } + return null; + } + + /** + * Returns true if the class has a static initializer. + * The presence of a static initializer is used to compute the serialVersionUID. + * @param cl a serializable classLook + * @return {@code true} if the class has a static initializer, + * otherwise {@code false} + */ + public final boolean hasStaticInitializerForSerialization(Class cl) { + Method m = hasStaticInitializerMethod; + if (m == null) { + try { + m = ObjectStreamClass.class.getDeclaredMethod("hasStaticInitializer", + new Class[]{Class.class}); + m.setAccessible(true); + hasStaticInitializerMethod = m; + } catch (NoSuchMethodException ex) { + throw new InternalError("No such method hasStaticInitializer on " + + ObjectStreamClass.class, ex); + } + } + try { + return (Boolean) m.invoke(null, cl); + } catch (InvocationTargetException | IllegalAccessException ex) { + throw new InternalError("Exception invoking hasStaticInitializer", ex); + } + } + + /** + * Returns a new OptionalDataException with {@code eof} set to {@code true} + * or {@code false}. + * @param bool the value of {@code eof} in the created OptionalDataException + * @return a new OptionalDataException + */ + public final OptionalDataException newOptionalDataExceptionForSerialization(boolean bool) { + try { + Constructor boolCtor = + OptionalDataException.class.getDeclaredConstructor(Boolean.TYPE); + boolCtor.setAccessible(true); + return boolCtor.newInstance(bool); + } catch (NoSuchMethodException | InstantiationException| + IllegalAccessException|InvocationTargetException ex) { + throw new InternalError("unable to create OptionalDataException", ex); + } + } + //-------------------------------------------------------------------------- // // Internals only below this point @@ -315,4 +579,17 @@ private static LangReflectAccess langReflectAccess() { } return langReflectAccess; } + + /** + * Returns true if classes are defined in the classloader and same package, false + * otherwise. + * @param cl1 a class + * @param cl2 another class + * @returns true if the two classes are in the same classloader and package + */ + private static boolean packageEquals(Class cl1, Class cl2) { + return cl1.getClassLoader() == cl2.getClassLoader() && + Objects.equals(cl1.getPackage(), cl2.getPackage()); + } + } From 0ec29d78f0e96d73cead53e0ac86f667f5902deb Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Wed, 21 Jun 2023 15:55:49 +0200 Subject: [PATCH 015/134] Add xjc/jxc --- .../IKVM.Image.JDK-bin.csproj | 4 +++- src/jxc/jxc.msbuildproj | 20 +++++++++++++++++++ src/xjc/xjc.msbuildproj | 20 +++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 src/jxc/jxc.msbuildproj create mode 100644 src/xjc/xjc.msbuildproj diff --git a/src/IKVM.Image.JDK-bin/IKVM.Image.JDK-bin.csproj b/src/IKVM.Image.JDK-bin/IKVM.Image.JDK-bin.csproj index 3198ab5aa6..7affab10cf 100644 --- a/src/IKVM.Image.JDK-bin/IKVM.Image.JDK-bin.csproj +++ b/src/IKVM.Image.JDK-bin/IKVM.Image.JDK-bin.csproj @@ -13,11 +13,13 @@ + + - + diff --git a/src/jxc/jxc.msbuildproj b/src/jxc/jxc.msbuildproj new file mode 100644 index 0000000000..4c4efb534b --- /dev/null +++ b/src/jxc/jxc.msbuildproj @@ -0,0 +1,20 @@ + + + + + + + Exe + net461;netcoreapp3.1 + $(_SupportedImageRuntimes) + com.sun.tools.internal.jxc.SchemaGenerator + ikvm.tools.jxc + + + + + + + + + diff --git a/src/xjc/xjc.msbuildproj b/src/xjc/xjc.msbuildproj new file mode 100644 index 0000000000..23b437f39a --- /dev/null +++ b/src/xjc/xjc.msbuildproj @@ -0,0 +1,20 @@ + + + + + + + Exe + net461;netcoreapp3.1 + $(_SupportedImageRuntimes) + com.sun.tools.internal.xjc.Driver + ikvm.tools.xjc + + + + + + + + + From 9792b6a2d4eef5e6f2724c536fff28ae021d9584 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Wed, 21 Jun 2023 15:56:13 +0200 Subject: [PATCH 016/134] Disable tests --- src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt index f7f82e1c6f..4b37439adf 100644 --- a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt +++ b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt @@ -3411,3 +3411,7 @@ sun/tools/jcmd/TestJcmdDefaults.java # jdi com/sun/jdi/oom/OomDebugTest.java generic-all +com/sun/jdi/EvalArraysAsList.sh generic-all + +# not implemented/not applicable +javax/management/mxbean/MXBeanInteropTest1.java generic-all From 587564a3c2c8426bf1a742a34308c1776b67ff31 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Wed, 21 Jun 2023 17:19:57 +0200 Subject: [PATCH 017/134] jxc is schemagen. --- .../IKVM.Image.JDK-bin.csproj | 1 - src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt | 3 +++ src/jxc/jxc.msbuildproj | 20 ------------------- 3 files changed, 3 insertions(+), 21 deletions(-) delete mode 100644 src/jxc/jxc.msbuildproj diff --git a/src/IKVM.Image.JDK-bin/IKVM.Image.JDK-bin.csproj b/src/IKVM.Image.JDK-bin/IKVM.Image.JDK-bin.csproj index 7affab10cf..09645cd57c 100644 --- a/src/IKVM.Image.JDK-bin/IKVM.Image.JDK-bin.csproj +++ b/src/IKVM.Image.JDK-bin/IKVM.Image.JDK-bin.csproj @@ -13,7 +13,6 @@ - diff --git a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt index 4b37439adf..ee809e562b 100644 --- a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt +++ b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt @@ -3415,3 +3415,6 @@ com/sun/jdi/EvalArraysAsList.sh # not implemented/not applicable javax/management/mxbean/MXBeanInteropTest1.java generic-all + +# accessibility +javax/accessibility/JList/AccessibleJListChildNPETest.java generic-all diff --git a/src/jxc/jxc.msbuildproj b/src/jxc/jxc.msbuildproj deleted file mode 100644 index 4c4efb534b..0000000000 --- a/src/jxc/jxc.msbuildproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - Exe - net461;netcoreapp3.1 - $(_SupportedImageRuntimes) - com.sun.tools.internal.jxc.SchemaGenerator - ikvm.tools.jxc - - - - - - - - - From 5fbbc83c29c933d19938d3f959ffb9086abeff19 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Wed, 21 Jun 2023 17:21:36 +0200 Subject: [PATCH 018/134] Add to solution --- IKVM.sln | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/IKVM.sln b/IKVM.sln index 75dd8d2cd3..6d0d960a54 100644 --- a/IKVM.sln +++ b/IKVM.sln @@ -306,6 +306,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.Image.JRE.runtime.linu EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.Image.JRE.runtime.linux-musl-x64", "src\IKVM.Image.JRE.runtime.linux-musl-x64\IKVM.Image.JRE.runtime.linux-musl-x64.csproj", "{4AC61233-8347-4AC6-9E01-5C5BC48D5A8F}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "xjc", "src\xjc\xjc.msbuildproj", "{C35B9502-AC9F-4490-9480-6EAB4FD94AAA}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -668,6 +670,10 @@ Global {4AC61233-8347-4AC6-9E01-5C5BC48D5A8F}.Debug|Any CPU.Build.0 = Debug|Any CPU {4AC61233-8347-4AC6-9E01-5C5BC48D5A8F}.Release|Any CPU.ActiveCfg = Release|Any CPU {4AC61233-8347-4AC6-9E01-5C5BC48D5A8F}.Release|Any CPU.Build.0 = Release|Any CPU + {C35B9502-AC9F-4490-9480-6EAB4FD94AAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C35B9502-AC9F-4490-9480-6EAB4FD94AAA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C35B9502-AC9F-4490-9480-6EAB4FD94AAA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C35B9502-AC9F-4490-9480-6EAB4FD94AAA}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From bb0386cf893cb89b78277413187a6f253072757e Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Mon, 26 Jun 2023 10:19:15 +0200 Subject: [PATCH 019/134] Include non-sun extra versions of heap size arguments --- src/IKVM.Runtime/Launcher.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/IKVM.Runtime/Launcher.cs b/src/IKVM.Runtime/Launcher.cs index 3eed52ddc1..3ec398164c 100644 --- a/src/IKVM.Runtime/Launcher.cs +++ b/src/IKVM.Runtime/Launcher.cs @@ -448,6 +448,9 @@ public static int Run(string main, bool jar, string[] args, string rarg, IDictio arg.StartsWith("-Xmn".AsSpan()) || arg.StartsWith("-Xss".AsSpan()) || arg.StartsWith("-XX:".AsSpan()) || + arg.StartsWith("-mn".AsSpan()) || + arg.StartsWith("-ms".AsSpan()) || + arg.StartsWith("-mx".AsSpan()) || ArgEquals(arg, "-Xmixed") || ArgEquals(arg, "-Xint") || ArgEquals(arg, "-Xincgc") || From b9cfb0e33a2cd1cee9aa10d434e6d5d8b0a1994e Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Wed, 28 Jun 2023 18:30:16 +0200 Subject: [PATCH 020/134] Fix jtreg invoking "java" by absolute path --- src/IKVM.Runtime/Java/Externs/java/lang/ProcessImpl.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/IKVM.Runtime/Java/Externs/java/lang/ProcessImpl.cs b/src/IKVM.Runtime/Java/Externs/java/lang/ProcessImpl.cs index 5700210d06..ed56511bf7 100644 --- a/src/IKVM.Runtime/Java/Externs/java/lang/ProcessImpl.cs +++ b/src/IKVM.Runtime/Java/Externs/java/lang/ProcessImpl.cs @@ -605,12 +605,13 @@ static bool WindowsExecutableExists(string file) { if (File.Exists(file)) return true; - else if (Directory.Exists(file)) + else if (Path.Exists(file)) return false; - else if (file.IndexOf('.') == -1 && File.Exists(file + ".exe")) - return true; - else + if (Path.GetFilename(file) is not string filename) + return false; + if (filename.IndexOf('.') != -1) return false; + return File.Exists(file + ".exe"); } catch { From fea2598ea918df11aaa20f5ef5ac3d14399b8626 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Wed, 28 Jun 2023 18:31:02 +0200 Subject: [PATCH 021/134] Exclude test --- src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt index ee809e562b..5b3a8f1658 100644 --- a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt +++ b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt @@ -3412,6 +3412,7 @@ sun/tools/jcmd/TestJcmdDefaults.java # jdi com/sun/jdi/oom/OomDebugTest.java generic-all com/sun/jdi/EvalArraysAsList.sh generic-all +com/sun/jdi/RedefineAddPrivateMethod.sh generic-all # not implemented/not applicable javax/management/mxbean/MXBeanInteropTest1.java generic-all From 96635478be1716bea1680ad8779206f5955b7e88 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Wed, 28 Jun 2023 18:38:49 +0200 Subject: [PATCH 022/134] Path Exists is .NET 6 --- src/IKVM.Runtime/Java/Externs/java/lang/ProcessImpl.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/IKVM.Runtime/Java/Externs/java/lang/ProcessImpl.cs b/src/IKVM.Runtime/Java/Externs/java/lang/ProcessImpl.cs index ed56511bf7..ee99b8e7d3 100644 --- a/src/IKVM.Runtime/Java/Externs/java/lang/ProcessImpl.cs +++ b/src/IKVM.Runtime/Java/Externs/java/lang/ProcessImpl.cs @@ -605,7 +605,7 @@ static bool WindowsExecutableExists(string file) { if (File.Exists(file)) return true; - else if (Path.Exists(file)) + else if (Directory.Exists(file)) return false; if (Path.GetFilename(file) is not string filename) return false; From 2a8ae9a956851cc43c813a7172b5fc9dd68d79dd Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Wed, 28 Jun 2023 18:41:50 +0200 Subject: [PATCH 023/134] Typo --- src/IKVM.Runtime/Java/Externs/java/lang/ProcessImpl.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/IKVM.Runtime/Java/Externs/java/lang/ProcessImpl.cs b/src/IKVM.Runtime/Java/Externs/java/lang/ProcessImpl.cs index ee99b8e7d3..c6a57cac7f 100644 --- a/src/IKVM.Runtime/Java/Externs/java/lang/ProcessImpl.cs +++ b/src/IKVM.Runtime/Java/Externs/java/lang/ProcessImpl.cs @@ -607,7 +607,7 @@ static bool WindowsExecutableExists(string file) return true; else if (Directory.Exists(file)) return false; - if (Path.GetFilename(file) is not string filename) + if (Path.GetFileName(file) is not string filename) return false; if (filename.IndexOf('.') != -1) return false; From 454e6339a21bae80d85dd1b12dc7b5ec354766b9 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Thu, 29 Jun 2023 10:40:41 +0200 Subject: [PATCH 024/134] Tests --- src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt index 5b3a8f1658..8d9f4d4602 100644 --- a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt +++ b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt @@ -3392,6 +3392,7 @@ javax/swing/plaf/nimbus/8057791/bug8057791.java javax/swing/text/FlowView/LayoutTest.java generic-all javax/swing/text/html/parser/Parser/HtmlCommentTagParseTest/HtmlCommentTagParseTest.java generic-all sun/java2d/ClassCastExceptionForInvalidSurface.java generic-all +javax/accessibility/JList/AccessibleJListChildNPETest.java generic-all # Windows-PRNG SecureRandom java/security/SecureRandom/DefaultProvider.java generic-all @@ -3417,5 +3418,14 @@ com/sun/jdi/RedefineAddPrivateMethod.sh # not implemented/not applicable javax/management/mxbean/MXBeanInteropTest1.java generic-all -# accessibility -javax/accessibility/JList/AccessibleJListChildNPETest.java generic-all +# not distributing limited policy +javax/crypto/CryptoPermission/TestUnlimited.java generic-all + +# rogue. +java/beans/Introspector/8159696/UnloadClassBeanInfo.java generic-all + +# fails with -Xbootclasspath/a (needs implement) +java/lang/invoke/CustomizedLambdaFormTest.java generic-all + +# Shell fails on Windows +sun/security/tools/keytool/keyalg.sh windows-all From 200b07fb01dc6de6617a362b5658eb7ab33a72e3 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Thu, 29 Jun 2023 17:08:47 +0200 Subject: [PATCH 025/134] Include native code --- src/libjava/libjava.clangproj | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/libjava/libjava.clangproj b/src/libjava/libjava.clangproj index d335073706..8b2d35dd91 100644 --- a/src/libjava/libjava.clangproj +++ b/src/libjava/libjava.clangproj @@ -7,6 +7,8 @@ java c99 + $(IncludeDirectories);$(OpenJdkDir)jdk\src\share\native\java\io + $(IncludeDirectories);$(OpenJdkDir)jdk\src\$(OpenJdkTargetOsApiDir)\native\java\io @@ -15,10 +17,13 @@ + + + From 5071ab79b79785e9a31f02a0304b28d8f356105a Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Thu, 29 Jun 2023 19:52:12 +0200 Subject: [PATCH 026/134] Fix compile --- src/libjava/libjava.clangproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/libjava/libjava.clangproj b/src/libjava/libjava.clangproj index 8b2d35dd91..82de899a1d 100644 --- a/src/libjava/libjava.clangproj +++ b/src/libjava/libjava.clangproj @@ -17,6 +17,10 @@ + + + c90 + From b02a0c09e465c197f87d7c020422cb2c50d95c7d Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Mon, 3 Jul 2023 14:54:43 +0200 Subject: [PATCH 027/134] Fix CoreFoundation framework link missing --- src/libjava/libjava.clangproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/libjava/libjava.clangproj b/src/libjava/libjava.clangproj index 82de899a1d..41dc7aa240 100644 --- a/src/libjava/libjava.clangproj +++ b/src/libjava/libjava.clangproj @@ -15,6 +15,9 @@ + + + From 7d896b8bfa27d64fb8a69377e6f970ac1d71cbab Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Tue, 4 Jul 2023 11:23:39 +0200 Subject: [PATCH 028/134] Fix symbolic link script to work on bundled powershell on windows --- ext/ikvm-native-sdk/Fix-SymbolicLinks.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/ikvm-native-sdk/Fix-SymbolicLinks.ps1 b/ext/ikvm-native-sdk/Fix-SymbolicLinks.ps1 index 79832e653d..a649f2a0d8 100644 --- a/ext/ikvm-native-sdk/Fix-SymbolicLinks.ps1 +++ b/ext/ikvm-native-sdk/Fix-SymbolicLinks.ps1 @@ -19,7 +19,7 @@ function Fix-SymbolicLink ($i, $p) { } # recurse into target, attempting to fix it - $t = gi $(Join-Path $i.DirectoryName $i.Target) + $t = gi $(Join-Path "$($i.DirectoryName)" "$($i.Target)") $t = Fix-SymbolicLink $t # is the target a directory? @@ -28,11 +28,11 @@ function Fix-SymbolicLink ($i, $p) { $t = $i.Target # remove original item and replace with mklink /D - ri $i + ri $i.FullName & cmd /c "mklink /D $n $t" | Write-Host # refresh item for recursive call - return (gi $i) + return (gi $i.FullName) } } catch { Write-Host -Foreground Red -Background Black ($i.FullName + ": " + $_.Exception.Message) From b83ce7466a173e6aea088646bb4c26934c9c331e Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Thu, 6 Jul 2023 15:40:22 +0200 Subject: [PATCH 029/134] Fix OneExceptionOnly-test --- .../java/net/PlainDatagramSocketImpl.cs | 40 ++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/src/IKVM.Runtime/Java/Externs/java/net/PlainDatagramSocketImpl.cs b/src/IKVM.Runtime/Java/Externs/java/net/PlainDatagramSocketImpl.cs index a040a044d5..8a1a5bc56f 100644 --- a/src/IKVM.Runtime/Java/Externs/java/net/PlainDatagramSocketImpl.cs +++ b/src/IKVM.Runtime/Java/Externs/java/net/PlainDatagramSocketImpl.cs @@ -511,33 +511,37 @@ public static int peek(object this_, object address_) /// static void PurgeOutstandingICMP(Socket socket) { - while (true) + // check for outstanding packet + while (socket.Poll(0, SelectMode.SelectRead)) { - // check for outstanding packet - if (socket.Poll(0, SelectMode.SelectRead) == false) - break; + var ep = (EndPoint)new IPEndPoint(IPAddress.IPv6Any, 0); + // Peek for real data try { - var ep = (EndPoint)new IPEndPoint(IPAddress.IPv6Any, 0); socket.EndReceiveFrom(socket.BeginReceiveFrom(TempBuffer, 0, TempBuffer.Length, SocketFlags.Peek, ref ep, null, null), ref ep); + // read data successfully, escape + return; } - catch (SocketException e) when (e.SocketErrorCode == SocketError.ConnectionReset) + catch { - try - { - var ep = (EndPoint)new IPEndPoint(IPAddress.IPv6Any, 0); - socket.EndReceiveFrom(socket.BeginReceiveFrom(TempBuffer, 0, TempBuffer.Length, SocketFlags.Peek, ref ep, null, null), ref ep); - } - catch (SocketException e2) when (e2.SocketErrorCode == SocketError.ConnectionReset) - { - - } - - continue; + // Swallow everything on Peek } - break; + // Consume packet + try + { + socket.EndReceiveFrom(socket.BeginReceiveFrom(TempBuffer, 0, TempBuffer.Length, SocketFlags.None, ref ep, null, null), ref ep); + } + catch (SocketException e) when (e.SocketErrorCode == SocketError.ConnectionReset) + { + // Continue on receiving ConnectionReset + } + catch + { + // Exception is anything different than ConnectionReset, finished + return; + } } } From cd88be88e517dd5ee116dcc8d71f065659032b9c Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Thu, 6 Jul 2023 16:35:32 +0200 Subject: [PATCH 030/134] Catch FileNotFound on Watcher init Works the same way as WindowsWatchService, where on error of begin overlap is handled, in that the watch key is basically no-op --- src/IKVM.Java/local/sun/nio/fs/DotNetFileSystem.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/IKVM.Java/local/sun/nio/fs/DotNetFileSystem.java b/src/IKVM.Java/local/sun/nio/fs/DotNetFileSystem.java index d5d2be8ded..ef25aaa0b6 100644 --- a/src/IKVM.Java/local/sun/nio/fs/DotNetFileSystem.java +++ b/src/IKVM.Java/local/sun/nio/fs/DotNetFileSystem.java @@ -485,7 +485,15 @@ synchronized WatchKey register(DotNetPath path, boolean create, boolean delete, existing = new NetWatchKey(path); keys.add(existing); } - existing.init(create, delete, modify, overflow, subtree); + try + { + existing.init(create, delete, modify, overflow, subtree); + } + catch (cli.System.IO.FileNotFoundException _) + { + // Ignore dotnet FileNotFoundException on EnableRaisingEvents=true + } + return existing; } } From 3aecdf95b8b7b10bf62577e655c40f3b519f4703 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Thu, 6 Jul 2023 16:40:49 +0200 Subject: [PATCH 031/134] Fix compile --- src/xjc/xjc.msbuildproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xjc/xjc.msbuildproj b/src/xjc/xjc.msbuildproj index 23b437f39a..2adab22249 100644 --- a/src/xjc/xjc.msbuildproj +++ b/src/xjc/xjc.msbuildproj @@ -1,6 +1,6 @@  - + @@ -14,7 +14,7 @@ - + From 0c348ef340c74b731f7ff99b5186d257e30e7099 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Wed, 26 Jul 2023 13:57:05 +0200 Subject: [PATCH 032/134] Implement DotNetWatchService natively --- .../java/io/FileNotFoundException.cs | 9 + src/IKVM.Java-ref/java/io/IOException.cs | 11 + .../lang/UnsupportedOperationException.cs | 9 + .../local/sun/nio/fs/DotNetFileSystem.java | 289 +----------------- .../local/sun/nio/fs/DotNetPath.java | 67 +--- .../local/sun/nio/fs/DotNetWatchService.java | 72 +++++ .../ExtendedWatchEventModifierAccessor.cs | 18 ++ .../SensitivityWatchEventModifierAccessor.cs | 20 ++ .../File/StandardWatchEventKindsAccessor.cs | 29 ++ .../Nio/Fs/DotNetWatchServiceKeyAccessor.cs | 20 ++ .../Externs/sun/nio/fs/DotNetWatchService.cs | 31 ++ .../Util/Sun/Nio/Fs/DotNetWatchService.cs | 145 +++++++++ 12 files changed, 378 insertions(+), 342 deletions(-) create mode 100644 src/IKVM.Java-ref/java/io/FileNotFoundException.cs create mode 100644 src/IKVM.Java-ref/java/io/IOException.cs create mode 100644 src/IKVM.Java-ref/java/lang/UnsupportedOperationException.cs create mode 100644 src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java create mode 100644 src/IKVM.Runtime/Accessors/Com/Sun/Nio/File/ExtendedWatchEventModifierAccessor.cs create mode 100644 src/IKVM.Runtime/Accessors/Com/Sun/Nio/File/SensitivityWatchEventModifierAccessor.cs create mode 100644 src/IKVM.Runtime/Accessors/Java/Nio/File/StandardWatchEventKindsAccessor.cs create mode 100644 src/IKVM.Runtime/Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs create mode 100644 src/IKVM.Runtime/Java/Externs/sun/nio/fs/DotNetWatchService.cs create mode 100644 src/IKVM.Runtime/Util/Sun/Nio/Fs/DotNetWatchService.cs diff --git a/src/IKVM.Java-ref/java/io/FileNotFoundException.cs b/src/IKVM.Java-ref/java/io/FileNotFoundException.cs new file mode 100644 index 0000000000..86579c5d34 --- /dev/null +++ b/src/IKVM.Java-ref/java/io/FileNotFoundException.cs @@ -0,0 +1,9 @@ +namespace java.io +{ + + public class FileNotFoundException : IOException + { + + } + +} diff --git a/src/IKVM.Java-ref/java/io/IOException.cs b/src/IKVM.Java-ref/java/io/IOException.cs new file mode 100644 index 0000000000..bcfb6ccb4f --- /dev/null +++ b/src/IKVM.Java-ref/java/io/IOException.cs @@ -0,0 +1,11 @@ +using java.lang; + +namespace java.io +{ + + public class IOException : Exception + { + + } + +} diff --git a/src/IKVM.Java-ref/java/lang/UnsupportedOperationException.cs b/src/IKVM.Java-ref/java/lang/UnsupportedOperationException.cs new file mode 100644 index 0000000000..69258d207f --- /dev/null +++ b/src/IKVM.Java-ref/java/lang/UnsupportedOperationException.cs @@ -0,0 +1,9 @@ +namespace java.lang +{ + + public class UnsupportedOperationException : RuntimeException + { + + } + +} diff --git a/src/IKVM.Java/local/sun/nio/fs/DotNetFileSystem.java b/src/IKVM.Java/local/sun/nio/fs/DotNetFileSystem.java index ef25aaa0b6..74093dc14c 100644 --- a/src/IKVM.Java/local/sun/nio/fs/DotNetFileSystem.java +++ b/src/IKVM.Java/local/sun/nio/fs/DotNetFileSystem.java @@ -211,296 +211,9 @@ public UserPrincipalLookupService getUserPrincipalLookupService() throw new UnsupportedOperationException(); } - static final class NetWatchService implements WatchService - { - static final WatchEvent overflowEvent = new WatchEvent() { - public Object context() { - return null; - } - public int count() { - return 1; - } - public WatchEvent.Kind kind() { - return StandardWatchEventKinds.OVERFLOW; - } - }; - private static final WatchKey CLOSED = new WatchKey() { - public boolean isValid() { return false; } - public List> pollEvents() { return null; } - public boolean reset() { return false; } - public void cancel() { } - public Watchable watchable() { return null; } - }; - private boolean closed; - private final ArrayList keys = new ArrayList<>(); - private final LinkedBlockingQueue queue = new LinkedBlockingQueue<>(); - - public synchronized void close() - { - if (!closed) - { - closed = true; - for (NetWatchKey key : keys) - { - key.close(); - } - enqueue(CLOSED); - } - } - - private WatchKey checkClosed(WatchKey key) - { - if (key == CLOSED) - { - enqueue(CLOSED); - throw new ClosedWatchServiceException(); - } - return key; - } - - public WatchKey poll() - { - return checkClosed(queue.poll()); - } - - public WatchKey poll(long timeout, TimeUnit unit) throws InterruptedException - { - return checkClosed(queue.poll(timeout, unit)); - } - - public WatchKey take() throws InterruptedException - { - return checkClosed(queue.take()); - } - - void enqueue(WatchKey key) - { - for (;;) - { - try - { - queue.put(key); - return; - } - catch (InterruptedException _) - { - } - } - } - - private final class NetWatchKey implements WatchKey - { - private final DotNetPath path; - private FileSystemWatcher fsw; - private ArrayList> list = new ArrayList<>(); - private HashSet modified = new HashSet<>(); - private boolean signaled; - - NetWatchKey(DotNetPath path) - { - this.path = path; - } - - synchronized void init(final boolean create, final boolean delete, final boolean modify, final boolean overflow, final boolean subtree) - { - if (fsw != null) - { - // we could reuse the FileSystemWatcher, but for now we just recreate it - // (and we run the risk of missing some events while we're doing that) - fsw.Dispose(); - fsw = null; - } - fsw = new FileSystemWatcher(path.path); - if (create) - { - fsw.add_Created(new FileSystemEventHandler(new FileSystemEventHandler.Method() { - public void Invoke(Object sender, FileSystemEventArgs e) { - addEvent(createEvent(e), null); - } - })); - } - if (delete) - { - fsw.add_Deleted(new FileSystemEventHandler(new FileSystemEventHandler.Method() { - public void Invoke(Object sender, FileSystemEventArgs e) { - addEvent(createEvent(e), null); - } - })); - } - if (modify) - { - fsw.add_Changed(new FileSystemEventHandler(new FileSystemEventHandler.Method() { - public void Invoke(Object sender, FileSystemEventArgs e) { - synchronized (NetWatchKey.this) { - if (modified.contains(e.get_Name())) { - // we already have an ENTRY_MODIFY event pending - return; - } - } - addEvent(createEvent(e), e.get_Name()); - } - })); - } - fsw.add_Error(new ErrorEventHandler(new ErrorEventHandler.Method() { - public void Invoke(Object sender, ErrorEventArgs e) { - if (e.GetException() instanceof cli.System.ComponentModel.Win32Exception - && ((cli.System.ComponentModel.Win32Exception)e.GetException()).get_ErrorCode() == -2147467259) { - // the directory we were watching was deleted - cancelledByError(); - } else if (overflow) { - addEvent(overflowEvent, null); - } - } - })); - if (subtree) - { - fsw.set_IncludeSubdirectories(true); - } - fsw.set_EnableRaisingEvents(true); - } - - WatchEvent createEvent(final FileSystemEventArgs e) - { - return new WatchEvent() { - public Path context() { - return new DotNetPath((DotNetFileSystem)path.getFileSystem(), e.get_Name()); - } - public int count() { - return 1; - } - public WatchEvent.Kind kind() { - switch (e.get_ChangeType().Value) { - case WatcherChangeTypes.Created: - return StandardWatchEventKinds.ENTRY_CREATE; - case WatcherChangeTypes.Deleted: - return StandardWatchEventKinds.ENTRY_DELETE; - default: - return StandardWatchEventKinds.ENTRY_MODIFY; - } - } - }; - } - - void cancelledByError() - { - cancel(); - synchronized (this) - { - if (!signaled) - { - signaled = true; - enqueue(this); - } - } - } - - synchronized void addEvent(WatchEvent event, String modified) - { - list.add(event); - if (modified != null) - { - this.modified.add(modified); - } - if (!signaled) - { - signaled = true; - enqueue(this); - } - } - - public synchronized boolean isValid() - { - return fsw != null; - } - - public synchronized List> pollEvents() - { - ArrayList> r = list; - list = new ArrayList<>(); - modified.clear(); - return r; - } - - public synchronized boolean reset() - { - if (fsw == null) - { - return false; - } - if (signaled) - { - if (list.size() == 0) - { - signaled = false; - } - else - { - enqueue(this); - } - } - return true; - } - - void close() - { - if (fsw != null) - { - fsw.Dispose(); - fsw = null; - } - } - - public void cancel() - { - synchronized (NetWatchService.this) - { - keys.remove(this); - close(); - } - } - - public Watchable watchable() - { - return path; - } - } - - synchronized WatchKey register(DotNetPath path, boolean create, boolean delete, boolean modify, boolean overflow, boolean subtree) - { - if (closed) - { - throw new ClosedWatchServiceException(); - } - NetWatchKey existing = null; - for (NetWatchKey key : keys) - { - if (key.watchable().equals(path)) - { - existing = key; - break; - } - } - if (existing == null) - { - existing = new NetWatchKey(path); - keys.add(existing); - } - try - { - existing.init(create, delete, modify, overflow, subtree); - } - catch (cli.System.IO.FileNotFoundException _) - { - // Ignore dotnet FileNotFoundException on EnableRaisingEvents=true - } - - return existing; - } - } - public WatchService newWatchService() throws IOException { - return new NetWatchService(); + return new DotNetWatchService(); } } diff --git a/src/IKVM.Java/local/sun/nio/fs/DotNetPath.java b/src/IKVM.Java/local/sun/nio/fs/DotNetPath.java index 5ee0e320e6..3af097e5f3 100644 --- a/src/IKVM.Java/local/sun/nio/fs/DotNetPath.java +++ b/src/IKVM.Java/local/sun/nio/fs/DotNetPath.java @@ -25,7 +25,6 @@ package sun.nio.fs; import com.sun.nio.file.ExtendedWatchEventModifier; -import com.sun.nio.file.SensitivityWatchEventModifier; import java.io.File; import java.io.IOException; import java.net.URI; @@ -513,73 +512,33 @@ public Path toRealPath(LinkOption... options) throws IOException public WatchKey register(WatchService watcher, WatchEvent.Kind[] events, WatchEvent.Modifier... modifiers) throws IOException { - if (!(watcher instanceof DotNetFileSystem.NetWatchService)) + if (!(watcher instanceof DotNetWatchService)) { // null check watcher.getClass(); throw new ProviderMismatchException(); } - boolean create = false; - boolean delete = false; - boolean modify = false; - boolean overflow = false; - boolean subtree = false; - for (WatchEvent.Kind kind : events) - { - if (kind == StandardWatchEventKinds.ENTRY_CREATE) - { - create = true; - } - else if (kind == StandardWatchEventKinds.ENTRY_DELETE) - { - delete = true; - } - else if (kind == StandardWatchEventKinds.ENTRY_MODIFY) - { - modify = true; - } - else if (kind == StandardWatchEventKinds.OVERFLOW) - { - overflow = true; - } - else - { - // null check - kind.getClass(); - throw new UnsupportedOperationException(); - } - } - if (!create && !delete && !modify) - { - throw new IllegalArgumentException(); - } - for (WatchEvent.Modifier modifier : modifiers) - { - if (modifier == ExtendedWatchEventModifier.FILE_TREE) - { - subtree = true; - } - else if (modifier instanceof SensitivityWatchEventModifier) - { - // ignore - } - else - { - // null check - modifier.getClass(); - throw new UnsupportedOperationException(); - } - } + SecurityManager sm = System.getSecurityManager(); if (sm != null) { + boolean subtree = false; + for(WatchEvent.Modifier modifier : modifiers) + { + if(modifier == ExtendedWatchEventModifier.FILE_TREE) + { + subtree = true; + break; + } + } + sm.checkRead(path); if (subtree) { sm.checkRead(path + cli.System.IO.Path.DirectorySeparatorChar + '-'); } } - return ((DotNetFileSystem.NetWatchService)watcher).register(this, create, delete, modify, overflow, subtree); + return ((DotNetWatchService)watcher).register(this, events, modifiers); } public int compareTo(Path other) diff --git a/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java b/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java new file mode 100644 index 0000000000..ebfb654e12 --- /dev/null +++ b/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java @@ -0,0 +1,72 @@ +package sun.nio.fs; + +import java.io.Closeable; +import java.nio.file.WatchEvent; +import java.util.concurrent.ConcurrentHashMap; + +final class DotNetWatchService extends AbstractWatchService { + private final ConcurrentHashMap keys = new ConcurrentHashMap(); + + @Override + void implClose() + throws IOException { + for (DotNetWatchKey key : keys.keySet()) { + key.close(); + } + + keys.clear(); + } + + @Override + DotNetWatchKey register(DotNetPath path, WatchEvent.Kind[] events, WatchEvent.Modifier... modifiers) + throws IOException { + if (!isOpen()) { + throw new ClosedWatchServiceException(); + } + + if (path == null) { + throw new ArgumentNullException(nameof(path)); + } + + final DotNetWatchKey key = keys.computeIfAbsent(path, c -> new DotNetWatchKey(c)); + register0(key, path, events, modifiers); + return key; + } + + void remove(DotNetPath dir) { + final DotNetWatchKey key = keys.remove(dir); + close0(key, dir); + } + + final class DotNetWatchKey extends AbstractWatchKey implements Closeable { + private final DotNetPath dir; + private Object state; + + DotNetWatchKey(DotNetPath dir) { + super(dir, DotNetWatchService.this); + this.dir = dir; + } + + @Override + public void cancel() { + synchronized (DotNetWatchService.this.closeLock()) { + DotNetWatchService.this.keys.remove(dir, this); + close(); + } + } + + @Override + public synchronized void close() throws IOException { + close0(this, dir); + } + + @Override + public boolean isValid() { + return state != null; + } + } + + static native void close0(DotNetWatchKey self, DotNetPath dir); + + static native void register0(DotNetWatchKey self, DotNetPath dir, WatchEvent.Kind[] events, WatchEvent.Modifier... modifiers); +} \ No newline at end of file diff --git a/src/IKVM.Runtime/Accessors/Com/Sun/Nio/File/ExtendedWatchEventModifierAccessor.cs b/src/IKVM.Runtime/Accessors/Com/Sun/Nio/File/ExtendedWatchEventModifierAccessor.cs new file mode 100644 index 0000000000..a2519ae653 --- /dev/null +++ b/src/IKVM.Runtime/Accessors/Com/Sun/Nio/File/ExtendedWatchEventModifierAccessor.cs @@ -0,0 +1,18 @@ +namespace IKVM.Runtime.Accessors.Com.Sun.Nio.File +{ +#if FIRST_PASS == false && EXPORTER == false && IMPORTER == false + + internal sealed class ExtendedWatchEventModifierAccessor : Accessor + { + private FieldAccessor fileTree; + + public object FILE_TREE => GetField(ref fileTree, nameof(FILE_TREE)).GetValue(); + + public ExtendedWatchEventModifierAccessor(AccessorTypeResolver resolver) + : base(resolver, "com.sun.nio.file.ExtendedWatchEventModifier") + { + } + } + +#endif +} diff --git a/src/IKVM.Runtime/Accessors/Com/Sun/Nio/File/SensitivityWatchEventModifierAccessor.cs b/src/IKVM.Runtime/Accessors/Com/Sun/Nio/File/SensitivityWatchEventModifierAccessor.cs new file mode 100644 index 0000000000..e283113064 --- /dev/null +++ b/src/IKVM.Runtime/Accessors/Com/Sun/Nio/File/SensitivityWatchEventModifierAccessor.cs @@ -0,0 +1,20 @@ +using System; + +namespace IKVM.Runtime.Accessors.Com.Sun.Nio.File +{ + +#if FIRST_PASS == false && EXPORTER == false && IMPORTER == false + + internal class SensitivityWatchEventModifierAccessor : Accessor + { + public SensitivityWatchEventModifierAccessor(AccessorTypeResolver resolver) + : base(resolver, "com.sun.nio.file.SensitivityWatchEventModifier") + { + } + + public bool Is(object self) => Type.IsInstanceOfType(self); + } + +#endif + +} diff --git a/src/IKVM.Runtime/Accessors/Java/Nio/File/StandardWatchEventKindsAccessor.cs b/src/IKVM.Runtime/Accessors/Java/Nio/File/StandardWatchEventKindsAccessor.cs new file mode 100644 index 0000000000..9401216b35 --- /dev/null +++ b/src/IKVM.Runtime/Accessors/Java/Nio/File/StandardWatchEventKindsAccessor.cs @@ -0,0 +1,29 @@ +namespace IKVM.Runtime.Accessors.Java.Nio.File +{ + +#if FIRST_PASS == false && EXPORTER == false && IMPORTER == false + + internal sealed class StandardWatchEventKindsAccessor : Accessor + { + private FieldAccessor entryCreate; + private FieldAccessor entryDelete; + private FieldAccessor entryModify; + private FieldAccessor overflow; + + public object ENTRY_CREATE => GetField(ref entryCreate, nameof(ENTRY_CREATE)).GetValue(); + + public object ENTRY_DELETE => GetField(ref entryDelete, nameof(ENTRY_DELETE)).GetValue(); + + public object ENTRY_MODIFY => GetField(ref entryModify, nameof(ENTRY_MODIFY)).GetValue(); + + public object OVERFLOW => GetField(ref overflow, nameof(OVERFLOW)).GetValue(); + + public StandardWatchEventKindsAccessor(AccessorTypeResolver resolver) + : base(resolver, "java.nio.file.StandardWatchEventKinds") + { + } + } + +#endif + +} \ No newline at end of file diff --git a/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs b/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs new file mode 100644 index 0000000000..2ee5a43fc2 --- /dev/null +++ b/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs @@ -0,0 +1,20 @@ +namespace IKVM.Runtime.Accessors.Sun.Nio.Fs +{ + +#if FIRST_PASS == false && EXPORTER == false && IMPORTER == false + + internal class DotNetWatchServiceKeyAccessor : Accessor + { + private FieldAccessor state; + + internal FieldAccessor State => GetField(ref state, "state"); + + public DotNetWatchServiceKeyAccessor(AccessorTypeResolver resolver) + : base(resolver, "sun.nio.fs.DotNetWatchService+DotNetWatchKey") + { + } + } + +#endif + +} diff --git a/src/IKVM.Runtime/Java/Externs/sun/nio/fs/DotNetWatchService.cs b/src/IKVM.Runtime/Java/Externs/sun/nio/fs/DotNetWatchService.cs new file mode 100644 index 0000000000..976b744cb4 --- /dev/null +++ b/src/IKVM.Runtime/Java/Externs/sun/nio/fs/DotNetWatchService.cs @@ -0,0 +1,31 @@ +using IKVM.Runtime.Accessors.Sun.Nio.Fs; +using usnfs = IKVM.Runtime.Util.Sun.Nio.Fs; + +namespace IKVM.Runtime.Java.Externs.sun.nio.fs +{ + public static partial class DotNetWatchService + { + public static void close0(object key) => close0Impl(key); + + public static void register0(object key, object dir, object[] events, params object[] modifiers) => register0Impl(key, dir, events, modifiers); + + static partial void close0Impl(object key); + + static partial void register0Impl(object key, object dir, object[] events, object[] modifiers); + } + +#if !FIRST_PASS + public static partial class DotNetWatchService + { + private static DotNetPathAccessor dotNetPath; + + private static DotNetPathAccessor DotNetPath => JVM.BaseAccessors.Get(ref dotNetPath); + + static partial void close0Impl(object key) + => usnfs.DotNetWatchService.Close(key); + + static partial void register0Impl(object key, object dir, object[] events, object[] modifiers) + => usnfs.DotNetWatchService.Register(key, DotNetPath.GetPath(dir), events, modifiers); + } +#endif +} \ No newline at end of file diff --git a/src/IKVM.Runtime/Util/Sun/Nio/Fs/DotNetWatchService.cs b/src/IKVM.Runtime/Util/Sun/Nio/Fs/DotNetWatchService.cs new file mode 100644 index 0000000000..888a773615 --- /dev/null +++ b/src/IKVM.Runtime/Util/Sun/Nio/Fs/DotNetWatchService.cs @@ -0,0 +1,145 @@ +using IKVM.Runtime.Accessors.Com.Sun.Nio.File; +using IKVM.Runtime.Accessors.Java.Nio.File; +using IKVM.Runtime.Accessors.Sun.Nio.Fs; +using System; +using System.IO; + +namespace IKVM.Runtime.Util.Sun.Nio.Fs +{ + +#if !FIRST_PASS + + internal static class DotNetWatchService + { + private static DotNetWatchServiceKeyAccessor dotNetWatchServiceKey; + private static ExtendedWatchEventModifierAccessor extendedWatchEventModifier; + private static SensitivityWatchEventModifierAccessor sensitivityWatchEventModifier; + private static StandardWatchEventKindsAccessor standardWatchEventKinds; + + private static DotNetWatchServiceKeyAccessor DotNetWatchServiceKey => JVM.BaseAccessors.Get(ref dotNetWatchServiceKey); + + private static ExtendedWatchEventModifierAccessor ExtendedWatchEventModifier => JVM.BaseAccessors.Get(ref extendedWatchEventModifier); + + private static SensitivityWatchEventModifierAccessor SensitivityWatchEventModifier => JVM.BaseAccessors.Get(ref sensitivityWatchEventModifier); + + private static StandardWatchEventKindsAccessor StandardWatchEventKinds => JVM.BaseAccessors.Get(ref standardWatchEventKinds); + + internal static void Close(object key) + { + if (DotNetWatchServiceKey.State.ExchangeValue(key, null) is not FileSystemWatcher fsw) + { + return; + } + + fsw.Dispose(); + } + + internal static void Register(object key, string dir, object[] events, object[] modifiers) + { + // we could reuse the FileSystemWatcher, but for now we just recreate it + // (and we run the risk of missing some events while we're doing that) + Close(key); + FileSystemWatcher watcher = null; + try + { + watcher = new FileSystemWatcher(dir); + WatchServiceHandler handler = new WatchServiceHandler(key); + bool valid = false; + foreach (var @event in events) + { + if (@event == StandardWatchEventKinds.OVERFLOW) + { + handler.Overflow = true; + } + else + { + valid = true; + if (@event == StandardWatchEventKinds.ENTRY_CREATE) + { + watcher.Created += handler.EventHandler; + } + else if (@event == StandardWatchEventKinds.ENTRY_DELETE) + { + watcher.Deleted += handler.EventHandler; + } + else if (@event == StandardWatchEventKinds.ENTRY_MODIFY) + { + watcher.Changed += handler.EventHandler; + } + else + { + @event.GetType(); + throw new global::java.lang.UnsupportedOperationException(); + } + } + } + + if (!valid) + { + throw new global::java.lang.IllegalArgumentException(); + } + + watcher.Error += handler.ErrorHandler; + foreach (var modifier in modifiers) + { + if (modifier == ExtendedWatchEventModifier.FILE_TREE) + { + watcher.IncludeSubdirectories = true; + } + else if (SensitivityWatchEventModifier.Is(modifier)) + { + } + else + { + modifier.GetType(); + throw new global::java.lang.UnsupportedOperationException(); + } + } + + watcher.EnableRaisingEvents = true; + DotNetWatchServiceKey.State.SetValue(key, watcher); + watcher = null; + } + catch (Exception e) when (e is ArgumentException or FileNotFoundException) + { + throw new global::java.io.FileNotFoundException(); + } + finally + { + watcher?.Dispose(); + } + } + + private class WatchServiceHandler + { + private readonly object key; + + public readonly ErrorEventHandler ErrorHandler; + + public readonly FileSystemEventHandler EventHandler; + + public bool Overflow { get; set; } + + public WatchServiceHandler(object key) + { + this.key = key; + ErrorHandler = OnError; + EventHandler = OnEvent; + } + + private void OnError(object sender, ErrorEventArgs e) + { + + } + + private void OnEvent(object sender, FileSystemEventArgs e) + { + + } + } + + } + +#endif + +} From 3c894eba1e3f418c2528d28809ccabdacdf8f8c1 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Wed, 26 Jul 2023 14:26:36 +0200 Subject: [PATCH 033/134] Implement event handler --- .../local/sun/nio/fs/DotNetWatchService.java | 9 +++++- .../Nio/Fs/DotNetWatchServiceKeyAccessor.cs | 19 +++++++++++- .../Externs/sun/nio/fs/DotNetWatchService.cs | 15 +++++++--- .../Util/Sun/Nio/Fs/DotNetWatchService.cs | 30 +++++++++++++++++-- 4 files changed, 64 insertions(+), 9 deletions(-) diff --git a/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java b/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java index ebfb654e12..28e904c93f 100644 --- a/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java +++ b/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java @@ -1,6 +1,7 @@ package sun.nio.fs; import java.io.Closeable; +import java.io.IOException; import java.nio.file.WatchEvent; import java.util.concurrent.ConcurrentHashMap; @@ -64,9 +65,15 @@ public synchronized void close() throws IOException { public boolean isValid() { return state != null; } + + void error() { + cancel(); + signal(); + } } static native void close0(DotNetWatchKey self, DotNetPath dir); - static native void register0(DotNetWatchKey self, DotNetPath dir, WatchEvent.Kind[] events, WatchEvent.Modifier... modifiers); + static native void register0(DotNetWatchKey self, DotNetPath dir, WatchEvent.Kind[] events, + WatchEvent.Modifier... modifiers); } \ No newline at end of file diff --git a/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs b/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs index 2ee5a43fc2..79a49cf56c 100644 --- a/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs +++ b/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs @@ -1,18 +1,35 @@ -namespace IKVM.Runtime.Accessors.Sun.Nio.Fs +using System; + +namespace IKVM.Runtime.Accessors.Sun.Nio.Fs { #if FIRST_PASS == false && EXPORTER == false && IMPORTER == false internal class DotNetWatchServiceKeyAccessor : Accessor { + private MethodAccessor> error0; + private MethodAccessor> signalEvent0; + private MethodAccessor> signalEvent1; private FieldAccessor state; + private Type watchEventKind; internal FieldAccessor State => GetField(ref state, "state"); + private Type WatchEventKind => watchEventKind ??= Resolve("java.nio.file.WatchEvent+Kind"); + public DotNetWatchServiceKeyAccessor(AccessorTypeResolver resolver) : base(resolver, "sun.nio.fs.DotNetWatchService+DotNetWatchKey") { } + + public void error(object self) + => (error0 ??= GetMethod(ref error0, nameof(error), null, default)).Invoker(self); + + public void signalEvent(object self) + => (signalEvent0 ??= GetMethod(ref signalEvent0, nameof(signalEvent), null, default).Invoker(self); + + public void signalEvent(object self, object kind, object context) + => (signalEvent1 ??= GetMethod(ref signalEvent1, nameof(signalEvent), null, Resolve("java.nio.file.WatchEvent.Kind"), typeof(object))).Invoker(self, kind, context); } #endif diff --git a/src/IKVM.Runtime/Java/Externs/sun/nio/fs/DotNetWatchService.cs b/src/IKVM.Runtime/Java/Externs/sun/nio/fs/DotNetWatchService.cs index 976b744cb4..f128287afd 100644 --- a/src/IKVM.Runtime/Java/Externs/sun/nio/fs/DotNetWatchService.cs +++ b/src/IKVM.Runtime/Java/Externs/sun/nio/fs/DotNetWatchService.cs @@ -5,18 +5,22 @@ namespace IKVM.Runtime.Java.Externs.sun.nio.fs { public static partial class DotNetWatchService { + public static void close0(object key) => close0Impl(key); - public static void register0(object key, object dir, object[] events, params object[] modifiers) => register0Impl(key, dir, events, modifiers); + public static void register0(object fs, object key, object dir, object[] events, params object[] modifiers) => register0Impl(fs, key, dir, events, modifiers); static partial void close0Impl(object key); - static partial void register0Impl(object key, object dir, object[] events, object[] modifiers); + static partial void register0Impl(object fs, object key, object dir, object[] events, object[] modifiers); + } #if !FIRST_PASS + public static partial class DotNetWatchService { + private static DotNetPathAccessor dotNetPath; private static DotNetPathAccessor DotNetPath => JVM.BaseAccessors.Get(ref dotNetPath); @@ -24,8 +28,11 @@ public static partial class DotNetWatchService static partial void close0Impl(object key) => usnfs.DotNetWatchService.Close(key); - static partial void register0Impl(object key, object dir, object[] events, object[] modifiers) - => usnfs.DotNetWatchService.Register(key, DotNetPath.GetPath(dir), events, modifiers); + static partial void register0Impl(object fs, object key, object dir, object[] events, object[] modifiers) + => usnfs.DotNetWatchService.Register(fs, key, DotNetPath.GetPath(dir), events, modifiers); + } + #endif + } \ No newline at end of file diff --git a/src/IKVM.Runtime/Util/Sun/Nio/Fs/DotNetWatchService.cs b/src/IKVM.Runtime/Util/Sun/Nio/Fs/DotNetWatchService.cs index 888a773615..ca03d6b769 100644 --- a/src/IKVM.Runtime/Util/Sun/Nio/Fs/DotNetWatchService.cs +++ b/src/IKVM.Runtime/Util/Sun/Nio/Fs/DotNetWatchService.cs @@ -1,6 +1,7 @@ using IKVM.Runtime.Accessors.Com.Sun.Nio.File; using IKVM.Runtime.Accessors.Java.Nio.File; using IKVM.Runtime.Accessors.Sun.Nio.Fs; +using IKVM.Runtime.Extensions; using System; using System.IO; @@ -11,11 +12,14 @@ namespace IKVM.Runtime.Util.Sun.Nio.Fs internal static class DotNetWatchService { + private static DotNetPathAccessor dotNetPath; private static DotNetWatchServiceKeyAccessor dotNetWatchServiceKey; private static ExtendedWatchEventModifierAccessor extendedWatchEventModifier; private static SensitivityWatchEventModifierAccessor sensitivityWatchEventModifier; private static StandardWatchEventKindsAccessor standardWatchEventKinds; + private static DotNetPathAccessor DotNetPath => JVM.BaseAccessors.Get(ref dotNetPath); + private static DotNetWatchServiceKeyAccessor DotNetWatchServiceKey => JVM.BaseAccessors.Get(ref dotNetWatchServiceKey); private static ExtendedWatchEventModifierAccessor ExtendedWatchEventModifier => JVM.BaseAccessors.Get(ref extendedWatchEventModifier); @@ -43,7 +47,7 @@ internal static void Register(object key, string dir, object[] events, object[] try { watcher = new FileSystemWatcher(dir); - WatchServiceHandler handler = new WatchServiceHandler(key); + WatchServiceHandler handler = new WatchServiceHandler(fs, key); bool valid = false; foreach (var @event in events) { @@ -88,6 +92,7 @@ internal static void Register(object key, string dir, object[] events, object[] } else if (SensitivityWatchEventModifier.Is(modifier)) { + // Ignore } else { @@ -112,6 +117,7 @@ internal static void Register(object key, string dir, object[] events, object[] private class WatchServiceHandler { + private readonly object fs; private readonly object key; public readonly ErrorEventHandler ErrorHandler; @@ -120,7 +126,7 @@ private class WatchServiceHandler public bool Overflow { get; set; } - public WatchServiceHandler(object key) + public WatchServiceHandler(object fs, object key) { this.key = key; ErrorHandler = OnError; @@ -129,13 +135,31 @@ public WatchServiceHandler(object key) private void OnError(object sender, ErrorEventArgs e) { + const int E_FAIL = unchecked((int)0x80004005); + if (e.GetException() is Win32Exception win32Exception + && win32Exception.ErrorCode == E_FAIL) + { + DotNetWatchServiceKey.error(key); + } + else if (overflow) + { + DotNetWatchServiceKey.signalEvent(key, + StandardWatchEventKinds.OVERFLOW, null); + } } private void OnEvent(object sender, FileSystemEventArgs e) { - + DotNetWatchServiceKey.signalEvent(key, + e.ChangeType switch + { + WatcherChangeTypes.Created => StandardWatchEventKinds.ENTRY_CREATE, + WatcherChangeTypes.Deleted => StandardWatchEventKinds.ENTRY_DELETE, + _ => StandardWatchEventKinds.ENTRY_MODIFY + }, DotNetPath.Init(fs, e.Name)); } + } } From afc2b9fb452ee454cddd93f0ff96a93e54687fb5 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Wed, 26 Jul 2023 14:50:48 +0200 Subject: [PATCH 034/134] Fix compilation --- .../local/sun/nio/fs/DotNetWatchService.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java b/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java index 28e904c93f..a08d8df1bf 100644 --- a/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java +++ b/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java @@ -2,7 +2,11 @@ import java.io.Closeable; import java.io.IOException; +import java.lang.IllegalArgumentException; +import java.nio.file.ClosedWatchServiceException; +import java.nio.file.Path; import java.nio.file.WatchEvent; +import java.nio.file.WatchKey; import java.util.concurrent.ConcurrentHashMap; final class DotNetWatchService extends AbstractWatchService { @@ -11,7 +15,7 @@ final class DotNetWatchService extends AbstractWatchService { @Override void implClose() throws IOException { - for (DotNetWatchKey key : keys.keySet()) { + for (DotNetWatchKey key : keys.values()) { key.close(); } @@ -19,18 +23,19 @@ void implClose() } @Override - DotNetWatchKey register(DotNetPath path, WatchEvent.Kind[] events, WatchEvent.Modifier... modifiers) + WatchKey register(Path path, WatchEvent.Kind[] events, WatchEvent.Modifier... modifiers) throws IOException { if (!isOpen()) { throw new ClosedWatchServiceException(); } - - if (path == null) { - throw new ArgumentNullException(nameof(path)); + if (!(path instanceof DotNetPath)) { + path.getClass(); + throw new ProviderMismatchException(); } + final DotNetPath dir = (DotNetPath)path; - final DotNetWatchKey key = keys.computeIfAbsent(path, c -> new DotNetWatchKey(c)); - register0(key, path, events, modifiers); + final DotNetWatchKey key = keys.computeIfAbsent(dir, c -> new DotNetWatchKey(c)); + register0(key, dir, events, modifiers); return key; } From ee1470b54fbb71843e8851199a91cb22977c4cfb Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Wed, 26 Jul 2023 14:59:22 +0200 Subject: [PATCH 035/134] Missing imports --- src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java b/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java index a08d8df1bf..afc4f87a16 100644 --- a/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java +++ b/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java @@ -5,6 +5,7 @@ import java.lang.IllegalArgumentException; import java.nio.file.ClosedWatchServiceException; import java.nio.file.Path; +import java.nio.file.ProviderMismatchException; import java.nio.file.WatchEvent; import java.nio.file.WatchKey; import java.util.concurrent.ConcurrentHashMap; From 4af40666d592bbf0b7c8f7da6b18f481d5e6a71b Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Wed, 26 Jul 2023 15:05:04 +0200 Subject: [PATCH 036/134] Update close sig --- src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java b/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java index afc4f87a16..bfdc366555 100644 --- a/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java +++ b/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java @@ -63,7 +63,7 @@ public void cancel() { } @Override - public synchronized void close() throws IOException { + public synchronized void close() { close0(this, dir); } From d2305bb959207f5130739f0bc0abe9b6d783a74c Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Wed, 26 Jul 2023 15:28:27 +0200 Subject: [PATCH 037/134] Fix compile --- .../Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs b/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs index 79a49cf56c..7d90996b79 100644 --- a/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs +++ b/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs @@ -26,10 +26,10 @@ public void error(object self) => (error0 ??= GetMethod(ref error0, nameof(error), null, default)).Invoker(self); public void signalEvent(object self) - => (signalEvent0 ??= GetMethod(ref signalEvent0, nameof(signalEvent), null, default).Invoker(self); + => (signalEvent0 ??= GetMethod(ref signalEvent0, nameof(signalEvent), null, default)).Invoker(self); public void signalEvent(object self, object kind, object context) - => (signalEvent1 ??= GetMethod(ref signalEvent1, nameof(signalEvent), null, Resolve("java.nio.file.WatchEvent.Kind"), typeof(object))).Invoker(self, kind, context); + => (signalEvent1 ??= GetMethod(ref signalEvent1, nameof(signalEvent), null, WatchEventKind, typeof(object))).Invoker(self, kind, context); } #endif From f15fbfad97c0f58782c270b9c55550be7ebe5600 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Wed, 26 Jul 2023 15:35:09 +0200 Subject: [PATCH 038/134] Add missing argument --- src/IKVM.Runtime/Util/Sun/Nio/Fs/DotNetWatchService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/IKVM.Runtime/Util/Sun/Nio/Fs/DotNetWatchService.cs b/src/IKVM.Runtime/Util/Sun/Nio/Fs/DotNetWatchService.cs index ca03d6b769..b9e55a6b68 100644 --- a/src/IKVM.Runtime/Util/Sun/Nio/Fs/DotNetWatchService.cs +++ b/src/IKVM.Runtime/Util/Sun/Nio/Fs/DotNetWatchService.cs @@ -38,7 +38,7 @@ internal static void Close(object key) fsw.Dispose(); } - internal static void Register(object key, string dir, object[] events, object[] modifiers) + internal static void Register(object fs, object key, string dir, object[] events, object[] modifiers) { // we could reuse the FileSystemWatcher, but for now we just recreate it // (and we run the risk of missing some events while we're doing that) From f5ad403ecccdf3221bb8ebe8bd57c4c900eb18ce Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Wed, 26 Jul 2023 15:36:37 +0200 Subject: [PATCH 039/134] Fix compile --- src/IKVM.Runtime/Util/Sun/Nio/Fs/DotNetWatchService.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/IKVM.Runtime/Util/Sun/Nio/Fs/DotNetWatchService.cs b/src/IKVM.Runtime/Util/Sun/Nio/Fs/DotNetWatchService.cs index b9e55a6b68..4f56cd872e 100644 --- a/src/IKVM.Runtime/Util/Sun/Nio/Fs/DotNetWatchService.cs +++ b/src/IKVM.Runtime/Util/Sun/Nio/Fs/DotNetWatchService.cs @@ -3,6 +3,7 @@ using IKVM.Runtime.Accessors.Sun.Nio.Fs; using IKVM.Runtime.Extensions; using System; +using System.ComponentModel; using System.IO; namespace IKVM.Runtime.Util.Sun.Nio.Fs @@ -142,7 +143,7 @@ private void OnError(object sender, ErrorEventArgs e) { DotNetWatchServiceKey.error(key); } - else if (overflow) + else if (Overflow) { DotNetWatchServiceKey.signalEvent(key, StandardWatchEventKinds.OVERFLOW, null); From b7239f98bdeabcd2cd127bf11189f1a04d0cf8f5 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Wed, 26 Jul 2023 21:03:28 +0200 Subject: [PATCH 040/134] Fix link --- src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java | 5 ++--- .../Java/Externs/sun/nio/fs/DotNetWatchService.cs | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java b/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java index bfdc366555..3dc4f19c5a 100644 --- a/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java +++ b/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java @@ -78,8 +78,7 @@ void error() { } } - static native void close0(DotNetWatchKey self, DotNetPath dir); + static native void close0(Object self, Object dir); - static native void register0(DotNetWatchKey self, DotNetPath dir, WatchEvent.Kind[] events, - WatchEvent.Modifier... modifiers); + static native void register0(Object self, Object dir, Object[] events, Object... modifiers); } \ No newline at end of file diff --git a/src/IKVM.Runtime/Java/Externs/sun/nio/fs/DotNetWatchService.cs b/src/IKVM.Runtime/Java/Externs/sun/nio/fs/DotNetWatchService.cs index f128287afd..3072e1c83e 100644 --- a/src/IKVM.Runtime/Java/Externs/sun/nio/fs/DotNetWatchService.cs +++ b/src/IKVM.Runtime/Java/Externs/sun/nio/fs/DotNetWatchService.cs @@ -1,9 +1,9 @@ using IKVM.Runtime.Accessors.Sun.Nio.Fs; using usnfs = IKVM.Runtime.Util.Sun.Nio.Fs; -namespace IKVM.Runtime.Java.Externs.sun.nio.fs +namespace IKVM.Java.Externs.sun.nio.fs { - public static partial class DotNetWatchService + internal static partial class DotNetWatchService { public static void close0(object key) => close0Impl(key); @@ -18,7 +18,7 @@ public static partial class DotNetWatchService #if !FIRST_PASS - public static partial class DotNetWatchService + internal static partial class DotNetWatchService { private static DotNetPathAccessor dotNetPath; From afac9fd0d941f52a11ee63bc5657969cd5460075 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Wed, 26 Jul 2023 21:22:50 +0200 Subject: [PATCH 041/134] Fix compile --- .../Java/Externs/sun/nio/fs/DotNetWatchService.cs | 6 +----- src/IKVM.Runtime/Util/Sun/Nio/Fs/DotNetWatchService.cs | 3 +++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/IKVM.Runtime/Java/Externs/sun/nio/fs/DotNetWatchService.cs b/src/IKVM.Runtime/Java/Externs/sun/nio/fs/DotNetWatchService.cs index 3072e1c83e..241bd19327 100644 --- a/src/IKVM.Runtime/Java/Externs/sun/nio/fs/DotNetWatchService.cs +++ b/src/IKVM.Runtime/Java/Externs/sun/nio/fs/DotNetWatchService.cs @@ -21,15 +21,11 @@ internal static partial class DotNetWatchService internal static partial class DotNetWatchService { - private static DotNetPathAccessor dotNetPath; - - private static DotNetPathAccessor DotNetPath => JVM.BaseAccessors.Get(ref dotNetPath); - static partial void close0Impl(object key) => usnfs.DotNetWatchService.Close(key); static partial void register0Impl(object fs, object key, object dir, object[] events, object[] modifiers) - => usnfs.DotNetWatchService.Register(fs, key, DotNetPath.GetPath(dir), events, modifiers); + => usnfs.DotNetWatchService.Register(fs, key, dir, events, modifiers); } diff --git a/src/IKVM.Runtime/Util/Sun/Nio/Fs/DotNetWatchService.cs b/src/IKVM.Runtime/Util/Sun/Nio/Fs/DotNetWatchService.cs index 4f56cd872e..81d4faa941 100644 --- a/src/IKVM.Runtime/Util/Sun/Nio/Fs/DotNetWatchService.cs +++ b/src/IKVM.Runtime/Util/Sun/Nio/Fs/DotNetWatchService.cs @@ -39,6 +39,9 @@ internal static void Close(object key) fsw.Dispose(); } + internal static void Register(object fs, object key, object dir, object[] events, object[] modifiers) + => Register(fs, key, DotNetPath.GetPath(dir), events, modifiers); + internal static void Register(object fs, object key, string dir, object[] events, object[] modifiers) { // we could reuse the FileSystemWatcher, but for now we just recreate it From 9481a6e80a888d209298bc18ffb18841a09845b6 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Wed, 26 Jul 2023 21:35:41 +0200 Subject: [PATCH 042/134] Format --- .../Externs/sun/nio/fs/DotNetWatchService.cs | 40 +++++++++---------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/src/IKVM.Runtime/Java/Externs/sun/nio/fs/DotNetWatchService.cs b/src/IKVM.Runtime/Java/Externs/sun/nio/fs/DotNetWatchService.cs index 241bd19327..b325be8f6c 100644 --- a/src/IKVM.Runtime/Java/Externs/sun/nio/fs/DotNetWatchService.cs +++ b/src/IKVM.Runtime/Java/Externs/sun/nio/fs/DotNetWatchService.cs @@ -1,3 +1,4 @@ +using System; using IKVM.Runtime.Accessors.Sun.Nio.Fs; using usnfs = IKVM.Runtime.Util.Sun.Nio.Fs; @@ -6,29 +7,24 @@ namespace IKVM.Java.Externs.sun.nio.fs internal static partial class DotNetWatchService { - public static void close0(object key) => close0Impl(key); - - public static void register0(object fs, object key, object dir, object[] events, params object[] modifiers) => register0Impl(fs, key, dir, events, modifiers); - - static partial void close0Impl(object key); - - static partial void register0Impl(object fs, object key, object dir, object[] events, object[] modifiers); - - } - -#if !FIRST_PASS - - internal static partial class DotNetWatchService - { - - static partial void close0Impl(object key) - => usnfs.DotNetWatchService.Close(key); - - static partial void register0Impl(object fs, object key, object dir, object[] events, object[] modifiers) - => usnfs.DotNetWatchService.Register(fs, key, dir, events, modifiers); + public static void close0(object key) + { +#if FIRST_PASS + throw new NotImplementedException(); +#else + usnfs.DotNetWatchService.Close(key); +#endif + } + + public static void register0(object fs, object key, object dir, object[] events, params object[] modifiers) + { +#if FIRST_PASS + throw new NotImplementedException(); +#else + usnfs.DotNetWatchService.Register(fs, key, dir, events, modifiers); +#endif + } } -#endif - } \ No newline at end of file From dcaf3fe2b65aec7e77fa35dd969178d608bc80f0 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Thu, 27 Jul 2023 00:11:34 +0200 Subject: [PATCH 043/134] Link --- .../local/sun/nio/fs/DotNetFileSystem.java | 2 +- .../local/sun/nio/fs/DotNetWatchService.java | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/IKVM.Java/local/sun/nio/fs/DotNetFileSystem.java b/src/IKVM.Java/local/sun/nio/fs/DotNetFileSystem.java index 74093dc14c..523a00a082 100644 --- a/src/IKVM.Java/local/sun/nio/fs/DotNetFileSystem.java +++ b/src/IKVM.Java/local/sun/nio/fs/DotNetFileSystem.java @@ -213,7 +213,7 @@ public UserPrincipalLookupService getUserPrincipalLookupService() public WatchService newWatchService() throws IOException { - return new DotNetWatchService(); + return new DotNetWatchService(this); } } diff --git a/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java b/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java index 3dc4f19c5a..5cf092d1a3 100644 --- a/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java +++ b/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java @@ -11,8 +11,13 @@ import java.util.concurrent.ConcurrentHashMap; final class DotNetWatchService extends AbstractWatchService { + private final DotNetFileSystem fs; private final ConcurrentHashMap keys = new ConcurrentHashMap(); + DotNetWatchService(DotNetFileSystem fs) { + this.fs = fs; + } + @Override void implClose() throws IOException { @@ -33,18 +38,13 @@ WatchKey register(Path path, WatchEvent.Kind[] events, WatchEvent.Modifier... path.getClass(); throw new ProviderMismatchException(); } - final DotNetPath dir = (DotNetPath)path; + final DotNetPath dir = (DotNetPath) path; final DotNetWatchKey key = keys.computeIfAbsent(dir, c -> new DotNetWatchKey(c)); - register0(key, dir, events, modifiers); + register0(fs, key, dir, events, (Object[]) modifiers); return key; } - void remove(DotNetPath dir) { - final DotNetWatchKey key = keys.remove(dir); - close0(key, dir); - } - final class DotNetWatchKey extends AbstractWatchKey implements Closeable { private final DotNetPath dir; private Object state; @@ -64,7 +64,7 @@ public void cancel() { @Override public synchronized void close() { - close0(this, dir); + close0(this); } @Override @@ -78,7 +78,7 @@ void error() { } } - static native void close0(Object self, Object dir); + static native void close0(Object key); - static native void register0(Object self, Object dir, Object[] events, Object... modifiers); + static native void register0(Object fs, Object key, Object dir, Object[] events, Object... modifiers); } \ No newline at end of file From 4baf23f288400fdddf9947dc224487020bd8dda1 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Fri, 28 Jul 2023 10:36:09 +0200 Subject: [PATCH 044/134] Fix ITLConstructor test (port upstream changes) Refs: 8031050, 8059677, 8171388 --- src/IKVM.Java/local/java/lang/Thread.java | 27 ++++++++++++++--------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/src/IKVM.Java/local/java/lang/Thread.java b/src/IKVM.Java/local/java/lang/Thread.java index dabf278766..b48ef57efe 100644 --- a/src/IKVM.Java/local/java/lang/Thread.java +++ b/src/IKVM.Java/local/java/lang/Thread.java @@ -173,7 +173,7 @@ protected void finalize() { int parkState; // used by cmpxchgParkState in map.xml /* --- end IKVM specific state --- */ - private volatile char name[]; + private volatile String name; private int priority; private Thread threadQ; private long eetop; @@ -448,11 +448,11 @@ public static void sleep(long millis, int nanos) /** * Initializes a Thread with the current AccessControlContext. - * @see #init(ThreadGroup,Runnable,String,long,AccessControlContext) + * @see #init(ThreadGroup,Runnable,String,long,AccessControlContext,boolean) */ private void init(ThreadGroup g, Runnable target, String name, long stackSize) { - init(g, target, name, stackSize, null); + init(g, target, name, stackSize, null, true); } /** @@ -465,14 +465,17 @@ private void init(ThreadGroup g, Runnable target, String name, * zero to indicate that this parameter is to be ignored. * @param acc the AccessControlContext to inherit, or * AccessController.getContext() if null + * @param inheritThreadLocals if {@code true}, inherit initial values for + * inheritable thread-locals from the constructing thread */ private void init(ThreadGroup g, Runnable target, String name, - long stackSize, AccessControlContext acc) { + long stackSize, AccessControlContext acc, + boolean inheritThreadLocals) { if (name == null) { throw new NullPointerException("name cannot be null"); } - this.name = name.toCharArray(); + this.name = name; Thread parent = currentThread(); SecurityManager security = System.getSecurityManager(); @@ -518,7 +521,7 @@ private void init(ThreadGroup g, Runnable target, String name, acc != null ? acc : AccessController.getLazyContext(parent.inheritedAccessControlContext); this.target = target; setPriority(priority); - if (parent.inheritableThreadLocals != null) + if (inheritThreadLocals && parent.inheritableThreadLocals != null) this.inheritableThreadLocals = ThreadLocal.createInheritedMap(parent.inheritableThreadLocals); /* Stash the specified stack size in case the VM cares */ @@ -541,7 +544,7 @@ private void init(ThreadGroup g, Runnable target, String name, this.group = g; this.daemon = thread.get_IsBackground(); this.priority = mapClrPriorityToJava(thread.get_Priority().Value); - this.name = name.toCharArray(); + this.name = name; this.contextClassLoader = ClassLoader.DUMMY; this.threadStatus = 0x0005; /* JVMTI_THREAD_STATE_ALIVE + JVMTI_THREAD_STATE_RUNNABLE */ @@ -645,7 +648,7 @@ public Thread(Runnable target) { * This is not a public constructor. */ Thread(Runnable target, AccessControlContext acc) { - init(null, target, "Thread-" + nextThreadNum(), 0, acc); + init(null, target, "Thread-" + nextThreadNum(), 0, acc, false); } /** @@ -1393,7 +1396,11 @@ public final int getPriority() { */ public final synchronized void setName(String name) { checkAccess(); - this.name = name.toCharArray(); + if (name == null) { + throw new NullPointerException("name cannot be null"); + } + + this.name = name; if (threadStatus != 0) { setNativeName(name); } @@ -1406,7 +1413,7 @@ public final synchronized void setName(String name) { * @see #setName(String) */ public final String getName() { - return String.valueOf(name); + return name; } /** From f9f7ea7aec13e1aa6eb8d19a08c2f6a7d1aa5bf5 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Fri, 28 Jul 2023 10:36:17 +0200 Subject: [PATCH 045/134] Unsupported --- src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt index 8fbc149c1e..a97e2cc2da 100644 --- a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt +++ b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt @@ -3427,3 +3427,6 @@ java/lang/invoke/CustomizedLambdaFormTest.java # Shell fails on Windows sun/security/tools/keytool/keyalg.sh windows-all + +# Class(-Loader) GC not supported +javax/management/mxbean/MXBeanLoadingTest1.java generic-all From 4bf18d0248022f3c4377868b080c4527096c189d Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Fri, 28 Jul 2023 10:36:24 +0200 Subject: [PATCH 046/134] Fix dead-lock --- src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java b/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java index 5cf092d1a3..c143f4d536 100644 --- a/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java +++ b/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java @@ -56,14 +56,13 @@ final class DotNetWatchKey extends AbstractWatchKey implements Closeable { @Override public void cancel() { - synchronized (DotNetWatchService.this.closeLock()) { - DotNetWatchService.this.keys.remove(dir, this); + if (DotNetWatchService.this.keys.remove(dir, this)) { close(); } } @Override - public synchronized void close() { + public void close() { close0(this); } From 71a5062c0dfc49094279d37fadf423feb26fe64a Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Fri, 28 Jul 2023 15:18:17 +0200 Subject: [PATCH 047/134] Fix VM crash on access --- .../Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs b/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs index 7d90996b79..7cff74a21a 100644 --- a/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs +++ b/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs @@ -11,10 +11,13 @@ internal class DotNetWatchServiceKeyAccessor : Accessor private MethodAccessor> signalEvent0; private MethodAccessor> signalEvent1; private FieldAccessor state; + private Type voidType; private Type watchEventKind; internal FieldAccessor State => GetField(ref state, "state"); + private TypeFlags Void => voidType ??= typeof(void); + private Type WatchEventKind => watchEventKind ??= Resolve("java.nio.file.WatchEvent+Kind"); public DotNetWatchServiceKeyAccessor(AccessorTypeResolver resolver) @@ -23,13 +26,13 @@ public DotNetWatchServiceKeyAccessor(AccessorTypeResolver resolver) } public void error(object self) - => (error0 ??= GetMethod(ref error0, nameof(error), null, default)).Invoker(self); + => (error0 ??= GetMethod(ref error0, nameof(error), Void, default)).Invoker(self); public void signalEvent(object self) - => (signalEvent0 ??= GetMethod(ref signalEvent0, nameof(signalEvent), null, default)).Invoker(self); + => (signalEvent0 ??= GetMethod(ref signalEvent0, nameof(signalEvent), Void default)).Invoker(self); public void signalEvent(object self, object kind, object context) - => (signalEvent1 ??= GetMethod(ref signalEvent1, nameof(signalEvent), null, WatchEventKind, typeof(object))).Invoker(self, kind, context); + => (signalEvent1 ??= GetMethod(ref signalEvent1, nameof(signalEvent), Void, WatchEventKind, typeof(object))).Invoker(self, kind, context); } #endif From ad58b30ef6b90939b7673b4f3da2c6467e057b08 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Fri, 28 Jul 2023 15:39:38 +0200 Subject: [PATCH 048/134] Policy paths have changed --- openjdk.props | 2 -- 1 file changed, 2 deletions(-) diff --git a/openjdk.props b/openjdk.props index aaafdf9306..638103eb4c 100644 --- a/openjdk.props +++ b/openjdk.props @@ -1777,8 +1777,6 @@ - - From fcf6fb25ca52c1d2998c7038627afec5378687c9 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Fri, 28 Jul 2023 15:48:00 +0200 Subject: [PATCH 049/134] Typo --- .../Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs b/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs index 7cff74a21a..e5d425e2a4 100644 --- a/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs +++ b/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs @@ -29,7 +29,7 @@ public void error(object self) => (error0 ??= GetMethod(ref error0, nameof(error), Void, default)).Invoker(self); public void signalEvent(object self) - => (signalEvent0 ??= GetMethod(ref signalEvent0, nameof(signalEvent), Void default)).Invoker(self); + => (signalEvent0 ??= GetMethod(ref signalEvent0, nameof(signalEvent), Void, default)).Invoker(self); public void signalEvent(object self, object kind, object context) => (signalEvent1 ??= GetMethod(ref signalEvent1, nameof(signalEvent), Void, WatchEventKind, typeof(object))).Invoker(self, kind, context); From 1fb54a1c13fb0a62f3ebf97be71dd6b26a772de4 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Fri, 28 Jul 2023 16:03:27 +0200 Subject: [PATCH 050/134] Typo --- .../Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs b/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs index e5d425e2a4..404e641f8d 100644 --- a/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs +++ b/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs @@ -16,7 +16,7 @@ internal class DotNetWatchServiceKeyAccessor : Accessor internal FieldAccessor State => GetField(ref state, "state"); - private TypeFlags Void => voidType ??= typeof(void); + private Type Void => voidType ??= typeof(void); private Type WatchEventKind => watchEventKind ??= Resolve("java.nio.file.WatchEvent+Kind"); From 53125744822fe24f56c98c0a9480372b49b477c6 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Fri, 28 Jul 2023 18:56:05 +0200 Subject: [PATCH 051/134] Fix sig --- .../Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs b/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs index 404e641f8d..6e561c826c 100644 --- a/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs +++ b/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs @@ -26,10 +26,10 @@ public DotNetWatchServiceKeyAccessor(AccessorTypeResolver resolver) } public void error(object self) - => (error0 ??= GetMethod(ref error0, nameof(error), Void, default)).Invoker(self); + => (error0 ??= GetMethod(ref error0, nameof(error), Void)).Invoker(self); public void signalEvent(object self) - => (signalEvent0 ??= GetMethod(ref signalEvent0, nameof(signalEvent), Void, default)).Invoker(self); + => (signalEvent0 ??= GetMethod(ref signalEvent0, nameof(signalEvent), Void)).Invoker(self); public void signalEvent(object self, object kind, object context) => (signalEvent1 ??= GetMethod(ref signalEvent1, nameof(signalEvent), Void, WatchEventKind, typeof(object))).Invoker(self, kind, context); From 61abed4a5751c4327181e6043f96e29f27a0d435 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Mon, 31 Jul 2023 10:39:56 +0200 Subject: [PATCH 052/134] Default to unlimited policy --- .../ikvm/any/linux-arm/lib/security/java.security | 2 +- .../ikvm/any/linux-arm64/lib/security/java.security | 2 +- .../ikvm/any/linux-musl-arm/lib/security/java.security | 2 +- .../ikvm/any/linux-musl-arm64/lib/security/java.security | 2 +- .../ikvm/any/linux-musl-x64/lib/security/java.security | 2 +- .../ikvm/any/linux-x64/lib/security/java.security | 2 +- .../ikvm/any/osx-x64/lib/security/java.security | 2 +- .../ikvm/any/win7-x64/lib/security/java.security | 2 +- .../ikvm/any/win7-x86/lib/security/java.security | 2 +- .../ikvm/any/win81-arm/lib/security/java.security | 2 +- src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt | 8 +++++--- src/dist-image/ikvm/lib/security/java.security | 2 +- 12 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/IKVM.Image/ikvm/any/linux-arm/lib/security/java.security b/src/IKVM.Image/ikvm/any/linux-arm/lib/security/java.security index 659f8a3e6b..d8162670a2 100644 --- a/src/IKVM.Image/ikvm/any/linux-arm/lib/security/java.security +++ b/src/IKVM.Image/ikvm/any/linux-arm/lib/security/java.security @@ -798,7 +798,7 @@ jdk.tls.legacyAlgorithms= \ # # Please see the JCA documentation for additional information on these # files and formats. -#crypto.policy=unlimited +crypto.policy=unlimited # # The policy for the XML Signature secure validation mode. The mode is diff --git a/src/IKVM.Image/ikvm/any/linux-arm64/lib/security/java.security b/src/IKVM.Image/ikvm/any/linux-arm64/lib/security/java.security index 659f8a3e6b..d8162670a2 100644 --- a/src/IKVM.Image/ikvm/any/linux-arm64/lib/security/java.security +++ b/src/IKVM.Image/ikvm/any/linux-arm64/lib/security/java.security @@ -798,7 +798,7 @@ jdk.tls.legacyAlgorithms= \ # # Please see the JCA documentation for additional information on these # files and formats. -#crypto.policy=unlimited +crypto.policy=unlimited # # The policy for the XML Signature secure validation mode. The mode is diff --git a/src/IKVM.Image/ikvm/any/linux-musl-arm/lib/security/java.security b/src/IKVM.Image/ikvm/any/linux-musl-arm/lib/security/java.security index 659f8a3e6b..d8162670a2 100644 --- a/src/IKVM.Image/ikvm/any/linux-musl-arm/lib/security/java.security +++ b/src/IKVM.Image/ikvm/any/linux-musl-arm/lib/security/java.security @@ -798,7 +798,7 @@ jdk.tls.legacyAlgorithms= \ # # Please see the JCA documentation for additional information on these # files and formats. -#crypto.policy=unlimited +crypto.policy=unlimited # # The policy for the XML Signature secure validation mode. The mode is diff --git a/src/IKVM.Image/ikvm/any/linux-musl-arm64/lib/security/java.security b/src/IKVM.Image/ikvm/any/linux-musl-arm64/lib/security/java.security index 659f8a3e6b..d8162670a2 100644 --- a/src/IKVM.Image/ikvm/any/linux-musl-arm64/lib/security/java.security +++ b/src/IKVM.Image/ikvm/any/linux-musl-arm64/lib/security/java.security @@ -798,7 +798,7 @@ jdk.tls.legacyAlgorithms= \ # # Please see the JCA documentation for additional information on these # files and formats. -#crypto.policy=unlimited +crypto.policy=unlimited # # The policy for the XML Signature secure validation mode. The mode is diff --git a/src/IKVM.Image/ikvm/any/linux-musl-x64/lib/security/java.security b/src/IKVM.Image/ikvm/any/linux-musl-x64/lib/security/java.security index 659f8a3e6b..d8162670a2 100644 --- a/src/IKVM.Image/ikvm/any/linux-musl-x64/lib/security/java.security +++ b/src/IKVM.Image/ikvm/any/linux-musl-x64/lib/security/java.security @@ -798,7 +798,7 @@ jdk.tls.legacyAlgorithms= \ # # Please see the JCA documentation for additional information on these # files and formats. -#crypto.policy=unlimited +crypto.policy=unlimited # # The policy for the XML Signature secure validation mode. The mode is diff --git a/src/IKVM.Image/ikvm/any/linux-x64/lib/security/java.security b/src/IKVM.Image/ikvm/any/linux-x64/lib/security/java.security index 659f8a3e6b..d8162670a2 100644 --- a/src/IKVM.Image/ikvm/any/linux-x64/lib/security/java.security +++ b/src/IKVM.Image/ikvm/any/linux-x64/lib/security/java.security @@ -798,7 +798,7 @@ jdk.tls.legacyAlgorithms= \ # # Please see the JCA documentation for additional information on these # files and formats. -#crypto.policy=unlimited +crypto.policy=unlimited # # The policy for the XML Signature secure validation mode. The mode is diff --git a/src/IKVM.Image/ikvm/any/osx-x64/lib/security/java.security b/src/IKVM.Image/ikvm/any/osx-x64/lib/security/java.security index 22dc0d2d1a..2a917e4a69 100644 --- a/src/IKVM.Image/ikvm/any/osx-x64/lib/security/java.security +++ b/src/IKVM.Image/ikvm/any/osx-x64/lib/security/java.security @@ -800,7 +800,7 @@ jdk.tls.legacyAlgorithms= \ # # Please see the JCA documentation for additional information on these # files and formats. -#crypto.policy=unlimited +crypto.policy=unlimited # # The policy for the XML Signature secure validation mode. The mode is diff --git a/src/IKVM.Image/ikvm/any/win7-x64/lib/security/java.security b/src/IKVM.Image/ikvm/any/win7-x64/lib/security/java.security index 0d6c53ed22..0a769887ed 100644 --- a/src/IKVM.Image/ikvm/any/win7-x64/lib/security/java.security +++ b/src/IKVM.Image/ikvm/any/win7-x64/lib/security/java.security @@ -800,7 +800,7 @@ jdk.tls.legacyAlgorithms= \ # # Please see the JCA documentation for additional information on these # files and formats. -#crypto.policy=unlimited +crypto.policy=unlimited # # The policy for the XML Signature secure validation mode. The mode is diff --git a/src/IKVM.Image/ikvm/any/win7-x86/lib/security/java.security b/src/IKVM.Image/ikvm/any/win7-x86/lib/security/java.security index 0d6c53ed22..0a769887ed 100644 --- a/src/IKVM.Image/ikvm/any/win7-x86/lib/security/java.security +++ b/src/IKVM.Image/ikvm/any/win7-x86/lib/security/java.security @@ -800,7 +800,7 @@ jdk.tls.legacyAlgorithms= \ # # Please see the JCA documentation for additional information on these # files and formats. -#crypto.policy=unlimited +crypto.policy=unlimited # # The policy for the XML Signature secure validation mode. The mode is diff --git a/src/IKVM.Image/ikvm/any/win81-arm/lib/security/java.security b/src/IKVM.Image/ikvm/any/win81-arm/lib/security/java.security index 0d6c53ed22..0a769887ed 100644 --- a/src/IKVM.Image/ikvm/any/win81-arm/lib/security/java.security +++ b/src/IKVM.Image/ikvm/any/win81-arm/lib/security/java.security @@ -800,7 +800,7 @@ jdk.tls.legacyAlgorithms= \ # # Please see the JCA documentation for additional information on these # files and formats. -#crypto.policy=unlimited +crypto.policy=unlimited # # The policy for the XML Signature secure validation mode. The mode is diff --git a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt index a97e2cc2da..fb3098e3fa 100644 --- a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt +++ b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt @@ -3416,9 +3416,6 @@ com/sun/jdi/RedefineAddPrivateMethod.sh # not implemented/not applicable javax/management/mxbean/MXBeanInteropTest1.java generic-all -# not distributing limited policy -javax/crypto/CryptoPermission/TestUnlimited.java generic-all - # rogue. java/beans/Introspector/8159696/UnloadClassBeanInfo.java generic-all @@ -3430,3 +3427,8 @@ sun/security/tools/keytool/keyalg.sh # Class(-Loader) GC not supported javax/management/mxbean/MXBeanLoadingTest1.java generic-all + +# These tests assume limited policy, reenable after integrating u161 +javax/crypto/CryptoPermission/TestUnlimited.java generic-all +com/sun/crypto/provider/Cipher/Blowfish/TestCipherBlowfish.java generic-all +com/sun/crypto/provider/Cipher/PBE/PBESameBuffer/PBESameBuffer.java generic-all diff --git a/src/dist-image/ikvm/lib/security/java.security b/src/dist-image/ikvm/lib/security/java.security index 659f8a3e6b..d8162670a2 100644 --- a/src/dist-image/ikvm/lib/security/java.security +++ b/src/dist-image/ikvm/lib/security/java.security @@ -798,7 +798,7 @@ jdk.tls.legacyAlgorithms= \ # # Please see the JCA documentation for additional information on these # files and formats. -#crypto.policy=unlimited +crypto.policy=unlimited # # The policy for the XML Signature secure validation mode. The mode is From d687890de9ed9e243e9727765aa68276d0a4ecd5 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Mon, 31 Jul 2023 10:42:12 +0200 Subject: [PATCH 053/134] Review tests --- src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt index fb3098e3fa..d3e1af8407 100644 --- a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt +++ b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt @@ -3042,12 +3042,6 @@ sun/security/x509/AlgorithmId/ExtensibleAlgorithmId.java sun/text/resources/LocaleDataTest.java generic-all sun/tools/common/CommonTests.sh generic-all sun/tools/java/CFCTest.java generic-all -sun/tools/jcmd/jcmd-Defaults.sh generic-all -sun/tools/jcmd/jcmd-big-script.sh generic-all -sun/tools/jcmd/jcmd-f.sh generic-all -sun/tools/jcmd/jcmd-help-help.sh generic-all -sun/tools/jcmd/jcmd-help.sh generic-all -sun/tools/jcmd/jcmd-pid.sh generic-all sun/tools/jconsole/ResourceCheckTest.sh generic-all sun/tools/jhat/HatHeapDump1Test.java generic-all sun/tools/jhat/ParseTest.sh generic-all @@ -3407,6 +3401,7 @@ sun/tools/jps/TestJpsSanity.java # jcmd sun/tools/jcmd/TestJcmdDefaults.java generic-all +sun/tools/jcmd/TestJcmdSanity.java generic-all # jdi com/sun/jdi/oom/OomDebugTest.java generic-all @@ -3428,6 +3423,10 @@ sun/security/tools/keytool/keyalg.sh # Class(-Loader) GC not supported javax/management/mxbean/MXBeanLoadingTest1.java generic-all +# krb5 +sun/security/krb5/auto/UnboundSSL.java generic-all +sun/security/krb5/auto/UnboundSSLPrincipalProperty.java generic-all + # These tests assume limited policy, reenable after integrating u161 javax/crypto/CryptoPermission/TestUnlimited.java generic-all com/sun/crypto/provider/Cipher/Blowfish/TestCipherBlowfish.java generic-all From 9a90a67bb0cc5b13f892bbd7db71c46e6986a6ff Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Mon, 31 Jul 2023 16:28:15 +0200 Subject: [PATCH 054/134] Include policy file at correct location --- openjdk.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openjdk.props b/openjdk.props index 638103eb4c..4313a71c6c 100644 --- a/openjdk.props +++ b/openjdk.props @@ -1774,7 +1774,7 @@ - + From dfbe175b6180ab78c845bfd87e3eef8ae5cd1073 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Tue, 1 Aug 2023 11:27:55 +0200 Subject: [PATCH 055/134] Disable test --- src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt index d3e1af8407..6254d9167a 100644 --- a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt +++ b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt @@ -3431,3 +3431,4 @@ sun/security/krb5/auto/UnboundSSLPrincipalProperty.java javax/crypto/CryptoPermission/TestUnlimited.java generic-all com/sun/crypto/provider/Cipher/Blowfish/TestCipherBlowfish.java generic-all com/sun/crypto/provider/Cipher/PBE/PBESameBuffer/PBESameBuffer.java generic-all +com/sun/crypto/provider/Cipher/PBE/TestCipherKeyWrapperPBEKey.java generic-all From 96cd078a4975753ca5f44724d7480002a0d054c9 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Wed, 2 Aug 2023 15:17:37 +0200 Subject: [PATCH 056/134] Disable tests --- src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt index 6254d9167a..201df514ab 100644 --- a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt +++ b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt @@ -3427,8 +3427,16 @@ javax/management/mxbean/MXBeanLoadingTest1.java sun/security/krb5/auto/UnboundSSL.java generic-all sun/security/krb5/auto/UnboundSSLPrincipalProperty.java generic-all +# RMI, fails, but works in Debug with attached Debugger +sun/rmi/server/UnicastServerRef/FilterUSRTest.java generic-all + # These tests assume limited policy, reenable after integrating u161 javax/crypto/CryptoPermission/TestUnlimited.java generic-all com/sun/crypto/provider/Cipher/Blowfish/TestCipherBlowfish.java generic-all com/sun/crypto/provider/Cipher/PBE/PBESameBuffer/PBESameBuffer.java generic-all com/sun/crypto/provider/Cipher/PBE/TestCipherKeyWrapperPBEKey.java generic-all +com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithDefaultProvider.java generic-all +com/sun/crypto/provider/Cipher/PBE/TestCipherPBE.java generic-all +com/sun/crypto/provider/Cipher/PBE/TestCipherPBECons.java generic-all +com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithProviderChange.java generic-all +com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithRemoveAddProvider.java generic-all \ No newline at end of file From 868970971800e8b1cd6813baf37efda265f9de10 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Wed, 2 Aug 2023 17:59:13 +0200 Subject: [PATCH 057/134] Fixup merge error in 3ec5790d17ece240c02c590cd555cdfd356b96f7 --- IKVM.sln | 1 + 1 file changed, 1 insertion(+) diff --git a/IKVM.sln b/IKVM.sln index bf31112dcc..eb884de225 100644 --- a/IKVM.sln +++ b/IKVM.sln @@ -303,6 +303,7 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.Image.JRE.runtime.linux-musl-x64", "src\IKVM.Image.JRE.runtime.linux-musl-x64\IKVM.Image.JRE.runtime.linux-musl-x64.csproj", "{4AC61233-8347-4AC6-9E01-5C5BC48D5A8F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "xjc", "src\xjc\xjc.msbuildproj", "{C35B9502-AC9F-4490-9480-6EAB4FD94AAA}" +EndProject Project("{6DE1C62B-E8D7-451A-8734-87EAEB46E35B}") = "libunpack", "src\libunpack\libunpack.clangproj", "{1E74B9F3-AF8C-4ADB-90EA-0E1696C7886C}" EndProject Project("{6DE1C62B-E8D7-451A-8734-87EAEB46E35B}") = "libjvm", "src\libjvm\libjvm.clangproj", "{FE90DDCB-06F3-4470-A9A7-7640B04EA9E4}" From 9abeb240601fe9547a02420f7518eaaa406b3d95 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Thu, 3 Aug 2023 00:29:32 +0200 Subject: [PATCH 058/134] Disable test --- src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt index 201df514ab..7835c3b376 100644 --- a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt +++ b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt @@ -3425,6 +3425,7 @@ javax/management/mxbean/MXBeanLoadingTest1.java # krb5 sun/security/krb5/auto/UnboundSSL.java generic-all +sun/security/krb5/auto/UnboundSSLMultipleKeys.java generic-all sun/security/krb5/auto/UnboundSSLPrincipalProperty.java generic-all # RMI, fails, but works in Debug with attached Debugger From 372ab3e6fcdce414e6922bca2dc7e7ac8148edf5 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Thu, 3 Aug 2023 00:29:38 +0200 Subject: [PATCH 059/134] Fix xjc executable --- src/IKVM.JTReg.TestAdapter.Core/JTRegTestManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/IKVM.JTReg.TestAdapter.Core/JTRegTestManager.cs b/src/IKVM.JTReg.TestAdapter.Core/JTRegTestManager.cs index 354e50c987..8af8b2eea0 100644 --- a/src/IKVM.JTReg.TestAdapter.Core/JTRegTestManager.cs +++ b/src/IKVM.JTReg.TestAdapter.Core/JTRegTestManager.cs @@ -44,7 +44,7 @@ static JTRegTestManager() if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) || RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) { var javaHome = java.lang.System.getProperty("java.home"); - foreach (var exec in new[] { "java", "javac", "jar", "jarsigner", "javadoc", "javah", "javap", "jdeps", "keytool", "native2ascii", "orbd", "policytool", "rmic", "schemagen", "wsgen", "wsimport" }) + foreach (var exec in new[] { "java", "javac", "jar", "jarsigner", "javadoc", "javah", "javap", "jdeps", "keytool", "native2ascii", "orbd", "policytool", "rmic", "schemagen", "wsgen", "wsimport", "xjc" }) { var execPath = Path.Combine(javaHome, "bin", exec); if (File.Exists(execPath)) From 2c0efe4ccb4e4923737d9e7bd4728e2dfbdbe6fd Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Tue, 15 Aug 2023 14:21:21 +0200 Subject: [PATCH 060/134] That missed --- src/IKVM.Runtime/Util/Sun/Nio/Fs/DotNetWatchService.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/IKVM.Runtime/Util/Sun/Nio/Fs/DotNetWatchService.cs b/src/IKVM.Runtime/Util/Sun/Nio/Fs/DotNetWatchService.cs index 81d4faa941..2b3916f593 100644 --- a/src/IKVM.Runtime/Util/Sun/Nio/Fs/DotNetWatchService.cs +++ b/src/IKVM.Runtime/Util/Sun/Nio/Fs/DotNetWatchService.cs @@ -132,6 +132,7 @@ private class WatchServiceHandler public WatchServiceHandler(object fs, object key) { + this.fs = fs; this.key = key; ErrorHandler = OnError; EventHandler = OnEvent; From 54c410c0c4e736a3331690bef1aec38fb854339e Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Tue, 15 Aug 2023 14:32:19 +0200 Subject: [PATCH 061/134] Fix xjc targets --- src/xjc/xjc.msbuildproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xjc/xjc.msbuildproj b/src/xjc/xjc.msbuildproj index 2adab22249..1d9027358d 100644 --- a/src/xjc/xjc.msbuildproj +++ b/src/xjc/xjc.msbuildproj @@ -5,7 +5,7 @@ Exe - net461;netcoreapp3.1 + net472;net6.0 $(_SupportedImageRuntimes) com.sun.tools.internal.xjc.Driver ikvm.tools.xjc From ba0db37996bb222a4628a4c40133e41818e18817 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Tue, 15 Aug 2023 16:47:00 +0200 Subject: [PATCH 062/134] No awt --- src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt index 20a8c83916..f44899fbd7 100644 --- a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt +++ b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt @@ -3432,6 +3432,7 @@ java/awt/Container/MoveToOtherScreenTest/MoveToOtherScreenTest.java java/awt/Dialog/DialogAboveFrame/DialogAboveFrameTest.java generic-all java/awt/EventQueue/6980209/bug6980209.java generic-all java/awt/Focus/ModalDialogActivationTest/ModalDialogActivationTest.java generic-all +java/awt/font/MonospacedGlyphWidth/MonospacedGlyphWidthTest.java generic-all java/awt/font/TextLayout/DiacriticsDrawingTest.java generic-all java/awt/Frame/FrameResize/ShowChildWhileResizingTest.java generic-all java/awt/Frame/NormalToIconified/NormalToIconifiedTest.java generic-all @@ -3446,6 +3447,7 @@ java/awt/print/PrinterJob/PrintCrashTest.java java/awt/TextArea/TextAreaEditing/TextAreaEditing.java generic-all java/awt/Window/WindowDeadlockTest/WindowDeadlockTest.java generic-all java/awt/Window/WindowJumpingTest/WindowJumpingTest.java generic-all +javax/accessibility/JList/AccessibleJListChildNPETest.java generic-all javax/swing/JComboBox/8136998/bug8136998.java generic-all javax/swing/JMenuItem/8152981/MenuItemIconTest.java generic-all javax/swing/JProgressBar/8161664/ProgressBarMemoryLeakTest.java generic-all @@ -3455,7 +3457,6 @@ javax/swing/plaf/nimbus/8057791/bug8057791.java javax/swing/text/FlowView/LayoutTest.java generic-all javax/swing/text/html/parser/Parser/HtmlCommentTagParseTest/HtmlCommentTagParseTest.java generic-all sun/java2d/ClassCastExceptionForInvalidSurface.java generic-all -javax/accessibility/JList/AccessibleJListChildNPETest.java generic-all # Windows-PRNG SecureRandom java/security/SecureRandom/DefaultProvider.java generic-all From 6a462149f2a6522ddc9f78c2df95e6d0c836a78d Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Mon, 6 Nov 2023 17:06:58 -0600 Subject: [PATCH 063/134] C98 on libiava. No more MD5 lock in JTReg. Fix FileInputStream merge results. --- .../JTRegTestManager.cs | 21 +++++-------------- .../Java/Externs/java/io/FileInputStream.cs | 14 ++++++------- src/libawt/libawt.clangproj | 2 +- src/libiava/libiava.clangproj | 2 +- 4 files changed, 14 insertions(+), 25 deletions(-) diff --git a/src/IKVM.JTReg.TestAdapter.Core/JTRegTestManager.cs b/src/IKVM.JTReg.TestAdapter.Core/JTRegTestManager.cs index fc80aa735f..b57c7c5e02 100644 --- a/src/IKVM.JTReg.TestAdapter.Core/JTRegTestManager.cs +++ b/src/IKVM.JTReg.TestAdapter.Core/JTRegTestManager.cs @@ -35,8 +35,6 @@ public class JTRegTestManager internal const string DEFAULT_PARAM_TAG = "regtest"; internal const string ENV_PREFIX = "JTREG_"; - static readonly MD5 md5 = MD5.Create(); - /// /// Initializes the static instance. /// @@ -76,22 +74,13 @@ static JTRegTestManager() /// protected static string GetSourceId(string source) { - // allows a lock around the MD5 instance - byte[] ComputeHash(byte[] buffer) - { - lock (md5) - { - var b = new byte[8]; - var h = md5.ComputeHash(buffer); - Array.Copy(h, b, 8); - return b; - } - } + using var md5 = MD5.Create(); + var h = md5.ComputeHash(Encoding.UTF8.GetBytes(source)); - var b = ComputeHash(Encoding.UTF8.GetBytes(source)); var s = new StringBuilder(16); - for (int i = 0; i < b.Length; i++) - s.Append(b[i].ToString("x2")); + for (int i = 0; i < 8; i++) + s.Append(h[i].ToString("x2")); + return s.ToString(); } diff --git a/src/IKVM.Runtime/Java/Externs/java/io/FileInputStream.cs b/src/IKVM.Runtime/Java/Externs/java/io/FileInputStream.cs index 0b0055dc52..acbe57c0fe 100644 --- a/src/IKVM.Runtime/Java/Externs/java/io/FileInputStream.cs +++ b/src/IKVM.Runtime/Java/Externs/java/io/FileInputStream.cs @@ -252,9 +252,9 @@ public static int readBytes(object this_, byte[] bytes, int off, int len) /// Implements the native method 'skip0'. /// /// - /// + /// /// - public static long skip0(object self, long n) + public static long skip0(object this_, long n) { #if FIRST_PASS throw new NotImplementedException(); @@ -275,7 +275,7 @@ public static long skip0(object self, long n) try { long cur = stream.Position; - long end = stream.Seek(toSkip, SeekOrigin.Current); + long end = stream.Seek(n, SeekOrigin.Current); return end - cur; } catch (ObjectDisposedException e) @@ -294,12 +294,12 @@ public static long skip0(object self, long n) else { __callerID ??= global::ikvm.@internal.CallerID.create(typeof(global::java.io.FileInputStream).TypeHandle); - __jniPtr__skip ??= Marshal.GetDelegateForFunctionPointer<__jniDelegate__skip>(JNIFrame.GetFuncPtr(__callerID, "java/io/FileInputStream", nameof(skip), "(J)J")); + __jniPtr__skip ??= Marshal.GetDelegateForFunctionPointer<__jniDelegate__skip>(JNIFrame.GetFuncPtr(__callerID, "java/io/FileInputStream", nameof(skip0), "(J)J")); var jniFrm = new JNIFrame(); var jniEnv = jniFrm.Enter(__callerID); try { - return __jniPtr__skip(jniEnv, jniFrm.MakeLocalRef(this_), toSkip); + return __jniPtr__skip(jniEnv, jniFrm.MakeLocalRef(this_), n); } catch (Exception ex) { @@ -320,7 +320,7 @@ public static long skip0(object self, long n) /// /// /// - public static int available0(object self) + public static int available0(object this_) { #if FIRST_PASS throw new NotImplementedException(); @@ -358,7 +358,7 @@ public static int available0(object self) else { __callerID ??= global::ikvm.@internal.CallerID.create(typeof(global::java.io.FileInputStream).TypeHandle); - __jniPtr__available ??= Marshal.GetDelegateForFunctionPointer<__jniDelegate__available>(JNIFrame.GetFuncPtr(__callerID, "java/io/FileInputStream", nameof(available), "()I")); + __jniPtr__available ??= Marshal.GetDelegateForFunctionPointer<__jniDelegate__available>(JNIFrame.GetFuncPtr(__callerID, "java/io/FileInputStream", nameof(available0), "()I")); var jniFrm = new JNIFrame(); var jniEnv = jniFrm.Enter(__callerID); try diff --git a/src/libawt/libawt.clangproj b/src/libawt/libawt.clangproj index f3140e4309..ef4e1b3c00 100644 --- a/src/libawt/libawt.clangproj +++ b/src/libawt/libawt.clangproj @@ -13,4 +13,4 @@ - \ No newline at end of file + diff --git a/src/libiava/libiava.clangproj b/src/libiava/libiava.clangproj index fc18582a62..04441463b8 100644 --- a/src/libiava/libiava.clangproj +++ b/src/libiava/libiava.clangproj @@ -6,7 +6,7 @@ iava - c99 + c89 $(IncludeDirectories);$(OpenJdkDir)jdk\src\share\native\java\io $(IncludeDirectories);$(OpenJdkDir)jdk\src\$(OpenJdkTargetOsApiDir)\native\java\io From d3aeab34b3c8d1e216d09bdd2104e3894f3b2ca9 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Mon, 6 Nov 2023 21:21:17 -0600 Subject: [PATCH 064/134] Disable test. Fails due to expired certificate. Upgrade more faster! --- src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt | 146 ++++++--------------- 1 file changed, 39 insertions(+), 107 deletions(-) diff --git a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt index 8495446a85..0b4c7ff159 100644 --- a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt +++ b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt @@ -1568,7 +1568,6 @@ java/security/cert/pkix/policyChanges/TestPolicy.java java/security/cert/PKIXRevocationChecker/OcspUnauthorized.java generic-all java/security/cert/PKIXRevocationChecker/UnitTest.java generic-all java/security/cert/PolicyNode/GetPolicyQualifiers.java generic-all -java/security/cert/pkix/policyChanges/TestPolicy.java generic-all java/text/Bidi/BidiConformance.java generic-all java/text/Bidi/BidiEmbeddingTest.java generic-all java/text/Format/DateFormat/Bug6645292.java generic-all @@ -3421,39 +3420,8 @@ java/util/prefs/RemoveReadOnlyNode.java java/util/prefs/RemoveUnregedListener.java macosx-all jdk/net/Sockets/SupportedOptions.java macosx-all sun/security/krb5/auto/MSOID2.java macosx-all - -## JDK8u152-b16 -# awt/swing -com/sun/java/swing/plaf/windows/Test8173145.java generic-all -java/awt/Container/MoveToOtherScreenTest/MoveToOtherScreenTest.java generic-all -java/awt/Dialog/DialogAboveFrame/DialogAboveFrameTest.java generic-all -java/awt/EventQueue/6980209/bug6980209.java generic-all -java/awt/Focus/ModalDialogActivationTest/ModalDialogActivationTest.java generic-all -java/awt/font/MonospacedGlyphWidth/MonospacedGlyphWidthTest.java generic-all -java/awt/font/TextLayout/DiacriticsDrawingTest.java generic-all -java/awt/Frame/FrameResize/ShowChildWhileResizingTest.java generic-all -java/awt/Frame/NormalToIconified/NormalToIconifiedTest.java generic-all -java/awt/Frame/ObscuredFrame/ObscuredFrameTest.java generic-all -java/awt/geom/AffineTransform/InvalidTransformParameterTest.java generic-all -java/awt/image/VolatileImage/VolatileImageBug.java generic-all -java/awt/Mouse/EnterExitEvents/ModalDialogEnterExitEventsTest.java generic-all -java/awt/MouseInfo/GetPointerInfoTest.java generic-all -java/awt/MouseInfo/MultiscreenPointerInfo.java generic-all -java/awt/Paint/ComponentIsNotDrawnAfterRemoveAddTest/ComponentIsNotDrawnAfterRemoveAddTest.java generic-all -java/awt/print/PrinterJob/PrintCrashTest.java generic-all -java/awt/TextArea/TextAreaEditing/TextAreaEditing.java generic-all -java/awt/Window/WindowDeadlockTest/WindowDeadlockTest.java generic-all -java/awt/Window/WindowJumpingTest/WindowJumpingTest.java generic-all -javax/accessibility/JList/AccessibleJListChildNPETest.java generic-all -javax/swing/JComboBox/8136998/bug8136998.java generic-all -javax/swing/JMenuItem/8152981/MenuItemIconTest.java generic-all -javax/swing/JProgressBar/8161664/ProgressBarMemoryLeakTest.java generic-all -javax/swing/plaf/basic/BasicComboPopup/8154069/Bug8154069.java generic-all -javax/swing/plaf/basic/BasicLabelUI/bug7172652.java generic-all -javax/swing/plaf/nimbus/8057791/bug8057791.java generic-all -javax/swing/text/FlowView/LayoutTest.java generic-all -javax/swing/text/html/parser/Parser/HtmlCommentTagParseTest/HtmlCommentTagParseTest.java generic-all -sun/java2d/ClassCastExceptionForInvalidSurface.java generic-all +java/nio/channels/AsynchronousFileChannel/Basic.java macosx-all +sun/net/www/http/KeepAliveStream/KeepAliveStreamCloseWithWrongContentLength.java macosx-all # Windows-PRNG SecureRandom java/security/SecureRandom/DefaultProvider.java generic-all @@ -3486,73 +3454,6 @@ java/beans/Introspector/8159696/UnloadClassBeanInfo.java # fails with -Xbootclasspath/a (needs implement) java/lang/invoke/CustomizedLambdaFormTest.java generic-all -# probably related to field or method order -javax/xml/bind/jxc/8073519/SchemagenErrorReporting.java generic-all - -# Broken on OS X -com/sun/corba/transport/KeepAliveSockets.java macosx-all -com/sun/crypto/provider/Cipher/AES/TestISO10126Padding.java macosx-all -com/sun/crypto/provider/Cipher/Blowfish/BlowfishTestVector.java macosx-all -com/sun/crypto/provider/Cipher/CTR/CounterMode.java macosx-all -com/sun/net/httpserver/bugs/B6393710.java macosx-all -java/awt/FontClass/HelvLtOblTest.java macosx-all -java/net/DatagramPacket/ReuseBuf.java macosx-all -java/net/DatagramSocket/PortUnreachable.java macosx-all -java/net/DatagramSocket/Send12k.java macosx-all -java/net/DatagramSocket/SendSize.java macosx-all -java/net/MulticastSocket/B6427403.java macosx-all -java/net/MulticastSocket/JoinGroup.java macosx-all -java/net/MulticastSocket/Leave.java macosx-all -java/net/MulticastSocket/Promiscuous.java macosx-all -java/net/MulticastSocket/SetOutgoingIf.java macosx-all -java/net/PlainSocketImpl/SetBufferSize.java macosx-all -java/net/Socket/LinkLocal.java macosx-all -java/net/Socket/SetSoLinger.java macosx-all -java/net/Socket/TrafficClass.java macosx-all -java/net/ipv6tests/TcpTest.java macosx-all -java/net/ipv6tests/UdpTest.java macosx-all -java/nio/MappedByteBuffer/Basic.java macosx-all -java/nio/MappedByteBuffer/Force.java macosx-all -java/nio/channels/AsynchronousSocketChannel/Basic.java macosx-all -java/nio/channels/AsynchronousFileChannel/Basic.java macosx-all -java/nio/channels/DatagramChannel/AdaptDatagramSocket.java macosx-all -java/nio/channels/DatagramChannel/BasicMulticastTests.java macosx-all -java/nio/channels/DatagramChannel/Connect.java macosx-all -java/nio/channels/DatagramChannel/ConnectedSend.java macosx-all -java/nio/channels/DatagramChannel/IsConnected.java macosx-all -java/nio/channels/DatagramChannel/NoSender.java macosx-all -java/nio/channels/DatagramChannel/NotBound.java macosx-all -java/nio/channels/DatagramChannel/ReceiveISA.java macosx-all -java/nio/channels/DatagramChannel/Refused.java macosx-all -java/nio/channels/DatagramChannel/SRTest.java macosx-all -java/nio/channels/DatagramChannel/Sender.java macosx-all -java/nio/channels/DatagramChannel/ThereCanBeOnlyOne.java macosx-all -java/nio/channels/Selector/RacyDeregister.java macosx-all -java/nio/channels/ServerSocketChannel/NonBlockingAccept.java macosx-all -java/nio/channels/ServerSocketChannel/SocketOptionTests.java macosx-all -java/nio/channels/SocketChannel/SendUrgentData.java macosx-all -java/nio/channels/SocketChannel/VectorParams.java macosx-all -java/nio/charset/coders/Check.java macosx-all -java/nio/file/Path/MacPathTest.java macosx-all -java/nio/file/WatchService/LotsOfCancels.java macosx-all -java/nio/file/WatchService/LotsOfEvents.java macosx-all -java/nio/file/WatchService/MayFlies.java macosx-all -java/util/prefs/AddNodeChangeListener.java macosx-all -java/util/prefs/CommentsInXml.java macosx-all -java/util/prefs/ConflictInFlush.java macosx-all -java/util/prefs/ExportNode.java macosx-all -java/util/prefs/ExportSubtree.java macosx-all -java/util/prefs/RemoveNullKeyCheck.java macosx-all -java/util/prefs/RemoveReadOnlyNode.java macosx-all -java/util/prefs/RemoveUnregedListener.java macosx-all -jdk/net/Sockets/SupportedOptions.java macosx-all -sun/security/krb5/auto/MSOID2.java macosx-all -sun/net/www/http/KeepAliveStream/KeepAliveStreamCloseWithWrongContentLength.java macosx-all -java/net/InetAddress/CheckJNI.java macosx-all -java/net/Inet6Address/B6206527.java macosx-all -java/net/Inet6Address/B6558853.java macosx-all - - # Shell fails on Windows sun/security/tools/keytool/keyalg.sh windows-all @@ -3576,9 +3477,40 @@ com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithDefaultProvider.jav com/sun/crypto/provider/Cipher/PBE/TestCipherPBE.java generic-all com/sun/crypto/provider/Cipher/PBE/TestCipherPBECons.java generic-all com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithProviderChange.java generic-all -com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithRemoveAddProvider.java generic-alljava/util/prefs/RemoveNullKeyCheck.java macosx-all -java/util/prefs/RemoveReadOnlyNode.java macosx-all -java/util/prefs/RemoveUnregedListener.java macosx-all -jdk/net/Sockets/SupportedOptions.java macosx-all -sun/security/krb5/auto/MSOID2.java macosx-all ->>>>>>>>> Temporary merge branch 2 +com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithRemoveAddProvider.java generic-all + +## JDK8u152-b16, new broken tests +# awt/swing +com/sun/java/swing/plaf/windows/Test8173145.java generic-all +java/awt/Container/MoveToOtherScreenTest/MoveToOtherScreenTest.java generic-all +java/awt/Dialog/DialogAboveFrame/DialogAboveFrameTest.java generic-all +java/awt/EventQueue/6980209/bug6980209.java generic-all +java/awt/Focus/ModalDialogActivationTest/ModalDialogActivationTest.java generic-all +java/awt/font/MonospacedGlyphWidth/MonospacedGlyphWidthTest.java generic-all +java/awt/font/TextLayout/DiacriticsDrawingTest.java generic-all +java/awt/Frame/FrameResize/ShowChildWhileResizingTest.java generic-all +java/awt/Frame/NormalToIconified/NormalToIconifiedTest.java generic-all +java/awt/Frame/ObscuredFrame/ObscuredFrameTest.java generic-all +java/awt/geom/AffineTransform/InvalidTransformParameterTest.java generic-all +java/awt/image/VolatileImage/VolatileImageBug.java generic-all +java/awt/Mouse/EnterExitEvents/ModalDialogEnterExitEventsTest.java generic-all +java/awt/MouseInfo/GetPointerInfoTest.java generic-all +java/awt/MouseInfo/MultiscreenPointerInfo.java generic-all +java/awt/Paint/ComponentIsNotDrawnAfterRemoveAddTest/ComponentIsNotDrawnAfterRemoveAddTest.java generic-all +java/awt/print/PrinterJob/PrintCrashTest.java generic-all +java/awt/TextArea/TextAreaEditing/TextAreaEditing.java generic-all +java/awt/Window/WindowDeadlockTest/WindowDeadlockTest.java generic-all +java/awt/Window/WindowJumpingTest/WindowJumpingTest.java generic-all +javax/accessibility/JList/AccessibleJListChildNPETest.java generic-all +javax/swing/JComboBox/8136998/bug8136998.java generic-all +javax/swing/JMenuItem/8152981/MenuItemIconTest.java generic-all +javax/swing/JProgressBar/8161664/ProgressBarMemoryLeakTest.java generic-all +javax/swing/plaf/basic/BasicComboPopup/8154069/Bug8154069.java generic-all +javax/swing/plaf/basic/BasicLabelUI/bug7172652.java generic-all +javax/swing/plaf/nimbus/8057791/bug8057791.java generic-all +javax/swing/text/FlowView/LayoutTest.java generic-all +javax/swing/text/html/parser/Parser/HtmlCommentTagParseTest/HtmlCommentTagParseTest.java generic-all +sun/java2d/ClassCastExceptionForInvalidSurface.java generic-all + +#expired certificate +sun/security/tools/jarsigner/warnings/BadNetscapeCertTypeTest.java generic-all From f0e0abdf8e0ea79b7930cbde6630e9e54cba4031 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Tue, 7 Nov 2023 13:03:07 -0600 Subject: [PATCH 065/134] Use PollingWatchService for non Windows. --- .../local/sun/nio/fs/DotNetFileSystem.java | 13 ++++++---- .../local/sun/nio/fs/DotNetPath.java | 25 ++++++------------- src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt | 8 +++--- 3 files changed, 20 insertions(+), 26 deletions(-) diff --git a/src/IKVM.Java/local/sun/nio/fs/DotNetFileSystem.java b/src/IKVM.Java/local/sun/nio/fs/DotNetFileSystem.java index 523a00a082..00dfbeccab 100644 --- a/src/IKVM.Java/local/sun/nio/fs/DotNetFileSystem.java +++ b/src/IKVM.Java/local/sun/nio/fs/DotNetFileSystem.java @@ -206,14 +206,17 @@ public boolean matches(Path path) { }; } - public UserPrincipalLookupService getUserPrincipalLookupService() - { + public UserPrincipalLookupService getUserPrincipalLookupService() { throw new UnsupportedOperationException(); } - public WatchService newWatchService() throws IOException - { - return new DotNetWatchService(this); + public WatchService newWatchService() throws IOException { + if (cli.IKVM.Runtime.RuntimeUtil.get_IsWindows()) { + return new DotNetWatchService(this); + } else { + // FileSystemWatcher implementation on .NET for Unix consumes way too many inotify queues + return new PollingWatchService(); + } } } diff --git a/src/IKVM.Java/local/sun/nio/fs/DotNetPath.java b/src/IKVM.Java/local/sun/nio/fs/DotNetPath.java index 3af097e5f3..c4cbade4a9 100644 --- a/src/IKVM.Java/local/sun/nio/fs/DotNetPath.java +++ b/src/IKVM.Java/local/sun/nio/fs/DotNetPath.java @@ -510,35 +510,26 @@ public Path toRealPath(LinkOption... options) throws IOException private static native String toRealPathImpl(String path); - public WatchKey register(WatchService watcher, WatchEvent.Kind[] events, WatchEvent.Modifier... modifiers) throws IOException - { - if (!(watcher instanceof DotNetWatchService)) - { - // null check - watcher.getClass(); - throw new ProviderMismatchException(); - } + public WatchKey register(WatchService watcher, WatchEvent.Kind[] events, WatchEvent.Modifier... modifiers) throws IOException { + watcher.getClass(); SecurityManager sm = System.getSecurityManager(); - if (sm != null) - { + if (sm != null) { boolean subtree = false; - for(WatchEvent.Modifier modifier : modifiers) - { - if(modifier == ExtendedWatchEventModifier.FILE_TREE) - { + for (WatchEvent.Modifier modifier : modifiers) { + if (modifier == ExtendedWatchEventModifier.FILE_TREE) { subtree = true; break; } } sm.checkRead(path); - if (subtree) - { + if (subtree) { sm.checkRead(path + cli.System.IO.Path.DirectorySeparatorChar + '-'); } } - return ((DotNetWatchService)watcher).register(this, events, modifiers); + + return ((AbstractWatchService)watcher).register(this, events, modifiers); } public int compareTo(Path other) diff --git a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt index 0b4c7ff159..16234e6da1 100644 --- a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt +++ b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt @@ -1415,7 +1415,7 @@ java/nio/file/Files/delete_on_close.sh java/nio/file/Files/walkFileTree/find.sh generic-all java/nio/file/Path/Misc.java linux-all,macosx-all java/nio/file/Path/PathOps.java windows-all -java/nio/file/WatchService/Basic.java linux-all,macosx-all +#java/nio/file/WatchService/Basic.java linux-all,macosx-all java/rmi/Naming/DefaultRegistryPort.java generic-all java/rmi/Naming/LookupIPv6.java generic-all java/rmi/Naming/LookupNameWithColon.java generic-all @@ -3407,9 +3407,9 @@ java/nio/channels/SocketChannel/SendUrgentData.java java/nio/channels/SocketChannel/VectorParams.java macosx-all java/nio/charset/coders/Check.java macosx-all java/nio/file/Path/MacPathTest.java macosx-all -java/nio/file/WatchService/LotsOfCancels.java macosx-all -java/nio/file/WatchService/LotsOfEvents.java macosx-all -java/nio/file/WatchService/MayFlies.java macosx-all +#java/nio/file/WatchService/LotsOfCancels.java macosx-all +#java/nio/file/WatchService/LotsOfEvents.java macosx-all +#java/nio/file/WatchService/MayFlies.java macosx-all java/util/prefs/AddNodeChangeListener.java macosx-all java/util/prefs/CommentsInXml.java macosx-all java/util/prefs/ConflictInFlush.java macosx-all From c20ed1956a57f460753f1396d735c2c20d5c4d16 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Sat, 11 Nov 2023 13:06:16 -0600 Subject: [PATCH 066/134] Revert DotNetWatchService. Back to old implementation. Just, use PollingWatchService on Unix. --- .../local/sun/nio/fs/DotNetFileSystem.java | 284 +++++++++++++++++- .../local/sun/nio/fs/DotNetPath.java | 82 ++++- .../local/sun/nio/fs/DotNetWatchService.java | 83 ----- .../ExtendedWatchEventModifierAccessor.cs | 18 -- .../SensitivityWatchEventModifierAccessor.cs | 20 -- .../File/StandardWatchEventKindsAccessor.cs | 29 -- .../Nio/Fs/DotNetWatchServiceKeyAccessor.cs | 40 --- src/IKVM.Runtime/IKVM.Runtime.csproj | 5 + .../Externs/sun/nio/fs/DotNetWatchService.cs | 30 -- .../Util/Sun/Nio/Fs/DotNetWatchService.cs | 174 ----------- 10 files changed, 353 insertions(+), 412 deletions(-) delete mode 100644 src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java delete mode 100644 src/IKVM.Runtime/Accessors/Com/Sun/Nio/File/ExtendedWatchEventModifierAccessor.cs delete mode 100644 src/IKVM.Runtime/Accessors/Com/Sun/Nio/File/SensitivityWatchEventModifierAccessor.cs delete mode 100644 src/IKVM.Runtime/Accessors/Java/Nio/File/StandardWatchEventKindsAccessor.cs delete mode 100644 src/IKVM.Runtime/Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs delete mode 100644 src/IKVM.Runtime/Java/Externs/sun/nio/fs/DotNetWatchService.cs delete mode 100644 src/IKVM.Runtime/Util/Sun/Nio/Fs/DotNetWatchService.cs diff --git a/src/IKVM.Java/local/sun/nio/fs/DotNetFileSystem.java b/src/IKVM.Java/local/sun/nio/fs/DotNetFileSystem.java index 00dfbeccab..9be3a662ba 100644 --- a/src/IKVM.Java/local/sun/nio/fs/DotNetFileSystem.java +++ b/src/IKVM.Java/local/sun/nio/fs/DotNetFileSystem.java @@ -206,13 +206,293 @@ public boolean matches(Path path) { }; } - public UserPrincipalLookupService getUserPrincipalLookupService() { + public UserPrincipalLookupService getUserPrincipalLookupService() + { throw new UnsupportedOperationException(); } + static final class NetWatchService implements WatchService + { + static final WatchEvent overflowEvent = new WatchEvent() { + public Object context() { + return null; + } + public int count() { + return 1; + } + public WatchEvent.Kind kind() { + return StandardWatchEventKinds.OVERFLOW; + } + }; + private static final WatchKey CLOSED = new WatchKey() { + public boolean isValid() { return false; } + public List> pollEvents() { return null; } + public boolean reset() { return false; } + public void cancel() { } + public Watchable watchable() { return null; } + }; + private boolean closed; + private final ArrayList keys = new ArrayList<>(); + private final LinkedBlockingQueue queue = new LinkedBlockingQueue<>(); + + public synchronized void close() + { + if (!closed) + { + closed = true; + for (NetWatchKey key : keys) + { + key.close(); + } + enqueue(CLOSED); + } + } + + private WatchKey checkClosed(WatchKey key) + { + if (key == CLOSED) + { + enqueue(CLOSED); + throw new ClosedWatchServiceException(); + } + return key; + } + + public WatchKey poll() + { + return checkClosed(queue.poll()); + } + + public WatchKey poll(long timeout, TimeUnit unit) throws InterruptedException + { + return checkClosed(queue.poll(timeout, unit)); + } + + public WatchKey take() throws InterruptedException + { + return checkClosed(queue.take()); + } + + void enqueue(WatchKey key) + { + for (;;) + { + try + { + queue.put(key); + return; + } + catch (InterruptedException _) + { + } + } + } + + private final class NetWatchKey implements WatchKey + { + private final DotNetPath path; + private FileSystemWatcher fsw; + private ArrayList> list = new ArrayList<>(); + private HashSet modified = new HashSet<>(); + private boolean signaled; + + NetWatchKey(DotNetPath path) + { + this.path = path; + } + + synchronized void init(final boolean create, final boolean delete, final boolean modify, final boolean overflow, final boolean subtree) + { + if (fsw != null) + { + // we could reuse the FileSystemWatcher, but for now we just recreate it + // (and we run the risk of missing some events while we're doing that) + fsw.Dispose(); + fsw = null; + } + fsw = new FileSystemWatcher(path.path); + if (create) + { + fsw.add_Created(new FileSystemEventHandler(new FileSystemEventHandler.Method() { + public void Invoke(Object sender, FileSystemEventArgs e) { + addEvent(createEvent(e), null); + } + })); + } + if (delete) + { + fsw.add_Deleted(new FileSystemEventHandler(new FileSystemEventHandler.Method() { + public void Invoke(Object sender, FileSystemEventArgs e) { + addEvent(createEvent(e), null); + } + })); + } + if (modify) + { + fsw.add_Changed(new FileSystemEventHandler(new FileSystemEventHandler.Method() { + public void Invoke(Object sender, FileSystemEventArgs e) { + synchronized (NetWatchKey.this) { + if (modified.contains(e.get_Name())) { + // we already have an ENTRY_MODIFY event pending + return; + } + } + addEvent(createEvent(e), e.get_Name()); + } + })); + } + fsw.add_Error(new ErrorEventHandler(new ErrorEventHandler.Method() { + public void Invoke(Object sender, ErrorEventArgs e) { + if (e.GetException() instanceof cli.System.ComponentModel.Win32Exception + && ((cli.System.ComponentModel.Win32Exception)e.GetException()).get_ErrorCode() == -2147467259) { + // the directory we were watching was deleted + cancelledByError(); + } else if (overflow) { + addEvent(overflowEvent, null); + } + } + })); + if (subtree) + { + fsw.set_IncludeSubdirectories(true); + } + fsw.set_EnableRaisingEvents(true); + } + + WatchEvent createEvent(final FileSystemEventArgs e) + { + return new WatchEvent() { + public Path context() { + return new DotNetPath((DotNetFileSystem)path.getFileSystem(), e.get_Name()); + } + public int count() { + return 1; + } + public WatchEvent.Kind kind() { + switch (e.get_ChangeType().Value) { + case WatcherChangeTypes.Created: + return StandardWatchEventKinds.ENTRY_CREATE; + case WatcherChangeTypes.Deleted: + return StandardWatchEventKinds.ENTRY_DELETE; + default: + return StandardWatchEventKinds.ENTRY_MODIFY; + } + } + }; + } + + void cancelledByError() + { + cancel(); + synchronized (this) + { + if (!signaled) + { + signaled = true; + enqueue(this); + } + } + } + + synchronized void addEvent(WatchEvent event, String modified) + { + list.add(event); + if (modified != null) + { + this.modified.add(modified); + } + if (!signaled) + { + signaled = true; + enqueue(this); + } + } + + public synchronized boolean isValid() + { + return fsw != null; + } + + public synchronized List> pollEvents() + { + ArrayList> r = list; + list = new ArrayList<>(); + modified.clear(); + return r; + } + + public synchronized boolean reset() + { + if (fsw == null) + { + return false; + } + if (signaled) + { + if (list.size() == 0) + { + signaled = false; + } + else + { + enqueue(this); + } + } + return true; + } + + void close() + { + if (fsw != null) + { + fsw.Dispose(); + fsw = null; + } + } + + public void cancel() + { + synchronized (NetWatchService.this) + { + keys.remove(this); + close(); + } + } + + public Watchable watchable() + { + return path; + } + } + + synchronized WatchKey register(DotNetPath path, boolean create, boolean delete, boolean modify, boolean overflow, boolean subtree) + { + if (closed) + { + throw new ClosedWatchServiceException(); + } + NetWatchKey existing = null; + for (NetWatchKey key : keys) + { + if (key.watchable().equals(path)) + { + existing = key; + break; + } + } + if (existing == null) + { + existing = new NetWatchKey(path); + keys.add(existing); + } + existing.init(create, delete, modify, overflow, subtree); + return existing; + } + } + public WatchService newWatchService() throws IOException { if (cli.IKVM.Runtime.RuntimeUtil.get_IsWindows()) { - return new DotNetWatchService(this); + return new NetWatchService(); } else { // FileSystemWatcher implementation on .NET for Unix consumes way too many inotify queues return new PollingWatchService(); diff --git a/src/IKVM.Java/local/sun/nio/fs/DotNetPath.java b/src/IKVM.Java/local/sun/nio/fs/DotNetPath.java index c4cbade4a9..d10b3464c9 100644 --- a/src/IKVM.Java/local/sun/nio/fs/DotNetPath.java +++ b/src/IKVM.Java/local/sun/nio/fs/DotNetPath.java @@ -25,6 +25,7 @@ package sun.nio.fs; import com.sun.nio.file.ExtendedWatchEventModifier; +import com.sun.nio.file.SensitivityWatchEventModifier; import java.io.File; import java.io.IOException; import java.net.URI; @@ -510,26 +511,75 @@ public Path toRealPath(LinkOption... options) throws IOException private static native String toRealPathImpl(String path); - public WatchKey register(WatchService watcher, WatchEvent.Kind[] events, WatchEvent.Modifier... modifiers) throws IOException { - watcher.getClass(); - - SecurityManager sm = System.getSecurityManager(); - if (sm != null) { - boolean subtree = false; - for (WatchEvent.Modifier modifier : modifiers) { - if (modifier == ExtendedWatchEventModifier.FILE_TREE) { - subtree = true; - break; - } + public WatchKey register(WatchService watcher, WatchEvent.Kind[] events, WatchEvent.Modifier... modifiers) throws IOException + { + if (!(watcher instanceof DotNetFileSystem.NetWatchService)) + { + // null check + watcher.getClass(); + throw new ProviderMismatchException(); + } + boolean create = false; + boolean delete = false; + boolean modify = false; + boolean overflow = false; + boolean subtree = false; + for (WatchEvent.Kind kind : events) + { + if (kind == StandardWatchEventKinds.ENTRY_CREATE) + { + create = true; + } + else if (kind == StandardWatchEventKinds.ENTRY_DELETE) + { + delete = true; + } + else if (kind == StandardWatchEventKinds.ENTRY_MODIFY) + { + modify = true; + } + else if (kind == StandardWatchEventKinds.OVERFLOW) + { + overflow = true; + } + else + { + // null check + kind.getClass(); + throw new UnsupportedOperationException(); + } + } + if (!create && !delete && !modify) + { + throw new IllegalArgumentException(); + } + for (WatchEvent.Modifier modifier : modifiers) + { + if (modifier == ExtendedWatchEventModifier.FILE_TREE) + { + subtree = true; + } + else if (modifier instanceof SensitivityWatchEventModifier) + { + // ignore } - + else + { + // null check + modifier.getClass(); + throw new UnsupportedOperationException(); + } + } + SecurityManager sm = System.getSecurityManager(); + if (sm != null) + { sm.checkRead(path); - if (subtree) { + if (subtree) + { sm.checkRead(path + cli.System.IO.Path.DirectorySeparatorChar + '-'); } } - - return ((AbstractWatchService)watcher).register(this, events, modifiers); + return ((DotNetFileSystem.NetWatchService)watcher).register(this, create, delete, modify, overflow, subtree); } public int compareTo(Path other) @@ -589,4 +639,4 @@ static DotNetPath from(Path path) } return (DotNetPath)path; } -} +} \ No newline at end of file diff --git a/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java b/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java deleted file mode 100644 index c143f4d536..0000000000 --- a/src/IKVM.Java/local/sun/nio/fs/DotNetWatchService.java +++ /dev/null @@ -1,83 +0,0 @@ -package sun.nio.fs; - -import java.io.Closeable; -import java.io.IOException; -import java.lang.IllegalArgumentException; -import java.nio.file.ClosedWatchServiceException; -import java.nio.file.Path; -import java.nio.file.ProviderMismatchException; -import java.nio.file.WatchEvent; -import java.nio.file.WatchKey; -import java.util.concurrent.ConcurrentHashMap; - -final class DotNetWatchService extends AbstractWatchService { - private final DotNetFileSystem fs; - private final ConcurrentHashMap keys = new ConcurrentHashMap(); - - DotNetWatchService(DotNetFileSystem fs) { - this.fs = fs; - } - - @Override - void implClose() - throws IOException { - for (DotNetWatchKey key : keys.values()) { - key.close(); - } - - keys.clear(); - } - - @Override - WatchKey register(Path path, WatchEvent.Kind[] events, WatchEvent.Modifier... modifiers) - throws IOException { - if (!isOpen()) { - throw new ClosedWatchServiceException(); - } - if (!(path instanceof DotNetPath)) { - path.getClass(); - throw new ProviderMismatchException(); - } - final DotNetPath dir = (DotNetPath) path; - - final DotNetWatchKey key = keys.computeIfAbsent(dir, c -> new DotNetWatchKey(c)); - register0(fs, key, dir, events, (Object[]) modifiers); - return key; - } - - final class DotNetWatchKey extends AbstractWatchKey implements Closeable { - private final DotNetPath dir; - private Object state; - - DotNetWatchKey(DotNetPath dir) { - super(dir, DotNetWatchService.this); - this.dir = dir; - } - - @Override - public void cancel() { - if (DotNetWatchService.this.keys.remove(dir, this)) { - close(); - } - } - - @Override - public void close() { - close0(this); - } - - @Override - public boolean isValid() { - return state != null; - } - - void error() { - cancel(); - signal(); - } - } - - static native void close0(Object key); - - static native void register0(Object fs, Object key, Object dir, Object[] events, Object... modifiers); -} \ No newline at end of file diff --git a/src/IKVM.Runtime/Accessors/Com/Sun/Nio/File/ExtendedWatchEventModifierAccessor.cs b/src/IKVM.Runtime/Accessors/Com/Sun/Nio/File/ExtendedWatchEventModifierAccessor.cs deleted file mode 100644 index a2519ae653..0000000000 --- a/src/IKVM.Runtime/Accessors/Com/Sun/Nio/File/ExtendedWatchEventModifierAccessor.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace IKVM.Runtime.Accessors.Com.Sun.Nio.File -{ -#if FIRST_PASS == false && EXPORTER == false && IMPORTER == false - - internal sealed class ExtendedWatchEventModifierAccessor : Accessor - { - private FieldAccessor fileTree; - - public object FILE_TREE => GetField(ref fileTree, nameof(FILE_TREE)).GetValue(); - - public ExtendedWatchEventModifierAccessor(AccessorTypeResolver resolver) - : base(resolver, "com.sun.nio.file.ExtendedWatchEventModifier") - { - } - } - -#endif -} diff --git a/src/IKVM.Runtime/Accessors/Com/Sun/Nio/File/SensitivityWatchEventModifierAccessor.cs b/src/IKVM.Runtime/Accessors/Com/Sun/Nio/File/SensitivityWatchEventModifierAccessor.cs deleted file mode 100644 index e283113064..0000000000 --- a/src/IKVM.Runtime/Accessors/Com/Sun/Nio/File/SensitivityWatchEventModifierAccessor.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; - -namespace IKVM.Runtime.Accessors.Com.Sun.Nio.File -{ - -#if FIRST_PASS == false && EXPORTER == false && IMPORTER == false - - internal class SensitivityWatchEventModifierAccessor : Accessor - { - public SensitivityWatchEventModifierAccessor(AccessorTypeResolver resolver) - : base(resolver, "com.sun.nio.file.SensitivityWatchEventModifier") - { - } - - public bool Is(object self) => Type.IsInstanceOfType(self); - } - -#endif - -} diff --git a/src/IKVM.Runtime/Accessors/Java/Nio/File/StandardWatchEventKindsAccessor.cs b/src/IKVM.Runtime/Accessors/Java/Nio/File/StandardWatchEventKindsAccessor.cs deleted file mode 100644 index 9401216b35..0000000000 --- a/src/IKVM.Runtime/Accessors/Java/Nio/File/StandardWatchEventKindsAccessor.cs +++ /dev/null @@ -1,29 +0,0 @@ -namespace IKVM.Runtime.Accessors.Java.Nio.File -{ - -#if FIRST_PASS == false && EXPORTER == false && IMPORTER == false - - internal sealed class StandardWatchEventKindsAccessor : Accessor - { - private FieldAccessor entryCreate; - private FieldAccessor entryDelete; - private FieldAccessor entryModify; - private FieldAccessor overflow; - - public object ENTRY_CREATE => GetField(ref entryCreate, nameof(ENTRY_CREATE)).GetValue(); - - public object ENTRY_DELETE => GetField(ref entryDelete, nameof(ENTRY_DELETE)).GetValue(); - - public object ENTRY_MODIFY => GetField(ref entryModify, nameof(ENTRY_MODIFY)).GetValue(); - - public object OVERFLOW => GetField(ref overflow, nameof(OVERFLOW)).GetValue(); - - public StandardWatchEventKindsAccessor(AccessorTypeResolver resolver) - : base(resolver, "java.nio.file.StandardWatchEventKinds") - { - } - } - -#endif - -} \ No newline at end of file diff --git a/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs b/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs deleted file mode 100644 index 6e561c826c..0000000000 --- a/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/DotNetWatchServiceKeyAccessor.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; - -namespace IKVM.Runtime.Accessors.Sun.Nio.Fs -{ - -#if FIRST_PASS == false && EXPORTER == false && IMPORTER == false - - internal class DotNetWatchServiceKeyAccessor : Accessor - { - private MethodAccessor> error0; - private MethodAccessor> signalEvent0; - private MethodAccessor> signalEvent1; - private FieldAccessor state; - private Type voidType; - private Type watchEventKind; - - internal FieldAccessor State => GetField(ref state, "state"); - - private Type Void => voidType ??= typeof(void); - - private Type WatchEventKind => watchEventKind ??= Resolve("java.nio.file.WatchEvent+Kind"); - - public DotNetWatchServiceKeyAccessor(AccessorTypeResolver resolver) - : base(resolver, "sun.nio.fs.DotNetWatchService+DotNetWatchKey") - { - } - - public void error(object self) - => (error0 ??= GetMethod(ref error0, nameof(error), Void)).Invoker(self); - - public void signalEvent(object self) - => (signalEvent0 ??= GetMethod(ref signalEvent0, nameof(signalEvent), Void)).Invoker(self); - - public void signalEvent(object self, object kind, object context) - => (signalEvent1 ??= GetMethod(ref signalEvent1, nameof(signalEvent), Void, WatchEventKind, typeof(object))).Invoker(self, kind, context); - } - -#endif - -} diff --git a/src/IKVM.Runtime/IKVM.Runtime.csproj b/src/IKVM.Runtime/IKVM.Runtime.csproj index 8d947a6f28..28b954dd32 100644 --- a/src/IKVM.Runtime/IKVM.Runtime.csproj +++ b/src/IKVM.Runtime/IKVM.Runtime.csproj @@ -44,6 +44,11 @@ + + + + + diff --git a/src/IKVM.Runtime/Java/Externs/sun/nio/fs/DotNetWatchService.cs b/src/IKVM.Runtime/Java/Externs/sun/nio/fs/DotNetWatchService.cs deleted file mode 100644 index b325be8f6c..0000000000 --- a/src/IKVM.Runtime/Java/Externs/sun/nio/fs/DotNetWatchService.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using IKVM.Runtime.Accessors.Sun.Nio.Fs; -using usnfs = IKVM.Runtime.Util.Sun.Nio.Fs; - -namespace IKVM.Java.Externs.sun.nio.fs -{ - internal static partial class DotNetWatchService - { - - public static void close0(object key) - { -#if FIRST_PASS - throw new NotImplementedException(); -#else - usnfs.DotNetWatchService.Close(key); -#endif - } - - public static void register0(object fs, object key, object dir, object[] events, params object[] modifiers) - { -#if FIRST_PASS - throw new NotImplementedException(); -#else - usnfs.DotNetWatchService.Register(fs, key, dir, events, modifiers); -#endif - } - - } - -} \ No newline at end of file diff --git a/src/IKVM.Runtime/Util/Sun/Nio/Fs/DotNetWatchService.cs b/src/IKVM.Runtime/Util/Sun/Nio/Fs/DotNetWatchService.cs deleted file mode 100644 index 2b3916f593..0000000000 --- a/src/IKVM.Runtime/Util/Sun/Nio/Fs/DotNetWatchService.cs +++ /dev/null @@ -1,174 +0,0 @@ -using IKVM.Runtime.Accessors.Com.Sun.Nio.File; -using IKVM.Runtime.Accessors.Java.Nio.File; -using IKVM.Runtime.Accessors.Sun.Nio.Fs; -using IKVM.Runtime.Extensions; -using System; -using System.ComponentModel; -using System.IO; - -namespace IKVM.Runtime.Util.Sun.Nio.Fs -{ - -#if !FIRST_PASS - - internal static class DotNetWatchService - { - private static DotNetPathAccessor dotNetPath; - private static DotNetWatchServiceKeyAccessor dotNetWatchServiceKey; - private static ExtendedWatchEventModifierAccessor extendedWatchEventModifier; - private static SensitivityWatchEventModifierAccessor sensitivityWatchEventModifier; - private static StandardWatchEventKindsAccessor standardWatchEventKinds; - - private static DotNetPathAccessor DotNetPath => JVM.BaseAccessors.Get(ref dotNetPath); - - private static DotNetWatchServiceKeyAccessor DotNetWatchServiceKey => JVM.BaseAccessors.Get(ref dotNetWatchServiceKey); - - private static ExtendedWatchEventModifierAccessor ExtendedWatchEventModifier => JVM.BaseAccessors.Get(ref extendedWatchEventModifier); - - private static SensitivityWatchEventModifierAccessor SensitivityWatchEventModifier => JVM.BaseAccessors.Get(ref sensitivityWatchEventModifier); - - private static StandardWatchEventKindsAccessor StandardWatchEventKinds => JVM.BaseAccessors.Get(ref standardWatchEventKinds); - - internal static void Close(object key) - { - if (DotNetWatchServiceKey.State.ExchangeValue(key, null) is not FileSystemWatcher fsw) - { - return; - } - - fsw.Dispose(); - } - - internal static void Register(object fs, object key, object dir, object[] events, object[] modifiers) - => Register(fs, key, DotNetPath.GetPath(dir), events, modifiers); - - internal static void Register(object fs, object key, string dir, object[] events, object[] modifiers) - { - // we could reuse the FileSystemWatcher, but for now we just recreate it - // (and we run the risk of missing some events while we're doing that) - Close(key); - FileSystemWatcher watcher = null; - try - { - watcher = new FileSystemWatcher(dir); - WatchServiceHandler handler = new WatchServiceHandler(fs, key); - bool valid = false; - foreach (var @event in events) - { - if (@event == StandardWatchEventKinds.OVERFLOW) - { - handler.Overflow = true; - } - else - { - valid = true; - if (@event == StandardWatchEventKinds.ENTRY_CREATE) - { - watcher.Created += handler.EventHandler; - } - else if (@event == StandardWatchEventKinds.ENTRY_DELETE) - { - watcher.Deleted += handler.EventHandler; - } - else if (@event == StandardWatchEventKinds.ENTRY_MODIFY) - { - watcher.Changed += handler.EventHandler; - } - else - { - @event.GetType(); - throw new global::java.lang.UnsupportedOperationException(); - } - } - } - - if (!valid) - { - throw new global::java.lang.IllegalArgumentException(); - } - - watcher.Error += handler.ErrorHandler; - foreach (var modifier in modifiers) - { - if (modifier == ExtendedWatchEventModifier.FILE_TREE) - { - watcher.IncludeSubdirectories = true; - } - else if (SensitivityWatchEventModifier.Is(modifier)) - { - // Ignore - } - else - { - modifier.GetType(); - throw new global::java.lang.UnsupportedOperationException(); - } - } - - watcher.EnableRaisingEvents = true; - DotNetWatchServiceKey.State.SetValue(key, watcher); - watcher = null; - } - catch (Exception e) when (e is ArgumentException or FileNotFoundException) - { - throw new global::java.io.FileNotFoundException(); - } - finally - { - watcher?.Dispose(); - } - } - - private class WatchServiceHandler - { - private readonly object fs; - private readonly object key; - - public readonly ErrorEventHandler ErrorHandler; - - public readonly FileSystemEventHandler EventHandler; - - public bool Overflow { get; set; } - - public WatchServiceHandler(object fs, object key) - { - this.fs = fs; - this.key = key; - ErrorHandler = OnError; - EventHandler = OnEvent; - } - - private void OnError(object sender, ErrorEventArgs e) - { - const int E_FAIL = unchecked((int)0x80004005); - - if (e.GetException() is Win32Exception win32Exception - && win32Exception.ErrorCode == E_FAIL) - { - DotNetWatchServiceKey.error(key); - } - else if (Overflow) - { - DotNetWatchServiceKey.signalEvent(key, - StandardWatchEventKinds.OVERFLOW, null); - } - } - - private void OnEvent(object sender, FileSystemEventArgs e) - { - DotNetWatchServiceKey.signalEvent(key, - e.ChangeType switch - { - WatcherChangeTypes.Created => StandardWatchEventKinds.ENTRY_CREATE, - WatcherChangeTypes.Deleted => StandardWatchEventKinds.ENTRY_DELETE, - _ => StandardWatchEventKinds.ENTRY_MODIFY - }, DotNetPath.Init(fs, e.Name)); - } - - } - - } - -#endif - -} From 1ecf69bcfd262a04e86f532285084ecbffa7f1ce Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Sat, 11 Nov 2023 14:09:48 -0600 Subject: [PATCH 067/134] Unused folders. --- src/IKVM.Runtime/IKVM.Runtime.csproj | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/IKVM.Runtime/IKVM.Runtime.csproj b/src/IKVM.Runtime/IKVM.Runtime.csproj index 28b954dd32..8d947a6f28 100644 --- a/src/IKVM.Runtime/IKVM.Runtime.csproj +++ b/src/IKVM.Runtime/IKVM.Runtime.csproj @@ -44,11 +44,6 @@ - - - - - From f11d3bddddab7b27c76b9456368a076216505350 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Sun, 12 Nov 2023 10:45:44 -0600 Subject: [PATCH 068/134] Load st_dev and st_ino into FileKey when on Unix for polling service. Add method to libikvm to acquire lstat values. Only some of them, though. Reenable certain file channel tests. --- openjdk.props | 1 + .../local/sun/nio/fs/DotNetPath.java | 302 +++++++----------- src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt | 14 +- .../Sun/Nio/Fs/UnixFileKeyAccessor.cs | 35 ++ .../sun/nio/fs/DotNetDosFileAttributes.cs | 23 +- src/IKVM.Runtime/LibIkvm.cs | 19 ++ .../Java/java/nio/file/WatchServiceTests.cs | 94 ++++++ src/libikvm/io.c | 14 + 8 files changed, 314 insertions(+), 188 deletions(-) create mode 100644 src/IKVM.Runtime/Accessors/Sun/Nio/Fs/UnixFileKeyAccessor.cs create mode 100644 src/IKVM.Tests/Java/java/nio/file/WatchServiceTests.cs diff --git a/openjdk.props b/openjdk.props index 35a66fef8f..9fe1af05e5 100644 --- a/openjdk.props +++ b/openjdk.props @@ -1480,6 +1480,7 @@ + diff --git a/src/IKVM.Java/local/sun/nio/fs/DotNetPath.java b/src/IKVM.Java/local/sun/nio/fs/DotNetPath.java index d10b3464c9..ae9254aa18 100644 --- a/src/IKVM.Java/local/sun/nio/fs/DotNetPath.java +++ b/src/IKVM.Java/local/sun/nio/fs/DotNetPath.java @@ -39,14 +39,10 @@ final class DotNetPath extends AbstractPath { private final DotNetFileSystem fs; final String path; - DotNetPath(DotNetFileSystem fs, String path) - { - if (cli.IKVM.Runtime.RuntimeUtil.get_IsWindows()) - { + DotNetPath(DotNetFileSystem fs, String path) { + if (cli.IKVM.Runtime.RuntimeUtil.get_IsWindows()) { path = WindowsPathParser.parse(path).path(); - } - else - { + } else { StringBuilder sb = null; int separatorCount = 0; boolean prevWasSeparator = false; @@ -103,136 +99,112 @@ public boolean isAbsolute() { public Path getRoot() { int len = getRootLength(); - return len == 0 ? null : new DotNetPath(fs, path.substring(0, len)); +return len == 0 ? null : new DotNetPath(fs, path.substring(0, len)); } private int getRootLength() { - if (cli.IKVM.Runtime.RuntimeUtil.get_IsWindows()) - { - if (path.length() >= 2 && path.charAt(1) == ':') - { - if (path.length() >= 3 && path.charAt(2) == '\\') - { + if (cli.IKVM.Runtime.RuntimeUtil.get_IsWindows()) { + if (path.length() >= 2 && path.charAt(1) == ':') { + if (path.length() >= 3 && path.charAt(2) == '\\') { return 3; - } - else - { + } else { return 2; } - } - else if (path.startsWith("\\\\")) - { + } else if (path.startsWith("\\\\")) { return path.indexOf('\\', path.indexOf('\\', 2) + 1) + 1; } } - if (path.length() >= 1 && path.charAt(0) == cli.System.IO.Path.DirectorySeparatorChar) - { + if (path.length() >= 1 && path.charAt(0) == cli.System.IO.Path.DirectorySeparatorChar) { return 1; - } - else - { + } else { return 0; } } public Path getFileName() { - if (path.length() == 0) - { + if (path.length() == 0) { return this; } - if (path.length() == getRootLength()) - { + if (path.length() == getRootLength()) { return null; } String name = cli.System.IO.Path.GetFileName(path); - if (name == null || name.length() == 0) - { + if (name == null || name.length() == 0) { return null; } + return new DotNetPath(fs, name); } - public Path getParent() - { - if (path.length() == getRootLength()) - { + public Path getParent() { + if (path.length() == getRootLength()) { return null; } String parent = cli.System.IO.Path.GetDirectoryName(path); - if (parent == null || parent.length() == 0) - { + if (parent == null || parent.length() == 0) { return null; } + return new DotNetPath(fs, parent); } - public int getNameCount() - { + public int getNameCount() { int len = getRootLength(); - if (path.length() == len) - { + if (path.length() == len) { return len == 0 ? 1 : 0; } int count = 1; - for (int i = len; i < path.length(); i++) - { - if (path.charAt(i) == cli.System.IO.Path.DirectorySeparatorChar) - { + for (int i = len; i < path.length(); i++) { + if (path.charAt(i) == cli.System.IO.Path.DirectorySeparatorChar) { count++; } } + return count; } - public Path getName(int index) - { + public Path getName(int index) { return new DotNetPath(fs, getNameImpl(index)); } - private String getNameImpl(int index) - { - for (int pos = getRootLength(); pos < path.length(); index--) - { + private String getNameImpl(int index) { + for (int pos = getRootLength(); pos < path.length(); index--) { int next = path.indexOf(cli.System.IO.Path.DirectorySeparatorChar, pos); - if (index == 0) - { + if (index == 0) { return next == -1 ? path.substring(pos) : path.substring(pos, next); } - if (next == -1) - { + if (next == -1) { break; } pos = next + 1; } - if (path.length() == 0 && index == 0) - { + + if (path.length() == 0 && index == 0) { return ""; } + throw new IllegalArgumentException(); } - public Path subpath(int beginIndex, int endIndex) - { + public Path subpath(int beginIndex, int endIndex) { StringBuilder sb = new StringBuilder(); - for (int i = beginIndex; i < endIndex; i++) - { - if (i != beginIndex) - { + for (int i = beginIndex; i < endIndex; i++) { + if (i != beginIndex) { sb.append(cli.System.IO.Path.DirectorySeparatorChar); } sb.append(getNameImpl(i)); } + return new DotNetPath(fs, sb.toString()); } - public boolean startsWith(Path other) - { + public boolean startsWith(Path other) { String npath = DotNetPath.from(other).path; - if (npath.length() == 0) - { + if (npath.length() == 0) { return path.length() == 0; } + return path.regionMatches(cli.IKVM.Runtime.RuntimeUtil.get_IsWindows(), 0, npath, 0, npath.length()) && (npath.length() == getRootLength() || (npath.length() > getRootLength() @@ -240,27 +212,22 @@ public boolean startsWith(Path other) || (path.length() > npath.length() && path.charAt(npath.length()) == cli.System.IO.Path.DirectorySeparatorChar)))); } - public boolean endsWith(Path other) - { + public boolean endsWith(Path other) { DotNetPath nother = DotNetPath.from(other); String npath = nother.path; - if (npath.length() > path.length()) - { + if (npath.length() > path.length()) { return false; } - if (npath.length() == 0) - { + if (npath.length() == 0) { return path.length() == 0; } int nameCount = getNameCount(); int otherNameCount = nother.getNameCount(); - if (otherNameCount > nameCount) - { + if (otherNameCount > nameCount) { return false; } int otherRootLength = nother.getRootLength(); - if (otherRootLength > 0) - { + if (otherRootLength > 0) { if (otherNameCount != nameCount || getRootLength() != otherRootLength || !path.regionMatches(cli.IKVM.Runtime.RuntimeUtil.get_IsWindows(), 0, npath, 0, otherRootLength)) @@ -268,6 +235,7 @@ public boolean endsWith(Path other) return false; } } + int skip = nameCount - otherNameCount; for (int i = 0; i < otherNameCount; i++) { @@ -278,6 +246,7 @@ public boolean endsWith(Path other) return false; } } + return true; } @@ -473,170 +442,145 @@ private DotNetPath emptyPath() { return new DotNetPath(fs, ""); } - public URI toUri() - { - if (cli.IKVM.Runtime.RuntimeUtil.get_IsWindows()) - { + public URI toUri() { + if (cli.IKVM.Runtime.RuntimeUtil.get_IsWindows()) { return DotNetWindowsUriSupport.toUri(this); - } - else - { + } else { return DotNetUnixUriUtils.toUri(this); } } - public DotNetPath toAbsolutePath() - { - if (isAbsolute()) - { + public DotNetPath toAbsolutePath() { + if (isAbsolute()) { return this; } + // System.getProperty("user.dir") will trigger the specified security check return new DotNetPath(fs, cli.System.IO.Path.GetFullPath(cli.System.IO.Path.Combine(System.getProperty("user.dir"), path))); } - public Path toRealPath(LinkOption... options) throws IOException - { + public Path toRealPath(LinkOption... options) throws IOException { SecurityManager sm = System.getSecurityManager(); - if (sm != null) - { + if (sm != null) { sm.checkRead(path); - if (!isAbsolute()) - { + if (!isAbsolute()) { sm.checkPropertyAccess("user.dir"); } } + return new DotNetPath(fs, toRealPathImpl(path)); } private static native String toRealPathImpl(String path); - public WatchKey register(WatchService watcher, WatchEvent.Kind[] events, WatchEvent.Modifier... modifiers) throws IOException - { - if (!(watcher instanceof DotNetFileSystem.NetWatchService)) - { - // null check - watcher.getClass(); - throw new ProviderMismatchException(); - } - boolean create = false; - boolean delete = false; - boolean modify = false; - boolean overflow = false; - boolean subtree = false; - for (WatchEvent.Kind kind : events) - { - if (kind == StandardWatchEventKinds.ENTRY_CREATE) - { - create = true; - } - else if (kind == StandardWatchEventKinds.ENTRY_DELETE) - { - delete = true; - } - else if (kind == StandardWatchEventKinds.ENTRY_MODIFY) - { - modify = true; - } - else if (kind == StandardWatchEventKinds.OVERFLOW) - { - overflow = true; - } - else - { + public WatchKey register(WatchService watcher, WatchEvent.Kind[] events, WatchEvent.Modifier... modifiers) throws IOException { + if (cli.IKVM.Runtime.RuntimeUtil.get_IsWindows()) { + if (!(watcher instanceof DotNetFileSystem.NetWatchService)) { // null check - kind.getClass(); - throw new UnsupportedOperationException(); - } - } - if (!create && !delete && !modify) - { - throw new IllegalArgumentException(); - } - for (WatchEvent.Modifier modifier : modifiers) - { - if (modifier == ExtendedWatchEventModifier.FILE_TREE) - { - subtree = true; + watcher.getClass(); + throw new ProviderMismatchException(); + } + + boolean create = false; + boolean delete = false; + boolean modify = false; + boolean overflow = false; + boolean subtree = false; + for (WatchEvent.Kind kind : events) { + if (kind == StandardWatchEventKinds.ENTRY_CREATE) { + create = true; + } else if (kind == StandardWatchEventKinds.ENTRY_DELETE) { + delete = true; + } else if (kind == StandardWatchEventKinds.ENTRY_MODIFY) { + modify = true; + } else if (kind == StandardWatchEventKinds.OVERFLOW) { + overflow = true; + } else { + // null check + kind.getClass(); + throw new UnsupportedOperationException(); + } } - else if (modifier instanceof SensitivityWatchEventModifier) - { - // ignore + + if (!create && !delete && !modify) { + throw new IllegalArgumentException(); } - else - { - // null check - modifier.getClass(); - throw new UnsupportedOperationException(); + + for (WatchEvent.Modifier modifier : modifiers) { + if (modifier == ExtendedWatchEventModifier.FILE_TREE) { + subtree = true; + } else if (modifier instanceof SensitivityWatchEventModifier) { + // ignore + } else { + // null check + modifier.getClass(); + throw new UnsupportedOperationException(); + } } - } - SecurityManager sm = System.getSecurityManager(); - if (sm != null) - { - sm.checkRead(path); - if (subtree) - { - sm.checkRead(path + cli.System.IO.Path.DirectorySeparatorChar + '-'); + + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkRead(path); + if (subtree) { + sm.checkRead(path + cli.System.IO.Path.DirectorySeparatorChar + '-'); + } } + + return ((DotNetFileSystem.NetWatchService)watcher).register(this, create, delete, modify, overflow, subtree); + } else { + return ((PollingWatchService)watcher).register(this, events, modifiers); } - return ((DotNetFileSystem.NetWatchService)watcher).register(this, create, delete, modify, overflow, subtree); } - public int compareTo(Path other) - { + public int compareTo(Path other) { String path2 = ((DotNetPath)other).path; int len1 = path.length(); int len2 = path2.length(); int min = Math.min(len1, len2); - for (int i = 0; i < min; i++) - { + for (int i = 0; i < min; i++) { char c1 = path.charAt(i); char c2 = path2.charAt(i); - if (c1 != c2 && Character.toUpperCase(c1) != Character.toUpperCase(c2)) - { + if (c1 != c2 && Character.toUpperCase(c1) != Character.toUpperCase(c2)) { return c1 - c2; } } + return len1 - len2; } - public boolean equals(Object other) - { - if (!(other instanceof DotNetPath)) - { + public boolean equals(Object other) { + if (!(other instanceof DotNetPath)) { return false; } + return compareTo((DotNetPath)other) == 0; } - public int hashCode() - { + public int hashCode() { int hash = 0; - for (int i = 0; i < path.length(); i++) - { + for (int i = 0; i < path.length(); i++) { hash = 97 * hash + Character.toUpperCase(path.charAt(i)); } + return hash; } - public String toString() - { + public String toString() { return path; } - boolean isUnc() - { + boolean isUnc() { return cli.IKVM.Runtime.RuntimeUtil.get_IsWindows() && getRootLength() > 3; } - static DotNetPath from(Path path) - { - if (!(path instanceof DotNetPath)) - { + static DotNetPath from(Path path) { + if (!(path instanceof DotNetPath)) { // null check path.getClass(); throw new ProviderMismatchException(); } + return (DotNetPath)path; } + } \ No newline at end of file diff --git a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt index 16234e6da1..cd72d21144 100644 --- a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt +++ b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt @@ -3372,7 +3372,7 @@ java/net/MulticastSocket/JoinGroup.java java/net/MulticastSocket/Leave.java macosx-all java/net/MulticastSocket/Promiscuous.java macosx-all java/net/MulticastSocket/SetOutgoingIf.java macosx-all -java/net/NetworkInterface/UniqueMacAddressesTest.java macosx-all +#java/net/NetworkInterface/UniqueMacAddressesTest.java macosx-all java/net/PlainSocketImpl/SetBufferSize.java macosx-all java/net/Socket/LinkLocal.java macosx-all java/net/Socket/SetSoLinger.java macosx-all @@ -3394,12 +3394,12 @@ java/nio/channels/DatagramChannel/Refused.java java/nio/channels/DatagramChannel/SRTest.java macosx-all java/nio/channels/DatagramChannel/Sender.java macosx-all java/nio/channels/DatagramChannel/ThereCanBeOnlyOne.java macosx-all -java/nio/channels/FileChannel/ExpandingMap.java macosx-all -java/nio/channels/FileChannel/LongTransferTest.java macosx-all -java/nio/channels/FileChannel/MapTest.java macosx-all -java/nio/channels/FileChannel/Transfer.java macosx-all -java/nio/channels/FileChannel/TransferToChannel.java macosx-all -java/nio/channels/FileChannel/Transfers.java macosx-all +#java/nio/channels/FileChannel/ExpandingMap.java macosx-all +#java/nio/channels/FileChannel/LongTransferTest.java macosx-all +#java/nio/channels/FileChannel/MapTest.java macosx-all +#java/nio/channels/FileChannel/Transfer.java macosx-all +#java/nio/channels/FileChannel/TransferToChannel.java macosx-all +#java/nio/channels/FileChannel/Transfers.java macosx-all java/nio/channels/Selector/RacyDeregister.java macosx-all java/nio/channels/ServerSocketChannel/NonBlockingAccept.java macosx-all java/nio/channels/ServerSocketChannel/SocketOptionTests.java macosx-all diff --git a/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/UnixFileKeyAccessor.cs b/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/UnixFileKeyAccessor.cs new file mode 100644 index 0000000000..52899938b2 --- /dev/null +++ b/src/IKVM.Runtime/Accessors/Sun/Nio/Fs/UnixFileKeyAccessor.cs @@ -0,0 +1,35 @@ +using System; + +namespace IKVM.Runtime.Accessors.Sun.Nio.Fs +{ + +#if FIRST_PASS == false && EXPORTER == false && IMPORTER == false + + internal sealed class UnixFileKeyAccessor : Accessor + { + + MethodAccessor> init; + + /// + /// Initializes a new instance. + /// + /// + public UnixFileKeyAccessor(AccessorTypeResolver resolver) : + base(resolver, "sun.nio.fs.UnixFileKey") + { + + } + + /// + /// Initializes a new instance. + /// + /// + /// + /// + public object Init(long st_dev, long st_ino) => GetConstructor(ref init, typeof(long), typeof(long)).Invoker(st_dev, st_ino); + + } + +#endif + +} \ No newline at end of file diff --git a/src/IKVM.Runtime/Java/Externs/sun/nio/fs/DotNetDosFileAttributes.cs b/src/IKVM.Runtime/Java/Externs/sun/nio/fs/DotNetDosFileAttributes.cs index b7b4071f61..76de2bd5fc 100644 --- a/src/IKVM.Runtime/Java/Externs/sun/nio/fs/DotNetDosFileAttributes.cs +++ b/src/IKVM.Runtime/Java/Externs/sun/nio/fs/DotNetDosFileAttributes.cs @@ -1,10 +1,12 @@ using System; using System.IO; +using System.Runtime.InteropServices; using System.Security; using IKVM.Runtime; using IKVM.Runtime.Accessors.Java.Lang; using IKVM.Runtime.Accessors.Sun.Nio.Ch; +using IKVM.Runtime.Accessors.Sun.Nio.Fs; using IKVM.Runtime.Vfs; namespace IKVM.Java.Externs.sun.nio.fs @@ -22,6 +24,7 @@ static class DotNetDosFileAttributes static SecurityManagerAccessor securityManagerAccessor; static FileTimeAccessor fileTimeAccessor; static DotNetDosFileAttributesAccessor dotNetDosFileAttributesAccessor; + static UnixFileKeyAccessor unixFileKeyAccessor; static SystemAccessor SystemAccessor => JVM.BaseAccessors.Get(ref systemAccessor); @@ -31,6 +34,8 @@ static class DotNetDosFileAttributes static DotNetDosFileAttributesAccessor DotNetDosFileAttributesAccessor => JVM.BaseAccessors.Get(ref dotNetDosFileAttributesAccessor); + static UnixFileKeyAccessor UnixFileKeyAccessor => JVM.BaseAccessors.Get(ref unixFileKeyAccessor); + #endif /// @@ -111,11 +116,17 @@ public static object read(string path) { var fileInfo = new FileInfo(path); if (fileInfo.Exists) + { + object fileKey = null; + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) == false) + if (LibIkvm.Instance.io_lstat(fileInfo.FullName, out var st_ino, out var st_dev) == 0) + fileKey = UnixFileKeyAccessor.Init(st_dev, st_ino); + return DotNetDosFileAttributesAccessor.Init( ToFileTime(fileInfo.CreationTimeUtc), ToFileTime(fileInfo.LastAccessTimeUtc), ToFileTime(fileInfo.LastWriteTimeUtc), - null, + fileKey, false, false, true, @@ -125,14 +136,21 @@ public static object read(string path) (fileInfo.Attributes & FileAttributes.Hidden) != 0, (fileInfo.Attributes & FileAttributes.Archive) != 0, (fileInfo.Attributes & FileAttributes.System) != 0); + } var directoryInfo = new DirectoryInfo(path); if (directoryInfo.Exists) + { + object fileKey = null; + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) == false) + if (LibIkvm.Instance.io_lstat(fileInfo.FullName, out var st_ino, out var st_dev) == 0) + fileKey = UnixFileKeyAccessor.Init(st_dev, st_ino); + return DotNetDosFileAttributesAccessor.Init( ToFileTime(directoryInfo.CreationTimeUtc), ToFileTime(directoryInfo.LastAccessTimeUtc), ToFileTime(directoryInfo.LastWriteTimeUtc), - null, + fileKey, true, false, false, @@ -142,6 +160,7 @@ public static object read(string path) (directoryInfo.Attributes & FileAttributes.Hidden) != 0, (directoryInfo.Attributes & FileAttributes.Archive) != 0, (directoryInfo.Attributes & FileAttributes.System) != 0); + } throw new global::java.nio.file.NoSuchFileException(path); } diff --git a/src/IKVM.Runtime/LibIkvm.cs b/src/IKVM.Runtime/LibIkvm.cs index be7739b947..c04c2c6c52 100644 --- a/src/IKVM.Runtime/LibIkvm.cs +++ b/src/IKVM.Runtime/LibIkvm.cs @@ -93,6 +93,16 @@ static class Externs [DllImport("ikvm", SetLastError = false)] internal static extern void IKVM_io_close_socket(long handle); + /// + /// Invokes the native 'IKVM_io_close_socket' function. + /// + /// + /// + /// + /// + [DllImport("ikvm", SetLastError = false)] + internal static extern int IKVM_io_lstat(string pathname, out long st_ino, out long st_dev); + } /// @@ -270,6 +280,15 @@ static nint Load() /// public long io_duplicate_socket(long handle) => Externs.IKVM_io_duplicate_socket(handle); + /// + /// Invokes the 'io_lstat' function. + /// + /// + /// + /// + /// + public int io_lstat(string pathname, out long st_ino, out long st_dev) => Externs.IKVM_io_lstat(pathname, out st_ino, out st_dev); + /// /// Releases the instance. /// diff --git a/src/IKVM.Tests/Java/java/nio/file/WatchServiceTests.cs b/src/IKVM.Tests/Java/java/nio/file/WatchServiceTests.cs new file mode 100644 index 0000000000..f4e406085b --- /dev/null +++ b/src/IKVM.Tests/Java/java/nio/file/WatchServiceTests.cs @@ -0,0 +1,94 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; + +using com.sun.nio.file; + +using FluentAssertions; + +using java.lang; +using java.nio.file; +using java.util.concurrent; + +using Microsoft.VisualStudio.TestTools.UnitTesting; + +namespace IKVM.Tests.Java.java.nio.file +{ + + [TestClass] + public class WatchServiceTests + { + + [TestMethod] + public void CanWatchDirectoryForBasicOperations() + { + var cts = new CancellationTokenSource(); + + using var watcher = FileSystems.getDefault().newWatchService(); + + var dir = Paths.get(System.IO.Path.GetTempPath(), Guid.NewGuid().ToString()); + System.IO.Directory.CreateDirectory(dir.ToString()); + + var key = dir.register(watcher, new[] { StandardWatchEventKinds.ENTRY_CREATE, StandardWatchEventKinds.ENTRY_DELETE }, SensitivityWatchEventModifier.HIGH); + var lst = new List<(WatchEvent.Kind, string)>(); + + var tsk = Task.Run(() => + { + while (cts.IsCancellationRequested == false) + { + var key = watcher.poll(1, TimeUnit.SECONDS); + if (key == null) + continue; + + foreach (var evt in key.pollEvents().AsEnumerable()) + { + var kind = evt.kind(); + if (kind == StandardWatchEventKinds.OVERFLOW) + continue; + + var name = (Path)evt.context(); + var item = dir.resolve(name).ToString(); + lst.Add((kind, item)); + } + + key.reset(); + } + }); + + System.Threading.Thread.Sleep(3000); + + // create a file and directory + System.IO.File.WriteAllText(dir.resolve("test.txt").ToString(), "HELLO"); + System.Threading.Thread.Sleep(3000); + System.IO.Directory.CreateDirectory(dir.resolve("test.dir").ToString()); + System.Threading.Thread.Sleep(3000); + + // remove a file and directory + System.IO.File.Delete(dir.resolve("test.txt").ToString()); + System.Threading.Thread.Sleep(3000); + System.IO.Directory.Delete(dir.resolve("test.dir").ToString()); + System.Threading.Thread.Sleep(3000); + + // wait for event loop to exit + cts.Cancel(); + tsk.Wait(); + key.cancel(); + + lst[0].Item1.Should().Be(StandardWatchEventKinds.ENTRY_CREATE); + lst[0].Item2.Should().Be(System.IO.Path.Combine(dir.ToString(), "test.txt")); + + lst[1].Item1.Should().Be(StandardWatchEventKinds.ENTRY_CREATE); + lst[1].Item2.Should().Be(System.IO.Path.Combine(dir.ToString(), "test.dir")); + + lst[2].Item1.Should().Be(StandardWatchEventKinds.ENTRY_DELETE); + lst[2].Item2.Should().Be(System.IO.Path.Combine(dir.ToString(), "test.txt")); + + lst[3].Item1.Should().Be(StandardWatchEventKinds.ENTRY_DELETE); + lst[3].Item2.Should().Be(System.IO.Path.Combine(dir.ToString(), "test.dir")); + } + + } + +} diff --git a/src/libikvm/io.c b/src/libikvm/io.c index f69a88fb60..e74954daa7 100644 --- a/src/libikvm/io.c +++ b/src/libikvm/io.c @@ -108,3 +108,17 @@ NETEXPORT void NETCALL IKVM_io_close_socket(long long handle) #endif } } + +NETEXPORT int NETCALL IKVM_io_lstat(const char* pathname, long long* st_ino, long long* st_dev) +{ +#ifdef WIN32 +#else + struct stat st; + if (lstat(pathname, &st) < 0) + return -1; + + *st_ino = st.st_ino; + *st_dev = st.st_dev; + return 0; +#endif +} From 0fc2bfd117222af302ad70d605e17612ef305e92 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Sun, 12 Nov 2023 12:59:45 -0600 Subject: [PATCH 069/134] Kerberos tests broken on OS X. --- src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt index cd72d21144..fbc1530baf 100644 --- a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt +++ b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt @@ -3464,6 +3464,9 @@ javax/management/mxbean/MXBeanLoadingTest1.java sun/security/krb5/auto/UnboundSSL.java generic-all sun/security/krb5/auto/UnboundSSLMultipleKeys.java generic-all sun/security/krb5/auto/UnboundSSLPrincipalProperty.java generic-all +sun/security/krb5/auto/TicketSName.java macosx-all +sun/security/krb5/auto/ForwardableCheck.java macosx-all +sun/security/krb5/auto/RefreshKrb5Config.java macosx-all # RMI, fails, but works in Debug with attached Debugger sun/rmi/server/UnicastServerRef/FilterUSRTest.java generic-all From 82ec68082fe789575293f5e3caf2ec9003284c11 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Sun, 12 Nov 2023 15:33:29 -0600 Subject: [PATCH 070/134] Ensure security manager check. --- .../local/sun/nio/fs/DotNetPath.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/IKVM.Java/local/sun/nio/fs/DotNetPath.java b/src/IKVM.Java/local/sun/nio/fs/DotNetPath.java index ae9254aa18..5748f7e557 100644 --- a/src/IKVM.Java/local/sun/nio/fs/DotNetPath.java +++ b/src/IKVM.Java/local/sun/nio/fs/DotNetPath.java @@ -528,6 +528,28 @@ public WatchKey register(WatchService watcher, WatchEvent.Kind[] events, Watc return ((DotNetFileSystem.NetWatchService)watcher).register(this, create, delete, modify, overflow, subtree); } else { + boolean subtree = false; + + for (WatchEvent.Modifier modifier : modifiers) { + if (modifier == ExtendedWatchEventModifier.FILE_TREE) { + subtree = true; + } else if (modifier instanceof SensitivityWatchEventModifier) { + // ignore + } else { + // null check + modifier.getClass(); + throw new UnsupportedOperationException(); + } + } + + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkRead(path); + if (subtree) { + sm.checkRead(path + cli.System.IO.Path.DirectorySeparatorChar + '-'); + } + } + return ((PollingWatchService)watcher).register(this, events, modifiers); } } From b58cd242e427cd568a7aab0554723e63ced2d381 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Thu, 7 Dec 2023 08:44:42 -0600 Subject: [PATCH 071/134] Formatting. --- .../local/sun/nio/fs/DotNetFileSystem.java | 339 ++++++++---------- 1 file changed, 144 insertions(+), 195 deletions(-) diff --git a/src/IKVM.Java/local/sun/nio/fs/DotNetFileSystem.java b/src/IKVM.Java/local/sun/nio/fs/DotNetFileSystem.java index 9be3a662ba..7b2f172b97 100644 --- a/src/IKVM.Java/local/sun/nio/fs/DotNetFileSystem.java +++ b/src/IKVM.Java/local/sun/nio/fs/DotNetFileSystem.java @@ -79,17 +79,12 @@ public String getSeparator() { public Iterable getRootDirectories() { SecurityManager sm = System.getSecurityManager(); ArrayList list = new ArrayList<>(); - for (DriveInfo info : DriveInfo.GetDrives()) - { - try - { - if (sm != null) - { + for (DriveInfo info : DriveInfo.GetDrives()) { + try { + if (sm != null) { sm.checkRead(info.get_Name()); } - } - catch (SecurityException _) - { + } catch (SecurityException _) { continue; } @@ -99,41 +94,28 @@ public Iterable getRootDirectories() { return list; } - public Iterable getFileStores() - { + public Iterable getFileStores() { SecurityManager sm = System.getSecurityManager(); - if (sm != null) - { - try - { + if (sm != null) { + try { sm.checkPermission(new RuntimePermission("getFileStoreAttributes")); - } - catch (SecurityException _) - { + } catch (SecurityException _) { return Collections.emptyList(); } } ArrayList list = new ArrayList<>(); - for (DriveInfo info : DriveInfo.GetDrives()) - { - try - { - if (sm != null) - { + for (DriveInfo info : DriveInfo.GetDrives()) { + try { + if (sm != null) { sm.checkRead(info.get_Name()); } - } - catch (SecurityException _) - { + } catch (SecurityException _) { continue; } - try - { + try { list.add(provider.getFileStore(info)); - } - catch (IOException _) - { + } catch (IOException _) { } } @@ -141,25 +123,18 @@ public Iterable getFileStores() return list; } - public Set supportedFileAttributeViews() - { + public Set supportedFileAttributeViews() { return attributes; } - public Path getPath(String first, String... more) - { - if (more.length == 0) - { + public Path getPath(String first, String... more) { + if (more.length == 0) { return new DotNetPath(this, first); - } - else - { + } else { StringBuilder sb = new StringBuilder(first); String sep = sb.length() == 0 ? "" : separator; - for (String s : more) - { - if (s.length() != 0) - { + for (String s : more) { + if (s.length() != 0) { sb.append(sep); sb.append(s); sep = separator; @@ -170,33 +145,23 @@ public Path getPath(String first, String... more) } } - public PathMatcher getPathMatcher(String syntaxAndPattern) - { + public PathMatcher getPathMatcher(String syntaxAndPattern) { String regex; - if (syntaxAndPattern.startsWith("glob:")) - { + if (syntaxAndPattern.startsWith("glob:")) { String pattern = syntaxAndPattern.substring(5); - if (cli.IKVM.Runtime.RuntimeUtil.get_IsWindows()) - { + if (cli.IKVM.Runtime.RuntimeUtil.get_IsWindows()) { regex = Globs.toWindowsRegexPattern(pattern); - } - else - { + } else { regex = Globs.toUnixRegexPattern(pattern); } - } - else if (syntaxAndPattern.startsWith("regex:")) - { + } else if (syntaxAndPattern.startsWith("regex:")) { regex = syntaxAndPattern.substring(6); - } - else if (syntaxAndPattern.indexOf(':') <= 0) - { + } else if (syntaxAndPattern.indexOf(':') <= 0) { throw new IllegalArgumentException(); - } - else - { + } else { throw new UnsupportedOperationException(); } + final Pattern pattern = Pattern.compile(regex, cli.IKVM.Runtime.RuntimeUtil.get_IsWindows() ? Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE : 0); return new PathMatcher() { @Override @@ -206,13 +171,12 @@ public boolean matches(Path path) { }; } - public UserPrincipalLookupService getUserPrincipalLookupService() - { + public UserPrincipalLookupService getUserPrincipalLookupService() { throw new UnsupportedOperationException(); } - static final class NetWatchService implements WatchService - { + static final class NetWatchService implements WatchService { + static final WatchEvent overflowEvent = new WatchEvent() { public Object context() { return null; @@ -224,6 +188,7 @@ public WatchEvent.Kind kind() { return StandardWatchEventKinds.OVERFLOW; } }; + private static final WatchKey CLOSED = new WatchKey() { public boolean isValid() { return false; } public List> pollEvents() { return null; } @@ -231,143 +196,143 @@ public WatchEvent.Kind kind() { public void cancel() { } public Watchable watchable() { return null; } }; + private boolean closed; private final ArrayList keys = new ArrayList<>(); private final LinkedBlockingQueue queue = new LinkedBlockingQueue<>(); - public synchronized void close() - { - if (!closed) - { + public synchronized void close() { + if (!closed) { closed = true; - for (NetWatchKey key : keys) - { + for (NetWatchKey key : keys) { key.close(); } enqueue(CLOSED); } } - private WatchKey checkClosed(WatchKey key) - { - if (key == CLOSED) - { + private WatchKey checkClosed(WatchKey key) { + if (key == CLOSED) { enqueue(CLOSED); throw new ClosedWatchServiceException(); } + return key; } - public WatchKey poll() - { + public WatchKey poll() { return checkClosed(queue.poll()); } - public WatchKey poll(long timeout, TimeUnit unit) throws InterruptedException - { + public WatchKey poll(long timeout, TimeUnit unit) throws InterruptedException { return checkClosed(queue.poll(timeout, unit)); } - public WatchKey take() throws InterruptedException - { + public WatchKey take() throws InterruptedException { return checkClosed(queue.take()); } - void enqueue(WatchKey key) - { - for (;;) - { - try - { + void enqueue(WatchKey key) { + for (;;) { + try { queue.put(key); return; - } - catch (InterruptedException _) - { + } catch (InterruptedException _) { + } } } - private final class NetWatchKey implements WatchKey - { + private final class NetWatchKey implements WatchKey { + private final DotNetPath path; private FileSystemWatcher fsw; private ArrayList> list = new ArrayList<>(); private HashSet modified = new HashSet<>(); private boolean signaled; - NetWatchKey(DotNetPath path) - { + NetWatchKey(DotNetPath path) { this.path = path; } - synchronized void init(final boolean create, final boolean delete, final boolean modify, final boolean overflow, final boolean subtree) - { - if (fsw != null) - { - // we could reuse the FileSystemWatcher, but for now we just recreate it - // (and we run the risk of missing some events while we're doing that) - fsw.Dispose(); - fsw = null; - } - fsw = new FileSystemWatcher(path.path); - if (create) - { - fsw.add_Created(new FileSystemEventHandler(new FileSystemEventHandler.Method() { - public void Invoke(Object sender, FileSystemEventArgs e) { - addEvent(createEvent(e), null); - } - })); - } - if (delete) - { - fsw.add_Deleted(new FileSystemEventHandler(new FileSystemEventHandler.Method() { - public void Invoke(Object sender, FileSystemEventArgs e) { - addEvent(createEvent(e), null); - } - })); - } - if (modify) - { - fsw.add_Changed(new FileSystemEventHandler(new FileSystemEventHandler.Method() { - public void Invoke(Object sender, FileSystemEventArgs e) { - synchronized (NetWatchKey.this) { - if (modified.contains(e.get_Name())) { - // we already have an ENTRY_MODIFY event pending - return; + synchronized void init(final boolean create, final boolean delete, final boolean modify, final boolean overflow, final boolean subtree) throws IOException { + try { + if (fsw != null) { + // we could reuse the FileSystemWatcher, but for now we just recreate it + // (and we run the risk of missing some events while we're doing that) + fsw.Dispose(); + fsw = null; + } + + fsw = new FileSystemWatcher(path.path); + if (create) { + fsw.add_Created(new FileSystemEventHandler(new FileSystemEventHandler.Method() { + public void Invoke(Object sender, FileSystemEventArgs e) { + addEvent(createEvent(e), null); + } + })); + } + + if (delete) { + fsw.add_Deleted(new FileSystemEventHandler(new FileSystemEventHandler.Method() { + public void Invoke(Object sender, FileSystemEventArgs e) { + addEvent(createEvent(e), null); + } + })); + } + + if (modify) { + fsw.add_Changed(new FileSystemEventHandler(new FileSystemEventHandler.Method() { + public void Invoke(Object sender, FileSystemEventArgs e) { + synchronized (NetWatchKey.this) { + if (modified.contains(e.get_Name())) { + // we already have an ENTRY_MODIFY event pending + return; + } } + addEvent(createEvent(e), e.get_Name()); + } + })); + } + + fsw.add_Error(new ErrorEventHandler(new ErrorEventHandler.Method() { + public void Invoke(Object sender, ErrorEventArgs e) { + if (e.GetException() instanceof cli.System.ComponentModel.Win32Exception && ((cli.System.ComponentModel.Win32Exception)e.GetException()).get_ErrorCode() == -2147467259) { + // the directory we were watching was deleted + cancelledByError(); + } else if (overflow) { + addEvent(overflowEvent, null); } - addEvent(createEvent(e), e.get_Name()); } })); - } - fsw.add_Error(new ErrorEventHandler(new ErrorEventHandler.Method() { - public void Invoke(Object sender, ErrorEventArgs e) { - if (e.GetException() instanceof cli.System.ComponentModel.Win32Exception - && ((cli.System.ComponentModel.Win32Exception)e.GetException()).get_ErrorCode() == -2147467259) { - // the directory we were watching was deleted - cancelledByError(); - } else if (overflow) { - addEvent(overflowEvent, null); - } + + if (subtree) { + fsw.set_IncludeSubdirectories(true); + } + + fsw.set_EnableRaisingEvents(true); + } catch (Throwable t) { + if (t instanceof cli.System.IO.FileNotFoundException) { + throw new java.nio.file.NoSuchFileException(((cli.System.IO.FileNotFoundException)t).get_FileName()); + } else if (t instanceof cli.System.Exception) { + throw new IOException(((cli.System.Exception)t).get_Message(), t); + } else { + throw new IOException(t); } - })); - if (subtree) - { - fsw.set_IncludeSubdirectories(true); } - fsw.set_EnableRaisingEvents(true); } - WatchEvent createEvent(final FileSystemEventArgs e) - { + WatchEvent createEvent(final FileSystemEventArgs e) { return new WatchEvent() { + public Path context() { return new DotNetPath((DotNetFileSystem)path.getFileSystem(), e.get_Name()); } + public int count() { return 1; } + public WatchEvent.Kind kind() { switch (e.get_ChangeType().Value) { case WatcherChangeTypes.Created: @@ -378,116 +343,100 @@ public WatchEvent.Kind kind() { return StandardWatchEventKinds.ENTRY_MODIFY; } } + }; } - void cancelledByError() - { + void cancelledByError() { cancel(); - synchronized (this) - { - if (!signaled) - { + synchronized (this) { + if (!signaled) { signaled = true; enqueue(this); } } } - synchronized void addEvent(WatchEvent event, String modified) - { + synchronized void addEvent(WatchEvent event, String modified) { list.add(event); - if (modified != null) - { + if (modified != null) { this.modified.add(modified); } - if (!signaled) - { + if (!signaled) { signaled = true; enqueue(this); } } - public synchronized boolean isValid() - { + public synchronized boolean isValid() { return fsw != null; } - public synchronized List> pollEvents() - { + public synchronized List> pollEvents() { ArrayList> r = list; list = new ArrayList<>(); modified.clear(); return r; } - public synchronized boolean reset() - { - if (fsw == null) - { + public synchronized boolean reset() { + if (fsw == null) { return false; } - if (signaled) - { - if (list.size() == 0) - { + + if (signaled) { + if (list.size() == 0) { signaled = false; - } - else - { + } else { enqueue(this); } } + return true; } - void close() - { - if (fsw != null) - { + void close() { + if (fsw != null) { fsw.Dispose(); fsw = null; } } - public void cancel() - { - synchronized (NetWatchService.this) - { + public void cancel() { + synchronized (NetWatchService.this) { keys.remove(this); close(); } } - public Watchable watchable() - { + public Watchable watchable() { return path; } + } - synchronized WatchKey register(DotNetPath path, boolean create, boolean delete, boolean modify, boolean overflow, boolean subtree) - { - if (closed) - { + synchronized WatchKey register(DotNetPath path, boolean create, boolean delete, boolean modify, boolean overflow, boolean subtree) throws IOException { + if (closed) { throw new ClosedWatchServiceException(); } + NetWatchKey existing = null; - for (NetWatchKey key : keys) - { - if (key.watchable().equals(path)) - { + for (NetWatchKey key : keys) { + if (key.watchable().equals(path)) { existing = key; break; } } - if (existing == null) - { + + if (existing == null) { existing = new NetWatchKey(path); keys.add(existing); } + existing.init(create, delete, modify, overflow, subtree); return existing; } + } public WatchService newWatchService() throws IOException { From b40d9de957fb4538ad564df0f2ff927d1f3f4f13 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Sun, 11 Feb 2024 16:43:09 -0600 Subject: [PATCH 072/134] Fix accessors name. --- .../Java/Externs/sun/nio/fs/DotNetDosFileAttributes.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/IKVM.Runtime/Java/Externs/sun/nio/fs/DotNetDosFileAttributes.cs b/src/IKVM.Runtime/Java/Externs/sun/nio/fs/DotNetDosFileAttributes.cs index 6184b0f3a5..70f8ba83b5 100644 --- a/src/IKVM.Runtime/Java/Externs/sun/nio/fs/DotNetDosFileAttributes.cs +++ b/src/IKVM.Runtime/Java/Externs/sun/nio/fs/DotNetDosFileAttributes.cs @@ -34,7 +34,7 @@ static class DotNetDosFileAttributes static DotNetDosFileAttributesAccessor DotNetDosFileAttributesAccessor => JVM.Internal.BaseAccessors.Get(ref dotNetDosFileAttributesAccessor); - static UnixFileKeyAccessor UnixFileKeyAccessor => JVM.BaseAccessors.Get(ref unixFileKeyAccessor); + static UnixFileKeyAccessor UnixFileKeyAccessor => JVM.Internal.BaseAccessors.Get(ref unixFileKeyAccessor); #endif From 6532e8ed8e8eedc479382b3fd01d300dcda6c59e Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Mon, 12 Feb 2024 09:05:27 -0600 Subject: [PATCH 073/134] Fox jni field names. --- .../Java/Externs/java/io/FileInputStream.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/IKVM.Runtime/Java/Externs/java/io/FileInputStream.cs b/src/IKVM.Runtime/Java/Externs/java/io/FileInputStream.cs index 7465243631..65133f02ef 100644 --- a/src/IKVM.Runtime/Java/Externs/java/io/FileInputStream.cs +++ b/src/IKVM.Runtime/Java/Externs/java/io/FileInputStream.cs @@ -33,9 +33,9 @@ static class FileInputStream delegate int __jniDelegate__readBytes(IntPtr jniEnv, IntPtr self, IntPtr bytes, int off, int len); static __jniDelegate__readBytes __jniPtr__readBytes; delegate long __jniDelegate__skip(IntPtr jniEnv, IntPtr self, long toSkip); - static __jniDelegate__skip __jniPtr__skip; + static __jniDelegate__skip __jniPtr__skip0; delegate int __jniDelegate__available(IntPtr jniEnv, IntPtr self); - static __jniDelegate__available __jniPtr__available; + static __jniDelegate__available __jniPtr__available0; delegate int __jniDelegate__close0(IntPtr jniEnv, IntPtr self); static __jniDelegate__close0 __jniPtr__close0; @@ -294,12 +294,12 @@ public static long skip0(object this_, long n) else { __callerID ??= global::ikvm.@internal.CallerID.create(typeof(global::java.io.FileInputStream).TypeHandle); - __jniPtr__skip ??= Marshal.GetDelegateForFunctionPointer<__jniDelegate__skip>(JNIFrame.GetFuncPtr(__callerID, "java/io/FileInputStream", nameof(skip0), "(J)J")); + __jniPtr__skip0 ??= Marshal.GetDelegateForFunctionPointer<__jniDelegate__skip>(JNIFrame.GetFuncPtr(__callerID, "java/io/FileInputStream", nameof(skip0), "(J)J")); var jniFrm = new JNIFrame(); var jniEnv = jniFrm.Enter(__callerID); try { - return __jniPtr__skip(jniEnv, jniFrm.MakeLocalRef(this_), n); + return __jniPtr__skip0(jniEnv, jniFrm.MakeLocalRef(this_), n); } catch (Exception ex) { @@ -358,12 +358,12 @@ public static int available0(object this_) else { __callerID ??= global::ikvm.@internal.CallerID.create(typeof(global::java.io.FileInputStream).TypeHandle); - __jniPtr__available ??= Marshal.GetDelegateForFunctionPointer<__jniDelegate__available>(JNIFrame.GetFuncPtr(__callerID, "java/io/FileInputStream", nameof(available0), "()I")); + __jniPtr__available0 ??= Marshal.GetDelegateForFunctionPointer<__jniDelegate__available>(JNIFrame.GetFuncPtr(__callerID, "java/io/FileInputStream", nameof(available0), "()I")); var jniFrm = new JNIFrame(); var jniEnv = jniFrm.Enter(__callerID); try { - return __jniPtr__available(jniEnv, jniFrm.MakeLocalRef(this_)); + return __jniPtr__available0(jniEnv, jniFrm.MakeLocalRef(this_)); } catch (Exception ex) { From b19af08da5a2143d33f5380f520e1e3da8e67903 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Mon, 12 Feb 2024 09:05:39 -0600 Subject: [PATCH 074/134] Revert to DotNetFileSystemWatcher for non-Windows. --- .../local/sun/nio/fs/DotNetFileSystem.java | 7 +------ src/IKVM.Java/local/sun/nio/fs/DotNetPath.java | 16 +++++++--------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/IKVM.Java/local/sun/nio/fs/DotNetFileSystem.java b/src/IKVM.Java/local/sun/nio/fs/DotNetFileSystem.java index 7b2f172b97..250d354979 100644 --- a/src/IKVM.Java/local/sun/nio/fs/DotNetFileSystem.java +++ b/src/IKVM.Java/local/sun/nio/fs/DotNetFileSystem.java @@ -440,12 +440,7 @@ synchronized WatchKey register(DotNetPath path, boolean create, boolean delete, } public WatchService newWatchService() throws IOException { - if (cli.IKVM.Runtime.RuntimeUtil.get_IsWindows()) { - return new NetWatchService(); - } else { - // FileSystemWatcher implementation on .NET for Unix consumes way too many inotify queues - return new PollingWatchService(); - } + return new NetWatchService(); } } diff --git a/src/IKVM.Java/local/sun/nio/fs/DotNetPath.java b/src/IKVM.Java/local/sun/nio/fs/DotNetPath.java index 5748f7e557..2766c08381 100644 --- a/src/IKVM.Java/local/sun/nio/fs/DotNetPath.java +++ b/src/IKVM.Java/local/sun/nio/fs/DotNetPath.java @@ -99,7 +99,7 @@ public boolean isAbsolute() { public Path getRoot() { int len = getRootLength(); -return len == 0 ? null : new DotNetPath(fs, path.substring(0, len)); + return len == 0 ? null : new DotNetPath(fs, path.substring(0, len)); } private int getRootLength() { @@ -474,18 +474,13 @@ public Path toRealPath(LinkOption... options) throws IOException { private static native String toRealPathImpl(String path); public WatchKey register(WatchService watcher, WatchEvent.Kind[] events, WatchEvent.Modifier... modifiers) throws IOException { - if (cli.IKVM.Runtime.RuntimeUtil.get_IsWindows()) { - if (!(watcher instanceof DotNetFileSystem.NetWatchService)) { - // null check - watcher.getClass(); - throw new ProviderMismatchException(); - } - + if (watcher instanceof DotNetFileSystem.NetWatchService) { boolean create = false; boolean delete = false; boolean modify = false; boolean overflow = false; boolean subtree = false; + for (WatchEvent.Kind kind : events) { if (kind == StandardWatchEventKinds.ENTRY_CREATE) { create = true; @@ -527,7 +522,7 @@ public WatchKey register(WatchService watcher, WatchEvent.Kind[] events, Watc } return ((DotNetFileSystem.NetWatchService)watcher).register(this, create, delete, modify, overflow, subtree); - } else { + } else if (watcher instanceof PollingWatchService) { boolean subtree = false; for (WatchEvent.Modifier modifier : modifiers) { @@ -551,6 +546,9 @@ public WatchKey register(WatchService watcher, WatchEvent.Kind[] events, Watc } return ((PollingWatchService)watcher).register(this, events, modifiers); + } else { + watcher.getClass(); // null check + throw new ProviderMismatchException(); } } From 52307b664a121bb7c4a6bddc04676505f72a87c1 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Mon, 12 Feb 2024 09:18:33 -0600 Subject: [PATCH 075/134] Move tests around. --- src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt | 92 ++++++++++------------ 1 file changed, 41 insertions(+), 51 deletions(-) diff --git a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt index 242b8ad06f..286ad24b4f 100644 --- a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt +++ b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt @@ -831,6 +831,27 @@ java/awt/xembed/server/RunTestXEmbed.java java/awt/xembed/server/TestXEmbedServer.java generic-all java/awt/xembed/server/TestXEmbedServerJava.java generic-all java/awt/xembed/server/TesterClient.java generic-all +com/sun/java/swing/plaf/windows/Test8173145.java generic-all +java/awt/Container/MoveToOtherScreenTest/MoveToOtherScreenTest.java generic-all +java/awt/Dialog/DialogAboveFrame/DialogAboveFrameTest.java generic-all +java/awt/EventQueue/6980209/bug6980209.java generic-all +java/awt/Focus/ModalDialogActivationTest/ModalDialogActivationTest.java generic-all +java/awt/font/MonospacedGlyphWidth/MonospacedGlyphWidthTest.java generic-all +java/awt/font/TextLayout/DiacriticsDrawingTest.java generic-all +java/awt/Frame/FrameResize/ShowChildWhileResizingTest.java generic-all +java/awt/Frame/NormalToIconified/NormalToIconifiedTest.java generic-all +java/awt/Frame/ObscuredFrame/ObscuredFrameTest.java generic-all +java/awt/geom/AffineTransform/InvalidTransformParameterTest.java generic-all +java/awt/image/VolatileImage/VolatileImageBug.java generic-all +java/awt/Mouse/EnterExitEvents/ModalDialogEnterExitEventsTest.java generic-all +java/awt/MouseInfo/GetPointerInfoTest.java generic-all +java/awt/MouseInfo/MultiscreenPointerInfo.java generic-all +java/awt/Paint/ComponentIsNotDrawnAfterRemoveAddTest/ComponentIsNotDrawnAfterRemoveAddTest.java generic-all +java/awt/print/PrinterJob/PrintCrashTest.java generic-all +java/awt/TextArea/TextAreaEditing/TextAreaEditing.java generic-all +java/awt/Window/WindowDeadlockTest/WindowDeadlockTest.java generic-all +java/awt/Window/WindowJumpingTest/WindowJumpingTest.java generic-all +sun/java2d/ClassCastExceptionForInvalidSurface.java generic-all java/beans/Beans/6669869/TestDesignTime.java generic-all java/beans/Beans/6669869/TestGuiAvailable.java generic-all java/beans/EventHandler/Test6179222.java generic-all @@ -1415,7 +1436,7 @@ java/nio/file/Files/delete_on_close.sh java/nio/file/Files/walkFileTree/find.sh generic-all java/nio/file/Path/Misc.java linux-all,macosx-all java/nio/file/Path/PathOps.java windows-all -#java/nio/file/WatchService/Basic.java linux-all,macosx-all +java/nio/file/WatchService/Basic.java linux-all,macosx-all java/rmi/Naming/DefaultRegistryPort.java generic-all java/rmi/Naming/LookupIPv6.java generic-all java/rmi/Naming/LookupNameWithColon.java generic-all @@ -1844,6 +1865,7 @@ java/util/zip/ZipFile/ReadLongZipFileName.java java/util/zip/ZipFile/StreamZipEntriesTest.java generic-all javax/accessibility/6986385/bug6986385.java generic-all javax/accessibility/8069268/bug8069268.java generic-all +javax/accessibility/JList/AccessibleJListChildNPETest.java generic-all javax/crypto/JceSecurity/SunJCE_BC_LoadOrdering.java generic-all javax/crypto/SecretKeyFactory/FailOverTest.sh generic-all javax/crypto/sanity/CheckManifestForRelease.java generic-all @@ -2615,6 +2637,14 @@ javax/swing/text/html/parser/Parser/7165725/bug7165725.java javax/swing/text/html/parser/Parser/8028616/bug8028616.java generic-all javax/swing/text/html/parser/Test8017492.java generic-all javax/swing/tree/DefaultTreeCellRenderer/7142955/bug7142955.java generic-all +javax/swing/JComboBox/8136998/bug8136998.java generic-all +javax/swing/JMenuItem/8152981/MenuItemIconTest.java generic-all +javax/swing/JProgressBar/8161664/ProgressBarMemoryLeakTest.java generic-all +javax/swing/plaf/basic/BasicComboPopup/8154069/Bug8154069.java generic-all +javax/swing/plaf/basic/BasicLabelUI/bug7172652.java generic-all +javax/swing/plaf/nimbus/8057791/bug8057791.java generic-all +javax/swing/text/FlowView/LayoutTest.java generic-all +javax/swing/text/html/parser/Parser/HtmlCommentTagParseTest/HtmlCommentTagParseTest.java generic-all javax/xml/bind/marshal/8036981/Test.java generic-all javax/xml/crypto/dsig/GenerationTests.java generic-all javax/xml/crypto/dsig/SecurityManager/XMLDSigWithSecMgr.java generic-all @@ -2899,6 +2929,8 @@ sun/security/krb5/auto/TwoPrinces.java sun/security/krb5/auto/TwoTab.java generic-all sun/security/krb5/auto/UdpTcp.java generic-all sun/security/krb5/auto/UnboundService.java generic-all +sun/security/krb5/auto/UnboundSSLMultipleKeys.java generic-all +sun/security/krb5/auto/UnboundSSLPrincipalProperty.java generic-all sun/security/krb5/auto/UseCacheAndStoreKey.java generic-all sun/security/krb5/auto/W83.java generic-all sun/security/krb5/ccache/EmptyCC.java generic-all @@ -3372,7 +3404,6 @@ java/net/MulticastSocket/JoinGroup.java java/net/MulticastSocket/Leave.java macosx-all java/net/MulticastSocket/Promiscuous.java macosx-all java/net/MulticastSocket/SetOutgoingIf.java macosx-all -#java/net/NetworkInterface/UniqueMacAddressesTest.java macosx-all java/net/PlainSocketImpl/SetBufferSize.java macosx-all java/net/Socket/LinkLocal.java macosx-all java/net/Socket/SetSoLinger.java macosx-all @@ -3394,12 +3425,6 @@ java/nio/channels/DatagramChannel/Refused.java java/nio/channels/DatagramChannel/SRTest.java macosx-all java/nio/channels/DatagramChannel/Sender.java macosx-all java/nio/channels/DatagramChannel/ThereCanBeOnlyOne.java macosx-all -#java/nio/channels/FileChannel/ExpandingMap.java macosx-all -#java/nio/channels/FileChannel/LongTransferTest.java macosx-all -#java/nio/channels/FileChannel/MapTest.java macosx-all -#java/nio/channels/FileChannel/Transfer.java macosx-all -#java/nio/channels/FileChannel/TransferToChannel.java macosx-all -#java/nio/channels/FileChannel/Transfers.java macosx-all java/nio/channels/Selector/RacyDeregister.java macosx-all java/nio/channels/ServerSocketChannel/NonBlockingAccept.java macosx-all java/nio/channels/ServerSocketChannel/SocketOptionTests.java macosx-all @@ -3407,9 +3432,9 @@ java/nio/channels/SocketChannel/SendUrgentData.java java/nio/channels/SocketChannel/VectorParams.java macosx-all java/nio/charset/coders/Check.java macosx-all java/nio/file/Path/MacPathTest.java macosx-all -#java/nio/file/WatchService/LotsOfCancels.java macosx-all -#java/nio/file/WatchService/LotsOfEvents.java macosx-all -#java/nio/file/WatchService/MayFlies.java macosx-all +java/nio/file/WatchService/LotsOfCancels.java macosx-all +java/nio/file/WatchService/LotsOfEvents.java macosx-all +java/nio/file/WatchService/MayFlies.java macosx-all java/util/prefs/AddNodeChangeListener.java macosx-all java/util/prefs/CommentsInXml.java macosx-all java/util/prefs/ConflictInFlush.java macosx-all @@ -3419,9 +3444,12 @@ java/util/prefs/RemoveNullKeyCheck.java java/util/prefs/RemoveReadOnlyNode.java macosx-all java/util/prefs/RemoveUnregedListener.java macosx-all jdk/net/Sockets/SupportedOptions.java macosx-all -sun/security/krb5/auto/MSOID2.java macosx-all -java/nio/channels/AsynchronousFileChannel/Basic.java macosx-all +#java/nio/channels/AsynchronousFileChannel/Basic.java macosx-all sun/net/www/http/KeepAliveStream/KeepAliveStreamCloseWithWrongContentLength.java macosx-all +sun/security/krb5/auto/MSOID2.java macosx-all +sun/security/krb5/auto/TicketSName.java macosx-all +sun/security/krb5/auto/ForwardableCheck.java macosx-all +sun/security/krb5/auto/RefreshKrb5Config.java macosx-all # Windows-PRNG SecureRandom java/security/SecureRandom/DefaultProvider.java generic-all @@ -3460,14 +3488,6 @@ sun/security/tools/keytool/keyalg.sh # Class(-Loader) GC not supported javax/management/mxbean/MXBeanLoadingTest1.java generic-all -# krb5 -sun/security/krb5/auto/UnboundSSL.java generic-all -sun/security/krb5/auto/UnboundSSLMultipleKeys.java generic-all -sun/security/krb5/auto/UnboundSSLPrincipalProperty.java generic-all -sun/security/krb5/auto/TicketSName.java macosx-all -sun/security/krb5/auto/ForwardableCheck.java macosx-all -sun/security/krb5/auto/RefreshKrb5Config.java macosx-all - # RMI, fails, but works in Debug with attached Debugger sun/rmi/server/UnicastServerRef/FilterUSRTest.java generic-all @@ -3484,36 +3504,6 @@ com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithRemoveAddProvider.j ## JDK8u152-b16, new broken tests # awt/swing -com/sun/java/swing/plaf/windows/Test8173145.java generic-all -java/awt/Container/MoveToOtherScreenTest/MoveToOtherScreenTest.java generic-all -java/awt/Dialog/DialogAboveFrame/DialogAboveFrameTest.java generic-all -java/awt/EventQueue/6980209/bug6980209.java generic-all -java/awt/Focus/ModalDialogActivationTest/ModalDialogActivationTest.java generic-all -java/awt/font/MonospacedGlyphWidth/MonospacedGlyphWidthTest.java generic-all -java/awt/font/TextLayout/DiacriticsDrawingTest.java generic-all -java/awt/Frame/FrameResize/ShowChildWhileResizingTest.java generic-all -java/awt/Frame/NormalToIconified/NormalToIconifiedTest.java generic-all -java/awt/Frame/ObscuredFrame/ObscuredFrameTest.java generic-all -java/awt/geom/AffineTransform/InvalidTransformParameterTest.java generic-all -java/awt/image/VolatileImage/VolatileImageBug.java generic-all -java/awt/Mouse/EnterExitEvents/ModalDialogEnterExitEventsTest.java generic-all -java/awt/MouseInfo/GetPointerInfoTest.java generic-all -java/awt/MouseInfo/MultiscreenPointerInfo.java generic-all -java/awt/Paint/ComponentIsNotDrawnAfterRemoveAddTest/ComponentIsNotDrawnAfterRemoveAddTest.java generic-all -java/awt/print/PrinterJob/PrintCrashTest.java generic-all -java/awt/TextArea/TextAreaEditing/TextAreaEditing.java generic-all -java/awt/Window/WindowDeadlockTest/WindowDeadlockTest.java generic-all -java/awt/Window/WindowJumpingTest/WindowJumpingTest.java generic-all -javax/accessibility/JList/AccessibleJListChildNPETest.java generic-all -javax/swing/JComboBox/8136998/bug8136998.java generic-all -javax/swing/JMenuItem/8152981/MenuItemIconTest.java generic-all -javax/swing/JProgressBar/8161664/ProgressBarMemoryLeakTest.java generic-all -javax/swing/plaf/basic/BasicComboPopup/8154069/Bug8154069.java generic-all -javax/swing/plaf/basic/BasicLabelUI/bug7172652.java generic-all -javax/swing/plaf/nimbus/8057791/bug8057791.java generic-all -javax/swing/text/FlowView/LayoutTest.java generic-all -javax/swing/text/html/parser/Parser/HtmlCommentTagParseTest/HtmlCommentTagParseTest.java generic-all -sun/java2d/ClassCastExceptionForInvalidSurface.java generic-all #expired certificate sun/security/tools/jarsigner/warnings/BadNetscapeCertTypeTest.java generic-all From e58b9ea6f4240deb6935aef58baddd5bc6032b77 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Mon, 12 Feb 2024 15:50:06 -0600 Subject: [PATCH 076/134] Add a test to see if method invoke throws the right thing. --- .../java/lang/invoke/MethodInvokeTests.java | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/IKVM.Java.Tests/java/lang/invoke/MethodInvokeTests.java diff --git a/src/IKVM.Java.Tests/java/lang/invoke/MethodInvokeTests.java b/src/IKVM.Java.Tests/java/lang/invoke/MethodInvokeTests.java new file mode 100644 index 0000000000..8b390b6c67 --- /dev/null +++ b/src/IKVM.Java.Tests/java/lang/invoke/MethodInvokeTests.java @@ -0,0 +1,31 @@ +package ikvm.tests.java.java.lang.invoke; + +import java.lang.*; +import java.lang.invoke.*; +import java.util.*; + +@cli.Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute.Annotation() +public class MethodInvokeTests { + + public static void switchWithNoCases(String s) { + switch (s) { } + } + + @cli.Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute.Annotation() + public void switchWithNullShouldThrowNullPointerExceptionInInvocationTargetException() throws Throwable { + Method method = MethodInvokeTests.class.getDeclaredMethod("switchWithNoCases", String.class); + + try { + method.invoke(null, (String)null); + } catch (InvocationTargetException ite) { + if (ite.getTargetException() instanceof NullPointerException) { + return; + } else { + throw new RuntimeException("Expected exception not thrown.", ite); + } + } + + throw new RuntimeException("Expected exception not thrown."); + } + +} From b206c3c195cf01b7d9debae38c587fae7c9ee59d Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Mon, 12 Feb 2024 19:24:38 -0600 Subject: [PATCH 077/134] Missing exception. --- src/IKVM.Java.Tests/java/lang/invoke/MethodInvokeTests.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/IKVM.Java.Tests/java/lang/invoke/MethodInvokeTests.java b/src/IKVM.Java.Tests/java/lang/invoke/MethodInvokeTests.java index 8b390b6c67..f545e8d9a8 100644 --- a/src/IKVM.Java.Tests/java/lang/invoke/MethodInvokeTests.java +++ b/src/IKVM.Java.Tests/java/lang/invoke/MethodInvokeTests.java @@ -2,6 +2,7 @@ import java.lang.*; import java.lang.invoke.*; +import java.lang.reflect.*; import java.util.*; @cli.Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute.Annotation() From 2292b57483f431b18dabd9d5ca143015183de58f Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Tue, 13 Feb 2024 18:16:43 -0600 Subject: [PATCH 078/134] Test cannot work. --- src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt index 8d074006c1..605f8a0796 100644 --- a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt +++ b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt @@ -3498,7 +3498,7 @@ com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithProviderChange.java com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithRemoveAddProvider.java generic-all ## JDK8u152-b16, new broken tests -# awt/swing +sun/nio/cs/Test4200310.sh generic-all #expired certificate sun/security/tools/jarsigner/warnings/BadNetscapeCertTypeTest.java generic-all From bbeccc8b441ac8277abb5056578f8163aec4da7e Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Fri, 16 Feb 2024 14:18:59 -0600 Subject: [PATCH 079/134] Add a test regarding method invocation. --- .../java/lang/invoke/MethodInvokeTests.java | 28 ++++++++++--------- src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt | 2 +- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/IKVM.Java.Tests/java/lang/invoke/MethodInvokeTests.java b/src/IKVM.Java.Tests/java/lang/invoke/MethodInvokeTests.java index f545e8d9a8..5f8ee832ca 100644 --- a/src/IKVM.Java.Tests/java/lang/invoke/MethodInvokeTests.java +++ b/src/IKVM.Java.Tests/java/lang/invoke/MethodInvokeTests.java @@ -8,25 +8,27 @@ @cli.Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute.Annotation() public class MethodInvokeTests { - public static void switchWithNoCases(String s) { - switch (s) { } + public static void shouldWrapNullPointerExceptionInFastMethodInvokeImpl() { + throw new NullPointerException(); } @cli.Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute.Annotation() - public void switchWithNullShouldThrowNullPointerExceptionInInvocationTargetException() throws Throwable { - Method method = MethodInvokeTests.class.getDeclaredMethod("switchWithNoCases", String.class); + public void shouldWrapNullPointerExceptionInMethodInvoke() throws Throwable { + Method method = MethodInvokeTests.class.getDeclaredMethod("shouldWrapNullPointerExceptionInFastMethodInvokeImpl"); - try { - method.invoke(null, (String)null); - } catch (InvocationTargetException ite) { - if (ite.getTargetException() instanceof NullPointerException) { - return; - } else { - throw new RuntimeException("Expected exception not thrown.", ite); + for (int i = 0; i < 30; i++) { + try { + method.invoke(); + } catch (InvocationTargetException ite) { + if (ite.getTargetException() instanceof NullPointerException) { + continue; + } else { + throw new RuntimeException("Expected exception not thrown.", ite); + } } - } - throw new RuntimeException("Expected exception not thrown."); + throw new RuntimeException("Expected exception not thrown."); + } } } diff --git a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt index 605f8a0796..0249110817 100644 --- a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt +++ b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt @@ -3500,5 +3500,5 @@ com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithRemoveAddProvider.j ## JDK8u152-b16, new broken tests sun/nio/cs/Test4200310.sh generic-all -#expired certificate +# expired certificate sun/security/tools/jarsigner/warnings/BadNetscapeCertTypeTest.java generic-all From 9552260124410894b0e1ac9bf718acea02cb7489 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Sat, 17 Feb 2024 09:32:02 -0600 Subject: [PATCH 080/134] Reenable static ctor invoke. --- .../Java/Externs/sun/reflect/ReflectionFactory.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/IKVM.Runtime/Java/Externs/sun/reflect/ReflectionFactory.cs b/src/IKVM.Runtime/Java/Externs/sun/reflect/ReflectionFactory.cs index ce7e0c43f7..e0e4bb383f 100644 --- a/src/IKVM.Runtime/Java/Externs/sun/reflect/ReflectionFactory.cs +++ b/src/IKVM.Runtime/Java/Externs/sun/reflect/ReflectionFactory.cs @@ -689,9 +689,9 @@ internal FastMethodAccessorImpl(RuntimeJavaMethod mw) // generate invoker invoker = (Invoker)dm.CreateDelegate(typeof(Invoker)); - //// invoker needs to run clinit, wrap in an invoker that does so - //if ((mw.IsStatic || mw.DeclaringType.IsInterface) && mw.DeclaringType.HasStaticInitializer) - // invoker = new Invoker(new RunClassInit(this, mw.DeclaringType, invoker).invoke); + // invoker needs to run clinit, wrap in an invoker that does so + if ((mw.IsStatic || mw.DeclaringType.IsInterface) && mw.DeclaringType.HasStaticInitializer) + invoker = new Invoker(new RunClassInit(this, mw.DeclaringType, invoker).invoke); } catch (RetargetableJavaException x) { @@ -715,6 +715,10 @@ public object invoke(object obj, object[] args, global::ikvm.@internal.CallerID // this can happen if we're calling a non-public method and the call stack doesn't have ReflectionPermission.MemberAccess throw new global::java.lang.IllegalAccessException().initCause(x); } + catch (global::java.lang.NullPointerException) + { + throw; + } } } From 34a2bbea91d791c954934a35ec773cf9b9de9518 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Sun, 18 Feb 2024 11:56:42 -0600 Subject: [PATCH 081/134] IKVM.Core.MSBuild removes DesignTimeBuild from passed properties to MSBuild sub-tasks. Because we're doing a nested publish we should be doing a full build. Was resulting in exe.config and dll.config getting deleted in weird orders. Same on IkvmToolReference targets. Nested publish, shouldn't do design time build. --- Directory.Packages.props | 2 +- .../buildTransitive/IKVM.MSBuild.IkvmToolReference.targets | 6 +++--- src/IKVM.NET.Sdk/targets/IKVM.Java.Core.NoTasks.targets | 4 ++-- targets/ClangProjectReference.targets | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 91c496c3ad..7f72165737 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -37,7 +37,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/IKVM.MSBuild/buildTransitive/IKVM.MSBuild.IkvmToolReference.targets b/src/IKVM.MSBuild/buildTransitive/IKVM.MSBuild.IkvmToolReference.targets index f907d67543..c78d621306 100644 --- a/src/IKVM.MSBuild/buildTransitive/IKVM.MSBuild.IkvmToolReference.targets +++ b/src/IKVM.MSBuild/buildTransitive/IKVM.MSBuild.IkvmToolReference.targets @@ -55,7 +55,7 @@ - + @@ -77,7 +77,7 @@ - + @@ -99,7 +99,7 @@ - + diff --git a/src/IKVM.NET.Sdk/targets/IKVM.Java.Core.NoTasks.targets b/src/IKVM.NET.Sdk/targets/IKVM.Java.Core.NoTasks.targets index 77f4914d54..9372a600af 100644 --- a/src/IKVM.NET.Sdk/targets/IKVM.Java.Core.NoTasks.targets +++ b/src/IKVM.NET.Sdk/targets/IKVM.Java.Core.NoTasks.targets @@ -205,7 +205,7 @@ Items = Items.OrderBy(i => i.ItemSpec).ToArray(); - + <_Convert Include="@(Convert)" /> @@ -252,7 +252,7 @@ Items = Items.OrderBy(i => i.ItemSpec).ToArray(); <_IkvmCompilerArgs Include="-sharedclassloader" Condition=" '$(SharedClassLoader)' == 'true' " /> <_IkvmCompilerArgs Include="-w$(WarningLevel)" /> <_IkvmCompilerArgs Include="-noparameterreflection" Condition=" '$(NoParameterReflection)' == 'true' " /> - <_IkvmCompilerArgs Include="-exclude:$([System.IO.Path]::GetFullPath('$(_ExcludeFilePath)'))" Condition="Exists('$(_ExcludeFilePath)')" /> + <_IkvmCompilerArgs Include="-exclude:$([System.IO.Path]::GetFullPath('$(_ExcludeFilePath)'))" Condition="Exists('$(_ExcludeFilePath)') And '@(ExcludeRegex)' != '' " /> <_IkvmCompilerArgs Include="@(_AssemblyAttributesClass->'-assemblyattributes:%(FullPath)')" /> <_IkvmCompilerReferencePath Remove="@(_IkvmCompilerReferencePath)" /> <_IkvmCompilerReferencePath Include="@(_IkvmCompilerReferencePathWithRefAssemblies)" Condition=" '%(_IkvmCompilerReferencePathWithRefAssemblies.HideFromJava)' != 'true' " /> diff --git a/targets/ClangProjectReference.targets b/targets/ClangProjectReference.targets index 5f09080cf5..b7c18acf49 100644 --- a/targets/ClangProjectReference.targets +++ b/targets/ClangProjectReference.targets @@ -58,8 +58,8 @@ %(_ClangProjectReference.SetConfiguration);%(_ClangProjectReference.SetPlatform);TargetIdentifier=%(_ClangProjectReference.RuntimeIdentifier) - - + + @@ -67,7 +67,7 @@ - + runtimes\%(_ClangProjectReferenceItems.TargetIdentifier)\native\%(_ClangProjectReferenceItems.Filename)%(_ClangProjectReferenceItems.Extension) From 46fa58845ad559db5e56c1f8f1feb93053d642e6 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Sun, 18 Feb 2024 11:57:22 -0600 Subject: [PATCH 082/134] EmitNullCheck is still fast, but we need to catch the results if it is actually null and transform to NullPointerException. --- .../Java/Externs/sun/reflect/ReflectionFactory.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/IKVM.Runtime/Java/Externs/sun/reflect/ReflectionFactory.cs b/src/IKVM.Runtime/Java/Externs/sun/reflect/ReflectionFactory.cs index e0e4bb383f..c421760673 100644 --- a/src/IKVM.Runtime/Java/Externs/sun/reflect/ReflectionFactory.cs +++ b/src/IKVM.Runtime/Java/Externs/sun/reflect/ReflectionFactory.cs @@ -476,6 +476,7 @@ static void Expand(CodeEmitter ilgen, RuntimeJavaType type) sealed class FastMethodAccessorImpl : global::sun.reflect.MethodAccessor { + internal static readonly ConstructorInfo nullPointerExceptionCtor; internal static readonly ConstructorInfo invocationTargetExceptionCtor; internal static readonly ConstructorInfo illegalArgumentExceptionCtor; internal static readonly MethodInfo get_TargetSite; @@ -489,6 +490,7 @@ sealed class FastMethodAccessorImpl : global::sun.reflect.MethodAccessor /// static FastMethodAccessorImpl() { + nullPointerExceptionCtor = typeof(global::java.lang.NullPointerException).GetConstructor(Type.EmptyTypes); invocationTargetExceptionCtor = typeof(global::java.lang.reflect.InvocationTargetException).GetConstructor(new Type[] { typeof(Exception) }); illegalArgumentExceptionCtor = typeof(global::java.lang.IllegalArgumentException).GetConstructor(Type.EmptyTypes); get_TargetSite = typeof(Exception).GetMethod("get_TargetSite"); @@ -562,8 +564,13 @@ internal FastMethodAccessorImpl(RuntimeJavaMethod mw) // do a null check for instance argument if (mw.IsStatic == false) { + il.BeginExceptionBlock(); il.Emit(OpCodes.Ldarg_0); il.EmitNullCheck(); + il.BeginCatchBlock(typeof(NullReferenceException)); + il.Emit(OpCodes.Newobj, nullPointerExceptionCtor); + il.Emit(OpCodes.Throw); + il.EndExceptionBlock(); } // zero length array may be null @@ -715,11 +722,8 @@ public object invoke(object obj, object[] args, global::ikvm.@internal.CallerID // this can happen if we're calling a non-public method and the call stack doesn't have ReflectionPermission.MemberAccess throw new global::java.lang.IllegalAccessException().initCause(x); } - catch (global::java.lang.NullPointerException) - { - throw; - } } + } sealed class FastConstructorAccessorImpl : global::sun.reflect.ConstructorAccessor From 6e8291d1f8198dd223a5036406ae62915dd03f38 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Sun, 18 Feb 2024 13:03:53 -0600 Subject: [PATCH 083/134] Typo. --- src/IKVM.Java.Tests/java/lang/invoke/MethodInvokeTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/IKVM.Java.Tests/java/lang/invoke/MethodInvokeTests.java b/src/IKVM.Java.Tests/java/lang/invoke/MethodInvokeTests.java index 5f8ee832ca..0d57219a92 100644 --- a/src/IKVM.Java.Tests/java/lang/invoke/MethodInvokeTests.java +++ b/src/IKVM.Java.Tests/java/lang/invoke/MethodInvokeTests.java @@ -18,7 +18,7 @@ public void shouldWrapNullPointerExceptionInMethodInvoke() throws Throwable { for (int i = 0; i < 30; i++) { try { - method.invoke(); + method.invoke(null); } catch (InvocationTargetException ite) { if (ite.getTargetException() instanceof NullPointerException) { continue; From 0ef084b930e6521b5d9da8baeb6330b853b46f2b Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Sun, 18 Feb 2024 15:01:30 -0600 Subject: [PATCH 084/134] Enable manual runs. --- .github/workflows/IKVM.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/IKVM.yml b/.github/workflows/IKVM.yml index aefcff7cec..22ec08d636 100644 --- a/.github/workflows/IKVM.yml +++ b/.github/workflows/IKVM.yml @@ -1,6 +1,7 @@ name: IKVM on: + workflow_dispatch: push: branches: - main From c89eb02c65932a79e2adbbf9c59a2d2a8b1d8f3e Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Sun, 18 Feb 2024 15:27:55 -0600 Subject: [PATCH 085/134] Transform target now runs before PrepareForBuild, which ensures design time. --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 7f72165737..298ad5ae95 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -37,7 +37,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all From a4f6a2638e7384d53e76f04e383a4860892a2b20 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Sun, 18 Feb 2024 16:46:48 -0600 Subject: [PATCH 086/134] Again. --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 298ad5ae95..189ea845b5 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -37,7 +37,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all From 74f7caf16cf7283a979c69583fc36e3f63031e49 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Sun, 18 Feb 2024 20:51:13 -0600 Subject: [PATCH 087/134] Advance beyond exception. --- .../Externs/sun/reflect/ReflectionFactory.cs | 45 ++++++++++--------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/src/IKVM.Runtime/Java/Externs/sun/reflect/ReflectionFactory.cs b/src/IKVM.Runtime/Java/Externs/sun/reflect/ReflectionFactory.cs index c421760673..0945e12129 100644 --- a/src/IKVM.Runtime/Java/Externs/sun/reflect/ReflectionFactory.cs +++ b/src/IKVM.Runtime/Java/Externs/sun/reflect/ReflectionFactory.cs @@ -1,25 +1,25 @@ /* - Copyright (C) 2007-2014 Jeroen Frijters - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - - Jeroen Frijters - jeroen@frijters.net - + Copyright (C) 2007-2014 Jeroen Frijters + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Jeroen Frijters + jeroen@frijters.net + */ using System; using System.Reflection; @@ -564,13 +564,16 @@ internal FastMethodAccessorImpl(RuntimeJavaMethod mw) // do a null check for instance argument if (mw.IsStatic == false) { + var endIsNullLabel = il.DefineLabel(); il.BeginExceptionBlock(); il.Emit(OpCodes.Ldarg_0); il.EmitNullCheck(); + il.EmitLeave(endIsNullLabel); il.BeginCatchBlock(typeof(NullReferenceException)); il.Emit(OpCodes.Newobj, nullPointerExceptionCtor); il.Emit(OpCodes.Throw); il.EndExceptionBlock(); + il.MarkLabel(endIsNullLabel); } // zero length array may be null From a1e7e8f08cfc089749e2a9bbdea3a9da2c6a60d6 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Mon, 19 Feb 2024 10:56:17 -0600 Subject: [PATCH 088/134] Ignore a number of tests broken on OS X for expected reasons: dual mode sockets. --- src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt index 0249110817..c5ff00ffea 100644 --- a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt +++ b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt @@ -3381,6 +3381,7 @@ sun/security/mscapi/CastError.java javax/xml/bind/jxc/8073519/SchemagenErrorReporting.java generic-all # Broken on OS X +com/apple/laf/ScreenMenu/ScreenMenuMemoryLeakTest.java macosx-all com/sun/corba/transport/KeepAliveSockets.java macosx-all com/sun/crypto/provider/Cipher/AES/TestISO10126Padding.java macosx-all com/sun/crypto/provider/Cipher/Blowfish/BlowfishTestVector.java macosx-all @@ -3445,6 +3446,10 @@ sun/security/krb5/auto/MSOID2.java sun/security/krb5/auto/TicketSName.java macosx-all sun/security/krb5/auto/ForwardableCheck.java macosx-all sun/security/krb5/auto/RefreshKrb5Config.java macosx-all +sun/security/krb5/auto/principalProperty/PrincipalSystemPropTest.java macosx-all +sun/security/krb5/auto/BogusKDC.java macosx-all +sun/security/krb5/auto/KrbTicket.java macosx-all +sun/security/krb5/auto/UnboundSSL.java macosx-all # Windows-PRNG SecureRandom java/security/SecureRandom/DefaultProvider.java generic-all From a93abd141d9c7a27c66a2f6f050788922d6002a1 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Mon, 19 Feb 2024 13:13:50 -0600 Subject: [PATCH 089/134] Well, I dunno why this would work...? --- .../Externs/sun/reflect/ReflectionFactory.cs | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/src/IKVM.Runtime/Java/Externs/sun/reflect/ReflectionFactory.cs b/src/IKVM.Runtime/Java/Externs/sun/reflect/ReflectionFactory.cs index 0945e12129..8ac62bd0cc 100644 --- a/src/IKVM.Runtime/Java/Externs/sun/reflect/ReflectionFactory.cs +++ b/src/IKVM.Runtime/Java/Externs/sun/reflect/ReflectionFactory.cs @@ -520,12 +520,20 @@ internal RunClassInit(FastMethodAccessorImpl outer, RuntimeJavaType tw, Invoker [IKVM.Attributes.HideFromJava] internal object invoke(object obj, object[] args, global::ikvm.@internal.CallerID callerID) { - // FXBUG pre-SP1 a DynamicMethod that calls a static method doesn't trigger the cctor, so we do that explicitly. - // even on .NET 2.0 SP2, interface method invocations don't run the interface cctor - // NOTE when testing, please test both the x86 and x64 CLR JIT, because they have different bugs (even on .NET 2.0 SP2) - tw.RunClassInit(); - outer.invoker = invoker; - return invoker(obj, args, callerID); + try + { + // FXBUG pre-SP1 a DynamicMethod that calls a static method doesn't trigger the cctor, so we do that explicitly. + // even on .NET 2.0 SP2, interface method invocations don't run the interface cctor + // NOTE when testing, please test both the x86 and x64 CLR JIT, because they have different bugs (even on .NET 2.0 SP2) + tw.RunClassInit(); + outer.invoker = invoker; + return invoker(obj, args, callerID); + } + catch (global::java.lang.NullPointerException e) + { + Console.Error.WriteLine("Caught NPE in runclassinit"); + throw; + } } } @@ -725,6 +733,11 @@ public object invoke(object obj, object[] args, global::ikvm.@internal.CallerID // this can happen if we're calling a non-public method and the call stack doesn't have ReflectionPermission.MemberAccess throw new global::java.lang.IllegalAccessException().initCause(x); } + catch (global::java.lang.NullPointerException e) + { + Console.Error.WriteLine("Caught NPE"); + throw; + } } } From f568db03bd0deaeeb15f388d9154f573100c7983 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Tue, 20 Feb 2024 18:50:49 -0600 Subject: [PATCH 090/134] Fix up reflectionfactory. Ignore console output. --- .../targets/IKVM.Java.Core.NoTasks.targets | 6 +- src/IKVM.Runtime/CodeEmitter.cs | 7 +- src/IKVM.Runtime/CodeEmitterLocal.cs | 1 + .../Externs/sun/reflect/ReflectionFactory.cs | 549 +++++++++++------- 4 files changed, 332 insertions(+), 231 deletions(-) diff --git a/src/IKVM.NET.Sdk/targets/IKVM.Java.Core.NoTasks.targets b/src/IKVM.NET.Sdk/targets/IKVM.Java.Core.NoTasks.targets index 9372a600af..15e7b7d397 100644 --- a/src/IKVM.NET.Sdk/targets/IKVM.Java.Core.NoTasks.targets +++ b/src/IKVM.NET.Sdk/targets/IKVM.Java.Core.NoTasks.targets @@ -111,7 +111,7 @@ Items = Items.OrderBy(i => i.ItemSpec).ToArray(); - + @@ -181,7 +181,7 @@ Items = Items.OrderBy(i => i.ItemSpec).ToArray(); - + @@ -282,7 +282,7 @@ Items = Items.OrderBy(i => i.ItemSpec).ToArray(); - + diff --git a/src/IKVM.Runtime/CodeEmitter.cs b/src/IKVM.Runtime/CodeEmitter.cs index 4968af995a..3f1ce1fe28 100644 --- a/src/IKVM.Runtime/CodeEmitter.cs +++ b/src/IKVM.Runtime/CodeEmitter.cs @@ -391,7 +391,8 @@ internal void RealEmit(int ilOffset, CodeEmitter codeEmitter, ref int lineNumber } } - public override string ToString() => pseudo.ToString() + " " + data; + /// + public override readonly string ToString() => pseudo == CodeType.OpCode ? opcode.ToString() + " " + data : pseudo.ToString() + " " + data; } @@ -2385,19 +2386,21 @@ internal CodeEmitterLocal AllocTempLocal(Type type) { for (int i = 0; i < tempLocals.Length; i++) { - CodeEmitterLocal lb = tempLocals[i]; + var lb = tempLocals[i]; if (lb != null && lb.LocalType == type) { tempLocals[i] = null; return lb; } } + return new CodeEmitterLocal(type); } internal void ReleaseTempLocal(CodeEmitterLocal lb) { EmitPseudoOpCode(CodeType.ReleaseTempLocal, lb); + for (int i = 0; i < tempLocals.Length; i++) { if (tempLocals[i] == null) diff --git a/src/IKVM.Runtime/CodeEmitterLocal.cs b/src/IKVM.Runtime/CodeEmitterLocal.cs index 3005afa572..b53060561f 100644 --- a/src/IKVM.Runtime/CodeEmitterLocal.cs +++ b/src/IKVM.Runtime/CodeEmitterLocal.cs @@ -68,6 +68,7 @@ internal void Emit(ILGenerator ilgen, OpCode opcode) // it's a temporary local that is only allocated on-demand local = ilgen.DeclareLocal(type); } + ilgen.Emit(opcode, local); } diff --git a/src/IKVM.Runtime/Java/Externs/sun/reflect/ReflectionFactory.cs b/src/IKVM.Runtime/Java/Externs/sun/reflect/ReflectionFactory.cs index 8ac62bd0cc..8595ea01a9 100644 --- a/src/IKVM.Runtime/Java/Externs/sun/reflect/ReflectionFactory.cs +++ b/src/IKVM.Runtime/Java/Externs/sun/reflect/ReflectionFactory.cs @@ -163,40 +163,64 @@ internal MethodAccessorImpl(RuntimeJavaMethod mw) [IKVM.Attributes.HideFromJava] public object invoke(object obj, object[] args, global::ikvm.@internal.CallerID callerID) { - if (!mw.IsStatic && !mw.DeclaringType.IsInstance(obj)) + try { - if (obj == null) - throw new global::java.lang.NullPointerException(); + if (!mw.IsStatic && !mw.DeclaringType.IsInstance(obj)) + { + if (obj == null) + throw new global::java.lang.NullPointerException(); - throw new global::java.lang.IllegalArgumentException("object is not an instance of declaring class"); - } + throw new global::java.lang.IllegalArgumentException("object is not an instance of declaring class"); + } - args = ConvertArgs(mw.DeclaringType.GetClassLoader(), mw.GetParameters(), args); + try + { + args = ConvertArgs(mw.DeclaringType.GetClassLoader(), mw.GetParameters(), args); + } + catch (InvalidCastException e) + { + throw new global::java.lang.IllegalArgumentException(e); + } + catch (NullReferenceException e) + { + throw new global::java.lang.IllegalArgumentException(e); + } - // if the method is an interface method, we must explicitly run , - // because .NET reflection doesn't - if (mw.DeclaringType.IsInterface) - mw.DeclaringType.RunClassInit(); + // if the method is an interface method, we must explicitly run , + // because .NET reflection doesn't + if (mw.DeclaringType.IsInterface) + mw.DeclaringType.RunClassInit(); - if (mw.HasCallerID) - args = ArrayUtil.Concat(args, callerID); + if (mw.HasCallerID) + args = ArrayUtil.Concat(args, callerID); - object retval; - try + object retval; + try + { + retval = mw.Invoke(obj, args); + } + catch (Exception e) + { + throw new global::java.lang.reflect.InvocationTargetException(global::ikvm.runtime.Util.mapException(e)); + } + + if (mw.ReturnType.IsPrimitive && mw.ReturnType != mw.DeclaringType.Context.PrimitiveJavaTypeFactory.VOID) + retval = JVM.Box(retval); + else + retval = mw.ReturnType.GhostUnwrap(retval); + + return retval; + } + catch (NullReferenceException e) { - retval = mw.Invoke(obj, args); + Console.Error.WriteLine("got nre " + e); + throw; } - catch (Exception e) + catch (global::java.lang.NullPointerException e) { - throw new global::java.lang.reflect.InvocationTargetException(global::ikvm.runtime.Util.mapException(e)); + Console.Error.WriteLine("got npe " + e); + throw; } - - if (mw.ReturnType.IsPrimitive && mw.ReturnType != mw.DeclaringType.Context.PrimitiveJavaTypeFactory.VOID) - retval = JVM.Box(retval); - else - retval = mw.ReturnType.GhostUnwrap(retval); - - return retval; } } @@ -477,10 +501,12 @@ sealed class FastMethodAccessorImpl : global::sun.reflect.MethodAccessor { internal static readonly ConstructorInfo nullPointerExceptionCtor; - internal static readonly ConstructorInfo invocationTargetExceptionCtor; + internal static readonly ConstructorInfo nullPointerExceptionWithMessageCtor; internal static readonly ConstructorInfo illegalArgumentExceptionCtor; - internal static readonly MethodInfo get_TargetSite; - internal static readonly MethodInfo GetCurrentMethod; + internal static readonly ConstructorInfo illegalArgumentExceptionWithMessageCtor; + internal static readonly ConstructorInfo illegalArgumentExceptionWithMessageAndCauseCtor; + internal static readonly ConstructorInfo illegalArgumentExceptionWithCauseCtor; + internal static readonly ConstructorInfo invocationTargetExceptionWithCauseCtor; delegate object Invoker(object obj, object[] args, global::ikvm.@internal.CallerID callerID); Invoker invoker; @@ -491,10 +517,12 @@ sealed class FastMethodAccessorImpl : global::sun.reflect.MethodAccessor static FastMethodAccessorImpl() { nullPointerExceptionCtor = typeof(global::java.lang.NullPointerException).GetConstructor(Type.EmptyTypes); - invocationTargetExceptionCtor = typeof(global::java.lang.reflect.InvocationTargetException).GetConstructor(new Type[] { typeof(Exception) }); + nullPointerExceptionWithMessageCtor = typeof(global::java.lang.NullPointerException).GetConstructor(new[] { typeof(string) }); illegalArgumentExceptionCtor = typeof(global::java.lang.IllegalArgumentException).GetConstructor(Type.EmptyTypes); - get_TargetSite = typeof(Exception).GetMethod("get_TargetSite"); - GetCurrentMethod = typeof(MethodBase).GetMethod("GetCurrentMethod"); + illegalArgumentExceptionWithMessageCtor = typeof(global::java.lang.IllegalArgumentException).GetConstructor(new[] { typeof(string) }); + illegalArgumentExceptionWithMessageAndCauseCtor = typeof(global::java.lang.IllegalArgumentException).GetConstructor(new[] { typeof(string), typeof(Exception) }); + illegalArgumentExceptionWithCauseCtor = typeof(global::java.lang.IllegalArgumentException).GetConstructor(new[] { typeof(Exception) }); + invocationTargetExceptionWithCauseCtor = typeof(global::java.lang.reflect.InvocationTargetException).GetConstructor(new[] { typeof(Exception) }); } sealed class RunClassInit @@ -520,20 +548,12 @@ internal RunClassInit(FastMethodAccessorImpl outer, RuntimeJavaType tw, Invoker [IKVM.Attributes.HideFromJava] internal object invoke(object obj, object[] args, global::ikvm.@internal.CallerID callerID) { - try - { - // FXBUG pre-SP1 a DynamicMethod that calls a static method doesn't trigger the cctor, so we do that explicitly. - // even on .NET 2.0 SP2, interface method invocations don't run the interface cctor - // NOTE when testing, please test both the x86 and x64 CLR JIT, because they have different bugs (even on .NET 2.0 SP2) - tw.RunClassInit(); - outer.invoker = invoker; - return invoker(obj, args, callerID); - } - catch (global::java.lang.NullPointerException e) - { - Console.Error.WriteLine("Caught NPE in runclassinit"); - throw; - } + // FXBUG pre-SP1 a DynamicMethod that calls a static method doesn't trigger the cctor, so we do that explicitly. + // even on .NET 2.0 SP2, interface method invocations don't run the interface cctor + // NOTE when testing, please test both the x86 and x64 CLR JIT, because they have different bugs (even on .NET 2.0 SP2) + tw.RunClassInit(); + outer.invoker = invoker; + return invoker(obj, args, callerID); } } @@ -542,7 +562,7 @@ internal object invoke(object obj, object[] args, global::ikvm.@internal.CallerI /// Initializes a new instance. /// /// - internal FastMethodAccessorImpl(RuntimeJavaMethod mw) + internal unsafe FastMethodAccessorImpl(RuntimeJavaMethod mw) { try { @@ -560,147 +580,181 @@ internal FastMethodAccessorImpl(RuntimeJavaMethod mw) // generate new dynamic method var np = !mw.IsPublic || !mw.DeclaringType.IsPublic; - var dm = DynamicMethodUtil.Create($"____{mw.DeclaringType.Name.Replace(".", "_")}__{mw.Name}", mw.DeclaringType.TypeAsBaseType, np, typeof(object), new Type[] { typeof(object), typeof(object[]), typeof(global::ikvm.@internal.CallerID) }); + var dm = DynamicMethodUtil.Create($"____{mw.DeclaringType.Name.Replace(".", "_")}__{mw.Name}", mw.DeclaringType.TypeAsBaseType, np, typeof(object), new[] { typeof(object), typeof(object[]), typeof(global::ikvm.@internal.CallerID) }); var il = JVM.Context.CodeEmitterFactory.Create(dm); - var rt = il.DeclareLocal(typeof(object)); // labels - var marshalLabel = il.DefineLabel(); - var callLabel = il.DefineLabel(); - var returnLabel = il.DefineLabel(); + var postLabel = il.DefineLabel(); + + // local variables for arguments passed to method + var n = 0; + var p = new CodeEmitterLocal[parameters.Length + 2]; - // do a null check for instance argument + // load instance if not static if (mw.IsStatic == false) { + // declare variable to hold first argument + var o = p[n++] = il.AllocTempLocal(mw.DeclaringType.TypeAsSignatureType); + + // explicit null check for target var endIsNullLabel = il.DefineLabel(); + il.Emit(OpCodes.Ldarg_0); + il.Emit(OpCodes.Ldnull); + il.EmitBne_Un(endIsNullLabel); + il.Emit(OpCodes.Ldstr, "object is not an instance of declaring class"); + il.Emit(OpCodes.Newobj, nullPointerExceptionWithMessageCtor); + il.Emit(OpCodes.Throw); + il.MarkLabel(endIsNullLabel); + + // temporary variables + var e = il.AllocTempLocal(typeof(Exception)); + + // cast target to appropriate type + var endConvSelf = il.DefineLabel(); il.BeginExceptionBlock(); il.Emit(OpCodes.Ldarg_0); - il.EmitNullCheck(); - il.EmitLeave(endIsNullLabel); - il.BeginCatchBlock(typeof(NullReferenceException)); - il.Emit(OpCodes.Newobj, nullPointerExceptionCtor); + mw.DeclaringType.EmitCheckcast(il); + mw.DeclaringType.EmitConvStackTypeToSignatureType(il, null); + il.Emit(OpCodes.Stloc, o); + il.EmitLeave(endConvSelf); + + // catch InvalidCastException, store, add message, and wrap with IllegalArgumentException + il.BeginCatchBlock(typeof(InvalidCastException)); + il.Emit(OpCodes.Stloc, e); + il.Emit(OpCodes.Ldstr, "object is not an instance of declaring class"); + il.Emit(OpCodes.Ldloc, e); + il.Emit(OpCodes.Newobj, illegalArgumentExceptionWithMessageAndCauseCtor); il.Emit(OpCodes.Throw); + + // catch Exception, wrap with IllegalArgumentException + il.BeginCatchBlock(typeof(Exception)); + il.Emit(OpCodes.Newobj, illegalArgumentExceptionWithCauseCtor); + il.Emit(OpCodes.Throw); + + // end of convert self block il.EndExceptionBlock(); - il.MarkLabel(endIsNullLabel); + il.MarkLabel(endConvSelf); + il.ReleaseTempLocal(e); } + // where we start converting arguemnts + var convArgsLabel = il.DefineLabel(); + // zero length array may be null if (parameters.Length == 0) { il.Emit(OpCodes.Ldarg_1); - il.EmitBrfalse(marshalLabel); + il.EmitBrfalse(convArgsLabel); } + // check that arguments array is not null + var chckArgsLabel = il.DefineLabel(); + il.Emit(OpCodes.Ldarg_1); + il.Emit(OpCodes.Ldnull); + il.EmitBne_Un(chckArgsLabel); + il.Emit(OpCodes.Ldstr, "wrong number of arguments"); + il.Emit(OpCodes.Newobj, illegalArgumentExceptionWithMessageCtor); + il.Emit(OpCodes.Throw); + // parameters length must match number of parameters on array + il.MarkLabel(chckArgsLabel); il.Emit(OpCodes.Ldarg_1); il.Emit(OpCodes.Ldlen); il.EmitLdc_I4(parameters.Length); - il.EmitBeq(marshalLabel); - il.Emit(OpCodes.Newobj, illegalArgumentExceptionCtor); + il.EmitBeq(convArgsLabel); + il.Emit(OpCodes.Ldstr, "wrong number of arguments"); + il.Emit(OpCodes.Newobj, illegalArgumentExceptionWithMessageCtor); il.Emit(OpCodes.Throw); // begin parameter conversion - il.MarkLabel(marshalLabel); + il.MarkLabel(convArgsLabel); - // emit self and argument locals - var self = mw.IsStatic == false ? il.DeclareLocal(mw.DeclaringType.TypeAsSignatureType) : null; - var args = new CodeEmitterLocal[parameters.Length]; - for (var i = 0; i < args.Length; i++) - args[i] = il.DeclareLocal(parameters[i].TypeAsSignatureType); + // emit conversion code for the remainder of the arguments + for (var i = 0; i < parameters.Length; i++) + { + var tw = parameters[i]; - // try block for conversion code - il.BeginExceptionBlock(); + // declare variable to hold argument + var o = p[n++] = il.AllocTempLocal(tw.TypeAsSignatureType); - // emit conversion code for the 'self' argument - if (self != null) - { - il.Emit(OpCodes.Ldarg_0); - mw.DeclaringType.EmitCheckcast(il); - mw.DeclaringType.EmitConvStackTypeToSignatureType(il, null); - il.Emit(OpCodes.Stloc, self); - } + // temporary variable for exceptions + var e = il.AllocTempLocal(typeof(Exception)); - // emit conversion code for the remainder of the arguments - for (var i = 0; i < args.Length; i++) - { + // load and convert argument + var endConvArgn = il.DefineLabel(); + il.BeginExceptionBlock(); il.Emit(OpCodes.Ldarg_1); il.EmitLdc_I4(i); il.Emit(OpCodes.Ldelem_Ref); - - var tw = parameters[i]; BoxUtil.EmitUnboxArg(il, tw); tw.EmitConvStackTypeToSignatureType(il, null); - il.Emit(OpCodes.Stloc, args[i]); - } - - // exception handler - il.EmitLeave(callLabel); - il.BeginCatchBlock(typeof(InvalidCastException)); - il.Emit(OpCodes.Newobj, illegalArgumentExceptionCtor); - il.Emit(OpCodes.Throw); - il.BeginCatchBlock(typeof(NullReferenceException)); - il.Emit(OpCodes.Newobj, illegalArgumentExceptionCtor); - il.Emit(OpCodes.Throw); - il.EndExceptionBlock(); - - // begin exception block for actual call - il.MarkLabel(callLabel); - il.BeginExceptionBlock(); + il.Emit(OpCodes.Stloc, o); + il.EmitLeave(endConvArgn); + + // catch InvalidCastException, store, add message, and wrap with IllegalArgumentException + il.BeginCatchBlock(typeof(InvalidCastException)); + il.Emit(OpCodes.Stloc, e); + il.Emit(OpCodes.Ldstr, $"argument type mismatch on parameter {i}"); + il.Emit(OpCodes.Ldloc, e); + il.Emit(OpCodes.Newobj, illegalArgumentExceptionWithMessageAndCauseCtor); + il.Emit(OpCodes.Throw); - // first constructor arg for the delegate: null for static, reference for valuetype/ghost, reference for instance - if (self != null && (mw.DeclaringType.IsNonPrimitiveValueType || mw.DeclaringType.IsGhost)) - il.Emit(OpCodes.Ldloca, self); - else if (self != null) - il.Emit(OpCodes.Ldloc, self); + // catch Exception, wrap with IllegalArgumentException + il.BeginCatchBlock(typeof(Exception)); + il.Emit(OpCodes.Stloc, e); + il.Emit(OpCodes.Ldstr, $"exception on parameter {i}"); + il.Emit(OpCodes.Ldloc, e); + il.Emit(OpCodes.Newobj, illegalArgumentExceptionWithMessageAndCauseCtor); + il.Emit(OpCodes.Throw); - // load the remainder of the arguments - for (var i = 0; i < args.Length; i++) - il.Emit(OpCodes.Ldloc, args[i]); + // end of convert self block + il.EndExceptionBlock(); + il.MarkLabel(endConvArgn); + il.ReleaseTempLocal(e); + } // method requires caller ID passed as final argument if (mw.HasCallerID) - il.EmitLdarg(2); + { + var o = p[n++] = il.AllocTempLocal(typeof(global::ikvm.@internal.CallerID)); + il.Emit(OpCodes.Ldarg_2); + il.Emit(OpCodes.Stloc, o); + } + + // storage for return value + var rt = il.AllocTempLocal(typeof(object)); + + // call method and convert result + il.BeginExceptionBlock(); - // final method call - il.Emit(self == null ? OpCodes.Call : OpCodes.Callvirt, mw.GetMethod()); + // load converted arguments + for (int i = 0; i < n; i++) + { + il.Emit(OpCodes.Ldloc, p[i]); + il.ReleaseTempLocal(p[i]); + } - // convert and store return value + // call method + il.Emit(mw.IsStatic == false ? OpCodes.Callvirt : OpCodes.Call, mw.GetMethod()); + + // handle return value mw.ReturnType.EmitConvSignatureTypeToStackType(il); BoxUtil.BoxReturnValue(il, mw.ReturnType); il.Emit(OpCodes.Stloc, rt); - il.EmitLeave(returnLabel); + il.EmitLeave(postLabel); - // catch the results of the call + // catch exception from call and wrap il.BeginCatchBlock(typeof(Exception)); - - // labels - var exceptionWrapLabel = il.DefineLabel(); - var exceptionThrowLabel = il.DefineLabel(); - - // If the exception we caught is a global::java.lang.reflect.InvocationTargetException, we know it must be - // wrapped, because .NET won't throw that exception and we also cannot check the target site, - // because it may be the same as us if a method is recursively invoking itself. - il.Emit(OpCodes.Dup); - il.Emit(OpCodes.Isinst, typeof(global::java.lang.reflect.InvocationTargetException)); - il.EmitBrtrue(exceptionWrapLabel); - - il.Emit(OpCodes.Dup); - il.Emit(OpCodes.Callvirt, get_TargetSite); - il.Emit(OpCodes.Call, GetCurrentMethod); - il.Emit(OpCodes.Ceq); - il.EmitBrtrue(exceptionThrowLabel); - - il.MarkLabel(exceptionWrapLabel); il.Emit(OpCodes.Ldc_I4_0); il.Emit(OpCodes.Call, il.Context.ByteCodeHelperMethods.MapException.MakeGenericMethod(il.Context.Types.Exception)); - il.Emit(OpCodes.Newobj, invocationTargetExceptionCtor); - - il.MarkLabel(exceptionThrowLabel); + il.Emit(OpCodes.Newobj, invocationTargetExceptionWithCauseCtor); il.Emit(OpCodes.Throw); il.EndExceptionBlock(); - il.MarkLabel(returnLabel); + // return from method with last return value + il.MarkLabel(postLabel); il.Emit(OpCodes.Ldloc, rt); + il.ReleaseTempLocal(rt); il.Emit(OpCodes.Ret); il.DoEmit(); @@ -724,18 +778,14 @@ public object invoke(object obj, object[] args, global::ikvm.@internal.CallerID { return invoker(obj, args, callerID); } - catch (System.InvalidProgramException e) - { - throw; - } catch (MethodAccessException x) { // this can happen if we're calling a non-public method and the call stack doesn't have ReflectionPermission.MemberAccess throw new global::java.lang.IllegalAccessException().initCause(x); } - catch (global::java.lang.NullPointerException e) + catch (NullReferenceException e) { - Console.Error.WriteLine("Caught NPE"); + global::java.lang.System.err.println("got NRE " + e); throw; } } @@ -750,102 +800,146 @@ sealed class FastConstructorAccessorImpl : global::sun.reflect.ConstructorAccess internal FastConstructorAccessorImpl(global::java.lang.reflect.Constructor constructor) { - var mw = RuntimeJavaMethod.FromExecutable(constructor); - - RuntimeJavaType[] parameters; try { + var mw = RuntimeJavaMethod.FromExecutable(constructor); + mw.DeclaringType.Finish(); - parameters = mw.GetParameters(); + var parameters = mw.GetParameters(); + for (int i = 0; i < parameters.Length; i++) { - // the EnsureLoadable shouldn't fail, because we don't allow a global::java.lang.reflect.Method - // to "escape" if it has an unloadable type in the signature parameters[i] = parameters[i].EnsureLoadable(mw.DeclaringType.GetClassLoader()); parameters[i].Finish(); } - } - catch (RetargetableJavaException x) - { - throw x.ToJava(); - } - mw.ResolveMethod(); - var dm = DynamicMethodUtil.Create("__", mw.DeclaringType.TypeAsTBD, !mw.IsPublic || !mw.DeclaringType.IsPublic, typeof(object), new Type[] { typeof(object[]) }); - var ilgen = JVM.Context.CodeEmitterFactory.Create(dm); - var ret = ilgen.DeclareLocal(typeof(object)); + // resolve the runtime method info + mw.ResolveMethod(); + var np = !mw.IsPublic || !mw.DeclaringType.IsPublic; + var dm = DynamicMethodUtil.Create($"____{mw.DeclaringType.Name.Replace(".", "_")}__{mw.Name}", mw.DeclaringType.TypeAsTBD, np, typeof(object), new[] { typeof(object[]) }); + var il = JVM.Context.CodeEmitterFactory.Create(dm); + + // labels + var postLabel = il.DefineLabel(); + + // local variables for arguments passed to constructor + var n = 0; + var p = new CodeEmitterLocal[parameters.Length]; + + // where we start converting arguemnts + var convArgsLabel = il.DefineLabel(); - // check args length - var argsLengthOK = ilgen.DefineLabel(); - if (parameters.Length == 0) - { // zero length array may be null - ilgen.Emit(OpCodes.Ldarg_0); - ilgen.EmitBrfalse(argsLengthOK); - } - ilgen.Emit(OpCodes.Ldarg_0); - ilgen.Emit(OpCodes.Ldlen); - ilgen.EmitLdc_I4(parameters.Length); - ilgen.EmitBeq(argsLengthOK); - ilgen.Emit(OpCodes.Newobj, FastMethodAccessorImpl.illegalArgumentExceptionCtor); - ilgen.Emit(OpCodes.Throw); - ilgen.MarkLabel(argsLengthOK); + if (parameters.Length == 0) + { + il.Emit(OpCodes.Ldarg_0); + il.EmitBrfalse(convArgsLabel); + } + + // check that arguments array is not null + var chckArgsLabel = il.DefineLabel(); + il.Emit(OpCodes.Ldarg_0); + il.Emit(OpCodes.Ldnull); + il.EmitBne_Un(chckArgsLabel); + il.Emit(OpCodes.Ldstr, "wrong number of arguments"); + il.Emit(OpCodes.Newobj, FastMethodAccessorImpl.illegalArgumentExceptionWithMessageCtor); + il.Emit(OpCodes.Throw); + + // parameters length must match number of parameters on array + il.MarkLabel(chckArgsLabel); + il.Emit(OpCodes.Ldarg_0); + il.Emit(OpCodes.Ldlen); + il.EmitLdc_I4(parameters.Length); + il.EmitBeq(convArgsLabel); + il.Emit(OpCodes.Ldstr, "wrong number of arguments"); + il.Emit(OpCodes.Newobj, FastMethodAccessorImpl.illegalArgumentExceptionWithMessageCtor); + il.Emit(OpCodes.Throw); + + // begin parameter conversion + il.MarkLabel(convArgsLabel); - var args = new CodeEmitterLocal[parameters.Length]; - for (int i = 0; i < args.Length; i++) - args[i] = ilgen.DeclareLocal(parameters[i].TypeAsSignatureType); + // emit conversion code for the remainder of the arguments + for (var i = 0; i < parameters.Length; i++) + { + var tw = parameters[i]; - ilgen.BeginExceptionBlock(); - for (int i = 0; i < args.Length; i++) + // declare variable to hold argument + var o = p[n++] = il.AllocTempLocal(tw.TypeAsSignatureType); + + // temporary variable for exceptions + var e = il.AllocTempLocal(typeof(Exception)); + + // load and convert argument + var endConvArgn = il.DefineLabel(); + il.BeginExceptionBlock(); + il.Emit(OpCodes.Ldarg_0); + il.EmitLdc_I4(i); + il.Emit(OpCodes.Ldelem_Ref); + BoxUtil.EmitUnboxArg(il, tw); + tw.EmitConvStackTypeToSignatureType(il, null); + il.Emit(OpCodes.Stloc, o); + il.EmitLeave(endConvArgn); + + // catch InvalidCastException, store, add message, and wrap with IllegalArgumentException + il.BeginCatchBlock(typeof(InvalidCastException)); + il.Emit(OpCodes.Stloc, e); + il.Emit(OpCodes.Ldstr, $"argument type mismatch on parameter {i}"); + il.Emit(OpCodes.Ldloc, e); + il.Emit(OpCodes.Newobj, FastMethodAccessorImpl.illegalArgumentExceptionWithMessageAndCauseCtor); + il.Emit(OpCodes.Throw); + + // catch Exception, wrap with IllegalArgumentException + il.BeginCatchBlock(typeof(Exception)); + il.Emit(OpCodes.Stloc, e); + il.Emit(OpCodes.Ldstr, $"exception on parameter {i}"); + il.Emit(OpCodes.Ldloc, e); + il.Emit(OpCodes.Newobj, FastMethodAccessorImpl.illegalArgumentExceptionWithMessageAndCauseCtor); + il.Emit(OpCodes.Throw); + + // end of convert self block + il.EndExceptionBlock(); + il.MarkLabel(endConvArgn); + il.ReleaseTempLocal(e); + } + + // handle exceptions in constructor + il.BeginExceptionBlock(); + + // load converted arguments + for (int i = 0; i < n; i++) + { + il.Emit(OpCodes.Ldloc, p[i]); + il.ReleaseTempLocal(p[i]); + } + + // call constructor + var rt = il.AllocTempLocal(typeof(object)); + mw.EmitNewobj(il); + il.Emit(OpCodes.Stloc, rt); + il.EmitLeave(postLabel); + + // catch exception from call and wrap + il.BeginCatchBlock(typeof(Exception)); + il.Emit(OpCodes.Ldc_I4_0); + il.Emit(OpCodes.Call, il.Context.ByteCodeHelperMethods.MapException.MakeGenericMethod(il.Context.Types.Exception)); + il.Emit(OpCodes.Newobj, FastMethodAccessorImpl.invocationTargetExceptionWithCauseCtor); + il.Emit(OpCodes.Throw); + il.EndExceptionBlock(); + + // return from method with last return value + il.MarkLabel(postLabel); + il.Emit(OpCodes.Ldloc, rt); + il.ReleaseTempLocal(rt); + il.Emit(OpCodes.Ret); + il.DoEmit(); + + // generate invoker + invoker = (Invoker)dm.CreateDelegate(typeof(Invoker)); + } + catch (RetargetableJavaException e) { - ilgen.Emit(OpCodes.Ldarg_0); - ilgen.EmitLdc_I4(i); - ilgen.Emit(OpCodes.Ldelem_Ref); - RuntimeJavaType tw = parameters[i]; - BoxUtil.EmitUnboxArg(ilgen, tw); - tw.EmitConvStackTypeToSignatureType(ilgen, null); - ilgen.Emit(OpCodes.Stloc, args[i]); - } - CodeEmitterLabel label1 = ilgen.DefineLabel(); - ilgen.EmitLeave(label1); - ilgen.BeginCatchBlock(typeof(InvalidCastException)); - ilgen.Emit(OpCodes.Newobj, FastMethodAccessorImpl.illegalArgumentExceptionCtor); - ilgen.Emit(OpCodes.Throw); - ilgen.BeginCatchBlock(typeof(NullReferenceException)); - ilgen.Emit(OpCodes.Newobj, FastMethodAccessorImpl.illegalArgumentExceptionCtor); - ilgen.Emit(OpCodes.Throw); - ilgen.EndExceptionBlock(); - - // this is the actual call - ilgen.MarkLabel(label1); - ilgen.BeginExceptionBlock(); - for (int i = 0; i < args.Length; i++) - { - ilgen.Emit(OpCodes.Ldloc, args[i]); - } - mw.EmitNewobj(ilgen); - ilgen.Emit(OpCodes.Stloc, ret); - CodeEmitterLabel label2 = ilgen.DefineLabel(); - ilgen.EmitLeave(label2); - ilgen.BeginCatchBlock(typeof(Exception)); - ilgen.Emit(OpCodes.Dup); - ilgen.Emit(OpCodes.Callvirt, FastMethodAccessorImpl.get_TargetSite); - ilgen.Emit(OpCodes.Call, FastMethodAccessorImpl.GetCurrentMethod); - ilgen.Emit(OpCodes.Ceq); - CodeEmitterLabel label = ilgen.DefineLabel(); - ilgen.EmitBrtrue(label); - ilgen.Emit(OpCodes.Ldc_I4_0); - ilgen.Emit(OpCodes.Call, ilgen.Context.ByteCodeHelperMethods.MapException.MakeGenericMethod(ilgen.Context.Types.Exception)); - ilgen.Emit(OpCodes.Newobj, FastMethodAccessorImpl.invocationTargetExceptionCtor); - ilgen.MarkLabel(label); - ilgen.Emit(OpCodes.Throw); - ilgen.EndExceptionBlock(); - - ilgen.MarkLabel(label2); - ilgen.Emit(OpCodes.Ldloc, ret); - ilgen.Emit(OpCodes.Ret); - ilgen.DoEmit(); - invoker = (Invoker)dm.CreateDelegate(typeof(Invoker)); + throw e.ToJava(); + } } [IKVM.Attributes.HideFromJava] @@ -855,16 +949,18 @@ public object newInstance(object[] args) { return invoker(args); } - catch (MethodAccessException x) + catch (MethodAccessException e) { // this can happen if we're calling a non-public method and the call stack doesn't have ReflectionPermission.MemberAccess - throw new global::java.lang.IllegalAccessException().initCause(x); + throw new global::java.lang.IllegalAccessException().initCause(e); } } + } private sealed class FastSerializationConstructorAccessorImpl : global::sun.reflect.ConstructorAccessor { + private static readonly MethodInfo GetTypeFromHandleMethod = typeof(Type).GetMethod("GetTypeFromHandle", new Type[] { typeof(RuntimeTypeHandle) }); private static readonly MethodInfo GetUninitializedObjectMethod = typeof(FormatterServices).GetMethod("GetUninitializedObject", new Type[] { typeof(Type) }); private delegate object InvokeCtor(); @@ -920,6 +1016,7 @@ public object newInstance(object[] args) sealed class ActivatorConstructorAccessor : global::sun.reflect.ConstructorAccessor { + private readonly Type type; internal ActivatorConstructorAccessor(RuntimeJavaMethod mw) @@ -930,9 +1027,8 @@ internal ActivatorConstructorAccessor(RuntimeJavaMethod mw) public object newInstance(object[] objarr) { if (objarr != null && objarr.Length != 0) - { throw new global::java.lang.IllegalArgumentException(); - } + try { return Activator.CreateInstance(type); @@ -945,7 +1041,7 @@ public object newInstance(object[] objarr) internal static bool IsSuitable(RuntimeJavaMethod mw) { - MethodBase mb = mw.GetMethod(); + var mb = mw.GetMethod(); return mb != null && mb.IsConstructor && mb.IsPublic @@ -953,6 +1049,7 @@ internal static bool IsSuitable(RuntimeJavaMethod mw) && mb.DeclaringType == mw.DeclaringType.TypeAsBaseType && mb.GetParameters().Length == 0; } + } private abstract class FieldAccessorImplBase : global::sun.reflect.FieldAccessor, IReflectionException From 5d9ad33becfa4aa8733248f85c26e3b021013767 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Wed, 21 Feb 2024 09:20:16 -0600 Subject: [PATCH 091/134] ldloca for value types/thoses. --- .../Externs/sun/reflect/ReflectionFactory.cs | 38 +++++++++++-------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/src/IKVM.Runtime/Java/Externs/sun/reflect/ReflectionFactory.cs b/src/IKVM.Runtime/Java/Externs/sun/reflect/ReflectionFactory.cs index 8595ea01a9..055ea1e414 100644 --- a/src/IKVM.Runtime/Java/Externs/sun/reflect/ReflectionFactory.cs +++ b/src/IKVM.Runtime/Java/Externs/sun/reflect/ReflectionFactory.cs @@ -586,15 +586,16 @@ internal unsafe FastMethodAccessorImpl(RuntimeJavaMethod mw) // labels var postLabel = il.DefineLabel(); - // local variables for arguments passed to method + // arguments passed to the method + var s = default(CodeEmitterLocal); var n = 0; - var p = new CodeEmitterLocal[parameters.Length + 2]; + var p = new CodeEmitterLocal[parameters.Length]; // load instance if not static if (mw.IsStatic == false) { - // declare variable to hold first argument - var o = p[n++] = il.AllocTempLocal(mw.DeclaringType.TypeAsSignatureType); + // declare variable to hold this instance + s = il.AllocTempLocal(mw.DeclaringType.TypeAsSignatureType); // explicit null check for target var endIsNullLabel = il.DefineLabel(); @@ -615,7 +616,7 @@ internal unsafe FastMethodAccessorImpl(RuntimeJavaMethod mw) il.Emit(OpCodes.Ldarg_0); mw.DeclaringType.EmitCheckcast(il); mw.DeclaringType.EmitConvStackTypeToSignatureType(il, null); - il.Emit(OpCodes.Stloc, o); + il.Emit(OpCodes.Stloc, s); il.EmitLeave(endConvSelf); // catch InvalidCastException, store, add message, and wrap with IllegalArgumentException @@ -707,26 +708,26 @@ internal unsafe FastMethodAccessorImpl(RuntimeJavaMethod mw) il.Emit(OpCodes.Newobj, illegalArgumentExceptionWithMessageAndCauseCtor); il.Emit(OpCodes.Throw); - // end of convert self block + // end convert il.EndExceptionBlock(); il.MarkLabel(endConvArgn); il.ReleaseTempLocal(e); } - // method requires caller ID passed as final argument - if (mw.HasCallerID) - { - var o = p[n++] = il.AllocTempLocal(typeof(global::ikvm.@internal.CallerID)); - il.Emit(OpCodes.Ldarg_2); - il.Emit(OpCodes.Stloc, o); - } - // storage for return value var rt = il.AllocTempLocal(typeof(object)); // call method and convert result il.BeginExceptionBlock(); + // this instance + if (s != null) + { + // null for static, reference for valuetype/ghost, reference for instance + il.Emit(mw.DeclaringType.IsNonPrimitiveValueType || mw.DeclaringType.IsGhost ? OpCodes.Ldloca : OpCodes.Ldloc, s); + il.ReleaseTempLocal(s); + } + // load converted arguments for (int i = 0; i < n; i++) { @@ -734,8 +735,15 @@ internal unsafe FastMethodAccessorImpl(RuntimeJavaMethod mw) il.ReleaseTempLocal(p[i]); } + // method requires caller ID passed as final argument + if (mw.HasCallerID) + il.Emit(OpCodes.Ldarg_2); + // call method - il.Emit(mw.IsStatic == false ? OpCodes.Callvirt : OpCodes.Call, mw.GetMethod()); + if (s != null) + il.Emit(OpCodes.Callvirt, mw.GetMethod()); + else + il.Emit(OpCodes.Call, mw.GetMethod()); // handle return value mw.ReturnType.EmitConvSignatureTypeToStackType(il); From 45b0c8da7e7db028e055cdaaee80adfbe9db36ba Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Sun, 25 Feb 2024 11:59:21 -0600 Subject: [PATCH 092/134] Add a few tests. Add image toosl to IKVM.Tests. --- src/IKVM.Tests/IKVM.Tests.csproj | 10 +++--- src/IKVM.Tests/Java/java/lang/ProcessTests.cs | 15 +++++++++ src/IKVM.Tests/Tools/XjcTests.cs | 31 +++++++++++++++++++ 3 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 src/IKVM.Tests/Tools/XjcTests.cs diff --git a/src/IKVM.Tests/IKVM.Tests.csproj b/src/IKVM.Tests/IKVM.Tests.csproj index 69d2a485f6..b33d9284b6 100644 --- a/src/IKVM.Tests/IKVM.Tests.csproj +++ b/src/IKVM.Tests/IKVM.Tests.csproj @@ -24,17 +24,19 @@ - + - - - + + + + + diff --git a/src/IKVM.Tests/Java/java/lang/ProcessTests.cs b/src/IKVM.Tests/Java/java/lang/ProcessTests.cs index 999780c229..0f94e0b841 100644 --- a/src/IKVM.Tests/Java/java/lang/ProcessTests.cs +++ b/src/IKVM.Tests/Java/java/lang/ProcessTests.cs @@ -52,6 +52,21 @@ public void CanReadFromErrorStream() l.Should().Be("hello"); } + [TestMethod] + public void CanWaitForWithInheritIO() + { + string[] c; + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + c = new[] { "cmd.exe", "/c", "echo hello" }; + else + c = new[] { "/bin/sh", "-c", "echo hello" }; + + var b = new ProcessBuilder(c); + b.inheritIO(); + var p = b.start(); + p.waitFor(); + } + } } diff --git a/src/IKVM.Tests/Tools/XjcTests.cs b/src/IKVM.Tests/Tools/XjcTests.cs new file mode 100644 index 0000000000..af53812cf4 --- /dev/null +++ b/src/IKVM.Tests/Tools/XjcTests.cs @@ -0,0 +1,31 @@ +using System.IO; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading.Tasks; + +using CliWrap; + +using FluentAssertions; + +using Microsoft.VisualStudio.TestTools.UnitTesting; + +namespace IKVM.Tests.Tools +{ + + [TestClass] + public class XjcTests + { + + [TestMethod] + public async Task CanDisplayHelp() + { + var s = new StringBuilder(); + var c = Path.Combine(java.lang.System.getProperty("java.home"), "bin", "xjc"); + var r = await Cli.Wrap(c).WithArguments("-help").WithStandardOutputPipe(PipeTarget.ToDelegate(i => s.Append(i))).WithValidation(CommandResultValidation.None).ExecuteAsync(); + r.ExitCode.Should().Be(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? -1 : 255); + s.ToString().Should().StartWith("Usage: xjc"); + } + + } + +} From feb590837ff4529566960071e98c184c3ad9d74d Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Sun, 25 Feb 2024 11:59:31 -0600 Subject: [PATCH 093/134] Include Process mechanisms in native library. --- src/libiava/libiava.clangproj | 7 ++++++- src/libjvm/jvm.cpp | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/libiava/libiava.clangproj b/src/libiava/libiava.clangproj index 0b66e4fa18..b4243cfd76 100644 --- a/src/libiava/libiava.clangproj +++ b/src/libiava/libiava.clangproj @@ -9,6 +9,8 @@ c89 $(IncludeDirectories);$(OpenJdkDir)jdk\src\share\native\java\io $(IncludeDirectories);$(OpenJdkDir)jdk\src\$(OpenJdkTargetOsApiDir)\native\java\io + $(IncludeDirectories);$(OpenJdkDir)jdk\src\share\native\java\lang + $(IncludeDirectories);$(OpenJdkDir)jdk\src\$(OpenJdkTargetOsApiDir)\native\java\lang @@ -41,16 +43,19 @@ + + + - + \ No newline at end of file diff --git a/src/libjvm/jvm.cpp b/src/libjvm/jvm.cpp index 463aaa4376..d74e7ef75b 100644 --- a/src/libjvm/jvm.cpp +++ b/src/libjvm/jvm.cpp @@ -976,6 +976,13 @@ void* JNICALL JVM_FindLibraryEntry(void* handle, const char* name) return os_dll_lookup(handle, name); } +#ifdef WIN32 +void* JVM_GetThreadInterruptEvent() +{ + return 0; +} +#endif + #ifdef __cplusplus extern "C" { #endif From 2d2b34e69663287e37f82605ecb17341e8d00904 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Mon, 26 Feb 2024 04:25:24 -0600 Subject: [PATCH 094/134] Include ProcessEnvironment and UNIXProcess from solaris implementation and redirect through ProcessImpl. Executing processes on Linux/OSX should thus go through OpenJDK native fork/exec code. Which might work with the pipe redirects? Also might fail because fork/exec doesn't work. We shall see. --- openjdk.props | 1 + .../local/java/io/FileDescriptor.java | 4 +- .../local/java/lang/ProcessImpl.java | 178 +++++-- .../java/lang/UNIXProcessEnvironment.java | 440 ++++++++++++++++++ .../local/java/lang/Win32Process.java | 46 ++ ...mplAccessor.cs => Win32ProcessAccessor.cs} | 8 +- .../java/lang/UNIXProcessEnvironment.cs | 52 +++ .../lang/{ProcessImpl.cs => Win32Process.cs} | 52 +-- src/IKVM.Tests/Java/java/lang/ProcessTests.cs | 122 ++++- src/libiava/libiava.clangproj | 9 +- src/libjvm/jni_md.h | 55 +++ src/libjvm/jvm.cpp | 90 ++-- src/libjvm/jvm.h | 29 -- src/libjvm/libjvm.clangproj | 29 +- 14 files changed, 954 insertions(+), 161 deletions(-) create mode 100644 src/IKVM.Java/local/java/lang/UNIXProcessEnvironment.java create mode 100644 src/IKVM.Java/local/java/lang/Win32Process.java rename src/IKVM.Runtime/Accessors/Java/Lang/{ProcessImplAccessor.cs => Win32ProcessAccessor.cs} (77%) create mode 100644 src/IKVM.Runtime/Java/Externs/java/lang/UNIXProcessEnvironment.cs rename src/IKVM.Runtime/Java/Externs/java/lang/{ProcessImpl.cs => Win32Process.cs} (95%) create mode 100644 src/libjvm/jni_md.h delete mode 100644 src/libjvm/jvm.h diff --git a/openjdk.props b/openjdk.props index 81a4929efb..5d606918eb 100644 --- a/openjdk.props +++ b/openjdk.props @@ -796,6 +796,7 @@ + diff --git a/src/IKVM.Java/local/java/io/FileDescriptor.java b/src/IKVM.Java/local/java/io/FileDescriptor.java index 76a6bd2b54..50d4db9b7a 100644 --- a/src/IKVM.Java/local/java/io/FileDescriptor.java +++ b/src/IKVM.Java/local/java/io/FileDescriptor.java @@ -22,7 +22,7 @@ public final class FileDescriptor { sun.misc.SharedSecrets.setJavaIOFileDescriptorAccess( new sun.misc.JavaIOFileDescriptorAccess() { public void set(FileDescriptor obj, int fd) { - + obj.fd = fd; } public int get(FileDescriptor obj) { @@ -30,7 +30,7 @@ public int get(FileDescriptor obj) { } public void setHandle(FileDescriptor obj, long handle) { - + obj.handle = handle; } public long getHandle(FileDescriptor obj) { diff --git a/src/IKVM.Java/local/java/lang/ProcessImpl.java b/src/IKVM.Java/local/java/lang/ProcessImpl.java index ae211b1e71..a931aa029d 100644 --- a/src/IKVM.Java/local/java/lang/ProcessImpl.java +++ b/src/IKVM.Java/local/java/lang/ProcessImpl.java @@ -1,46 +1,156 @@ +/* + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + package java.lang; -import java.io.*; +import java.io.IOException; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.lang.ProcessBuilder.Redirect; import java.util.*; -final class ProcessImpl extends Process { +/** + * This class is for the exclusive use of ProcessBuilder.start() to + * create new processes. + * + * @author Martin Buchholz + * @since 1.5 + */ +final class ProcessImpl { + + public native void dummy(); - cli.System.Diagnostics.Process process; - OutputStream outputStream; - InputStream inputStream; - InputStream errorStream; + private static final sun.misc.JavaIOFileDescriptorAccess fdAccess + = sun.misc.SharedSecrets.getJavaIOFileDescriptorAccess(); - static native Process start(String cmdarray[], java.util.Map environment, String dir, ProcessBuilder.Redirect[] redirects, boolean redirectErrorStream) throws IOException; + private ProcessImpl() {} // Not instantiable - private ProcessImpl(cli.System.Diagnostics.Process process, OutputStream outputStream, InputStream inputStream, InputStream errorStream) { - this.process = process; - this.outputStream = outputStream; - this.inputStream = inputStream; - this.errorStream = errorStream; + private static byte[] toCString(String s) { + if (s == null) + return null; + byte[] bytes = s.getBytes(); + byte[] result = new byte[bytes.length + 1]; + System.arraycopy(bytes, 0, + result, 0, + bytes.length); + result[result.length-1] = (byte)0; + return result; } - @Override - public OutputStream getOutputStream() { - return outputStream; - } + // Only for use by ProcessBuilder.start() + static Process start(String[] cmdarray, + java.util.Map environment, + String dir, + ProcessBuilder.Redirect[] redirects, + boolean redirectErrorStream) + throws IOException + { + if (cli.IKVM.Runtime.RuntimeUtil.get_IsWindows()) { + return Win32Process.start(cmdarray, environment, dir, redirects, redirectErrorStream); + } else { - @Override - public InputStream getInputStream() { - return inputStream; - } - - @Override - public InputStream getErrorStream() { - return errorStream; - } - - @Override - public native int waitFor() throws InterruptedException; - - @Override - public native int exitValue(); - - @Override - public native void destroy(); + assert cmdarray != null && cmdarray.length > 0; + + // Convert arguments to a contiguous block; it's easier to do + // memory management in Java than in C. + byte[][] args = new byte[cmdarray.length-1][]; + int size = args.length; // For added NUL bytes + for (int i = 0; i < args.length; i++) { + args[i] = cmdarray[i+1].getBytes(); + size += args[i].length; + } + byte[] argBlock = new byte[size]; + int i = 0; + for (byte[] arg : args) { + System.arraycopy(arg, 0, argBlock, i, arg.length); + i += arg.length + 1; + // No need to write NUL bytes explicitly + } + int[] envc = new int[1]; + byte[] envBlock = UNIXProcessEnvironment.toEnvironmentBlock(environment, envc); + + int[] std_fds; + + FileInputStream f0 = null; + FileOutputStream f1 = null; + FileOutputStream f2 = null; + + try { + if (redirects == null) { + std_fds = new int[] { -1, -1, -1 }; + } else { + std_fds = new int[3]; + + if (redirects[0] == Redirect.PIPE) + std_fds[0] = -1; + else if (redirects[0] == Redirect.INHERIT) + std_fds[0] = 0; + else { + f0 = new FileInputStream(redirects[0].file()); + std_fds[0] = fdAccess.get(f0.getFD()); + } + + if (redirects[1] == Redirect.PIPE) + std_fds[1] = -1; + else if (redirects[1] == Redirect.INHERIT) + std_fds[1] = 1; + else { + f1 = new FileOutputStream(redirects[1].file(), + redirects[1].append()); + std_fds[1] = fdAccess.get(f1.getFD()); + } + + if (redirects[2] == Redirect.PIPE) + std_fds[2] = -1; + else if (redirects[2] == Redirect.INHERIT) + std_fds[2] = 2; + else { + f2 = new FileOutputStream(redirects[2].file(), + redirects[2].append()); + std_fds[2] = fdAccess.get(f2.getFD()); + } + } + + return new UNIXProcess + (toCString(cmdarray[0]), + argBlock, args.length, + envBlock, envc[0], + toCString(dir), + std_fds, + redirectErrorStream); + } finally { + // In theory, close() can throw IOException + // (although it is rather unlikely to happen here) + try { if (f0 != null) f0.close(); } + finally { + try { if (f1 != null) f1.close(); } + finally { if (f2 != null) f2.close(); } + } + } + + } + } } diff --git a/src/IKVM.Java/local/java/lang/UNIXProcessEnvironment.java b/src/IKVM.Java/local/java/lang/UNIXProcessEnvironment.java new file mode 100644 index 0000000000..e51dcaab90 --- /dev/null +++ b/src/IKVM.Java/local/java/lang/UNIXProcessEnvironment.java @@ -0,0 +1,440 @@ +/* + * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* We use APIs that access the standard Unix environ array, which + * is defined by UNIX98 to look like: + * + * char **environ; + * + * These are unsorted, case-sensitive, null-terminated arrays of bytes + * of the form FOO=BAR\000 which are usually encoded in the user's + * default encoding (file.encoding is an excellent choice for + * encoding/decoding these). However, even though the user cannot + * directly access the underlying byte representation, we take pains + * to pass on the child the exact byte representation we inherit from + * the parent process for any environment name or value not created by + * Javaland. So we keep track of all the byte representations. + * + * Internally, we define the types Variable and Value that exhibit + * String/byteArray duality. The internal representation of the + * environment then looks like a Map. But we don't + * expose this to the user -- we only provide a Map + * view, although we could also provide a Map view. + * + * The non-private methods in this class are not for general use even + * within this package. Instead, they are the system-dependent parts + * of the system-independent method of the same name. Don't even + * think of using this class unless your method's name appears below. + * + * @author Martin Buchholz + * @since 1.5 + */ + +package java.lang; + +import java.io.*; +import java.util.*; + + +final class UNIXProcessEnvironment +{ + private static final HashMap theEnvironment; + private static final Map theUnmodifiableEnvironment; + static final int MIN_NAME_LENGTH = 0; + + static { + // We cache the C environment. This means that subsequent calls + // to putenv/setenv from C will not be visible from Java code. + byte[][] environ = environ(); + theEnvironment = new HashMap<>(environ.length/2 + 3); + // Read environment variables back to front, + // so that earlier variables override later ones. + for (int i = environ.length-1; i > 0; i-=2) + theEnvironment.put(Variable.valueOf(environ[i-1]), + Value.valueOf(environ[i])); + + theUnmodifiableEnvironment + = Collections.unmodifiableMap + (new StringEnvironment(theEnvironment)); + } + + /* Only for use by System.getenv(String) */ + static String getenv(String name) { + return theUnmodifiableEnvironment.get(name); + } + + /* Only for use by System.getenv() */ + static Map getenv() { + return theUnmodifiableEnvironment; + } + + /* Only for use by ProcessBuilder.environment() */ + @SuppressWarnings("unchecked") + static Map environment() { + return new StringEnvironment + ((Map)(theEnvironment.clone())); + } + + /* Only for use by Runtime.exec(...String[]envp...) */ + static Map emptyEnvironment(int capacity) { + return new StringEnvironment(new HashMap(capacity)); + } + + private static native byte[][] environ(); + + // This class is not instantiable. + private UNIXProcessEnvironment() {} + + // Check that name is suitable for insertion into Environment map + private static void validateVariable(String name) { + if (name.indexOf('=') != -1 || + name.indexOf('\u0000') != -1) + throw new IllegalArgumentException + ("Invalid environment variable name: \"" + name + "\""); + } + + // Check that value is suitable for insertion into Environment map + private static void validateValue(String value) { + if (value.indexOf('\u0000') != -1) + throw new IllegalArgumentException + ("Invalid environment variable value: \"" + value + "\""); + } + + // A class hiding the byteArray-String duality of + // text data on Unixoid operating systems. + private static abstract class ExternalData { + protected final String str; + protected final byte[] bytes; + + protected ExternalData(String str, byte[] bytes) { + this.str = str; + this.bytes = bytes; + } + + public byte[] getBytes() { + return bytes; + } + + public String toString() { + return str; + } + + public boolean equals(Object o) { + return o instanceof ExternalData + && arrayEquals(getBytes(), ((ExternalData) o).getBytes()); + } + + public int hashCode() { + return arrayHash(getBytes()); + } + } + + private static class Variable + extends ExternalData implements Comparable + { + protected Variable(String str, byte[] bytes) { + super(str, bytes); + } + + public static Variable valueOfQueryOnly(Object str) { + return valueOfQueryOnly((String) str); + } + + public static Variable valueOfQueryOnly(String str) { + return new Variable(str, str.getBytes()); + } + + public static Variable valueOf(String str) { + validateVariable(str); + return valueOfQueryOnly(str); + } + + public static Variable valueOf(byte[] bytes) { + return new Variable(new String(bytes), bytes); + } + + public int compareTo(Variable variable) { + return arrayCompare(getBytes(), variable.getBytes()); + } + + public boolean equals(Object o) { + return o instanceof Variable && super.equals(o); + } + } + + private static class Value + extends ExternalData implements Comparable + { + protected Value(String str, byte[] bytes) { + super(str, bytes); + } + + public static Value valueOfQueryOnly(Object str) { + return valueOfQueryOnly((String) str); + } + + public static Value valueOfQueryOnly(String str) { + return new Value(str, str.getBytes()); + } + + public static Value valueOf(String str) { + validateValue(str); + return valueOfQueryOnly(str); + } + + public static Value valueOf(byte[] bytes) { + return new Value(new String(bytes), bytes); + } + + public int compareTo(Value value) { + return arrayCompare(getBytes(), value.getBytes()); + } + + public boolean equals(Object o) { + return o instanceof Value && super.equals(o); + } + } + + // This implements the String map view the user sees. + private static class StringEnvironment + extends AbstractMap + { + private Map m; + private static String toString(Value v) { + return v == null ? null : v.toString(); + } + public StringEnvironment(Map m) {this.m = m;} + public int size() {return m.size();} + public boolean isEmpty() {return m.isEmpty();} + public void clear() { m.clear();} + public boolean containsKey(Object key) { + return m.containsKey(Variable.valueOfQueryOnly(key)); + } + public boolean containsValue(Object value) { + return m.containsValue(Value.valueOfQueryOnly(value)); + } + public String get(Object key) { + return toString(m.get(Variable.valueOfQueryOnly(key))); + } + public String put(String key, String value) { + return toString(m.put(Variable.valueOf(key), + Value.valueOf(value))); + } + public String remove(Object key) { + return toString(m.remove(Variable.valueOfQueryOnly(key))); + } + public Set keySet() { + return new StringKeySet(m.keySet()); + } + public Set> entrySet() { + return new StringEntrySet(m.entrySet()); + } + public Collection values() { + return new StringValues(m.values()); + } + + // It is technically feasible to provide a byte-oriented view + // as follows: + // public Map asByteArrayMap() { + // return new ByteArrayEnvironment(m); + // } + + + // Convert to Unix style environ as a monolithic byte array + // inspired by the Windows Environment Block, except we work + // exclusively with bytes instead of chars, and we need only + // one trailing NUL on Unix. + // This keeps the JNI as simple and efficient as possible. + public byte[] toEnvironmentBlock(int[]envc) { + int count = m.size() * 2; // For added '=' and NUL + for (Map.Entry entry : m.entrySet()) { + count += entry.getKey().getBytes().length; + count += entry.getValue().getBytes().length; + } + + byte[] block = new byte[count]; + + int i = 0; + for (Map.Entry entry : m.entrySet()) { + byte[] key = entry.getKey ().getBytes(); + byte[] value = entry.getValue().getBytes(); + System.arraycopy(key, 0, block, i, key.length); + i+=key.length; + block[i++] = (byte) '='; + System.arraycopy(value, 0, block, i, value.length); + i+=value.length + 1; + // No need to write NUL byte explicitly + //block[i++] = (byte) '\u0000'; + } + envc[0] = m.size(); + return block; + } + } + + static byte[] toEnvironmentBlock(Map map, int[]envc) { + return map == null ? null : + ((StringEnvironment)map).toEnvironmentBlock(envc); + } + + + private static class StringEntry + implements Map.Entry + { + private final Map.Entry e; + public StringEntry(Map.Entry e) {this.e = e;} + public String getKey() {return e.getKey().toString();} + public String getValue() {return e.getValue().toString();} + public String setValue(String newValue) { + return e.setValue(Value.valueOf(newValue)).toString(); + } + public String toString() {return getKey() + "=" + getValue();} + public boolean equals(Object o) { + return o instanceof StringEntry + && e.equals(((StringEntry)o).e); + } + public int hashCode() {return e.hashCode();} + } + + private static class StringEntrySet + extends AbstractSet> + { + private final Set> s; + public StringEntrySet(Set> s) {this.s = s;} + public int size() {return s.size();} + public boolean isEmpty() {return s.isEmpty();} + public void clear() { s.clear();} + public Iterator> iterator() { + return new Iterator>() { + Iterator> i = s.iterator(); + public boolean hasNext() {return i.hasNext();} + public Map.Entry next() { + return new StringEntry(i.next()); + } + public void remove() {i.remove();} + }; + } + private static Map.Entry vvEntry(final Object o) { + if (o instanceof StringEntry) + return ((StringEntry)o).e; + return new Map.Entry() { + public Variable getKey() { + return Variable.valueOfQueryOnly(((Map.Entry)o).getKey()); + } + public Value getValue() { + return Value.valueOfQueryOnly(((Map.Entry)o).getValue()); + } + public Value setValue(Value value) { + throw new UnsupportedOperationException(); + } + }; + } + public boolean contains(Object o) { return s.contains(vvEntry(o)); } + public boolean remove(Object o) { return s.remove(vvEntry(o)); } + public boolean equals(Object o) { + return o instanceof StringEntrySet + && s.equals(((StringEntrySet) o).s); + } + public int hashCode() {return s.hashCode();} + } + + private static class StringValues + extends AbstractCollection + { + private final Collection c; + public StringValues(Collection c) {this.c = c;} + public int size() {return c.size();} + public boolean isEmpty() {return c.isEmpty();} + public void clear() { c.clear();} + public Iterator iterator() { + return new Iterator() { + Iterator i = c.iterator(); + public boolean hasNext() {return i.hasNext();} + public String next() {return i.next().toString();} + public void remove() {i.remove();} + }; + } + public boolean contains(Object o) { + return c.contains(Value.valueOfQueryOnly(o)); + } + public boolean remove(Object o) { + return c.remove(Value.valueOfQueryOnly(o)); + } + public boolean equals(Object o) { + return o instanceof StringValues + && c.equals(((StringValues)o).c); + } + public int hashCode() {return c.hashCode();} + } + + private static class StringKeySet extends AbstractSet { + private final Set s; + public StringKeySet(Set s) {this.s = s;} + public int size() {return s.size();} + public boolean isEmpty() {return s.isEmpty();} + public void clear() { s.clear();} + public Iterator iterator() { + return new Iterator() { + Iterator i = s.iterator(); + public boolean hasNext() {return i.hasNext();} + public String next() {return i.next().toString();} + public void remove() { i.remove();} + }; + } + public boolean contains(Object o) { + return s.contains(Variable.valueOfQueryOnly(o)); + } + public boolean remove(Object o) { + return s.remove(Variable.valueOfQueryOnly(o)); + } + } + + // Replace with general purpose method someday + private static int arrayCompare(byte[]x, byte[] y) { + int min = x.length < y.length ? x.length : y.length; + for (int i = 0; i < min; i++) + if (x[i] != y[i]) + return x[i] - y[i]; + return x.length - y.length; + } + + // Replace with general purpose method someday + private static boolean arrayEquals(byte[] x, byte[] y) { + if (x.length != y.length) + return false; + for (int i = 0; i < x.length; i++) + if (x[i] != y[i]) + return false; + return true; + } + + // Replace with general purpose method someday + private static int arrayHash(byte[] x) { + int hash = 0; + for (int i = 0; i < x.length; i++) + hash = 31 * hash + x[i]; + return hash; + } + +} diff --git a/src/IKVM.Java/local/java/lang/Win32Process.java b/src/IKVM.Java/local/java/lang/Win32Process.java new file mode 100644 index 0000000000..9f804716be --- /dev/null +++ b/src/IKVM.Java/local/java/lang/Win32Process.java @@ -0,0 +1,46 @@ +package java.lang; + +import java.io.*; +import java.util.*; + +final class Win32Process extends Process { + + cli.System.Diagnostics.Process process; + OutputStream outputStream; + InputStream inputStream; + InputStream errorStream; + + static native Process start(String cmdarray[], java.util.Map environment, String dir, ProcessBuilder.Redirect[] redirects, boolean redirectErrorStream) throws IOException; + + private Win32Process(cli.System.Diagnostics.Process process, OutputStream outputStream, InputStream inputStream, InputStream errorStream) { + this.process = process; + this.outputStream = outputStream; + this.inputStream = inputStream; + this.errorStream = errorStream; + } + + @Override + public OutputStream getOutputStream() { + return outputStream; + } + + @Override + public InputStream getInputStream() { + return inputStream; + } + + @Override + public InputStream getErrorStream() { + return errorStream; + } + + @Override + public native int waitFor() throws InterruptedException; + + @Override + public native int exitValue(); + + @Override + public native void destroy(); + +} diff --git a/src/IKVM.Runtime/Accessors/Java/Lang/ProcessImplAccessor.cs b/src/IKVM.Runtime/Accessors/Java/Lang/Win32ProcessAccessor.cs similarity index 77% rename from src/IKVM.Runtime/Accessors/Java/Lang/ProcessImplAccessor.cs rename to src/IKVM.Runtime/Accessors/Java/Lang/Win32ProcessAccessor.cs index df6f9aa7ea..8ad55e96c2 100644 --- a/src/IKVM.Runtime/Accessors/Java/Lang/ProcessImplAccessor.cs +++ b/src/IKVM.Runtime/Accessors/Java/Lang/Win32ProcessAccessor.cs @@ -7,9 +7,9 @@ namespace IKVM.Runtime.Accessors.Java.Lang #if FIRST_PASS == false && EXPORTER == false && IMPORTER == false /// - /// Provides runtime access to the 'java.io.ProcessImpl' type. + /// Provides runtime access to the 'java.lang.Win32Process' type. /// - internal sealed class ProcessImplAccessor : Accessor + internal sealed class Win32ProcessAccessor : Accessor { MethodAccessor> init; @@ -19,8 +19,8 @@ internal sealed class ProcessImplAccessor : Accessor /// Initializes a new instance. /// /// - public ProcessImplAccessor(AccessorTypeResolver resolver) : - base(resolver, "java.lang.ProcessImpl") + public Win32ProcessAccessor(AccessorTypeResolver resolver) : + base(resolver, "java.lang.Win32Process") { } diff --git a/src/IKVM.Runtime/Java/Externs/java/lang/UNIXProcessEnvironment.cs b/src/IKVM.Runtime/Java/Externs/java/lang/UNIXProcessEnvironment.cs new file mode 100644 index 0000000000..0109d4653a --- /dev/null +++ b/src/IKVM.Runtime/Java/Externs/java/lang/UNIXProcessEnvironment.cs @@ -0,0 +1,52 @@ +using System; +using System.Runtime.InteropServices; + +using IKVM.Runtime.JNI; + +namespace IKVM.Java.Externs.java.lang +{ + + static class UNIXProcessEnvironment + { + +#if FIRST_PASS == false + + static global::ikvm.@internal.CallerID __callerID; + delegate IntPtr __jniDelegate__environ(IntPtr jniEnv); + static __jniDelegate__environ __jniPtr__environ; + +#endif + + /// + /// Implements the native method 'environ'. + /// + /// + public static object environ() + { +#if FIRST_PASS + throw new NotImplementedException(); +#else + __callerID ??= global::ikvm.@internal.CallerID.create(typeof(global::java.lang.UNIXProcessEnvironment).TypeHandle); + __jniPtr__environ ??= Marshal.GetDelegateForFunctionPointer<__jniDelegate__environ>(JNIFrame.GetFuncPtr(__callerID, "java/lang/ProcessEnvironment", nameof(environ), "()[[B")); + var jniFrm = new JNIFrame(); + var jniEnv = jniFrm.Enter(__callerID); + try + { + return jniFrm.UnwrapLocalRef(__jniPtr__environ(jniEnv)); + } + catch (Exception ex) + { + global::System.Console.WriteLine("*** exception in native code ***"); + global::System.Console.WriteLine(ex); + throw; + } + finally + { + jniFrm.Leave(); + } +#endif + } + + } + +} diff --git a/src/IKVM.Runtime/Java/Externs/java/lang/ProcessImpl.cs b/src/IKVM.Runtime/Java/Externs/java/lang/Win32Process.cs similarity index 95% rename from src/IKVM.Runtime/Java/Externs/java/lang/ProcessImpl.cs rename to src/IKVM.Runtime/Java/Externs/java/lang/Win32Process.cs index 777f47c6d9..816a96b821 100644 --- a/src/IKVM.Runtime/Java/Externs/java/lang/ProcessImpl.cs +++ b/src/IKVM.Runtime/Java/Externs/java/lang/Win32Process.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; -using System.Linq; using System.Security.AccessControl; using System.Text.RegularExpressions; using System.Threading; @@ -18,9 +17,9 @@ namespace IKVM.Java.Externs.java.lang { /// - /// Implements the native methods for 'ProcessImpl'. + /// Implements the native methods for 'Win32Process'. /// - static class ProcessImpl + static class Win32Process { #if FIRST_PASS == false @@ -45,7 +44,7 @@ static class ProcessImpl static MapEntryAccessor mapEntryAccessor; static SetAccessor setAccessor; static IteratorAccessor iteratorAccessor; - static ProcessImplAccessor processImplAccessor; + static Win32ProcessAccessor win32ProcessAccessor; static CallerIDAccessor CallerIDAccessor => JVM.Internal.BaseAccessors.Get(ref callerIDAccessor); @@ -87,7 +86,7 @@ static class ProcessImpl static IteratorAccessor IteratorAccessor => JVM.Internal.BaseAccessors.Get(ref iteratorAccessor); - static ProcessImplAccessor ProcessImplAccessor => JVM.Internal.BaseAccessors.Get(ref processImplAccessor); + static Win32ProcessAccessor Win32ProcessAccessor => JVM.Internal.BaseAccessors.Get(ref win32ProcessAccessor); #endif @@ -229,10 +228,7 @@ static object Create(string[] cmd, Dictionary env, string dir, S #if FIRST_PASS throw new NotImplementedException(); #else - if (RuntimeUtil.IsWindows) - return CreateWindows(cmd, env, dir, s0, s1, s2, redirectErrorStream); - else - return CreateUnix(cmd, env, dir, s0, s1, s2, redirectErrorStream); + return CreateWindows(cmd, env, dir, s0, s1, s2, redirectErrorStream); #endif } @@ -619,34 +615,6 @@ static bool WindowsExecutableExists(string file) } } - /// - /// Creates a new 'ProcessImpl' for a Unix machine. - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - static object CreateUnix(string[] cmd, Dictionary env, string dir, Stream h0, Stream h1, Stream h2, bool redirectErrorStream) - { -#if NETFRAMEWORK - throw new NotImplementedException(); -#else - var psi = new ProcessStartInfo(); - psi.FileName = cmd[0]; - - foreach (var arg in cmd.Skip(1)) - psi.ArgumentList.Add(arg); - - return Create(psi, env, dir, h0, h1, h2, redirectErrorStream); -#endif - - } - /// /// Creates a new 'ProcessImpl' based on the filename and arguments configured on the . /// @@ -753,10 +721,10 @@ static object Create(ProcessStartInfo psi, Dictionary env, strin s0 = h0 == null ? ProcessBuilderNullOutputStreamAccessor.GetInstance() : BufferedOutputStreamAccessor.Init(FileOutputStreamAccessor.Init2(CreateFileDescriptor(h0))); s1 = h1 == null ? ProcessBuilderNullInputStreamAccessor.GetInstance() : BufferedInputStreamAccessor.Init(FileInputStreamAccessor.Init2(CreateFileDescriptor(h1))); s2 = h2 == null ? ProcessBuilderNullInputStreamAccessor.GetInstance() : FileInputStreamAccessor.Init2(CreateFileDescriptor(h2)); - }), null, CallerIDAccessor.InvokeCreate(ProcessImplAccessor.Type.TypeHandle)); + }), null, CallerIDAccessor.InvokeCreate(Win32ProcessAccessor.Type.TypeHandle)); // return new process - return ProcessImplAccessor.Init(process, s0, s1, s2); + return Win32ProcessAccessor.Init(process, s0, s1, s2); #endif } @@ -934,7 +902,7 @@ public static int waitFor(object self) #if FIRST_PASS throw new NotImplementedException(); #else - var pid = ProcessImplAccessor.GetProcess(self); + var pid = Win32ProcessAccessor.GetProcess(self); if (pid.HasExited) return pid.ExitCode; @@ -954,7 +922,7 @@ public static int exitValue(object self) #if FIRST_PASS throw new NotImplementedException(); #else - var pid = ProcessImplAccessor.GetProcess(self); + var pid = Win32ProcessAccessor.GetProcess(self); if (pid.HasExited == false) throw new global::java.lang.IllegalThreadStateException("process has not exited"); @@ -967,7 +935,7 @@ public static void destroy(object self) #if FIRST_PASS throw new NotImplementedException(); #else - var pid = ProcessImplAccessor.GetProcess(self); + var pid = Win32ProcessAccessor.GetProcess(self); if (pid.HasExited) return; diff --git a/src/IKVM.Tests/Java/java/lang/ProcessTests.cs b/src/IKVM.Tests/Java/java/lang/ProcessTests.cs index 0f94e0b841..07a17c5aef 100644 --- a/src/IKVM.Tests/Java/java/lang/ProcessTests.cs +++ b/src/IKVM.Tests/Java/java/lang/ProcessTests.cs @@ -1,4 +1,5 @@ -using System.Runtime.InteropServices; +using System.IO; +using System.Runtime.InteropServices; using FluentAssertions; @@ -14,6 +15,24 @@ namespace IKVM.Tests.Java.java.lang public class ProcessTests { + public TestContext TestContext { get; set; } + + [TestMethod] + public void CanReadExitCode() + { + string[] c; + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + c = new[] { "cmd.exe", "/c", "exit 1" }; + else + c = new[] { "/bin/sh", "-c", "exit 1" }; + + var b = new ProcessBuilder(c); + var p = b.start(); + + p.waitFor(); + p.exitValue().Should().Be(1); + } + [TestMethod] public void CanReadFromInputStream() { @@ -24,6 +43,7 @@ public void CanReadFromInputStream() c = new[] { "/bin/sh", "-c", "echo hello" }; var b = new ProcessBuilder(c); + b.redirectOutput(ProcessBuilder.Redirect.PIPE); var p = b.start(); var r = new BufferedReader(new InputStreamReader(p.getInputStream())); @@ -43,6 +63,7 @@ public void CanReadFromErrorStream() c = new[] { "/bin/sh", "-c", "echo hello>&2" }; var b = new ProcessBuilder(c); + b.redirectError(ProcessBuilder.Redirect.PIPE); var p = b.start(); var r = new BufferedReader(new InputStreamReader(p.getErrorStream())); @@ -52,6 +73,105 @@ public void CanReadFromErrorStream() l.Should().Be("hello"); } + [TestMethod] + public void CanRedirectOutputToFile() + { + var f = Path.GetTempFileName(); + + string[] c; + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + c = new[] { "cmd.exe", "/c", "echo hello" }; + else + c = new[] { "/bin/sh", "-c", "echo hello" }; + + var b = new ProcessBuilder(c); + b.redirectOutput(ProcessBuilder.Redirect.to(new global::java.io.File(f))); + var p = b.start(); + p.waitFor(); + + System.IO.File.ReadAllText(f).TrimEnd().Should().Be("hello"); + } + + [TestMethod] + public void CanRedirectErrorToFile() + { + var f = Path.GetTempFileName(); + + string[] c; + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + c = new[] { "cmd.exe", "/c", "echo hello>&2" }; + else + c = new[] { "/bin/sh", "-c", "echo hello>&2" }; + + var b = new ProcessBuilder(c); + b.redirectError(ProcessBuilder.Redirect.to(new global::java.io.File(f))); + var p = b.start(); + p.waitFor(); + + System.IO.File.ReadAllText(f).TrimEnd().Should().Be("hello"); + } + + [TestMethod] + public void CanRedirectOutputToPipe() + { + string[] c; + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + c = new[] { "cmd.exe", "/c", "echo hello" }; + else + c = new[] { "/bin/sh", "-c", "echo hello" }; + + var b = new ProcessBuilder(c); + b.redirectOutput(ProcessBuilder.Redirect.PIPE); + var p = b.start(); + p.waitFor(); + } + + [TestMethod] + public void CanRedirectErrorToPipe() + { + string[] c; + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + c = new[] { "cmd.exe", "/c", "echo hello>&2" }; + else + c = new[] { "/bin/sh", "-c", "echo hello>&2" }; + + var b = new ProcessBuilder(c); + b.redirectError(ProcessBuilder.Redirect.PIPE); + var p = b.start(); + p.waitFor(); + } + + [TestMethod] + public void CanInheritInput() + { + string[] c; + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + c = new[] { "cmd.exe", "/c", "echo hello" }; + else + c = new[] { "/bin/sh", "-c", "echo hello" }; + + var b = new ProcessBuilder(c); + b.redirectError(ProcessBuilder.Redirect.INHERIT); + var p = b.start(); + p.waitFor(); + TestContext.WriteLine(p.ToString()); + } + + [TestMethod] + public void CanInheritError() + { + string[] c; + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + c = new[] { "cmd.exe", "/c", "echo hello" }; + else + c = new[] { "/bin/sh", "-c", "echo hello" }; + + var b = new ProcessBuilder(c); + b.redirectError(ProcessBuilder.Redirect.INHERIT); + var p = b.start(); + TestContext.WriteLine(p.ToString()); + } + [TestMethod] public void CanWaitForWithInheritIO() { diff --git a/src/libiava/libiava.clangproj b/src/libiava/libiava.clangproj index b4243cfd76..27ea6f3bd3 100644 --- a/src/libiava/libiava.clangproj +++ b/src/libiava/libiava.clangproj @@ -21,12 +21,15 @@ + + + @@ -49,12 +52,16 @@ + + + + + - diff --git a/src/libjvm/jni_md.h b/src/libjvm/jni_md.h new file mode 100644 index 0000000000..33d1ed4273 --- /dev/null +++ b/src/libjvm/jni_md.h @@ -0,0 +1,55 @@ +/* + * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* Switch to the correct jni_md.h file without reliance on -I options. */ +#ifdef TARGET_ARCH_x86 +# include "jni_x86.h" +#endif +#ifdef TARGET_ARCH_sparc +# include "jni_sparc.h" +#endif +#ifdef TARGET_ARCH_zero +# include "jni_zero.h" +#endif +#ifdef TARGET_ARCH_arm +# include "jni_arm.h" +#endif +#ifdef TARGET_ARCH_aarch64 +# include "jni_arm.h" +#endif +#ifdef TARGET_ARCH_ppc +# include "jni_ppc.h" +#endif + + +/* + The local copies of JNI header files may be refreshed + from a JDK distribution by means of these commands: + + cp ${JDK_DIST}/solaris/include/solaris/jni_md.h ./jni_sparc.h + cp ${JDK_DIST}/win32/include/win32/jni_md.h ./jni_i486.h + cp ${JDK_DIST}/win32/include/jni.h ./jni.h + +*/ diff --git a/src/libjvm/jvm.cpp b/src/libjvm/jvm.cpp index d74e7ef75b..018dcfc005 100644 --- a/src/libjvm/jvm.cpp +++ b/src/libjvm/jvm.cpp @@ -1,6 +1,5 @@ #include #include -#include "jvm.h" #include #include @@ -21,6 +20,11 @@ #include #include #include +#include +#endif + +#ifdef __cplusplus +extern "C" { #endif #define assert(condition, fmt, ...); @@ -977,61 +981,57 @@ void* JNICALL JVM_FindLibraryEntry(void* handle, const char* name) } #ifdef WIN32 -void* JVM_GetThreadInterruptEvent() +void* JNICALL JVM_GetThreadInterruptEvent() { return 0; } #endif -#ifdef __cplusplus -extern "C" { -#endif - - int jio_vsnprintf(char* str, size_t count, const char* fmt, va_list args) - { - // Reject count values that are negative signed values converted to - // unsigned; see bug 4399518, 4417214 - if ((intptr_t)count <= 0) return -1; - - int result = vsnprintf(str, count, fmt, args); - if (result > 0 && (size_t)result >= count) { - result = -1; - } +int jio_vsnprintf(char* str, size_t count, const char* fmt, va_list args) +{ + // Reject count values that are negative signed values converted to + // unsigned; see bug 4399518, 4417214 + if ((intptr_t)count <= 0) return -1; - return result; + int result = vsnprintf(str, count, fmt, args); + if (result > 0 && (size_t)result >= count) { + result = -1; } - int jio_snprintf(char* str, size_t count, const char* fmt, ...) { - va_list args; - int len; - va_start(args, fmt); - len = jio_vsnprintf(str, count, fmt, args); - va_end(args); - return len; - } + return result; +} - int jio_fprintf(FILE* f, const char* fmt, ...) { - int len; - va_list args; - va_start(args, fmt); - len = jio_vfprintf(f, fmt, args); - va_end(args); - return len; - } +int jio_snprintf(char* str, size_t count, const char* fmt, ...) { + va_list args; + int len; + va_start(args, fmt); + len = jio_vsnprintf(str, count, fmt, args); + va_end(args); + return len; +} - int jio_vfprintf(FILE* f, const char* fmt, va_list args) - { - return vfprintf(f, fmt, args); - } +int jio_fprintf(FILE* f, const char* fmt, ...) { + int len; + va_list args; + va_start(args, fmt); + len = jio_vfprintf(f, fmt, args); + va_end(args); + return len; +} - int jio_printf(const char* fmt, ...) { - int len; - va_list args; - va_start(args, fmt); - len = jio_vfprintf(stdout, fmt, args); - va_end(args); - return len; - } +int jio_vfprintf(FILE* f, const char* fmt, va_list args) +{ + return vfprintf(f, fmt, args); +} + +int jio_printf(const char* fmt, ...) { + int len; + va_list args; + va_start(args, fmt); + len = jio_vfprintf(stdout, fmt, args); + va_end(args); + return len; +} #ifdef __cplusplus } diff --git a/src/libjvm/jvm.h b/src/libjvm/jvm.h deleted file mode 100644 index 681c648c54..0000000000 --- a/src/libjvm/jvm.h +++ /dev/null @@ -1,29 +0,0 @@ -/** - -We use this file to redefine a few methods that should be exported, but which are not exported in jni.h. -OpenJDK passes /export or -export to the command line to do these manually. - -*/ - -#include - -#ifndef _IKVM_JVM_H_ -#define _IKVM_JVM_H_ - -#ifdef __cplusplus -extern "C" { -#endif - - JNIEXPORT int jio_vsnprintf(char* str, size_t count, const char* fmt, va_list args); - - JNIEXPORT int jio_snprintf(char* str, size_t count, const char* fmt, ...); - - JNIEXPORT int jio_fprintf(FILE*, const char* fmt, ...); - - JNIEXPORT int jio_vfprintf(FILE*, const char* fmt, va_list args); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/src/libjvm/libjvm.clangproj b/src/libjvm/libjvm.clangproj index 002fc7a938..2646f5ef9a 100644 --- a/src/libjvm/libjvm.clangproj +++ b/src/libjvm/libjvm.clangproj @@ -6,19 +6,42 @@ jvm + $(AdditionalCompileOptions);-Wno-dll-attribute-on-redeclaration - - - + + + + + + + + + + + + + + + + + + + + + + + + + From 6bbf64abcdefcf5e2520920c8e2f5044d570285d Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Mon, 26 Feb 2024 11:28:21 -0600 Subject: [PATCH 095/134] Convert to StringEnvironment. This doens't preserve the guaurentees that OpenJDK does. But we're getting the process from .NET, which ended that anyways. --- .../local/java/lang/UNIXProcessEnvironment.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/IKVM.Java/local/java/lang/UNIXProcessEnvironment.java b/src/IKVM.Java/local/java/lang/UNIXProcessEnvironment.java index e51dcaab90..fbe4f37ef2 100644 --- a/src/IKVM.Java/local/java/lang/UNIXProcessEnvironment.java +++ b/src/IKVM.Java/local/java/lang/UNIXProcessEnvironment.java @@ -52,6 +52,8 @@ * @since 1.5 */ + // IKVM Largely a copy of the UNIX version of ProcessEnvironment. Used currently to provide the toEnvironmentBlock method needed by JNI for UNIXProcess. + package java.lang; import java.io.*; @@ -294,8 +296,16 @@ public byte[] toEnvironmentBlock(int[]envc) { } static byte[] toEnvironmentBlock(Map map, int[]envc) { - return map == null ? null : - ((StringEnvironment)map).toEnvironmentBlock(envc); + if (map == null) { + return null; + } + + StringEnvironment env = new StringEnvironment(new HashMap(map.size())); + for (Map.Entry entry : map.entrySet()) { + env.put(entry.getKey(), entry.getValue()); + } + + return env.toEnvironmentBlock(envc); } From 9fdd4274a0fa85a7f23f68c30a34832c5c2a1c14 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Mon, 26 Feb 2024 15:34:12 -0600 Subject: [PATCH 096/134] Fork UNIXProcess and use only FORK on BSD/OSX. --- openjdk.props | 1 - .../local/java/lang/UNIXProcess.java | 829 ++++++++++++++++++ 2 files changed, 829 insertions(+), 1 deletion(-) create mode 100644 src/IKVM.Java/local/java/lang/UNIXProcess.java diff --git a/openjdk.props b/openjdk.props index 5d606918eb..81a4929efb 100644 --- a/openjdk.props +++ b/openjdk.props @@ -796,7 +796,6 @@ - diff --git a/src/IKVM.Java/local/java/lang/UNIXProcess.java b/src/IKVM.Java/local/java/lang/UNIXProcess.java new file mode 100644 index 0000000000..735cbdae91 --- /dev/null +++ b/src/IKVM.Java/local/java/lang/UNIXProcess.java @@ -0,0 +1,829 @@ +/* + * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package java.lang; + +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.ByteArrayInputStream; +import java.io.FileDescriptor; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.Arrays; +import java.util.EnumSet; +import java.util.Locale; +import java.util.Set; +import java.util.concurrent.Executors; +import java.util.concurrent.Executor; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.TimeUnit; +import java.security.AccessController; +import static java.security.AccessController.doPrivileged; +import java.security.PrivilegedAction; +import java.security.PrivilegedActionException; +import java.security.PrivilegedExceptionAction; + +/** + * java.lang.Process subclass in the UNIX environment. + * + * @author Mario Wolczko and Ross Knippel. + * @author Konstantin Kladko (ported to Linux and Bsd) + * @author Martin Buchholz + * @author Volker Simonis (ported to AIX) + */ +final class UNIXProcess extends Process { + private static final sun.misc.JavaIOFileDescriptorAccess fdAccess + = sun.misc.SharedSecrets.getJavaIOFileDescriptorAccess(); + + private final int pid; + private int exitcode; + private boolean hasExited; + + private /* final */ OutputStream stdin; + private /* final */ InputStream stdout; + private /* final */ InputStream stderr; + + // only used on Solaris + private /* final */ DeferredCloseInputStream stdout_inner_stream; + + private static enum LaunchMechanism { + // order IS important! + FORK, + POSIX_SPAWN, + VFORK + } + + private static enum Platform { + + LINUX(LaunchMechanism.VFORK, LaunchMechanism.FORK), + + BSD(LaunchMechanism.FORK), + + SOLARIS(LaunchMechanism.POSIX_SPAWN, LaunchMechanism.FORK), + + AIX(LaunchMechanism.POSIX_SPAWN, LaunchMechanism.FORK); + + final LaunchMechanism defaultLaunchMechanism; + final Set validLaunchMechanisms; + + Platform(LaunchMechanism ... launchMechanisms) { + this.defaultLaunchMechanism = launchMechanisms[0]; + this.validLaunchMechanisms = + EnumSet.copyOf(Arrays.asList(launchMechanisms)); + } + + private String helperPath(String javahome, String osArch) { + switch (this) { + case SOLARIS: + if (osArch.equals("x86")) { osArch = "i386"; } + else if (osArch.equals("x86_64")) { osArch = "amd64"; } + // fall through... + case LINUX: + case AIX: + return javahome + "/lib/" + osArch + "/jspawnhelper"; + + case BSD: + return javahome + "/lib/jspawnhelper"; + + default: + throw new AssertionError("Unsupported platform: " + this); + } + } + + String helperPath() { + return AccessController.doPrivileged( + (PrivilegedAction) () -> + helperPath(System.getProperty("java.home"), + System.getProperty("os.arch")) + ); + } + + LaunchMechanism launchMechanism() { + return AccessController.doPrivileged( + (PrivilegedAction) () -> { + String s = System.getProperty( + "jdk.lang.Process.launchMechanism"); + LaunchMechanism lm; + if (s == null) { + lm = defaultLaunchMechanism; + s = lm.name().toLowerCase(Locale.ENGLISH); + } else { + try { + lm = LaunchMechanism.valueOf( + s.toUpperCase(Locale.ENGLISH)); + } catch (IllegalArgumentException e) { + lm = null; + } + } + if (lm == null || !validLaunchMechanisms.contains(lm)) { + throw new Error( + s + " is not a supported " + + "process launch mechanism on this platform." + ); + } + return lm; + } + ); + } + + static Platform get() { + String osName = AccessController.doPrivileged( + (PrivilegedAction) () -> System.getProperty("os.name") + ); + + if (osName.equals("Linux")) { return LINUX; } + if (osName.contains("OS X")) { return BSD; } + if (osName.equals("SunOS")) { return SOLARIS; } + if (osName.equals("AIX")) { return AIX; } + + throw new Error(osName + " is not a supported OS platform."); + } + } + + private static final Platform platform = Platform.get(); + private static final LaunchMechanism launchMechanism = platform.launchMechanism(); + private static final byte[] helperpath = toCString(platform.helperPath()); + + private static byte[] toCString(String s) { + if (s == null) + return null; + byte[] bytes = s.getBytes(); + byte[] result = new byte[bytes.length + 1]; + System.arraycopy(bytes, 0, + result, 0, + bytes.length); + result[result.length-1] = (byte)0; + return result; + } + + /* this is for the reaping thread */ + private native int waitForProcessExit(int pid); + + /** + * Creates a process. Depending on the {@code mode} flag, this is done by + * one of the following mechanisms: + * 
+     *   1 - fork(2) and exec(2)
+     *   2 - posix_spawn(3P)
+     *   3 - vfork(2) and exec(2)
+     *
+     *  (4 - clone(2) and exec(2) - obsolete and currently disabled in native code)
+     *
+ * @param fds an array of three file descriptors. + * Indexes 0, 1, and 2 correspond to standard input, + * standard output and standard error, respectively. On + * input, a value of -1 means to create a pipe to connect + * child and parent processes. On output, a value which + * is not -1 is the parent pipe fd corresponding to the + * pipe which has been created. An element of this array + * is -1 on input if and only if it is not -1 on + * output. + * @return the pid of the subprocess + */ + private native int forkAndExec(int mode, byte[] helperpath, + byte[] prog, + byte[] argBlock, int argc, + byte[] envBlock, int envc, + byte[] dir, + int[] fds, + boolean redirectErrorStream) + throws IOException; + + /** + * The thread pool of "process reaper" daemon threads. + */ + private static final Executor processReaperExecutor = + doPrivileged((PrivilegedAction) () -> { + + ThreadGroup tg = Thread.currentThread().getThreadGroup(); + while (tg.getParent() != null) tg = tg.getParent(); + ThreadGroup systemThreadGroup = tg; + + ThreadFactory threadFactory = grimReaper -> { + long stackSize = Boolean.getBoolean("jdk.lang.processReaperUseDefaultStackSize") ? 0 : 32768; + Thread t = new Thread(systemThreadGroup, grimReaper,"process reaper", stackSize); + t.setDaemon(true); + // A small attempt (probably futile) to avoid priority inversion + t.setPriority(Thread.MAX_PRIORITY); + return t; + }; + + return Executors.newCachedThreadPool(threadFactory); + }); + + UNIXProcess(final byte[] prog, + final byte[] argBlock, final int argc, + final byte[] envBlock, final int envc, + final byte[] dir, + final int[] fds, + final boolean redirectErrorStream) + throws IOException { + + pid = forkAndExec(launchMechanism.ordinal() + 1, + helperpath, + prog, + argBlock, argc, + envBlock, envc, + dir, + fds, + redirectErrorStream); + + try { + doPrivileged((PrivilegedExceptionAction) () -> { + initStreams(fds); + return null; + }); + } catch (PrivilegedActionException ex) { + throw (IOException) ex.getException(); + } + } + + static FileDescriptor newFileDescriptor(int fd) { + FileDescriptor fileDescriptor = new FileDescriptor(); + fdAccess.set(fileDescriptor, fd); + return fileDescriptor; + } + + void initStreams(int[] fds) throws IOException { + switch (platform) { + case LINUX: + case BSD: + stdin = (fds[0] == -1) ? + ProcessBuilder.NullOutputStream.INSTANCE : + new ProcessPipeOutputStream(fds[0]); + + stdout = (fds[1] == -1) ? + ProcessBuilder.NullInputStream.INSTANCE : + new ProcessPipeInputStream(fds[1]); + + stderr = (fds[2] == -1) ? + ProcessBuilder.NullInputStream.INSTANCE : + new ProcessPipeInputStream(fds[2]); + + processReaperExecutor.execute(() -> { + int exitcode = waitForProcessExit(pid); + + synchronized (this) { + this.exitcode = exitcode; + this.hasExited = true; + this.notifyAll(); + } + + if (stdout instanceof ProcessPipeInputStream) + ((ProcessPipeInputStream) stdout).processExited(); + + if (stderr instanceof ProcessPipeInputStream) + ((ProcessPipeInputStream) stderr).processExited(); + + if (stdin instanceof ProcessPipeOutputStream) + ((ProcessPipeOutputStream) stdin).processExited(); + }); + break; + + case SOLARIS: + stdin = (fds[0] == -1) ? + ProcessBuilder.NullOutputStream.INSTANCE : + new BufferedOutputStream( + new FileOutputStream(newFileDescriptor(fds[0]))); + + stdout = (fds[1] == -1) ? + ProcessBuilder.NullInputStream.INSTANCE : + new BufferedInputStream( + stdout_inner_stream = + new DeferredCloseInputStream( + newFileDescriptor(fds[1]))); + + stderr = (fds[2] == -1) ? + ProcessBuilder.NullInputStream.INSTANCE : + new DeferredCloseInputStream(newFileDescriptor(fds[2])); + + /* + * For each subprocess forked a corresponding reaper task + * is submitted. That task is the only thread which waits + * for the subprocess to terminate and it doesn't hold any + * locks while doing so. This design allows waitFor() and + * exitStatus() to be safely executed in parallel (and they + * need no native code). + */ + processReaperExecutor.execute(() -> { + int exitcode = waitForProcessExit(pid); + + synchronized (this) { + this.exitcode = exitcode; + this.hasExited = true; + this.notifyAll(); + } + }); + break; + + case AIX: + stdin = (fds[0] == -1) ? + ProcessBuilder.NullOutputStream.INSTANCE : + new ProcessPipeOutputStream(fds[0]); + + stdout = (fds[1] == -1) ? + ProcessBuilder.NullInputStream.INSTANCE : + new DeferredCloseProcessPipeInputStream(fds[1]); + + stderr = (fds[2] == -1) ? + ProcessBuilder.NullInputStream.INSTANCE : + new DeferredCloseProcessPipeInputStream(fds[2]); + + processReaperExecutor.execute(() -> { + int exitcode = waitForProcessExit(pid); + + synchronized (this) { + this.exitcode = exitcode; + this.hasExited = true; + this.notifyAll(); + } + + if (stdout instanceof DeferredCloseProcessPipeInputStream) + ((DeferredCloseProcessPipeInputStream) stdout).processExited(); + + if (stderr instanceof DeferredCloseProcessPipeInputStream) + ((DeferredCloseProcessPipeInputStream) stderr).processExited(); + + if (stdin instanceof ProcessPipeOutputStream) + ((ProcessPipeOutputStream) stdin).processExited(); + }); + break; + + default: throw new AssertionError("Unsupported platform: " + platform); + } + } + + public OutputStream getOutputStream() { + return stdin; + } + + public InputStream getInputStream() { + return stdout; + } + + public InputStream getErrorStream() { + return stderr; + } + + public synchronized int waitFor() throws InterruptedException { + while (!hasExited) { + wait(); + } + return exitcode; + } + + @Override + public synchronized boolean waitFor(long timeout, TimeUnit unit) + throws InterruptedException + { + if (hasExited) return true; + if (timeout <= 0) return false; + + long remainingNanos = unit.toNanos(timeout); + long deadline = System.nanoTime() + remainingNanos; + + do { + // Round up to next millisecond + wait(TimeUnit.NANOSECONDS.toMillis(remainingNanos + 999_999L)); + if (hasExited) { + return true; + } + remainingNanos = deadline - System.nanoTime(); + } while (remainingNanos > 0); + return hasExited; + } + + public synchronized int exitValue() { + if (!hasExited) { + throw new IllegalThreadStateException("process hasn't exited"); + } + return exitcode; + } + + private static native void destroyProcess(int pid, boolean force); + + private void destroy(boolean force) { + switch (platform) { + case LINUX: + case BSD: + case AIX: + // There is a risk that pid will be recycled, causing us to + // kill the wrong process! So we only terminate processes + // that appear to still be running. Even with this check, + // there is an unavoidable race condition here, but the window + // is very small, and OSes try hard to not recycle pids too + // soon, so this is quite safe. + synchronized (this) { + if (!hasExited) + destroyProcess(pid, force); + } + try { stdin.close(); } catch (IOException ignored) {} + try { stdout.close(); } catch (IOException ignored) {} + try { stderr.close(); } catch (IOException ignored) {} + break; + + case SOLARIS: + // There is a risk that pid will be recycled, causing us to + // kill the wrong process! So we only terminate processes + // that appear to still be running. Even with this check, + // there is an unavoidable race condition here, but the window + // is very small, and OSes try hard to not recycle pids too + // soon, so this is quite safe. + synchronized (this) { + if (!hasExited) + destroyProcess(pid, force); + try { + stdin.close(); + if (stdout_inner_stream != null) + stdout_inner_stream.closeDeferred(stdout); + if (stderr instanceof DeferredCloseInputStream) + ((DeferredCloseInputStream) stderr) + .closeDeferred(stderr); + } catch (IOException e) { + // ignore + } + } + break; + + default: throw new AssertionError("Unsupported platform: " + platform); + } + } + + public void destroy() { + destroy(false); + } + + @Override + public Process destroyForcibly() { + destroy(true); + return this; + } + + @Override + public synchronized boolean isAlive() { + return !hasExited; + } + + private static native void init(); + + static { + init(); + } + + /** + * A buffered input stream for a subprocess pipe file descriptor + * that allows the underlying file descriptor to be reclaimed when + * the process exits, via the processExited hook. + * + * This is tricky because we do not want the user-level InputStream to be + * closed until the user invokes close(), and we need to continue to be + * able to read any buffered data lingering in the OS pipe buffer. + */ + private static class ProcessPipeInputStream extends BufferedInputStream { + private final Object closeLock = new Object(); + + ProcessPipeInputStream(int fd) { + super(new FileInputStream(newFileDescriptor(fd))); + } + private static byte[] drainInputStream(InputStream in) + throws IOException { + int n = 0; + int j; + byte[] a = null; + while ((j = in.available()) > 0) { + a = (a == null) ? new byte[j] : Arrays.copyOf(a, n + j); + n += in.read(a, n, j); + } + return (a == null || n == a.length) ? a : Arrays.copyOf(a, n); + } + + /** Called by the process reaper thread when the process exits. */ + synchronized void processExited() { + synchronized (closeLock) { + try { + InputStream in = this.in; + // this stream is closed if and only if: in == null + if (in != null) { + byte[] stragglers = drainInputStream(in); + in.close(); + this.in = (stragglers == null) ? + ProcessBuilder.NullInputStream.INSTANCE : + new ByteArrayInputStream(stragglers); + } + } catch (IOException ignored) {} + } + } + + @Override + public void close() throws IOException { + // BufferedInputStream#close() is not synchronized unlike most other + // methods. Synchronizing helps avoid race with processExited(). + synchronized (closeLock) { + super.close(); + } + } + } + + /** + * A buffered output stream for a subprocess pipe file descriptor + * that allows the underlying file descriptor to be reclaimed when + * the process exits, via the processExited hook. + */ + private static class ProcessPipeOutputStream extends BufferedOutputStream { + ProcessPipeOutputStream(int fd) { + super(new FileOutputStream(newFileDescriptor(fd))); + } + + /** Called by the process reaper thread when the process exits. */ + synchronized void processExited() { + OutputStream out = this.out; + if (out != null) { + try { + out.close(); + } catch (IOException ignored) { + // We know of no reason to get an IOException, but if + // we do, there's nothing else to do but carry on. + } + this.out = ProcessBuilder.NullOutputStream.INSTANCE; + } + } + } + + // A FileInputStream that supports the deferment of the actual close + // operation until the last pending I/O operation on the stream has + // finished. This is required on Solaris because we must close the stdin + // and stdout streams in the destroy method in order to reclaim the + // underlying file descriptors. Doing so, however, causes any thread + // currently blocked in a read on one of those streams to receive an + // IOException("Bad file number"), which is incompatible with historical + // behavior. By deferring the close we allow any pending reads to see -1 + // (EOF) as they did before. + // + private static class DeferredCloseInputStream extends FileInputStream + { + DeferredCloseInputStream(FileDescriptor fd) { + super(fd); + } + + private Object lock = new Object(); // For the following fields + private boolean closePending = false; + private int useCount = 0; + private InputStream streamToClose; + + private void raise() { + synchronized (lock) { + useCount++; + } + } + + private void lower() throws IOException { + synchronized (lock) { + useCount--; + if (useCount == 0 && closePending) { + streamToClose.close(); + } + } + } + + // stc is the actual stream to be closed; it might be this object, or + // it might be an upstream object for which this object is downstream. + // + private void closeDeferred(InputStream stc) throws IOException { + synchronized (lock) { + if (useCount == 0) { + stc.close(); + } else { + closePending = true; + streamToClose = stc; + } + } + } + + public void close() throws IOException { + synchronized (lock) { + useCount = 0; + closePending = false; + } + super.close(); + } + + public int read() throws IOException { + raise(); + try { + return super.read(); + } finally { + lower(); + } + } + + public int read(byte[] b) throws IOException { + raise(); + try { + return super.read(b); + } finally { + lower(); + } + } + + public int read(byte[] b, int off, int len) throws IOException { + raise(); + try { + return super.read(b, off, len); + } finally { + lower(); + } + } + + public long skip(long n) throws IOException { + raise(); + try { + return super.skip(n); + } finally { + lower(); + } + } + + public int available() throws IOException { + raise(); + try { + return super.available(); + } finally { + lower(); + } + } + } + + /** + * A buffered input stream for a subprocess pipe file descriptor + * that allows the underlying file descriptor to be reclaimed when + * the process exits, via the processExited hook. + * + * This is tricky because we do not want the user-level InputStream to be + * closed until the user invokes close(), and we need to continue to be + * able to read any buffered data lingering in the OS pipe buffer. + * + * On AIX this is especially tricky, because the 'close()' system call + * will block if another thread is at the same time blocked in a file + * operation (e.g. 'read()') on the same file descriptor. We therefore + * combine 'ProcessPipeInputStream' approach used on Linux and Bsd + * with the DeferredCloseInputStream approach used on Solaris. This means + * that every potentially blocking operation on the file descriptor + * increments a counter before it is executed and decrements it once it + * finishes. The 'close()' operation will only be executed if there are + * no pending operations. Otherwise it is deferred after the last pending + * operation has finished. + * + */ + private static class DeferredCloseProcessPipeInputStream + extends BufferedInputStream { + + private final Object closeLock = new Object(); + private int useCount = 0; + private boolean closePending = false; + + DeferredCloseProcessPipeInputStream(int fd) { + super(new FileInputStream(newFileDescriptor(fd))); + } + + private InputStream drainInputStream(InputStream in) + throws IOException { + int n = 0; + int j; + byte[] a = null; + synchronized (closeLock) { + if (buf == null) // asynchronous close()? + return null; // discard + j = in.available(); + } + while (j > 0) { + a = (a == null) ? new byte[j] : Arrays.copyOf(a, n + j); + synchronized (closeLock) { + if (buf == null) // asynchronous close()? + return null; // discard + n += in.read(a, n, j); + j = in.available(); + } + } + return (a == null) ? + ProcessBuilder.NullInputStream.INSTANCE : + new ByteArrayInputStream(n == a.length ? a : Arrays.copyOf(a, n)); + } + + /** Called by the process reaper thread when the process exits. */ + synchronized void processExited() { + try { + InputStream in = this.in; + if (in != null) { + InputStream stragglers = drainInputStream(in); + in.close(); + this.in = stragglers; + } + } catch (IOException ignored) { } + } + + private void raise() { + synchronized (closeLock) { + useCount++; + } + } + + private void lower() throws IOException { + synchronized (closeLock) { + useCount--; + if (useCount == 0 && closePending) { + closePending = false; + super.close(); + } + } + } + + @Override + public int read() throws IOException { + raise(); + try { + return super.read(); + } finally { + lower(); + } + } + + @Override + public int read(byte[] b) throws IOException { + raise(); + try { + return super.read(b); + } finally { + lower(); + } + } + + @Override + public int read(byte[] b, int off, int len) throws IOException { + raise(); + try { + return super.read(b, off, len); + } finally { + lower(); + } + } + + @Override + public long skip(long n) throws IOException { + raise(); + try { + return super.skip(n); + } finally { + lower(); + } + } + + @Override + public int available() throws IOException { + raise(); + try { + return super.available(); + } finally { + lower(); + } + } + + @Override + public void close() throws IOException { + // BufferedInputStream#close() is not synchronized unlike most other + // methods. Synchronizing helps avoid racing with drainInputStream(). + synchronized (closeLock) { + if (useCount == 0) { + super.close(); + } + else { + closePending = true; + } + } + } + } +} From 1869bf9496cda248c545a18c7dfd91b38f6274b1 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Mon, 26 Feb 2024 21:32:47 -0600 Subject: [PATCH 097/134] Set as executable. --- src/IKVM.Tests/Tools/XjcTests.cs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/IKVM.Tests/Tools/XjcTests.cs b/src/IKVM.Tests/Tools/XjcTests.cs index af53812cf4..ef144fccd8 100644 --- a/src/IKVM.Tests/Tools/XjcTests.cs +++ b/src/IKVM.Tests/Tools/XjcTests.cs @@ -21,6 +21,18 @@ public async Task CanDisplayHelp() { var s = new StringBuilder(); var c = Path.Combine(java.lang.System.getProperty("java.home"), "bin", "xjc"); +#if NETCOREAPP + if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) || RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) + { + var psx = Mono.Unix.UnixFileSystemInfo.GetFileSystemEntry(c); + var prm = psx.FileAccessPermissions; + prm |= Mono.Unix.FileAccessPermissions.UserExecute; + prm |= Mono.Unix.FileAccessPermissions.GroupExecute; + prm |= Mono.Unix.FileAccessPermissions.OtherExecute; + if (prm != psx.FileAccessPermissions) + psx.FileAccessPermissions = prm; + } +#endif var r = await Cli.Wrap(c).WithArguments("-help").WithStandardOutputPipe(PipeTarget.ToDelegate(i => s.Append(i))).WithValidation(CommandResultValidation.None).ExecuteAsync(); r.ExitCode.Should().Be(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? -1 : 255); s.ToString().Should().StartWith("Usage: xjc"); From 3408fff5fe8a79793c059a8fc9e2b82aa1ec5e44 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Tue, 27 Feb 2024 14:01:11 -0600 Subject: [PATCH 098/134] Was testing wrong path for trailing slash. --- .../local/sun/nio/fs/DotNetUnixUriUtils.java | 40 +++++++++++++++---- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/src/IKVM.Java/local/sun/nio/fs/DotNetUnixUriUtils.java b/src/IKVM.Java/local/sun/nio/fs/DotNetUnixUriUtils.java index 7b4c82543d..e05a86d9e4 100644 --- a/src/IKVM.Java/local/sun/nio/fs/DotNetUnixUriUtils.java +++ b/src/IKVM.Java/local/sun/nio/fs/DotNetUnixUriUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -69,6 +69,32 @@ static Path fromUri(DotNetFileSystem fs, URI uri) { // transform escaped octets and unescaped characters to bytes if (p.endsWith("/") && len > 1) len--; + byte[] result = new byte[len]; + int rlen = 0; + int pos = 0; + while (pos < len) { + char c = p.charAt(pos++); + byte b; + if (c == '%') { + assert (pos+2) <= len; + char c1 = p.charAt(pos++); + char c2 = p.charAt(pos++); + b = (byte)((decode(c1) << 4) | decode(c2)); + if (b == 0) + throw new IllegalArgumentException("Nul character not allowed"); + } else { + if (c == 0 || c >= 0x80) + throw new IllegalArgumentException("Bad escape"); + b = (byte)c; + } + if (b == '/' && rlen > 0 && result[rlen-1] == '/') { + // skip redundant slashes + continue; + } + result[rlen++] = b; + } + if (rlen != result.length) + result = Arrays.copyOf(result, rlen); return new DotNetPath(fs, p); } @@ -94,7 +120,7 @@ static URI toUri(DotNetPath up) { // trailing slash if directory if (sb.charAt(sb.length()-1) != '/') { try { - if (cli.System.IO.Directory.Exists(sb.toString()) || isVfsDirectory(sb.toString())) + if (cli.System.IO.Directory.Exists(up.toString()) || isVfsDirectory(up.toString())) sb.append('/'); } catch (Throwable x) { // ignore @@ -217,15 +243,15 @@ private static int decode(char c) { private static final long H_PCHAR = H_UNRESERVED | highMask(":@&=+$,"); - // All valid path characters - private static final long L_PATH = L_PCHAR | lowMask(";/"); - private static final long H_PATH = H_PCHAR | highMask(";/"); + // All valid path characters + private static final long L_PATH = L_PCHAR | lowMask(";/"); + private static final long H_PATH = H_PCHAR | highMask(";/"); - private final static char[] hexDigits = { + private final static char[] hexDigits = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' }; static native boolean isVfsDirectory(String path); -} \ No newline at end of file +} From 4370c66343ccfa943dca954b851b6c1e373898de Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Tue, 27 Feb 2024 14:01:59 -0600 Subject: [PATCH 099/134] Path with no trailing slash, but with existing directory, should have trailing slash added when converted to Uri. --- src/IKVM.Tests/Java/java/nio/file/PathTests.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/IKVM.Tests/Java/java/nio/file/PathTests.cs b/src/IKVM.Tests/Java/java/nio/file/PathTests.cs index 8d6c3a9f0f..4ddcecc75e 100644 --- a/src/IKVM.Tests/Java/java/nio/file/PathTests.cs +++ b/src/IKVM.Tests/Java/java/nio/file/PathTests.cs @@ -48,6 +48,15 @@ public void CanResolveUnixPaths(string path, string other, string expected) Paths.get(path).resolve(other).ToString().Should().Be(expected); } + [TestMethod] + public void ShouldAppendSlashToUriForExistingDirectory() + { + var t = System.IO.Path.GetTempPath().TrimEnd(System.IO.Path.DirectorySeparatorChar); + var p = Paths.get(t); + var u = p.toUri(); + u.ToString().Should().EndWith(System.IO.Path.DirectorySeparatorChar.ToString()); + } + } } From 397bc69fdff4a71a9c0c7cdd5969d666cd2e2bde Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Tue, 27 Feb 2024 14:02:29 -0600 Subject: [PATCH 100/134] Add test cases for URI. --- src/IKVM.Tests/Java/java/net/URITests.cs | 52 ++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 src/IKVM.Tests/Java/java/net/URITests.cs diff --git a/src/IKVM.Tests/Java/java/net/URITests.cs b/src/IKVM.Tests/Java/java/net/URITests.cs new file mode 100644 index 0000000000..32c455b65a --- /dev/null +++ b/src/IKVM.Tests/Java/java/net/URITests.cs @@ -0,0 +1,52 @@ +using FluentAssertions; + +using java.nio.file; + +using Microsoft.VisualStudio.TestTools.UnitTesting; + +namespace IKVM.Tests.Java.java.net +{ + + [TestClass] + public class URITests + { + + [TestMethod] + public void CanCreateHttpURI() + { + var u = new global::java.net.URI("http://www.site.com/"); + u.getScheme().Should().Be("http"); + u.getHost().Should().Be("www.site.com"); + u.getPath().Should().Be("/"); + } + + [TestMethod] + public void CanCreateHttpsURI() + { + var u = new global::java.net.URI("https://www.site.com/"); + u.getScheme().Should().Be("https"); + u.getHost().Should().Be("www.site.com"); + u.getPath().Should().Be("/"); + } + + [TestMethod] + public void CanCreateWindowsFileURI() + { + var u = new global::java.net.URI("file:///c:/dir"); + u.getScheme().Should().Be("file"); + u.getHost().Should().Be(null); + u.getPath().Should().Be("/c:/dir"); + } + + [TestMethod] + public void CanCreateUnixFileURI() + { + var u = new global::java.net.URI("file:///tmp/foo"); + u.getScheme().Should().Be("file"); + u.getHost().Should().Be(null); + u.getPath().Should().Be("/tmp/foo"); + } + + } + +} From 6f69bc113729ed248f66c7f6505a6060c05a5ae9 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Tue, 27 Feb 2024 14:09:53 -0600 Subject: [PATCH 101/134] Add alternative test --- src/IKVM.Tests/Java/java/nio/file/PathTests.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/IKVM.Tests/Java/java/nio/file/PathTests.cs b/src/IKVM.Tests/Java/java/nio/file/PathTests.cs index 4ddcecc75e..0a5f7ada97 100644 --- a/src/IKVM.Tests/Java/java/nio/file/PathTests.cs +++ b/src/IKVM.Tests/Java/java/nio/file/PathTests.cs @@ -57,6 +57,15 @@ public void ShouldAppendSlashToUriForExistingDirectory() u.ToString().Should().EndWith(System.IO.Path.DirectorySeparatorChar.ToString()); } + [TestMethod] + public void ShouldNotAppendSlashToUriForMissingDirectory() + { + var r = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? @"C:\missing" : @"/missing"; + var p = Paths.get(r); + var u = p.toUri(); + u.ToString().Should().NotEndWith(System.IO.Path.DirectorySeparatorChar.ToString()); + } + } } From e8c06de1f28b3b440ecbd8bfcf1b29c2d7d0a857 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Tue, 27 Feb 2024 14:19:41 -0600 Subject: [PATCH 102/134] Was using wrong variable again. --- .../local/sun/nio/fs/DotNetWindowsUriSupport.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/IKVM.Java/local/sun/nio/fs/DotNetWindowsUriSupport.java b/src/IKVM.Java/local/sun/nio/fs/DotNetWindowsUriSupport.java index fa37311593..554cb6a87e 100644 --- a/src/IKVM.Java/local/sun/nio/fs/DotNetWindowsUriSupport.java +++ b/src/IKVM.Java/local/sun/nio/fs/DotNetWindowsUriSupport.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -104,9 +104,9 @@ static URI toUri(DotNetPath path) { boolean addSlash = false; if (!s.endsWith("\\")) { try { - addSlash = cli.System.IO.Directory.Exists(s) || isVfsDirectory(s); + path.checkRead(); + addSlash = cli.System.IO.Directory.Exists(path) || isVfsDirectory(path); } catch (Throwable x) { - } } @@ -168,4 +168,4 @@ static DotNetPath fromUri(DotNetFileSystem fs, URI uri) { static native boolean isVfsDirectory(String path); -} \ No newline at end of file +} From 73a55b42501423f29561d2751268be9cb3453622 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Tue, 27 Feb 2024 16:21:32 -0600 Subject: [PATCH 103/134] Should always be forward. --- src/IKVM.Tests/Java/java/nio/file/PathTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/IKVM.Tests/Java/java/nio/file/PathTests.cs b/src/IKVM.Tests/Java/java/nio/file/PathTests.cs index 0a5f7ada97..ea2f149c26 100644 --- a/src/IKVM.Tests/Java/java/nio/file/PathTests.cs +++ b/src/IKVM.Tests/Java/java/nio/file/PathTests.cs @@ -54,7 +54,7 @@ public void ShouldAppendSlashToUriForExistingDirectory() var t = System.IO.Path.GetTempPath().TrimEnd(System.IO.Path.DirectorySeparatorChar); var p = Paths.get(t); var u = p.toUri(); - u.ToString().Should().EndWith(System.IO.Path.DirectorySeparatorChar.ToString()); + u.ToString().Should().EndWith("/"); } [TestMethod] @@ -63,7 +63,7 @@ public void ShouldNotAppendSlashToUriForMissingDirectory() var r = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? @"C:\missing" : @"/missing"; var p = Paths.get(r); var u = p.toUri(); - u.ToString().Should().NotEndWith(System.IO.Path.DirectorySeparatorChar.ToString()); + u.ToString().Should().NotEndWith("/"); } } From e9799f8d2f0dd16cc0a4278d35d34800c4ba3f4b Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Tue, 27 Feb 2024 16:28:58 -0600 Subject: [PATCH 104/134] ToString. --- src/IKVM.Java/local/sun/nio/fs/DotNetWindowsUriSupport.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/IKVM.Java/local/sun/nio/fs/DotNetWindowsUriSupport.java b/src/IKVM.Java/local/sun/nio/fs/DotNetWindowsUriSupport.java index 554cb6a87e..83d00c1e95 100644 --- a/src/IKVM.Java/local/sun/nio/fs/DotNetWindowsUriSupport.java +++ b/src/IKVM.Java/local/sun/nio/fs/DotNetWindowsUriSupport.java @@ -105,7 +105,7 @@ static URI toUri(DotNetPath path) { if (!s.endsWith("\\")) { try { path.checkRead(); - addSlash = cli.System.IO.Directory.Exists(path) || isVfsDirectory(path); + addSlash = cli.System.IO.Directory.Exists(path.toString()) || isVfsDirectory(path.toString()); } catch (Throwable x) { } } From 33c037c1ba139ef7ba96497a7af7e61b4f5c4748 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Tue, 27 Feb 2024 16:30:36 -0600 Subject: [PATCH 105/134] Already toStringing. --- src/IKVM.Java/local/sun/nio/fs/DotNetWindowsUriSupport.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/IKVM.Java/local/sun/nio/fs/DotNetWindowsUriSupport.java b/src/IKVM.Java/local/sun/nio/fs/DotNetWindowsUriSupport.java index 83d00c1e95..6b8dd46212 100644 --- a/src/IKVM.Java/local/sun/nio/fs/DotNetWindowsUriSupport.java +++ b/src/IKVM.Java/local/sun/nio/fs/DotNetWindowsUriSupport.java @@ -105,7 +105,7 @@ static URI toUri(DotNetPath path) { if (!s.endsWith("\\")) { try { path.checkRead(); - addSlash = cli.System.IO.Directory.Exists(path.toString()) || isVfsDirectory(path.toString()); + addSlash = cli.System.IO.Directory.Exists(s) || isVfsDirectory(s); } catch (Throwable x) { } } From c6568da4172e1ced5d46493a489d7d3977bf6e85 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Tue, 27 Feb 2024 18:24:03 -0600 Subject: [PATCH 106/134] no checkread. --- src/IKVM.Java/local/sun/nio/fs/DotNetWindowsUriSupport.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/IKVM.Java/local/sun/nio/fs/DotNetWindowsUriSupport.java b/src/IKVM.Java/local/sun/nio/fs/DotNetWindowsUriSupport.java index 6b8dd46212..7c98fd3f5f 100644 --- a/src/IKVM.Java/local/sun/nio/fs/DotNetWindowsUriSupport.java +++ b/src/IKVM.Java/local/sun/nio/fs/DotNetWindowsUriSupport.java @@ -104,7 +104,6 @@ static URI toUri(DotNetPath path) { boolean addSlash = false; if (!s.endsWith("\\")) { try { - path.checkRead(); addSlash = cli.System.IO.Directory.Exists(s) || isVfsDirectory(s); } catch (Throwable x) { } From f43d460db9164e198cc1e1551aa1ed8dc9e1feef Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Wed, 28 Feb 2024 10:17:05 -0600 Subject: [PATCH 107/134] Replace usage of FormatterServices.GetUninitializedObject on NET Core with RuntimeHelpers. Should remove dependency on System.Runtime.Serialization.Formatters? --- src/IKVM.MSBuild.Tasks/IkvmJsonParser.cs | 5 +++++ src/IKVM.Runtime/JNI/JNIEnv.cs | 8 +++++++- .../Java/Externs/sun/misc/Unsafe.cs | 4 ++++ .../Externs/sun/reflect/ReflectionFactory.cs | 20 ++++++++++++++----- .../RuntimeAssemblyClassLoader.cs | 7 +++++++ .../IkvmExporterContext.NetCore.cs | 7 +------ 6 files changed, 39 insertions(+), 12 deletions(-) diff --git a/src/IKVM.MSBuild.Tasks/IkvmJsonParser.cs b/src/IKVM.MSBuild.Tasks/IkvmJsonParser.cs index 5aba198027..238256265c 100644 --- a/src/IKVM.MSBuild.Tasks/IkvmJsonParser.cs +++ b/src/IKVM.MSBuild.Tasks/IkvmJsonParser.cs @@ -5,6 +5,7 @@ using System.Collections; using System.Collections.Generic; using System.Reflection; + using System.Runtime.CompilerServices; using System.Runtime.Serialization; using System.Text; @@ -321,7 +322,11 @@ static Dictionary CreateMemberNameDictionary(T[] members) where T static object ParseObject(Type type, string json) { +#if NETFRAMEWORK object instance = FormatterServices.GetUninitializedObject(type); +#else + object instance = RuntimeHelpers.GetUninitializedObject(type); +#endif //The list is split into key/value pairs only, this means the split must be divisible by 2 to be valid JSON List elems = Split(json); diff --git a/src/IKVM.Runtime/JNI/JNIEnv.cs b/src/IKVM.Runtime/JNI/JNIEnv.cs index 6d0963d143..265d629351 100644 --- a/src/IKVM.Runtime/JNI/JNIEnv.cs +++ b/src/IKVM.Runtime/JNI/JNIEnv.cs @@ -25,7 +25,9 @@ Jeroen Frijters using System.Collections.Generic; using System.Diagnostics; using System.Reflection; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; +using System.Runtime.Serialization; using IKVM.ByteCode.Text; @@ -739,7 +741,11 @@ static jobject AllocObjectImpl(JNIEnv* pEnv, RuntimeJavaType wrapper) return IntPtr.Zero; } wrapper.Finish(); - return pEnv->MakeLocalRef(System.Runtime.Serialization.FormatterServices.GetUninitializedObject(wrapper.TypeAsBaseType)); +#if NETFRAMEWORK + return pEnv->MakeLocalRef(FormatterServices.GetUninitializedObject(wrapper.TypeAsBaseType)); +#else + return pEnv->MakeLocalRef(RuntimeHelpers.GetUninitializedObject(wrapper.TypeAsBaseType)); +#endif } catch (RetargetableJavaException e) { diff --git a/src/IKVM.Runtime/Java/Externs/sun/misc/Unsafe.cs b/src/IKVM.Runtime/Java/Externs/sun/misc/Unsafe.cs index f62ef262f6..16202305f3 100644 --- a/src/IKVM.Runtime/Java/Externs/sun/misc/Unsafe.cs +++ b/src/IKVM.Runtime/Java/Externs/sun/misc/Unsafe.cs @@ -1704,7 +1704,11 @@ public static object allocateInstance(object self, global::java.lang.Class cls) throw x.ToJava(); } +#if NETFRAMEWORK return FormatterServices.GetUninitializedObject(wrapper.TypeAsBaseType); +#else + return RuntimeHelpers.GetUninitializedObject(wrapper.TypeAsBaseType); +#endif } /// diff --git a/src/IKVM.Runtime/Java/Externs/sun/reflect/ReflectionFactory.cs b/src/IKVM.Runtime/Java/Externs/sun/reflect/ReflectionFactory.cs index b27ab6d627..9c4a43cc86 100644 --- a/src/IKVM.Runtime/Java/Externs/sun/reflect/ReflectionFactory.cs +++ b/src/IKVM.Runtime/Java/Externs/sun/reflect/ReflectionFactory.cs @@ -25,6 +25,8 @@ Jeroen Frijters using System.Reflection; #if !NO_REF_EMIT using System.Reflection.Emit; +using System.Runtime.CompilerServices; + #endif using System.Runtime.Serialization; using System.Security; @@ -282,7 +284,11 @@ internal SerializationConstructorAccessorImpl(global::java.lang.reflect.Construc [SecuritySafeCritical] public object newInstance(object[] args) { +#if NETFRAMEWORK var obj = FormatterServices.GetUninitializedObject(type); +#else + var obj = RuntimeHelpers.GetUninitializedObject(type); +#endif if (mw != null) mw.Invoke(obj, ConvertArgs(mw.DeclaringType.GetClassLoader(), mw.GetParameters(), args)); @@ -966,13 +972,17 @@ public object newInstance(object[] args) } - private sealed class FastSerializationConstructorAccessorImpl : global::sun.reflect.ConstructorAccessor + sealed class FastSerializationConstructorAccessorImpl : global::sun.reflect.ConstructorAccessor { - private static readonly MethodInfo GetTypeFromHandleMethod = typeof(Type).GetMethod("GetTypeFromHandle", new Type[] { typeof(RuntimeTypeHandle) }); - private static readonly MethodInfo GetUninitializedObjectMethod = typeof(FormatterServices).GetMethod("GetUninitializedObject", new Type[] { typeof(Type) }); - private delegate object InvokeCtor(); - private InvokeCtor invoker; + static readonly MethodInfo GetTypeFromHandleMethod = typeof(Type).GetMethod(nameof(Type.GetTypeFromHandle), new[] { typeof(RuntimeTypeHandle) }); +#if NETFRAMEWORK + static readonly MethodInfo GetUninitializedObjectMethod = typeof(FormatterServices).GetMethod(nameof(FormatterServices.GetUninitializedObject), new[] { typeof(Type) }); +#else + static readonly MethodInfo GetUninitializedObjectMethod = typeof(RuntimeHelpers).GetMethod(nameof(RuntimeHelpers.GetUninitializedObject), new[] { typeof(Type) }); +#endif + delegate object InvokeCtor(); + InvokeCtor invoker; internal FastSerializationConstructorAccessorImpl(global::java.lang.reflect.Constructor constructorToCall, global::java.lang.Class classToInstantiate) { diff --git a/src/IKVM.Runtime/RuntimeAssemblyClassLoader.cs b/src/IKVM.Runtime/RuntimeAssemblyClassLoader.cs index c276613ef0..0fc236e1d0 100644 --- a/src/IKVM.Runtime/RuntimeAssemblyClassLoader.cs +++ b/src/IKVM.Runtime/RuntimeAssemblyClassLoader.cs @@ -31,6 +31,9 @@ Jeroen Frijters using IKVM.Attributes; using IKVM.Runtime.Syntax; +using System.Runtime.CompilerServices; + + #if IMPORTER || EXPORTER using IKVM.Reflection; @@ -1253,7 +1256,11 @@ void InitializeJavaClassLoader(JavaClassLoaderConstructionInProgress jclcip, Typ [System.Security.SecuritySafeCritical] static object GetUninitializedObject(Type type) { +#if NETFRAMEWORK return FormatterServices.GetUninitializedObject(type); +#else + return RuntimeHelpers.GetUninitializedObject(type); +#endif } static void LoadCustomClassLoaderRedirects(RuntimeContext context) diff --git a/src/IKVM.Tools.Exporter/IkvmExporterContext.NetCore.cs b/src/IKVM.Tools.Exporter/IkvmExporterContext.NetCore.cs index f263decfd8..2188bf4fd4 100644 --- a/src/IKVM.Tools.Exporter/IkvmExporterContext.NetCore.cs +++ b/src/IKVM.Tools.Exporter/IkvmExporterContext.NetCore.cs @@ -1,17 +1,12 @@ #if NETCOREAPP using System; -using System.IO; using System.Reflection; using System.Runtime.Loader; -using System.Runtime.Serialization.Formatters.Binary; +using System.Text.Json; using System.Threading; using System.Threading.Tasks; -using Microsoft.Extensions.DependencyModel.Resolution; - -using System.Text.Json; - namespace IKVM.Tools.Exporter { From d370a9bede7f7fa78f3c76a43e10b2ff8b34709c Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Thu, 29 Feb 2024 07:43:38 -0600 Subject: [PATCH 108/134] Socket multigroup join still broken on OSX. --- src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt index c5ff00ffea..b13b4846e9 100644 --- a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt +++ b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt @@ -3404,6 +3404,7 @@ java/net/PlainSocketImpl/SetBufferSize.java java/net/Socket/LinkLocal.java macosx-all java/net/Socket/SetSoLinger.java macosx-all java/net/Socket/TrafficClass.java macosx-all +java/net/SocketPermission/SocketPermissionTest.java macosx-all java/net/ipv6tests/TcpTest.java macosx-all java/net/ipv6tests/UdpTest.java macosx-all java/nio/MappedByteBuffer/Basic.java macosx-all From 798b0e7a8dff8ac0437b405517469378359c52e3 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Thu, 29 Feb 2024 08:39:58 -0600 Subject: [PATCH 109/134] Disable watch service tests on OS X for now. --- src/IKVM.Tests/Java/java/nio/file/WatchServiceTests.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/IKVM.Tests/Java/java/nio/file/WatchServiceTests.cs b/src/IKVM.Tests/Java/java/nio/file/WatchServiceTests.cs index f4e406085b..231705ed71 100644 --- a/src/IKVM.Tests/Java/java/nio/file/WatchServiceTests.cs +++ b/src/IKVM.Tests/Java/java/nio/file/WatchServiceTests.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; @@ -24,6 +25,10 @@ public class WatchServiceTests [TestMethod] public void CanWatchDirectoryForBasicOperations() { + // though it works on OS X, events come out in a bit of an incorrect order, and we aren't going to fix this today + if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) + return; + var cts = new CancellationTokenSource(); using var watcher = FileSystems.getDefault().newWatchService(); From 6f95ff11a79e91ce561b3fc570b0452c959167cc Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Thu, 29 Feb 2024 11:35:51 -0600 Subject: [PATCH 110/134] Throws OOM on test host. Unsure why exactly. Might be a real bug. --- src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt index b13b4846e9..4048399a9e 100644 --- a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt +++ b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt @@ -3451,6 +3451,7 @@ sun/security/krb5/auto/principalProperty/PrincipalSystemPropTest.java sun/security/krb5/auto/BogusKDC.java macosx-all sun/security/krb5/auto/KrbTicket.java macosx-all sun/security/krb5/auto/UnboundSSL.java macosx-all +sun/nio/ch/TestMaxCachedBufferSize.java macosx-all # Windows-PRNG SecureRandom java/security/SecureRandom/DefaultProvider.java generic-all From 7884fc79fbc72cdd7a06770c6cf2eeb6324c2dcc Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Fri, 1 Mar 2024 11:52:42 -0600 Subject: [PATCH 111/134] Set dump type. --- .github/workflows/IKVM.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/IKVM.yml b/.github/workflows/IKVM.yml index 9136d97d29..a55902671c 100644 --- a/.github/workflows/IKVM.yml +++ b/.github/workflows/IKVM.yml @@ -637,6 +637,7 @@ jobs: "--blame-crash", "--blame-hang", "--blame-hang-timeout", "120m", + "--blame-hang-dump-type", "full", "-v:diag", "--results-directory", "TestResults", "--logger:console;verbosity=diag", From 0d538985e430802803b98ab3547827053680b337 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Fri, 1 Mar 2024 11:53:20 -0600 Subject: [PATCH 112/134] Decreate hang timeout. Increase job timeout. --- .github/workflows/IKVM.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/IKVM.yml b/.github/workflows/IKVM.yml index a55902671c..5bbf2d8090 100644 --- a/.github/workflows/IKVM.yml +++ b/.github/workflows/IKVM.yml @@ -611,7 +611,7 @@ jobs: run: ri tests--${{ steps.test-name.outputs.result }}.tar.gz working-directory: ${{ env.WORKPATH }} - name: Execute Tests - timeout-minutes: 120 + timeout-minutes: 240 shell: pwsh run: | # assign powershell variables @@ -636,7 +636,7 @@ jobs: "--blame", "--blame-crash", "--blame-hang", - "--blame-hang-timeout", "120m", + "--blame-hang-timeout", "60m", "--blame-hang-dump-type", "full", "-v:diag", "--results-directory", "TestResults", From 25f4a13b32007ab652ac2a1807d9aafc252772d3 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Fri, 1 Mar 2024 12:18:33 -0600 Subject: [PATCH 113/134] Add detailed test output. --- .github/workflows/IKVM.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/IKVM.yml b/.github/workflows/IKVM.yml index 5bbf2d8090..35fc9afe13 100644 --- a/.github/workflows/IKVM.yml +++ b/.github/workflows/IKVM.yml @@ -640,7 +640,7 @@ jobs: "--blame-hang-dump-type", "full", "-v:diag", "--results-directory", "TestResults", - "--logger:console;verbosity=diag", + "--logger:console;verbosity=detailed", "--logger:trx" # "--collect", "Code Coverage" ) From 33a64a46265b6d457c997e14dba8889013478f4f Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Fri, 1 Mar 2024 19:30:21 -0600 Subject: [PATCH 114/134] Reverting this guy because it may or may not contribute to something. --- .../java/net/PlainDatagramSocketImpl.cs | 40 +++++++++---------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/src/IKVM.Runtime/Java/Externs/java/net/PlainDatagramSocketImpl.cs b/src/IKVM.Runtime/Java/Externs/java/net/PlainDatagramSocketImpl.cs index 3ace135df9..32f9236bb8 100644 --- a/src/IKVM.Runtime/Java/Externs/java/net/PlainDatagramSocketImpl.cs +++ b/src/IKVM.Runtime/Java/Externs/java/net/PlainDatagramSocketImpl.cs @@ -543,37 +543,33 @@ public static int peek(object this_, object address_) /// static void PurgeOutstandingICMP(Socket socket) { - // check for outstanding packet - while (socket.Poll(0, SelectMode.SelectRead)) + while (true) { - var ep = (EndPoint)new IPEndPoint(IPAddress.IPv6Any, 0); + // check for outstanding packet + if (socket.Poll(0, SelectMode.SelectRead) == false) + break; - // Peek for real data try { + var ep = (EndPoint)new IPEndPoint(IPAddress.IPv6Any, 0); socket.EndReceiveFrom(socket.BeginReceiveFrom(TempBuffer, 0, TempBuffer.Length, SocketFlags.Peek, ref ep, null, null), ref ep); - // read data successfully, escape - return; - } - catch - { - // Swallow everything on Peek - } - - // Consume packet - try - { - socket.EndReceiveFrom(socket.BeginReceiveFrom(TempBuffer, 0, TempBuffer.Length, SocketFlags.None, ref ep, null, null), ref ep); } catch (SocketException e) when (e.SocketErrorCode == SocketError.ConnectionReset) { - // Continue on receiving ConnectionReset - } - catch - { - // Exception is anything different than ConnectionReset, finished - return; + try + { + var ep = (EndPoint)new IPEndPoint(IPAddress.IPv6Any, 0); + socket.EndReceiveFrom(socket.BeginReceiveFrom(TempBuffer, 0, TempBuffer.Length, SocketFlags.Peek, ref ep, null, null), ref ep); + } + catch (SocketException e2) when (e2.SocketErrorCode == SocketError.ConnectionReset) + { + + } + + continue; } + + break; } } From f414db2b30d1e212a01aaaefcc7ba8eb7e2b7be5 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Sat, 2 Mar 2024 08:58:24 -0600 Subject: [PATCH 115/134] Fix times. Throw exceptions on socket failure so maybe we can uncover an issue. --- .github/workflows/IKVM.yml | 2 +- .../Java/java/net/ServerSocketTests.cs | 24 ++++--------------- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/.github/workflows/IKVM.yml b/.github/workflows/IKVM.yml index 35fc9afe13..95a17ab109 100644 --- a/.github/workflows/IKVM.yml +++ b/.github/workflows/IKVM.yml @@ -611,7 +611,7 @@ jobs: run: ri tests--${{ steps.test-name.outputs.result }}.tar.gz working-directory: ${{ env.WORKPATH }} - name: Execute Tests - timeout-minutes: 240 + timeout-minutes: 120 shell: pwsh run: | # assign powershell variables diff --git a/src/IKVM.Tests/Java/java/net/ServerSocketTests.cs b/src/IKVM.Tests/Java/java/net/ServerSocketTests.cs index ad0d53cb9f..45763d720a 100644 --- a/src/IKVM.Tests/Java/java/net/ServerSocketTests.cs +++ b/src/IKVM.Tests/Java/java/net/ServerSocketTests.cs @@ -47,17 +47,10 @@ public EchoSocketServer(int port) /// public void Start() { - try - { - serverSocket = new ServerSocket(port); - port = serverSocket.getLocalPort(); - serverSocket.setSoTimeout(15000); - base.start(); - } - catch (IOException e) - { - e.printStackTrace(); - } + serverSocket = new ServerSocket(port); + port = serverSocket.getLocalPort(); + serverSocket.setSoTimeout(15000); + base.start(); } public void Stop() @@ -74,14 +67,7 @@ public override void run() while (running) { - try - { - new ClientHandler(serverSocket.accept()).start(); - } - catch (IOException e) - { - e.printStackTrace(); - } + new ClientHandler(serverSocket.accept()).start(); } } finally From a7891ba3ef9cc2d60c63a518986cd54dcb543e1e Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Sun, 3 Mar 2024 14:52:57 -0600 Subject: [PATCH 116/134] Upgrade CliWrap to try to fix a deadlock. Wasn't really the issue, sorta. The problem is not disposing of Process near the end of the program. GC doesn't do it. It locks up. --- .../IKVM.Java.Tests.Util.csproj | 2 +- .../IKVM.MSBuild.Tasks.csproj | 2 +- src/IKVM.Tests.Util/DotNetSdkResolver.cs | 42 +++++++++++-------- src/IKVM.Tests.Util/DotNetSdkUtil.cs | 15 ++++--- src/IKVM.Tests.Util/IKVM.Tests.Util.csproj | 3 +- .../ikvm/runtime/AssemblyClassLoaderTests.cs | 13 +++--- .../nio/channels/ServerSocketChannelTests.cs | 6 ++- .../IKVM.Tools.Runner.csproj | 2 +- .../Importer/IkvmImporterLauncher.cs | 2 +- 9 files changed, 50 insertions(+), 37 deletions(-) diff --git a/src/IKVM.Java.Tests.Util/IKVM.Java.Tests.Util.csproj b/src/IKVM.Java.Tests.Util/IKVM.Java.Tests.Util.csproj index 1b6ae8895c..6f6ea7e202 100644 --- a/src/IKVM.Java.Tests.Util/IKVM.Java.Tests.Util.csproj +++ b/src/IKVM.Java.Tests.Util/IKVM.Java.Tests.Util.csproj @@ -4,7 +4,7 @@ - + diff --git a/src/IKVM.MSBuild.Tasks/IKVM.MSBuild.Tasks.csproj b/src/IKVM.MSBuild.Tasks/IKVM.MSBuild.Tasks.csproj index af84027354..b11eec0712 100644 --- a/src/IKVM.MSBuild.Tasks/IKVM.MSBuild.Tasks.csproj +++ b/src/IKVM.MSBuild.Tasks/IKVM.MSBuild.Tasks.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/IKVM.Tests.Util/DotNetSdkResolver.cs b/src/IKVM.Tests.Util/DotNetSdkResolver.cs index 8734762113..0538123f6d 100644 --- a/src/IKVM.Tests.Util/DotNetSdkResolver.cs +++ b/src/IKVM.Tests.Util/DotNetSdkResolver.cs @@ -1,10 +1,8 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.IO; using System.Linq; -using System.Threading; - -using CliWrap; namespace IKVM.Tests.Util { @@ -34,12 +32,12 @@ public static string ResolvePath(string dotnetExePath) /// /// /// - static List GetInfo(string dotnetExePath) + static IList GetInfo(string dotnetExePath) { // Ensure that we set the DOTNET_CLI_UI_LANGUAGE environment variable to "en-US" before // running 'dotnet --info'. Otherwise, we may get localized results // Also unset some MSBuild variables, see https://github.com/OmniSharp/omnisharp-roslyn/blob/df160f86ce906bc566fe3e04e38a4077bd6023b4/src/OmniSharp.Abstractions/Services/DotNetCliService.cs#L36 - var environmentVariables = new Dictionary + var envv = new Dictionary { ["DOTNET_CLI_UI_LANGUAGE"] = "en-US", ["MSBUILD_EXE_PATH"] = null, @@ -47,15 +45,23 @@ static List GetInfo(string dotnetExePath) ["MSBuildExtensionsPath"] = null, }; - var lines = new List(); - var task = (Cli.Wrap(dotnetExePath) - .WithArguments("--info") - .WithEnvironmentVariables(environmentVariables) - | lines.Add) - .ExecuteAsync(new CancellationTokenSource(10000).Token); - task.GetAwaiter().GetResult(); - - return lines; + // execute dotnet --info, capture output as binary, without stream reader, to prevent deadlocks + var psi = new ProcessStartInfo(dotnetExePath); + psi.Arguments = "--info"; + psi.CreateNoWindow = true; + psi.UseShellExecute = false; + psi.RedirectStandardOutput = true; + + // start process and append output lines to buffer + using var prc = new Process(); + var buf = new List(); + prc.StartInfo = psi; + prc.EnableRaisingEvents = true; + prc.OutputDataReceived += (s, a) => buf.Add(a.Data); + prc.Start(); + prc.BeginOutputReadLine(); + prc.WaitForExit(2000); + return buf; } /// @@ -63,7 +69,7 @@ static List GetInfo(string dotnetExePath) /// /// /// - static string ParseBasePath(List lines) + static string ParseBasePath(IList lines) { foreach (var line in lines.Where(x => x != null)) { @@ -74,13 +80,13 @@ static string ParseBasePath(List lines) // Make sure the base path matches the runtime architecture if on Windows // Note that this only works for the default installation locations under "Program Files" - if (basePath.Contains(@"\Program Files\") && !System.Environment.Is64BitProcess) + if (basePath.Contains(@"\Program Files\") && Environment.Is64BitProcess == false) { var newBasePath = basePath.Replace(@"\Program Files\", @"\Program Files (x86)\"); if (Directory.Exists(newBasePath)) basePath = newBasePath; } - else if (basePath.Contains(@"\Program Files (x86)\") && System.Environment.Is64BitProcess) + else if (basePath.Contains(@"\Program Files (x86)\") && Environment.Is64BitProcess) { var newBasePath = basePath.Replace(@"\Program Files (x86)\", @"\Program Files\"); if (Directory.Exists(newBasePath)) @@ -100,7 +106,7 @@ static string ParseBasePath(List lines) /// /// /// - static string ParseInstalledSdksPath(List lines) + static string ParseInstalledSdksPath(IList lines) { var index = lines.IndexOf(".NET SDKs installed:"); if (index == -1) diff --git a/src/IKVM.Tests.Util/DotNetSdkUtil.cs b/src/IKVM.Tests.Util/DotNetSdkUtil.cs index b0a49b1347..8185291cb3 100644 --- a/src/IKVM.Tests.Util/DotNetSdkUtil.cs +++ b/src/IKVM.Tests.Util/DotNetSdkUtil.cs @@ -7,8 +7,11 @@ using Microsoft.Build.Utilities; +using Semver; + namespace IKVM.Tests.Util { + public static class DotNetSdkUtil { @@ -79,8 +82,8 @@ public static IList GetPathToReferenceAssemblies(string tfm, string targ static IList GetCorePathToReferenceAssemblies(string tfm, string targetFrameworkVersion) { // parse requested version - if (Version.TryParse(targetFrameworkVersion, out var targetVer) == false) - throw new InvalidOperationException(); + if (SemVersion.TryParse(targetFrameworkVersion, SemVersionStyles.Any, out var targetVer) == false) + throw new InvalidOperationException(targetFrameworkVersion); // back up to pack directory and get list of ref packs var sdkBase = DotNetSdkResolver.ResolvePath(null) ?? throw new InvalidOperationException(); @@ -88,14 +91,14 @@ static IList GetCorePathToReferenceAssemblies(string tfm, string targetF var sdkVers = Directory.EnumerateDirectories(packDir).Select(Path.GetFileName); // identify maximum matching version - var thisVer = new Version(0, 0); + var thisVer = default(SemVersion); foreach (var ver in sdkVers) - if (Version.TryParse(ver, out var v)) - if (v > thisVer && v.Major == targetVer.Major && v.Minor == targetVer.Minor) + if (SemVersion.TryParse(ver, SemVersionStyles.Any, out var v)) + if (v.IsPrerelease == false && v.Major == targetVer.Major && v.Minor == targetVer.Minor && v.ComparePrecedenceTo(thisVer) == 1) thisVer = v; // no higher version found - if (thisVer == new Version(0, 0)) + if (thisVer == null) return null; // check for TFM refs directory diff --git a/src/IKVM.Tests.Util/IKVM.Tests.Util.csproj b/src/IKVM.Tests.Util/IKVM.Tests.Util.csproj index 604868a84d..2ae09a5af3 100644 --- a/src/IKVM.Tests.Util/IKVM.Tests.Util.csproj +++ b/src/IKVM.Tests.Util/IKVM.Tests.Util.csproj @@ -4,8 +4,9 @@ - + + diff --git a/src/IKVM.Tests/Java/ikvm/runtime/AssemblyClassLoaderTests.cs b/src/IKVM.Tests/Java/ikvm/runtime/AssemblyClassLoaderTests.cs index 769996e9a6..f092e2e5e0 100644 --- a/src/IKVM.Tests/Java/ikvm/runtime/AssemblyClassLoaderTests.cs +++ b/src/IKVM.Tests/Java/ikvm/runtime/AssemblyClassLoaderTests.cs @@ -8,7 +8,6 @@ using FluentAssertions; -using IKVM.Runtime.Extensions; using IKVM.Tests.Util; using IKVM.Tools.Runner; using IKVM.Tools.Runner.Importer; @@ -28,12 +27,8 @@ public class AssemblyClassLoaderTests public TestContext TestContext { get; set; } - /// - /// Initializes the test DLL. - /// - /// [TestInitialize] - public async Task Setup() + public async Task TestInitialize() { #if NET7_0 var ikvmTool = "net6.0"; @@ -86,6 +81,12 @@ public async Task Setup() helloworldDll = Assembly.LoadFrom(p); } + [TestCleanup] + public void TestCleanup() + { + helloworldDll = null; + } + [TestMethod] public void CanGetPackage() { diff --git a/src/IKVM.Tests/Java/java/nio/channels/ServerSocketChannelTests.cs b/src/IKVM.Tests/Java/java/nio/channels/ServerSocketChannelTests.cs index 4c0df169b0..3567b7c790 100644 --- a/src/IKVM.Tests/Java/java/nio/channels/ServerSocketChannelTests.cs +++ b/src/IKVM.Tests/Java/java/nio/channels/ServerSocketChannelTests.cs @@ -120,15 +120,17 @@ public async Task CanReceiveNonBlocking() { var cancellationTokenSource = new CancellationTokenSource(); var receive = ByteBuffer.allocate(sizeof(int) * 4); + int port = 0; // server receives messages until cancelled var serverTask = Task.Run(() => { // initialize server using var server = ServerSocketChannel.open(); - var serverAddr = new InetSocketAddress(42342); + var serverAddr = new InetSocketAddress(port); server.bind(serverAddr); server.configureBlocking(false); + port = server.socket().getLocalPort(); // begin selector var selector = Selector.open(); @@ -171,7 +173,7 @@ public async Task CanReceiveNonBlocking() // wait a second and write some messages to the server await Task.Delay(1000); - using (var c = SocketChannel.open(new InetSocketAddress("127.0.0.1", 42342))) + using (var c = SocketChannel.open(new InetSocketAddress("127.0.0.1", port))) { foreach (var i in new[] { 1, 2, 3, 4 }) { diff --git a/src/IKVM.Tools.Runner/IKVM.Tools.Runner.csproj b/src/IKVM.Tools.Runner/IKVM.Tools.Runner.csproj index 0766910bc6..d3e2b6ee24 100644 --- a/src/IKVM.Tools.Runner/IKVM.Tools.Runner.csproj +++ b/src/IKVM.Tools.Runner/IKVM.Tools.Runner.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/IKVM.Tools.Runner/Importer/IkvmImporterLauncher.cs b/src/IKVM.Tools.Runner/Importer/IkvmImporterLauncher.cs index 986832adfd..6875de1988 100644 --- a/src/IKVM.Tools.Runner/Importer/IkvmImporterLauncher.cs +++ b/src/IKVM.Tools.Runner/Importer/IkvmImporterLauncher.cs @@ -305,7 +305,7 @@ public async Task ExecuteAsync(IkvmImporterOptions options, CancellationTok ctk = CancellationTokenSource.CreateLinkedTokenSource(ctk, new CancellationTokenSource(options.Timeout).Token).Token; // execute command - var pid = cli.ExecuteAsync(ctk); + using var pid = cli.ExecuteAsync(ctk); // windows provides special support for killing subprocesses on termination of parent if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) From d49c04381831153163a03edda8f9a6fcfc2e17d8 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Fri, 8 Mar 2024 17:48:38 -0600 Subject: [PATCH 117/134] UNIXProcess.init was overriding .NETs SIGCHLD handler, resulting .NET being unable to track processes. OpenJDK just wipes out the existing hander. Very rude. To prevent this, we intercept UNIXProcess.init and save the handler before calling init, then restore it after, effectively nullifying it. This works because UNIXProcess doesn't seem to rely on SIGCHLD anyways: it just sets it to DFL. Few new functions on libikvm for getting the sigaction struct size, getting SIGCHLD and setting SIGCHLD. --- .../Java/Externs/java/lang/UNIXProcess.cs | 78 +++++++++++++++++++ .../java/lang/UNIXProcessEnvironment.cs | 5 +- src/IKVM.Runtime/LibIkvm.cs | 43 ++++++++++ src/libikvm/sig.c | 29 +++++++ 4 files changed, 153 insertions(+), 2 deletions(-) create mode 100644 src/IKVM.Runtime/Java/Externs/java/lang/UNIXProcess.cs create mode 100644 src/libikvm/sig.c diff --git a/src/IKVM.Runtime/Java/Externs/java/lang/UNIXProcess.cs b/src/IKVM.Runtime/Java/Externs/java/lang/UNIXProcess.cs new file mode 100644 index 0000000000..725f3285d8 --- /dev/null +++ b/src/IKVM.Runtime/Java/Externs/java/lang/UNIXProcess.cs @@ -0,0 +1,78 @@ +using System; +using System.Diagnostics; +using System.Runtime.InteropServices; + +using IKVM.Runtime; +using IKVM.Runtime.JNI; + +namespace IKVM.Java.Externs.java.lang +{ + + static class UNIXProcess + { + +#if FIRST_PASS == false + + static global::ikvm.@internal.CallerID __callerID; + delegate void __jniDelegate__init(IntPtr jniEnv, IntPtr clazz); + static __jniDelegate__init __jniPtr__init; + +#endif + + /// + /// Implements the native method 'init'. + /// + /// + /// We save and load the old SIGCHLD handler between calls to prevent Java from overwriting the .NET handler. This isn't thread safe but should suffice since it's limited to static initialization. + /// + /// + public static unsafe void init() + { +#if FIRST_PASS + throw new NotImplementedException(); +#else + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + return; + + // get size of sigaction structure and allocate space + var size = LibIkvm.Instance.sig_get_size_sigaction(); + Debug.Assert(size > 0); + var save = stackalloc byte[size]; + + // save old SIGCHLD structure + if (LibIkvm.Instance.sig_get_chld_action(save) != 0) + throw new InternalException("Could not save SIGCHLD handler."); + + try + { + __callerID ??= global::ikvm.@internal.CallerID.create(typeof(global::java.lang.UNIXProcess).TypeHandle); + __jniPtr__init ??= Marshal.GetDelegateForFunctionPointer<__jniDelegate__init>(JNIFrame.GetFuncPtr(__callerID, "java/lang/UNIXProcess", nameof(init), "()V")); + var jniFrm = new JNIFrame(); + var jniEnv = jniFrm.Enter(__callerID); + try + { + __jniPtr__init(jniEnv, jniFrm.MakeLocalRef(ClassLiteral.Value)); + } + catch (Exception ex) + { + global::System.Console.WriteLine("*** exception in native code ***"); + global::System.Console.WriteLine(ex); + throw; + } + finally + { + jniFrm.Leave(); + } + } + finally + { + // restore old SIGCHLD structure + if (LibIkvm.Instance.sig_set_chld_action(save) != 0) + throw new InternalException("Could not restore SIGCHLD handler."); + } +#endif + } + + } + +} diff --git a/src/IKVM.Runtime/Java/Externs/java/lang/UNIXProcessEnvironment.cs b/src/IKVM.Runtime/Java/Externs/java/lang/UNIXProcessEnvironment.cs index 0109d4653a..8ff1cdad6b 100644 --- a/src/IKVM.Runtime/Java/Externs/java/lang/UNIXProcessEnvironment.cs +++ b/src/IKVM.Runtime/Java/Externs/java/lang/UNIXProcessEnvironment.cs @@ -1,6 +1,7 @@ using System; using System.Runtime.InteropServices; +using IKVM.Runtime; using IKVM.Runtime.JNI; namespace IKVM.Java.Externs.java.lang @@ -12,7 +13,7 @@ static class UNIXProcessEnvironment #if FIRST_PASS == false static global::ikvm.@internal.CallerID __callerID; - delegate IntPtr __jniDelegate__environ(IntPtr jniEnv); + delegate IntPtr __jniDelegate__environ(IntPtr jniEnv, IntPtr clazz); static __jniDelegate__environ __jniPtr__environ; #endif @@ -32,7 +33,7 @@ public static object environ() var jniEnv = jniFrm.Enter(__callerID); try { - return jniFrm.UnwrapLocalRef(__jniPtr__environ(jniEnv)); + return jniFrm.UnwrapLocalRef(__jniPtr__environ(jniEnv, jniFrm.MakeLocalRef(ClassLiteral.Value))); } catch (Exception ex) { diff --git a/src/IKVM.Runtime/LibIkvm.cs b/src/IKVM.Runtime/LibIkvm.cs index c04c2c6c52..2c75606b22 100644 --- a/src/IKVM.Runtime/LibIkvm.cs +++ b/src/IKVM.Runtime/LibIkvm.cs @@ -103,6 +103,29 @@ static class Externs [DllImport("ikvm", SetLastError = false)] internal static extern int IKVM_io_lstat(string pathname, out long st_ino, out long st_dev); + /// + /// Invokes the native 'IKVM_sig_get_size_sigaction' function. + /// + /// + [DllImport("ikvm", SetLastError = false)] + internal static unsafe extern int IKVM_sig_get_size_sigaction(); + + /// + /// Invokes the native 'IKVM_sig_get_chld_action' function. + /// + /// + /// + [DllImport("ikvm", SetLastError = false)] + internal static unsafe extern int IKVM_sig_get_chld_action(void* sig); + + /// + /// Invokes the native 'IKVM_sig_set_chld_action' function. + /// + /// + /// + [DllImport("ikvm", SetLastError = false)] + internal static unsafe extern int IKVM_sig_set_chld_action(void* sig); + } /// @@ -289,6 +312,26 @@ static nint Load() /// public int io_lstat(string pathname, out long st_ino, out long st_dev) => Externs.IKVM_io_lstat(pathname, out st_ino, out st_dev); + /// + /// Invokes the 'sig_get_size_sigaction' function. + /// + /// + public unsafe int sig_get_size_sigaction() => Externs.IKVM_sig_get_size_sigaction(); + + /// + /// Invokes the 'sig_get_chld_action' function. + /// + /// + /// + public unsafe int sig_get_chld_action(void* sig) => Externs.IKVM_sig_get_chld_action(sig); + + /// + /// Invokes the 'sig_set_chld_action' function. + /// + /// + /// + public unsafe int sig_set_chld_action(void* sig) => Externs.IKVM_sig_set_chld_action(sig); + /// /// Releases the instance. /// diff --git a/src/libikvm/sig.c b/src/libikvm/sig.c new file mode 100644 index 0000000000..e17b8b4775 --- /dev/null +++ b/src/libikvm/sig.c @@ -0,0 +1,29 @@ +#ifdef WIN32 +#define NETEXPORT __declspec(dllexport) +#define NETCALL __stdcall +#else +#define NETEXPORT +#define NETCALL +#endif + +#if defined LINUX | MACOSX +#include +#include +#include + +NETEXPORT int NETCALL IKVM_sig_get_size_sigaction() +{ + return sizeof(struct sigaction); +} + +NETEXPORT int NETCALL IKVM_sig_get_chld_action(struct sigaction* sig) +{ + return sigaction(SIGCHLD, NULL, sig); +} + +NETEXPORT int NETCALL IKVM_sig_set_chld_action(struct sigaction* sig) +{ + return sigaction(SIGCHLD, sig, NULL); +} + +#endif From 129e25c8174337ae521491c7214b531b3db31088 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Fri, 8 Mar 2024 17:48:54 -0600 Subject: [PATCH 118/134] Set all execute permissions. --- src/IKVM.Tools.Runner/Importer/IkvmImporterLauncher.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/IKVM.Tools.Runner/Importer/IkvmImporterLauncher.cs b/src/IKVM.Tools.Runner/Importer/IkvmImporterLauncher.cs index 6875de1988..2a4673a91b 100644 --- a/src/IKVM.Tools.Runner/Importer/IkvmImporterLauncher.cs +++ b/src/IKVM.Tools.Runner/Importer/IkvmImporterLauncher.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Runtime.InteropServices; @@ -278,8 +277,12 @@ public async Task ExecuteAsync(IkvmImporterOptions options, CancellationTok try { var psx = Mono.Unix.UnixFileSystemInfo.GetFileSystemEntry(exe); - if (psx.FileAccessPermissions.HasFlag(Mono.Unix.FileAccessPermissions.UserExecute) == false) - psx.FileAccessPermissions |= Mono.Unix.FileAccessPermissions.UserExecute; + var prm = psx.FileAccessPermissions; + prm |= Mono.Unix.FileAccessPermissions.UserExecute; + prm |= Mono.Unix.FileAccessPermissions.GroupExecute; + prm |= Mono.Unix.FileAccessPermissions.OtherExecute; + if (prm != psx.FileAccessPermissions) + psx.FileAccessPermissions = prm; } catch (Exception e) { From 83fc3c93df9ad2eceb424b67571ff27194d5bc6c Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Fri, 8 Mar 2024 17:49:09 -0600 Subject: [PATCH 119/134] Handle no listener. --- src/IKVM.Tools.Runner/IkvmToolLauncher.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/IKVM.Tools.Runner/IkvmToolLauncher.cs b/src/IKVM.Tools.Runner/IkvmToolLauncher.cs index 767be1ed4c..63be52b7f1 100644 --- a/src/IKVM.Tools.Runner/IkvmToolLauncher.cs +++ b/src/IKVM.Tools.Runner/IkvmToolLauncher.cs @@ -38,7 +38,10 @@ public IkvmToolLauncher(string toolName, string toolPath, IIkvmToolDiagnosticEve /// protected Task LogEvent(IkvmToolDiagnosticEventLevel level, string message, params object[] args) { - return listener?.ReceiveAsync(new IkvmToolDiagnosticEvent(level, message, args)); + if (message != null && listener != null) + return listener.ReceiveAsync(new IkvmToolDiagnosticEvent(level, message, args)); + else + return Task.CompletedTask; } /// From 81e23e385a04a8191c5e562946f452aff871aa12 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Fri, 8 Mar 2024 17:49:25 -0600 Subject: [PATCH 120/134] CliWrap. --- src/IKVM.Tests.Util/DotNetSdkResolver.cs | 30 ++++++++++-------------- 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/src/IKVM.Tests.Util/DotNetSdkResolver.cs b/src/IKVM.Tests.Util/DotNetSdkResolver.cs index 0538123f6d..0e97a2cddc 100644 --- a/src/IKVM.Tests.Util/DotNetSdkResolver.cs +++ b/src/IKVM.Tests.Util/DotNetSdkResolver.cs @@ -1,8 +1,10 @@ using System; using System.Collections.Generic; -using System.Diagnostics; using System.IO; using System.Linq; +using System.Threading; + +using CliWrap; namespace IKVM.Tests.Util { @@ -45,23 +47,15 @@ static IList GetInfo(string dotnetExePath) ["MSBuildExtensionsPath"] = null, }; - // execute dotnet --info, capture output as binary, without stream reader, to prevent deadlocks - var psi = new ProcessStartInfo(dotnetExePath); - psi.Arguments = "--info"; - psi.CreateNoWindow = true; - psi.UseShellExecute = false; - psi.RedirectStandardOutput = true; - - // start process and append output lines to buffer - using var prc = new Process(); - var buf = new List(); - prc.StartInfo = psi; - prc.EnableRaisingEvents = true; - prc.OutputDataReceived += (s, a) => buf.Add(a.Data); - prc.Start(); - prc.BeginOutputReadLine(); - prc.WaitForExit(2000); - return buf; + var info = new List(); + var task = (Cli.Wrap(dotnetExePath) + .WithArguments("--info") + .WithEnvironmentVariables(envv) + | info.Add) + .ExecuteAsync(new CancellationTokenSource(2000).Token); + task.GetAwaiter().GetResult(); + + return info; } /// From 2791aaafbf753dfca2810520f3facaedcc72de0a Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Fri, 8 Mar 2024 17:49:35 -0600 Subject: [PATCH 121/134] A space. --- src/IKVM.Tests/Tools/XjcTests.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/IKVM.Tests/Tools/XjcTests.cs b/src/IKVM.Tests/Tools/XjcTests.cs index ef144fccd8..6f7a7413ad 100644 --- a/src/IKVM.Tests/Tools/XjcTests.cs +++ b/src/IKVM.Tests/Tools/XjcTests.cs @@ -33,6 +33,7 @@ public async Task CanDisplayHelp() psx.FileAccessPermissions = prm; } #endif + var r = await Cli.Wrap(c).WithArguments("-help").WithStandardOutputPipe(PipeTarget.ToDelegate(i => s.Append(i))).WithValidation(CommandResultValidation.None).ExecuteAsync(); r.ExitCode.Should().Be(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? -1 : 255); s.ToString().Should().StartWith("Usage: xjc"); From 0347669aac96b0e4b833fd30b0a312bc7ca88af6 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Fri, 8 Mar 2024 17:49:52 -0600 Subject: [PATCH 122/134] Update many test related libraries. --- src/IKVM.ByteCode.Tests/IKVM.ByteCode.Tests.csproj | 4 ++-- .../IKVM.JTReg.TestAdapter.Tests.csproj | 8 ++++---- .../IKVM.JTReg.TestAdapter.csproj | 2 +- src/IKVM.Java.Tests/IKVM.Java.Tests.msbuildproj | 2 +- .../IKVM.MSBuild.Tasks.Tests.csproj | 8 ++++---- src/IKVM.MSBuild.Tests/IKVM.MSBuild.Tests.csproj | 8 ++++---- src/IKVM.NET.Sdk.Tests/IKVM.NET.Sdk.Tests.csproj | 8 ++++---- src/IKVM.OpenJDK.Tests/IKVM.OpenJDK.Tests.csproj | 2 +- .../IKVM.Reflection.Tests.csproj | 12 ++++++------ .../IKVM.Tools.Exporter.Tests.csproj | 8 ++++---- .../IKVM.Tools.Importer.Tests.csproj | 8 ++++---- src/IKVM.Tools.Tests/IKVM.Tools.Tests.csproj | 6 +++--- 12 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/IKVM.ByteCode.Tests/IKVM.ByteCode.Tests.csproj b/src/IKVM.ByteCode.Tests/IKVM.ByteCode.Tests.csproj index 6e54046a5b..c75d04d97c 100644 --- a/src/IKVM.ByteCode.Tests/IKVM.ByteCode.Tests.csproj +++ b/src/IKVM.ByteCode.Tests/IKVM.ByteCode.Tests.csproj @@ -7,9 +7,9 @@ - + - + diff --git a/src/IKVM.JTReg.TestAdapter.Tests/IKVM.JTReg.TestAdapter.Tests.csproj b/src/IKVM.JTReg.TestAdapter.Tests/IKVM.JTReg.TestAdapter.Tests.csproj index ac726cac6c..7137908d62 100644 --- a/src/IKVM.JTReg.TestAdapter.Tests/IKVM.JTReg.TestAdapter.Tests.csproj +++ b/src/IKVM.JTReg.TestAdapter.Tests/IKVM.JTReg.TestAdapter.Tests.csproj @@ -12,11 +12,11 @@ - - - + + + - + diff --git a/src/IKVM.JTReg.TestAdapter/IKVM.JTReg.TestAdapter.csproj b/src/IKVM.JTReg.TestAdapter/IKVM.JTReg.TestAdapter.csproj index e22e600b64..6a9fecb831 100644 --- a/src/IKVM.JTReg.TestAdapter/IKVM.JTReg.TestAdapter.csproj +++ b/src/IKVM.JTReg.TestAdapter/IKVM.JTReg.TestAdapter.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/IKVM.Java.Tests/IKVM.Java.Tests.msbuildproj b/src/IKVM.Java.Tests/IKVM.Java.Tests.msbuildproj index b3d38cba03..972f2c1e16 100644 --- a/src/IKVM.Java.Tests/IKVM.Java.Tests.msbuildproj +++ b/src/IKVM.Java.Tests/IKVM.Java.Tests.msbuildproj @@ -8,7 +8,7 @@ - + diff --git a/src/IKVM.MSBuild.Tasks.Tests/IKVM.MSBuild.Tasks.Tests.csproj b/src/IKVM.MSBuild.Tasks.Tests/IKVM.MSBuild.Tasks.Tests.csproj index 6b89928275..3adcdd1793 100644 --- a/src/IKVM.MSBuild.Tasks.Tests/IKVM.MSBuild.Tasks.Tests.csproj +++ b/src/IKVM.MSBuild.Tasks.Tests/IKVM.MSBuild.Tasks.Tests.csproj @@ -16,11 +16,11 @@ - - + + - - + + diff --git a/src/IKVM.MSBuild.Tests/IKVM.MSBuild.Tests.csproj b/src/IKVM.MSBuild.Tests/IKVM.MSBuild.Tests.csproj index 5bd05d0dbd..7d8e160b92 100644 --- a/src/IKVM.MSBuild.Tests/IKVM.MSBuild.Tests.csproj +++ b/src/IKVM.MSBuild.Tests/IKVM.MSBuild.Tests.csproj @@ -23,10 +23,10 @@ - - - - + + + + diff --git a/src/IKVM.NET.Sdk.Tests/IKVM.NET.Sdk.Tests.csproj b/src/IKVM.NET.Sdk.Tests/IKVM.NET.Sdk.Tests.csproj index d0f8d5e694..a3c347fb76 100644 --- a/src/IKVM.NET.Sdk.Tests/IKVM.NET.Sdk.Tests.csproj +++ b/src/IKVM.NET.Sdk.Tests/IKVM.NET.Sdk.Tests.csproj @@ -13,11 +13,11 @@ - - + + - - + + diff --git a/src/IKVM.OpenJDK.Tests/IKVM.OpenJDK.Tests.csproj b/src/IKVM.OpenJDK.Tests/IKVM.OpenJDK.Tests.csproj index a3dcf6db76..cf068e8b66 100644 --- a/src/IKVM.OpenJDK.Tests/IKVM.OpenJDK.Tests.csproj +++ b/src/IKVM.OpenJDK.Tests/IKVM.OpenJDK.Tests.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/IKVM.Reflection.Tests/IKVM.Reflection.Tests.csproj b/src/IKVM.Reflection.Tests/IKVM.Reflection.Tests.csproj index be055641bd..34778cc416 100644 --- a/src/IKVM.Reflection.Tests/IKVM.Reflection.Tests.csproj +++ b/src/IKVM.Reflection.Tests/IKVM.Reflection.Tests.csproj @@ -5,14 +5,14 @@ - + - - - + + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/IKVM.Tools.Exporter.Tests/IKVM.Tools.Exporter.Tests.csproj b/src/IKVM.Tools.Exporter.Tests/IKVM.Tools.Exporter.Tests.csproj index 445b327634..aa1e7b5ca0 100644 --- a/src/IKVM.Tools.Exporter.Tests/IKVM.Tools.Exporter.Tests.csproj +++ b/src/IKVM.Tools.Exporter.Tests/IKVM.Tools.Exporter.Tests.csproj @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/src/IKVM.Tools.Importer.Tests/IKVM.Tools.Importer.Tests.csproj b/src/IKVM.Tools.Importer.Tests/IKVM.Tools.Importer.Tests.csproj index 6305756282..d3e9fd3595 100644 --- a/src/IKVM.Tools.Importer.Tests/IKVM.Tools.Importer.Tests.csproj +++ b/src/IKVM.Tools.Importer.Tests/IKVM.Tools.Importer.Tests.csproj @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/src/IKVM.Tools.Tests/IKVM.Tools.Tests.csproj b/src/IKVM.Tools.Tests/IKVM.Tools.Tests.csproj index d73c82b683..55a5e053a2 100644 --- a/src/IKVM.Tools.Tests/IKVM.Tools.Tests.csproj +++ b/src/IKVM.Tools.Tests/IKVM.Tools.Tests.csproj @@ -6,9 +6,9 @@ - - - + + + From 15c635de9ae7f48b94e14efb53d57910d5dc076e Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Fri, 8 Mar 2024 20:20:36 -0600 Subject: [PATCH 123/134] Specifically include Semver package. --- src/IKVM.MSBuild.Tasks.Tests/IKVM.MSBuild.Tasks.Tests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/IKVM.MSBuild.Tasks.Tests/IKVM.MSBuild.Tasks.Tests.csproj b/src/IKVM.MSBuild.Tasks.Tests/IKVM.MSBuild.Tasks.Tests.csproj index 3adcdd1793..0d7acc9b6c 100644 --- a/src/IKVM.MSBuild.Tasks.Tests/IKVM.MSBuild.Tasks.Tests.csproj +++ b/src/IKVM.MSBuild.Tasks.Tests/IKVM.MSBuild.Tasks.Tests.csproj @@ -23,6 +23,7 @@ + From f4141334fb5348c2d88d1f3366d85f904958beab Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Fri, 8 Mar 2024 21:21:10 -0600 Subject: [PATCH 124/134] Force binding redirects. --- Directory.Build.targets | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Directory.Build.targets b/Directory.Build.targets index 0c55181af6..fee6992f2c 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -7,4 +7,11 @@ win-x64 true + + + + true + + + From 7ce597e1500c0161b6af41bbe0f66539561c6bc0 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Fri, 8 Mar 2024 22:19:01 -0600 Subject: [PATCH 125/134] Add StrongNamer for SemVer? --- src/IKVM.MSBuild.Tasks.Tests/IKVM.MSBuild.Tasks.Tests.csproj | 2 +- src/IKVM.MSBuild.Tests/IKVM.MSBuild.Tests.csproj | 1 + src/IKVM.Tests.Util/IKVM.Tests.Util.csproj | 1 + src/IKVM.Tests/IKVM.Tests.csproj | 1 + src/IKVM.Tools.Exporter.Tests/IKVM.Tools.Exporter.Tests.csproj | 1 + src/IKVM.Tools.Importer.Tests/IKVM.Tools.Importer.Tests.csproj | 1 + src/IKVM.Tools.Tests/IKVM.Tools.Tests.csproj | 1 + 7 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/IKVM.MSBuild.Tasks.Tests/IKVM.MSBuild.Tasks.Tests.csproj b/src/IKVM.MSBuild.Tasks.Tests/IKVM.MSBuild.Tasks.Tests.csproj index 0d7acc9b6c..0168128488 100644 --- a/src/IKVM.MSBuild.Tasks.Tests/IKVM.MSBuild.Tasks.Tests.csproj +++ b/src/IKVM.MSBuild.Tasks.Tests/IKVM.MSBuild.Tasks.Tests.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/IKVM.MSBuild.Tests/IKVM.MSBuild.Tests.csproj b/src/IKVM.MSBuild.Tests/IKVM.MSBuild.Tests.csproj index 7d8e160b92..ab144ff2b5 100644 --- a/src/IKVM.MSBuild.Tests/IKVM.MSBuild.Tests.csproj +++ b/src/IKVM.MSBuild.Tests/IKVM.MSBuild.Tests.csproj @@ -27,6 +27,7 @@ + diff --git a/src/IKVM.Tests.Util/IKVM.Tests.Util.csproj b/src/IKVM.Tests.Util/IKVM.Tests.Util.csproj index 2ae09a5af3..73d9019ebf 100644 --- a/src/IKVM.Tests.Util/IKVM.Tests.Util.csproj +++ b/src/IKVM.Tests.Util/IKVM.Tests.Util.csproj @@ -7,6 +7,7 @@ + diff --git a/src/IKVM.Tests/IKVM.Tests.csproj b/src/IKVM.Tests/IKVM.Tests.csproj index b33d9284b6..2e7d506368 100644 --- a/src/IKVM.Tests/IKVM.Tests.csproj +++ b/src/IKVM.Tests/IKVM.Tests.csproj @@ -30,6 +30,7 @@ + diff --git a/src/IKVM.Tools.Exporter.Tests/IKVM.Tools.Exporter.Tests.csproj b/src/IKVM.Tools.Exporter.Tests/IKVM.Tools.Exporter.Tests.csproj index aa1e7b5ca0..ad861a8886 100644 --- a/src/IKVM.Tools.Exporter.Tests/IKVM.Tools.Exporter.Tests.csproj +++ b/src/IKVM.Tools.Exporter.Tests/IKVM.Tools.Exporter.Tests.csproj @@ -11,6 +11,7 @@ + diff --git a/src/IKVM.Tools.Importer.Tests/IKVM.Tools.Importer.Tests.csproj b/src/IKVM.Tools.Importer.Tests/IKVM.Tools.Importer.Tests.csproj index d3e9fd3595..284a1dcd69 100644 --- a/src/IKVM.Tools.Importer.Tests/IKVM.Tools.Importer.Tests.csproj +++ b/src/IKVM.Tools.Importer.Tests/IKVM.Tools.Importer.Tests.csproj @@ -11,6 +11,7 @@ + diff --git a/src/IKVM.Tools.Tests/IKVM.Tools.Tests.csproj b/src/IKVM.Tools.Tests/IKVM.Tools.Tests.csproj index 55a5e053a2..6bd4c5a3bd 100644 --- a/src/IKVM.Tools.Tests/IKVM.Tools.Tests.csproj +++ b/src/IKVM.Tools.Tests/IKVM.Tools.Tests.csproj @@ -9,6 +9,7 @@ + From 0e0f31df9d655091c43567ed2ba92be70e22bf69 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Fri, 8 Mar 2024 22:19:25 -0600 Subject: [PATCH 126/134] Target isn't required. --- Directory.Build.targets | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index fee6992f2c..b3f4ad1017 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -7,11 +7,5 @@ win-x64 true - - - - true - - From 20215e3b5a1e12ee535bc507000dae13224db5fb Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Fri, 8 Mar 2024 22:20:33 -0600 Subject: [PATCH 127/134] Missed one. --- src/IKVM.Reflection.Tests/IKVM.Reflection.Tests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/IKVM.Reflection.Tests/IKVM.Reflection.Tests.csproj b/src/IKVM.Reflection.Tests/IKVM.Reflection.Tests.csproj index 34778cc416..657656aebe 100644 --- a/src/IKVM.Reflection.Tests/IKVM.Reflection.Tests.csproj +++ b/src/IKVM.Reflection.Tests/IKVM.Reflection.Tests.csproj @@ -16,6 +16,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive + From 5b2c507eb3785fa5860065ae1d9d62ad78c68beb Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Sat, 9 Mar 2024 08:56:02 -0600 Subject: [PATCH 128/134] Strong name only assemblies we redistribute, which means we don't need to strong name test assemblies. Which means we can include SemVer, which isn't strong named. Which is annoying, but works. https://github.com/maxhauser/semver/issues/23 --- src/IKVM.ByteCode/IKVM.ByteCode.csproj | 1 + src/IKVM.JTReg.TestAdapter/IKVM.JTReg.TestAdapter.csproj | 1 + src/IKVM.Java-ref/IKVM.Java-ref.csproj | 1 + src/IKVM.Java/IKVM.Java.runtime.props | 1 + src/IKVM.MSBuild.Tasks/IKVM.MSBuild.Tasks.csproj | 1 + src/IKVM.Reflection/IKVM.Reflection.csproj | 3 ++- src/IKVM.Runtime-ref/IKVM.Runtime-ref.csproj | 1 + src/IKVM.Runtime/IKVM.Runtime.csproj | 1 + src/IKVM.Tests.Util/IKVM.Tests.Util.csproj | 1 - src/IKVM.Tools.Exporter/IKVM.Tools.Exporter.csproj | 1 + src/IKVM.Tools.Importer/IKVM.Tools.Importer.csproj | 1 + src/IKVM.Tools.Runner/IKVM.Tools.Runner.csproj | 1 + 12 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/IKVM.ByteCode/IKVM.ByteCode.csproj b/src/IKVM.ByteCode/IKVM.ByteCode.csproj index 6d3c2a57e7..bb60d72a25 100644 --- a/src/IKVM.ByteCode/IKVM.ByteCode.csproj +++ b/src/IKVM.ByteCode/IKVM.ByteCode.csproj @@ -5,6 +5,7 @@ 11 true true + true diff --git a/src/IKVM.JTReg.TestAdapter/IKVM.JTReg.TestAdapter.csproj b/src/IKVM.JTReg.TestAdapter/IKVM.JTReg.TestAdapter.csproj index 6a9fecb831..37f0d4d1ed 100644 --- a/src/IKVM.JTReg.TestAdapter/IKVM.JTReg.TestAdapter.csproj +++ b/src/IKVM.JTReg.TestAdapter/IKVM.JTReg.TestAdapter.csproj @@ -2,6 +2,7 @@ net472;net6.0 false + true diff --git a/src/IKVM.Java-ref/IKVM.Java-ref.csproj b/src/IKVM.Java-ref/IKVM.Java-ref.csproj index 3539d4bbea..e0f90394d2 100644 --- a/src/IKVM.Java-ref/IKVM.Java-ref.csproj +++ b/src/IKVM.Java-ref/IKVM.Java-ref.csproj @@ -4,6 +4,7 @@ net472;net6.0 IKVM.Java true + true diff --git a/src/IKVM.Java/IKVM.Java.runtime.props b/src/IKVM.Java/IKVM.Java.runtime.props index 220799fc20..4495f3ce27 100644 --- a/src/IKVM.Java/IKVM.Java.runtime.props +++ b/src/IKVM.Java/IKVM.Java.runtime.props @@ -18,6 +18,7 @@ net472;net6.0 IKVM.Java + true false true true diff --git a/src/IKVM.MSBuild.Tasks/IKVM.MSBuild.Tasks.csproj b/src/IKVM.MSBuild.Tasks/IKVM.MSBuild.Tasks.csproj index b11eec0712..8a0346e358 100644 --- a/src/IKVM.MSBuild.Tasks/IKVM.MSBuild.Tasks.csproj +++ b/src/IKVM.MSBuild.Tasks/IKVM.MSBuild.Tasks.csproj @@ -1,6 +1,7 @@  net472;net6.0 + true diff --git a/src/IKVM.Reflection/IKVM.Reflection.csproj b/src/IKVM.Reflection/IKVM.Reflection.csproj index 754032f372..7932bfc2e6 100644 --- a/src/IKVM.Reflection/IKVM.Reflection.csproj +++ b/src/IKVM.Reflection/IKVM.Reflection.csproj @@ -3,9 +3,10 @@ net472;net6.0;net7.0 IKVM implementation of System.Reflection[.Emit] - true true 11 + true + true diff --git a/src/IKVM.Runtime-ref/IKVM.Runtime-ref.csproj b/src/IKVM.Runtime-ref/IKVM.Runtime-ref.csproj index 82a97704d7..336898bfb1 100644 --- a/src/IKVM.Runtime-ref/IKVM.Runtime-ref.csproj +++ b/src/IKVM.Runtime-ref/IKVM.Runtime-ref.csproj @@ -6,6 +6,7 @@ $(DefineConstants);EMITTERS;FIRST_PASS true true + true diff --git a/src/IKVM.Runtime/IKVM.Runtime.csproj b/src/IKVM.Runtime/IKVM.Runtime.csproj index 8d947a6f28..4b6c77540f 100644 --- a/src/IKVM.Runtime/IKVM.Runtime.csproj +++ b/src/IKVM.Runtime/IKVM.Runtime.csproj @@ -6,6 +6,7 @@ net472;net6.0 $(DefineConstants);EMITTERS true + true true diff --git a/src/IKVM.Tests.Util/IKVM.Tests.Util.csproj b/src/IKVM.Tests.Util/IKVM.Tests.Util.csproj index 73d9019ebf..2ae09a5af3 100644 --- a/src/IKVM.Tests.Util/IKVM.Tests.Util.csproj +++ b/src/IKVM.Tests.Util/IKVM.Tests.Util.csproj @@ -7,7 +7,6 @@ - diff --git a/src/IKVM.Tools.Exporter/IKVM.Tools.Exporter.csproj b/src/IKVM.Tools.Exporter/IKVM.Tools.Exporter.csproj index 17563db628..eab501fc56 100644 --- a/src/IKVM.Tools.Exporter/IKVM.Tools.Exporter.csproj +++ b/src/IKVM.Tools.Exporter/IKVM.Tools.Exporter.csproj @@ -4,6 +4,7 @@ $(DefineConstants);EXPORTER true true + true diff --git a/src/IKVM.Tools.Importer/IKVM.Tools.Importer.csproj b/src/IKVM.Tools.Importer/IKVM.Tools.Importer.csproj index a59212befb..56299643ab 100644 --- a/src/IKVM.Tools.Importer/IKVM.Tools.Importer.csproj +++ b/src/IKVM.Tools.Importer/IKVM.Tools.Importer.csproj @@ -4,6 +4,7 @@ $(DefineConstants);IMPORTER;EMITTERS true true + true diff --git a/src/IKVM.Tools.Runner/IKVM.Tools.Runner.csproj b/src/IKVM.Tools.Runner/IKVM.Tools.Runner.csproj index d3e2b6ee24..9e3e8d35f1 100644 --- a/src/IKVM.Tools.Runner/IKVM.Tools.Runner.csproj +++ b/src/IKVM.Tools.Runner/IKVM.Tools.Runner.csproj @@ -2,6 +2,7 @@ net472;net6.0;net7.0 true + true From 015bfc61bd67bab4479bd711934d42bd19ef1d87 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Sat, 9 Mar 2024 09:03:03 -0600 Subject: [PATCH 129/134] Strong name executables. --- src/ikvmc/ikvmc.csproj | 1 + src/ikvmstub/ikvmstub.csproj | 1 + src/jar/jar.msbuildproj | 1 + src/jarsigner/jarsigner.msbuildproj | 1 + src/java/java.csproj | 1 + src/javac-ref/javac-ref.msbuildproj | 1 + src/javac/javac.msbuildproj | 1 + src/javadoc/javadoc.msbuildproj | 1 + src/javah/javah.msbuildproj | 1 + src/javap/javap.msbuildproj | 1 + src/jdeps/jdeps.msbuildproj | 1 + src/keytool/keytool.msbuildproj | 1 + src/native2ascii/native2ascii.msbuildproj | 1 + src/orbd/orbd.msbuildproj | 1 + src/policytool/policytool.msbuildproj | 1 + src/rmic/rmic.msbuildproj | 1 + src/schemagen/schemagen.msbuildproj | 1 + src/wsgen/wsgen.msbuildproj | 1 + src/wsimport/wsimport.msbuildproj | 1 + src/xjc/xjc.msbuildproj | 1 + 20 files changed, 20 insertions(+) diff --git a/src/ikvmc/ikvmc.csproj b/src/ikvmc/ikvmc.csproj index ad17ab129b..b4c4c1bcaf 100644 --- a/src/ikvmc/ikvmc.csproj +++ b/src/ikvmc/ikvmc.csproj @@ -3,6 +3,7 @@ Exe net6.0;net472 $(_SupportedToolRuntimes) + true true diff --git a/src/ikvmstub/ikvmstub.csproj b/src/ikvmstub/ikvmstub.csproj index 0e8f641af8..28d5833f3d 100644 --- a/src/ikvmstub/ikvmstub.csproj +++ b/src/ikvmstub/ikvmstub.csproj @@ -3,6 +3,7 @@ Exe net472;net6.0 $(_SupportedToolRuntimes) + true true diff --git a/src/jar/jar.msbuildproj b/src/jar/jar.msbuildproj index df6b0cc9a2..a9a9b22b67 100644 --- a/src/jar/jar.msbuildproj +++ b/src/jar/jar.msbuildproj @@ -9,6 +9,7 @@ $(_SupportedImageRuntimes) sun.tools.jar.Main ikvm.tools.jar + true diff --git a/src/jarsigner/jarsigner.msbuildproj b/src/jarsigner/jarsigner.msbuildproj index e7067311aa..75f7b4b1cf 100644 --- a/src/jarsigner/jarsigner.msbuildproj +++ b/src/jarsigner/jarsigner.msbuildproj @@ -9,6 +9,7 @@ $(_SupportedImageRuntimes) sun.security.tools.jarsigner.Main ikvm.tools.jarsigner + true diff --git a/src/java/java.csproj b/src/java/java.csproj index cf3d36b052..aaf0b9345b 100644 --- a/src/java/java.csproj +++ b/src/java/java.csproj @@ -4,6 +4,7 @@ net6.0;net472 $(_SupportedImageRuntimes) ikvm.tools.java + true diff --git a/src/javac-ref/javac-ref.msbuildproj b/src/javac-ref/javac-ref.msbuildproj index e29b588154..b8ea8a7fe0 100644 --- a/src/javac-ref/javac-ref.msbuildproj +++ b/src/javac-ref/javac-ref.msbuildproj @@ -10,6 +10,7 @@ $(_SupportedImageRuntimes) com.sun.tools.javac.Main ikvm.tools.javac + true diff --git a/src/javac/javac.msbuildproj b/src/javac/javac.msbuildproj index 1ee2572e49..f4e9563637 100644 --- a/src/javac/javac.msbuildproj +++ b/src/javac/javac.msbuildproj @@ -9,6 +9,7 @@ $(_SupportedImageRuntimes) com.sun.tools.javac.Main ikvm.tools.javac + true diff --git a/src/javadoc/javadoc.msbuildproj b/src/javadoc/javadoc.msbuildproj index e0ff70a70a..f6941cf5b1 100644 --- a/src/javadoc/javadoc.msbuildproj +++ b/src/javadoc/javadoc.msbuildproj @@ -9,6 +9,7 @@ $(_SupportedImageRuntimes) com.sun.tools.javadoc.Main ikvm.tools.javadoc + true diff --git a/src/javah/javah.msbuildproj b/src/javah/javah.msbuildproj index cb7214428b..53f60cbbc4 100644 --- a/src/javah/javah.msbuildproj +++ b/src/javah/javah.msbuildproj @@ -9,6 +9,7 @@ $(_SupportedImageRuntimes) com.sun.tools.javah.Main ikvm.tools.javah + true diff --git a/src/javap/javap.msbuildproj b/src/javap/javap.msbuildproj index 643cab5b7d..70b6d90c12 100644 --- a/src/javap/javap.msbuildproj +++ b/src/javap/javap.msbuildproj @@ -9,6 +9,7 @@ $(_SupportedImageRuntimes) com.sun.tools.javap.Main ikvm.tools.javap + true diff --git a/src/jdeps/jdeps.msbuildproj b/src/jdeps/jdeps.msbuildproj index 4f1fed6a2f..79cfb0db96 100644 --- a/src/jdeps/jdeps.msbuildproj +++ b/src/jdeps/jdeps.msbuildproj @@ -9,6 +9,7 @@ $(_SupportedImageRuntimes) com.sun.tools.jdeps.Main ikvm.tools.jdeps + true diff --git a/src/keytool/keytool.msbuildproj b/src/keytool/keytool.msbuildproj index ff6767116d..cd602a64ff 100644 --- a/src/keytool/keytool.msbuildproj +++ b/src/keytool/keytool.msbuildproj @@ -9,6 +9,7 @@ $(_SupportedImageRuntimes) sun.security.tools.keytool.Main ikvm.tools.keytool + true diff --git a/src/native2ascii/native2ascii.msbuildproj b/src/native2ascii/native2ascii.msbuildproj index 573ff2bfe5..8bd01ebed9 100644 --- a/src/native2ascii/native2ascii.msbuildproj +++ b/src/native2ascii/native2ascii.msbuildproj @@ -9,6 +9,7 @@ $(_SupportedImageRuntimes) sun.tools.native2ascii.Main ikvm.tools.native2ascii + true diff --git a/src/orbd/orbd.msbuildproj b/src/orbd/orbd.msbuildproj index e4e75bcdea..6f0e5c21f8 100644 --- a/src/orbd/orbd.msbuildproj +++ b/src/orbd/orbd.msbuildproj @@ -9,6 +9,7 @@ $(_SupportedImageRuntimes) com.sun.corba.se.impl.activation.ORBD ikvm.tools.orbd + true diff --git a/src/policytool/policytool.msbuildproj b/src/policytool/policytool.msbuildproj index ab3f612a2d..ae1e634d04 100644 --- a/src/policytool/policytool.msbuildproj +++ b/src/policytool/policytool.msbuildproj @@ -9,6 +9,7 @@ $(_SupportedImageRuntimes) sun.security.tools.policytool.PolicyTool ikvm.tools.policytool + true diff --git a/src/rmic/rmic.msbuildproj b/src/rmic/rmic.msbuildproj index da1950b85d..1ba883983f 100644 --- a/src/rmic/rmic.msbuildproj +++ b/src/rmic/rmic.msbuildproj @@ -9,6 +9,7 @@ $(_SupportedImageRuntimes) sun.rmi.rmic.Main ikvm.tools.rmic + true diff --git a/src/schemagen/schemagen.msbuildproj b/src/schemagen/schemagen.msbuildproj index 1a91d2a683..fc3fff7098 100644 --- a/src/schemagen/schemagen.msbuildproj +++ b/src/schemagen/schemagen.msbuildproj @@ -9,6 +9,7 @@ $(_SupportedImageRuntimes) com.sun.tools.internal.jxc.SchemaGenerator ikvm.tools.schemagen + true diff --git a/src/wsgen/wsgen.msbuildproj b/src/wsgen/wsgen.msbuildproj index e96627dc58..11d07b94b1 100644 --- a/src/wsgen/wsgen.msbuildproj +++ b/src/wsgen/wsgen.msbuildproj @@ -9,6 +9,7 @@ $(_SupportedImageRuntimes) com.sun.tools.internal.ws.WsGen ikvm.tools.wsgen + true diff --git a/src/wsimport/wsimport.msbuildproj b/src/wsimport/wsimport.msbuildproj index 8fbe2662d5..014cb355ed 100644 --- a/src/wsimport/wsimport.msbuildproj +++ b/src/wsimport/wsimport.msbuildproj @@ -9,6 +9,7 @@ $(_SupportedImageRuntimes) com.sun.tools.internal.ws.WsImport ikvm.tools.wsimport + true diff --git a/src/xjc/xjc.msbuildproj b/src/xjc/xjc.msbuildproj index 897bc1e15d..c6bd9ea72b 100644 --- a/src/xjc/xjc.msbuildproj +++ b/src/xjc/xjc.msbuildproj @@ -9,6 +9,7 @@ $(_SupportedImageRuntimes) com.sun.tools.internal.xjc.Driver ikvm.tools.xjc + true From 50a0c3d741ef55708da2b028f67986d16b71cd51 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Sat, 9 Mar 2024 09:03:34 -0600 Subject: [PATCH 130/134] Test adapters can technically be distributed (though they aren't) IKVM.Util is used by a tasks. --- .../IKVM.JTReg.TestAdapter.Core.csproj | 1 + src/IKVM.Java.Extensions/IKVM.Java.Extensions.csproj | 1 + src/IKVM.Util/IKVM.Util.csproj | 1 + 3 files changed, 3 insertions(+) diff --git a/src/IKVM.JTReg.TestAdapter.Core/IKVM.JTReg.TestAdapter.Core.csproj b/src/IKVM.JTReg.TestAdapter.Core/IKVM.JTReg.TestAdapter.Core.csproj index d6414ed142..b142c6c953 100644 --- a/src/IKVM.JTReg.TestAdapter.Core/IKVM.JTReg.TestAdapter.Core.csproj +++ b/src/IKVM.JTReg.TestAdapter.Core/IKVM.JTReg.TestAdapter.Core.csproj @@ -9,6 +9,7 @@ false true true + true diff --git a/src/IKVM.Java.Extensions/IKVM.Java.Extensions.csproj b/src/IKVM.Java.Extensions/IKVM.Java.Extensions.csproj index d70a87b5ef..a14001802b 100644 --- a/src/IKVM.Java.Extensions/IKVM.Java.Extensions.csproj +++ b/src/IKVM.Java.Extensions/IKVM.Java.Extensions.csproj @@ -2,6 +2,7 @@ net472;net6.0 + true diff --git a/src/IKVM.Util/IKVM.Util.csproj b/src/IKVM.Util/IKVM.Util.csproj index c2f9d420cb..18d51d5be3 100644 --- a/src/IKVM.Util/IKVM.Util.csproj +++ b/src/IKVM.Util/IKVM.Util.csproj @@ -2,6 +2,7 @@ net472;net6.0 true + true From 4625cc02217d83a06fa7129301fbfe8cf521f6f9 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Sat, 9 Mar 2024 09:50:52 -0600 Subject: [PATCH 131/134] Welp, give up. Remove SemVer library. I can't find a major combination to get tests working on the Framework path without strong naming. Switch back to bad parsing using Version. But good enough for now. https://github.com/maxhauser/semver/issues/23 --- src/IKVM.ByteCode/IKVM.ByteCode.csproj | 1 - .../IKVM.JTReg.TestAdapter.csproj | 1 - src/IKVM.Java-ref/IKVM.Java-ref.csproj | 1 - src/IKVM.Java.Extensions/IKVM.Java.Extensions.csproj | 3 +-- src/IKVM.Java/IKVM.Java.runtime.props | 1 - src/IKVM.MSBuild.Tasks/IKVM.MSBuild.Tasks.csproj | 1 - src/IKVM.Reflection/IKVM.Reflection.csproj | 1 - src/IKVM.Runtime-ref/IKVM.Runtime-ref.csproj | 1 - src/IKVM.Runtime/IKVM.Runtime.csproj | 1 - src/IKVM.Tests.Util/DotNetSdkUtil.cs | 12 +++++------- src/IKVM.Tests.Util/IKVM.Tests.Util.csproj | 1 - src/IKVM.Tools.Exporter/IKVM.Tools.Exporter.csproj | 1 - src/IKVM.Tools.Importer/IKVM.Tools.Importer.csproj | 1 - src/IKVM.Tools.Runner/IKVM.Tools.Runner.csproj | 1 - src/IKVM.Util/IKVM.Util.csproj | 3 +-- src/native2ascii/native2ascii.msbuildproj | 1 - src/xjc/xjc.msbuildproj | 1 - 17 files changed, 7 insertions(+), 25 deletions(-) diff --git a/src/IKVM.ByteCode/IKVM.ByteCode.csproj b/src/IKVM.ByteCode/IKVM.ByteCode.csproj index bb60d72a25..6d3c2a57e7 100644 --- a/src/IKVM.ByteCode/IKVM.ByteCode.csproj +++ b/src/IKVM.ByteCode/IKVM.ByteCode.csproj @@ -5,7 +5,6 @@ 11 true true - true diff --git a/src/IKVM.JTReg.TestAdapter/IKVM.JTReg.TestAdapter.csproj b/src/IKVM.JTReg.TestAdapter/IKVM.JTReg.TestAdapter.csproj index 37f0d4d1ed..6a9fecb831 100644 --- a/src/IKVM.JTReg.TestAdapter/IKVM.JTReg.TestAdapter.csproj +++ b/src/IKVM.JTReg.TestAdapter/IKVM.JTReg.TestAdapter.csproj @@ -2,7 +2,6 @@ net472;net6.0 false - true diff --git a/src/IKVM.Java-ref/IKVM.Java-ref.csproj b/src/IKVM.Java-ref/IKVM.Java-ref.csproj index e0f90394d2..3539d4bbea 100644 --- a/src/IKVM.Java-ref/IKVM.Java-ref.csproj +++ b/src/IKVM.Java-ref/IKVM.Java-ref.csproj @@ -4,7 +4,6 @@ net472;net6.0 IKVM.Java true - true diff --git a/src/IKVM.Java.Extensions/IKVM.Java.Extensions.csproj b/src/IKVM.Java.Extensions/IKVM.Java.Extensions.csproj index a14001802b..132453ad92 100644 --- a/src/IKVM.Java.Extensions/IKVM.Java.Extensions.csproj +++ b/src/IKVM.Java.Extensions/IKVM.Java.Extensions.csproj @@ -1,8 +1,7 @@ - + net472;net6.0 - true diff --git a/src/IKVM.Java/IKVM.Java.runtime.props b/src/IKVM.Java/IKVM.Java.runtime.props index 4495f3ce27..220799fc20 100644 --- a/src/IKVM.Java/IKVM.Java.runtime.props +++ b/src/IKVM.Java/IKVM.Java.runtime.props @@ -18,7 +18,6 @@ net472;net6.0 IKVM.Java - true false true true diff --git a/src/IKVM.MSBuild.Tasks/IKVM.MSBuild.Tasks.csproj b/src/IKVM.MSBuild.Tasks/IKVM.MSBuild.Tasks.csproj index 8a0346e358..b11eec0712 100644 --- a/src/IKVM.MSBuild.Tasks/IKVM.MSBuild.Tasks.csproj +++ b/src/IKVM.MSBuild.Tasks/IKVM.MSBuild.Tasks.csproj @@ -1,7 +1,6 @@  net472;net6.0 - true diff --git a/src/IKVM.Reflection/IKVM.Reflection.csproj b/src/IKVM.Reflection/IKVM.Reflection.csproj index 7932bfc2e6..a6ce4b5996 100644 --- a/src/IKVM.Reflection/IKVM.Reflection.csproj +++ b/src/IKVM.Reflection/IKVM.Reflection.csproj @@ -6,7 +6,6 @@ true 11 true - true diff --git a/src/IKVM.Runtime-ref/IKVM.Runtime-ref.csproj b/src/IKVM.Runtime-ref/IKVM.Runtime-ref.csproj index 336898bfb1..82a97704d7 100644 --- a/src/IKVM.Runtime-ref/IKVM.Runtime-ref.csproj +++ b/src/IKVM.Runtime-ref/IKVM.Runtime-ref.csproj @@ -6,7 +6,6 @@ $(DefineConstants);EMITTERS;FIRST_PASS true true - true diff --git a/src/IKVM.Runtime/IKVM.Runtime.csproj b/src/IKVM.Runtime/IKVM.Runtime.csproj index 4b6c77540f..8d947a6f28 100644 --- a/src/IKVM.Runtime/IKVM.Runtime.csproj +++ b/src/IKVM.Runtime/IKVM.Runtime.csproj @@ -6,7 +6,6 @@ net472;net6.0 $(DefineConstants);EMITTERS true - true true diff --git a/src/IKVM.Tests.Util/DotNetSdkUtil.cs b/src/IKVM.Tests.Util/DotNetSdkUtil.cs index 8185291cb3..b93f2b98fb 100644 --- a/src/IKVM.Tests.Util/DotNetSdkUtil.cs +++ b/src/IKVM.Tests.Util/DotNetSdkUtil.cs @@ -7,8 +7,6 @@ using Microsoft.Build.Utilities; -using Semver; - namespace IKVM.Tests.Util { @@ -82,7 +80,7 @@ public static IList GetPathToReferenceAssemblies(string tfm, string targ static IList GetCorePathToReferenceAssemblies(string tfm, string targetFrameworkVersion) { // parse requested version - if (SemVersion.TryParse(targetFrameworkVersion, SemVersionStyles.Any, out var targetVer) == false) + if (Version.TryParse(targetFrameworkVersion, out var targetVer) == false) throw new InvalidOperationException(targetFrameworkVersion); // back up to pack directory and get list of ref packs @@ -91,14 +89,14 @@ static IList GetCorePathToReferenceAssemblies(string tfm, string targetF var sdkVers = Directory.EnumerateDirectories(packDir).Select(Path.GetFileName); // identify maximum matching version - var thisVer = default(SemVersion); + var thisVer = new Version(0, 0, 0); foreach (var ver in sdkVers) - if (SemVersion.TryParse(ver, SemVersionStyles.Any, out var v)) - if (v.IsPrerelease == false && v.Major == targetVer.Major && v.Minor == targetVer.Minor && v.ComparePrecedenceTo(thisVer) == 1) + if (Version.TryParse(ver, out var v)) + if (v.Major == targetVer.Major && v.Minor == targetVer.Minor && v > thisVer) thisVer = v; // no higher version found - if (thisVer == null) + if (thisVer.Major == 0) return null; // check for TFM refs directory diff --git a/src/IKVM.Tests.Util/IKVM.Tests.Util.csproj b/src/IKVM.Tests.Util/IKVM.Tests.Util.csproj index 2ae09a5af3..dea085c541 100644 --- a/src/IKVM.Tests.Util/IKVM.Tests.Util.csproj +++ b/src/IKVM.Tests.Util/IKVM.Tests.Util.csproj @@ -6,7 +6,6 @@ - diff --git a/src/IKVM.Tools.Exporter/IKVM.Tools.Exporter.csproj b/src/IKVM.Tools.Exporter/IKVM.Tools.Exporter.csproj index eab501fc56..17563db628 100644 --- a/src/IKVM.Tools.Exporter/IKVM.Tools.Exporter.csproj +++ b/src/IKVM.Tools.Exporter/IKVM.Tools.Exporter.csproj @@ -4,7 +4,6 @@ $(DefineConstants);EXPORTER true true - true diff --git a/src/IKVM.Tools.Importer/IKVM.Tools.Importer.csproj b/src/IKVM.Tools.Importer/IKVM.Tools.Importer.csproj index 56299643ab..a59212befb 100644 --- a/src/IKVM.Tools.Importer/IKVM.Tools.Importer.csproj +++ b/src/IKVM.Tools.Importer/IKVM.Tools.Importer.csproj @@ -4,7 +4,6 @@ $(DefineConstants);IMPORTER;EMITTERS true true - true diff --git a/src/IKVM.Tools.Runner/IKVM.Tools.Runner.csproj b/src/IKVM.Tools.Runner/IKVM.Tools.Runner.csproj index 9e3e8d35f1..d3e2b6ee24 100644 --- a/src/IKVM.Tools.Runner/IKVM.Tools.Runner.csproj +++ b/src/IKVM.Tools.Runner/IKVM.Tools.Runner.csproj @@ -2,7 +2,6 @@ net472;net6.0;net7.0 true - true diff --git a/src/IKVM.Util/IKVM.Util.csproj b/src/IKVM.Util/IKVM.Util.csproj index 18d51d5be3..f7bbcb0876 100644 --- a/src/IKVM.Util/IKVM.Util.csproj +++ b/src/IKVM.Util/IKVM.Util.csproj @@ -1,8 +1,7 @@ - + net472;net6.0 true - true diff --git a/src/native2ascii/native2ascii.msbuildproj b/src/native2ascii/native2ascii.msbuildproj index 8bd01ebed9..573ff2bfe5 100644 --- a/src/native2ascii/native2ascii.msbuildproj +++ b/src/native2ascii/native2ascii.msbuildproj @@ -9,7 +9,6 @@ $(_SupportedImageRuntimes) sun.tools.native2ascii.Main ikvm.tools.native2ascii - true diff --git a/src/xjc/xjc.msbuildproj b/src/xjc/xjc.msbuildproj index c6bd9ea72b..897bc1e15d 100644 --- a/src/xjc/xjc.msbuildproj +++ b/src/xjc/xjc.msbuildproj @@ -9,7 +9,6 @@ $(_SupportedImageRuntimes) com.sun.tools.internal.xjc.Driver ikvm.tools.xjc - true From a13e01a331776a00b06e9fe7d996c9e011c05f1a Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Sat, 9 Mar 2024 10:07:05 -0600 Subject: [PATCH 132/134] Remove StrongNamer. --- src/IKVM.MSBuild.Tasks.Tests/IKVM.MSBuild.Tasks.Tests.csproj | 1 - src/IKVM.MSBuild.Tests/IKVM.MSBuild.Tests.csproj | 1 - src/IKVM.Reflection.Tests/IKVM.Reflection.Tests.csproj | 1 - src/IKVM.Tests/IKVM.Tests.csproj | 1 - src/IKVM.Tools.Exporter.Tests/IKVM.Tools.Exporter.Tests.csproj | 1 - src/IKVM.Tools.Importer.Tests/IKVM.Tools.Importer.Tests.csproj | 1 - src/IKVM.Tools.Tests/IKVM.Tools.Tests.csproj | 1 - 7 files changed, 7 deletions(-) diff --git a/src/IKVM.MSBuild.Tasks.Tests/IKVM.MSBuild.Tasks.Tests.csproj b/src/IKVM.MSBuild.Tasks.Tests/IKVM.MSBuild.Tasks.Tests.csproj index 0168128488..3adcdd1793 100644 --- a/src/IKVM.MSBuild.Tasks.Tests/IKVM.MSBuild.Tasks.Tests.csproj +++ b/src/IKVM.MSBuild.Tasks.Tests/IKVM.MSBuild.Tasks.Tests.csproj @@ -23,7 +23,6 @@ - diff --git a/src/IKVM.MSBuild.Tests/IKVM.MSBuild.Tests.csproj b/src/IKVM.MSBuild.Tests/IKVM.MSBuild.Tests.csproj index ab144ff2b5..7d8e160b92 100644 --- a/src/IKVM.MSBuild.Tests/IKVM.MSBuild.Tests.csproj +++ b/src/IKVM.MSBuild.Tests/IKVM.MSBuild.Tests.csproj @@ -27,7 +27,6 @@ - diff --git a/src/IKVM.Reflection.Tests/IKVM.Reflection.Tests.csproj b/src/IKVM.Reflection.Tests/IKVM.Reflection.Tests.csproj index 657656aebe..34778cc416 100644 --- a/src/IKVM.Reflection.Tests/IKVM.Reflection.Tests.csproj +++ b/src/IKVM.Reflection.Tests/IKVM.Reflection.Tests.csproj @@ -16,7 +16,6 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/src/IKVM.Tests/IKVM.Tests.csproj b/src/IKVM.Tests/IKVM.Tests.csproj index 2e7d506368..b33d9284b6 100644 --- a/src/IKVM.Tests/IKVM.Tests.csproj +++ b/src/IKVM.Tests/IKVM.Tests.csproj @@ -30,7 +30,6 @@ - diff --git a/src/IKVM.Tools.Exporter.Tests/IKVM.Tools.Exporter.Tests.csproj b/src/IKVM.Tools.Exporter.Tests/IKVM.Tools.Exporter.Tests.csproj index ad861a8886..aa1e7b5ca0 100644 --- a/src/IKVM.Tools.Exporter.Tests/IKVM.Tools.Exporter.Tests.csproj +++ b/src/IKVM.Tools.Exporter.Tests/IKVM.Tools.Exporter.Tests.csproj @@ -11,7 +11,6 @@ - diff --git a/src/IKVM.Tools.Importer.Tests/IKVM.Tools.Importer.Tests.csproj b/src/IKVM.Tools.Importer.Tests/IKVM.Tools.Importer.Tests.csproj index 284a1dcd69..d3e9fd3595 100644 --- a/src/IKVM.Tools.Importer.Tests/IKVM.Tools.Importer.Tests.csproj +++ b/src/IKVM.Tools.Importer.Tests/IKVM.Tools.Importer.Tests.csproj @@ -11,7 +11,6 @@ - diff --git a/src/IKVM.Tools.Tests/IKVM.Tools.Tests.csproj b/src/IKVM.Tools.Tests/IKVM.Tools.Tests.csproj index 6bd4c5a3bd..55a5e053a2 100644 --- a/src/IKVM.Tools.Tests/IKVM.Tools.Tests.csproj +++ b/src/IKVM.Tools.Tests/IKVM.Tools.Tests.csproj @@ -9,7 +9,6 @@ - From c98575dd544136ed8c3a7a14faba424a9d043bc4 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Sun, 10 Mar 2024 11:36:00 -0500 Subject: [PATCH 133/134] add a Delegate completion handler, use to see which thread the operation is resumed on. increase size to ensure it does not complete sync. --- .../nio/channels/DelegateCompletionHandler.cs | 89 +++++++++++++++++++ .../channels/AsynchronousFileChannelTests.cs | 65 ++++++++------ 2 files changed, 127 insertions(+), 27 deletions(-) create mode 100644 src/IKVM.Java.Extensions/java/nio/channels/DelegateCompletionHandler.cs diff --git a/src/IKVM.Java.Extensions/java/nio/channels/DelegateCompletionHandler.cs b/src/IKVM.Java.Extensions/java/nio/channels/DelegateCompletionHandler.cs new file mode 100644 index 0000000000..ac461a2576 --- /dev/null +++ b/src/IKVM.Java.Extensions/java/nio/channels/DelegateCompletionHandler.cs @@ -0,0 +1,89 @@ +using System; + +namespace java.nio.channels +{ + + /// + /// An implementation of a that accepts a delegate. + /// + public class DelegateCompletionHandler : DelegateCompletionHandler + { + + /// + /// Initializes a new instance. + /// + /// + /// + public DelegateCompletionHandler(Action onCompleted, Action onFailed) : + base(onCompleted, onFailed) + { + + } + + } + + /// + /// An implementation of a that accepts a delegate. + /// + /// + public class DelegateCompletionHandler : DelegateCompletionHandler + { + + + /// + /// Initializes a new instance. + /// + /// + /// + public DelegateCompletionHandler(Action onCompleted, Action onFailed) : + base((r, a) => onCompleted(r), (e, a) => onFailed(e)) + { + + } + + } + + /// + /// An implementation of a that accepts a delegate. + /// + /// + public class DelegateCompletionHandler : CompletionHandler + { + + readonly Action onCompleted; + readonly Action onFailed; + + /// + /// Initializes a new instance. + /// + /// + /// + public DelegateCompletionHandler(Action onCompleted, Action onFailed) + { + this.onCompleted = onCompleted; + this.onFailed = onFailed; + } + + /// + /// Invoked when the handler is signaled completion. + /// + /// + /// + void CompletionHandler.completed(object result, object attachment) + { + onCompleted((V)result, (A)attachment); + } + + /// + /// Invoked when the handler is signaled failure. + /// + /// + /// + void CompletionHandler.failed(Exception exc, object attachment) + { + onFailed(exc, (A)attachment); + } + + } + +} diff --git a/src/IKVM.Tests/Java/java/nio/channels/AsynchronousFileChannelTests.cs b/src/IKVM.Tests/Java/java/nio/channels/AsynchronousFileChannelTests.cs index 92ddf8b54a..b1331e3067 100644 --- a/src/IKVM.Tests/Java/java/nio/channels/AsynchronousFileChannelTests.cs +++ b/src/IKVM.Tests/Java/java/nio/channels/AsynchronousFileChannelTests.cs @@ -4,6 +4,7 @@ using System.Runtime.InteropServices; using System.Security.Cryptography; using System.Security.Policy; +using System.Threading; using System.Threading.Tasks; using FluentAssertions; @@ -365,9 +366,9 @@ public NamedThreadFactory(string name) this.name = name ?? throw new ArgumentNullException(nameof(name)); } - public Thread newThread(Runnable r) + public global::java.lang.Thread newThread(Runnable r) { - var t = new Thread(r, name); + var t = new global::java.lang.Thread(r, name); t.setDaemon(true); return t; } @@ -379,40 +380,50 @@ public Thread newThread(Runnable r) /// /// [TestMethod] - public async Task ShouldExecuteOnThreadPool() + public void ShouldResumeAsyncOnThreadPool() { - if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) - return; + // check current thread + global::java.lang.Thread.currentThread().getName().Should().NotBe("ShouldResumeAsyncOnThreadPool"); - Thread.currentThread().getName().Should().NotBe("ShouldExecuteOnThreadPool"); - var thisThread = Thread.currentThread(); + // create temporary file + var file = File.createTempFile("ShouldResumeAsyncOnThreadPool", null); + file.deleteOnExit(); + System.IO.File.Create(file.getPath()).Close(); - var f = new File("AsynchronousFileChannelTests_ShouldExecuteOnThreadPool.txt"); - if (f.exists()) - f.delete(); + // custom executor to resume on named thread + var t = Executors.newSingleThreadExecutor(new NamedThreadFactory("ShouldResumeAsyncOnThreadPool")); + using var c = AsynchronousFileChannel.open(file.toPath(), Collections.singleton(StandardOpenOption.WRITE), t); - f.createNewFile(); - using var s = new FileOutputStream(f); - s.write(new byte[] { 1 }); - s.close(); + // fill buffer with random data + var rng = RandomNumberGenerator.Create(); + var buf = ByteBuffer.allocate(1024 * 1024 * 64); + rng.GetBytes(buf.array(), buf.arrayOffset(), buf.limit()); - var t = Executors.newSingleThreadExecutor(new NamedThreadFactory("ShouldExecuteOnThreadPool")); - using var c = AsynchronousFileChannel.open(f.toPath(), Collections.singleton(StandardOpenOption.READ), t); - var b = ByteBuffer.allocate(1); + // capture results + var r = new AutoResetEvent(false); + var o = default(System.Exception); - var h = new AwaitableCompletionHandler(); - c.read(b, 0, null, h); - var n = await h; + // on complete check proper thread + void OnCompleted(Integer i) + { + global::java.lang.Thread.currentThread().getName().Should().Be("ShouldResumeAsyncOnThreadPool"); + r.Set(); + } - // should resume execution either on the same thread (synchronous) or on a thread pool thread - if (Thread.currentThread() != thisThread) - Thread.currentThread().getName().Should().Be("ShouldExecuteOnThreadPool"); + // on failed set exception + void OnFailed(System.Exception e) + { + o = e; + r.Set(); + } - n.intValue().Should().Be(1); - c.close(); + // begin async operation + c.write(buf, 0, null, new DelegateCompletionHandler(OnCompleted, OnFailed)); - b.flip(); - b.get().Should().Be(1); + // wait for completion + r.WaitOne(); + if (o != null) + throw new System.Exception("", o); } /// From 1139e7670b5604e981b89ca6fdc2962ee043371f Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Sun, 10 Mar 2024 18:09:00 -0500 Subject: [PATCH 134/134] Revert to Alive's version. --- .../java/net/PlainDatagramSocketImpl.cs | 43 +++++++++++-------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/src/IKVM.Runtime/Java/Externs/java/net/PlainDatagramSocketImpl.cs b/src/IKVM.Runtime/Java/Externs/java/net/PlainDatagramSocketImpl.cs index 32f9236bb8..b2282b62aa 100644 --- a/src/IKVM.Runtime/Java/Externs/java/net/PlainDatagramSocketImpl.cs +++ b/src/IKVM.Runtime/Java/Externs/java/net/PlainDatagramSocketImpl.cs @@ -98,6 +98,7 @@ static Action MakeAnonymousTypeDelegate(MethodInfo method) static __jniDelegate__init __jniPtr__init; #if NETCOREAPP3_1_OR_GREATER + // HACK .NET Core has an explicit check for _isConnected https://github.com/dotnet/runtime/issues/77962 static readonly FieldInfo SocketIsConnectedField = typeof(Socket).GetField("_isConnected", BindingFlags.NonPublic | BindingFlags.Instance); static readonly Action SocketIsConnectedFieldSetter = MakeFieldSetter(SocketIsConnectedField); @@ -538,38 +539,42 @@ public static int peek(object this_, object address_) #if !FIRST_PASS /// - /// Peek at the queue to see if there is an ICMP port unreachable. If there is, then receive it. + /// Peek at the queue to see if there is an ICMP port unreachable. If there is then receive it. /// /// static void PurgeOutstandingICMP(Socket socket) { - while (true) + // check for outstanding packet + while (socket.Poll(0, SelectMode.SelectRead)) { - // check for outstanding packet - if (socket.Poll(0, SelectMode.SelectRead) == false) - break; + var ep = (EndPoint)new IPEndPoint(IPAddress.IPv6Any, 0); + // check for real data on the socket, if so, we can exit, no exceptions try { - var ep = (EndPoint)new IPEndPoint(IPAddress.IPv6Any, 0); socket.EndReceiveFrom(socket.BeginReceiveFrom(TempBuffer, 0, TempBuffer.Length, SocketFlags.Peek, ref ep, null, null), ref ep); + return; } - catch (SocketException e) when (e.SocketErrorCode == SocketError.ConnectionReset) + catch { - try - { - var ep = (EndPoint)new IPEndPoint(IPAddress.IPv6Any, 0); - socket.EndReceiveFrom(socket.BeginReceiveFrom(TempBuffer, 0, TempBuffer.Length, SocketFlags.Peek, ref ep, null, null), ref ep); - } - catch (SocketException e2) when (e2.SocketErrorCode == SocketError.ConnectionReset) - { - - } - - continue; + // swallow any exceptions emitted by peek, the exception will be thrown again upon following read } - break; + // consume real data (exception) + try + { + socket.EndReceiveFrom(socket.BeginReceiveFrom(TempBuffer, 0, TempBuffer.Length, SocketFlags.None, ref ep, null, null), ref ep); + } + catch (SocketException e) when (e.SocketErrorCode == SocketError.ConnectionReset) + { + // we consumed exception reset and thus can continue to look for next + } + catch + { + // some other exception besides connection reset + // ignore since the purge method should only purge + return; + } } }