paul/isn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Paul Schneider
2022-04-09 19:53:26 +01:00
parent df55836c58
commit 1befc2e053
38 changed files with 427 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
.vs/isn/xs/UserPrefs.xml
View File

@ -1,34 +1,19 @@
<Properties StartupConfiguration="{9D758F00-17FF-433D-B088-F9C2D97C9BD1}|Default">
<MonoDevelop.Ide.Workbench ActiveDocument="../../../../usr/share/dotnet/sdk/5.0.400/Sdks/Microsoft.NET.Sdk/targets/Microsoft.NET.TargetFrameworkInference.targets">
<MonoDevelop.Ide.Workbench ActiveDocument="src/isn/Program.cs">
<Files>
<File FileName="../../../../usr/share/dotnet/sdk/5.0.400/Sdks/Microsoft.NET.Sdk/targets/Microsoft.NET.TargetFrameworkInference.targets" Line="54" Column="5" />
<File FileName="src/isn/isn.1.0.0.nupkg" />
<File FileName="src/isn/Program.cs" Line="54" Column="9" />
<File FileName="src/isn/Program.cs" Line="62" Column="9" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="isn" expanded="True">
<Node name="src" expanded="True">
<Node name="isn" expanded="True" />
</Node>
<Node name="test" expanded="True">
<Node name="isn.tests" selected="True" />
</Node>
</Node>
</State>
</Pad>
<Pad Id="MonoDevelop.UnitTesting.TestPad">
<State name="__root__">
<Node name="isn" expanded="True">
<Node name="test" expanded="True">
<Node name="isn.tests" expanded="True">
<Node name="isn" expanded="True">
<Node name="Tests" expanded="True" />
<Node name="Program.cs" selected="True" />
</Node>
<Node name="isn.abst" expanded="True" />
</Node>
<Node name="isnd.tests" selected="True" />
</Node>
<Node name="test" expanded="True" />
</Node>
</State>
</Pad>

26
.vscode/settings.json vendored
View File

@ -10,5 +10,29 @@
"dotnetCoreExplorer.runEnvVars": {
"ASPNETCORE_ENVIRONMENT": "Testing"
},
"dotnetCoreExplorer.searchpatterns": "test/**/bin/**/*.tests.{dll,exe}"
"dotnetCoreExplorer.searchpatterns": "test/**/bin/**/*.tests.{dll,exe}",
"sqltools.connections": [
{
"previewLimit": 50,
"server": "localhost",
"port": 5432,
"driver": "PostgreSQL",
"name": "isntest",
"group": "isn",
"database": "nugettest",
"username": "paul",
"password": "R1vJa=y8#b/tfg"
},
{
"previewLimit": 50,
"server": "localhost",
"port": 5432,
"driver": "PostgreSQL",
"name": "isndev",
"group": "isn",
"database": "dotnetmvc",
"username": "dotnetmvc",
"password": "RvJa=y#b/tfg"
}
]
}

15
isn.sln
View File

