From 49f765737e28131b8704cc0b4ce2d96a743dcd0b Mon Sep 17 00:00:00 2001
From: Rohan Sircar <rohansircar@tuta.io>
Date: Tue, 26 Nov 2019 11:32:40 +0530
Subject: [PATCH] initial implementation of registration captcha

---
 .../org/ros/chatto/ChattoApplication.java     |  18 +-
 .../ros/chatto/WebSecurityConfiguration.java  |   3 +-
 .../ros/chatto/captcha/CaptchaBehaviour.java  |  10 +
 .../captcha/ManualCaptchaBehaviour.java       |  37 ++++
 .../org/ros/chatto/captcha/SimpleCaptcha.java | 183 ++++++++++++++++++
 .../chatto/captcha/SimpleCaptchaBehavior.java |  40 ++++
 .../org/ros/chatto/captcha/WebCaptcha.java    |  26 +++
 .../ros/chatto/captcha/WebCaptchaBuilder.java |  16 ++
 .../controller/RegistrationController.java    |  58 +++++-
 .../ros/chatto/dto/UserRegistrationDTO.java   |  25 +--
 .../ros/chatto/service/CaptchaService.java    |  26 +++
 chatto/src/main/resources/pictures/A.png      | Bin 0 -> 612 bytes
 chatto/src/main/resources/pictures/B.png      | Bin 0 -> 603 bytes
 chatto/src/main/resources/pictures/C.png      | Bin 0 -> 590 bytes
 chatto/src/main/resources/pictures/D.png      | Bin 0 -> 561 bytes
 chatto/src/main/resources/pictures/E.png      | Bin 0 -> 446 bytes
 chatto/src/main/resources/pictures/F.png      | Bin 0 -> 391 bytes
 chatto/src/main/resources/pictures/G.png      | Bin 0 -> 694 bytes
 chatto/src/main/resources/pictures/H.png      | Bin 0 -> 466 bytes
 chatto/src/main/resources/pictures/I.png      | Bin 0 -> 381 bytes
 chatto/src/main/resources/pictures/J.png      | Bin 0 -> 439 bytes
 chatto/src/main/resources/pictures/K.png      | Bin 0 -> 582 bytes
 chatto/src/main/resources/pictures/L.png      | Bin 0 -> 387 bytes
 chatto/src/main/resources/pictures/M.png      | Bin 0 -> 911 bytes
 chatto/src/main/resources/pictures/N.png      | Bin 0 -> 606 bytes
 chatto/src/main/resources/pictures/O.png      | Bin 0 -> 732 bytes
 chatto/src/main/resources/pictures/P.png      | Bin 0 -> 588 bytes
 chatto/src/main/resources/pictures/Q.png      | Bin 0 -> 830 bytes
 chatto/src/main/resources/pictures/R.png      | Bin 0 -> 693 bytes
 chatto/src/main/resources/pictures/S.png      | Bin 0 -> 775 bytes
 chatto/src/main/resources/pictures/T.png      | Bin 0 -> 378 bytes
 chatto/src/main/resources/pictures/U.png      | Bin 0 -> 656 bytes
 chatto/src/main/resources/pictures/V.png      | Bin 0 -> 705 bytes
 chatto/src/main/resources/pictures/W.png      | Bin 0 -> 755 bytes
 chatto/src/main/resources/pictures/X.png      | Bin 0 -> 715 bytes
 chatto/src/main/resources/pictures/Y.png      | Bin 0 -> 655 bytes
 chatto/src/main/resources/pictures/Z.png      | Bin 0 -> 568 bytes
 .../resources/templates/registration.html     |   9 +
 38 files changed, 427 insertions(+), 24 deletions(-)
 create mode 100644 chatto/src/main/java/org/ros/chatto/captcha/CaptchaBehaviour.java
 create mode 100644 chatto/src/main/java/org/ros/chatto/captcha/ManualCaptchaBehaviour.java
 create mode 100644 chatto/src/main/java/org/ros/chatto/captcha/SimpleCaptcha.java
 create mode 100644 chatto/src/main/java/org/ros/chatto/captcha/SimpleCaptchaBehavior.java
 create mode 100644 chatto/src/main/java/org/ros/chatto/captcha/WebCaptcha.java
 create mode 100644 chatto/src/main/java/org/ros/chatto/captcha/WebCaptchaBuilder.java
 create mode 100644 chatto/src/main/java/org/ros/chatto/service/CaptchaService.java
 create mode 100644 chatto/src/main/resources/pictures/A.png
 create mode 100644 chatto/src/main/resources/pictures/B.png
 create mode 100644 chatto/src/main/resources/pictures/C.png
 create mode 100644 chatto/src/main/resources/pictures/D.png
 create mode 100644 chatto/src/main/resources/pictures/E.png
 create mode 100644 chatto/src/main/resources/pictures/F.png
 create mode 100644 chatto/src/main/resources/pictures/G.png
 create mode 100644 chatto/src/main/resources/pictures/H.png
 create mode 100644 chatto/src/main/resources/pictures/I.png
 create mode 100644 chatto/src/main/resources/pictures/J.png
 create mode 100644 chatto/src/main/resources/pictures/K.png
 create mode 100644 chatto/src/main/resources/pictures/L.png
 create mode 100644 chatto/src/main/resources/pictures/M.png
 create mode 100644 chatto/src/main/resources/pictures/N.png
 create mode 100644 chatto/src/main/resources/pictures/O.png
 create mode 100644 chatto/src/main/resources/pictures/P.png
 create mode 100644 chatto/src/main/resources/pictures/Q.png
 create mode 100644 chatto/src/main/resources/pictures/R.png
 create mode 100644 chatto/src/main/resources/pictures/S.png
 create mode 100644 chatto/src/main/resources/pictures/T.png
 create mode 100644 chatto/src/main/resources/pictures/U.png
 create mode 100644 chatto/src/main/resources/pictures/V.png
 create mode 100644 chatto/src/main/resources/pictures/W.png
 create mode 100644 chatto/src/main/resources/pictures/X.png
 create mode 100644 chatto/src/main/resources/pictures/Y.png
 create mode 100644 chatto/src/main/resources/pictures/Z.png

diff --git a/chatto/src/main/java/org/ros/chatto/ChattoApplication.java b/chatto/src/main/java/org/ros/chatto/ChattoApplication.java
index c2f4909..11ab5b0 100644
--- a/chatto/src/main/java/org/ros/chatto/ChattoApplication.java
+++ b/chatto/src/main/java/org/ros/chatto/ChattoApplication.java
@@ -2,13 +2,10 @@ package org.ros.chatto;
 
 import java.sql.SQLException;
 
-import org.ros.chatto.service.DBInitializerService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-import org.springframework.cache.annotation.EnableCaching;
 
 @SpringBootApplication
 public class ChattoApplication extends SpringBootServletInitializer {
@@ -16,6 +13,21 @@ public class ChattoApplication extends SpringBootServletInitializer {
 	public static void main(String[] args) throws SQLException {
 		SpringApplication application = new SpringApplication(ChattoApplication.class);
 		application.run();
+
+//		WebCaptcha webCaptcha = WebCaptcha.builder().captchaBehaviour(new SimpleCaptchaBehavior()).build();
+//		webCaptcha.generateCaptcha();
+//
+//		// @formatter:off
+//		webCaptcha = WebCaptcha.builder()
+//				.captchaBehaviour(
+//						ManualCaptchaBehaviour.builder()
+//						.length(8)
+//						.style("black")
+//						.build()
+//				).build();
+//				
+//		// @formatter:on
+
 	}
 
 	@Override
diff --git a/chatto/src/main/java/org/ros/chatto/WebSecurityConfiguration.java b/chatto/src/main/java/org/ros/chatto/WebSecurityConfiguration.java
index 3455340..7309125 100644
--- a/chatto/src/main/java/org/ros/chatto/WebSecurityConfiguration.java
+++ b/chatto/src/main/java/org/ros/chatto/WebSecurityConfiguration.java
@@ -77,7 +77,8 @@ public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
 					
 					.anyRequest()
 //					.hasAnyRole("USER", "ADMIN", "SUPER_USER")
-					.authenticated().and().httpBasic().authenticationEntryPoint(authenticationEntryPoint)
+					.authenticated()
+					.and().httpBasic().authenticationEntryPoint(authenticationEntryPoint)
 //					.and()
 //					.logout().invalidateHttpSession(true).clearAuthentication(true)
 //					.logoutRequestMatcher(new AntPathRequestMatcher("/api/perform_logout"))
diff --git a/chatto/src/main/java/org/ros/chatto/captcha/CaptchaBehaviour.java b/chatto/src/main/java/org/ros/chatto/captcha/CaptchaBehaviour.java
new file mode 100644
index 0000000..ead3ba2
--- /dev/null
+++ b/chatto/src/main/java/org/ros/chatto/captcha/CaptchaBehaviour.java
@@ -0,0 +1,10 @@
+package org.ros.chatto.captcha;
+
+import java.awt.image.BufferedImage;
+
+interface CaptchaBehaviour {
+	public BufferedImage generateCaptcha();
+	public BufferedImage generateCaptcha(String captchaText);
+	public String getRandomChars(int size);
+	public String getRandomChars();
+}
diff --git a/chatto/src/main/java/org/ros/chatto/captcha/ManualCaptchaBehaviour.java b/chatto/src/main/java/org/ros/chatto/captcha/ManualCaptchaBehaviour.java
new file mode 100644
index 0000000..a33ff07
--- /dev/null
+++ b/chatto/src/main/java/org/ros/chatto/captcha/ManualCaptchaBehaviour.java
@@ -0,0 +1,37 @@
+package org.ros.chatto.captcha;
+
+import java.awt.image.BufferedImage;
+
+import lombok.Builder;
+
+/*Class for providing your own captcha generator*/
+@Builder
+public class ManualCaptchaBehaviour implements CaptchaBehaviour{
+	private final int length;
+	private final String style;
+	@Override
+	public BufferedImage generateCaptcha() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public BufferedImage generateCaptcha(String captchaText) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getRandomChars(int size) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getRandomChars() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+
+}
diff --git a/chatto/src/main/java/org/ros/chatto/captcha/SimpleCaptcha.java b/chatto/src/main/java/org/ros/chatto/captcha/SimpleCaptcha.java
new file mode 100644
index 0000000..7849576
--- /dev/null
+++ b/chatto/src/main/java/org/ros/chatto/captcha/SimpleCaptcha.java
@@ -0,0 +1,183 @@
+package org.ros.chatto.captcha;
+
+import javax.imageio.ImageIO;
+
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.util.Random;
+
+/**
+ * This class represents a simple captcha consisting
+ * of an image {@code png} and its text value.
+ * Comic Neue Bold Font.
+ * Capital english letters {@code ONLY}.
+ *
+ * @since 1.3
+ * @author Gennadiy Golovin
+ */
+public final class SimpleCaptcha {
+
+    private BufferedImage imagePng;
+    private char[] text;
+
+    /**
+     * Initializes a newly created default object
+     * consisting of 8 capital english letters.
+     */
+    public SimpleCaptcha() {
+        this.text = getRandomChars();
+
+        try {
+            generateCaptcha();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Initializes a newly created object, which length
+     * depends on the passed {@code int} parameter,
+     * which {@code MUST} be greater than 0.
+     * If the condition is not met, initializes a newly
+     * created default object consisting of 8 symbols.
+     *
+     * @param length the quantity of symbols, that the
+     *               captcha consists of, greater than 0.
+     */
+    public SimpleCaptcha(int length) {
+        if (length < 1) {
+            this.text = getRandomChars();
+        } else {
+            this.text = getRandomChars(length);
+        }
+
+        try {
+            generateCaptcha();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Initializes a newly created object based on the passed
+     * {@link String} parameter, consisting of capital english
+     * letters. If the condition is not met, initializes a newly
+     * created default object consisting of 8 capital english letters.
+     *
+     * @param text the text string with the value of the captcha,
+     *             length greater than 0.
+     */
+    public SimpleCaptcha(String text) {
+        if (text == null || text.equals("")) {
+            this.text = getRandomChars();
+        } else {
+            this.text = text.toCharArray();
+        }
+
+        try {
+            generateCaptcha();
+        } catch (IOException e) {
+            this.text = getRandomChars();
+            try {
+                generateCaptcha();
+            } catch (IOException ex) {
+                ex.printStackTrace();
+            }
+        }
+    }
+
+    /**
+     * Returns the picture with captcha
+     *
+     * @return {@link BufferedImage}
+     */
+    public BufferedImage getImagePng() {
+        return imagePng;
+    }
+
+    /**
+     * Returns the text value of the captcha
+     *
+     * @return {@link String}
+     */
+    public String getText() {
+        return String.valueOf(text);
+    }
+
+    //////// //////// //////// //////// //////// //////// //////// ////////
+
+    private char[] getRandomChars() {
+        return getRandomChars(8);
+    }
+
+    private char[] getRandomChars(int quantity) {
+
+        char[] randomString = new char[quantity];
+
+        Random random = new Random();
+
+        int capitalLetter;
+
+        for (int i = 0; i < quantity; i++) {
+            capitalLetter = 65 + random.nextInt(26);
+            randomString[i] = (char) capitalLetter;
+        }
+
+        return randomString;
+    }
+
+    private void generateCaptcha() throws IOException {
+        int charsQuantity = this.text.length;
+        BufferedImage[] images = new BufferedImage[charsQuantity];
+
+        for (int i = 0; i < charsQuantity; i++) {
+            images[i] = ImageIO.read(SimpleCaptcha.class.getResourceAsStream("/pictures/" + this.text[i] + ".png"));
+            if (i % 2 == 0) {
+                images[i] = rotateImage(images[i], 25);
+            } else {
+                images[i] = rotateImage(images[i], -20);
+            }
+        }
+
+        int imageSize = 30;
+        int rotatedImageSize = (int) Math.sqrt(imageSize * imageSize * 2);
+
+        BufferedImage captchaImg = new BufferedImage(rotatedImageSize * (charsQuantity - 1) / 10 * 6 + rotatedImageSize, rotatedImageSize, BufferedImage.TYPE_INT_ARGB);
+        Graphics2D graphics2d = captchaImg.createGraphics();
+        graphics2d.setBackground(Color.WHITE);
+        graphics2d.clearRect(0, 0, captchaImg.getWidth(), captchaImg.getHeight());
+        for (int i = 0; i < charsQuantity; i++) {
+            captchaImg.getGraphics().drawImage(images[i], rotatedImageSize * i / 10 * 6, 0, null);
+        }
+        graphics2d.dispose();
+        this.imagePng = captchaImg;
+    }
+
+    private BufferedImage rotateImage(BufferedImage buffImage, double angle) {
+
+        double radian = Math.toRadians(angle);
+        double sin = Math.abs(Math.sin(radian));
+        double cos = Math.abs(Math.cos(radian));
+
+        int width = buffImage.getWidth();
+        int height = buffImage.getHeight();
+
+        int nWidth = (int) Math.floor((double) width * cos + (double) height * sin);
+        int nHeight = (int) Math.floor((double) height * cos + (double) width * sin);
+
+        BufferedImage rotatedImage = new BufferedImage(nWidth, nHeight, BufferedImage.TYPE_INT_ARGB);
+
+        Graphics2D graphics = rotatedImage.createGraphics();
+
+        graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);
+        graphics.translate((nWidth - width) / 2, (nHeight - height) / 2);
+        graphics.rotate(radian, (double) (width / 2), (double) (height / 2));
+        graphics.drawImage(buffImage, 0, 0,null);
+        graphics.dispose();
+
+        return rotatedImage;
+    }
+}
\ No newline at end of file
diff --git a/chatto/src/main/java/org/ros/chatto/captcha/SimpleCaptchaBehavior.java b/chatto/src/main/java/org/ros/chatto/captcha/SimpleCaptchaBehavior.java
new file mode 100644
index 0000000..f317421
--- /dev/null
+++ b/chatto/src/main/java/org/ros/chatto/captcha/SimpleCaptchaBehavior.java
@@ -0,0 +1,40 @@
+package org.ros.chatto.captcha;
+
+import java.awt.image.BufferedImage;
+import java.util.Random;
+
+public class SimpleCaptchaBehavior implements CaptchaBehaviour {
+	@Override
+	public BufferedImage generateCaptcha() {
+		// TODO Auto-generated method stub
+		SimpleCaptcha simpleCaptcha = new SimpleCaptcha();
+		return simpleCaptcha.getImagePng();
+	}
+	@Override
+	public BufferedImage generateCaptcha(String captchaText) {
+		// TODO Auto-generated method stub
+		SimpleCaptcha simpleCaptcha = new SimpleCaptcha(captchaText);
+		return simpleCaptcha.getImagePng();
+	}
+	
+	public String getRandomChars() {
+        return getRandomChars(8);
+    }
+	
+	public String getRandomChars(int quantity)
+	{
+		char[] randomString = new char[quantity];
+
+        Random random = new Random();
+
+        int capitalLetter;
+
+        for (int i = 0; i < quantity; i++) {
+            capitalLetter = 65 + random.nextInt(26);
+            randomString[i] = (char) capitalLetter;
+        }
+
+        return new String(randomString);
+	}
+
+}
diff --git a/chatto/src/main/java/org/ros/chatto/captcha/WebCaptcha.java b/chatto/src/main/java/org/ros/chatto/captcha/WebCaptcha.java
new file mode 100644
index 0000000..1218279
--- /dev/null
+++ b/chatto/src/main/java/org/ros/chatto/captcha/WebCaptcha.java
@@ -0,0 +1,26 @@
+package org.ros.chatto.captcha;
+
+import java.awt.image.BufferedImage;
+
+import lombok.Builder;
+
+@Builder
+public class WebCaptcha {
+	private final CaptchaBehaviour captchaBehaviour;
+	
+	public BufferedImage generateCaptcha() {
+		return captchaBehaviour.generateCaptcha();
+	} 
+	
+	public BufferedImage generateCaptcha(String captchaText) {
+		return captchaBehaviour.generateCaptcha(captchaText);
+	} 
+	
+	public String getRandomChars() {
+        return captchaBehaviour.getRandomChars();
+    }
+
+    public String getRandomChars(int quantity) {
+    	return captchaBehaviour.getRandomChars(quantity);
+    }
+}
diff --git a/chatto/src/main/java/org/ros/chatto/captcha/WebCaptchaBuilder.java b/chatto/src/main/java/org/ros/chatto/captcha/WebCaptchaBuilder.java
new file mode 100644
index 0000000..e7c7d24
--- /dev/null
+++ b/chatto/src/main/java/org/ros/chatto/captcha/WebCaptchaBuilder.java
@@ -0,0 +1,16 @@
+package org.ros.chatto.captcha;
+
+import lombok.Builder;
+
+@Builder
+public class WebCaptchaBuilder {
+	private CaptchaBehaviour captchaBehaviour;
+//	public WebCaptchaBuilder(CaptchaBehaviour captchaBehaviour)
+//	{
+//		this.captchaBehaviour = captchaBehaviour;
+//	}
+	public WebCaptcha build()
+	{
+		return new WebCaptcha(captchaBehaviour);
+	}
+}
diff --git a/chatto/src/main/java/org/ros/chatto/controller/RegistrationController.java b/chatto/src/main/java/org/ros/chatto/controller/RegistrationController.java
index 02ed450..367d580 100644
--- a/chatto/src/main/java/org/ros/chatto/controller/RegistrationController.java
+++ b/chatto/src/main/java/org/ros/chatto/controller/RegistrationController.java
@@ -1,15 +1,31 @@
 package org.ros.chatto.controller;
 
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ThreadLocalRandom;
+
+import javax.imageio.ImageIO;
 import javax.validation.Valid;
 
 import org.ros.chatto.dto.UserRegistrationDTO;
+import org.ros.chatto.service.CaptchaService;
 import org.ros.chatto.service.UserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 
 @Controller
@@ -18,9 +34,23 @@ public class RegistrationController {
 	@Autowired
 	private UserService userService;
 
+	@Autowired
+	private CaptchaService captchaService;
+
+	private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+	private final Map<Long, String> captchaMap = new ConcurrentHashMap<>();
+
 	@GetMapping("/registration")
 	public String registrationForm(Model model) {
-		model.addAttribute("userRegistrationDTO", new UserRegistrationDTO());
+		UserRegistrationDTO userRegistrationDTO = new UserRegistrationDTO();
+		String captchaText = captchaService.getRandomText();
+		userRegistrationDTO.setCaptchaText(captchaText);
+		logger.debug("captcha text = {}", captchaText);
+		Long captchaID = ThreadLocalRandom.current().nextLong();
+		userRegistrationDTO.setCaptchaID(captchaID);
+		captchaMap.put(captchaID, captchaText);
+		model.addAttribute("userRegistrationDTO", userRegistrationDTO);
 		return "registration";
 	}
 
@@ -29,10 +59,32 @@ public class RegistrationController {
 			@ModelAttribute("userRegistrationDTO") @Valid UserRegistrationDTO userRegistrationDTO,
 			BindingResult bindingResult) {
 		if (bindingResult.hasErrors()) {
-			System.out.println("Input has errors!");
+			logger.warn("Registration input has errors!");
 			return "registration";
 		}
-		userService.registerUser(userRegistrationDTO);
+		logger.debug("Captcha text from user input = {}", userRegistrationDTO.getCaptchaInput());
+		logger.debug("Captcha text from captcha map = {}", captchaMap.get(userRegistrationDTO.getCaptchaID()));
+		if (userRegistrationDTO.getCaptchaInput().equals(captchaMap.get(userRegistrationDTO.getCaptchaID()))) {
+			logger.info("Registration captcha equal success");
+		} else {
+			logger.warn("Registration captcha equal fail");
+		}
+//		userService.registerUser(userRegistrationDTO);
 		return "user/home";
 	}
+
+	@GetMapping(value = "/img/{image_id}", produces = MediaType.IMAGE_PNG_VALUE)
+	public ResponseEntity<byte[]> getImage(@PathVariable("image_id") Long imageId) throws IOException {
+
+		final String captchaText = captchaMap.get(imageId);
+		final HttpHeaders headers = new HttpHeaders();
+		headers.setContentType(MediaType.IMAGE_PNG);
+		BufferedImage captchaBufferedImage = captchaService.createCaptchaImage(captchaText);
+
+		ByteArrayOutputStream baos = new ByteArrayOutputStream();
+		ImageIO.write(captchaBufferedImage, "png", baos);
+		byte[] imageBytes = baos.toByteArray();
+
+		return new ResponseEntity<byte[]>(imageBytes, headers, HttpStatus.OK);
+	}
 }
diff --git a/chatto/src/main/java/org/ros/chatto/dto/UserRegistrationDTO.java b/chatto/src/main/java/org/ros/chatto/dto/UserRegistrationDTO.java
index f049238..b47a339 100644
--- a/chatto/src/main/java/org/ros/chatto/dto/UserRegistrationDTO.java
+++ b/chatto/src/main/java/org/ros/chatto/dto/UserRegistrationDTO.java
@@ -5,6 +5,9 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 
+import lombok.Data;
+
+@Data
 public class UserRegistrationDTO {
 	@Size(min = 4, max = 10, message = "Username must be between 4 and 10 characters")
 	@NotBlank(message = "Username should not be blank")
@@ -15,21 +18,9 @@ public class UserRegistrationDTO {
 	@NotBlank(message = "Password should not be blank")
 //	@Pattern(regexp = "^.*(?=.{6,})(?=.*d)(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#$%^&*? ]).*$", message = "Invalid password format")
 	private String password;
-
-	public String getUserName() {
-		return userName;
-	}
-
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-
-	public String getPassword() {
-		return password;
-	}
-
-	public void setPassword(String password) {
-		this.password = password;
-	}
-
+	
+	private Long captchaID;
+	private String captchaText;
+	
+	private String captchaInput;
 }
diff --git a/chatto/src/main/java/org/ros/chatto/service/CaptchaService.java b/chatto/src/main/java/org/ros/chatto/service/CaptchaService.java
new file mode 100644
index 0000000..31bfa7d
--- /dev/null
+++ b/chatto/src/main/java/org/ros/chatto/service/CaptchaService.java
@@ -0,0 +1,26 @@
+package org.ros.chatto.service;
+
+import java.awt.image.BufferedImage;
+
+import org.ros.chatto.captcha.SimpleCaptchaBehavior;
+import org.ros.chatto.captcha.WebCaptcha;
+import org.springframework.stereotype.Service;
+
+@Service
+public class CaptchaService {
+	private final WebCaptcha webCaptcha;
+	
+	public CaptchaService() {
+		webCaptcha = WebCaptcha.builder().captchaBehaviour(new SimpleCaptchaBehavior()).build();
+	}
+	
+	public BufferedImage createCaptchaImage(String captchaText)
+	{
+		return webCaptcha.generateCaptcha(captchaText);
+	}
+	
+	public String getRandomText()
+	{
+		return webCaptcha.getRandomChars();
+	}
+}
diff --git a/chatto/src/main/resources/pictures/A.png b/chatto/src/main/resources/pictures/A.png
new file mode 100644
index 0000000000000000000000000000000000000000..bde14697edf53d5d65fb44046910e88fd0a62b1d
GIT binary patch
literal 612
zcmV-q0-ODbP)<h;3K|Lk000e1NJLTq0015U0015c1ONa4kvV2500002VoOIv0RM-N
z%)bBt010qNS#tmY3ljhU3ljkVnw%H_000McNliru;{pc~Dk>0R+O+@x03B&mSad^g
zZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00GQNL_t(I%f-~qOO#O*$MKJo
zW@;rFX(>oAhNzG)5aBQdgCPWh6#WDJ2|?=?wQcVvqJnloM7xlp7o^f;3WU(aT7@N8
z4fdjqw}rzP&ht#pBKqCUeK_~~oOA9y=kO1ekcc;KDT(fON|#T*mG8B}6{~`awwDk0
zc_|29X^YD#UTKHH5gpO##lww~cI5Yi>dFgx*qo4GGY*yGxk}3Z!dIJ~sKDdkPD$`y
z77VG~JlwAvTr)0UP}64NCMk88cGsvSG&@!tcr@IT4|>#F56pwpwrvKk*6#qmdSuC@
zX#r_1D*g_)NrR`JVa1pwG)QlRD<j}uN5Pa<1KORi6`XO?_tM3&*9}3CGi%DcAB9rM
z>M8{`yX>*W!tssk!p6YYRqMQ8MZg!&UAG_z#?-{+oX}8s%bX8hn~*VU!Dsb`RO-`V
zGOqc1J<0nU(W+ie;b-S$1;M3KV`oGV%o#4ajafmEiK_86b?1-V)>ve_Wks+o6<s9N
zk`5wk%*P`5j-RM<Hrj8C`-0$w-U#b1GlJmF`Z)a4bG;6%8kdQH7d@22zNqG8kE@nV
y7>K!%q<6CJ6?fN~b~>)TL<M#_Ss04{Rlfm9Cz54-Yd63E0000<MNUMnLSTX>`VR&G

literal 0
HcmV?d00001

diff --git a/chatto/src/main/resources/pictures/B.png b/chatto/src/main/resources/pictures/B.png
new file mode 100644
index 0000000000000000000000000000000000000000..4404eec5091d059674db5190c939b7a58bd0c0d8
GIT binary patch
literal 603
zcmV-h0;K(kP)<h;3K|Lk000e1NJLTq0015U0015c1ONa4kvV2500002VoOIv0RM-N
z%)bBt010qNS#tmY3ljhU3ljkVnw%H_000McNliru;{pc~FAh-^${_#%03B&mSad^g
zZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00F~EL_t(I%gxk1XcTb}1@K=k
zcM{D9iK1Ra#Sa9Dr4mI!j93I4!7kWYS(rv5c48}}OlO~7EEEMHooFM(C>91KArVod
zo{74f+rNdIGk3Y$ODdhI-oV>=|CzVLzlxR`oU=vys%o$-5{V^i$@v<5&@BUkkmAG-
zv!1wb(${Pq1y_W+8N1`q8l6?K*>ypXSgvGJ`M_iQvShEw{pOi@t!UAq*8y8GV8k_1
zqt0zc1i_?}tExp;O-lqNhpVSse+QdZq4&m&Swe?X>mk>U=AlKfr#X3T>{o#5b=4;)
zepTU}F6#u(vrO_Qx}4FK_M*q2L3un~54qQ{B{>9i*#=^x7Mha_igm|$-b+)>_S`7T
zCiFGyJZIdC^vyv*(Ftc2<eYZPkaAY%Dd&(+v!KInm&^%*l4IGc3YMw-8nN$YjT;rA
zUH?WMM)1H-uxq0ZgB|IFqK%V_ZfZmMuTk<1-dx-Bf?<7fcx@t^+^SQz9zFIt;<%#~
z$t5=$-LjQc#TI;25>;6wG2>#EJ(INBT~kebcGqoh8k1x5VmTqbXJv`VC$Btm&)a54
pf4d?55|Kq;d@y6$J0<^F{03j#uY26M4Bh|$002ovPDHLkV1kE(0bu|D

literal 0
HcmV?d00001

diff --git a/chatto/src/main/resources/pictures/C.png b/chatto/src/main/resources/pictures/C.png
new file mode 100644
index 0000000000000000000000000000000000000000..613281579d3e8292870d80c2040c59cb94d0df2e
GIT binary patch
literal 590
zcmV-U0<ryxP)<h;3K|Lk000e1NJLTq0015U0015c1ONa4kvV2500002VoOIv0RM-N
z%)bBt010qNS#tmY3ljhU3ljkVnw%H_000McNliru;{pc~Gz$Mt#i9TJ03B&mSad^g
zZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00Fj1L_t(I%gxkJNEBfh$MKJw
zwWj@p{t$}^DJdC-Xg4E>4uKsybV~5jrAwC%QP81IUAq<Cy4P9gBxHht6r~12hlnzv
z@}Ld7>#p;58EV(v(cM%128NgU&G&hqd7pV6{*_u%os6t~IuMBzl@S_)_c-IK^NwQ0
zf(cWyzWTN~K&^T_^h>C^*2HGywnK+ZBtWd7V51_$<;oXZYtR7?Tm;MB`zXli(<2MX
zJw-WBlRamRYfqk@_Ds2U=W1o$5DS87XRDl(-pE^YDjgm)F9;T0s_{nMH=17Bc6S6p
z<lYwbPf@p7LGVg{V?d^2)oTbvQ$92cw;9%gCDV<jS_uz;B@4~NS)Jgg<>ujx4v<%9
z9u7*$54)pzcs)t?phL~W1#_UwP^0kQ6wBI-VZX==aotwEt=l^r^#XNyDF~KbujBTc
zQxqAmpGB*&r16*Bw7be1@iy`9rhUX=kCKT|H0hc?M;vp(6W^0o{iHYj432yLXXL~p
zKddHWAPBxVxAhTrdMw&B{DN57jN$Dou*(&bR^+WKDJfbt@0J6N4*i`5jW}Vig3n%?
cvF1P0Z#rP4x@ae6`v3p{07*qoM6N<$g83Q#DF6Tf

literal 0
HcmV?d00001

diff --git a/chatto/src/main/resources/pictures/D.png b/chatto/src/main/resources/pictures/D.png
new file mode 100644
index 0000000000000000000000000000000000000000..d549359f0feaaddf9a64352b47527810260e954b
GIT binary patch
literal 561
zcmV-10?z%3P)<h;3K|Lk000e1NJLTq0015U0015c1ONa4kvV2500002VoOIv0RM-N
z%)bBt010qNS#tmY3ljhU3ljkVnw%H_000McNliru;{pd01{s$^x;g*=03B&mSad^g
zZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00EgvL_t(I%dOQrYm`A0#_`|Y
zh{oK=8X`6+1T`wb6h;LRL_sVpy)=qg*rl)$`~vn8EH#q&4J<80ix?Clior@#2&)DR
zt6|Ar-`B#`thw-JR-fq(=Rb3pbLJWTL8*0-G>FCF@J=JTl@xvR!-}f<R_n-{5R1hk
zMQ=^H?x3D#H3`~pz6r0cC6AnyPlkt^aK*Ap%LX;~jmoS||2r_?q5;gB_R*56tnEk}
zb;5!LQS!-mLCzuL9$RdlUvO?KW#4P*Lbn@UiNs>>4Tr&S%rgzK*reRrkx0_4+dhB`
z4u`_bc%XtEE{DTRDS*>D!r_9~A`ICT4)aEYPP^NI3u2`8wFCctU)grxeksIC?Z5}5
zQ1c}m?s8lji#~<JR}D#F#&Re;=B7^6O@~g{c@OQ8!V^zd!`Tg!b2^k|<m4T3#Th-#
zPTx{Vf-gC$D5Kw?-al^h)iv{*m$%Q{Is^RWr8O^%ZQ$}P>T^d~Rb3<!X{amvZqB&g
zWYh0*%1L_-+NPo8vv;0*X(j9<%58EV|4Tms$8V4_72H8-00000NkvXXu0mjfB`EKt

literal 0
HcmV?d00001

diff --git a/chatto/src/main/resources/pictures/E.png b/chatto/src/main/resources/pictures/E.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9191aa4781694630891d0bff0378f732210adea
GIT binary patch
literal 446
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX0wgC|rfC8xrX+877l!}s{b%+Ad7K3vk;M!Q
z+`=Ht$S`Y;1W=H@#M9T6{V@}}Fo%hc-06crA=%83h!W@g+}zZ>5+Ij>!MP|ku_QG`
zp**uBL&4qCHy}kXm7RfsQO(oEF~s8Z)k%i_OpXGr`(p(cb*^1_(J!f#vz4{8_5bl7
z{(pqUj$Jx(?noQc)&?f$rYP?o$3>lnZaZ!-W_WV$cH(r0g~nIUp1D1{^8G=kg*I9z
zJDy$??aEnrS-I1o<b}swBi~0ee|ltEtrNarQ_a$6Ty8O=?n#jPljEmr1-Z6=-?6z_
zy<|_(xxeery(n~^8_j9crKf)9hsV;jTTSifepOP7w7T)(E&DdXZ3pdIH|BV*t2XI~
zd7$K8lU5Q|Q*dTx$~mTXzT&tg^=9&krajqj)BQ3x&RV%Yu(bL9&L^iXan{~wJ7M-J
zTj;C&ThCdSf4<r2H`DRhyagPU4~{-HP)>1~o%{RN$9@|xkF$EBzi-vvve{_)`H`Nk
m=S3Mt(ZE#K6Q;iZ9C#RASLJy9y!M;}6qKH>elF{r5}E+s9k$5;

literal 0
HcmV?d00001

diff --git a/chatto/src/main/resources/pictures/F.png b/chatto/src/main/resources/pictures/F.png
new file mode 100644
index 0000000000000000000000000000000000000000..d05909f87e5d52ec6f863d5f1afb4c764b23de8c
GIT binary patch
literal 391
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX0wgC|rfC8xrX+877l!}s{b%+Ad7K3vk;M!Q
z+`=Ht$S`Y;1W=H@#M9T6{V@}}umE>Oa@|s(kZfj1M2T~LZf<H`36RUc;9QiNSdyBe
zP@Y+mq2TW68<3)x$_^BN@9E+gVsZNE6hp2<1`@6N-Hvum4lXSE!m@6ip4@@E(iIZn
z;-!K%{R(=Ef>;IDDkz!qDJ?b3>~_`qk?#5L$y5J()to7!(~QndJYIErpVOma<Hp=s
zTQsD+J=1zDU#Ls(I5FcI_q6T{qB3)CbcZ$P#TmcdoGO3I%;H;LqREZL=Nl%qnVsa*
zU$^PBT4#vU?6azuBbOL<8oc;fyP<D`k?bpxDQ_k<o{aXNyhV9V>B7}QGv^r0p0#RE
z+;dy^)aY)@;6D``+~+H93wnOUOEoCI^6aDHl`d&~zvVYPnfEMot|e346=s9~lInRO
fGYlS`@;}b}cYl!m%o{SxKw;wP>gTe~DWM4fr1F#-

literal 0
HcmV?d00001

diff --git a/chatto/src/main/resources/pictures/G.png b/chatto/src/main/resources/pictures/G.png
new file mode 100644
index 0000000000000000000000000000000000000000..1356c3af4e345f83fc43b01e4f4b7b9c20ddaafa
GIT binary patch
literal 694
zcmV;n0!jUeP)<h;3K|Lk000e1NJLTq0015U0015c1ONa4kvV2500002VoOIv0RM-N
z%)bBt010qNS#tmY3ljhU3ljkVnw%H_000McNliru;{pd07B%l!#E1X@03B&mSad^g
zZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00JIKL_t(I%gxl?YmZ?V2k_6f
z-`E(9nT1eFErc~I2V}{Sw-hO*oZtk10VO3bhfW+QQ<7RaAT<Y)cLz*tSsEc)WV9i+
z-)}F!+kwZ^?{(W5*K_c6U)TM;p6mX8zxTtxijpGvQspXDnJjI<FDb(l1DBX?h0U5R
zG}Wj+FWhj`2dVL9NoaIIQpkDUJE(SS=p@^8#eiXhlG5?I#k|bTWjSBn=#0gnSBHBZ
z==9NuD&=S})9qrzH+e1yhTOMDO`NZHN>B9lLxrKUoEHQmu345>-S4X)cxO%_aW+LX
zJ=9RJ`Pu07JM&93ToeSK?JYuPy|;pt?fIppdIdq-7=r9}&e04mVxD&jf*%f#Ddm(*
zTP31*xh0W6kH-WLWYhGw$$aq5n~7hHMBHR5NcmY{*KBpFRS3T8@hKOaHW=BnG6%TT
z4vS1vA%UcC-nrsx=9Wsw1wps9S<pt0@~+6J4t1Gl9@Z5N*p%bC1qJLh=MU#)@z|wy
zsZb%QEyMa>)T-0%x=Z>jRf<<mxSQRtMr-7-eOdWw=9*=SDtDv>1J=h(Wn9iJMg&2-
zH3b+y=9eJ2l@EnlEfFP8ZOp1nciMMBFla+D)mL~H!TYt^rNI*G9MNeg%AbrWE)dOL
z#*(BBNk&Kcvu=s3R5Vt(X*f^Yw0_6NgF>|fp6E9yB_-*n9+$12_)ovmax2Y~(C@W&
cJ^ris4FfUNXW;zY0ssI207*qoM6N<$f>gjW8vp<R

literal 0
HcmV?d00001

diff --git a/chatto/src/main/resources/pictures/H.png b/chatto/src/main/resources/pictures/H.png
new file mode 100644
index 0000000000000000000000000000000000000000..1642358e40f76ee9384f7c0b8369950fc9013439
GIT binary patch
literal 466
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX0wgC|rfC8xrX+877l!}s{b%+Ad7K3vk;M!Q
z+`=Ht$S`Y;1W=H@#M9T6{V@}}u#Bt%Q_ByakZfj1M2T~LZf<H`36RUc;9QiNSdyBe
zP@Y+mq2TW68<3)x%Fe*RXyxhR7-Dhy?&RHG%#I>$`(qbpA4*H?-JHP{ZGD+zUsJ2^
zJcpbbS$T(mHMMLT1+1+VTN4!Z9;r@HP`o+gY~R_A-PYD?W*j<w|4hNTpKZqJ&)Vl-
ziphGvp~>4NX-!#XlHoOBzTGy(zPCH{ihTNwXH{uEkm-CPa+@JvNO9tudX_g=SY;Tr
z&PYFy;#4RsjZnIp6}IlsywqFu%=7A4_2gzAHVQKfx!5Ii@5;Kaeg^>sj*JcGoFrv7
zG@sXEY+|$X{!tOqJ?r8_G4?AfgSF+G_^K<SbQYavHjI{37CrFt(}Zd#xypt9{bK4j
zzm@JdELdLh(m3HnN5@8^l_&N$^W85xk-hRe?|T{Hv!4#H`Jc+OFTY2~BJ7y)LE+Lb
zF750w22VRzpHJ~KFOd)`ik$K#WAohYv2NLKHXhW!U~L%f^U^UmYaJ+fJzf1=);T3K
F0RYv5v3~#n

literal 0
HcmV?d00001

diff --git a/chatto/src/main/resources/pictures/I.png b/chatto/src/main/resources/pictures/I.png
new file mode 100644
index 0000000000000000000000000000000000000000..2dbdc6c3f12ae22b627f7555a71d07ef27c91cac
GIT binary patch
literal 381
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX0wgC|rfC8xrX+877l!}s{b%+Ad7K3vk;M!Q
z+`=Ht$S`Y;1W=H@#M9T6{V@}}u!42tpNd~VA=%83h!W@g+}zZ>5+Ij>!MP|ku_QG`
zp**uBL&4qCHy}kXl^rPl)YHW=#NzbZD;vEI2Z$W|7;n<8srXi5OGkve`a#DFcg+Rn
zpT5doAi(Z==jz(k`WIZ;V_j}Jux`D+v^&#DNw4YeyRskup3f`RuleH?_&6&gse4PV
z2iLRCg@uvL?_XI7dY#+2q;8_^;h-OZ+cSEfKTv00y-Z0vX-~CqfpY#Qli7SrjM}#q
zyg%jf?ojdP`V%o+O~H{<Q&$S*Mb6Wm_D3df0qdTI|MGt<z1Ji}rFME}+3pUKeZAoQ
ziPd-JPX878>zudo8=olqvh#kKmuuJl+9-b~>a$__$*qNx8Q$EurpNN<#DOF8FN$B`
V@h)NKFpdX>gr}>Y%Q~loCIGGfnBD*Y

