- Used IntelliJ's Refactoring-Method
This commit is contained in:
@@ -15,10 +15,21 @@ import java.io.File;
|
||||
import java.io.IOException;
|
||||
|
||||
public abstract class ProtocolClient extends DefaultMethodsOverrider {
|
||||
private ProtocolVersion serverVersion = null;
|
||||
|
||||
@Getter
|
||||
private final NetworkClient networkClient;
|
||||
private ProtocolVersion serverVersion = null;
|
||||
|
||||
public ProtocolClient(File caFolder, File certificatesClientFolder, File certificatesKeyFolder) {
|
||||
if (!caFolder.exists()) caFolder.mkdirs();
|
||||
if (!certificatesClientFolder.exists()) certificatesClientFolder.mkdirs();
|
||||
if (!certificatesKeyFolder.exists()) certificatesKeyFolder.mkdirs();
|
||||
|
||||
networkClient = new NetworkClient.ClientBuilder().setLogger(ProtocolBridge.getInstance().getLogger()).
|
||||
setHost(ProtocolBridge.getInstance().getProtocolSettings().host).setPort(ProtocolBridge.getInstance().getProtocolSettings().port).
|
||||
setPacketHandler(ProtocolBridge.getInstance().getProtocolSettings().packetHandler).setEventManager(ProtocolBridge.getInstance().getProtocolSettings().eventManager).
|
||||
setRootCAFolder(caFolder).setClientCertificatesFolder(certificatesClientFolder, certificatesKeyFolder).
|
||||
build();
|
||||
}
|
||||
|
||||
public final ProtocolVersion getServerVersion() {
|
||||
return serverVersion == null ? ProtocolVersion.PV_1_0_0_CLASSIC : serverVersion;
|
||||
@@ -86,18 +97,7 @@ public abstract class ProtocolClient extends DefaultMethodsOverrider {
|
||||
networkClient.sendPacket(new ValidateDomainPacket(domain));
|
||||
}
|
||||
|
||||
public ProtocolClient(File caFolder, File certificatesClientFolder, File certificatesKeyFolder) {
|
||||
if (!caFolder.exists()) caFolder.mkdirs();
|
||||
if (!certificatesClientFolder.exists()) certificatesClientFolder.mkdirs();
|
||||
if (!certificatesKeyFolder.exists()) certificatesKeyFolder.mkdirs();
|
||||
|
||||
networkClient = new NetworkClient.ClientBuilder().setLogger(ProtocolBridge.getInstance().getLogger()).
|
||||
setHost(ProtocolBridge.getInstance().getProtocolSettings().host).setPort(ProtocolBridge.getInstance().getProtocolSettings().port).
|
||||
setPacketHandler(ProtocolBridge.getInstance().getProtocolSettings().packetHandler).setEventManager(ProtocolBridge.getInstance().getProtocolSettings().eventManager).
|
||||
setRootCAFolder(caFolder).setClientCertificatesFolder(certificatesClientFolder, certificatesKeyFolder).
|
||||
build();
|
||||
}
|
||||
|
||||
public abstract void validationCompleted(Domain domain, DNSResponseCode responseCode);
|
||||
|
||||
public abstract void getDestinationCompleted(Domain domain, String destination, DNSResponseCode validationResponse);
|
||||
}
|
||||
|
@@ -12,6 +12,10 @@ public class ConnectedProtocolClient {
|
||||
|
||||
private ProtocolVersion clientVersion = null;
|
||||
|
||||
public ConnectedProtocolClient(ConnectionHandler connectionHandler) {
|
||||
this.connectionHandler = connectionHandler;
|
||||
}
|
||||
|
||||
public ProtocolVersion getClientVersion() {
|
||||
return clientVersion == null ? ProtocolVersion.PV_1_0_0_CLASSIC : clientVersion;
|
||||
}
|
||||
@@ -20,10 +24,6 @@ public class ConnectedProtocolClient {
|
||||
if (clientVersion == null) this.clientVersion = clientVersion;
|
||||
}
|
||||
|
||||
public ConnectedProtocolClient(ConnectionHandler connectionHandler) {
|
||||
this.connectionHandler = connectionHandler;
|
||||
}
|
||||
|
||||
public boolean isStableClient() {
|
||||
return !isBetaClient() && !isClassicClient();
|
||||
}
|
||||
|
@@ -5,7 +5,6 @@ import github.openautonomousconnection.protocol.versions.v1_0_0.beta.DNSResponse
|
||||
import github.openautonomousconnection.protocol.versions.v1_0_0.beta.Domain;
|
||||
import lombok.Getter;
|
||||
import me.finn.unlegitlibrary.file.ConfigurationManager;
|
||||
import me.finn.unlegitlibrary.network.system.server.ConnectionHandler;
|
||||
import me.finn.unlegitlibrary.network.system.server.NetworkServer;
|
||||
import me.finn.unlegitlibrary.utils.DefaultMethodsOverrider;
|
||||
|
||||
@@ -22,12 +21,7 @@ public abstract class ProtocolServer extends DefaultMethodsOverrider {
|
||||
@Getter
|
||||
private List<ConnectedProtocolClient> clients;
|
||||
|
||||
private ConfigurationManager configurationManager;
|
||||
|
||||
public final ConnectedProtocolClient getClientByID(int clientID) {
|
||||
for (ConnectedProtocolClient client : clients) if (client.getConnectionHandler().getClientID() == clientID) return client;
|
||||
return null;
|
||||
}
|
||||
private final ConfigurationManager configurationManager;
|
||||
|
||||
public ProtocolServer(File caFolder, File certFile, File keyFile, File configFile) throws IOException {
|
||||
if (!caFolder.exists()) caFolder.mkdirs();
|
||||
@@ -36,8 +30,10 @@ public abstract class ProtocolServer extends DefaultMethodsOverrider {
|
||||
configurationManager = new ConfigurationManager(configFile);
|
||||
configurationManager.loadProperties();
|
||||
|
||||
if (!configurationManager.isSet("server.site.info")) configurationManager.set("server.site.info", "DNS-SERVER INFO SITE IP");
|
||||
if (!configurationManager.isSet("server.site.register")) configurationManager.set("server.site.register", "SERVER IP TO DNS-FRONTENT WEBSITE");
|
||||
if (!configurationManager.isSet("server.site.info"))
|
||||
configurationManager.set("server.site.info", "DNS-SERVER INFO SITE IP");
|
||||
if (!configurationManager.isSet("server.site.register"))
|
||||
configurationManager.set("server.site.register", "SERVER IP TO DNS-FRONTENT WEBSITE");
|
||||
|
||||
ProtocolBridge protocolBridge = ProtocolBridge.getInstance();
|
||||
this.clients = new ArrayList<>();
|
||||
@@ -50,6 +46,12 @@ public abstract class ProtocolServer extends DefaultMethodsOverrider {
|
||||
build();
|
||||
}
|
||||
|
||||
public final ConnectedProtocolClient getClientByID(int clientID) {
|
||||
for (ConnectedProtocolClient client : clients)
|
||||
if (client.getConnectionHandler().getClientID() == clientID) return client;
|
||||
return null;
|
||||
}
|
||||
|
||||
public final String getDNSInfoSite() {
|
||||
return configurationManager.getString("server.site.info");
|
||||
}
|
||||
@@ -59,10 +61,16 @@ public abstract class ProtocolServer extends DefaultMethodsOverrider {
|
||||
}
|
||||
|
||||
public abstract List<Domain> getDomains();
|
||||
|
||||
public abstract String getDomainDestination(Domain domain);
|
||||
|
||||
public abstract String getSubnameDestination(Domain domain, String subname);
|
||||
|
||||
public abstract String getTLNInfoSite(String topLevelName);
|
||||
|
||||
public abstract DNSResponseCode validateDomain(Domain requestedDomain);
|
||||
|
||||
public abstract void validationFailed(Domain domain, ConnectedProtocolClient client, Exception exception);
|
||||
|
||||
public abstract void getDomainDestinationFailed(ConnectedProtocolClient client, Domain domain, DNSResponseCode validationResponse, Exception exception);
|
||||
}
|
||||
|
Reference in New Issue
Block a user