cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-30 16:39:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some repository cleanups

Browse Source 
- Bad git credentials should now throw a proper JobException.
- Use ILibGit2Comamnds in Repository instead of Commands class directly.
This commit is contained in:
Jordan Brown
2021-02-07 14:33:57 -05:00
parent a64be6d981
commit 1cc3a99ba0
1 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Repository/Repository.cs
+37 -12
View File
@@ -116,6 +116,16 @@ namespace Tgstation.Server.Host.Components.Repository
/// <returns>A <see cref="LibGit2Sharp.Handlers.CheckoutProgressHandler"/> based on <paramref name="progressReporter"/></returns>
static CheckoutProgressHandler CheckoutProgressHandler(Action<int> progressReporter) => (a, completedSteps, totalSteps) => progressReporter((int)(((float)completedSteps) / totalSteps * 100));
/// <summary>
/// Rethrow the authentication failure message as a <see cref="JobException"/> if it is one.
/// </summary>
/// <param name="exception">The current <see cref="LibGit2SharpException"/>.</param>
static void CheckBadCredentialsException(LibGit2SharpException exception)
{
if (exception.Message == "too many redirects or authentication replays")
throw new JobException("Bad git credentials exchange!", exception);
}
/// <summary>
/// Construct a <see cref="Repository"/>
/// </summary>
@@ -324,6 +334,10 @@ namespace Tgstation.Server.Host.Components.Repository
logMessage);
}
catch (UserCancelledException) { }
catch (LibGit2SharpException ex)
{
CheckBadCredentialsException(ex);
}
cancellationToken.ThrowIfCancellationRequested();
@@ -432,24 +446,35 @@ namespace Tgstation.Server.Host.Components.Repository
var remote = libGitRepo.Network.Remotes.First();
try
{
Commands.Fetch((LibGit2Sharp.Repository)libGitRepo, remote.Name, remote.FetchRefSpecs.Select(x => x.Specification), new FetchOptions
{
Prune = true,
OnProgress = (a) => !cancellationToken.IsCancellationRequested,
OnTransferProgress = (a) =>
commands.Fetch(
libGitRepo,
remote
.FetchRefSpecs
.Select(x => x.Specification),
remote,
new FetchOptions
{
var percentage = 100 * (((float)a.IndexedObjects + a.ReceivedObjects) / (a.TotalObjects * 2));
progressReporter((int)percentage);
return !cancellationToken.IsCancellationRequested;
Prune = true,
OnProgress = (a) => !cancellationToken.IsCancellationRequested,
OnTransferProgress = (a) =>
{
var percentage = 100 * (((float)a.IndexedObjects + a.ReceivedObjects) / (a.TotalObjects * 2));
progressReporter((int)percentage);
return !cancellationToken.IsCancellationRequested;
},
OnUpdateTips = (a, b, c) => !cancellationToken.IsCancellationRequested,
CredentialsProvider = credentialsProvider.GenerateCredentialsHandler(username, password)
},
OnUpdateTips = (a, b, c) => !cancellationToken.IsCancellationRequested,
CredentialsProvider = credentialsProvider.GenerateCredentialsHandler(username, password)
}, "Fetch origin commits");
"Fetch origin commits");
}
catch (UserCancelledException)
{
cancellationToken.ThrowIfCancellationRequested();
}
catch (LibGit2SharpException ex)
{
CheckBadCredentialsException(ex);
}
}, cancellationToken, DefaultIOManager.BlockingTaskCreationOptions, TaskScheduler.Current).ConfigureAwait(false);
}
@@ -480,7 +505,7 @@ namespace Tgstation.Server.Host.Components.Repository
{
cancellationToken.ThrowIfCancellationRequested();
}
catch(LibGit2SharpException e)
catch (LibGit2SharpException e)
{
logger.LogWarning(e, "Unable to push to temporary branch!");
}