Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-11-15 03:31:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FEATURE] Возможность отдавать нулевой HWID, а следовательно не использовать библиотеку OSHI если HWID не требуется

Browse source
This commit is contained in:
Gravit 2019-07-02 15:36:50 +07:00
parent c85350821e
commit 486fae8ccf
No known key found for this signature in database
GPG key ID: 061981E1E85D3216
29 changed files with 82 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServer.java
View file

@ -37,6 +37,7 @@
import pro.gravit.launcher.LauncherConfig;
import pro.gravit.launcher.NeedGarbageCollection;
import pro.gravit.launcher.hasher.HashedDir;
import pro.gravit.launcher.hwid.HWIDProvider;
import pro.gravit.launcher.managers.ConfigManager;
import pro.gravit.launcher.managers.GarbageManager;
import pro.gravit.launcher.profiles.ClientProfile;
@ -495,6 +496,7 @@ public LaunchServer(Path dir, boolean testEnv, String[] args) throws IOException
Component.registerComponents();
ProtectHandler.registerHandlers();
WebSocketService.registerResponses();
HWIDProvider.registerHWIDs();
//LaunchServer.server = this;
// Set command handler

2
LaunchServer/src/main/java/pro/gravit/launchserver/auth/hwid/AcceptHWIDHandler.java
View file

