Browse Source

minor improvements

feature/brute_force_protection
Stephan Richter 3 months ago
parent
commit
3b7c292e32
  1. 55
      backend/src/main/java/de/srsoftware/umbrella/backend/Application.java
  2. 2
      legacy/src/main/java/de/srsoftware/umbrella/legacy/CompanyLegacy.java
  3. 1
      legacy/src/main/java/de/srsoftware/umbrella/legacy/NotesLegacy.java
  4. 2
      legacy/src/main/java/de/srsoftware/umbrella/legacy/ProjectLegacy.java

55
backend/src/main/java/de/srsoftware/umbrella/backend/Application.java

@ -63,43 +63,24 @@ public class Application {
var server = HttpServer.create(new InetSocketAddress(port), 0); var server = HttpServer.create(new InetSocketAddress(port), 0);
var registry = new ModuleRegistry(); var registry = new ModuleRegistry();
var translationModule = new Translations(registry); new Translations(registry).bindPath("/api/translations").on(server);
var postBox = new MessageSystem(registry,config); new MessageSystem(registry,config);
new UserModule(registry,config).bindPath("/api/user").on(server);
var userModule = new UserModule(registry,config); new TagModule(registry,config).bindPath("/api/tags").on(server);
var tagModule = new TagModule(registry,config); new BookmarkApi(registry,config).bindPath("/api/bookmark").on(server);
var bookmarkApi = new BookmarkApi(registry,config); new CompanyModule(registry, config).bindPath("/api/company").on(server);
var companyModule = new CompanyModule(registry, config); new CompanyLegacy(registry, config).bindPath("/legacy/company").on(server);
var companyLegacy = new CompanyLegacy(registry, config); new DocumentApi(registry, config).bindPath("/api/document").on(server);
var documentApi = new DocumentApi(registry, config); new ItemApi(registry, config).bindPath("/api/items").on(server);
var itemApi = new ItemApi(registry, config); new UserLegacy(registry,config).bindPath("/legacy/user").on(server);
var userLegacy = new UserLegacy(registry,config); new NotesLegacy(registry,config).bindPath("/legacy/notes").on(server);
var notesLegacy = new NotesLegacy(registry,config); new MarkdownApi(registry).bindPath("/api/markdown").on(server);
var markdownApi = new MarkdownApi(registry); new NoteModule(registry,config).bindPath("/api/notes").on(server);
var notesModule = new NoteModule(registry,config); new ProjectModule(registry, config).bindPath("/api/project").on(server);
var projectModule = new ProjectModule(registry, config); new ProjectLegacy(registry,config).bindPath("/legacy/project").on(server);
var projectLegacy = new ProjectLegacy(registry,config); new TaskModule(registry, config).bindPath("/api/task").on(server);
var taskModule = new TaskModule(registry, config); new TimeModule(registry, config).bindPath("/api/times").on(server);
var timeModule = new TimeModule(registry, config); new WebHandler().bindPath("/").on(server);
var webHandler = new WebHandler();
bookmarkApi .bindPath("/api/bookmark") .on(server);
documentApi .bindPath("/api/document") .on(server);
companyModule .bindPath("/api/company") .on(server);
companyLegacy .bindPath("/legacy/company") .on(server);
itemApi .bindPath("/api/items") .on(server);
markdownApi .bindPath("/api/markdown") .on(server);
notesModule .bindPath("/api/notes") .on(server);
projectModule .bindPath("/api/project") .on(server);
tagModule .bindPath("/api/tags") .on(server);
taskModule .bindPath("/api/task") .on(server);
timeModule .bindPath("/api/times") .on(server);
translationModule.bindPath("/api/translations").on(server);
userModule .bindPath("/api/user") .on(server);
notesLegacy .bindPath("/legacy/notes") .on(server);
projectLegacy .bindPath("/legacy/project") .on(server);
userLegacy .bindPath("/legacy/user") .on(server);
webHandler .bindPath("/") .on(server);
server.setExecutor(Executors.newFixedThreadPool(threads)); server.setExecutor(Executors.newFixedThreadPool(threads));
server.start(); server.start();

2
legacy/src/main/java/de/srsoftware/umbrella/legacy/CompanyLegacy.java

@ -37,7 +37,7 @@ public class CompanyLegacy extends BaseHandler {
@Override @Override
public boolean doGet(Path path, HttpExchange ex) throws IOException { public boolean doGet(Path path, HttpExchange ex) throws IOException {
if (path.empty()) return sendRedirect(ex, url(ex).replaceAll("/legacy/.*","")); if (path.empty()) return sendRedirect(ex, url(ex).replaceAll("/legacy/","/"));
return super.doGet(path, ex); return super.doGet(path, ex);
} }

1
legacy/src/main/java/de/srsoftware/umbrella/legacy/NotesLegacy.java

@ -39,6 +39,7 @@ public class NotesLegacy extends BaseHandler {
@Override @Override
public boolean doGet(Path path, HttpExchange ex) throws IOException { public boolean doGet(Path path, HttpExchange ex) throws IOException {
if (path.empty()) return sendRedirect(ex, url(ex).replaceAll("/legacy/","/"));
return super.doGet(path, ex); return super.doGet(path, ex);
} }

2
legacy/src/main/java/de/srsoftware/umbrella/legacy/ProjectLegacy.java

@ -38,7 +38,7 @@ public class ProjectLegacy extends BaseHandler {
@Override @Override
public boolean doGet(Path path, HttpExchange ex) throws IOException { public boolean doGet(Path path, HttpExchange ex) throws IOException {
if (path.empty()) return sendRedirect(ex, url(ex).replaceAll("/legacy/.*","")); if (path.empty()) return sendRedirect(ex, url(ex).replaceAll("/legacy/","/"));
return super.doGet(path, ex); return super.doGet(path, ex);
} }

Loading…
Cancel
Save