Skip to content

Add support for optionally explaining why inapplicable certificates are not applicable. Partially fixes #58251. #2865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rolfbjarne merged 1 commit into from
Oct 10, 2017
Merged

Add support for optionally explaining why inapplicable certificates are not applicable. Partially fixes #58251. #2865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion external/Xamarin.MacDev
Open in desktop
Submodule Xamarin.MacDev updated from dc219b to f83f84
51 changes: 45 additions & 6 deletions msbuild/Xamarin.MacDev.Tasks.Core/Tasks/DetectSigningIdentityTaskBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,17 @@ bool TryGetSigningCertificates (SecKeychain keychain, out IList<X509Certificate2
{
var now = DateTime.Now;

certs = keychain.FindNamedSigningCertificates (x => StartsWithAny (x, prefixes)).Where (x => now < x.NotAfter).ToList ();
certs = keychain.FindNamedSigningCertificates (x => {
var rv = StartsWithAny (x, prefixes);
if (!rv)
Log.LogMessage (MessageImportance.Low, "The certificate '{0}' does not match any of the prefixes '{1}'.", x, string.Join ("', '", prefixes));
return rv;
}).Where (x => {
var rv = now < x.NotAfter;
if (!rv)
Log.LogMessage (MessageImportance.Low, "The certificate '{0}' has expired ({1})", Xamarin.MacDev.Keychain.GetCertificateCommonName (x), x.NotAfter);
return rv;
}).ToList ();

if (certs.Count == 0 && !allowZeroCerts) {
var message = "No valid " + PlatformName + " code signing keys found in keychain. You need to request a codesigning certificate from https://developer.apple.com.";
Expand All @@ -214,7 +224,17 @@ bool TryGetSigningCertificates (SecKeychain keychain, out IList<X509Certificate2
{
var now = DateTime.Now;

certs = keychain.FindNamedSigningCertificates (x => x == name).Where (x => now < x.NotAfter).ToList ();
certs = keychain.FindNamedSigningCertificates (x => {
var rv = x == name;
if (!rv)
Log.LogMessage (MessageImportance.Low, "The certificate '{0}' does not match '{1}'.", x, name);
return rv;
}).Where (x => {
var rv = now < x.NotAfter;
if (!rv)
Log.LogMessage (MessageImportance.Low, "The certificate '{0}' has expired ({1})", Xamarin.MacDev.Keychain.GetCertificateCommonName (x), x.NotAfter);
return rv;
}).ToList ();

if (certs.Count == 0) {
Log.LogError (PlatformName + " code signing key '{0}' not found in keychain.", SigningKey);
Expand Down Expand Up @@ -367,6 +387,12 @@ public override bool Execute ()
if (!TryGetSigningCertificates (out certs, false))
return false;

if (certs.Count > 0) {
Log.LogMessage (MessageImportance.Low, "Available certificates:");
foreach (var cert in certs)
Log.LogMessage (MessageImportance.Low, " {0}", Xamarin.MacDev.Keychain.GetCertificateCommonName (cert));
}

if (!IsAutoCodeSignProfile (ProvisioningProfile)) {
identity.Profile = MobileProvisionIndex.GetMobileProvision (platform, ProvisioningProfile);

Expand Down Expand Up @@ -408,15 +434,28 @@ public override bool Execute ()
return !Log.HasLoggedErrors;
}

List<string> failures = new List<string> ();
if (identity.BundleId != null) {
if (certs.Count > 0)
profiles = MobileProvisionIndex.GetMobileProvisions (platform, identity.BundleId, type, certs, unique: true);
profiles = MobileProvisionIndex.GetMobileProvisions (platform, identity.BundleId, type, certs, unique: true, failures: failures);
else
profiles = MobileProvisionIndex.GetMobileProvisions (platform, identity.BundleId, type, unique: true);
profiles = MobileProvisionIndex.GetMobileProvisions (platform, identity.BundleId, type, unique: true, failures: failures);
} else if (certs.Count > 0) {
profiles = MobileProvisionIndex.GetMobileProvisions (platform, type, certs, unique: true);
profiles = MobileProvisionIndex.GetMobileProvisions (platform, type, certs, unique: true, failures: failures);
} else {
profiles = MobileProvisionIndex.GetMobileProvisions (platform, type, unique: true, failures: failures);
}

if (profiles.Count == 0) {
foreach (var f in failures)
Log.LogMessage (MessageImportance.Low, "{0}", f);
Log.LogError ($"Could not find any available provisioning profiles for {PlatformName}.");
return false;
} else {
profiles = MobileProvisionIndex.GetMobileProvisions (platform, type, unique: true);
Log.LogMessage (MessageImportance.Low, "Available profiles:");
foreach (var p in profiles) {
Log.LogMessage (MessageImportance.Low, " {0}", p.Name);
}
}

List<CodeSignIdentity> pairs;
Expand Down