Fix create/edit for ReferenceSourceLibraries,ReferenceAssemblies,Embe…

…ddedResources
cobbr · Jul 31, 2020 · 7d64880 · 7d64880
1 parent 720aa18
commit 7d64880
Show file tree

Hide file tree

Showing 13 changed files with 141 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -67,6 +67,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed POST /api/users API endpoint authentication issue
 - Fixed profiles using Cookie header
 - Fixed profile using curly brace character
+- Fix create/edit for ReferenceSourceLibraries,ReferenceAssemblies,EmbeddedResources
 
 ## [v0.5] - 2020-06-04
 ### Added

diff --git a/Covenant/Components/EmbeddedResources/CreateEmbeddedResource.razor b/Covenant/Components/EmbeddedResources/CreateEmbeddedResource.razor
@@ -0,0 +1,36 @@
+@page "/embeddedresource/create"
+@attribute [Authorize(Roles = "User, Administrator")]
+@inherits OwningComponentBase<ICovenantService>
+
+@using Covenant.Core
+@using Covenant.Models.Grunts
+@inject NavigationManager NavigationManager
+
+<div class="d-flex justify-content-between flex-wrap flex-md-nowrap pb-2 mb-3">
+    <h1 class="h2">Create EmbeddedResource</h1>
+</div>
+
+<EmbeddedResourceForm EmbeddedResource="EmbeddedResource" OnSubmit="OnCreate" SubmitIcon="plus" SubmitLabel="Create" />
+
+@code {
+    [Parameter]
+    public EmbeddedResource EmbeddedResource { get; set; }
+
+    protected override void OnInitialized()
+    {
+        this.EmbeddedResource = this.EmbeddedResource ?? new EmbeddedResource();
+    }
+
+    public async Task OnCreate(EmbeddedResource resource)
+    {
+        try
+        {
+            this.EmbeddedResource = await Service.CreateEmbeddedResource(resource);
+            NavigationManager.NavigateTo("/grunttask");
+        }
+        catch (Exception e) when (e is ControllerNotFoundException || e is ControllerBadRequestException || e is ControllerUnauthorizedException)
+        {
+            // return RedirectToAction(nameof(Edit), new { id = libraryModel.Id });
+        }
+    }
+}
diff --git a/Covenant/Components/EmbeddedResources/EditEmbeddedResource.razor b/Covenant/Components/EmbeddedResources/EditEmbeddedResource.razor
@@ -0,0 +1,39 @@
+@page "/embeddedresource/edit/{EmbeddedResourceId:int}"
+@attribute [Authorize(Roles = "User, Administrator")]
+@inherits OwningComponentBase<ICovenantService>
+
+@using Covenant.Core
+@using Covenant.Models.Grunts
+@inject NavigationManager NavigationManager
+
+<div class="d-flex justify-content-between flex-wrap flex-md-nowrap pb-2 mb-3">
+    <h1 class="h2">EmbeddedResource: <span  class="primary-color">@EmbeddedResource.Name</span></h1>
+</div>
+
+<EmbeddedResourceForm EmbeddedResource="EmbeddedResource" OnSubmit="OnEdit" SubmitIcon="edit" SubmitLabel="Edit" />
+
+@code {
+    [Parameter]
+    public int EmbeddedResourceId { get; set; }
+
+    [Parameter]
+    public EmbeddedResource EmbeddedResource { get; set; }
+
+    protected override async Task OnInitializedAsync()
+    {
+        this.EmbeddedResource = this.EmbeddedResource ?? await Service.GetEmbeddedResource(this.EmbeddedResourceId);
+    }
+
+    public async Task OnEdit(EmbeddedResource resource)
+    {
+        try
+        {
+            await Service.EditEmbeddedResource(resource);
+            NavigationManager.NavigateTo("/grunttask");
+        }
+        catch (Exception e) when (e is ControllerNotFoundException || e is ControllerBadRequestException || e is ControllerUnauthorizedException)
+        {
+            // return RedirectToAction(nameof(Edit), new { id = resource.Id });
+        }
+    }
+}
diff --git a/Covenant/Components/EmbeddedResources/EmbeddedResourceForm.razor b/Covenant/Components/EmbeddedResources/EmbeddedResourceForm.razor
@@ -0,0 +1,39 @@
+@using Microsoft.JSInterop
+@using Microsoft.AspNetCore.Components.Forms
+@using Covenant.Core
+@using Covenant.Models.Grunts
+@inject IJSRuntime IJSRuntime
+
+<EditForm Model="EmbeddedResource" OnValidSubmit="(e => this.OnSubmit.InvokeAsync(EmbeddedResource))">
+    <div class="form-row">
+        <div class="form-group col-md-4">
+            <label for="Name">Name</label>
+            <input id="Name" name="Name" @bind="EmbeddedResource.Name" class="form-control">
+            <div class="text-danger"><ValidationMessage For="() => EmbeddedResource.Name" /></div>
+        </div>
+    </div>
+    <div class="form-row">
+        <div class="form-group col-md-12">
+            <label for="Location">Location</label>
+            <input id="Location" name="Location" @bind="EmbeddedResource.Location" class="form-control">
+            <div class="text-danger"><ValidationMessage For="() => EmbeddedResource.Location" /></div>
+        </div>
+    </div>
+    <button type="submit" class="btn btn-primary">
+        <span class="fe fe-@SubmitIcon"></span> @SubmitLabel
+    </button>
+</EditForm>
+
+@code {
+    [Parameter]
+    public EmbeddedResource EmbeddedResource { get; set; }
+
+    [Parameter]
+    public string SubmitIcon { get; set; }
+
+    [Parameter]
+    public string SubmitLabel { get; set; }
+
+    [Parameter]
+    public EventCallback<EmbeddedResource> OnSubmit { get; set; }
+}
diff --git a/Covenant/Components/GruntTasks/CreateGruntTask.razor b/Covenant/Components/GruntTasks/CreateGruntTask.razor
@@ -29,7 +29,6 @@
         {
             await Service.CreateGruntTask(task);
             NavigationManager.NavigateTo("/grunttask");
-            this.StateHasChanged();
         }
         catch (Exception e) when (e is ControllerNotFoundException || e is ControllerBadRequestException || e is ControllerUnauthorizedException)
         {

diff --git a/Covenant/Components/GruntTasks/EditGruntTask.razor b/Covenant/Components/GruntTasks/EditGruntTask.razor
@@ -9,7 +9,7 @@
 @inject NavigationManager NavigationManager
 
 <div class="d-flex justify-content-between flex-wrap flex-md-nowrap pb-2 mb-3">
-    <h1 class="h2">GruntTask: <span id="task-name" class="primary-color">@GruntTask.Name</span></h1>
+    <h1 class="h2">GruntTask: <span class="primary-color">@GruntTask.Name</span></h1>
 </div>
 
 <GruntTaskForm GruntTask="GruntTask" OnSubmit="OnEdit" SubmitIcon="edit" SubmitLabel="Edit">

diff --git a/Covenant/Components/GruntTasks/GruntTaskIndex.razor b/Covenant/Components/GruntTasks/GruntTaskIndex.razor
@@ -73,24 +73,24 @@
     </div>
     <div class="tab-pane fade" id="libraries" role="tabpanel" aria-labelledby="libraries-tab">
         <ReferenceSourceLibraryTable ReferenceSourceLibraries="ReferenceSourceLibraries" />
-        <button href="/referencesourcelibrary/create" class="btn btn-primary">
+        <a href="/referencesourcelibrary/create" class="btn btn-primary">
             <span class="fe fe-plus"></span>
             Create
-        </button>
+        </a>
     </div>
     <div class="tab-pane fade" id="assemblies" role="tabpanel" aria-labelledby="assemblies-tab">
         <ReferenceAssemblyTable ReferenceAssemblies="ReferenceAssemblies" />
-        <button href="/referenceassembly/create" class="btn btn-primary">
+        <a href="/referenceassembly/create" class="btn btn-primary">
             <span class="fe fe-plus"></span>
             Create
-        </button>
+        </a>
     </div>
     <div class="tab-pane fade" id="resources" role="tabpanel" aria-labelledby="resources-tab">
         <EmbeddedResourceTable EmbeddedResources="EmbeddedResources" />
-        <button href="/embeddedresource/create" class="btn btn-primary">
+        <a href="/embeddedresource/create" class="btn btn-primary">
             <span class="fe fe-plus"></span>
             Create
-        </button>
+        </a>
     </div>
 </div>
 

diff --git a/Covenant/Components/ReferenceAssemblies/CreateReferenceAssembly.razor b/Covenant/Components/ReferenceAssemblies/CreateReferenceAssembly.razor
@@ -16,12 +16,17 @@
     [Parameter]
     public ReferenceAssembly ReferenceAssembly { get; set; }
 
+    protected override void OnInitialized()
+    {
+        this.ReferenceAssembly = this.ReferenceAssembly ?? new ReferenceAssembly();
+    }
+
     public async Task OnCreate(ReferenceAssembly assembly)
     {
         try
         {
             await Service.CreateReferenceAssembly(assembly);
-            NavigationManager.NavigateTo("/referenceassembly");
+            NavigationManager.NavigateTo("/grunttask");
         }
         catch (Exception e) when (e is ControllerNotFoundException || e is ControllerBadRequestException || e is ControllerUnauthorizedException)
         {

diff --git a/Covenant/Components/ReferenceAssemblies/EditReferenceAssembly.razor b/Covenant/Components/ReferenceAssemblies/EditReferenceAssembly.razor
@@ -7,7 +7,7 @@
 @inject NavigationManager NavigationManager
 
 <div class="d-flex justify-content-between flex-wrap flex-md-nowrap pb-2 mb-3">
-    <h1 class="h2">ReferenceAssembly: <span id="task-name" class="primary-color">@ReferenceAssembly.Name</span></h1>
+    <h1 class="h2">ReferenceAssembly: <span class="primary-color">@ReferenceAssembly.Name</span></h1>
 </div>
 
 <ReferenceAssemblyForm ReferenceAssembly="ReferenceAssembly" OnSubmit="OnEdit" SubmitIcon="edit" SubmitLabel="Edit" />

diff --git a/Covenant/Components/ReferenceAssemblies/ReferenceAssemblyForm.razor b/Covenant/Components/ReferenceAssemblies/ReferenceAssemblyForm.razor
@@ -36,7 +36,7 @@
             <div class="text-danger"><ValidationMessage For="() => ReferenceAssembly.Location" /></div>
         </div>
     </div>
-    <button type="button" class="btn btn-primary">
+    <button type="submit" class="btn btn-primary">
         <span class="fe fe-@SubmitIcon"></span> @SubmitLabel
     </button>
 </EditForm>

diff --git a/Covenant/Components/ReferenceSourceLibraries/CreateReferenceSourceLibrary.razor b/Covenant/Components/ReferenceSourceLibraries/CreateReferenceSourceLibrary.razor
@@ -4,6 +4,7 @@
 
 @using Covenant.Core
 @using Covenant.Models.Grunts
+@inject NavigationManager NavigationManager
 
 <div class="d-flex justify-content-between flex-wrap flex-md-nowrap pb-2 mb-3">
     <h1 class="h2">Create ReferenceSourceLibrary</h1>
@@ -15,17 +16,21 @@
     [Parameter]
     public ReferenceSourceLibrary ReferenceSourceLibrary { get; set; }
 
+    protected override void OnInitialized()
+    {
+        this.ReferenceSourceLibrary = this.ReferenceSourceLibrary ?? new ReferenceSourceLibrary();
+    }
+
     public async Task OnCreate(ReferenceSourceLibrary library)
     {
         try
         {
             this.ReferenceSourceLibrary = await Service.CreateReferenceSourceLibrary(library);
-            this.StateHasChanged();
-            // return View(await _context.EditReferenceSourceLibrary(library));
+            NavigationManager.NavigateTo("/grunttask");
         }
         catch (Exception e) when (e is ControllerNotFoundException || e is ControllerBadRequestException || e is ControllerUnauthorizedException)
         {
             // return RedirectToAction(nameof(Edit), new { id = libraryModel.Id });
         }
     }
-}
+}
diff --git a/Covenant/Components/ReferenceSourceLibraries/ReferenceSourceLibraryForm.razor b/Covenant/Components/ReferenceSourceLibraries/ReferenceSourceLibraryForm.razor
@@ -7,6 +7,7 @@
 @inject IJSRuntime IJSRuntime
 
 <EditForm Model="ReferenceSourceLibrary" OnValidSubmit="Submit">
+    <DataAnnotationsValidator />
     <div class="form-row">
         <div class="form-group col-md-4">
             <label for="Name">Name</label>
@@ -118,7 +119,7 @@
         }
         set
         {
-            if (value.Id > 0)
+            if (value != null && value.Id > 0)
             {
                 _ReferenceSourceLibrary = Service.GetReferenceSourceLibrary(value.Id).WaitResult();
             }

diff --git a/Covenant/Models/Grunts/GruntTaskComponents.cs b/Covenant/Models/Grunts/GruntTaskComponents.cs
@@ -131,7 +131,7 @@ public class ReferenceSourceLibrary : ISerializable<ReferenceSourceLibrary>
         public string Description { get; set; }
         public string Location { get; set; }
         public ImplantLanguage Language { get; set; } = ImplantLanguage.CSharp;
-        public List<Common.DotNetVersion> CompatibleDotNetVersions { get; set; }
+        public List<Common.DotNetVersion> CompatibleDotNetVersions { get; set; } = new List<Common.DotNetVersion> { Common.DotNetVersion.Net35, Common.DotNetVersion.Net40 };
 
         private List<ReferenceSourceLibraryReferenceAssembly> ReferenceSourceLibraryReferenceAssemblies { get; set; } = new List<ReferenceSourceLibraryReferenceAssembly>();
         private List<ReferenceSourceLibraryEmbeddedResource> ReferenceSourceLibraryEmbeddedResources { get; set; } = new List<ReferenceSourceLibraryEmbeddedResource>();