Bump junit-jupiter-api from 5.8.2 to 5.9.0

.github/workflows/build-and-publish-dev.yml

@@ -0,0 +1,63 @@
+name: build-and-publish-dev
+on:
+  push:
+    branches:
+      - "dev"
+
+permissions:
+  contents: read
+  id-token: write
+
+jobs:
+  build-and-publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - id: "auth"
+        name: "Authenticate to Google Cloud"
+        uses: "google-github-actions/auth@v0"
+        with:
+          token_format: "access_token"
+          workload_identity_provider: ${{secrets.WORKLOAD_IDENTITY_PROVIDER_DEV}}
+          service_account: ${{secrets.SERVICE_ACCOUNT_ID_DEV}}
+
+      - name: Login to GCR
+        uses: docker/login-action@v2
+        with:
+          registry: us-docker.pkg.dev
+          username: oauth2accesstoken
+          password: ${{ steps.auth.outputs.access_token }}
+
+      - name: Set environment variables
+        uses: c-py/action-dotenv-to-setenv@v2
+        with:
+          env-file: .env
+
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Build Maven with Docker Profile
+        run: mvn clean install -Pdocker -DskipTests -B
+      - name: Build and push
+        uses: docker/bake-action@master
+        with:
+          push: true
+        env:
+          IMAGE_TOMCAT: us-docker.pkg.dev/elastic-infosec-dev/security-shepherd/security-shepherd:latest
+          IMAGE_MARIADB: us-docker.pkg.dev/elastic-infosec-dev/security-shepherd/security-shepherd_mariadb:latest
+          IMAGE_MONGO: us-docker.pkg.dev/elastic-infosec-dev/security-shepherd/security-shepherd_mongo:latest
+          CONTAINER_TOMCAT: secshep-tomcat
+          CONTAINER_MARIADB: secshep-mariadb
+          CONTAINER_MONGO: secshep-mongo
+          MONGO_BIND_ADDRESS: "0.0.0.0"
+      # - name: Setup tmate session
+      #   uses: mxschmitt/action-tmate@v3
+      #   with:
+      #     limit-access-to-actor: true
+      #   if: ${{ failure() }}

Dockerfile

@@ -25,7 +25,7 @@ COPY target/docker/tomcat/$TLS_KEYSTORE_FILE $TLS_KEYSTORE_FILE
 COPY docker/tomcat/serverxml.patch serverxml.patch
 COPY docker/tomcat/webxml.patch webxml.patch
 
-RUN printf "databaseConnectionURL=$MARIADB_URI/\nDriverType=$DB_DRIVER\ndatabaseSchema=$DB_SCHEMA\ndatabaseUsername=$DB_USER\ndatabasePassword=$DB_PASS\ndatabaseOptions=useUnicode=true&character_set_server=utf8mb4\n" >> database.properties
+# RUN printf "databaseConnectionURL=$MARIADB_URI/\nDriverType=$DB_DRIVER\ndatabaseSchema=$DB_SCHEMA\ndatabaseUsername=$DB_USER\ndatabasePassword=$DB_PASS\ndatabaseOptions=useUnicode=true&character_set_server=utf8mb4\n" >> database.properties
 RUN printf "connectionHost=$MONGO_HOST\nconnectionPort=$MONGO_PORT\ndatabaseName=shepherdGames\nconnectTimeout=$MONGO_CONN_TIMEOUT\nsocketTimeout=$MONGO_SOCK_TIMEOUT\nserverSelectionTimeout=$MONGO_SVR_TIMEOUT"  >> mongo.properties
 RUN sed -i 's/keystoreFile="conf\/TLS_KEYSTORE_FILE" keystorePass="TLS_KEYSTORE_PASS" keyAlias="ALIAS">/keystoreFile="conf\/'"$TLS_KEYSTORE_FILE"'" keystorePass="'"$TLS_KEYSTORE_PASS"'" keyAlias="'"$ALIAS"'">/g' serverxml.patch &&\
     sed -i 's/redirectPort="HTTPS_PORT" \/>/redirectPort="'"$HTTPS_PORT"'" \/>/g' serverxml.patch
@@ -35,7 +35,7 @@ COPY --from=builder /workdir/ROOT.war /usr/local/tomcat/webapps/
 COPY --from=builder /workdir/$TLS_KEYSTORE_FILE /usr/local/tomcat/conf/
 COPY --from=builder /workdir/serverxml.patch /usr/local/tomcat/conf/
 COPY --from=builder /workdir/webxml.patch /usr/local/tomcat/conf/
-COPY --from=builder /workdir/database.properties /usr/local/tomcat/conf/
+# COPY --from=builder /workdir/database.properties /usr/local/tomcat/conf/
 COPY --from=builder /workdir/mongo.properties /usr/local/tomcat/conf/
 
 ENV RUN_USER tomcat

pom.xml

@@ -327,7 +327,7 @@
 					<plugin>
 						<groupId>io.fabric8</groupId>
 						<artifactId>docker-maven-plugin</artifactId>
-						<version>0.40.1</version>
+						<version>0.40.2</version>
 						<executions>
 							<execution>
 								<id>start</id>

