Skip to content
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

Added certificateCheck parameter to Repository.ListRemoteReferences a… #2134

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added certificateCheck parameter to Repository.ListRemoteReferences a… #2134

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
49 changes: 38 additions & 11 deletions LibGit2Sharp/Network.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public virtual IEnumerable<Reference> ListReferences(Remote remote)
{
Ensure.ArgumentNotNull(remote, "remote");

return ListReferencesInternal(remote.Url, null, new ProxyOptions());
return ListReferencesInternal(remote.Url, null, null, new ProxyOptions());
}

/// <summary>
Expand All @@ -71,7 +71,7 @@ public virtual IEnumerable<Reference> ListReferences(Remote remote, ProxyOptions
{
Ensure.ArgumentNotNull(remote, "remote");

return ListReferencesInternal(remote.Url, null, proxyOptions);
return ListReferencesInternal(remote.Url, null, null, proxyOptions);
}

/// <summary>
Expand All @@ -91,7 +91,29 @@ public virtual IEnumerable<Reference> ListReferences(Remote remote, CredentialsH
Ensure.ArgumentNotNull(remote, "remote");
Ensure.ArgumentNotNull(credentialsProvider, "credentialsProvider");

return ListReferencesInternal(remote.Url, credentialsProvider, new ProxyOptions());
return ListReferencesInternal(remote.Url, credentialsProvider, null, new ProxyOptions());
}

/// <summary>
/// List references in a <see cref="Remote"/> repository.
/// <para>
/// When the remote tips are ahead of the local ones, the retrieved
/// <see cref="DirectReference"/>s may point to non existing
/// <see cref="GitObject"/>s in the local repository. In that
/// case, <see cref="DirectReference.Target"/> will return <c>null</c>.
/// </para>
/// </summary>
/// <param name="remote">The <see cref="Remote"/> to list from.</param>
/// <param name="credentialsProvider">The <see cref="Func{Credentials}"/> used to connect to remote repository.</param>
/// <param name="certificateCheck">This handler will be called to let the user make a decision on whether to allow the connection to proceed based on the certificate presented by the server..</param>
/// <returns>The references in the <see cref="Remote"/> repository.</returns>
public virtual IEnumerable<Reference> ListReferences(Remote remote, CredentialsHandler credentialsProvider, CertificateCheckHandler certificateCheck)
{
Ensure.ArgumentNotNull(remote, "remote");
Ensure.ArgumentNotNull(credentialsProvider, "credentialsProvider");
Ensure.ArgumentNotNull(certificateCheck, "certificateCheck");

return ListReferencesInternal(remote.Url, credentialsProvider, certificateCheck, new ProxyOptions());
}

/// <summary>
Expand All @@ -112,7 +134,7 @@ public virtual IEnumerable<Reference> ListReferences(Remote remote, CredentialsH
Ensure.ArgumentNotNull(remote, "remote");
Ensure.ArgumentNotNull(credentialsProvider, "credentialsProvider");

return ListReferencesInternal(remote.Url, credentialsProvider, proxyOptions);
return ListReferencesInternal(remote.Url, credentialsProvider, null, proxyOptions);
}

/// <summary>
Expand All @@ -130,7 +152,7 @@ public virtual IEnumerable<Reference> ListReferences(string url)
{
Ensure.ArgumentNotNull(url, "url");

return ListReferencesInternal(url, null, new ProxyOptions());
return ListReferencesInternal(url, null, null, new ProxyOptions());
}

/// <summary>
Expand All @@ -149,7 +171,7 @@ public virtual IEnumerable<Reference> ListReferences(string url, ProxyOptions pr
{
Ensure.ArgumentNotNull(url, "url");

return ListReferencesInternal(url, null, proxyOptions);
return ListReferencesInternal(url, null, null, proxyOptions);
}

/// <summary>
Expand All @@ -169,7 +191,7 @@ public virtual IEnumerable<Reference> ListReferences(string url, CredentialsHand
Ensure.ArgumentNotNull(url, "url");
Ensure.ArgumentNotNull(credentialsProvider, "credentialsProvider");

return ListReferencesInternal(url, credentialsProvider, new ProxyOptions());
return ListReferencesInternal(url, credentialsProvider, null, new ProxyOptions());
}

/// <summary>
Expand All @@ -190,10 +212,10 @@ public virtual IEnumerable<Reference> ListReferences(string url, CredentialsHand
Ensure.ArgumentNotNull(url, "url");
Ensure.ArgumentNotNull(credentialsProvider, "credentialsProvider");

return ListReferencesInternal(url, credentialsProvider, new ProxyOptions());
return ListReferencesInternal(url, credentialsProvider, null, new ProxyOptions());
}

private IEnumerable<Reference> ListReferencesInternal(string url, CredentialsHandler credentialsProvider, ProxyOptions proxyOptions)
private IEnumerable<Reference> ListReferencesInternal(string url, CredentialsHandler credentialsProvider, CertificateCheckHandler certificateCheck, ProxyOptions proxyOptions)
{
proxyOptions ??= new();

Expand All @@ -202,9 +224,14 @@ private IEnumerable<Reference> ListReferencesInternal(string url, CredentialsHan

GitRemoteCallbacks gitCallbacks = new GitRemoteCallbacks { version = 1 };

if (credentialsProvider != null)
if (credentialsProvider != null || certificateCheck != null)
{
var callbacks = new RemoteCallbacks(credentialsProvider);
var fetchOptions = new FetchOptions()
{
CredentialsProvider = credentialsProvider,
CertificateCheck = certificateCheck
};
var callbacks = new RemoteCallbacks(fetchOptions);
gitCallbacks = callbacks.GenerateCallbacks();
}

Expand Down
35 changes: 29 additions & 6 deletions LibGit2Sharp/Repository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@ internal Commit LookupCommit(string committish)
/// <returns>The references in the remote repository.</returns>
public static IEnumerable<Reference> ListRemoteReferences(string url)
{
return ListRemoteReferences(url, null, new ProxyOptions());
return ListRemoteReferences(url, null, null, new ProxyOptions());
}

/// <summary>
Expand All @@ -667,7 +667,7 @@ public static IEnumerable<Reference> ListRemoteReferences(string url)
/// <returns>The references in the remote repository.</returns>
public static IEnumerable<Reference> ListRemoteReferences(string url, ProxyOptions proxyOptions)
{
return ListRemoteReferences(url, null, proxyOptions);
return ListRemoteReferences(url, null, null, proxyOptions);
}

/// <summary>
Expand All @@ -683,7 +683,7 @@ public static IEnumerable<Reference> ListRemoteReferences(string url, ProxyOptio
/// <returns>The references in the remote repository.</returns>
public static IEnumerable<Reference> ListRemoteReferences(string url, CredentialsHandler credentialsProvider)
{
return ListRemoteReferences(url, credentialsProvider, new ProxyOptions());
return ListRemoteReferences(url, credentialsProvider, null, new ProxyOptions());
}

/// <summary>
Expand All @@ -696,9 +696,27 @@ public static IEnumerable<Reference> ListRemoteReferences(string url, Credential
/// </para>
/// <param name="url">The url to list from.</param>
/// <param name="credentialsProvider">The <see cref="Func{Credentials}"/> used to connect to remote repository.</param>
/// <param name="certificateCheck">This handler will be called to let the user make a decision on whether to allow the connection to proceed based on the certificate presented by the server..</param>
/// <returns>The references in the remote repository.</returns>
public static IEnumerable<Reference> ListRemoteReferences(string url, CredentialsHandler credentialsProvider, CertificateCheckHandler certificateCheck)
{
return ListRemoteReferences(url, credentialsProvider, certificateCheck, new ProxyOptions());
}

/// <summary>
/// Lists the Remote Repository References.
/// </summary>
/// <para>
/// Does not require a local Repository. The retrieved
/// <see cref="IBelongToARepository.Repository"/>
/// throws <see cref="InvalidOperationException"/> in this case.
/// </para>
/// <param name="url">The url to list from.</param>
/// <param name="credentialsProvider">The <see cref="Func{Credentials}"/> used to connect to remote repository.</param>
/// <param name="certificateCheck">This handler will be called to let the user make a decision on whether to allow the connection to proceed based on the certificate presented by the server..</param>
/// <param name="proxyOptions">Options for connecting through a proxy.</param>
/// <returns>The references in the remote repository.</returns>
public static IEnumerable<Reference> ListRemoteReferences(string url, CredentialsHandler credentialsProvider, ProxyOptions proxyOptions)
public static IEnumerable<Reference> ListRemoteReferences(string url, CredentialsHandler credentialsProvider, CertificateCheckHandler certificateCheck, ProxyOptions proxyOptions)
{
Ensure.ArgumentNotNull(url, "url");

Expand All @@ -710,9 +728,14 @@ public static IEnumerable<Reference> ListRemoteReferences(string url, Credential

var gitCallbacks = new GitRemoteCallbacks { version = 1 };

if (credentialsProvider != null)
if (credentialsProvider != null || certificateCheck != null)
{
var callbacks = new RemoteCallbacks(credentialsProvider);
var fetchOptions = new FetchOptions()
{
CredentialsProvider = credentialsProvider,
CertificateCheck = certificateCheck
};
var callbacks = new RemoteCallbacks(fetchOptions);
gitCallbacks = callbacks.GenerateCallbacks();
}

Expand Down