Preparing for interim release

Author: adamcin

pom.xml

@@ -59,7 +59,7 @@
 
  <dependency>
  <groupId>net.adamcin.sshkey</groupId>
- <artifactId>net.adamcin.sshkey.provider.jsch</artifactId>
+ <artifactId>sshkey-bouncycastle</artifactId>
  <version>0.5.0-SNAPSHOT</version>
  </dependency>
 
@@ -72,7 +72,8 @@
  <dependency>
  <groupId>org.jvnet.hudson.plugins</groupId>
  <artifactId>collapsing-console-sections</artifactId>
- <version>1.3</version>
+ <version>1.4.1</version>
+ <optional>true</optional>
  </dependency>
 
  <dependency>
@@ -88,9 +89,15 @@
  </dependency>
 
  <dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch</artifactId>
- <version>0.1.50</version>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ <version>1.49</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <version>1.49</version>
  </dependency>
 
  <dependency>

src/main/java/net/adamcin/jenkins/granite/DeployPackagesBuilder.java

@@ -283,7 +283,7 @@ public PackId invoke(File f, VirtualChannel channel) throws IOException, Interru
  }
 
  Map<PackId, FilePath> selected = new LinkedHashMap<PackId, FilePath>();
- for (Map.Entry<String, PackIdFilter> filterEntry : listPackageFilters().entrySet()) {
+ for (Map.Entry<String, PackIdFilter> filterEntry : listPackageFilters(build, listener).entrySet()) {
  boolean matched = false;
  for (Map.Entry<PackId, FilePath> entry : found.entrySet()) {
  if (filterEntry.getValue().includes(entry.getKey())) {
@@ -320,12 +320,20 @@ public PackId invoke(File f, VirtualChannel channel) throws IOException, Interru
  return Collections.unmodifiableMap(selected);
  }
 
- private Map<String, PackIdFilter> listPackageFilters() {
+ public String getPackageIdFilters(AbstractBuild<?, ?> build, TaskListener listener) throws Exception {
+ return TokenMacro.expandAll(build, listener, getPackageIdFilters());
+ }
+
+ private Map<String, PackIdFilter> listPackageFilters(AbstractBuild<?, ?> build, TaskListener listener) {
  Map<String, PackIdFilter> filters = new LinkedHashMap<String, PackIdFilter>();
- for (String filter : getPackageIdFilters().split("(\\r)?\\n")) {
- if (filter.trim().length() > 0) {
- filters.put(filter, DefaultPackIdFilter.parse(filter));
+ try {
+ for (String filter : getPackageIdFilters(build, listener).split("(\\r)?\\n")) {
+ if (filter.trim().length() > 0) {
+ filters.put(filter, DefaultPackIdFilter.parse(filter));
+ }
  }
+ } catch (Exception e) {
+ listener.error("failed to expand tokens in: %n%s", getPackageIdFilters());
  }
  return Collections.unmodifiableMap(filters);
  }

src/main/java/net/adamcin/jenkins/granite/GraniteAnnotatorFactory.java

@@ -5,21 +5,25 @@
 import hudson.console.ConsoleAnnotatorFactory;
 import hudson.model.Run;
 import org.jvnet.hudson.plugins.collapsingconsolesections.CollapsingSectionAnnotator;
+import org.jvnet.hudson.plugins.collapsingconsolesections.CollapsingSectionNote;
+import org.jvnet.hudson.plugins.collapsingconsolesections.CollapsingSectionsConfiguration;
 import org.jvnet.hudson.plugins.collapsingconsolesections.SectionDefinition;
 
-@Extension
+@Extension(optional = true)
 public class GraniteAnnotatorFactory extends ConsoleAnnotatorFactory<Class<Run>> {
 
  @Override
  public ConsoleAnnotator newInstance(Class<Run> context) {
- SectionDefinition uninstallSection = new SectionDefinition(
+ CollapsingSectionNote uninstallSection = new CollapsingSectionNote(
  "[Granite] Uninstalling package",
  "Uninstalling content",
- "Package uninstalled");
- SectionDefinition installSection = new SectionDefinition(
+ "Package uninstalled", false);
+ CollapsingSectionNote installSection = new CollapsingSectionNote(
  "[Granite] Installing package",
  "Installing content",
- "Package uploaded");
- return new CollapsingSectionAnnotator(uninstallSection, installSection);
+ "Package uploaded", false);
+ return new CollapsingSectionAnnotator(
+ new CollapsingSectionsConfiguration(
+ new CollapsingSectionNote[]{uninstallSection, installSection}, false));
  }
 }

src/main/java/net/adamcin/jenkins/granite/PackageDeploymentCallable.java

@@ -14,8 +14,10 @@
 import net.adamcin.granite.client.packman.SimpleResponse;
 import net.adamcin.granite.client.packman.UnauthorizedException;
 import net.adamcin.granite.client.packman.async.AsyncPackageManagerClient;
+import net.adamcin.sshkey.api.DefaultKeychain;
+import net.adamcin.sshkey.api.Key;
 import net.adamcin.sshkey.api.Signer;
-import net.adamcin.sshkey.api.SignerException;
+import net.adamcin.sshkey.bouncycastle.PEMHelper;
 
 import java.io.File;
 import java.io.IOException;
@@ -155,7 +157,7 @@ private boolean handleExisting(AsyncPackageManagerClient client, PackId packId)
  return true;
  }
 
- private boolean login(AsyncPackageManagerClient client) throws SignerException, IOException {
+ private boolean login(AsyncPackageManagerClient client) throws IOException {
  try {
  client.waitForService();
  } catch (UnauthorizedException e) {
@@ -167,17 +169,21 @@ private boolean login(AsyncPackageManagerClient client) throws SignerException,
  }
 
  if (request.isSshKeyLogin()) {
- Signer signer = SignerFactory.getFactoryInstance().getInstance();
  List<SSHUserPrivateKey> keys = CredentialsProvider.lookupCredentials(SSHUserPrivateKey.class);
+ DefaultKeychain keychain = new DefaultKeychain();
  for (SSHUserPrivateKey key : keys) {
- byte[] passphrase = null;
+ char[] passphrase = null;
  if (key.getPassphrase() != null) {
- passphrase = key.getPassphrase().getEncryptedValue().getBytes("UTF-8");
+ passphrase = key.getPassphrase().getEncryptedValue().toCharArray();
  }
 
- signer.addLocalKey(key.getUsername(), key.getPrivateKey().getBytes("UTF-8"), passphrase);
+ Key sshkey = PEMHelper.readKey(key.getPrivateKey().getBytes("UTF-8"), passphrase);
+ if (sshkey != null) {
+ keychain.add(sshkey);
+ }
  }
 
+ Signer signer = new Signer(keychain);
  return client.login(request.getUsername(), signer);
  } else {
  return client.login(request.getUsername(), request.getPassword());