Travis now builds Docker and create a Github release.

Removed ActiveMQ between WebGoat and WebWolf they now act as standalone applications

webgoat-lessons/webwolf-introduction/src/main/java/org/owasp/webgoat/plugin/Email.java

@@ -0,0 +1,18 @@
+package org.owasp.webgoat.plugin;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Builder
+@Data
+public class Email implements Serializable {
+
+    private LocalDateTime time;
+    private String contents;
+    private String sender;
+    private String title;
+    private String recipient;
+}

webgoat-lessons/webwolf-introduction/src/main/java/org/owasp/webgoat/plugin/MailAssignment.java

@@ -1,15 +1,14 @@
 package org.owasp.webgoat.plugin;
 
-import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.owasp.webgoat.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.assignments.AssignmentPath;
 import org.owasp.webgoat.assignments.AttackResult;
-import org.owasp.webgoat.mail.IncomingMailEvent;
-import org.springframework.jms.core.JmsTemplate;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.client.RestTemplate;
 
 import java.time.LocalDateTime;
 
@@ -18,29 +17,33 @@ import java.time.LocalDateTime;
  * @since 8/20/17.
  */
 @AssignmentPath("/WebWolf/mail")
-@AllArgsConstructor
 public class MailAssignment extends AssignmentEndpoint {
 
-    private JmsTemplate jmsTemplate;
+    private final String webWolfURL;
+    private RestTemplate restTemplate;
+
+    public MailAssignment(RestTemplate restTemplate, @Value("${webwolf.url}") String webWolfURL) {
+        this.restTemplate = restTemplate;
+        this.webWolfURL = webWolfURL;
+    }
 
     @PostMapping("send")
     @ResponseBody
     public AttackResult sendEmail(@RequestParam String email) {
         String username = email.substring(0, email.indexOf("@"));
         if (username.equals(getWebSession().getUserName())) {
-            IncomingMailEvent mailEvent = IncomingMailEvent.builder()
+            Email mailEvent = Email.builder()
                     .recipient(username)
                     .title("Test messages from WebWolf")
                     .time(LocalDateTime.now())
                     .contents("This is a test message from WebWolf, your unique code is" + StringUtils.reverse(username))
                     .sender("webgoat@owasp.org")
                     .build();
-            jmsTemplate.convertAndSend("mailbox", mailEvent);
+            restTemplate.postForEntity(webWolfURL + "/WebWolf/mail", mailEvent, Object.class);
             return informationMessage().feedback("webwolf.email_send").feedbackArgs(email).build();
         } else {
             return informationMessage().feedback("webwolf.email_mismatch").feedbackArgs(username).build();
         }
-
     }
 
     @PostMapping

webgoat-lessons/webwolf-introduction/src/main/resources/lessonPlans/en/Introduction.adoc

@@ -17,5 +17,12 @@ are not using the Docker image you will need to download the jar file and start
 java -jar webwolf-<<version>>.jar
 ```
 
+WebWolf is also available as a Docker container:
+
+```
+docker pull webwolf/webwolf-8.0
+docker run -it 8081:8081 /home/webwolf/run.sh
+```
+
 This will start the application on port 8081, in your browser type: `http://localhost:8081/WebWolf`
 You will be redirected to the login page where you need to login with your WebGoat username and password