fix(runner): pass token in PUT request

semaphoreui · Jan 7, 2024 · f7da53c · f7da53c
1 parent 7d99fd2
commit f7da53c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/api/runners/runners.go b/api/runners/runners.go
@@ -15,6 +15,13 @@ func RunnerMiddleware(next http.Handler) http.Handler {
 
 		token := r.Header.Get("X-API-Token")
 
+		if token == "" {
+			helpers.WriteJSON(w, http.StatusUnauthorized, map[string]string{
+				"error": "Invalid token",
+			})
+			return
+		}
+
 		runnerID, err := helpers.GetIntParam("runner_id", w, r)
 
 		if err != nil {
@@ -28,16 +35,16 @@ func RunnerMiddleware(next http.Handler) http.Handler {
 
 		runner, err := store.GetGlobalRunner(runnerID)
 
-		if runner.Token != token {
-			helpers.WriteJSON(w, http.StatusUnauthorized, map[string]string{
-				"error": "Invalid token",
+		if err != nil {
+			helpers.WriteJSON(w, http.StatusNotFound, map[string]string{
+				"error": "Runner not found",
 			})
 			return
 		}
 
-		if err != nil {
-			helpers.WriteJSON(w, http.StatusNotFound, map[string]string{
-				"error": "Runner not found",
+		if runner.Token != token {
+			helpers.WriteJSON(w, http.StatusUnauthorized, map[string]string{
+				"error": "Invalid token",
 			})
 			return
 		}

diff --git a/services/runners/JobPool.go b/services/runners/JobPool.go
@@ -298,6 +298,8 @@ func (p *JobPool) sendProgress() {
 		return
 	}
 
+	req.Header.Set("X-API-Token", p.config.Token)
+
 	resp, err := client.Do(req)
 	if err != nil {
 		fmt.Println("Error making request:", err)
@@ -312,6 +314,8 @@ func (p *JobPool) tryRegisterRunner() bool {
 		return true
 	}
 
+	log.Info("Trying to register on server")
+
 	if os.Getenv("SEMAPHORE_RUNNER_ID") != "" {
 
 		runnerId, err := strconv.Atoi(os.Getenv("SEMAPHORE_RUNNER_ID"))
@@ -328,9 +332,9 @@ func (p *JobPool) tryRegisterRunner() bool {
 			RunnerID: runnerId,
 			Token:    os.Getenv("SEMAPHORE_RUNNER_TOKEN"),
 		}
-	}
 
-	log.Info("Trying to register on server")
+		return true
+	}
 
 	_, err := os.Stat(util.Config.Runner.ConfigFile)
 
@@ -375,14 +379,12 @@ func (p *JobPool) tryRegisterRunner() bool {
 	req, err := http.NewRequest("POST", url, bytes.NewBuffer(jsonBytes))
 	if err != nil {
 		log.Error("Error creating request:", err)
-		//fmt.Println("Error creating request:", err)
 		return false
 	}
 
 	resp, err := client.Do(req)
 	if err != nil || resp.StatusCode != 200 {
 		log.Error("Error making request:", err)
-		//fmt.Println("Error making request:", err)
 		return false
 	}