@ -15,6 +15,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "isn", "src\isn\isn.csproj",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "isn.tests", "test\isn.tests\isn.tests.csproj", "{305F640E-11BA-44F9-95E0-C6882E9CD151}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "isn.abst", "src\isn.abst\isn.abst.csproj", "{4EFA7D3E-8B31-4BF7-96D1-B9F2867735C7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -76,11 +78,24 @@ Global
{305F640E-11BA-44F9-95E0-C6882E9CD151}.Release|x64.Build.0 = Release|Any CPU
{305F640E-11BA-44F9-95E0-C6882E9CD151}.Release|x86.ActiveCfg = Release|Any CPU
{305F640E-11BA-44F9-95E0-C6882E9CD151}.Release|x86.Build.0 = Release|Any CPU
{4EFA7D3E-8B31-4BF7-96D1-B9F2867735C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4EFA7D3E-8B31-4BF7-96D1-B9F2867735C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4EFA7D3E-8B31-4BF7-96D1-B9F2867735C7}.Debug|x64.ActiveCfg = Debug|Any CPU
{4EFA7D3E-8B31-4BF7-96D1-B9F2867735C7}.Debug|x64.Build.0 = Debug|Any CPU
{4EFA7D3E-8B31-4BF7-96D1-B9F2867735C7}.Debug|x86.ActiveCfg = Debug|Any CPU
{4EFA7D3E-8B31-4BF7-96D1-B9F2867735C7}.Debug|x86.Build.0 = Debug|Any CPU
{4EFA7D3E-8B31-4BF7-96D1-B9F2867735C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4EFA7D3E-8B31-4BF7-96D1-B9F2867735C7}.Release|Any CPU.Build.0 = Release|Any CPU
{4EFA7D3E-8B31-4BF7-96D1-B9F2867735C7}.Release|x64.ActiveCfg = Release|Any CPU
{4EFA7D3E-8B31-4BF7-96D1-B9F2867735C7}.Release|x64.Build.0 = Release|Any CPU
{4EFA7D3E-8B31-4BF7-96D1-B9F2867735C7}.Release|x86.ActiveCfg = Release|Any CPU
{4EFA7D3E-8B31-4BF7-96D1-B9F2867735C7}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{9D758F00-17FF-433D-B088-F9C2D97C9BD1} = {3C312E42-9A47-4BED-8265-A405FCA6AFFF}
{468DB0E4-6221-4E01-BEFF-F452865E59C1} = {E8A2DF68-847A-4D88-B002-64FB666F696C}
{910E800A-59AE-46C4-B7C7-879986179246} = {E8A2DF68-847A-4D88-B002-64FB666F696C}
{305F640E-11BA-44F9-95E0-C6882E9CD151} = {3C312E42-9A47-4BED-8265-A405FCA6AFFF}
{4EFA7D3E-8B31-4BF7-96D1-B9F2867735C7} = {E8A2DF68-847A-4D88-B002-64FB666F696C}
EndGlobalSection
EndGlobal

1
isntest.session.sql Normal file
View File

@ -0,0 +1 @@
select * from ApiKLeys;

13
src/isn.abst/ApiIndexViewModel.cs Normal file
View File

@ -0,0 +1,13 @@
using Newtonsoft.Json;
namespace isn.Abstract
{
public class ApiIndexViewModel
{
[JsonProperty("version")]
public string Version { get; set; }
[JsonProperty("resources")]
public Resource[] Resources { get; set; }
}
}

8
src/isn.abst/Constants.cs Normal file
View File

@ -0,0 +1,8 @@
namespace isn.abst
{
public static class Constants
{
public const string PublishCommandId = "PackagePublish/2.0.0";
}
}

2
src/isnd/Controllers/Resource.cs → src/isn.abst/Resource.cs
View File

@ -1,6 +1,6 @@
using Newtonsoft.Json;
namespace isnd.Controllers
namespace isn.Abstract
{
public class Resource
{

11
src/isn.abst/isn.abst.csproj Normal file
View File

@ -0,0 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net4.7.2</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="11.0.1"/>
</ItemGroup>
</Project>

9
src/isn/IsnSourceSettings.cs Normal file
View File

@ -0,0 +1,9 @@
namespace isn
{
public class IsnSourceSettings
{
internal string Source { get; set; }
internal string[] Keys { get; set; }
}
}

8
src/isn/IsndErrorMessage.cs Normal file
View File

@ -0,0 +1,8 @@
namespace isn
{
public class IsndErrorMessage
{
public int ecode { get; set; }
public string msg { get; set; }
}
}

126
src/isn/Program.Commands.cs
View File

@ -1,126 +0,0 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Threading.Tasks;
using Mono.Options;
using Newtonsoft.Json;
namespace isn
{
partial class Program
{
private static void SourceList(IEnumerable<string> sargs)
{
throw new NotImplementedException();
}
private static object SourceAdd(IEnumerable<string> str)
{
throw new NotImplementedException();
}
private static object Add(IEnumerable<string> str)
{
throw new NotImplementedException();
}
private static async Task<List<PushReport>> PushPkgAsync(IEnumerable<string> pkgs)
{
List<PushReport> pushReports = new List<PushReport>();
foreach (string pkg in pkgs)
{
var report = await PushCommand.RunAsync(pkg, source, apiKey);
pushReports.Add(report);
}
if (storApiKey)
{
EnsureKeyStored();
}
return pushReports;
}
static OptionSet storeoptions = new OptionSet {
{ "s|source=", "use source", val => source = source ?? val },
{ "h|help", "show this message and exit", h => shouldShowPushHelp = h != null },
};
private static string _configFileName =
Path.Combine(
Path.Combine(Environment.GetFolderPath(
Environment.SpecialFolder.UserProfile), ".isn"),
"config.json")
;
public class IsnSourceSettings
{
internal string Source { get; set; }
internal string[] Keys { get; set; }
}
public static IEnumerable<IsnSourceSettings> Sources { get; protected set; }
private static void StoreApiKey(IEnumerable<string> storeArgs)
{
var args = storeoptions.Parse(storeArgs);
if (shouldShowPushHelp)
{
// output the options
Console.Error.WriteLine("Push Options:");
storeoptions.WriteOptionDescriptions(Console.Out);
}
else
{
apiKey = args[0];
EnsureKeyStored();
}
}
public static void EnsureKeyStored()
{
if (source == null) return;
if (Settings.Sources.ContainsKey(source))
{
if (apiKey == null)
{
// Une suppression
Settings.Sources.Remove(source);
if (Settings.DefaultSource == source) Settings.DefaultSource = null;
}
else
{
// Une mise À jour
string ptd = Protector.Protect(apiKey);
Settings.Sources[source].ApiKey = ptd;
if (Settings.DefaultSource == null) Settings.DefaultSource = source;
}
}
else if (apiKey != null)
{
// une addition
string ptd = Protector.Protect(apiKey);
Settings.Sources.Add(source, new SourceSettings { ApiKey = ptd });
}
else return;
FileInfo cfgSettingIf = new FileInfo(_configFileName);
if (!cfgSettingIf.Directory.Exists) cfgSettingIf.Directory.Create();
File.WriteAllText(
cfgSettingIf.FullName,
JsonConvert.SerializeObject(
Settings,
Formatting.Indented
));
}
public static void LoadConfig()
{
FileInfo cfgSettingIf = new FileInfo(_configFileName);
if (cfgSettingIf.Exists)
{
var json = File.ReadAllText(cfgSettingIf.FullName);
settings = JsonConvert.DeserializeObject<Settings>(json);
}
}
}
}

57
src/isn/Program.cs
View File

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Mono.Options;
using Newtonsoft.Json;
@ -8,6 +9,29 @@ namespace isn
{
partial class Program
{
public static IEnumerable<IsnSourceSettings> Sources { get; protected set; }
public static void LoadConfig()
{
FileInfo cfgSettingIf = new FileInfo(_configFileName);
if (cfgSettingIf.Exists)
{
var json = File.ReadAllText(cfgSettingIf.FullName);
settings = JsonConvert.DeserializeObject<Settings>(json);
}
}
static OptionSet storeoptions = new OptionSet {
{ "s|source=", "use source", val => source = source ?? val },
{ "h|help", "show this message and exit", h => shouldShowPushHelp = h != null },
};
private static string _configFileName =
Path.Combine(
Path.Combine(Environment.GetFolderPath(
Environment.SpecialFolder.UserProfile), ".isn"),
"config.json")
;
public const string push = "push";
static OptionSet options = new OptionSet {
{ "h|help", "show this message and exit", h => shouldShowHelp = h != null },
@ -23,6 +47,9 @@ namespace isn
{ "h|help", "show this message and exit", h => shouldShowSourceHelp = h != null },
};
static OptionSet showOptions = new OptionSet {
{ "h|help", "show this message and exit", h => shouldShowSourceHelp = h != null },
};
private static bool shouldShowHelp;
private static bool shouldShowSourceHelp;
@ -59,10 +86,37 @@ namespace isn
{
Run = sargs => SourceList(sargs)
};
var showconfig = new Command("config")
{
Run = sargs => ShowConfig()
};
var srcadd = new Command("add")
{
Run = sargs => SourceAdd(sargs)
};
var showCommand = new Command("show")
{
Run = sargs =>
{
var showCommandSet = new CommandSet("show")
{
showconfig
};
var pargs = showOptions.Parse(sargs);
if (shouldShowSourceHelp)
{
// output the options
Console.WriteLine("Sources Options:");
showOptions.WriteOptionDescriptions(Console.Out);
return;
}
showCommandSet.Run(pargs);
}
};
var srcCmd = new Command("sources")
{
Run = sargs =>
@ -73,6 +127,8 @@ namespace isn
srclst,
srcadd
};
var pargs = sourceoptions.Parse(sargs);
if (shouldShowSourceHelp)
{
@ -116,6 +172,7 @@ namespace isn
};
commandSet.Add(setapikey);
commandSet.Add(srcCmd);
commandSet.Add(showCommand);
List<string> extra;
try

13
src/isn/PushCommand.cs
View File

@ -1,5 +1,6 @@
using System;
using System.IO;
using System.Linq;
using System.Net;
using System.Threading.Tasks;
using Newtonsoft.Json;
@ -28,10 +29,16 @@ namespace isn
if (source == null)
{
source = Program.Settings.DefaultSource;
apikey = Program.Settings.Sources[source].ApiKey;
if (apikey is null) if (source!=null)
apikey = Program.Protector.UnProtect(Program.Settings.Sources[source].ApiKey);
}
if (apikey is null) if (source!=null)
if (Program.Settings.Sources.ContainsKey(source))
if (apikey is null) apikey = Program.Protector.UnProtect(Program.Settings.Sources[source].ApiKey);
apikey = Program.Protector.UnProtect(Program.Settings.Sources[source].ApiKey);
if (source == null) throw new InvalidOperationException("source is null");
var resources = await SourceHelpers.GetServerResourcesAsync(source);
if (resources.Resources==null || resources.Resources.Any(res => res.Id == "" ))
throw new InvalidOperationException("Source won't serve the expected push command");
wrqueryHandler.UploadFilesToServer(report, new Uri(source), fi, apikey);
}
catch (WebException ex)
@ -43,7 +50,7 @@ namespace isn
{
StreamReader sr = new StreamReader(respStream);
string json = sr.ReadToEnd();
var res = JsonConvert.DeserializeObject<NugetdErrorMessage>(json);
var res = JsonConvert.DeserializeObject<IsndErrorMessage>(json);
// ecode == 1 => package already present server side.
report.AlreadyPresent = res.ecode == 1;
report.Message = res.msg;

21
src/isn/SourceHelpers.cs Normal file
View File

@ -0,0 +1,21 @@
using System.Net.Http;
using System.Threading.Tasks;
using isn.Abstract;
using Newtonsoft.Json;
namespace isn
{
public static class SourceHelpers
{
public static async Task<ApiIndexViewModel> GetServerResourcesAsync(string url)
{
HttpClient client = new HttpClient();
client.DefaultRequestHeaders.Add("content-type","application/json; utf-8");
using (var indexResponse = await client.GetAsync(url))
{
var json = await indexResponse.Content.ReadAsStringAsync();
return JsonConvert.DeserializeObject<ApiIndexViewModel>(json);
}
}
}
}

7
src/isn/UploadFilesToServerUsingWebRequest.cs
View File

@ -7,12 +7,7 @@ using Newtonsoft.Json;
namespace isn
{
public class NugetdErrorMessage
{
public string versionId { get; set; }
public int ecode { get; set; }
public string msg { get; set; }
}
public class UploadFilesToServerUsingWebRequest
{
internal void UploadFilesToServer(PushReport report, Uri uri, FileInfo fi,

35
src/isn/commands/push.cs Normal file
View File

@ -0,0 +1,35 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Newtonsoft.Json;
namespace isn
{
partial class Program
{
private static async Task<List<PushReport>> PushPkgAsync(IEnumerable<string> pkgs)
{
List<PushReport> pushReports = new List<PushReport>();
foreach (string pkg in pkgs)
{
var report = await PushCommand.RunAsync(pkg, source, apiKey);
pushReports.Add(report);
}
if (storApiKey)
{
EnsureKeyStored();
}
return pushReports;
}
private static object Add(IEnumerable<string> str)
{
throw new NotImplementedException();
}
}
}

66
src/isn/commands/set-api-key.cs Normal file
View File

@ -0,0 +1,66 @@
using System;
using System.Collections.Generic;
using System.IO;
using Newtonsoft.Json;
namespace isn
{
partial class Program
{
private static void StoreApiKey(IEnumerable<string> storeArgs)
{
var args = storeoptions.Parse(storeArgs);
if (shouldShowPushHelp)
{
// output the options
Console.Error.WriteLine("Push Options:");
storeoptions.WriteOptionDescriptions(Console.Out);
}
else
{
apiKey = args[0];
EnsureKeyStored();
}
}
public static void EnsureKeyStored()
{
if (source == null) return;
if (Settings.Sources.ContainsKey(source))
{
if (apiKey == null)
{
// Une suppression
Settings.Sources.Remove(source);
if (Settings.DefaultSource == source) Settings.DefaultSource = null;
}
else
{
// Une mise À jour
string ptd = Protector.Protect(apiKey);
Settings.Sources[source].ApiKey = ptd;
if (Settings.DefaultSource == null) Settings.DefaultSource = source;
}
}
else if (apiKey != null)
{
// une addition
string ptd = Protector.Protect(apiKey);
Settings.Sources.Add(source, new SourceSettings { ApiKey = ptd });
}
else return;
FileInfo cfgSettingIf = new FileInfo(_configFileName);
if (!cfgSettingIf.Directory.Exists) cfgSettingIf.Directory.Create();
File.WriteAllText(
cfgSettingIf.FullName,
JsonConvert.SerializeObject(
Settings,
Formatting.Indented
));
}
}
}

19
src/isn/commands/show.config.cs Normal file
View File

@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using Newtonsoft.Json;
namespace isn
{
partial class Program
{
private static void ShowConfig()
{
Console.WriteLine(JsonConvert.SerializeObject(Settings));
}
}
}

25
src/isn/commands/sources.add.cs Normal file
View File

@ -0,0 +1,25 @@
using System;
using System.Collections.Generic;
using Newtonsoft.Json;
namespace isn
{
partial class Program
{
private static void SourceAdd(IEnumerable<string> str)
{
foreach (string arg in str)
{
if (Settings.Sources.ContainsKey(arg))
{
SourceSettings setting = Settings.Sources[arg];
throw new InvalidOperationException
(setting.Alias);
}
throw new NotImplementedException();
}
}
}
}

23
src/isn/commands/sources.list.cs Normal file
View File

@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Newtonsoft.Json;
namespace isn
{
partial class Program
{
private static void SourceList(IEnumerable<string> sargs)
{
IEnumerable<string> spec = sargs.Count()>0 ? sargs : Settings.Sources.Keys;
foreach (string arg in spec)
{
SourceSettings setting = Settings.Sources[arg];
Console.WriteLine(JsonConvert.SerializeObject(setting));
}
}
}
}

BIN
src/isn/isn.1.0.0.nupkg
View File

Binary file not shown.

9
src/isn/isn.csproj
View File

@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net472</TargetFramework>
<TargetFramework>net6</TargetFramework>
<RootNamespace>nuget_cli</RootNamespace>
<UserSecretsId>45b74c62-05bc-4603-95b4-3e80ae2fdf50</UserSecretsId>
<PackageVersion>1.0.1</PackageVersion>
@ -9,10 +10,16 @@
<PackageLicenseExpression>WTFPL</PackageLicenseExpression>
<IsTool>true</IsTool>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Mono.Options" Version="5.3.0" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
<PackageReference Include="unleash.client" Version="1.6.1" />
<Reference Include="System.Net.Http" Version="4.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="../isn.abst/isn.abst.csproj" />
</ItemGroup>
</Project>

2
src/isnd/Constants.cs
View File

@ -1,6 +1,6 @@
namespace isnd
{
public static class Constants
public static class IsndConstants
{
public const string AdministratorRoleName = "Admin";
public const string RequireAdminPolicyName = "RequireAdministratorRole";

4
src/isnd/Controllers/AccountController.cs
View File

@ -245,9 +245,9 @@ namespace isnd.Controllers
{
var user = await _userManager.FindByNameAsync(username);
var roles = await _userManager.GetRolesAsync(user);
if (!roles.Contains(Constants.AdministratorRoleName))
if (!roles.Contains(IsndConstants.AdministratorRoleName))
{
await _userManager.AddToRoleAsync(user, Constants.AdministratorRoleName);
await _userManager.AddToRoleAsync(user, IsndConstants.AdministratorRoleName);
}
return Ok();

2
src/isnd/Controllers/NewUpdateController.cs
View File

@ -9,7 +9,7 @@ namespace isnd.Controllers
// TODO Web hook CI
public class NewUpdateController : Controller
{
[Authorize(Policy = Constants.RequireAdminPolicyName)]
[Authorize(Policy = IsndConstants.RequireAdminPolicyName)]
public IActionResult NewRelease(NewReleaseInfo version)
{
throw new NotImplementedException("web hook");

3
src/isnd/Controllers/PackagesController.cs
View File

@ -15,6 +15,7 @@ using isnd.Services;
using isnd.ViewModels;
using System.Threading.Tasks;
using isnd.Interfaces;
using isn.Abstract;
namespace isnd.Controllers
{
@ -54,7 +55,7 @@ namespace isnd.Controllers
[HttpGet(_pkgRootPrefix + ApiConfig.Base)]
public IActionResult ApiIndex()
{
return Ok(new { version = "3.0.0", resources = _resources });
return Ok(new ApiIndexViewModel{ Version = "3.0.0", Resources = _resources });
}
// GET /autocomplete?id=isn.protocol&prerelease=true

1
src/isnd/Interfaces/IPackageManager.cs
View File

@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using isn.Abstract;
using isnd.Controllers;
using isnd.Data;
using isnd.Data.Catalog;

4
src/isnd/Services/PackageManager.cs
View File

@ -3,6 +3,8 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using isn.abst;
using isn.Abstract;
using isnd.Controllers;
using isnd.Data;
using isnd.Data.Catalog;
@ -41,7 +43,7 @@ namespace isnd.Services
new Resource
{
Id = extUrl + ApiConfig.Publish,
Type = "PackagePublish/2.0.0",
Type = Constants.PublishCommandId,
Comment = "Package Publish service"
});
// under dev, only leash in release mode

6
src/isnd/Startup.cs
View File

@ -58,9 +58,9 @@ namespace isnd
services.AddAuthorization(options =>
{
options.AddPolicy(Constants.RequireAdminPolicyName,
policy => policy.RequireRole(Constants.AdministratorRoleName));
options.AddPolicy(Constants.RequireValidApiKey, policy =>
options.AddPolicy(IsndConstants.RequireAdminPolicyName,
policy => policy.RequireRole(IsndConstants.AdministratorRoleName));
options.AddPolicy(IsndConstants.RequireValidApiKey, policy =>
policy.Requirements.Add(new ValidApiKeyRequirement()));
})

4
src/isnd/isnd.csproj
View File

@ -25,6 +25,10 @@
<PackageReference Include="unleash.client" Version="1.6.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="../isn.abst/isn.abst.csproj" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.1.1" />
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.1.0-preview1-final" />

17
test/isn.tests/Engine.cs
View File

@ -1,17 +0,0 @@
using static isn.tests.Tests;
namespace isn.tests
{
internal class Engine : INeedEngine
{
public Engine()
{
}
public object Parse(string code)
{
throw new System.NotImplementedException();
}
}
}

12
test/isn.tests/IBody.cs
View File

@ -1,12 +0,0 @@
namespace isn.tests
{
internal interface IBody
{
/// <summary>
/// The mult
/// </summary>
/// <returns></returns>
T Action<T>(T v);
}
}

11
test/isn.tests/IRing.cs
View File

@ -1,11 +0,0 @@
namespace isn.tests
{
internal interface IRing : IBody
{
IRing Add(IRing other);
IRing Mult<TBody>(TBody v);
}
}

29
test/isn.tests/Ring.cs
View File

@ -1,29 +0,0 @@
namespace isn.tests
{
internal class Body : IBody
{
static public Ring One { get ;}
public T Action<T>(T v)
{
throw new System.NotImplementedException();
}
}
internal class Ring : Body, IRing
{
public static IRing Zero => throw new System.NotImplementedException();
public IRing Add(IRing unity)
{
throw new System.NotImplementedException();
}
public IRing Mult<TBody>(TBody v)
{
throw new System.NotImplementedException();
}
}
}

61
test/isn.tests/UnitTest1.cs
View File

@ -1,25 +1,14 @@
using System;
using System.Data;
using System.IO;
using System.Text;
using System.Xml;
using NUnit.Framework;
namespace isn.tests
{
public class Tests
{
private const int V = 0;
private const int V1 = 1;
public interface INeedEngine
{
object Parse(string code);
}
[SetUp]
public void Setup()
{
}
private DataRow dataRow;
[Test]
public void HAveADefaultDataProtector()
@ -33,42 +22,18 @@ namespace isn.tests
Assert.Pass($"Good jod man! (decoding {protectedpass})");
}
// Not a [Test]
public void TestParseCplus()
{
INeedEngine engine = new Engine();
IRing c = new Ring();
Assert.Equals((INeedEngine)engine.Parse("c+"), c.Add(Ring.One));
}
public void AssertIRingIsABody()
{
Ring c = new Ring();
Ring one = Ring.One;
Assert.True(c.Mult(one).Equals(c));
}
public void AssertIRingIsARing()
{
AssertIRingIsABody();
Ring c = new Ring();
IRing zero = Ring.Zero;
Assert.True(c.Add(zero).Equals(c));
}
[Test]
public void AssertReadInput()
public void Test()
{
var oldOut = Console.Out;
StringBuilder censoredTxt = new StringBuilder();
var newOut = new StringWriter(censoredTxt);
Console.SetOut(newOut);
Console.WriteLine("~~censored~~");
Console.SetOut(oldOut);
Console.Write("Hello ");
Console.Write(censoredTxt);
}
System.Data.DataTable dataTable = new System.Data.DataTable();
dataTable.Columns.Add(new DataColumn("x"));
dataTable.Columns.Add(new DataColumn("y"));
dataRow = dataTable.NewRow();
dataRow[0]= 1;
dataRow[1]= 2;
dataTable.Rows.Add(dataRow);
}
}
}

2
test/isn.tests/isn.tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>net6</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

11
test/isnd.tests/UnitTestWebHost.cs
View File

@ -7,6 +7,7 @@ using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using System.Collections.Generic;
namespace isnd.host.tests
{
@ -44,5 +45,15 @@ namespace isnd.host.tests
.UseStartup<Startup>()
.Build();
private class Butts: List<Butt>
{
public bool Im12 { get; set; }
}
private class Butt
{
public bool Im12 { get; set; }
}
}
}

4
test/isnd.tests/isnd.tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>net6</TargetFramework>
<IsPackable>false</IsPackable>
<UserSecretsId>d7144e46-4e63-4391-ba86-64b61f6e7be4</UserSecretsId>
@ -28,7 +28,7 @@
<Target Name="CopyTestConfig">
<Copy
SourceFiles="@(MyTestingConfigFiles)"
DestinationFolder="bin\Debug\netcoreapp2.1"
DestinationFolder="bin\Debug\net6.0"
/>
</Target>
</Project>