Author: markt
Date: Fri Mar 31 20:18:32 2017
New Revision: 1789744
URL: http://svn.apache.org/viewvc?rev=1789744&view=rev
Log:
Complete fixes to code signing task
- update URL
- make the debug log that was actually useful configurable
Modified:
tomcat/trunk/build.xml
tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1789744&r1=1789743&r2=1789744&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri Mar 31 20:18:32 2017
@@ -2059,7 +2059,7 @@ skip.installer property in build.propert
classpath="${tomcat.classes}" />
<signcode userName="${codesigning.user}" password="${codesigning.pwd}"
partnerCode="${codesigning.partnercode}"
- keyStore="${codesigning.keyStore}"
+ keyStore="${codesigning.keyStore}"
keyStorePassword="${codesigning.keyStorePassword}"
applicationName="Apache Tomcat ${version.major.minor} Uninstaller"
applicationversion="${version}"
Modified: tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java?rev=1789744&r1=1789743&r2=1789744&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java Fri Mar 31
20:18:32 2017
@@ -25,14 +25,12 @@ import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import java.util.zip.ZipOutputStream;
import javax.xml.soap.MessageFactory;
-import javax.xml.soap.MimeHeader;
import javax.xml.soap.SOAPBody;
import javax.xml.soap.SOAPConnection;
import javax.xml.soap.SOAPConnectionFactory;
@@ -65,7 +63,8 @@ public class SignCode extends Task {
static {
try {
- SIGNING_SERVICE_URL = new
URL("https://api.ws.symantec.com/webtrust/SigningService";);
+ SIGNING_SERVICE_URL = new URL(
+
"https://api-appsec-cws.ws.symantec.com/webtrust/SigningService";);
} catch (MalformedURLException e) {
throw new IllegalArgumentException(e);
}
@@ -85,6 +84,7 @@ public class SignCode extends Task {
private String applicationName;
private String applicationVersion;
private String signingService;
+ private boolean debug;
public void addFileset(FileSet fileset) {
filesets.add(fileset);
@@ -131,6 +131,11 @@ public class SignCode extends Task {
}
+ public void setDebug(String debug) {
+ this.debug = Boolean.parseBoolean(debug);
+ }
+
+
@Override
public void execute() throws BuildException {
@@ -204,11 +209,10 @@ public class SignCode extends Task {
log("Sending singing request to server and waiting for response");
SOAPMessage response = connection.call(message, SIGNING_SERVICE_URL);
- // Temporary debug code
- Iterator<?> iter = response.getMimeHeaders().getAllHeaders();
- while (iter.hasNext()) {
- MimeHeader mh = (MimeHeader) iter.next();
- log("Response header: Name: [" + mh.getName() + "], Value: [" +
mh.getValue() + "]");
+ if (debug) {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream(2 * 1024);
+ response.writeTo(baos);
+ log(baos.toString("UTF-8"));
}
log("Processing response");
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1789744&r1=1789743&r2=1789744&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Mar 31 20:18:32 2017
@@ -85,6 +85,11 @@
Review i18n property files, remove unencessary escaping and
consistently
use <code>[...]</code> to delimit inserted values. (markt)
</scode>
+ <fix>
+ Update the custom Ant task that integrates with the Symantec code
+ signing service to use the now mandatory 2-factor authentication.
+ (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
