infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8371094: --mac-signing-key-user-name no longer works

Browse Source 
Reviewed-by: almatvee
This commit is contained in:
Alexey Semenyuk 2025-11-04 19:44:04 +00:00
parent 8224292ba5
commit 0555f6228c
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityBuilder.java
View File

@ -113,14 +113,16 @@ final class SigningIdentityBuilder {
final var signingIdentityNames = certificateSelector.signingIdentities();
// Look up for the exact match.
var matchingCertificates = mappedCertficates.stream().filter(e -> {
return signingIdentityNames.contains(e.getKey());
}).map(Map.Entry::getValue).toList();
if (matchingCertificates.isEmpty()) {
// No exact matches found, look up for substrings.
matchingCertificates = mappedCertficates.stream().filter(e -> {
return signingIdentityNames.stream().anyMatch(filter -> {
return filter.startsWith(e.getKey());
return e.getKey().startsWith(filter);
});
}).map(Map.Entry::getValue).toList();
}

7
test/jdk/tools/jpackage/macosx/MacSignTest.java
View File

@ -184,6 +184,7 @@ public class MacSignTest {
@Test
@ParameterSupplier
@ParameterSupplier("testSelectSigningIdentity_JDK_8371094")
public static void testSelectSigningIdentity(String signingKeyUserName, CertificateRequest certRequest) {
MacSign.withKeychain(keychain -> {
@ -207,6 +208,12 @@ public class MacSignTest {
}).toList();
}
public static Collection<Object[]> testSelectSigningIdentity_JDK_8371094() {
return List.<Object[]>of(new Object[] {
"ACME Technologies Limited", SigningBase.StandardCertificateRequest.CODESIGN_ACME_TECH_LTD.spec()
});
}
enum SignOption {
EXPIRED_SIGNING_KEY_USER_NAME("--mac-signing-key-user-name", SigningBase.StandardCertificateRequest.CODESIGN_EXPIRED.spec(), true, false),
EXPIRED_SIGNING_KEY_USER_NAME_PKG("--mac-signing-key-user-name", SigningBase.StandardCertificateRequest.PKG_EXPIRED.spec(), true, false),

4
test/jdk/tools/jpackage/macosx/base/SigningBase.java
View File

@ -68,6 +68,7 @@ public class SigningBase {
public enum StandardCertificateRequest {
CODESIGN(cert().userName(DEV_NAMES[CertIndex.ASCII_INDEX.value()])),
CODESIGN_COPY(cert().days(100).userName(DEV_NAMES[CertIndex.ASCII_INDEX.value()])),
CODESIGN_ACME_TECH_LTD(cert().days(100).userName("ACME Technologies Limited (ABC12345)")),
PKG(cert().type(CertificateType.INSTALLER).userName(DEV_NAMES[CertIndex.ASCII_INDEX.value()])),
PKG_COPY(cert().type(CertificateType.INSTALLER).days(100).userName(DEV_NAMES[CertIndex.ASCII_INDEX.value()])),
CODESIGN_UNICODE(cert().userName(DEV_NAMES[CertIndex.UNICODE_INDEX.value()])),
@ -101,7 +102,8 @@ public class SigningBase {
StandardCertificateRequest.CODESIGN,
StandardCertificateRequest.PKG,
StandardCertificateRequest.CODESIGN_UNICODE,
StandardCertificateRequest.PKG_UNICODE),
StandardCertificateRequest.PKG_UNICODE,
StandardCertificateRequest.CODESIGN_ACME_TECH_LTD),
/**
* A keychain with some good and some expired certificates.
*/