From 01dbd709e7ed34ec7b6bc5fb02f2d5a3399dd35e Mon Sep 17 00:00:00 2001
From: Christof Rabensteiner <christof.rabensteiner@iaik.tugraz.at>
Date: Tue, 6 Aug 2019 11:23:09 +0200
Subject: verifyXML: parametrize xpath pointing to Signature location

- Add two methods to public interface of
  ISignatureVerificationService, where caller can specify xpath.
- Ignore intellj project files.
---
 .../moasig/api/ISignatureVerificationService.java  | 37 ++++++++++++++++++++--
 1 file changed, 34 insertions(+), 3 deletions(-)

(limited to 'eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/api')

diff --git a/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/api/ISignatureVerificationService.java b/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/api/ISignatureVerificationService.java
index 420fe5dc..a3243635 100644
--- a/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/api/ISignatureVerificationService.java
+++ b/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/api/ISignatureVerificationService.java
@@ -11,7 +11,7 @@ public interface ISignatureVerificationService {
 	/**
 	 * Verify a CAdES or CMS signature
 	 * <br><br>
-	 * <i>This method only validates the first CMS or CAdES signature of more than one signature exists</i>
+	 * <i>This method only validates the first CMS or CAdES signature if more than one signature exists</i>
 	 *  
 	 * @param signature Enveloped CMS or CAdES signature
 	 * @param trustProfileID Id of the Trust-Profile from MOA-Sig configuration
@@ -26,7 +26,7 @@ public interface ISignatureVerificationService {
 	/**
 	 * Verify a XML or XAdES signature
 	 * <br><br>
-	 * <i>This method only validates the first XML or XAdES signature of more than one signature exists</i>
+	 * <i>This method only validates the first XML or XAdES signature if more than one signature exists</i>
 	 * 
 	 * @param signature Serialized XML or XAdES signature
 	 * @param trustProfileID Id of the Trust-Profile from MOA-Sig configuration
@@ -39,7 +39,7 @@ public interface ISignatureVerificationService {
 	/**
 	 * Verify a XML or XAdES signature
 	 * <br><br>
-	 * <i>This method only validates the first XML or XAdES signature of more than one signature exists</i>
+	 * <i>This method only validates the first XML or XAdES signature if more than one signature exists</i>
 	 * 
 	 * @param signature Serialized XML or XAdES signature
 	 * @param trustProfileID Id of the Trust-Profile from MOA-Sig configuration
@@ -50,4 +50,35 @@ public interface ISignatureVerificationService {
 	IXMLSignatureVerificationResponse verifyXMLSignature(byte[] signature, String trustProfileID,
 			List<String> verifyTransformsInfoProfileID) throws MOASigServiceException;
 
+
+	/**
+	 * Verify a XML or XAdES signature
+	 * <br><br>
+	 * <i>This method only validates the first XML or XAdES signature if more than one signature exists</i>
+	 *
+	 * @param signature Serialized XML or XAdES signature
+	 * @param trustProfileID Id of the Trust-Profile from MOA-Sig configuration
+	 * @param signatureLocationXpath Xpath that points to location of Signature element
+	 * @return @link {@link IXMLSignatureVerificationResponse}, or null if no signature was found
+	 * @throws MOASigServiceException on signatue-verification error
+	 */
+	IXMLSignatureVerificationResponse verifyXMLSignature(byte[] signature, String trustProfileID,
+														 String signatureLocationXpath) throws MOASigServiceException;
+
+	/**
+	 * Verify a XML or XAdES signature
+	 * <br><br>
+	 * <i>This method only validates the first XML or XAdES signature if more than one signature exists</i>
+	 *
+	 * @param signature Serialized XML or XAdES signature
+	 * @param trustProfileID Id of the Trust-Profile from MOA-Sig configuration
+	 * @param verifyTransformsInfoProfileID {@link List} of XML Transformations that should be used for signature-verification
+	 * @param signatureLocationXpath Xpath that points to location of Signature element
+	 * @return @link {@link IXMLSignatureVerificationResponse}, or null if no signature was found
+	 * @throws MOASigServiceException on signatue-verification error
+	 */
+	IXMLSignatureVerificationResponse verifyXMLSignature(byte[] signature, String trustProfileID,
+														 List<String> verifyTransformsInfoProfileID,
+														 String signatureLocationXpath) throws MOASigServiceException;
+
 }
\ No newline at end of file
-- 
cgit v1.2.3