Enabled AJP

Author: jasonlessenich

…vadiscord/javabot/data/SpringConfig.java …avadiscord/javabot/api/SpringConfig.javasrc/main/java/net/javadiscord/javabot/data/SpringConfig.java renamed to src/main/java/net/javadiscord/javabot/api/SpringConfig.java src/main/java/net/javadiscord/javabot/data/SpringConfig.java renamed to src/main/java/net/javadiscord/javabot/api/SpringConfig.java

@@ -1,4 +1,4 @@
-package net.javadiscord.javabot.data;
+package net.javadiscord.javabot.api;
 
 import net.dv8tion.jda.api.JDA;
 import net.javadiscord.javabot.Bot;

src/main/java/net/javadiscord/javabot/api/TomcatConfig.java

@@ -0,0 +1,41 @@
+package net.javadiscord.javabot.api;
+
+import net.javadiscord.javabot.Bot;
+import org.apache.catalina.connector.Connector;
+import org.apache.coyote.ajp.AjpNioProtocol;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
+import org.springframework.context.annotation.Bean;
+
+/**
+ * Holds all configuration for the {@link org.springframework.boot.autoconfigure.web.ServerProperties.Tomcat}
+ * web service.
+ */
+public class TomcatConfig {
+
+	@Value("${tomcat.ajp.port}")
+	int ajpPort;
+
+	@Value("${tomcat.ajp.enabled}")
+	boolean tomcatAjpEnabled;
+
+	/**
+	 * Sets up the {@link TomcatServletWebServerFactory} using the {@link Value}s defined in the
+	 * application.properties file.
+	 *
+	 * @return The {@link TomcatServletWebServerFactory}.
+	 */
+	@Bean
+	public TomcatServletWebServerFactory servletContainer() {
+		TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory();
+		if (tomcatAjpEnabled) {
+			Connector ajpConnector = new Connector("org.apache.coyote.ajp.AjpNioProtocol");
+			AjpNioProtocol protocol= (AjpNioProtocol) ajpConnector.getProtocolHandler();
+			protocol.setSecret(Bot.getConfig().getSystems().getApiConfig().getAjpSecret());
+			ajpConnector.setPort(ajpPort);
+			ajpConnector.setSecure(true);
+			tomcat.addAdditionalTomcatConnectors(ajpConnector);
+		}
+		return tomcat;
+	}
+}

src/main/java/net/javadiscord/javabot/data/config/SystemsConfig.java

@@ -66,6 +66,7 @@ public static class ApiConfig {
 		private String clientSecret = "";
 		private String redirectUrl = "";
 		private String[] scopes = new String[]{};
+		private String ajpSecret = "";
 	}
 
 	/**

src/main/resources/application.properties

@@ -1 +1,3 @@
-server.port=9000
+server.port=9000
+tomcat.ajp.port=9090
+tomcat.ajp.enabled=true