Skip to content
This repository was archived by the owner on Sep 21, 2021. It is now read-only.

WIP Bugfix agent MQTT #661

Open
wants to merge 17 commits into
base: develop
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(mqtt): add TrustManagerFactory on the mqtt options
Signed-off-by: Rafa Hernandez <[email protected]>
rafaelje authored and Ivan Del Pino committed Oct 19, 2018

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 8bae71fa039823c497515033b314fbb8a1e8fb0f
37 changes: 36 additions & 1 deletion app/src/main/java/org/flyve/mdm/agent/core/mqtt/MqttModel.java
Original file line number Diff line number Diff line change
@@ -84,11 +84,18 @@
import org.flyve.mdm.agent.utils.Helpers;
import org.json.JSONArray;
import org.json.JSONObject;

import java.security.KeyStore;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
import java.util.Date;
import java.util.Enumeration;
import java.util.Timer;
import java.util.TimerTask;

import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManagerFactory;

public class MqttModel implements mqtt.Model {

@@ -194,9 +201,37 @@ public void connect(final Context context, final MqttCallback callback) {

// If TLS is active needs ssl connection option
if (mTLS.equals("1")) {
TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());

KeyStore caKeyStore = KeyStore.getInstance(KeyStore.getDefaultType());
caKeyStore.load(null, null);

CertificateFactory caCF = CertificateFactory.getInstance("X.509");
X509Certificate ca = (X509Certificate) caCF.generateCertificate(context.getResources().openRawResource(R.raw.flyve_org));
String alias = ca.getSubjectX500Principal().getName();

// Set propper alias name
caKeyStore.setCertificateEntry(alias, ca);
tmf.init(caKeyStore);

FlyveLog.v("Certificate Owner: %s", ca.getSubjectDN().toString());
FlyveLog.v("Certificate Issuer: %s", ca.getIssuerDN().toString());
FlyveLog.v("Certificate Serial Number: %s", ca.getSerialNumber().toString());
FlyveLog.v("Certificate Algorithm: %s", ca.getSigAlgName());
FlyveLog.v("Certificate Version: %s", ca.getVersion());
FlyveLog.v("Certificate OID: %s", ca.getSigAlgOID());
Enumeration<String> aliasesCA = caKeyStore.aliases();
for (; aliasesCA.hasMoreElements(); ) {
String o = aliasesCA.nextElement();
FlyveLog.v("Alias: %s isKeyEntry:%s isCertificateEntry:%s", o, caKeyStore.isKeyEntry(o), caKeyStore.isCertificateEntry(o));
}

KeyManagerFactory kmf = KeyManagerFactory.getInstance("X509");
kmf.init(null,null);

// SSL
SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
sslContext.init(null, null, null);
sslContext.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
options.setSocketFactory(sslContext.getSocketFactory());
}
} catch (Exception ex) {