Move apple wwdrca to credentials.

.gitignore

@@ -6,3 +6,4 @@ test-*
 .DS_Store
 *.orig
 /examples
+TEST-*

CHANGELOG.md

@@ -5,6 +5,9 @@ Changelog
 
 See [GitHub releases](https://github.com/jenkinsci/xcode-plugin/releases)
 
+#### Version 2.0.15 (14th Mar 2021)
+-   ##### Moved information in the AppleWWDRCA.cer file from the local file system to credentials.
+
 #### Version 2.0.14 (14th Nov 2019)
 -   ##### Fix backward compatibility problem at Import Developer Profile.
 

pom.xml

@@ -70,7 +70,7 @@
     <connection>scm:git:git@github.com:jenkinsci/xcode-plugin.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/xcode-plugin.git</developerConnection>
     <url>https://github.com/jenkinsci/xcode-plugin</url>
-    <tag>xcode-plugin-2.0.11</tag>
+    <tag>xcode-plugin-2.0.15</tag>
   </scm>
   <repositories>
     <repository>

src/main/java/au/com/rayh/AppleWWDRCA.java

@@ -0,0 +1,118 @@
+package au.com.rayh;
+
+import com.cloudbees.plugins.credentials.CredentialsProvider;
+import com.cloudbees.plugins.credentials.domains.DomainRequirement;
+import hudson.Extension;
+import hudson.security.ACL;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.GeneralSecurityException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.*;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+import javax.naming.InvalidNameException;
+import javax.naming.ldap.LdapName;
+import javax.naming.ldap.Rdn;
+
+import jenkins.security.ConfidentialKey;
+
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.io.IOUtils;
+import org.kohsuke.stapler.DataBoundConstructor;
+
+import com.cloudbees.plugins.credentials.CredentialsScope;
+import com.cloudbees.plugins.credentials.impl.BaseStandardCredentials;
+
+/**
+ * Apple Worldwide Developer Relations Certification Authority, which consists of any number of
+ * certificate for prepare certificate for code signing, and mobile provisioning profiles.
+ *
+ * @author Kazuhide Takahashi
+ */
+public class AppleWWDRCA extends BaseStandardCredentials {
+    @DataBoundConstructor
+    public AppleWWDRCA(@CheckForNull CredentialsScope scope, @CheckForNull String id, @CheckForNull String description,
+            FileItem image) throws IOException {
+        super(scope, id, description);
+
+        if ( image != null ) {
+            // for added secrecy, store this in the confidential store
+            new ConfidentialKeyImpl(id).store(image);
+        }
+    }
+
+    /**
+     * Retrieves the AppleWWDRCA.cer file image.
+     * @return AppleWWDRCA.cer file image
+     * @throws IOException file I/O
+     */
+    public byte[] getImage() throws IOException {
+        return new ConfidentialKeyImpl(getId()).load();
+    }
+
+    /**
+     * Obtains the certificates in this AppleWWDRCA.cer file.
+     * @return X509Certificates
+     * @throws IOException file I/O
+     * @throws GeneralSecurityException Certificate error
+     */
+    public @Nonnull List<X509Certificate> getCertificates() throws IOException, GeneralSecurityException {
+        List<X509Certificate> r = new ArrayList<>();
+        try ( InputStream inputStream = new ByteArrayInputStream(getImage()) ) {
+            CertificateFactory certificateFactory = CertificateFactory.getInstance("X.509");
+            Collection c = certificateFactory.generateCertificates(inputStream);
+            Iterator i = c.iterator();
+            while ( i.hasNext() ) {
+                X509Certificate cert = (X509Certificate) i.next();
+                r.add((X509Certificate)cert);
+            }
+        }
+        return r;
+     }
+
+    public String getDisplayNameOf(X509Certificate p) {
+        String name = p.getSubjectDN().getName();
+        try {
+            LdapName n = new LdapName(name);
+            for ( Rdn rdn : n.getRdns() ) {
+                if ( rdn.getType().equalsIgnoreCase("CN") )
+                    return rdn.getValue().toString();
+            }
+        }
+        catch ( InvalidNameException e ) {
+            // fall through
+        }
+        return name; // fallback
+    }
+
+    @Extension
+    public static class DescriptorImpl extends BaseStandardCredentialsDescriptor {
+        @Override
+        public String getDisplayName() {
+            return "Apple Worldwide Developer Relations Certification Authority";
+        }
+    }
+
+    static class ConfidentialKeyImpl extends ConfidentialKey {
+        ConfidentialKeyImpl(String id) {
+            super(AppleWWDRCA.class.getName()+"."+id);
+        }
+
+        public void store(FileItem submitted) throws IOException {
+            super.store(IOUtils.toByteArray(submitted.getInputStream()));
+        }
+
+        public @CheckForNull byte[] load() throws IOException {
+            return super.load();
+        }
+    }
+
+    public static List<AppleWWDRCA> getAllCertificates() {
+	    return CredentialsProvider.lookupCredentials(AppleWWDRCA.class, (hudson.model.Item)null, ACL.SYSTEM, Collections.<DomainRequirement>emptyList());
+    }
+}

src/main/java/au/com/rayh/DeveloperProfile.java

@@ -4,7 +4,6 @@
 import com.cloudbees.plugins.credentials.domains.DomainRequirement;
 import hudson.Extension;
 import hudson.security.ACL;
-import hudson.util.IOUtils;
 import hudson.util.Secret;
 
 import java.io.ByteArrayInputStream;
@@ -29,6 +28,7 @@
 import jenkins.security.ConfidentialKey;
 
 import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.io.IOUtils;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 import com.cloudbees.plugins.credentials.CredentialsScope;
@@ -52,15 +52,15 @@ public DeveloperProfile(@CheckForNull CredentialsScope scope, @CheckForNull Stri
         super(scope, id, description);
         this.password = password;
 
-        if (image!=null) {
+        if ( image != null ) {
             // for added secrecy, store this in the confidential store
             new ConfidentialKeyImpl(id).store(image);
         }
     }
 
     @Deprecated
     public DeveloperProfile(String id, String description, Secret password, FileItem image) throws IOException {
-        this(CredentialsScope.GLOBAL,id,description,password,image);
+        this(CredentialsScope.GLOBAL, id, description, password, image);
     }
 
     public Secret getPassword() {
@@ -87,21 +87,20 @@ public byte[] getImage() throws IOException {
             List<X509Certificate> r = new ArrayList<>();
 
             ZipEntry ze;
-            while ((ze = zip.getNextEntry()) != null) {
-                if (ze.getName().endsWith(".p12")) {
+            while ( (ze = zip.getNextEntry()) != null ) {
+                if ( ze.getName().endsWith(".p12") ) {
                     KeyStore ks = KeyStore.getInstance("pkcs12");
                     ks.load(zip, password.getPlainText().toCharArray());
                     Enumeration<String> en = ks.aliases();
-                    while (en.hasMoreElements()) {
+                    while ( en.hasMoreElements() ) {
                         String s = en.nextElement();
                         Certificate c = ks.getCertificate(s);
-                        if (c instanceof X509Certificate) {
+                        if ( c instanceof X509Certificate ) {
                             r.add((X509Certificate) c);
                         }
                     }
                 }
             }
-
             return r;
         }
     }
@@ -110,11 +109,12 @@ public String getDisplayNameOf(X509Certificate p) {
         String name = p.getSubjectDN().getName();
         try {
             LdapName n = new LdapName(name);
-            for (Rdn rdn : n.getRdns()) {
-                if (rdn.getType().equalsIgnoreCase("CN"))
+            for ( Rdn rdn : n.getRdns() ) {
+                if ( rdn.getType().equalsIgnoreCase("CN") )
                     return rdn.getValue().toString();
             }
-        } catch (InvalidNameException e) {
+        }
+        catch ( InvalidNameException e ) {
             // fall through
         }
         return name; // fallback
@@ -143,6 +143,6 @@ public void store(FileItem submitted) throws IOException {
     }
 
     public static List<DeveloperProfile> getAllProfiles() {
-	return CredentialsProvider.lookupCredentials(DeveloperProfile.class, (hudson.model.Item)null, ACL.SYSTEM, Collections.<DomainRequirement>emptyList());
+	    return CredentialsProvider.lookupCredentials(DeveloperProfile.class, (hudson.model.Item)null, ACL.SYSTEM, Collections.<DomainRequirement>emptyList());
     }
 }