Introducing GPG signature verification when loading main package_index file

Author: Federico Fissore

.classpath

@@ -20,8 +20,8 @@
 	<classpathentry kind="lib" path="app/lib/jmdns-3.4.1.jar"/>
 	<classpathentry kind="lib" path="app/lib/jsch-0.1.50.jar"/>
 	<classpathentry kind="lib" path="app/lib/jssc-2.8.0.jar"/>
-	<classpathentry kind="lib" path="app/lib/bcpg-jdk15on-149.jar"/>
-	<classpathentry kind="lib" path="app/lib/bcprov-jdk15on-149.jar"/>
+	<classpathentry kind="lib" path="app/lib/bcpg-jdk15on-152.jar"/>
+	<classpathentry kind="lib" path="app/lib/bcprov-jdk15on-152.jar"/>
 	<classpathentry kind="lib" path="app/lib/jackson-core-2.2.3.jar"/>
 	<classpathentry kind="lib" path="app/lib/jackson-databind-2.2.3.jar"/>
 	<classpathentry kind="lib" path="app/lib/jackson-module-mrbean-2.2.3.jar"/>

app/.classpath

@@ -7,8 +7,8 @@
 	<classpathentry kind="lib" path="lib/jna.jar"/>
 	<classpathentry kind="lib" path="lib/ecj.jar"/>
 	<classpathentry kind="lib" path="lib/apple.jar"/>
-	<classpathentry kind="lib" path="lib/bcpg-jdk15on-149.jar"/>
-	<classpathentry kind="lib" path="lib/bcprov-jdk15on-149.jar"/>
+	<classpathentry kind="lib" path="lib/bcpg-jdk15on-152.jar"/>
+	<classpathentry kind="lib" path="lib/bcprov-jdk15on-152.jar"/>
 	<classpathentry kind="lib" path="lib/commons-codec-1.7.jar"/>
 	<classpathentry kind="lib" path="lib/commons-compress-1.8.jar"/>
 	<classpathentry kind="lib" path="lib/commons-exec-1.1.jar"/>

app/build.xml

@@ -99,6 +99,8 @@
       <fileset dir="test" includes="**/*.txt" />
       <fileset dir="test" includes="**/*.properties" />
       <fileset dir="test" includes="**/*.ino" />
+      <fileset dir="test" includes="**/*.json*" />
+      <fileset dir="test" includes="**/*.key" />
     </copy>
 
     <junit printsummary="yes" dir="${work.dir}" fork="true">

app/lib/bcpg-jdk15on-149.jar

@@ -32,7 +32,7 @@
 import cc.arduino.contributions.filters.InstalledPredicate;
 import cc.arduino.contributions.packages.ContributedPackage;
 import cc.arduino.contributions.packages.ContributedPlatform;
-import cc.arduino.contributions.packages.ContributionsIndex;
+import cc.arduino.contributions.packages.ContributionsIndexer;
 import cc.arduino.contributions.ui.FilteredAbstractTableModel;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
