Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,4 @@ bin/
### Mac OS ###
.DS_Store
/src/main/resources/installer-data/dependencies.json
/.idea/
3 changes: 0 additions & 3 deletions .idea/.gitignore

This file was deleted.

17 changes: 0 additions & 17 deletions .idea/gradle.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/hotswap_agent.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/inspectionProfiles/Project_Default.xml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/misc.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

10 changes: 4 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import org.mangorage.mangobotgradle.util.GitVersion


buildscript {
repositories {
Expand All @@ -18,7 +16,7 @@ buildscript {
}

dependencies {
classpath 'org.mangorage:MangoBotGradle:6.0.22'
classpath 'org.mangorage:MangoBotGradle:6.0.24'
}
}

Expand All @@ -31,7 +29,7 @@ apply plugin: 'maven-publish'
apply plugin: 'MangoBotGradle'

group = 'org.mangorage'
version = GitVersion.getGitVersion().getVersionAsString()
version = "0.0.0"

println("Version: " + version)

Expand Down Expand Up @@ -93,8 +91,8 @@ dependencies {

launchtarget("org.mangorage:mangobotlaunchtarget:0.1.8")

plugin('org.mangorage:mangobot:12.0.96')
plugin('org.mangorage:mangobotplugin:12.0.57')
plugin('org.mangorage:mangobot:12.0.109')
plugin('org.mangorage:mangobotplugin:12.0.63')

library('org.eclipse.jetty:jetty-server:11.0.16')
library('org.eclipse.jetty:jetty-servlet:11.0.16')
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@
requires org.mangorage.bootstrap;

// Files
opens templates.file;
opens templates.general;
opens templates;

// TODO: Deal with it
exports org.mangorage.mangobotsite.website.servlet.data;

exports org.mangorage.mangobotsite;
exports org.mangorage.mangobotsite.website.file;
exports org.mangorage.mangobotsite.website.servlet.entity;
Expand Down
26 changes: 2 additions & 24 deletions src/main/java/org/mangorage/mangobotsite/website/WebServer.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,7 @@
import org.mangorage.mangobotsite.website.filters.RequestInterceptorFilter;
import org.mangorage.mangobotsite.website.handlers.DefaultErrorHandler;
import org.mangorage.mangobotsite.website.impl.ObjectMap;
import org.mangorage.mangobotsite.website.servlet.AccountServlet;

import org.mangorage.mangobotsite.website.servlet.EntitiesServlet;
import org.mangorage.mangobotsite.website.servlet.EntityServlet;
import org.mangorage.mangobotsite.website.servlet.FileServlet;
import org.mangorage.mangobotsite.website.servlet.FileUploadServlet;
import org.mangorage.mangobotsite.website.servlet.HomeServlet;
import org.mangorage.mangobotsite.website.servlet.InfoServlet;
import org.mangorage.mangobotsite.website.servlet.LoginServlet;
import org.mangorage.mangobotsite.website.servlet.StreamingServlet;
import org.mangorage.mangobotsite.website.servlet.TestAuthServlet;
import org.mangorage.mangobotsite.website.servlet.TricksServlet;
import org.mangorage.mangobotsite.website.util.ResolveString;
import org.mangorage.mangobotsite.website.util.ServletContextHandlerBuilder;
Expand Down Expand Up @@ -111,22 +101,10 @@ public static void startWebServer(ObjectMap objectMap) throws Exception {
h.setErrorHandler(new DefaultErrorHandler());
})

.addServlet(StreamingServlet.class, "/watch")

.addHttpServlet(HomeServlet.class, "/home")
.addHttpServlet(InfoServlet.class, "/info")
.addHttpServlet(TricksServlet.class, "/trick")
.addHttpServlet(FileServlet.class, "/file")
.addHttpServlet(TestAuthServlet.class, "/testAuth")
.addHttpServlet(LoginServlet.class, "/login")
.addHttpServlet(AccountServlet.class, "/account")
.addHttpServlet(FileUploadServlet.class, "/upload", h -> {
h.getRegistration().setMultipartConfig(
new MultipartConfigElement("/tmp/uploads")
);
})
.addHttpServlet(EntityServlet.class, "/api/entity/*")
.addHttpServlet(EntitiesServlet.class, "/api/entities/*")
.addServlet(TricksServlet.class, "/tricks")

.setAttribute(WebConstants.WEB_OBJECT_ID, objectMap)
.addFilter(RequestInterceptorFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST))
.configureLoginBuilder(security -> {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package org.mangorage.mangobotsite.website;

import org.mangorage.mangobotsite.website.servlet.data.HeaderData;

import java.util.List;

public final class WebsiteConstants {
public static final List<HeaderData> headers = List.of(
new HeaderData("/home", "Home", true),
new HeaderData("/home#plugins", "Plugins", true),
new HeaderData("/tricks", "Tricks", true),
new HeaderData("/home#contact", "Contact", true)
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import jakarta.servlet.http.HttpServletResponse;
import org.eclipse.jetty.server.Request;
import org.mangorage.mangobotcore.api.util.log.LogHelper;
import org.mangorage.mangobotsite.website.servlet.StreamingServlet;


import java.io.IOException;
Expand All @@ -36,9 +35,6 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
var ip = main.getHeader("X-Forwarded-For");
LogHelper.info("Intercepted Request from %s for %s -> https://mangobot.mangorage.org%s".formatted(ip == null ? request.getRemoteAddr() : ip, main.getMethod(), main.getOriginalURI()));

if (main.getOriginalURI().contains("mode")) {
new StreamingServlet().service(request, response);
}
} else if (request instanceof HttpServletRequest http) {
var ip = http.getHeader("X-Forwarded-For");
LogHelper.info("Unknown Type (Class) From %s -> %s".formatted(ip == null ? http.getRemoteAddr() : ip, request.getClass()));
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading