mirror of
https://github.com/GravitLauncher/Launcher
synced 2024-12-23 00:51:01 +03:00
[FIX] Strict profile access, update gradle
This commit is contained in:
parent
cdb54b34de
commit
00ab20473c
8 changed files with 3 additions and 70 deletions
|
@ -29,12 +29,12 @@ public void init(LaunchServer server) {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canGetProfile(ClientProfile profile, Client client) {
|
public boolean canGetProfile(ClientProfile profile, Client client) {
|
||||||
return !profile.isLimited() || isWhitelisted("launchserver.profile.%s.show", profile, client);
|
return (client.isAuth && !profile.isLimited()) || isWhitelisted("launchserver.profile.%s.show", profile, client);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canChangeProfile(ClientProfile profile, Client client) {
|
public boolean canChangeProfile(ClientProfile profile, Client client) {
|
||||||
return !profile.isLimited() || isWhitelisted("launchserver.profile.%s.enter", profile, client);
|
return (client.isAuth && !profile.isLimited()) || isWhitelisted("launchserver.profile.%s.enter", profile, client);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -31,7 +31,6 @@
|
||||||
import pro.gravit.launchserver.socket.response.secure.SecurityReportResponse;
|
import pro.gravit.launchserver.socket.response.secure.SecurityReportResponse;
|
||||||
import pro.gravit.launchserver.socket.response.secure.VerifySecureLevelKeyResponse;
|
import pro.gravit.launchserver.socket.response.secure.VerifySecureLevelKeyResponse;
|
||||||
import pro.gravit.launchserver.socket.response.update.LauncherResponse;
|
import pro.gravit.launchserver.socket.response.update.LauncherResponse;
|
||||||
import pro.gravit.launchserver.socket.response.update.UpdateListResponse;
|
|
||||||
import pro.gravit.launchserver.socket.response.update.UpdateResponse;
|
import pro.gravit.launchserver.socket.response.update.UpdateResponse;
|
||||||
import pro.gravit.utils.BiHookSet;
|
import pro.gravit.utils.BiHookSet;
|
||||||
import pro.gravit.utils.HookSet;
|
import pro.gravit.utils.HookSet;
|
||||||
|
@ -74,7 +73,6 @@ public static void registerResponses() {
|
||||||
providers.register("joinServer", JoinServerResponse.class);
|
providers.register("joinServer", JoinServerResponse.class);
|
||||||
providers.register("profiles", ProfilesResponse.class);
|
providers.register("profiles", ProfilesResponse.class);
|
||||||
providers.register("launcher", LauncherResponse.class);
|
providers.register("launcher", LauncherResponse.class);
|
||||||
providers.register("updateList", UpdateListResponse.class);
|
|
||||||
providers.register("setProfile", SetProfileResponse.class);
|
providers.register("setProfile", SetProfileResponse.class);
|
||||||
providers.register("update", UpdateResponse.class);
|
providers.register("update", UpdateResponse.class);
|
||||||
providers.register("batchProfileByUsername", BatchProfileByUsername.class);
|
providers.register("batchProfileByUsername", BatchProfileByUsername.class);
|
||||||
|
|
|
@ -1,27 +0,0 @@
|
||||||
package pro.gravit.launchserver.socket.response.update;
|
|
||||||
|
|
||||||
import io.netty.channel.ChannelHandlerContext;
|
|
||||||
import pro.gravit.launcher.base.events.request.UpdateListRequestEvent;
|
|
||||||
import pro.gravit.launchserver.socket.Client;
|
|
||||||
import pro.gravit.launchserver.socket.response.SimpleResponse;
|
|
||||||
|
|
||||||
import java.util.HashSet;
|
|
||||||
|
|
||||||
public class UpdateListResponse extends SimpleResponse {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getType() {
|
|
||||||
return "updateList";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void execute(ChannelHandlerContext ctx, Client client) {
|
|
||||||
if (!client.isAuth) {
|
|
||||||
sendError("Access denied");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
HashSet<String> set = server.updatesManager.getUpdatesList();
|
|
||||||
sendResult(new UpdateListRequestEvent(set));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,24 +0,0 @@
|
||||||
package pro.gravit.launcher.base.events.request;
|
|
||||||
|
|
||||||
import pro.gravit.launcher.core.LauncherNetworkAPI;
|
|
||||||
import pro.gravit.launcher.base.events.RequestEvent;
|
|
||||||
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
|
|
||||||
public class UpdateListRequestEvent extends RequestEvent {
|
|
||||||
@SuppressWarnings("unused")
|
|
||||||
private static final UUID uuid = UUID.fromString("5fa836ae-6b61-401c-96ac-d8396f07ec6b");
|
|
||||||
@LauncherNetworkAPI
|
|
||||||
public final HashSet<String> dirs;
|
|
||||||
|
|
||||||
public UpdateListRequestEvent(HashSet<String> dirs) {
|
|
||||||
this.dirs = dirs;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getType() {
|
|
||||||
return "updateList";
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,13 +0,0 @@
|
||||||
package pro.gravit.launcher.base.request.update;
|
|
||||||
|
|
||||||
import pro.gravit.launcher.base.events.request.UpdateListRequestEvent;
|
|
||||||
import pro.gravit.launcher.base.request.Request;
|
|
||||||
import pro.gravit.launcher.base.request.websockets.WebSocketRequest;
|
|
||||||
|
|
||||||
public final class UpdateListRequest extends Request<UpdateListRequestEvent> implements WebSocketRequest {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getType() {
|
|
||||||
return "updateList";
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -94,7 +94,6 @@ public void registerResults() {
|
||||||
results.register("batchProfileByUsername", BatchProfileByUsernameRequestEvent.class);
|
results.register("batchProfileByUsername", BatchProfileByUsernameRequestEvent.class);
|
||||||
results.register("profiles", ProfilesRequestEvent.class);
|
results.register("profiles", ProfilesRequestEvent.class);
|
||||||
results.register("setProfile", SetProfileRequestEvent.class);
|
results.register("setProfile", SetProfileRequestEvent.class);
|
||||||
results.register("updateList", UpdateListRequestEvent.class);
|
|
||||||
results.register("error", ErrorRequestEvent.class);
|
results.register("error", ErrorRequestEvent.class);
|
||||||
results.register("update", UpdateRequestEvent.class);
|
results.register("update", UpdateRequestEvent.class);
|
||||||
results.register("getAvailabilityAuth", GetAvailabilityAuthRequestEvent.class);
|
results.register("getAvailabilityAuth", GetAvailabilityAuthRequestEvent.class);
|
||||||
|
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -1,6 +1,6 @@
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
|
Loading…
Reference in a new issue