hwf453
/
admin-client-temperature
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change mqtt to hk

Browse Source
oracle
修改密码漏洞修复完成 1 year ago
parent 1eaf6e5305
commit cedd019309
3 changed files with 61 additions and 7 deletions
Show Stats Download Patch File Download Diff File

12
.idea/workspace.xml
Unescape Escape View File

@ -5,9 +5,9 @@
</component>
<component name="ChangeListManager">
<list default="true" id="eacd3dd8-1e95-428c-a6af-1aadb9921989" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/main/resources/ssl/client.crt" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/ssl/client.key" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/ssl/my_root_ca.crt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/utils/MqttSSLSocketFactory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/utils/MqttSSLSocketFactory.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -50,6 +50,9 @@
<property name="settings.editor.selected.configurable" value="reference.projectsettings.compiler.javacompiler" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/src/main/resources/ssl" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.rehome.mqttclienttemperature.controller.api" />
</key>
@ -110,7 +113,8 @@
<workItem from="1730260900938" duration="1898000" />
<workItem from="1730778836030" duration="60000" />
<workItem from="1731121098979" duration="327000" />
<workItem from="1731121695314" duration="619000" />
<workItem from="1731121695314" duration="1328000" />
<workItem from="1731123043189" duration="844000" />
</task>
<servers />
</component>

6
src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java
Unescape Escape View File

@ -24,7 +24,7 @@ public class MqttRSAClient {
/**
* 客户端唯一标识
*/
public static String MQTT_CLIENT_ID = "AppServer_admin-client-temperature_APP_server_01";
public static String MQTT_CLIENT_ID = "AppServer_temperature_APP_server_02";
/**
*帐号
@ -68,6 +68,10 @@ public class MqttRSAClient {
//断线重连
options.setAutomaticReconnect(true);
//mqtt服务器端单双向加密
// InputStream caCrtFile = this.getClass().getResourceAsStream("/ssl/my_root_ca.crt");
// InputStream crtFile = this.getClass().getResourceAsStream("/ssl/client.crt");
// InputStream keyFile = this.getClass().getResourceAsStream("/ssl/client.key");
// String password = "";
InputStream caCrtFile = this.getClass().getResourceAsStream("/ssl/my_root_ca.crt");
InputStream crtFile = this.getClass().getResourceAsStream("/ssl/client.crt");
InputStream keyFile = this.getClass().getResourceAsStream("/ssl/client.key");

48
src/main/java/com/rehome/mqttclienttemperature/utils/MqttSSLSocketFactory.java
Unescape Escape View File

@ -39,6 +39,53 @@ public class MqttSSLSocketFactory {
return sslContext.getSocketFactory();
}
// public static SSLSocketFactory getTwoDirSocketFactory(InputStream caCrtFile, InputStream crtFile, InputStream keyFile,
// String password) throws Exception {
// Security.addProvider(new BouncyCastleProvider());
//
// // load CA certificate
// X509Certificate caCert = null;
//
// BufferedInputStream bis = new BufferedInputStream(caCrtFile);
// CertificateFactory cf = CertificateFactory.getInstance("X.509");
//
// while (bis.available() > 0) {
// caCert = (X509Certificate) cf.generateCertificate(bis);
// }
//
// // load client certificate
// bis = new BufferedInputStream(crtFile);
// X509Certificate cert = null;
// while (bis.available() > 0) {
// cert = (X509Certificate) cf.generateCertificate(bis);
// }
//
// // load client private cert
// PEMParser pemParser = new PEMParser(new InputStreamReader(keyFile));
// Object object = pemParser.readObject();
// JcaPEMKeyConverter converter = new JcaPEMKeyConverter();
// KeyPair key = converter.getKeyPair((PEMKeyPair) object);
//
// KeyStore caKs = KeyStore.getInstance(KeyStore.getDefaultType());
// caKs.load(null, null);
// caKs.setCertificateEntry("cert-certificate", caCert);
// TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
// tmf.init(caKs);
//
// KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
// ks.load(null, null);
// ks.setCertificateEntry("certificate", cert);
// ks.setKeyEntry("private-cert", key.getPrivate(), password.toCharArray(),
// new java.security.cert.Certificate[]{cert});
// KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
// kmf.init(ks, password.toCharArray());
//
// SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
// sslContext.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
//
// return sslContext.getSocketFactory();
// }
public static SSLSocketFactory getTwoDirSocketFactory(InputStream caCrtFile, InputStream crtFile, InputStream keyFile,
String password) throws Exception {
Security.addProvider(new BouncyCastleProvider());
@ -86,5 +133,4 @@ public class MqttSSLSocketFactory {
return sslContext.getSocketFactory();
}
}

Write Preview
Loading…
Cancel
Save