@@ -113,16 +113,16 @@ public void select(ContributedPlatform value) {
 
   private Class<?>[] columnTypes = {ContributedPlatform.class};
 
-  private ContributionsIndex index;
+  private ContributionsIndexer indexer;
 
-  public void setIndex(ContributionsIndex _index) {
-    index = _index;
+  public void setIndexer(ContributionsIndexer indexer) {
+    this.indexer = indexer;
   }
 
   public void updateIndexFilter(String filters[], Predicate<ContributedPlatform>... additionalFilters) {
     contributions.clear();
     Predicate<ContributedPlatform> filter = Predicates.and(additionalFilters);
-    for (ContributedPackage pack : index.getPackages()) {
+    for (ContributedPackage pack : indexer.getPackages()) {
       for (ContributedPlatform platform : pack.getPlatforms()) {
         if (!filter.apply(platform)) {
           continue;

app/lib/bcpg-jdk15on-152.jar

@@ -28,15 +28,11 @@
  */
 package cc.arduino.contributions.packages.ui;
 
-import cc.arduino.contributions.ui.InstallerJDialogUncaughtExceptionHandler;
 import cc.arduino.contributions.packages.ContributedPlatform;
 import cc.arduino.contributions.packages.ContributionInstaller;
 import cc.arduino.contributions.packages.ContributionsIndexer;
 import cc.arduino.contributions.packages.DownloadableContribution;
-import cc.arduino.contributions.ui.DropdownItem;
-import cc.arduino.contributions.ui.FilteredAbstractTableModel;
-import cc.arduino.contributions.ui.InstallerJDialog;
-import cc.arduino.contributions.ui.InstallerTableCell;
+import cc.arduino.contributions.ui.*;
 import cc.arduino.utils.Progress;
 import processing.app.I18n;
 
@@ -95,7 +91,7 @@ public void setIndexer(ContributionsIndexer indexer) {
 
     categoryChooser.removeActionListener(categoryChooserActionListener);
 
-    getContribModel().setIndex(indexer.getIndex());
+    getContribModel().setIndexer(indexer);
 
     categoryFilter = null;
     categoryChooser.removeAllItems();
@@ -106,7 +102,7 @@ public void setIndexer(ContributionsIndexer indexer) {
 
     // Enable categories combo only if there are two or more choices
     categoryChooser.addItem(new DropdownAllCoresItem());
-    Collection<String> categories = indexer.getIndex().getCategories();
+    Collection<String> categories = indexer.getCategories();
     for (String s : categories) {
       categoryChooser.addItem(new DropdownCoreOfCategoryItem(s));
     }

app/lib/bcprov-jdk15on-149.jar

@@ -22,6 +22,7 @@
 
 package processing.app;
 
+import cc.arduino.DefaultUncaughtExceptionHandler;
 import cc.arduino.contributions.DownloadableContributionVersionComparator;
 import cc.arduino.contributions.VersionHelper;
 import cc.arduino.contributions.libraries.ContributedLibrary;
@@ -342,7 +343,7 @@ protected void onProgress(Progress progress) {
         System.exit(1);
       }
 
-      ContributedPlatform installed = indexer.getIndex().getInstalled(boardToInstallParts[0], boardToInstallParts[1]);
+      ContributedPlatform installed = indexer.getInstalled(boardToInstallParts[0], boardToInstallParts[1]);
 
       if (!selected.isReadOnly()) {
         installer.install(selected);

app/lib/bcprov-jdk15on-152.jar

@@ -0,0 +1,66 @@
+/*
+ * This file is part of Arduino.
+ *
+ * Copyright 2015 Arduino LLC (http://www.arduino.cc/)
+ *
+ * Arduino is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ */
+
+package cc.arduino.packages.contributions;
+
+import cc.arduino.contributions.GPGDetachedSignatureVerifier;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.File;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class GPGDetachedSignatureVerifierTest {
+
+  private GPGDetachedSignatureVerifier GPGDetachedSignatureVerifier;
+
+  @Before
+  public void setUp() throws Exception {
+    GPGDetachedSignatureVerifier = new GPGDetachedSignatureVerifier();
+  }
+
+  @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("./public.gpg.key").getFile());
+    assertTrue(GPGDetachedSignatureVerifier.verify(signedFile, sign, publickKey));
+  }
+
+  @Test
+  public void testSignatureFailingVerification() throws Exception {
+    File fakeSignedFile = File.createTempFile("fakeSigned", "txt");
+    fakeSignedFile.deleteOnExit();
+    File sign = new File(GPGDetachedSignatureVerifierTest.class.getResource("./package_index.json.sig").getFile());
+    File publickKey = new File(GPGDetachedSignatureVerifierTest.class.getResource("./public.gpg.key").getFile());
+    assertFalse(GPGDetachedSignatureVerifier.verify(fakeSignedFile, sign, publickKey));
+  }
+}