Raincloud/sheepit-shadow-nabber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feature: do not store the passwrd as plain text but instead use a public key generated on server side

Browse Source
This commit is contained in:
Laurent Clouet
2019-08-22 21:35:26 +02:00
parent e044c35ad7
commit 72462b88c7
7 changed files with 46 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/sheepit/client/Server.java
View File

@@ -185,6 +185,7 @@ public class Server extends Thread implements HostnameVerifier, X509TrustManager
public Error.Type getConfiguration() {
OS os = OS.getOS();
HttpURLConnection connection = null;
String publickey = null;
try {
String url_remote = this.base_url + "/server/config.php";
String parameters = String.format("login=%s&password=%s&cpu_family=%s&cpu_model=%s&cpu_model_name=%s&cpu_cores=%s&os=%s&ram=%s&bits=%s&version=%s&hostname=%s&ui=%s&extras=%s",
@@ -241,6 +242,16 @@ public class Server extends Thread implements HostnameVerifier, X509TrustManager
}
config_node = (Element) ns.item(0);
if (config_node.hasAttribute("publickey")) {
publickey = config_node.getAttribute("publickey");
if (publickey.isEmpty()) {
publickey = null;
}
else {
this.user_config.setPassword(publickey);
}
}
ns = config_node.getElementsByTagName("request");
if (ns.getLength() == 0) {
this.log.error("getConfiguration error: failed to parse XML, node 'config' has no child node 'request'");
@@ -285,6 +296,9 @@ public class Server extends Thread implements HostnameVerifier, X509TrustManager
connection.disconnect();
}
}
this.client.getGui().successfulAuthenticationEvent(publickey);
return Error.Type.OK;
}