diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java b/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java index 3f7de47d..57c7f92a 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java @@ -553,7 +553,7 @@ private void generateConfigIfNotExists() throws IOException { newConfig.authProvider = new AuthProvider[]{new RejectAuthProvider("Настройте authProvider")}; newConfig.textureProvider = new RequestTextureProvider("http://example.com/skins/%username%.png","http://example.com/cloaks/%username%.png"); newConfig.permissionsHandler = new JsonFilePermissionsHandler(); - newConfig.port = 7420; + newConfig.port = 7240; newConfig.bindAddress = "0.0.0.0"; newConfig.authRejectString = "Превышен лимит авторизаций"; newConfig.binaryName = "Launcher"; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/RequestAuthProvider.java b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/RequestAuthProvider.java index efe2305e..a0e5fb78 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/RequestAuthProvider.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/RequestAuthProvider.java @@ -12,15 +12,22 @@ public final class RequestAuthProvider extends AuthProvider { private String url; - private Pattern response; + private transient Pattern pattern; + private String response; private boolean usePermission; + @Override + public void init() + { + pattern = Pattern.compile(response); + } + @Override public AuthProviderResult auth(String login, String password, String ip) throws IOException { String currentResponse = IOHelper.request(new URL(getFormattedURL(login, password, ip))); // Match username - Matcher matcher = response.matcher(currentResponse); + Matcher matcher = pattern.matcher(currentResponse); return matcher.matches() && matcher.groupCount() >= 1 ? new AuthProviderResult(matcher.group("username"), SecurityHelper.randomStringToken(), usePermission ? new ClientPermissions(Long.getLong(matcher.group("permission"))) : new ClientPermissions()) : authError(currentResponse);