From 5802ba773414a525dd5444b27e5f14f67df0b1bb Mon Sep 17 00:00:00 2001 From: Zlatin Balevsky Date: Wed, 6 Nov 2019 18:19:45 +0000 Subject: [PATCH] show trust status of certificate issuers in cli as well --- .../com/muwire/clilanterna/ViewCertificatesModel.groovy | 5 +++-- .../com/muwire/clilanterna/ViewCertificatesView.groovy | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cli-lanterna/src/main/groovy/com/muwire/clilanterna/ViewCertificatesModel.groovy b/cli-lanterna/src/main/groovy/com/muwire/clilanterna/ViewCertificatesModel.groovy index 262e168c..a410be25 100644 --- a/cli-lanterna/src/main/groovy/com/muwire/clilanterna/ViewCertificatesModel.groovy +++ b/cli-lanterna/src/main/groovy/com/muwire/clilanterna/ViewCertificatesModel.groovy @@ -17,7 +17,7 @@ class ViewCertificatesModel { private final Core core private final TextGUIThread guiThread - private final TableModel model = new TableModel("Issuer","File Name","Comment","Timestamp") + private final TableModel model = new TableModel("Issuer","Trust Status","File Name","Comment","Timestamp") private int totalCerts @@ -52,7 +52,8 @@ class ViewCertificatesModel { void onCertificateFetchedEvent(CertificateFetchedEvent e) { guiThread.invokeLater { Date date = new Date(e.certificate.timestamp) - model.addRow(new CertificateWrapper(e.certificate), e.certificate.name.name, e.certificate.comment != null, date) + model.addRow(new CertificateWrapper(e.certificate), core.trustService.getLevel(e.certificate.issuer.destination), + e.certificate.name.name, e.certificate.comment != null, date) String percentageString = "" if (totalCerts > 0) { diff --git a/cli-lanterna/src/main/groovy/com/muwire/clilanterna/ViewCertificatesView.groovy b/cli-lanterna/src/main/groovy/com/muwire/clilanterna/ViewCertificatesView.groovy index 7914eb0c..8a48581c 100644 --- a/cli-lanterna/src/main/groovy/com/muwire/clilanterna/ViewCertificatesView.groovy +++ b/cli-lanterna/src/main/groovy/com/muwire/clilanterna/ViewCertificatesView.groovy @@ -49,7 +49,7 @@ class ViewCertificatesView extends BasicWindow { topPanel.addComponent(percentageLabel, layoutData) contentPanel.addComponent(topPanel, layoutData) - table = new Table("Issuer","File Name","Comment","Timestamp") + table = new Table("Issuer","Trust Status","File Name","Comment","Timestamp") table.with { setCellSelection(false) setTableModel(model.model)