Logging issues fixed:

 - Added possibility to configure logging of BKUWebstart. Logging is now configured from log4j configuration deployed with BKUWebstart in a first step. In a second step the webstart launcher looks for a log4j configuration file in the user's mooca configuration directory and updates the log4j configuration.
 - Logging of IAIK PKI properly initialized. IAIK PKI does not mess with the log4j configuration any longer.
 - Changed log4j accordingly (an appender is now needed as IAIK PKI does not reconfigure log4j any longer).

Added css-stylesheet to ErrorResponses issued by the BKU to improve the presentation to the user.

Changed dependencies of BKUWebStart (see Issue#469 https://egovlabs.gv.at/tracker/index.php?func=detail&aid=469&group_id=13&atid=134).

DataURLConnection now uses the request encoding of SL < 1.2. application/x-www-form-urlencoded is now used as default encoding method. multipart/form-data is used only if transfer parameters are present in the request that require a Content-Type parameter. This can only be set with multipart/form-data. This is not in conformance with SL 1.2, however it should improve compatibility with applications. 

Therefore, removed the ability to configure the DataURLConnection implementation class.

DataURLConnection now uses a streaming implementation for encoding of application/x-www-form-urlencoded requests. 

XWWWFormUrlImputDecoder now uses a streaming implementation for decoding of application/x-www-form-urlencoded requests.

Fixed Bug in SLResultPart that caused a binary response to be provided as parameter "XMLResponse" in a multipart/form-data encoded request to DataURL.

SLCommandFactory now supports unmarshalling of SL < 1.2 requests in order issue meaningful error messages. Therefore, the marshaling context for response marshaling had to be separated from the marshaling context for requests in order to avoid the marshaling of SL < 1.2 namespace prefixes in SL 1.2 responses.

Target attribute in QualifiedProperties is now marshaled. (see Issue#470 https://egovlabs.gv.at/tracker/index.php?func=detail&aid=470&group_id=13&atid=134)

Reporting of XML validation errors improved.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@510 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

1 files changed, 56 insertions, 38 deletions

diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/SLResultImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/SLResultImpl.java
index 0452bddf..0077b7b2 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/SLResultImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/SLResultImpl.java
@@ -17,12 +17,14 @@
 package at.gv.egiz.bku.slcommands.impl;
 
 import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
 import java.util.Locale;
 
-import javax.xml.bind.JAXBContext;
+import javax.xml.XMLConstants;
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
+import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Result;
 import javax.xml.transform.Templates;
 import javax.xml.transform.Transformer;
@@ -41,17 +43,15 @@ import org.w3c.dom.Node;
 
 import at.buergerkarte.namespaces.securitylayer._1.ErrorResponseType;
 import at.buergerkarte.namespaces.securitylayer._1.ObjectFactory;
-import at.gv.egiz.marshal.NamespacePrefixMapperImpl;
-import at.gv.egiz.bku.slcommands.SLCommandFactory;
+import at.gv.egiz.bku.slcommands.SLMarshallerFactory;
 import at.gv.egiz.bku.slcommands.SLResult;
 import at.gv.egiz.bku.slexceptions.SLBindingException;
 import at.gv.egiz.bku.slexceptions.SLCommandException;
 import at.gv.egiz.bku.slexceptions.SLException;
 import at.gv.egiz.bku.slexceptions.SLRuntimeException;
+import at.gv.egiz.bku.slexceptions.SLVersionException;
 import at.gv.egiz.bku.utils.DebugOutputStream;
 import at.gv.egiz.bku.utils.DebugWriter;
-import at.gv.egiz.marshal.MarshallerFactory;
-import javax.xml.bind.PropertyException;
 
 /**
  * This class serves as an abstract base class for the implementation of a
@@ -90,20 +90,18 @@ public abstract class SLResultImpl implements SLResult {
     return resultingMimeType;
   }
 
-  private Marshaller getMarshaller() {
-    try {
-      JAXBContext context  = SLCommandFactory.getInstance().getJaxbContext();
-      Marshaller marshaller = MarshallerFactory.createMarshaller(context, true);
-      return marshaller;
-    } catch (JAXBException e) {
-      log.fatal("Failed to marshall error response.", e);
-      throw new SLRuntimeException("Failed to marshall error response.", e);
-    }
+  @Override
+  public void writeTo(Result result, boolean fragment) {
+    writeTo(result, null, false);
   }
 
+  @Override
+  public abstract void writeTo(Result result, Templates templates, boolean fragment);
+
   private TransformerHandler getTransformerHandler(Templates templates, Result result) throws SLException {
     try {
       SAXTransformerFactory transformerFactory = (SAXTransformerFactory) SAXTransformerFactory.newInstance();
+      transformerFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
       TransformerHandler transformerHandler = transformerFactory.newTransformerHandler(templates);
       transformerHandler.setResult(result);
       return transformerHandler;
@@ -119,12 +117,6 @@ public abstract class SLResultImpl implements SLResult {
     }
   }
 
-  @Override
-  public void writeTo(Result result) {
-    writeTo(result, null);
-  }
-
-
   /**
    * Writes the given <code>response</code> to the SAX <code>result</code> using
    * the given transform <code>templates</code>.
@@ -133,7 +125,7 @@ public abstract class SLResultImpl implements SLResult {
    * @param result
    * @param templates
    */
-  protected void writeTo(JAXBElement<?> response, Result result, Templates templates) {
+  protected void writeTo(JAXBElement<?> response, Result result, Templates templates, boolean fragment) {
     
     DebugWriter dw = null;
     DebugOutputStream ds = null;
@@ -154,11 +146,11 @@ public abstract class SLResultImpl implements SLResult {
       try {
         transformerHandler = getTransformerHandler(templates, result);
       } catch (SLException e) {
-        writeErrorTo(e, result, templates);
+        writeErrorTo(e, result, templates, fragment);
       }
     }
     
-    Marshaller marshaller = getMarshaller();
+    Marshaller marshaller = SLMarshallerFactory.getInstance().createMarshaller(true);
     try {
       if (transformerHandler != null) {
         marshaller.marshal(response, transformerHandler);
@@ -168,7 +160,7 @@ public abstract class SLResultImpl implements SLResult {
     } catch (JAXBException e) {
       log.info("Failed to marshall " + response.getName() + " result." , e);
       SLCommandException commandException = new SLCommandException(4000);
-      writeErrorTo(commandException, result, templates);
+      writeErrorTo(commandException, result, templates, fragment);
     }
     
     if (ds != null) {
@@ -185,7 +177,7 @@ public abstract class SLResultImpl implements SLResult {
     
   }
   
-  protected void writeTo(Node node, Result result, Templates templates) {
+  protected void writeTo(Node node, Result result, Templates templates, boolean fragment) {
 
     DebugWriter dw = null;
     DebugOutputStream ds = null;
@@ -205,24 +197,30 @@ public abstract class SLResultImpl implements SLResult {
       try {
         TransformerFactory transformerFactory = TransformerFactory.newInstance();
         Transformer transformer = transformerFactory.newTransformer();
+        if (fragment) {
+          transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
+        }
         transformer.transform(new DOMSource(node), result);
       } catch (TransformerConfigurationException e) {
         log.error("Failed to create Transformer.", e);
-        writeErrorTo(new SLException(4000), result, null);
+        writeErrorTo(new SLException(4000), result, null, fragment);
       } catch (TransformerException e) {
         log.error("Failed to transform result.", e);
-        writeErrorTo(new SLException(4000), result, null);
+        writeErrorTo(new SLException(4000), result, null, fragment);
       }
     } else {
       try {
         Transformer transformer = templates.newTransformer();
+        if (fragment) {
+          transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
+        }
         transformer.transform(new DOMSource(node), result);
       } catch (TransformerConfigurationException e) {
         log.info("Failed to create transformer.", e);
-        writeErrorTo(new SLException(2008), result, templates);
+        writeErrorTo(new SLException(2008), result, templates, fragment);
       } catch (TransformerException e) {
         log.error("Failed to transform result.", e);
-        writeErrorTo(new SLException(2008), result, templates);
+        writeErrorTo(new SLException(2008), result, templates, fragment);
       }
     }
 
@@ -240,11 +238,11 @@ public abstract class SLResultImpl implements SLResult {
 
   }
   
-  protected void writeErrorTo(SLException slException, Result result, Templates templates) {
-    writeErrorTo(slException, result, templates, Locale.getDefault());
+  protected void writeErrorTo(SLException slException, Result result, Templates templates, boolean fragment) {
+    writeErrorTo(slException, result, templates, Locale.getDefault(), fragment);
   }
   
-  protected void writeErrorTo(SLException slException, Result result, Templates templates, Locale locale) {
+  protected void writeErrorTo(SLException slException, Result result, Templates templates, Locale locale, boolean fragment) {
     
     TransformerHandler transformerHandler = null;
     if (templates != null) {
@@ -256,13 +254,33 @@ public abstract class SLResultImpl implements SLResult {
       }
     }
 
-    ObjectFactory factory = new ObjectFactory();
-    ErrorResponseType responseType = factory.createErrorResponseType();
-    responseType.setErrorCode(slException.getErrorCode());
-    responseType.setInfo(slException.getLocalizedMessage(locale));
-    JAXBElement<ErrorResponseType> response = factory.createErrorResponse(responseType);
+    Object response;
+    
+    Marshaller marshaller;
+    if (slException instanceof SLVersionException
+        && ("http://www.buergerkarte.at/namespaces/securitylayer/20020225#"
+            .equals(((SLVersionException) slException).getNamespaceURI()) || 
+            "http://www.buergerkarte.at/namespaces/securitylayer/20020831#"
+            .equals(((SLVersionException) slException).getNamespaceURI()))) {
+      // issue ErrorResponse in the legacy namespace
+      at.buergerkarte.namespaces.securitylayer._20020225_.ObjectFactory factory 
+          = new at.buergerkarte.namespaces.securitylayer._20020225_.ObjectFactory();
+      at.buergerkarte.namespaces.securitylayer._20020225_.ErrorResponseType errorResponseType = factory
+          .createErrorResponseType();
+      errorResponseType.setErrorCode(BigInteger.valueOf(slException
+          .getErrorCode()));
+      errorResponseType.setInfo(slException.getLocalizedMessage(locale));
+      response = factory.createErrorResponse(errorResponseType);
+      marshaller = SLMarshallerFactory.getInstance().createLegacyMarshaller(true, fragment);
+    } else {
+      ObjectFactory factory = new ObjectFactory();
+      ErrorResponseType responseType = factory.createErrorResponseType();
+      responseType.setErrorCode(slException.getErrorCode());
+      responseType.setInfo(slException.getLocalizedMessage(locale));
+      response = factory.createErrorResponse(responseType);
+      marshaller = SLMarshallerFactory.getInstance().createMarshaller(true, fragment);
+    }
     
-    Marshaller marshaller = getMarshaller();
     try {
       if (transformerHandler != null) {
         marshaller.marshal(response, transformerHandler);