Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit cde8ac6

Browse files
author
Rick Martin
committed
Add SSH support from github.com/leobuskin/libgit2sharp-ssh. Add local nuget package source to use locally built libgit2sharp.nativebinaries. Add readme explaining how to build locally.
1 parent 8c32b61 commit cde8ac6

11 files changed

+265
-1
lines changed

‎LibGit2Sharp/AuthenticationException.cs

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
using System;
2+
using System.Runtime.Serialization;
3+
using LibGit2Sharp.Core;
4+
5+
namespace LibGit2Sharp
6+
{
7+
/// <summary>
8+
/// The exception that is thrown when an operation which requires an
9+
/// authentication fails.
10+
/// </summary>
11+
[Serializable]
12+
public class AuthenticationException : LibGit2SharpException
13+
{
14+
/// <summary>
15+
/// Initializes a new instance of the <see cref="LibGit2Sharp.AuthenticationException"/> class.
16+
/// </summary>
17+
public AuthenticationException()
18+
{
19+
}
20+
21+
/// <summary>
22+
/// Initializes a new instance of the <see cref="LibGit2Sharp.AuthenticationException"/> class with a specified error message.
23+
/// </summary>
24+
/// <param name="message">A message that describes the error.</param>
25+
public AuthenticationException(string message)
26+
: base(message)
27+
{
28+
}
29+
30+
/// <summary>
31+
/// Initializes a new instance of the <see cref="LibGit2Sharp.AuthenticationException"/> class with a specified error message and a reference to the inner exception that is the cause of this exception.
32+
/// </summary>
33+
/// <param name="message">The error message that explains the reason for the exception.</param>
34+
/// <param name="innerException">The exception that is the cause of the current exception. If the <paramref name="innerException"/> parameter is not a null reference, the current exception is raised in a catch block that handles the inner exception.</param>
35+
public AuthenticationException(string message, Exception innerException)
36+
: base(message, innerException)
37+
{
38+
}
39+
40+
/// <summary>
41+
/// Initializes a new instance of the <see cref="LibGit2Sharp.AuthenticationException"/> class with a serialized data.
42+
/// </summary>
43+
/// <param name="info">The <see cref="SerializationInfo"/> that holds the serialized object data about the exception being thrown.</param>
44+
/// <param name="context">The <see cref="StreamingContext"/> that contains contextual information about the source or destination.</param>
45+
protected AuthenticationException(SerializationInfo info, StreamingContext context)
46+
: base(info, context)
47+
{
48+
}
49+
internal AuthenticationException(string message, GitErrorCategory category)
50+
: base(message, category)
51+
{ }
52+
53+
internal AuthenticationException(string message, GitErrorCode code, GitErrorCategory category)
54+
: base(message, code, category)
55+
{
56+
}
57+
}
58+
}

‎LibGit2Sharp/Core/Ensure.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ private static readonly Dictionary<GitErrorCode, Func<string, GitErrorCategory,
128128
{ GitErrorCode.LockedFile, (m, c) => new LockedFileException(m, c) },
129129
{ GitErrorCode.NotFound, (m, c) => new NotFoundException(m, c) },
130130
{ GitErrorCode.Peel, (m, c) => new PeelException(m, c) },
131+
{ GitErrorCode.Auth, (m, c) => new AuthenticationException(m, c) },
131132
};
132133

133134
private static unsafe void HandleError(int result)

