Extend STAL to support CMS SignedAttributes

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

3 files changed, 25 insertions, 6 deletions

diff --git a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
index a1e29870..836d6538 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
@@ -408,7 +408,9 @@ public class STALServiceImpl implements STALPortType {
     log.info("[TestSession] add SIGN " + keyIdentifier + " request");
     SignRequestType sigT = stalObjFactory.createSignRequestType();
     sigT.setKeyIdentifier(keyIdentifier);
-    sigT.setSignedInfo(TestSignatureData.SIGNED_INFO.get(1)); //select! 
+    SignRequestType.SignedInfo sigI = stalObjFactory.createSignRequestTypeSignedInfo();
+    sigI.setValue(TestSignatureData.SIGNED_INFO.get(1));
+    sigT.setSignedInfo(sigI); //select!
     reqs.add(stalObjFactory.createGetNextRequestResponseTypeSignRequest(sigT));
   }
 
diff --git a/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd b/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd
index b37e8df7..5f96578d 100644
--- a/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd
+++ b/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd
@@ -123,7 +123,16 @@
               </restriction>
             </simpleType>
           </element>
-          <element name="SignedInfo" type="base64Binary"/>
+          <element name="SignedInfo">
+            <complexType>
+              <simpleContent>
+                <extension base="base64Binary">
+                  <attribute name="IsCMSSignedAttributes" type="boolean" default="false"/>
+                </extension>
+              </simpleContent>
+            </complexType>
+          </element>
+          <element name="SignatureMethod" type="string" minOccurs="0"/>
         </sequence>
       </extension>
     </complexContent>
diff --git a/BKUOnline/src/test/java/at/gv/egiz/stal/service/STALRequestBrokerTest.java b/BKUOnline/src/test/java/at/gv/egiz/stal/service/STALRequestBrokerTest.java
index 164e6335..bfbff5a4 100644
--- a/BKUOnline/src/test/java/at/gv/egiz/stal/service/STALRequestBrokerTest.java
+++ b/BKUOnline/src/test/java/at/gv/egiz/stal/service/STALRequestBrokerTest.java
@@ -114,7 +114,9 @@ public class STALRequestBrokerTest {
         List<STALRequest> requests = new ArrayList<STALRequest>();
         SignRequest r1 = new SignRequest();
         r1.setKeyIdentifier("keybox1");
-        r1.setSignedInfo("1234".getBytes());
+        SignRequest.SignedInfo si1 = new SignRequest.SignedInfo();
+        si1.setValue("1234".getBytes());
+        r1.setSignedInfo(si1);
         HashDataInput hdi = new HashDataInput() {
 
             @Override
@@ -166,7 +168,9 @@ public class STALRequestBrokerTest {
         List<STALRequest> requests = new ArrayList<STALRequest>();
         SignRequest r1 = new SignRequest();
         r1.setKeyIdentifier("keybox1");
-        r1.setSignedInfo("1234".getBytes());
+        SignRequest.SignedInfo si1 = new SignRequest.SignedInfo();
+        si1.setValue("1234".getBytes());
+        r1.setSignedInfo(si1);
         HashDataInput hdi = new HashDataInput() {
 
             @Override
@@ -230,7 +234,9 @@ public class STALRequestBrokerTest {
         List<STALRequest> requests = new ArrayList<STALRequest>();
         SignRequest r1 = new SignRequest();
         r1.setKeyIdentifier("keybox1");
-        r1.setSignedInfo("1234".getBytes());
+        SignRequest.SignedInfo si1 = new SignRequest.SignedInfo();
+        si1.setValue("1234".getBytes());
+        r1.setSignedInfo(si1);
         HashDataInput hdi = new HashDataInput() {
 
             @Override
@@ -263,7 +269,9 @@ public class STALRequestBrokerTest {
         List<STALRequest> requests2 = new ArrayList<STALRequest>();
         SignRequest r2 = new SignRequest();
         r2.setKeyIdentifier("keybox2");
-        r2.setSignedInfo("6789".getBytes());
+        SignRequest.SignedInfo si2 = new SignRequest.SignedInfo();
+        si2.setValue("6789".getBytes());
+        r2.setSignedInfo(si2);
         HashDataInput hdi2 = new HashDataInput() {
 
             @Override