diff --git a/Makefile b/Makefile index d15c6d4..07e6a71 100644 --- a/Makefile +++ b/Makefile @@ -43,12 +43,6 @@ package: runx: IMGFLOAT_CHANNELS_URL=http://localhost:8080/channels ./src/main/shell/run-electron-app-in-xorg -.PHONY: ssl -ssl: - mkdir -p local - keytool -genkeypair -alias imgfloat -keyalg RSA -keystore local/keystore.p12 -storetype PKCS12 -storepass changeit -keypass changeit -dname "CN=localhost" -validity 365 - echo "Use SSL_ENABLED=true SSL_KEYSTORE_PATH=file:$$PWD/local/keystore.p12" - .PHONY: fix fix: node_modules ./node_modules/.bin/prettier --write src diff --git a/shell.nix b/shell.nix index 62ebdff..d084c6b 100644 --- a/shell.nix +++ b/shell.nix @@ -5,13 +5,11 @@ pkgs.mkShell { pkgs.electron pkgs.jdt-language-server pkgs.maven - pkgs.mkcert pkgs.nodePackages.prettier pkgs.nodejs pkgs.nss pkgs.openbox pkgs.openjdk - pkgs.openssl pkgs.xorg.xorgserver ]; } diff --git a/src/main/java/dev/kruhlmann/imgfloat/controller/ChannelApiController.java b/src/main/java/dev/kruhlmann/imgfloat/controller/ChannelApiController.java index 9ddffb7..eabaa04 100644 --- a/src/main/java/dev/kruhlmann/imgfloat/controller/ChannelApiController.java +++ b/src/main/java/dev/kruhlmann/imgfloat/controller/ChannelApiController.java @@ -77,10 +77,10 @@ public class ChannelApiController { ) { String sessionUsername = OauthSessionUser.from(oauthToken).login(); authorizationService.userMatchesSessionUsernameOrThrowHttpError(broadcaster, sessionUsername); - LOG.info("User {} adding admin {} to {}", sessionUsername, request.getUsername(), broadcaster); + LOG.info("User {} adding admin {} to {}", sessionUsername, request.getUsername(), broadcaster.replaceAll("[\n\r]", "_")); boolean added = channelDirectoryService.addAdmin(broadcaster, request.getUsername()); if (!added) { - LOG.info("User {} already admin for {} or could not be added", request.getUsername(), broadcaster); + LOG.info("User {} already admin for {} or could not be added", request.getUsername(), broadcaster.replaceAll("[\n\r]", "_")); } return ResponseEntity.ok().body(added); }