literal 0
HcmV?d00001

diff --git a/chatto/src/main/resources/pictures/J.png b/chatto/src/main/resources/pictures/J.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f796edee476dc23f232c4501b7e013fa67b63a4
GIT binary patch
literal 439
zcmV;o0Z9IdP)<h;3K|Lk000e1NJLTq0015U0015c1ONa4kvV2500002VoOIv0RM-N
z%)bBt010qNS#tmY3ljhU3ljkVnw%H_000McNliru;{pd0BP=NbuKoZ303B&mSad^g
zZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00AFKL_t(I%k9*?E`&iC#qpoT
zW@8IkpAm^hr4Z2(By>9B5=5h=5~b2bkf_~&XoO1K01>g#5DFjJPl?gI#ah<ByUixz
zOm{N>$usAfd1#f|YWNA=GCC@pk_W|jhmJXvQ;?5V!Lu#Nc<{QiP_^#$SC{v*vMv?n
z<&=e}?2GEM+iSqLuH3nB=H0MP?A!LxXrybN1i{Qtsn%06>PYJQ-bB;Qj0O9L{~+9D
z(nxb~pB={zEHncTS<++5T!k0n!odfU1}k24I{LQn_23uRVA^ctWX$Wvn<pQ?Um|5A
z8abDCt=e>|BnXc5*3V$v`M22>lr4Xmq&2nZstPUGl8)QH345|$ym|HL#EQ<w=EQ(e
h86{aa^@3`JJ^=`5VQN%FMK}Ne002ovPDHLkV1oMwyF>s0