‎LibGit2Sharp/Core/NativeMethods.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -599,6 +599,24 @@ internal static extern int git_cred_userpass_plaintext_new(
599599
[DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
600600
internal static extern void git_cred_free(IntPtr cred);
601601

602+
[DllImport(libgit2)]
603+
internal static extern int git_cred_ssh_key_new(
604+
out IntPtr cred,
605+
[MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string username,
606+
[MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string publickey,
607+
[MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string privatekey,
608+
[MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string passphrase);
609+
610+
[DllImport(libgit2)]
611+
internal static extern int git_cred_ssh_key_from_agent(
612+
out IntPtr cred,
613+
[MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string username);
614+
615+
[DllImport(libgit2)]
616+
internal static extern int git_cred_username_new(
617+
out IntPtr cred,
618+
[MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string username);
619+
602620
[DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
603621
internal static extern unsafe int git_describe_commit(
604622
out git_describe_result* describe,

‎LibGit2Sharp/LibGit2Sharp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</ItemGroup>
3434

3535
<ItemGroup>
36-
<PackageReference Include="LibGit2Sharp.NativeBinaries" Version="[2.0.320]" PrivateAssets="none" />
36+
<PackageReference Include="LibGit2Sharp.NativeBinaries" Version="2.0.320-ssh" PrivateAssets="none" />
3737
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
3838
<PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="all" />
3939
</ItemGroup>

‎LibGit2Sharp/RemoteCallbacks.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,14 @@ private int GitCredentialHandler(
284284
{
285285
types |= SupportedCredentialTypes.Default;
286286
}
287+
if (credTypes.HasFlag(GitCredentialType.SshKey))
288+
{
289+
types |= SupportedCredentialTypes.Ssh;
290+
}
291+
if (credTypes.HasFlag(GitCredentialType.Username))
292+
{
293+
types |= SupportedCredentialTypes.UsernameQuery;
294+
}
287295

288296
ptr = IntPtr.Zero;
289297
try

‎LibGit2Sharp/SshAgentCredentials.cs

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
using System;
2+
using LibGit2Sharp.Core;
3+
4+
namespace LibGit2Sharp
5+
{
6+
/// <summary>
7+
/// Class that holds SSH agent credentials for remote repository access.
8+
/// </summary>
9+
public sealed class SshAgentCredentials : Credentials
10+
{
11+
/// <summary>
12+
/// Callback to acquire a credential object.
13+
/// </summary>
14+
/// <param name="cred">The newly created credential object.</param>
15+
/// <returns>0 for success, &lt; 0 to indicate an error, &gt; 0 to indicate no credential was acquired.</returns>
16+
protected internal override int GitCredentialHandler(out IntPtr cred)
17+
{
18+
if (!GlobalSettings.Version.Features.HasFlag(BuiltInFeatures.Ssh))
19+
{
20+
throw new InvalidOperationException("LibGit2 was not built with SSH support.");
21+
}
22+
23+
if (Username == null)
24+
{
25+
throw new InvalidOperationException("SshAgentCredentials contains a null Username.");
26+
}
27+
28+
return NativeMethods.git_cred_ssh_key_from_agent(out cred, Username);
29+
}
30+
31+
/// <summary>
32+
/// Username for SSH authentication.
33+
/// </summary>
34+
public string Username { get; set; }
35+
}
36+
}

‎LibGit2Sharp/SshUserKeyCredentials.cs

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
using System;
2+
using LibGit2Sharp.Core;
3+
4+
namespace LibGit2Sharp
5+
{
6+
/// <summary>
7+
/// Class that holds SSH username with key credentials for remote repository access.
8+
/// </summary>
9+
public sealed class SshUserKeyCredentials : Credentials
10+
{
11+
/// <summary>
12+
/// Callback to acquire a credential object.
13+
/// </summary>
14+
/// <param name="cred">The newly created credential object.</param>
15+
/// <returns>0 for success, &lt; 0 to indicate an error, &gt; 0 to indicate no credential was acquired.</returns>
16+
protected internal override int GitCredentialHandler(out IntPtr cred)
17+
{
18+
if (!GlobalSettings.Version.Features.HasFlag(BuiltInFeatures.Ssh))
19+
{
20+
throw new InvalidOperationException("LibGit2 was not built with SSH support.");
21+
}
22+
23+
if (Username == null)
24+
{
25+
throw new InvalidOperationException("SshUserKeyCredentials contains a null Username.");
26+
}
27+
28+
if (Passphrase == null)
29+
{
30+
throw new InvalidOperationException("SshUserKeyCredentials contains a null Passphrase.");
31+
}
32+
33+
if (PublicKey == null)
34+
{
35+
throw new InvalidOperationException("SshUserKeyCredentials contains a null PublicKey.");
36+
}
37+
38+
if (PrivateKey == null)
39+
{
40+
throw new InvalidOperationException("SshUserKeyCredentials contains a null PrivateKey.");
41+
}
42+
43+
return NativeMethods.git_cred_ssh_key_new(out cred, Username, PublicKey, PrivateKey, Passphrase);
44+
}
45+
46+
/// <summary>
47+
/// Username for SSH authentication.
48+
/// </summary>
49+
public string Username { get; set; }
50+
51+
/// <summary>
52+
/// Public key file location for SSH authentication.
53+
/// </summary>
54+
public string PublicKey { get; set; }
55+
56+
/// <summary>
57+
/// Private key file location for SSH authentication.
58+
/// </summary>
59+
public string PrivateKey { get; set; }
60+
61+
/// <summary>
62+
/// Passphrase for SSH authentication.
63+
/// </summary>
64+
public string Passphrase { get; set; }
65+
}
66+
}

‎LibGit2Sharp/SupportedCredentialTypes.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,15 @@ public enum SupportedCredentialTypes
1818
/// Ask Windows to provide its default credentials for the current user (e.g. NTLM)
1919
/// </summary>
2020
Default = (1 << 1),
21+
22+
/// <summary>
23+
/// SSH with username and public/private keys. (SshUserKeyCredentials, SshAgentCredentials).
24+
/// </summary>
25+
Ssh = (1 << 2),
26+
27+
/// <summary>
28+
/// Queries the server with the given username, then later returns the supported credential types.
29+
/// </summary>
30+
UsernameQuery = (1 << 3),
2131
}
2232
}

‎LibGit2Sharp/UsernameQueryCredentials.cs

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
using System;
2+
using LibGit2Sharp.Core;
3+
4+
namespace LibGit2Sharp
5+
{
6+
/// <summary>
7+
/// Class that holds username query credentials for remote repository access.
8+
/// </summary>
9+
public sealed class UsernameQueryCredentials : Credentials
10+
{
11+
/// <summary>
12+
/// Callback to acquire a credential object.
13+
/// </summary>
14+
/// <param name="cred">The newly created credential object.</param>
15+
/// <returns>0 for success, &lt; 0 to indicate an error, &gt; 0 to indicate no credential was acquired.</returns>
16+
protected internal override int GitCredentialHandler(out IntPtr cred)
17+
{
18+
if (Username == null)
19+
{
20+
throw new InvalidOperationException("UsernameQueryCredentials contains a null Username.");
21+
}
22+
23+
return NativeMethods.git_cred_username_new(out cred, Username);
24+
}
25+
26+
/// <summary>
27+
/// Username for querying the server for supported authentication.
28+
/// </summary>
29+
public string Username { get; set; }
30+
}
31+
}

‎README.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,41 @@
1010
- [NuGet package](http://nuget.org/List/Packages/LibGit2Sharp)
1111
- [Source code](https://github.com/libgit2/libgit2sharp/)
1212

13+
## MadCap steps for building locally
14+
15+
1. Clone this repository as well as libgit2sharp.nativebinaries so they are in folders next to each other:
16+
17+
```
18+
git clone https://github.com/madcapsoftware/libgit2sharp.git
19+
git clone https://github.com/madcapsoftware/libgit2sharp.nativebinaries.git
20+
```
21+
22+
Example folder structure:
23+
24+
```
25+
C:\source\madcapsoftware\libgit2sharp
26+
C:\source\madcapsoftware\libgit2sharp.nativebinaries
27+
```
28+
29+
2. Open a powershell terminal to the root of the libgit2sharp.nativebinaries repository
30+
3. Build `libgit2sharp.nativebinaries` and create a local nuget package, specifying the version to use. The version at time of writing matches the main `libgit2sharp.nativebinaries` repository with a `-ssh` suffix.
31+
32+
```
33+
.\UpdateAllLibsToSha.ps1 -libgit2sha main -libssh2sha master -zlibsha master
34+
.\build.libgit2.ps1 -x86 -x64 -libssh2
35+
.\nuget.exe Pack nuget.package/NativeBinaries.nuspec -Version 2.0.320-ssh -NoPackageAnalysis
36+
```
37+
38+
4. Open the LibGit2Sharp solution
39+
5. Right click the LibGit2Sharp project and click "Manage NuGet packages..."
40+
6. Make sure "Package source" is set to "libgit2sharp.nativebinaries" which is a local relative path to the package generated in step 3
41+
7. Check "Include prerelease" as the package version is a prerelease version due to the `-ssh` suffix
42+
8. Click Install to update to the latest version
43+
9. Build the `Release` solution configuration.
44+
45+
NOTE: The version of the resulting dll is based on the most recent git tag, which in this case is `0.27.2-ssh.0`.
46+
For more details, see: https://github.com/adamralph/minver
47+
1348
## Troubleshooting and support
1449
1550
- Usage or programming related question? Post it on [StackOverflow](http://stackoverflow.com/questions/tagged/libgit2sharp) using the tag *libgit2sharp*

‎nuget.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
<configuration>
33
<packageSources>
44
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
5+
<add key="libgit2sharp.nativebinaries" value="..\libgit2sharp.nativebinaries" />
56
</packageSources>
67
</configuration>

0 commit comments

Comments
 (0)