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