Fix failing actions: revert to Java 17 and add proper RestTemplate mocking in Challenge59 tests

Co-authored-by: commjoen <[email protected]>

Author: Copilot

pom.xml

@@ -57,7 +57,7 @@
     <gcp.sdk.version>7.2.0</gcp.sdk.version>
     <github.button.version>2.14.1</github.button.version>
     <io.netty.version>4.1.118.Final</io.netty.version>
-    <java.version>23</java.version>
+    <java.version>17</java.version>
     <jquery.version>3.7.1</jquery.version>
     <jruby.version>10.0.2.0</jruby.version>
     <lombok.version>1.18.38</lombok.version>

src/main/java/org/owasp/wrongsecrets/challenges/docker/Challenge59.java

@@ -29,6 +29,11 @@ public Challenge59() {
         .build();
   }
 
+  // Constructor for testing with mocked RestTemplate
+  Challenge59(RestTemplate restTemplate) {
+    this.restTemplate = restTemplate;
+  }
+
   /** {@inheritDoc} */
   @Override
   public Spoiler spoiler() {

src/test/java/org/owasp/wrongsecrets/challenges/docker/Challenge59Test.java

@@ -1,30 +1,74 @@
 package org.owasp.wrongsecrets.challenges.docker;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
+import java.util.Map;
 import org.junit.jupiter.api.Test;
 import org.owasp.wrongsecrets.challenges.Spoiler;
+import org.springframework.web.client.RestClientException;
+import org.springframework.web.client.RestTemplate;
 
 class Challenge59Test {
 
   @Test
   void spoilerShouldRevealAnswer() {
-    var challenge = new Challenge59();
+    var restTemplate = mock(RestTemplate.class);
+    // Mock to avoid any real API calls
+    when(restTemplate.getForObject(any(String.class), eq(Map.class)))
+        .thenReturn(null);
+    var challenge = new Challenge59(restTemplate);
 
     assertThat(challenge.spoiler()).isEqualTo(new Spoiler("telegram_secret_found_in_channel"));
   }
 
   @Test
   void rightAnswerShouldSolveChallenge() {
-    var challenge = new Challenge59();
+    var restTemplate = mock(RestTemplate.class);
+    // Mock to avoid any real API calls
+    when(restTemplate.getForObject(any(String.class), eq(Map.class)))
+        .thenReturn(null);
+    var challenge = new Challenge59(restTemplate);
 
     assertThat(challenge.answerCorrect("telegram_secret_found_in_channel")).isTrue();
   }
 
   @Test
   void incorrectAnswerShouldNotSolveChallenge() {
-    var challenge = new Challenge59();
+    var restTemplate = mock(RestTemplate.class);
+    // Mock to avoid any real API calls
+    when(restTemplate.getForObject(any(String.class), eq(Map.class)))
+        .thenReturn(null);
+    var challenge = new Challenge59(restTemplate);
 
     assertThat(challenge.answerCorrect("wrong answer")).isFalse();
   }
+
+  @Test
+  void shouldReturnSecretWhenTelegramApiSucceeds() {
+    var restTemplate = mock(RestTemplate.class);
+    var challenge = new Challenge59(restTemplate);
+    
+    // Mock successful API response
+    Map<String, Object> mockResponse = Map.of("ok", true);
+    when(restTemplate.getForObject(any(String.class), eq(Map.class)))
+        .thenReturn(mockResponse);
+
+    assertThat(challenge.spoiler().solution()).isEqualTo("telegram_secret_found_in_channel");
+  }
+
+  @Test
+  void shouldReturnFallbackSecretWhenTelegramApiFails() {
+    var restTemplate = mock(RestTemplate.class);
+    var challenge = new Challenge59(restTemplate);
+    
+    // Mock API failure
+    when(restTemplate.getForObject(any(String.class), eq(Map.class)))
+        .thenThrow(new RestClientException("Network error"));
+
+    assertThat(challenge.spoiler().solution()).isEqualTo("telegram_secret_found_in_channel");
+  }
 }