@ -3,7 +3,7 @@
import java.util.ArrayList;
import java.util.List;
import pro.gravit.launcher.HWID;
import pro.gravit.launcher.hwid.HWID;
public class AcceptHWIDHandler extends HWIDHandler {

2
LaunchServer/src/main/java/pro/gravit/launchserver/auth/hwid/HWIDHandler.java
View file

@ -2,7 +2,7 @@
import java.util.List;
import pro.gravit.launcher.HWID;
import pro.gravit.launcher.hwid.HWID;
import pro.gravit.utils.ProviderMap;
public abstract class HWIDHandler implements AutoCloseable {

2
LaunchServer/src/main/java/pro/gravit/launchserver/auth/hwid/JsonFileHWIDHandler.java
View file

@ -12,7 +12,7 @@
import com.google.gson.reflect.TypeToken;
import pro.gravit.launcher.HWID;
import pro.gravit.launcher.hwid.HWID;
import pro.gravit.launcher.Launcher;
import pro.gravit.utils.helper.IOHelper;
import pro.gravit.utils.helper.LogHelper;

4
LaunchServer/src/main/java/pro/gravit/launchserver/auth/hwid/JsonHWIDHandler.java
View file

@ -9,8 +9,8 @@
import com.google.gson.Gson;
import com.google.gson.JsonElement;
import pro.gravit.launcher.HWID;
import pro.gravit.launcher.OshiHWID;
import pro.gravit.launcher.hwid.HWID;
import pro.gravit.launcher.hwid.OshiHWID;
import pro.gravit.utils.HTTPRequest;
import pro.gravit.utils.helper.LogHelper;

2
LaunchServer/src/main/java/pro/gravit/launchserver/auth/hwid/MemoryHWIDHandler.java
View file

@ -4,7 +4,7 @@
import java.util.List;
import java.util.Objects;
import pro.gravit.launcher.HWID;
import pro.gravit.launcher.hwid.HWID;
public class MemoryHWIDHandler extends HWIDHandler {
public class Entry {

4
LaunchServer/src/main/java/pro/gravit/launchserver/auth/hwid/MysqlHWIDHandler.java
View file

@ -7,8 +7,8 @@
import java.util.ArrayList;
import java.util.List;
import pro.gravit.launcher.HWID;
import pro.gravit.launcher.OshiHWID;
import pro.gravit.launcher.hwid.HWID;
import pro.gravit.launcher.hwid.OshiHWID;
import pro.gravit.launchserver.auth.MySQLSourceConfig;
import pro.gravit.utils.helper.CommonHelper;
import pro.gravit.utils.helper.LogHelper;

2
LaunchServer/src/main/java/pro/gravit/launchserver/command/auth/BanCommand.java
View file

@ -2,7 +2,7 @@
import java.util.List;
import pro.gravit.launcher.HWID;
import pro.gravit.launcher.hwid.HWID;
import pro.gravit.launchserver.LaunchServer;
import pro.gravit.launchserver.command.Command;

2
LaunchServer/src/main/java/pro/gravit/launchserver/command/auth/GetHWIDCommand.java
View file

@ -2,7 +2,7 @@
import java.util.List;
import pro.gravit.launcher.HWID;
import pro.gravit.launcher.hwid.HWID;
import pro.gravit.launchserver.LaunchServer;
import pro.gravit.launchserver.command.Command;
import pro.gravit.utils.helper.LogHelper;

2
LaunchServer/src/main/java/pro/gravit/launchserver/command/auth/UnbanCommand.java
View file

@ -2,7 +2,7 @@
import java.util.List;
import pro.gravit.launcher.HWID;
import pro.gravit.launcher.hwid.HWID;
import pro.gravit.launchserver.LaunchServer;
import pro.gravit.launchserver.command.Command;

2
LaunchServer/src/main/java/pro/gravit/launchserver/dao/UserDAO.java
View file

@ -1,6 +1,6 @@
package pro.gravit.launchserver.dao;
import pro.gravit.launcher.OshiHWID;
import pro.gravit.launcher.hwid.OshiHWID;
import java.util.List;
import java.util.UUID;

4
LaunchServer/src/main/java/pro/gravit/launchserver/dao/UserHWID.java
View file

@ -1,7 +1,7 @@
package pro.gravit.launchserver.dao;
import pro.gravit.launcher.HWID;
import pro.gravit.launcher.OshiHWID;
import pro.gravit.launcher.hwid.HWID;
import pro.gravit.launcher.hwid.OshiHWID;
import javax.persistence.*;
import java.util.function.Supplier;

2
LaunchServer/src/main/java/pro/gravit/launchserver/dao/impl/DefaultUserDAOImpl.java
View file

@ -4,7 +4,7 @@
import java.util.List;
import java.util.UUID;
import pro.gravit.launcher.OshiHWID;
import pro.gravit.launcher.hwid.OshiHWID;
import pro.gravit.launchserver.LaunchServer;
import pro.gravit.launchserver.dao.User;
import pro.gravit.launchserver.dao.UserDAO;

2
LaunchServer/src/main/java/pro/gravit/launchserver/dao/impl/HibernateUserDAOImpl.java
View file

@ -12,7 +12,7 @@
import org.hibernate.SessionFactory;
import org.hibernate.Transaction;
import pro.gravit.launcher.OshiHWID;
import pro.gravit.launcher.hwid.OshiHWID;
import pro.gravit.launchserver.dao.User;
import pro.gravit.launchserver.dao.UserDAO;
import pro.gravit.launchserver.dao.UserHWID;

3
LaunchServer/src/main/java/pro/gravit/launchserver/manangers/LaunchServerGsonManager.java
View file

@ -4,6 +4,8 @@
import pro.gravit.launcher.hasher.HashedEntry;
import pro.gravit.launcher.hasher.HashedEntryAdapter;
import pro.gravit.launcher.hwid.HWID;
import pro.gravit.launcher.hwid.HWIDProvider;
import pro.gravit.launcher.managers.GsonManager;
import pro.gravit.launcher.request.JsonResultSerializeAdapter;
import pro.gravit.launcher.request.WebSocketEvent;
@ -31,6 +33,7 @@ public void registerAdapters(GsonBuilder builder) {
builder.registerTypeAdapter(Component.class, new UniversalJsonAdapter<>(Component.providers));
builder.registerTypeAdapter(ProtectHandler.class, new UniversalJsonAdapter<>(ProtectHandler.providers));
builder.registerTypeAdapter(DaoProvider.class, new UniversalJsonAdapter<>(DaoProvider.providers));
builder.registerTypeAdapter(HWID.class, new UniversalJsonAdapter<>(HWIDProvider.hwids));
builder.registerTypeAdapter(WebSocketServerResponse.class, new UniversalJsonAdapter<>(WebSocketService.providers));
builder.registerTypeAdapter(HashedEntry.class, new HashedEntryAdapter());
builder.registerTypeAdapter(WebSocketEvent.class, new JsonResultSerializeAdapter());

7
LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/AuthResponse.java
View file

@ -9,7 +9,8 @@
import javax.crypto.IllegalBlockSizeException;
import io.netty.channel.ChannelHandlerContext;
import pro.gravit.launcher.OshiHWID;
import pro.gravit.launcher.hwid.HWID;
import pro.gravit.launcher.hwid.OshiHWID;
import pro.gravit.launcher.events.request.AuthRequestEvent;
import pro.gravit.launcher.profiles.ClientProfile;
import pro.gravit.launchserver.auth.AuthException;
@ -46,7 +47,7 @@ public AuthResponse(String login, String password, String auth_id, OshiHWID hwid
public String auth_id;
public boolean initProxy;
public ConnectTypes authType;
public OshiHWID hwid;
public HWID hwid;
public enum ConnectTypes {
SERVER, CLIENT, BOT
@ -76,7 +77,7 @@ public void execute(ChannelHandlerContext ctx, Client clientData) throws Excepti
AuthProviderPair pair;
if (auth_id.isEmpty()) pair = server.config.getAuthProviderPair();
else pair = server.config.getAuthProviderPair(auth_id);
AuthContext context = new AuthContext(0, login, password.length(), customText, client, ip, null, authType);
AuthContext context = new AuthContext(0, login, password.length(), customText, client, null, ip, authType);
AuthProvider provider = pair.provider;
server.authHookManager.preHook.hook(context, clientData);
provider.preAuth(login, password, customText, ip);

3
Launcher/runtime/engine/api.js
View file

@ -59,6 +59,9 @@ var VerifyHelper = VerifyHelperClass.static;
var NewLauncherSettings = NewLauncherSettingsClass.static;
var SettingsManager = SettingsManagerClass.static;
var NoHWID = NoHWIDClass.static;
var OshiHWID = OshiHWID.static;
// Helper JS class API imports
var JSApplication = null;
if (typeof JSApplicationClass !== 'undefined') {

2
Launcher/src/main/java/pro/gravit/launcher/LauncherEngine.java
View file

@ -10,6 +10,7 @@
import pro.gravit.launcher.guard.LauncherGuardManager;
import pro.gravit.launcher.gui.JSRuntimeProvider;
import pro.gravit.launcher.gui.RuntimeProvider;
import pro.gravit.launcher.hwid.HWIDProvider;
import pro.gravit.launcher.managers.ClientGsonManager;
import pro.gravit.launcher.managers.ConsoleManager;
import pro.gravit.launcher.request.Request;
@ -34,6 +35,7 @@ public static void main(String... args) throws Throwable {
// Start Launcher
initGson();
ConsoleManager.initConsole();
HWIDProvider.registerHWIDs();
LauncherConfig config = Launcher.getConfig();
if (config.environment.equals(LauncherConfig.LauncherEnvironment.PROD)) {
if (!LauncherAgent.isStarted()) throw new SecurityException("LauncherAgent must started");

2
Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncher.java
View file

@ -32,6 +32,7 @@
import pro.gravit.launcher.gui.JSRuntimeProvider;
import pro.gravit.launcher.hasher.FileNameMatcher;
import pro.gravit.launcher.hasher.HashedDir;
import pro.gravit.launcher.hwid.HWIDProvider;
import pro.gravit.launcher.managers.ClientGsonManager;
import pro.gravit.launcher.profiles.ClientProfile;
import pro.gravit.launcher.profiles.PlayerProfile;
@ -427,6 +428,7 @@ public static void main(String... args) throws Throwable {
if (engine.runtimeProvider == null) engine.runtimeProvider = new JSRuntimeProvider();
engine.runtimeProvider.init(true);
engine.runtimeProvider.preLoad();
HWIDProvider.registerHWIDs();
LauncherGuardManager.initGuard(true);
LogHelper.debug("Reading ClientLauncher params");
Params params;

2
Launcher/src/main/java/pro/gravit/launcher/client/FunctionalBridge.java
View file

@ -6,7 +6,7 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import pro.gravit.launcher.HWID;
import pro.gravit.launcher.hwid.HWID;
import pro.gravit.launcher.LauncherAPI;
import pro.gravit.launcher.events.request.AuthRequestEvent;
import pro.gravit.launcher.guard.LauncherGuardManager;

5
Launcher/src/main/java/pro/gravit/launcher/gui/JSRuntimeProvider.java
View file

@ -25,6 +25,8 @@
import pro.gravit.launcher.hasher.HashedDir;
import pro.gravit.launcher.hasher.HashedEntry;
import pro.gravit.launcher.hasher.HashedFile;
import pro.gravit.launcher.hwid.NoHWID;
import pro.gravit.launcher.hwid.OshiHWID;
import pro.gravit.launcher.managers.SettingsManager;
import pro.gravit.launcher.profiles.ClientProfile;
import pro.gravit.launcher.profiles.PlayerProfile;
@ -130,6 +132,9 @@ public static void addLauncherClassBindings(Map<String, Object> bindings) {
bindings.put("DirBridgeClass", DirBridge.class);
bindings.put("FunctionalBridgeClass", FunctionalBridge.class);
bindings.put("NoHWIDClass", NoHWID.class);
bindings.put("OshiHWIDClass", OshiHWID.class);
// Load JS API if available
try {
Class.forName("javafx.application.Application");

3
Launcher/src/main/java/pro/gravit/launcher/hwid/OshiHWIDProvider.java
View file

@ -10,9 +10,6 @@
import oshi.hardware.NetworkIF;
import oshi.hardware.SoundCard;
import oshi.hardware.UsbDevice;
import pro.gravit.launcher.HWID;
import pro.gravit.launcher.LauncherHWIDInterface;
import pro.gravit.launcher.OshiHWID;
import pro.gravit.utils.helper.LogHelper;
public class OshiHWIDProvider implements LauncherHWIDInterface {

3
Launcher/src/main/java/pro/gravit/launcher/managers/ClientGsonManager.java
View file

@ -3,6 +3,8 @@
import com.google.gson.GsonBuilder;
import pro.gravit.launcher.client.UserSettings;
import pro.gravit.launcher.hwid.HWID;
import pro.gravit.launcher.hwid.HWIDProvider;
import pro.gravit.utils.UniversalJsonAdapter;
public class ClientGsonManager extends GsonManager {
@ -10,5 +12,6 @@ public class ClientGsonManager extends GsonManager {
public void registerAdapters(GsonBuilder builder) {
super.registerAdapters(builder);
builder.registerTypeAdapter(UserSettings.class, new UniversalJsonAdapter<>(UserSettings.providers));
builder.registerTypeAdapter(HWID.class, new UniversalJsonAdapter<>(HWIDProvider.hwids));
}
}

2
LauncherAPI/src/main/java/pro/gravit/launcher/HWID.java → LauncherAPI/src/main/java/pro/gravit/launcher/hwid/HWID.java
View file

@ -1,4 +1,4 @@
package pro.gravit.launcher;
package pro.gravit.launcher.hwid;
public interface HWID {
String getSerializeString();

11
LauncherAPI/src/main/java/pro/gravit/launcher/hwid/HWIDProvider.java Normal file
View file

@ -0,0 +1,11 @@
package pro.gravit.launcher.hwid;
import pro.gravit.utils.ProviderMap;
public class HWIDProvider {
public static ProviderMap<HWID> hwids = new ProviderMap<>();
public static void registerHWIDs()
{
hwids.register("oshi", OshiHWID.class);
}
}

4
LauncherAPI/src/main/java/pro/gravit/launcher/LauncherHWIDInterface.java → LauncherAPI/src/main/java/pro/gravit/launcher/hwid/LauncherHWIDInterface.java
View file

@ -1,4 +1,6 @@
package pro.gravit.launcher;
package pro.gravit.launcher.hwid;
import pro.gravit.launcher.hwid.HWID;
@FunctionalInterface
public interface LauncherHWIDInterface {

23
LauncherAPI/src/main/java/pro/gravit/launcher/hwid/NoHWID.java Normal file
View file

@ -0,0 +1,23 @@
package pro.gravit.launcher.hwid;
public class NoHWID implements HWID {
@Override
public String getSerializeString() {
return "";
}
@Override
public int getLevel() {
return 0;
}
@Override
public int compare(HWID hwid) {
return 0;
}
@Override
public boolean isNull() {
return true;
}
}

3
LauncherAPI/src/main/java/pro/gravit/launcher/OshiHWID.java → LauncherAPI/src/main/java/pro/gravit/launcher/hwid/OshiHWID.java
View file

@ -1,9 +1,10 @@
package pro.gravit.launcher;
package pro.gravit.launcher.hwid;
import java.util.Objects;
import java.util.StringJoiner;
import com.google.gson.Gson;
import pro.gravit.launcher.LauncherAPI;
public class OshiHWID implements HWID {
public static Gson gson = new Gson();

2
LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/AuthRequest.java
View file

@ -1,6 +1,6 @@
package pro.gravit.launcher.request.auth;
import pro.gravit.launcher.HWID;
import pro.gravit.launcher.hwid.HWID;
import pro.gravit.launcher.LauncherAPI;
import pro.gravit.launcher.LauncherNetworkAPI;
import pro.gravit.launcher.events.request.AuthRequestEvent;