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

Асинхронная авторизация ServerWrapper

Browse source
This commit is contained in:
Gravit 2018-10-09 18:37:46 +07:00
parent 2486c868b3
commit 540a2d85a3
No known key found for this signature in database
GPG key ID: 061981E1E85D3216
1 changed files with 47 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerWrapper.java
View file

@ -21,6 +21,7 @@
import ru.gravit.launcher.serialize.config.entry.BooleanConfigEntry; import ru.gravit.launcher.serialize.config.entry.BooleanConfigEntry;
import ru.gravit.launcher.serialize.config.entry.IntegerConfigEntry; import ru.gravit.launcher.serialize.config.entry.IntegerConfigEntry;
import ru.gravit.launcher.serialize.config.entry.StringConfigEntry; import ru.gravit.launcher.serialize.config.entry.StringConfigEntry;
import ru.gravit.utils.helper.CommonHelper;
import ru.gravit.utils.helper.IOHelper; import ru.gravit.utils.helper.IOHelper;
import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.LogHelper;
import ru.gravit.launcher.profiles.ClientProfile; import ru.gravit.launcher.profiles.ClientProfile;
@ -32,6 +33,44 @@ public class ServerWrapper {
public static ModulesManager modulesManager; public static ModulesManager modulesManager;
public static Path configFile; public static Path configFile;
public static Config config; public static Config config;
public static boolean auth(ServerWrapper wrapper) {
try {
LauncherConfig cfg = Launcher.getConfig();
Boolean auth = new AuthServerRequest(cfg,config.login,SecurityHelper.newRSAEncryptCipher(cfg.publicKey).doFinal(IOHelper.encode(config.password)),0,config.title).request();
ProfilesRequest.Result result = new ProfilesRequest(cfg).request();
for (SignedObjectHolder<ClientProfile> p : result.profiles) {
LogHelper.debug("Get profile: %s", p.object.getTitle());
if (p.object.getTitle().equals(config.title)) {
wrapper.profile = p.object;
Launcher.profile = p.object;
LogHelper.debug("Found profile: %s", Launcher.profile.getTitle());
break;
}
}
return true;
} catch (Throwable e)
{
LogHelper.error(e);
return false;
}
}
public static boolean loopAuth(ServerWrapper wrapper,int count,int sleeptime) {
if(count == 0) {
while(true) {
if(auth(wrapper)) return true;
}
}
for(int i=0;i<count;++i) {
if(auth(wrapper)) return true;
try {
Thread.sleep(sleeptime);
} catch (InterruptedException e) {
return false;
}
}
return false;
}
public static void main(String[] args) throws Throwable { public static void main(String[] args) throws Throwable {
ServerWrapper wrapper = new ServerWrapper(); ServerWrapper wrapper = new ServerWrapper();
modulesManager = new ModulesManager(wrapper); modulesManager = new ModulesManager(wrapper);
@ -44,19 +83,9 @@ public static void main(String[] args) throws Throwable {
config = new Config(TextConfigReader.read(reader, true)); config = new Config(TextConfigReader.read(reader, true));
} }
LauncherConfig cfg = new LauncherConfig(config.address, config.port, SecurityHelper.toPublicRSAKey(IOHelper.read(Paths.get("public.key"))),new HashMap<>(),config.projectname); LauncherConfig cfg = new LauncherConfig(config.address, config.port, SecurityHelper.toPublicRSAKey(IOHelper.read(Paths.get("public.key"))),new HashMap<>(),config.projectname);
Boolean auth = new AuthServerRequest(cfg,config.login,SecurityHelper.newRSAEncryptCipher(cfg.publicKey).doFinal(IOHelper.encode(config.password)),0,config.title).request();
// TODO check auth...
ProfilesRequest.Result result = new ProfilesRequest(cfg).request();
Launcher.setConfig(cfg); Launcher.setConfig(cfg);
for (SignedObjectHolder<ClientProfile> p : result.profiles) { if(config.syncAuth) auth(wrapper);
LogHelper.debug("Get profile: %s", p.object.getTitle()); else CommonHelper.newThread("Server Auth Thread",true,() -> ServerWrapper.loopAuth(wrapper,config.reconnectCount,config.reconnectSleep));
if (p.object.getTitle().equals(config.title)) {
wrapper.profile = p.object;
Launcher.profile = p.object;
LogHelper.debug("Found profile: %s", Launcher.profile.getTitle());
break;
}
}
modulesManager.initModules(); modulesManager.initModules();
String classname = config.mainclass.isEmpty() ? args[0] : config.mainclass; String classname = config.mainclass.isEmpty() ? args[0] : config.mainclass;
Class<?> mainClass; Class<?> mainClass;
@ -99,7 +128,10 @@ public static final class Config extends ConfigObject {
public String projectname; public String projectname;
public String address; public String address;
public int port; public int port;
public int reconnectCount;
public int reconnectSleep;
public boolean customClassLoader; public boolean customClassLoader;
public boolean syncAuth;
public String classloader; public String classloader;
public String mainclass; public String mainclass;
public String login; public String login;
@ -116,8 +148,10 @@ protected Config(BlockConfigEntry block) {
if(customClassLoader) if(customClassLoader)
classloader = block.getEntryValue("classloader",StringConfigEntry.class); classloader = block.getEntryValue("classloader",StringConfigEntry.class);
mainclass = block.getEntryValue("MainClass",StringConfigEntry.class); mainclass = block.getEntryValue("MainClass",StringConfigEntry.class);
reconnectCount = block.hasEntry("reconnectCount") ? block.getEntryValue("reconnectCount",IntegerConfigEntry.class) : 1;
reconnectSleep = block.hasEntry("reconnectSleep") ? block.getEntryValue("reconnectSleep",IntegerConfigEntry.class) : 30000;
syncAuth = block.hasEntry("syncAuth") ? block.getEntryValue("syncAuth",BooleanConfigEntry.class) : true;
} }
} }
public ClientProfile profile; public ClientProfile profile;
} }