src/main/webapp/css/lessonCss/theCss.css

@@ -39,7 +39,7 @@ p, ul, ol {
 }
 
 a {
-	color: #9B1AC8;
+	color: #FF957D;
 	word-wrap: break-word;
 }
 
@@ -49,7 +49,6 @@ b {
 
 a:hover {
 	text-decoration: none;
-	color: #E6B715;
 }
 
 td {
@@ -70,7 +69,7 @@ td {
 
 #header h1, #header p {
 	margin: 0;
-	color: #A878EF;
+	color: #FA744E;
 }
 
 #header h1 {
@@ -83,7 +82,7 @@ td {
 }
 
 #header a {
-	color: #A878EF;
+	color: #FA744E;
 	text-decoration: none;
 }
 
@@ -131,7 +130,7 @@ td {
 .title {
 	margin: 0;
 	padding-bottom: 5px;
-	border-bottom: 2px solid #A878EF;
+	border-bottom: 2px solid #FA744E;
 }
 
 #sidebar {
@@ -196,4 +195,4 @@ td {
 	word-wrap: break-word;
 	z-index: 1000000;
 	-webkit-font-smoothing: subpixel-antialiased;
-}
+}

src/main/webapp/css/theCss.css

@@ -39,12 +39,11 @@ p, ul, ol {
 }
 
 a {
-	color: #9B1AC8;
+	color: #FF957D;
 }
 
 a:hover {
 	text-decoration: none;
-	color: #E6B715;
 }
 
 #wrapper {
@@ -54,14 +53,14 @@ a:hover {
 
 #header {
 	width: 757px;
-	height: 240px;
+	height: 340px;
 	margin: 0 auto;
 	background: url(images/shepherd_and_sheep_v2.png) no-repeat right top;
 }
 
 #header h1, #header p {
 	margin: 0;
-	color: #A878EF;
+	color: #FA744E;
 }
 
 #header h1 {
@@ -74,7 +73,7 @@ a:hover {
 }
 
 #header a {
-	color: #A878EF;
+	color: #FA744E;
 	text-decoration: none;
 }
 
@@ -116,7 +115,7 @@ a:hover {
 .title {
 	margin: 0;
 	padding-bottom: 5px;
-	border-bottom: 2px solid #A878EF;
+	border-bottom: 2px solid #FA744E;
 }
 
 #sidebar {
@@ -196,30 +195,27 @@ a:hover {
 
 .menuButton {
 	display: block;
-	border-bottom: 3px solid #A878EF;
-	background: #D4D4D4;
+	background: #0077CC;
 	padding: 5px 5px;
 	border-radius: 5px;
-	color: black;
-	font-size: 1.5em;
+	color: white;
 	text-align: center;
 	text-decoration: none;
 	vertical-align: middle;
 	margin-bottom: 5px;
 }
 
 .menuButton:hover {
-	border-top-color: #CC99FF;
-	background: #BFBFBF;
+	background: #005A9E;
 }
 
 .menuButton:active {
-	border-top-color: #8660BF;
-	background: #8660BF;
+	border-top-color: #005A9E;
+	background: #005A9E;
 }
 
 .scoreBar {
-	background-color: #965BED;
+	background-color: #FA744E;
 	height: 30px;
 	position: relative;
 	font-size: 25px;
@@ -234,7 +230,7 @@ a:hover {
 }
 
 .scoreBar:hover {
-	background-color: #AC7DF2;
+	background-color: #F990C6;
 	height: 30px;
 	position: relative;
 	font-size: 25px;
@@ -332,9 +328,9 @@ a:hover {
 
 .informationBox {
 	display: block; margin 0;
-	border-color: #A878EF;
+	border-color: #FA744E;
 	border-style: dashed;
-	background-color: #D4D4D4;
+	background-color: #E6EbF2;
 	padding-top: 5px;
 	padding-bottom: 5px;
 	padding-right: 5px;
@@ -345,9 +341,9 @@ a:hover {
 .cheatBox {
 	float: right; margin 0;
 	width: 685px;
-	border-color: #A878EF;
+	border-color: #FA744E;
 	border-style: dashed;
-	background-color: #D4D4D4;
+	background-color: #E6EBF2;
 	padding-top: 5px;
 	padding-bottom: 5px;
 	padding-right: 5px;
@@ -498,4 +494,4 @@ a:hover {
 		width: 100%;
 		margin-top: 0;
 	}
-}
+}

src/main/webapp/index.jsp

@@ -61,7 +61,7 @@ if (request.getSession() != null)
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<title>OWASP Security Shepherd</title>
+<title>Elastic CTF - Powered by OWASP Security Shepherd</title>
 
 <!-- 
 			<fmt:message key="generic.text.commentMessage.1" /> 
@@ -90,7 +90,6 @@ if (request.getSession() != null)
 	<div id="wrapper">
 		<jsp:include page="translation-select.jsp" />
 		<div id="header">
-			<h1>Security Shepherd</h1>
 			<div style="position: absolute; top: 12px; right: 130px;">
 				<p>
 					<strong><%= userName %>&nbsp;&#x7c;&nbsp;<a