Inglobated GPGDetachedSignatureVerifier into SignatureVerifier

There is no point to have this abstract class.

Author: cmaglie

app/src/processing/app/Base.java

@@ -296,7 +296,7 @@ public Base(String[] args) throws Exception {
     pdeKeywords = new PdeKeywords();
     pdeKeywords.reload();
 
-    final GPGDetachedSignatureVerifier gpgDetachedSignatureVerifier = new GPGDetachedSignatureVerifier();
+    final SignatureVerifier gpgDetachedSignatureVerifier = new SignatureVerifier();
     contributionInstaller = new ContributionInstaller(BaseNoGui.getPlatform(), gpgDetachedSignatureVerifier);
     libraryInstaller = new LibraryInstaller(BaseNoGui.getPlatform(), gpgDetachedSignatureVerifier);
 

app/test/cc/arduino/contributions/GPGDetachedSignatureVerifierTest.java

@@ -39,19 +39,19 @@
 
 public class GPGDetachedSignatureVerifierTest {
 
-  private GPGDetachedSignatureVerifier GPGDetachedSignatureVerifier;
+  private SignatureVerifier verifier;
 
   @Before
   public void setUp() throws Exception {
-    GPGDetachedSignatureVerifier = new GPGDetachedSignatureVerifier();
+    verifier = new SignatureVerifier();
   }
 
   @Test
   public void testSignatureSuccessfulVerification() throws Exception {
     File signedFile = new File(GPGDetachedSignatureVerifierTest.class.getResource("./package_index.json").getFile());
     File sign = new File(GPGDetachedSignatureVerifierTest.class.getResource("./package_index.json.sig").getFile());
     File publickKey = new File(GPGDetachedSignatureVerifierTest.class.getResource("./test.public.gpg.key").getFile());
-    assertTrue(GPGDetachedSignatureVerifier.verify(signedFile, sign, publickKey));
+    assertTrue(verifier.verify(signedFile, sign, publickKey));
   }
 
   @Test
@@ -60,6 +60,6 @@ public void testSignatureFailingVerification() throws Exception {
     fakeSignedFile.deleteOnExit();
     File sign = new File(GPGDetachedSignatureVerifierTest.class.getResource("./package_index.json.sig").getFile());
     File publickKey = new File(GPGDetachedSignatureVerifierTest.class.getResource("./test.public.gpg.key").getFile());
-    assertFalse(GPGDetachedSignatureVerifier.verify(fakeSignedFile, sign, publickKey));
+    assertFalse(verifier.verify(fakeSignedFile, sign, publickKey));
   }
 }

arduino-core/src/cc/arduino/contributions/GPGDetachedSignatureVerifier.java renamed to arduino-core/src/cc/arduino/contributions/SignatureVerifier.java

@@ -34,22 +34,46 @@
 import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator;
 import org.bouncycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider;
 
+import processing.app.BaseNoGui;
+
 import java.io.*;
 import java.util.Iterator;
 
-public class GPGDetachedSignatureVerifier extends SignatureVerifier {
+public class SignatureVerifier {
 
   private String keyId;
 
-  public GPGDetachedSignatureVerifier() {
+  public SignatureVerifier() {
     this("7F294291");
   }
 
-  public GPGDetachedSignatureVerifier(String keyId) {
+  public SignatureVerifier(String keyId) {
     this.keyId = keyId;
   }
 
-  @Override
+  public boolean isSigned(File indexFile) {
+    File signature = new File(indexFile.getParent(), indexFile.getName() + ".sig");
+    if (!signature.exists()) {
+      return false;
+    }
+
+    try {
+      return verify(indexFile, signature, new File(BaseNoGui.getContentFile("lib"), "public.gpg.key"));
+    } catch (Exception e) {
+      BaseNoGui.showWarning(e.getMessage(), e.getMessage(), e);
+      return false;
+    }
+  }
+
+  public boolean isSigned(File indexFile, File signature) {
+    try {
+      return verify(indexFile, signature, new File(BaseNoGui.getContentFile("lib"), "public.gpg.key"));
+    } catch (Exception e) {
+      BaseNoGui.showWarning(e.getMessage(), e.getMessage(), e);
+      return false;
+    }
+  }
+
   protected boolean verify(File signedFile, File signature, File publicKey) throws IOException {
     FileInputStream signatureInputStream = null;
     FileInputStream signedFileInputStream = null;

arduino-core/src/cc/arduino/contributions/libraries/LibraryInstaller.java

@@ -31,7 +31,7 @@
 
 import cc.arduino.Constants;
 import cc.arduino.contributions.DownloadableContributionsDownloader;
-import cc.arduino.contributions.GPGDetachedSignatureVerifier;
+import cc.arduino.contributions.SignatureVerifier;
 import cc.arduino.contributions.GZippedJsonDownloader;
 import cc.arduino.contributions.ProgressListener;
 import cc.arduino.utils.ArchiveExtractor;
@@ -60,9 +60,9 @@ public class LibraryInstaller {
   private static Logger log = LogManager.getLogger(LibraryInstaller.class);
 
   private final Platform platform;
-  private final GPGDetachedSignatureVerifier signatureVerifier;
+  private final SignatureVerifier signatureVerifier;
 
-  public LibraryInstaller(Platform platform, GPGDetachedSignatureVerifier signatureVerifier) {
+  public LibraryInstaller(Platform platform, SignatureVerifier signatureVerifier) {
     this.platform = platform;
     this.signatureVerifier = signatureVerifier;
   }

arduino-core/src/cc/arduino/contributions/packages/ContributionInstaller.java

@@ -32,8 +32,8 @@
 import cc.arduino.Constants;
 import cc.arduino.contributions.DownloadableContribution;
 import cc.arduino.contributions.DownloadableContributionsDownloader;
-import cc.arduino.contributions.ProgressListener;
 import cc.arduino.contributions.SignatureVerifier;
+import cc.arduino.contributions.ProgressListener;
 import cc.arduino.filters.FileExecutablePredicate;
 import cc.arduino.utils.ArchiveExtractor;
 import cc.arduino.utils.MultiStepProgress;

arduino-core/src/processing/app/BaseNoGui.java

@@ -1,7 +1,7 @@
 package processing.app;
 
 import cc.arduino.Constants;
-import cc.arduino.contributions.GPGDetachedSignatureVerifier;
+import cc.arduino.contributions.SignatureVerifier;
 import cc.arduino.contributions.VersionComparator;
 import cc.arduino.contributions.libraries.LibrariesIndexer;
 import cc.arduino.contributions.packages.ContributedPlatform;
@@ -477,7 +477,7 @@ static public void initLogger() {
 
   static public void initPackages() throws Exception {
     indexer = new ContributionsIndexer(getSettingsFolder(), getHardwareFolder(), getPlatform(),
-        new GPGDetachedSignatureVerifier());
+        new SignatureVerifier());
 
     try {
       indexer.parseIndex();