notazof/isn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Errors to Error std output

Browse source
This commit is contained in:
Paul Schneider 2022-04-18 20:58:46 +01:00
commit 3e09afcbfe
9 changed files with 33 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/isnd/Controllers/Packages/Put.cs
View file

@ -34,11 +34,11 @@ namespace isnd.Controllers
var files = new List<string>();
ViewData["files"] = files;
var clearkey = _protector.Unprotect(apiKey);
var apikey = _dbContext.ApiKeys.SingleOrDefault(k => k.Id == clearkey);
var clearkey = protector.Unprotect(apiKey);
var apikey = dbContext.ApiKeys.SingleOrDefault(k => k.Id == clearkey);
if (apikey == null)
{
_logger.LogError("403 : no api-key");
logger.LogError("403 : no api-key");
return Unauthorized();
}
Commit commit = new Commit
@ -46,7 +46,7 @@ namespace isnd.Controllers
Action = PackageAction.PublishPackage,
TimeStamp = DateTime.Now
};
_dbContext.Commits.Add(commit);
dbContext.Commits.Add(commit);
foreach (IFormFile file in Request.Form.Files)
{
@ -79,14 +79,14 @@ namespace isnd.Controllers
pkgid = reader.GetId();
version = reader.GetVersion();
string pkgidpath = Path.Combine(_isndSettings.PackagesRootDir,
string pkgidpath = Path.Combine(isndSettings.PackagesRootDir,
pkgid);
pkgpath = Path.Combine(pkgidpath, version.ToFullString());
string name = $"{pkgid}-{version}.nupkg";
fullpath = Path.Combine(pkgpath, name);
var destpkgiddir = new DirectoryInfo(pkgidpath);
Package package = _dbContext.Packages.SingleOrDefault(p => p.Id == pkgid);
Package package = dbContext.Packages.SingleOrDefault(p => p.Id == pkgid);
if (package != null)
{
if (package.OwnerId != apikey.UserId)
@ -104,7 +104,7 @@ namespace isnd.Controllers
OwnerId = apikey.UserId,
LatestVersion = commit
};
_dbContext.Packages.Add(package);
dbContext.Packages.Add(package);
}
if (!destpkgiddir.Exists) destpkgiddir.Create();
@ -116,7 +116,7 @@ namespace isnd.Controllers
// La version existe sur le disque,
// mais si elle ne l'est pas en base de donnéés,
// on remplace la version sur disque.
var pkgv = _dbContext.PackageVersions.Where(
var pkgv = dbContext.PackageVersions.Where(
v => v.PackageId == package.Id
);
@ -125,10 +125,9 @@ namespace isnd.Controllers
dest.Delete();
}
else {
ViewData["msg"] = "existant";
ViewData["ecode"] = 1;
_logger.LogWarning("400 : existant");
return base.BadRequest(new { error = ModelState });
logger.LogWarning("400 : pkgversion:existant");
ModelState.AddModelError("pkgversion", "existant" );
return BadRequest(ModelState);
}
}
{
@ -136,16 +135,16 @@ namespace isnd.Controllers
source.MoveTo(fullpath);
files.Add(name);
string fullstringversion = version.ToFullString();
var pkgvers = _dbContext.PackageVersions.Where
var pkgvers = dbContext.PackageVersions.Where
(v => v.PackageId == package.Id && v.FullString == fullstringversion);
if (pkgvers.Count() > 0)
{
foreach (var v in pkgvers.ToArray())
_dbContext.PackageVersions.Remove(v);
dbContext.PackageVersions.Remove(v);
}
// FIXME default type or null
if (types==null || types.Count==0)
_dbContext.PackageVersions.Add
dbContext.PackageVersions.Add
(new PackageVersion{
Package = package,
@ -171,13 +170,13 @@ namespace isnd.Controllers
Type = type.Name,
LatestCommit = commit
};
_dbContext.PackageVersions.Add(pkgver);
dbContext.PackageVersions.Add(pkgver);
}
await _dbContext.SaveChangesAsync();
_packageManager.ÛpdateCatalogFor(commit);
await dbContext.SaveChangesAsync();
packageManager.ÛpdateCatalogFor(commit);
_logger.LogInformation($"new package : {nuspec.Name}");
logger.LogInformation($"new package : {nuspec.Name}");
}
}
using (var shacrypto = System.Security.Cryptography.SHA512.Create())
@ -208,8 +207,8 @@ namespace isnd.Controllers
}
catch (Exception ex)
{
_logger.LogError(ex.Message);
_logger.LogError("Stack Trace: " + ex.StackTrace);
logger.LogError(ex.Message);
logger.LogError("Stack Trace: " + ex.StackTrace);
return new ObjectResult(new { ViewData, ex.Message })
{ StatusCode = 500 };
}