1 files changed, 55 insertions, 6 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/SignedDocAttributeRequestProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/SignedDocAttributeRequestProvider.java
index 72274bada..13b14b0be 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/SignedDocAttributeRequestProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/SignedDocAttributeRequestProvider.java
@@ -104,8 +104,7 @@ public class SignedDocAttributeRequestProvider extends AttributeProvider {
 	public SignedDocAttributeRequestProvider(String oasisDssWebFormURL, String attributes) {
 		super(attributes);
 		this.oasisDssWebFormURL = oasisDssWebFormURL;
-		//TODO load dtlUrl from config
-		
+
 		Properties props = new Properties();
 		try {
 			props.load(DatabaseConnectorMySQLImpl.class.getResourceAsStream("docservice.properties"));
@@ -132,6 +131,14 @@ public class SignedDocAttributeRequestProvider extends AttributeProvider {
 		}
 		
 		requestedAttribute = attribute;
+		try
+		{
+			 String tmp = requestedAttribute.getValue().get(0);
+		}catch(Exception e)
+		{
+			Logger.info("SignedDocAttributeProvide failed:"+e.toString());
+			throw new UnsupportedAttributeException();
+		}
 
 		throw new ExternalAttributeRequestRequiredException(this);
 	}
@@ -144,11 +151,10 @@ public class SignedDocAttributeRequestProvider extends AttributeProvider {
 	 * .servlet.http.HttpServletRequest)
 	 */
 	public IPersonalAttributeList parse(HttpServletRequest httpReq) throws MOAIDException, UnsupportedAttributeException {
-		Logger.debug("Beginning to extract OASIS-DSS response out of HTTP Request2");
+		Logger.debug("Beginning to extract OASIS-DSS response out of HTTP Request");
 
 		try {
-			String base64 = httpReq.
-					getParameter("signresponse");
+			String base64 = httpReq.getParameter("signresponse");
 			Logger.debug("signresponse url: " + httpReq.getRequestURI().toString());
 			Logger.debug("signresponse querystring: " + httpReq.getQueryString());
 			Logger.debug("signresponse method: " + httpReq.getMethod());
@@ -219,6 +225,49 @@ public class SignedDocAttributeRequestProvider extends AttributeProvider {
 					{
 						//No document service used?
 						// do nothing....
+						//TODO temporary fix because document is deleted after fetching => SP can't download Doc
+						//Add doc to Signresponse
+
+						DocumentWithSignature documentWithSignature = new DocumentWithSignature();
+						DocumentType value = new DocumentType();
+						if(signResponse.getProfile().toLowerCase().contains("xades"))
+						{
+							value.setBase64XML(data);
+						}
+						else
+						{
+							Base64Data base64data = new Base64Data();
+							base64data.setValue(data);
+							base64data.setMimeType(dataSource.getContentType());
+							value.setBase64Data(base64data);
+						}
+						documentWithSignature.setDocument(value);
+						if(signResponse.getOptionalOutputs()!=null)
+						{
+							//signResponse.getOptionalOutputs().getAny().add(documentWithSignature);
+							for(Object o :signResponse.getOptionalOutputs().getAny())
+							{
+								if(o instanceof DocumentWithSignature)
+								{
+									signResponse.getOptionalOutputs().getAny().remove(o);
+									signResponse.getOptionalOutputs().getAny().add(documentWithSignature);
+									break;
+								}
+							}
+						}
+						else
+						{
+							AnyType anytype = new AnyType();
+							anytype.getAny().add(documentWithSignature);
+							signResponse.setOptionalOutputs(anytype );
+						}
+
+//						System.out.println("overwriting:"+signResponse.getResult().getResultMessage()+" with DTL url:"+dtlUrl);
+						InputStream istr = ApiUtils.marshalToInputStream(signResponse);
+						StringWriter writer = new StringWriter();
+						IOUtils.copy(istr, writer, "UTF-8");
+						signResponseString = writer.toString();
+						Logger.info("SignResponse overwritten:"+signResponseString);
 					}
 			}
 			else
@@ -337,7 +386,7 @@ public class SignedDocAttributeRequestProvider extends AttributeProvider {
 			StringWriter writer = new StringWriter();
 			template.merge(context, writer);
 
-			resp.getOutputStream().write(writer.toString().getBytes());
+			resp.getOutputStream().write(writer.toString().getBytes("UTF-8"));
 		} catch (Exception e) {
 			Logger.error("Error sending DSS signrequest.", e);
 			throw new MOAIDException("stork.11", null);