mirror of
https://github.com/imgfloat/server.git
synced 2026-02-05 03:39:26 +00:00
Remove local ssl setup in favor of pure http in local development
This commit is contained in:
6
Makefile
6
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
|
||||
|
||||
@@ -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
|
||||
];
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user