literal 0
HcmV?d00001

diff --git a/chatto/src/main/resources/pictures/K.png b/chatto/src/main/resources/pictures/K.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f16ebf1f1c6bb6bd71e224d062c8fad4b71f44c
GIT binary patch
literal 582
zcmV-M0=fN(P)<h;3K|Lk000e1NJLTq0015U0015c1ONa4kvV2500002VoOIv0RM-N
z%)bBt010qNS#tmY3ljhU3ljkVnw%H_000McNliru;{pd0CkyCg-jM(R03B&mSad^g
zZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00FK^L_t(I%e~b*XjDNI#_`{7
zR*b6=6B`pGHoictObWrmRt1r0qbbBnL=+p*P7A>*pp9T4A{arjQL#{KlO}>7C<tQV
zgJgXmiHNUF#v(Vn%kIwIU4_i;&Yb_8@0&AshW{9Cbz&Kry1AL^>{@u0K0UtrQ-iLz
zS585QDakt{_~v+3JZq;{f-knlZS=Y)2(DRC5nbw#NkI@CtXwhXx9oeR6Ruc;Ib+7k
z$+?DG+U>Ms+VR^Xr@W1)u5&+;-2pbasVE3$T(vsAP8rT)yT^&sf^(KN61e~m>$J;6
zg1&aN34<m0j+0&{=!AWdV-tZtC?x1ZJDNSN3-J6`G-^vcInBw85tq_hlS@H|TsEC1
zGaH?0*WI`|anIk~we4TwV9qlG&9$i#es3ySVA5I3TZ3;nV7w&%x}H|x5gj(TZ8qum
zxc=th`OBcw1=C6WcLp1|ul^<540=<Ne^I^_82UU(<j;DbH|>zr-i=QU81(~Ld)z8l
zuZD|$f?tXi(T|Qe?~{Oyx?-}IIBd!b`|Hf@_S|Q~bsvh-Gq5(=)h?UU(8U{n0g-*I
UC;g!K2LJ#707*qoM6N<$g33?(FaQ7m

literal 0
HcmV?d00001

diff --git a/chatto/src/main/resources/pictures/L.png b/chatto/src/main/resources/pictures/L.png
new file mode 100644
index 0000000000000000000000000000000000000000..46879415c6bd2932db6678288fe4057f4ab72b22
GIT binary patch
literal 387
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmP-6T7f6(|)my2|yv)%#er@=ltB<)VvZPmw~~#C^fMp
zHASI3vm`^o-P1Q9MK6^dDE{2j#WBR=_}goHy_g+E+8!P^)W{MD^i;pWV$FTfO?&+T
z?~i(W)+OZTif-H_*yPxp^e1w5bBk!xZfT{)pAQUz&zz~QTlOPDLD$vfQqj@RxiX3T
z{uQ&smx?oLC+!dVzA@zC8@)dD1oanZnCEzH_VrDh`|ovoS^--+1byg_;(aIfLnm@^
zn8g&+oCM+5I}RUSbD(`k&$_n>+753U*18FC*3NlcCibAYWB-co%ex-*YnE-Bv8nE%
z-1X9ETL=F18^<KxPduaTR>8O5_DJ#(hVUJl)lXO5tFlkC;yU5oa9nt5+TTm&X>r=Y
THMzB2ps?_C^>bP0l+XkKg71@U

literal 0
HcmV?d00001

diff --git a/chatto/src/main/resources/pictures/M.png b/chatto/src/main/resources/pictures/M.png
new file mode 100644
index 0000000000000000000000000000000000000000..79b99a369c0bce3283f9f0aecbce7a2808bef2a8
GIT binary patch
literal 911
zcmV;A191F_P)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;{pd0HwUW_fa?GN03B&m
zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00Q$#L_t(Y$K}>bZ<j?B
z2JoN%7O0h*7b2n&L_q4LP-+T>1%wSEE0%r&6XMoy;+J3n#t=4M5<;TkBBF?jMDP}Z
zNCXO66ts17ra2kk_wB!l3ldNACNuNSnP=vi=bSU#r}jX6|GD2l$G^o`kL9?HzxxDT
zhz(eYTli}}JAMdnVH!W+^?CTdf$O-7H|I;$GdP2p_zqyW55M8c@6%x5U)F0`U<KBt
z{sz3%2k;K8PW`n(d0)VT;jp-3V4@G;eU;x*jP?sW)G&D&#_(VV=;PRq1(mwD^$R?V
zEe+$(W26IkH&!)_Z*2;#Cg5dwv0;2YHg^E;t!OT`5f9G=+{06NvSEQog6^S~#W#mO
z;7+I-9>a5U0T1GZ)c+lqQ-8Eld$HFl^}d5YQbL)S3wRO6Q~z5WO8t?Buv&m!SQ7o~
zcpJZT39Q#3tg&d%;5-iFYKreovB6>!L3I((hxjafXJUM`zM@_w{S_gia!(iV1x}}V
zV^xxPwW9f8_?}Alyb5dDfO{c=k{WN}Yy6DkY2Ky?Euq#|BDceLI1%j=k?TeLZ)pP_
ztbR`7%V>X&UsIwe31)jGw!^p<?XywU%G%r7fEVKB)W3?0(Y_G(R%|@NZU>%7nm7_P
z!xem=a9U5iG%5BTE=4$r(s-((dr#bVsXm|Jt3>a;s7^&cYtklXf$JYrIG2F##EEYt
zvFxvM`nwTI*^ajyY!<i|rzrMYMXfl^xfHvjk(ElKIT{<zb~+ve<tn$<zynowxe-9w
zE=G~hz9n{#hN5e`6j4zGHeLe{rOThjPa%$MQ^CSy1Hh4_`fRroO9SzsSdxKP;@N25
zZ8)tIBIm2I%Q%TY8|F`^xQ0hd!6<ZXOo?NvqBPq#k;$^Xj~_eA<;f}~kLMGwo<msq
z-<gyc;DZ*LvnX#?&#GDAvr$bZ@lglWa10;EJNvze@9B>DS0dD=;#!W?6Gp1?)@4s)
lXWI+1<vF!8<@o=h{R2<novfZMt4sg@002ovPDHLkV1o9gpAG;3

literal 0
HcmV?d00001

diff --git a/chatto/src/main/resources/pictures/N.png b/chatto/src/main/resources/pictures/N.png
new file mode 100644
index 0000000000000000000000000000000000000000..405bce0955ebc96f455d98b1b131ba68498d4c23
GIT binary patch
literal 606
zcmV-k0-^nhP)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;{pd101iilj{X1u03B&m
zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00F{DL_t(Y$L-d;Yg9oL
z2Jqi*f{%a@NfBaWB_@?Nv5{b7A(BE3h}bI<kbt!o_G0M+Uxoe$0TFyv=>wt&iV?91
zLJ%WLNZf047A{M6GvnPW7Jl6v=A7@mXZT0asG!&Ebzz`~;xP7MC%&UdBpt*-Okf3T
zIUWz=dXT-s@eJJ)L0I5+kKi`Nek_G@ffo^d3Lao1^p>%EvrEmy8cks~(w<V^VyjyB
zB5ril?KEaGo2+YJG&7X;;5-iWV_ce<qcnwc-Rjma;%<?j!O2A3O2ixZh|h5z!39j#
zo$3NF@d&MuO-8*(`%T>FxU-CV;Xpa%GuT#Va}D4<ZsJqOhH&vuQ=Zx&Z6_W_%G>*Q
z9CH|}i@1%SxQk~c*(sdGjyh6Z9;qeVz`IfzF5ys}5x4OK53yR>YFA>h6m=4}a0|~%
zvZFEILn-8g36Dh4#n2aAizjp<WOMkD@&;F0dsv8O`x@s_>`k#-l~~O7Q~b)YnMz!2
zF=AKo_HT4`Ctk-NZKdDDDI;<p^H{G!+$tGp#nYIA%Xm|AbiGvjB#gv%TEilaW#~@h
s1HR!-?)MgU;c(1pF2->L+x<u2H=iO}DG<*D_W%F@07*qoM6N<$f(~2&Q2+n{

literal 0
HcmV?d00001

diff --git a/chatto/src/main/resources/pictures/O.png b/chatto/src/main/resources/pictures/O.png
new file mode 100644
index 0000000000000000000000000000000000000000..df943d3dab7ff63de29f707fd8cc80a37764016e
GIT binary patch
literal 732
zcmV<20wev2P)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;{pd10y)hONpk=I03B&m
zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00KZsL_t(Y$L-cRXjM@V
z2H-EzxW}j@ir|J2F)kRe(kg{uBWPo#MG&;G5*tCS>@4iG77IZT3o!~J2rfYgqD8QX
zHqjz+!;olVR-es0I6Ur4?u`#^{NWboa%TQHv-6KoS0mZd-ymLuMzmlhCh-+R_=#V&
z_D%z~;{sk`G+sJ`LEOZFFsf!~L?`-!tlBq)%UE9v($%<#u?m7Ae8e|QR~T>uYiCos
zU=Gq{IEhPG68{GA5Z7@FJ(!4?FONHW!np1TMIqGVP`s-Al3pCg!i>A8@gceU6CLw$
z@n&=-iu!PP4w*9;PGs&z739W397_}o<6KU;u5fQDGJkgw;&r%_5I@3}oU%tSlE|K|
z7RM}XOyV<&r|8c~{1^jCH`||=xB+cg6XyZEDB!J;q~2j`Mlxm+FAic!`ScY`%=Za#
zQ&xgid-0~^JcQ2$iN_P-`YfLMDov#+IgdqyDB5D{5+kPa5ZC?TxD*vo*6}IJ@GRo#
zsN1w{E-gU13ayFmH+i#qs-kpS3Qn7jiUIK?FY$PVl^f7rfVeZfB>MdGA~9-@*pvtT
zwVZK38rw*@Yh5jxFU>Lb$_n1aq?!$Fcpa-xDavr?e0H&e$$C?YSnZv~L*2=6D8-7j
zU_K?W23IOJi(Z_HxHn;25cDT6E#ZD_F7rk!9#oLe#JV$p?-_g7vjUTBR_wsN3O8nb
zleis|t!8M(dA!AsD7lGPZ$|JECyF$hqOGw7`>+cu@FjNao-pD+s^T|9BeHA8{fBA*
O0000<MNUMnLSTXvPdA(Z

literal 0
HcmV?d00001

diff --git a/chatto/src/main/resources/pictures/P.png b/chatto/src/main/resources/pictures/P.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc0267bc75511c25c25587107a47a0d3180cdc27
GIT binary patch
literal 588
zcmV-S0<-;zP)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;{pd12?+=ypcDWA03B&m
zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00FQ`L_t(Y$L-d^OBGQR
z2Jl~6Y7r$_1`&Zl3-d21$&Jt|+O}0%8U#VRAn0GHwyh<K+O%k`i=-kY%0-ZvuC#}R
zR%p*RZO(&Xc;xhEoK1dknVCC>``vr)Io~<_Z`ha9rUyrH2pwpkj?EaqW7Ol{j@X~W
zrVlqUjw3;wU<(^q#RBH=8uKyttEg8l#KK9=@d@{E9tVmLU&5Ev!khRJC)x_vw%WjF
zTtj!eu1+JtG+yCgxV{f3(I3ylVLO0F5hIgDPuz(6&Y~9=aThZYXw8!^;B*<pw|B4~
z#0zYv$ZuqgI(8vN=Wz#Xsp}c8f*9VTmPyG<h>xd&Oyqkd#MgtoseEsXrc)l38^Z*;
zVy=egWf0dh-<>#z5nRS-q*oL7@v#izL0rWtoC%>Az*(Hg*gnLAi0s0WS;Jzg5VVrZ
zW!wriQ-);1u^6qeh$nc8*}qk&qQUh&ioqL9;T@J@zHmLxViJ!-nZDv1*6}kmIv3ih
zPIGt``I)rqs&)iqJGBW_5|@HK;#O#+TGk|Q`&tI^3O>a9a)?AF4LuCuN^}=5qto2O
aKj9A~2Z4$DGSD#q0000<MNUMnLSTaBsrMxS

literal 0
HcmV?d00001

diff --git a/chatto/src/main/resources/pictures/Q.png b/chatto/src/main/resources/pictures/Q.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e70ed76fb4533ec15c79b6535264fe08106f290
GIT binary patch
literal 830
zcmV-E1Ht@>P)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;{pd11_g!;@bCZt03B&m
zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00N>(L_t(Y$K}^Kh*Vn;
z2H<bp#&KNU6BT#dP<XhYD1vC>0vZ?yYM>^An3-wpOCG#HA5Toxzzq{I5k&<tFc1?L
zToDm*#0?c^)E=Fgo-wHlhwGi5?j8fdf(w05pE`e6oxlF7=6AD(I`$7k6GovCUHFU=
zI#K?azzqR39~-e6Gti7~yux*y#SOei&p@*>1WRxPU(nmna~>-&bReL^u>}uvhxbHk
z+tE<~{u-Mrfmcd(BevoICd679t+<OvXu~)xh-X6L{}DSP16A7~tjF^ticdI$wHTb+
zKLRbd8QI8u9${83z_W2RIiMZ?=OQYymAI8l`@vf7b#LO>g<}|BrT-?pOZ?wf8}*zV
znQmffjifvse8`BnyPDG3mVlP<ZynXJAt}9{sP7+0lv)$kCGRhAu@2xHk?yQ==7!?+
z3EYfj$$Kkq*8%(?YB{qp!TdgfM`3Dw?g=Sut5bZwMyfNM!F>TYM8w%I>y9$2xA}}r
z1gaC?Dn*>CS;GLNb{r-q@9%@Cg}}X`yB!I`|ELpqIsQz}eUR@~`H0)`GKqLf{Q6pL
zTWEa-e5F5!(KwaV@w4c^MK%wIa0086^%cSB?2MO~+#m4J=qQ;}H;xuG1^6$RTMqW`
z!%SRGRI3;Jt4-4^+)Er^VQ0a<!?|YA5gF=C)}CT|wZM(ol{@qaw&(UO!i8ueMUzM=
z8b+ZNrLY|LG6@S~Z7kN{uNdsQf{3j#08A`6=M9cWPp`@5;!;5*-Jxb5Lli2_Uv2m&
zDJ`|!_sK;5Dm`6z9R0VP`|eyH*{x_zQJ2?3{7Vt(w;)tI?&I&6P!>m~N;!g#uXmsy
z7WcUX(?WdS;!X?;pK?>oo*-#+kg(-v%-Yr3ybzbhU*^BlcLPb}<HnyjYXATM07*qo
IM6N<$f<csQU;qFB

literal 0
HcmV?d00001

diff --git a/chatto/src/main/resources/pictures/R.png b/chatto/src/main/resources/pictures/R.png
new file mode 100644
index 0000000000000000000000000000000000000000..21c84a54ab929776c8a9201ef2126b46bb92dc50
GIT binary patch
literal 693
zcmV;m0!safP)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;{pd14Gn7}p$Py003B&m
zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00J3FL_t(Y$L-cjh|W<M
z2JoLTuG3(0ohGc@MJ^F#g(xd!Da4ZHBnw$cN{EG(r7V<{g@t4zWo*pOwMGeJ)M$+R
z%x6BE_p8&_clm#p85>WX#W|h-|2gk--uF2#{|J*Z?rABpo=-;8iDzIv)}Sr+|G`gu
z!2tU489y+Bv1TZ;D+uxx##i*>Dt2Oi8HF;V1qZ8;mKyi48#C)Ao{YoE4@dA3eRvxZ
z4~E3W<lk^SuBs$jtB|LO(~k>yh}oEfF08;>EXU$Fa9c<}h+FkUd?<<HW!!lwObvN&
z<9qVWbIdJwkF``lIfX`WAIESPxmaI`?Tr#=!7#2x)CFvq2x54L(PZ8}QN-IYJ(&+o
z1o1|kNNRW#kLxL?tXP13IEpPvKo7#z8Y0f)cTzr`ScT0&wlxk=Kp)PA!8AlXFWl$=
z76nOXjADE2#cA}^YniEmj77cXD){t!T#37``0};ZXdqLn?CHTpe8>`2rPpa4_QyOI
z5k14}cnCU*{?UbLcvMu&4N3hb<{fdrUGe_jDU$yeE=2-1h4>Zrl#ssz=b|CVC)wYf
zv9-!XythKGoC*00`-dv*Z<=%Ea2_`!^TnHe84JhTGIKZ;nO$i3R>#`7d-V`b;#0DA
zBs!GL#QA7t(};2z$e-YPB6)ilN=?{=r%@s|!XC4rJvx$Myuh-08vdo&5nf#jW<`&-
b#DCx~zhs~x!3zS000000NkvXXu0mjf>M<<Q

literal 0
HcmV?d00001

diff --git a/chatto/src/main/resources/pictures/S.png b/chatto/src/main/resources/pictures/S.png
new file mode 100644
index 0000000000000000000000000000000000000000..457f2b4a26b6e628318c042d45a67ed0405df0cc
GIT binary patch
literal 775
zcmV+i1Ni)jP)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;{pd16cCdoWXJ#j03B&m
zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00L`CL_t(Y$K}^ch>l?t
z2k_tAU1o?hhB5BaTuf4~WzwW9C^jry%0f1>P!_VWkd+M!D=Q)!rEF{@vQQ!<MN=+C
zkql#uxtg&#U%kG*+kD>)3#Z<`-oEE~{^vaBfBxsZ{39!yz`bLW1zd(IOu@`}rUl>+
ze2w1$j7-$cRHFsQaR(nU6rf`P_7>N%7Y!&c6|@$I@FoG2@41V$rKGYNhtZdIa34P5
zJwD(IhSS!(z~XENSLOk3!I8)%4B|O%;|V^;8B5TCEtnsXwqPI5j5peH97v1e7Fu)c
z*&og%*Oz5GJey5TyQ*H?h%3xyS8zY^-jfZuGEc-ciTB}Paz49&ir~jZjE?uJYj8Ai
zZKDy<!UFa-U~aAj6*>O<6=Jasb#Z0OuqdMM3Bkx@KZ5y10mHY5d~*O-qYazTj^&|X
zeZhf(Eg$e8x&pK<k@K0s?v8L`J(l8o)OX3iDK<Y2<*Gwdq8chN8!NFf9GDZ#A1D<V
z`a?J#;8CPtdVr?Nr3#JM5L|eWg9Amk!+Na29-PPPG@%*Ar6A{|_48R+jdN+5K7d_+
zW2mUb*+@$Y{Aw`=&BIBYMstCCnxkW-fS*PQ7HoAm6}cM1<tU+iRv!aFvNhI>r%6<Y
zLZ!x?PHZm#cpYXW-rtAH6>L>Fn8ws+*pXvTD;|c_ruG~wCdUh6hDw5W;~I8jRR~9C
zkm_BeCbhOJcv6(L<6efDYBb8FKPJkt3=VE9wM<q-JN%gzQ6^_bLgBWSIJ5uJn|I=7
z40pZZNPoy;cj)<vVD_YZNi+qK8e@X##!I{^a6<V{?KkH@x@9c~-7f$D002ovPDHLk
FV1i-7OGp3!

literal 0
HcmV?d00001

diff --git a/chatto/src/main/resources/pictures/T.png b/chatto/src/main/resources/pictures/T.png
new file mode 100644
index 0000000000000000000000000000000000000000..f22d9fa24ccd0539752acbe8e0e3a6fbf8dec619
GIT binary patch
literal 378
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmP-6T65wv(2`$t3V;y%#er@=ltB<)VvZPmw~~#C^fMp
zHASI3vm`^o-P1Q9MK6^dD1Oh=#WBR=_}goSeol@etq=K|IXW*~l+gCx_CRTkMoi1r
zwYLkTH?at5TPM4xsyk*H9AnzBQ{`E!`X0gD8IygC%isOY_cJ<~ct7O#!fOuF?VX#a
z&v>|(Ye%bh%wvnTB@OL64!z#yn_kiL?EbueRt|ev{xk|!&6xgW?VYG8dm1&5g&xq~
zanRVxu!c4BvCQ&9^Fz)$(b^HU@@4N`VtMvOR!W}^x#Y;SBeGys-{Sua;eV&qb4@!a
zIR}jP%zuz{Y}WE67eqd&6kSVqn15>1XTQnLFIdC{KfL>(mfgIMfxp69spR=rYfun)
My85}Sb4q9e0Q&io2LJ#7

literal 0
HcmV?d00001

diff --git a/chatto/src/main/resources/pictures/U.png b/chatto/src/main/resources/pictures/U.png
new file mode 100644
index 0000000000000000000000000000000000000000..70c1adb71d6b6a031e76be280bf61d54a697de8a
GIT binary patch
literal 656
zcmV;B0&o3^P)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;{pd19SXmNCi?&Y03B&m
zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00Hz#L_t(Y$L*FuOItw@
z$A3u^Q_`lfi4l4#1))MwM5N%MC%;2atzSX#;GsQvv8R5Pdgv`T4<0-ON(pMI2M?x&
zAVu1SBqndY%!6S`UgmAQ=^qx}K6d86GyC6}g}a6aWBwO_r$8RK23$(N8K4Z5fT4_u
zC<0r+Pv9%C8W7M+pbq>1KFCHUVgYDLlzre+0P&vKJKz$S^A}`C80CS7^6ez;X;D(?
z%>j=r#2J+u2Mhv;haN}HLY!6qomChfoae7#jaU;$0mPB#FP}Em1YD)0KoW^>18!2i
z$c`~`-j1h@7%Op<q(}pD-gyr!#E~K%DGUQ<Jbyh4@lfh>d^RBkq^Q0Jz<&#IALuCJ
z#{tAo)Y*2e#66&`=4Dkvt(aBBS1OQ1;x2Hm<`tlpQdm_rZ;MY;#7#AymyTscO}bGW
z@!6;%G%n(Xnm<d~lh@>oV>GPycnF-zLm(E)x}2K@Z<Qu`z(E>ul!4ExinV}u2D=U5
zm$Ewy5GHR#7~09}g!Rjk)=1gB52>*wU{^VDz&Bu1#1p?%o&(z=B28KsA3=BleDTN!
zz=dq$1o-0-I?>0gX<OVPurH!>2_up<N5IN$_17w}0~`Z?<;wMBbfh{pfsbDCNY^V9
qP!WMG$%DTS{06>D>i=<%F}MLgZiFxjPw%Y&0000<MNUMnLSTZ~z6mh^

literal 0
HcmV?d00001

diff --git a/chatto/src/main/resources/pictures/V.png b/chatto/src/main/resources/pictures/V.png
new file mode 100644
index 0000000000000000000000000000000000000000..9eb8cefe3fbdb29243ed31e79c96da26d1c4aa9f
GIT binary patch
literal 705
zcmV;y0zUnTP)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;{pd1FA%Sni|_yd03B&m
zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00JdRL_t(Y$K}`Ei%nq^
z2JqjU(HQbk2sIKjk|72oT#-l-Zn$&d-nIY5KR`&yM+)P@40B-^q$o{OLq1AK`Dg|+
z$IaS$JDu6H_jE?ds#EVed%f>-_OqY$>~;9xqIrsIEoj0-$#a`98<olSP6j*&dvOBu
zFkBLR9ZsSXLl`Z(aSJ}7iV++v0XiFZVs90v>J?RT?s#sj+pw<$@NRS``LZ&=Z}BA7
zv#<#(3j!ZUYph3cwG8kF+)VPd*iis<6?Vmsg@+g@1N;?t6H&Ak1U`zTNqz=nWm|1E
z`Vx`!pd+Wg6}_SUD&AnlWW|-7gWltIl6TgKrk<!eqle*2Xr(mpH{8dUgzoN~-am$g
zvHpp3(=eVt(Gho@(S0j~R<G_^QrCz1c?Vaf0Dc!{ki|xH)u}rYjAU^(7@IcmcMOJ$
z!E$U34^PczKNch&&@&ayl>&4R;X#sbLwk*=)+eI6oF}R>z^~Dt<eRY}$qxk+Fpi7(
z(FovCJc{;$B|&#H)?j-=eLtQTQFEoBx?hC-WwA4Pd8DRt9-oUGSQPkW^mG<o@oe{C
zQ6j3|A~ctc!(oHfpmHF<vfe$N7)V2-9oG_|Ux_b|<3I@pix<WuGFUS<Wi50soNHnx
zfG0xTuj*X8l&HSp!0<FawbM#}nSpLPz$17Z&oztd@x7S@7HS@j^%!p8V<QK8IfGye
n7RNjHLX1j(Et>wx|4zRFsLFmb31B9#00000NkvXXu0mjfnkFa)

literal 0
HcmV?d00001

diff --git a/chatto/src/main/resources/pictures/W.png b/chatto/src/main/resources/pictures/W.png
new file mode 100644
index 0000000000000000000000000000000000000000..16f7fcacdbaad5919b1adfa1007102d41246bb1b
GIT binary patch
literal 755
zcmV<P0u23$P)<h;3K|Lk000e1NJLTq0015U0015c1ONa4kvV2500002VoOIv0RM-N
z%)bBt010qNS#tmY3ljhU3ljkVnw%H_000McNliru;{pc~Auogf_wfJ#03B&mSad^g
zZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00LV{L_t(I%jMKtYgAVl2H+<%
zc7pMcs1uJA1D@h|o}?;9tS!AL#eyQ}O%c5H!av|2@X9|SctTVJk%$@#;@Q!PNt#gF
zl45J4m;;)QJBQ`P><oJ*$+Z{#_RYKA^}hRC-#UE!kD^8mq>+|2Pf@6n)M`{Kn!?w~
zTVc>BY}W3EwkiMLufti*Q?mXfGT=yQa6%AVsS-81A_$JjROP)Vh@2vYK9KWeg=kBh
zbGwELeuEZ_xKB!O-ypK~RESzMfgKtv_=7TnzuYWke&rG7__kuvTh)TKno4^M>g~sv
z+XhPJ$aQ3FwWuu0*%YIcyt*>qW;H&zSejzO&x%-XXQJZO3B&v{J}fQh@o>@{{OK3e
z+Z#)=wyDK$2GC+j%rEmD#$6Rnni<iK*;>qr>&#==dA}knXBPP05)8RKSrLrt5U|oV
zuu(I5T-6gVyj1leX*|}QG*9T&jYfO0P+kU4yztU6cAJl!R*btq(#()sn5Pv@wxg(^
z=&63Jw-N_5;9u?4=Av6*m5tWOp+_fPc!e*tnrojlZu-00Jg!S0mijTi9tFL4r%Qx3
z-&m){xO3CJ(FINmK6>i0py+taAJs4T!!?nhTm5wAjH7~JR3v!m>+)Ue6pSeff|E1#
zhrBmJ{GBO3hqP-ZVm9(s(vV8ve>{j$<heKH-6$A|@e`dhnFrm8(eDZg{+{6&UGU$`
zjcu>@g5Z+H2{!AQAQ-Z?Ql6?9^(o+^=lT=uTV2M`5%-)KqRw&e-L-2<E9~{!4^^qA
lIj~ihO~W@;b-2$Qp8(l9xWQC<H8ubM002ovPDHLkV1ioAU0DDC

literal 0
HcmV?d00001

diff --git a/chatto/src/main/resources/pictures/X.png b/chatto/src/main/resources/pictures/X.png
new file mode 100644
index 0000000000000000000000000000000000000000..24c3195a2ce0344fefce287f3ea110f977b9e202
GIT binary patch
literal 715
zcmV;+0yO=JP)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;{pd1F*2^U^~(SN03B&m
zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00J*bL_t(Y$K}>dh>c+s
z2k;-m%rHufX_6G9OVeZ_Ns^BcVI#ywDOph#3Jb(a7B+S$HEfh<R^y{YYOENE#T2C(
zp(x{H24k9WZJxKD-tHamy>o9V|GJC&yyt(;`<(Zj|2h1Fm{3h0HARePActBEB40+(
zCM?7Veq<rc!j%y0309R6v;|!l#RD{EAuYy02%HbZT!}Zm74b*0Aq#OfI#a~<jBh;+
zm+(8{zrftAZ@mmX5qS`&Q8xx>GEQPB;=RS@Qod0QcHm>=<Q?{oQK|dTAK8D#{&HGj
z3XbAu<m?&N6|mic-pKA3PK~D}n{Xj=n8$6jMmEdQowB)zspA!aMX4%H95-SC?xdb|
zgaWMy)`T=C&IfQ7*Fsv8^DeYiQa&eQPbjb?$oHU1$^Ra#t%i0t;5fdfQk%zn>@Fg~
z6~P?bED-n@>Pt;wsTw@Lz<DmTUscdnpn{X%P`GtnHB#K3(%?6#Ve$#v%gAC;Ovf1v
zM?t!=3FpGBP0n9oNhN~T;b7`!eb^Pv?v7L@9-?`?Ys)r#h@5`GAxw(wTJbpb%`cZ)
z<uO*^W#nu)s8vG&+l?U;iR}oElrto9c$B)u)i5-Q;XuepEUQ~f3EGV7si1c=u0Q8f
zi$HH`k`+ZgPNaf9#mW+7wKJvR_p|i(Ox%k|ud%bl&omFuqe}13vUAnraF{%Op@Pf7
x>d@2Qa3kzve?@Ir_Lh!Q16r`YNEiHv_yb}`#TZuUUl{-Z002ovPDHLkV1l+6H-rEH

literal 0
HcmV?d00001

diff --git a/chatto/src/main/resources/pictures/Y.png b/chatto/src/main/resources/pictures/Y.png
new file mode 100644
index 0000000000000000000000000000000000000000..e998b80bbd3033a24dc10153ec466567363acec8
GIT binary patch
literal 655
zcmV;A0&x9_P)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;{pd1GbJBW5{>`>03B&m
zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00Hw!L_t(Y$L-clh)!V?
z2k_s_m}HDM%!+(Vm?;Y@N^E>ACXyAUL>AagR+NREl!y`wWudG@l6+)=B@1FPBsM}K
zpBW_PwK=z*E@SR}-?=vY>(>1^=l_4sx#yhc;a@}B5bxVD7A^SE1a~J!;d>E>PHe{w
z>_x3X;WfC1lbBk>VF5m&jt}T-Ky)^q21gzH@&>KHaT>%x+}E%H-6cd@up3hnzHdbw
z$KgP-+OP54T2Ocu-Y5Q#Fr(<Id(fXaKg5axel=W=DC-gFwle={G<GBeb)3S)Vf=RD
zbK-Lq9c2q-8ZIRyFR|$l_VaRCdWWTrv_lKl20=!41#^b5JszpeY!8*Fi(k-%V+q+8
z?24g~q8HB+yMD}ScDgNz;>t+xVsY|)0xrgc%WSqp7Mj8s?8z0{VT_OOeYxLpAr><t
z=!rJT$X`UicH>sApq7n9v}y5d%?*aLIG2pqI`%ixKEq)WPA4J*G1ao?`<P$VHo6*5
z60!8!9NTFn=)l2T1!rlWT=n6h7mpLsH&|J=pvq2`HY~#Q<lPC}jzv_4<#>=pdk+h%
zPH|U6mx&I>4%S|^@J75%gwJDU)uMB8IT3x0b${a+ygqiOO!!E%^SEeLe~h+)J2(?_
pdBhL&c|4Ef>MI<@P5)66KLJpzn}d`niYfpA002ovPDHLkV1mxi7i$0j

literal 0
HcmV?d00001

diff --git a/chatto/src/main/resources/pictures/Z.png b/chatto/src/main/resources/pictures/Z.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab84cd4f5df27e602352062bf1f90e2aa09928d0
GIT binary patch
literal 568
zcmV-80>}M{P)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;{pd15FQZmjLQH303B&m
zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00EpyL_t(Y$L-d?OVv>r
z$MM&_=8se)2O+J&h8&y}iNL`jXt1Rg2Umw&Z1)eS2<jhbm2$8pLYjj_8w!euhAdhN
z)WJ;461&&sTsU5?_`TkHbm;?!?{J1U-{<o@&-rjd${li_uLGk{4LFCh7(g3}M}+>s
zoAAw~9y|-cTF(p`vVw=ORVVOzsNO!EIsm+i7Z^FnqY5gb38%{}e21UaG*>T1(VD^I
z()|q#M?bWTalB4BAwzf{DpbT8#!`=E9~L5C|6n>bv<r{18-X7Nual_-cknBMKF7J#
ze|r-v5%g{FI;lqSF@k=_^$cscCJlx;FG06)3(YB^=kW;tBJcxrri8ZRE`CSQIb28y
z&0{hwh7$A@E~Rd!YxopFzlLVYr-TmRWdz;A)NwS^Y}r$HA7@fRJ8-+KgP){srbbMZ
zt-~c;P8|ZT;9CS;4)1N!l-VD$QoMIRgl)BxaV-|Gh^N7-OiSWko$}V-Fov0Ob0fOz
zRM93}taMQ+>}`hfT&*!v!)MG_8|b^k$sG}1z!z-zFYEy<NSzp$en8#;0000<MNUMn
GLSTXdo#_Pt

literal 0
HcmV?d00001

diff --git a/chatto/src/main/resources/templates/registration.html b/chatto/src/main/resources/templates/registration.html
index ab3938f..327f868 100644
--- a/chatto/src/main/resources/templates/registration.html
+++ b/chatto/src/main/resources/templates/registration.html
@@ -54,6 +54,15 @@
                                         <label for="password-repeat">Repeat password: </label>
                                         <input class="form-control" type="password" id="password-repeat" required>
                                     </div>
+                                    <input type="hidden" th:value="${userRegistrationDTO.captchaID}" name="captchaID">
+                                     <!-- <span th:text="${userRegistrationDTO.captchaText}"></span> -->
+                                    <div class="form-group">
+                                        <label for="captcha">Enter this captcha: 
+                                           
+                                            <img th:src="@{'/img/' + ${userRegistrationDTO.captchaID}}" />
+                                        </label>
+                                        <input class="form-control" type="text" id="captcha" th:field="*{captchaInput}" required>
+                                    </div>
                                     <div class="form-group">
                                         <input class="form-control btn btn-secondary" type="submit" value="Submit">
                                     </div>