Enowars5

.dockerignore

@@ -1,8 +1,9 @@
 .dockerignore
 Dockerfile
 docker-compose.yml
-bin/
-obj/
+**/bin/
+**/obj/
+**/node_modules/**/*
 .vs
 .vs-code
 .git
@@ -17,6 +18,4 @@ obj/
 /EnoLandingPageFrontend/bin
 /EnoLandingPageFrontend/obj
 /data
-/scoreboard
-/sessions
-
+/sessions

.github/workflows/docker-build.yml

@@ -0,0 +1,22 @@
+name: docker-compose build
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: add .env file
+        run: touch .env
+      - name: run docker-compose build
+        run: docker-compose build

.gitignore

@@ -351,9 +351,13 @@ MigrationBackup/
 
 # EnoLandingPage
 /EnoLandingPageBackend/data
+/EnoLandingPageBackend/enginedata/*.json
 /EnoLandingPageBackend/appsettings.Development.json
 /EnoLandingPageBackend/wwwroot
 /data
 /scoreboard
 /sessions
-docker-compose.yml
+.env
+mock/*.json
+mock/*.info
+

.gitpod.Dockerfile

@@ -0,0 +1,8 @@
+FROM gitpod/workspace-full
+
+# From https://github.com/gitpod-io/workspace-images/blob/master/dotnet-lts/Dockerfile
+USER gitpod
+RUN mkdir -p /home/gitpod/dotnet && curl -fsSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin -c 5.0 --install-dir /home/gitpod/dotnet
+ENV DOTNET_ROOT=/home/gitpod/dotnet
+ENV PATH=$PATH:/home/gitpod/dotnet
+RUN npm install -g @angular/cli

.gitpod.yml

@@ -0,0 +1,60 @@
+
+image:
+  file: .gitpod.Dockerfile
+
+# List the start up tasks. Learn more https://www.gitpod.io/docs/config-start-tasks/
+tasks:
+  - name: Setup
+    before: | 
+      dotnet tool install --global dotnet-ef
+      export PATH="$PATH:$HOME/.dotnet/tools/"
+      cp example.env .env
+  - name: Run Mock
+    before: | 
+      cd mock
+      python3 simulate_ctf.py
+  - name: Frontend
+    env:
+      NG_CLI_ANALYTICS: ci
+    before: |
+      cd EnoLandingPageBackend/ClientApp
+      npm install
+      npm run build
+    command: |
+      cd EnoLandingPageBackend/ClientApp
+      npm start
+  - name: Backend
+    before: |
+      mkdir EnoLandingPageBackend/data
+      cp EnoLandingPageBackend/appsettings.example.json EnoLandingPageBackend/appsettings.Development.json
+    command: |
+      cd EnoLandingPageBackend
+      dotnet watch run
+    openMode: split-right
+
+# List the ports to expose. Learn more https://www.gitpod.io/docs/config-ports/
+ports:
+  - port: 5000
+    onOpen: notify
+  - port: 5001
+    onOpen: ignore
+  - port: 4200
+    onOpen: ignore
+
+vscode:
+  extensions:
+    - ms-azuretools.vscode-docker
+    - angular.ng-template
+    - esbenp.prettier-vscode
+    - k--kato.docomment
+    - https://github.com/OmniSharp/omnisharp-vscode/releases/download/v1.23.12/csharp-1.23.12.vsix
+
+github:
+  prebuilds:
+    master: true
+    branches: true
+    pullRequests: true
+    pullRequestsFromForks: true
+    addCheck: false
+    addComment: false
+    addBadge: true

Dockerfile

@@ -1,26 +1,50 @@
-FROM mcr.microsoft.com/dotnet/sdk:5.0-focal AS build
+# Build Backend Portal
+FROM mcr.microsoft.com/dotnet/sdk:5.0-focal AS backend-build
+RUN curl -sL https://deb.nodesource.com/setup_14.x |  bash -
+RUN apt-get install -y nodejs
 WORKDIR /src
-
+ARG NO_WEB_APP=true
 # Fetch deps
 COPY EnoLandingPage.sln EnoLandingPage.sln
 COPY EnoLandingPageBackend/EnoLandingPageBackend.csproj EnoLandingPageBackend/EnoLandingPageBackend.csproj
-COPY EnoLandingPageCore/EnoLandingPageCore.csproj EnoLandingPageCore/EnoLandingPageCore.csproj
-COPY EnoLandingPageFrontend/EnoLandingPageFrontend.csproj EnoLandingPageFrontend/EnoLandingPageFrontend.csproj
 RUN dotnet restore
 
 # Publish
 COPY EnoLandingPageBackend EnoLandingPageBackend
-COPY EnoLandingPageCore EnoLandingPageCore
-COPY EnoLandingPageFrontend EnoLandingPageFrontend
 COPY Directory.Build.props Directory.Build.props
 COPY ENOWARS.ruleset ENOWARS.ruleset
 COPY stylecop.json stylecop.json
 RUN dotnet publish -c Release -o /app
 
-# Copy to runtime container
+# Build Frontend in extra storage for improved caching
+FROM node:14 AS build
+WORKDIR /usr/src/app
+COPY EnoLandingPageBackend/ClientApp/package.json EnoLandingPageBackend/ClientApp/package-lock.json ./
+RUN npm install
+COPY EnoLandingPageBackend/ClientApp .
+RUN npm run build
+
+
+# Build runtime container
 FROM mcr.microsoft.com/dotnet/aspnet:5.0
 WORKDIR /app
+RUN apt-get update && apt-get install gettext-base -y && apt-get clean
+
+# Create data folder if not run as mapped volume
+RUN mkdir ./data
 EXPOSE 80
-COPY --from=build /app .
+
+ENV STATIC_HOSTING=false
+ENV ENVSUBST_OUTPUT_DIR=/app/ClientApp/dist/ClientApp
+
+COPY ./substitute_variables.sh /substitute_variables.sh
+RUN chmod +x /substitute_variables.sh
+
+# Copy files from other stages
+COPY --from=backend-build /app .
+COPY --from=build /usr/src/app/dist/ClientApp/index.html /template/index.html
+COPY --from=build /usr/src/app/dist /app/ClientApp/dist
+COPY ./customization /app/ClientApp/dist/ClientApp/assets/customization
 COPY EnoLandingPageBackend/appsettings.json .
-ENTRYPOINT ["dotnet", "EnoLandingPageBackend.dll"]
+# ENTRYPOINT ["dotnet", "EnoLandingPageBackend.dll"]
+ENTRYPOINT ["/bin/sh", "-c" , "/substitute_variables.sh && dotnet EnoLandingPageBackend.dll"]

EnoLandingPage.sln

@@ -3,12 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30711.63
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EnoLandingPageCore", "EnoLandingPageCore\EnoLandingPageCore.csproj", "{7972F197-F59D-41D8-98C2-CD618BA9AF43}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EnoLandingPageBackend", "EnoLandingPageBackend\EnoLandingPageBackend.csproj", "{10C14526-179D-4627-9891-F2B25F353260}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EnoLandingPageFrontend", "EnoLandingPageFrontend\EnoLandingPageFrontend.csproj", "{B36F02C0-04D2-4F73-A40A-73DC0EFBEB8A}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6D9FEE9F-BA38-439F-91EE-B9AB1CEE9EE9}"
 	ProjectSection(SolutionItems) = preProject
 		Directory.Build.props = Directory.Build.props
@@ -20,18 +16,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7972F197-F59D-41D8-98C2-CD618BA9AF43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7972F197-F59D-41D8-98C2-CD618BA9AF43}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7972F197-F59D-41D8-98C2-CD618BA9AF43}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7972F197-F59D-41D8-98C2-CD618BA9AF43}.Release|Any CPU.Build.0 = Release|Any CPU
 		{10C14526-179D-4627-9891-F2B25F353260}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{10C14526-179D-4627-9891-F2B25F353260}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{10C14526-179D-4627-9891-F2B25F353260}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{10C14526-179D-4627-9891-F2B25F353260}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B36F02C0-04D2-4F73-A40A-73DC0EFBEB8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B36F02C0-04D2-4F73-A40A-73DC0EFBEB8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B36F02C0-04D2-4F73-A40A-73DC0EFBEB8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B36F02C0-04D2-4F73-A40A-73DC0EFBEB8A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

EnoLandingPageBackend/Cache/AttackCache.cs

@@ -0,0 +1,62 @@
+
+namespace EnoLandingPageBackend.Cache
+{
+    using System;
+    using System.Threading.Tasks;
+    using Microsoft.Extensions.Caching.Memory;
+    public class CustomMemoryCache<T>
+    {
+        private readonly string defaultKey = "default";
+        private MemoryCache _cache { get; set; }
+        public CustomMemoryCache()
+        {
+            _cache = new MemoryCache(new MemoryCacheOptions
+            {
+                SizeLimit = 1024
+            });
+        }
+
+        public T TryGetDefault()
+        {
+            T cacheEntry;
+            this._cache.TryGetValue(defaultKey, out cacheEntry);
+            return cacheEntry;
+        }
+        public void InvalidateDefault()
+        {
+            this._cache.Remove(defaultKey);
+        }
+
+        public void CreateDefault(T attackInfo)
+        {
+            var cacheEntryOptions = new MemoryCacheEntryOptions()
+                .SetSize(1);
+            _cache.Set(this.defaultKey, attackInfo, cacheEntryOptions);
+        }
+
+        public T GetOrCreate(object key, Func<T> createItem)
+        {
+            T cacheEntry;
+            if (!_cache.TryGetValue(key, out cacheEntry))// Look for cache key.
+            {
+                cacheEntry = createItem();
+
+                var cacheEntryOptions = new MemoryCacheEntryOptions()
+                    .SetSize(1)
+                    .SetPriority(CacheItemPriority.Normal);
+
+                _cache.Set(key, cacheEntry, cacheEntryOptions);
+            }
+            return cacheEntry;
+        }
+
+        public async Task<T> GetOrCreateAsync(object key, Func<Task<T>> createItem)
+        {
+            var func = await createItem();
+            return this.GetOrCreate(key, () =>
+            {
+                return func;
+            });
+        }
+    }
+}

EnoLandingPageBackend/Cache/ScoreboardCache.cs

@@ -0,0 +1,63 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Options;
+
+namespace EnoLandingPageBackend.Cache
+{
+    public class ScoreboardCache
+    {
+        private readonly string defaultKey = "default";
+        private MemoryCache _cache { get; set; }
+        public ScoreboardCache()
+        {
+            _cache = new MemoryCache(new MemoryCacheOptions
+            {
+                SizeLimit = 1024
+            });
+        }
+
+        public string TryGetDefault()
+        {
+            string cacheEntry;
+            this._cache.TryGetValue(defaultKey, out cacheEntry);
+            return cacheEntry;
+        }
+        public void InvalidateDefault()
+        {
+            this._cache.Remove(defaultKey);
+        }
+
+        public void CreateDefault(string scoreboard)
+        {
+            var cacheEntryOptions = new MemoryCacheEntryOptions()
+                .SetSize(1);
+            _cache.Set(this.defaultKey, scoreboard, cacheEntryOptions);
+        }
+
+        public string GetOrCreate(object key, Func<string> createItem)
+        {
+            string cacheEntry;
+            if (!_cache.TryGetValue(key, out cacheEntry))// Look for cache key.
+            {
+                cacheEntry = createItem();
+
+                var cacheEntryOptions = new MemoryCacheEntryOptions()
+                    .SetSize(1)
+                    .SetPriority(CacheItemPriority.Normal);
+
+                _cache.Set(key, cacheEntry, cacheEntryOptions);
+            }
+            return cacheEntry;
+        }
+
+        public async Task<string> GetOrCreateAsync(object key, Func<Task<string>> createItem)
+        {
+            var func = await createItem();
+            return this.GetOrCreate(key, () =>
+            {
+                return func;
+            });
+        }
+    }
+}

EnoLandingPageBackend/ClientApp/.browserslistrc

@@ -0,0 +1,17 @@
+# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
+# For additional information regarding the format and rule options, please see:
+# https://github.com/browserslist/browserslist#queries
+
+# For the full list of supported browsers by the Angular framework, please see:
+# https://angular.io/guide/browser-support
+
+# You can see what browsers were selected by your queries by running:
+#   npx browserslist
+
+last 1 Chrome version
+last 1 Firefox version
+last 2 Edge major versions
+last 2 Safari major versions
+last 2 iOS major versions
+Firefox ESR
+not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.

EnoLandingPageBackend/ClientApp/.editorconfig

@@ -0,0 +1,16 @@
+# Editor configuration, see https://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.ts]
+quote_type = single
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false