From 162d44acfe4e6d972e3511e0e0b55223a7267699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Minelli?= <git@minelli.me> Date: Tue, 30 Apr 2024 13:26:28 +0200 Subject: [PATCH] HttpManager => Send secret on request to API --- AssignmentChecker/src/config/Config.ts | 11 ++++++++++- AssignmentChecker/src/managers/HttpManager.ts | 2 ++ AssignmentChecker/src/shared | 2 +- AssignmentChecker/src/sharedByClients | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/AssignmentChecker/src/config/Config.ts b/AssignmentChecker/src/config/Config.ts index 729deac..ecca844 100644 --- a/AssignmentChecker/src/config/Config.ts +++ b/AssignmentChecker/src/config/Config.ts @@ -13,7 +13,11 @@ class Config { project: string; resultsVolume: string; resultsDojo: string; resultsExercise: string; }; - public dockerhub!: { + public readonly assignment: { + name: string; secret: string; + }; + + public readonly dockerhub: { repositories: { assignmentChecker: string } @@ -39,6 +43,11 @@ class Config { }; this.resetResultsVolume(); + this.assignment = { + name : process.env.DOJO_ASSIGNMENT_NAME || '', + secret: process.env.DOJO_ASSIGNMENT_SECRET || '' + }; + this.dockerhub = { repositories: { assignmentChecker: getEnvVar('DOCKERHUB_ASSIGNMENT_CHECKER_REPOSITORY', '') diff --git a/AssignmentChecker/src/managers/HttpManager.ts b/AssignmentChecker/src/managers/HttpManager.ts index 090ee1a..30f6519 100644 --- a/AssignmentChecker/src/managers/HttpManager.ts +++ b/AssignmentChecker/src/managers/HttpManager.ts @@ -41,6 +41,8 @@ class HttpManager { config.headers['Content-Type'] = 'multipart/form-data'; } + config.headers.assignmentsecret = Config.assignment.secret; + config.headers['client'] = 'DojoAssignmentChecker'; config.headers['client-version'] = version; } diff --git a/AssignmentChecker/src/shared b/AssignmentChecker/src/shared index 92008b2..937081e 160000 --- a/AssignmentChecker/src/shared +++ b/AssignmentChecker/src/shared @@ -1 +1 @@ -Subproject commit 92008b25753c96bef9917cd39baab3a4d160cd9c +Subproject commit 937081e68f6127b669daca30e57c43e73b9c96c9 diff --git a/AssignmentChecker/src/sharedByClients b/AssignmentChecker/src/sharedByClients index e549c7f..eedbe86 160000 --- a/AssignmentChecker/src/sharedByClients +++ b/AssignmentChecker/src/sharedByClients @@ -1 +1 @@ -Subproject commit e549c7f03955a2ac295a8b8486f921154af751ee +Subproject commit eedbe869a561f6e9a3b02fa9374cee425af27946 -- GitLab