imgfloat/server
1
0
Fork 0
mirror of https://github.com/imgfloat/server.git synced 2026-02-05 03:39:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove local ssl setup in favor of pure http in local development

Browse Source
This commit is contained in:
Andreas Krühlmann
2026-01-05 22:03:20 +01:00
parent 58de51f0b7
commit 01ffc6f1cf
3 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -43,12 +43,6 @@ package:
runx: runx:
IMGFLOAT_CHANNELS_URL=http://localhost:8080/channels ./src/main/shell/run-electron-app-in-xorg 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 .PHONY: fix
fix: node_modules fix: node_modules
./node_modules/.bin/prettier --write src ./node_modules/.bin/prettier --write src

2
shell.nix
View File

@@ -5,13 +5,11 @@ pkgs.mkShell {
pkgs.electron pkgs.electron
pkgs.jdt-language-server pkgs.jdt-language-server
pkgs.maven pkgs.maven
pkgs.mkcert
pkgs.nodePackages.prettier pkgs.nodePackages.prettier
pkgs.nodejs pkgs.nodejs
pkgs.nss pkgs.nss
pkgs.openbox pkgs.openbox
pkgs.openjdk pkgs.openjdk
pkgs.openssl
pkgs.xorg.xorgserver pkgs.xorg.xorgserver
]; ];
} }

4
src/main/java/dev/kruhlmann/imgfloat/controller/ChannelApiController.java
View File

@@ -77,10 +77,10 @@ public class ChannelApiController {
) { ) {
String sessionUsername = OauthSessionUser.from(oauthToken).login(); String sessionUsername = OauthSessionUser.from(oauthToken).login();
authorizationService.userMatchesSessionUsernameOrThrowHttpError(broadcaster, sessionUsername); 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()); boolean added = channelDirectoryService.addAdmin(broadcaster, request.getUsername());
if (!added) { 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); return ResponseEntity.ok().body(added);
} }