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

Restrict repo update reads to those with the read RIGHT

Browse Source
This commit is contained in:
Cyberboss
2018-08-31 11:19:31 -04:00
parent 2a9da14e6d
commit 5b8e7ee645
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Controllers/RepositoryController.cs
+22 -16
View File
@@ -325,29 +325,35 @@ namespace Tgstation.Server.Host.Controllers
currentModel.AccessToken = null;
}
var api = userRights.HasFlag(RepositoryRights.Read) ? currentModel.ToApi() : new Repository();
var canRead = userRights.HasFlag(RepositoryRights.Read);
var api = canRead ? currentModel.ToApi() : new Repository();
var repoManager = instanceManager.GetInstance(Instance).RepositoryManager;
if (repoManager.CloneInProgress)
return Conflict(new ErrorMessage
{
Message = "A clone operation is in progress!"
});
if (repoManager.InUse)
return Conflict(new ErrorMessage
{
Message = "The repo is busy!"
});
using (var repo = await repoManager.LoadRepository(cancellationToken).ConfigureAwait(false))
if (canRead)
{
if (repo == null)
if (repoManager.CloneInProgress)
return Conflict(new ErrorMessage
{
Message = "Repository could not be loaded!"
Message = "A clone operation is in progress!"
});
await PopulateApi(api, repo, DatabaseContext, Instance, cancellationToken).ConfigureAwait(false);
if (repoManager.InUse)
return Conflict(new ErrorMessage
{
Message = "The repo is busy!"
});
using (var repo = await repoManager.LoadRepository(cancellationToken).ConfigureAwait(false))
{
if (repo == null)
return Conflict(new ErrorMessage
{
Message = "Repository could not be loaded!"
});
await PopulateApi(api, repo, DatabaseContext, Instance, cancellationToken).ConfigureAwait(false);
}
}
//this is just db stuf so stow it away