move citizen-card authentication and validation (Security-layer communication) to discrete module

11 files changed, 0 insertions, 3063 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java
deleted file mode 100644
index e1ab0025e..000000000
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java
+++ /dev/null
@@ -1,671 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Federal Chancellery Austria
- * MOA-ID has been developed in a cooperation between BRZ, the Federal
- * Chancellery Austria - ICT staff unit, and Graz University of Technology.
- * 
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * http://www.osor.eu/eupl/
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- * 
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- ******************************************************************************/
-/*
- * Copyright 2003 Federal Chancellery Austria
- * MOA-ID has been developed in a cooperation between BRZ, the Federal
- * Chancellery Austria - ICT staff unit, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * http://www.osor.eu/eupl/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- */
-
-
-package at.gv.egovernment.moa.id.auth.validator;
-
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.bind.DatatypeConverter;
-
-import org.jaxen.SimpleNamespaceContext;
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.id.auth.builder.AuthenticationBlockAssertionBuilder;
-import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
-import at.gv.egovernment.moa.id.auth.data.CreateXMLSignatureResponse;
-import at.gv.egovernment.moa.id.auth.data.ExtendedSAMLAttribute;
-import at.gv.egovernment.moa.id.auth.data.IdentityLink;
-import at.gv.egovernment.moa.id.auth.data.SAMLAttribute;
-import at.gv.egovernment.moa.id.auth.exception.ValidateException;
-import at.gv.egovernment.moa.id.config.ConfigurationException;
-import at.gv.egovernment.moa.id.config.TargetToSectorNameMapper;
-import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProviderFactory;
-import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.MiscUtil;
-import at.gv.egovernment.moa.util.StringUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
-
-/**
- * 
- * This class is used to validate an {@link CreateXMLSignatureResponse} 
- * returned by the security layer.
- * This class implements the Singleton pattern.
- * @author Stefan Knirsch
- * @version $Id$
- */
-public class CreateXMLSignatureResponseValidator {
-  
- 
-  /** Xpath expression to the dsig:Signature element */
-  private static final String SIGNATURE_XPATH = Constants.DSIG_PREFIX + ":Signature";
-  
-  private static final String XADES_1_1_1_SIGNINGTIME_PATH = "//" + Constants.XADES_1_1_1_NS_PREFIX + ":SigningTime";
-  private static final String XADES_1_3_2_SIGNINGTIME_PATH = "//" + Constants.XADES_1_3_2_NS_PREFIX + ":SigningTime";
-  
-  
-  private static final long MAX_DIFFERENCE_IN_MILLISECONDS = 600000; // 10min
-  
- /** Singleton instance. <code>null</code>, if none has been created. */
-  private static CreateXMLSignatureResponseValidator instance;
-
-  private static SimpleNamespaceContext NS_CONTEXT;
-  static {
-    NS_CONTEXT = new SimpleNamespaceContext();
-    NS_CONTEXT.addNamespace(Constants.XADES_1_1_1_NS_PREFIX, Constants.XADES_1_1_1_NS_URI);
-    NS_CONTEXT.addNamespace(Constants.XADES_1_2_2_NS_PREFIX, Constants.XADES_1_2_2_NS_URI);
-    NS_CONTEXT.addNamespace(Constants.XADES_1_3_2_NS_PREFIX, Constants.XADES_1_3_2_NS_URI);
-    NS_CONTEXT.addNamespace(Constants.XADES_1_4_1_NS_PREFIX, Constants.XADES_1_4_1_NS_URI);
-  }
-
-  
-  /**
-   * Constructor for a singleton CreateXMLSignatureResponseValidator.
-   * @return an instance of CreateXMLSignatureResponseValidator
-   * @throws ValidateException if no instance can be created
-   */
-   public static synchronized CreateXMLSignatureResponseValidator getInstance() 
-   throws ValidateException {
-   if (instance == null) {
-      instance = new CreateXMLSignatureResponseValidator();
-    }
-    return instance;
-  } 
-  
-  
-  /**
-   * The Method validate is used for validating an explicit {@link CreateXMLSignatureResponse}
-   * @param createXMLSignatureResponse
-   * @param session
-   * @throws ValidateException
-   */
-  public void validate(CreateXMLSignatureResponse createXMLSignatureResponse, AuthenticationSession session)
-   throws ValidateException {
-      
-      // A3.056: more then one /saml:Assertion/saml:AttributeStatement/saml:Subject/saml:NameIdentifier
-    
-    String gbTarget = session.getTarget();
-    String oaURL = session.getPublicOAURLPrefix(); 
-    boolean businessService = session.getBusinessService();
-    
-    IdentityLink identityLink = session.getIdentityLink();
-    
-    Element samlAssertion = createXMLSignatureResponse.getSamlAssertion(); 
-    String issuer = samlAssertion.getAttribute("Issuer");
-    if (issuer == null) {
-      // should not happen, because parser would dedect this
-      throw new ValidateException("validator.32", null);
-    }
-    // replace ' in name with &#39;
-    issuer = issuer.replaceAll("'", "&#39;");
-    
-    String issueInstant = samlAssertion.getAttribute("IssueInstant");
-    if (!issueInstant.equals(session.getIssueInstant())) {
-      throw new ValidateException("validator.39", new Object[] {issueInstant, session.getIssueInstant()});
-    }
-    
-    String name = identityLink.getName();
-    
-    if (!issuer.equals(name)) {
-      throw new ValidateException("validator.33", new Object[] {issuer, name});
-    }     
-       
-    SAMLAttribute[] samlAttributes = createXMLSignatureResponse.getSamlAttributes();
-
-    boolean foundOA = false;
-    boolean foundGB = false;
-    boolean foundWBPK = false;
-    int offset = 0;
-    
-    // check number of SAML aatributes
-    List<ExtendedSAMLAttribute> extendedSAMLAttributes = session.getExtendedSAMLAttributesAUTH();
-    int extendedSAMLAttributesNum = 0;
-    if (extendedSAMLAttributes != null) {
-      extendedSAMLAttributesNum = extendedSAMLAttributes.size();
-    }
-    int expectedSAMLAttributeNumber = 
-      AuthenticationBlockAssertionBuilder.NUM_OF_SAML_ATTRIBUTES + extendedSAMLAttributesNum;
-    if (!session.getSAMLAttributeGebeORwbpk()) expectedSAMLAttributeNumber--;
-    int actualSAMLAttributeNumber = samlAttributes.length;
-    if (actualSAMLAttributeNumber != expectedSAMLAttributeNumber) {
-      Logger.error("Wrong number of SAML attributes in CreateXMLSignatureResponse: expected " + 
-        expectedSAMLAttributeNumber + ", but was " + actualSAMLAttributeNumber);
-      throw new ValidateException(
-        "validator.36", 
-        new Object[] {String.valueOf(actualSAMLAttributeNumber), String.valueOf(expectedSAMLAttributeNumber)});
-    }
-    
-    SAMLAttribute samlAttribute;
-    if (session.getSAMLAttributeGebeORwbpk()) {
-      // check the first attribute ("Geschaeftsbereich" or "wbPK")
-      samlAttribute = samlAttributes[0];
-      if (businessService) {
-        if (!samlAttribute.getName().equals("wbPK")) {
-          if (samlAttribute.getName().equals("Geschaeftsbereich")) {
-            throw new ValidateException("validator.26", null);
-          } else {
-            throw new ValidateException(
-            "validator.37", 
-            new Object[] {samlAttribute.getName(), "wbPK", String.valueOf(1)});
-          }
-        }          
-        if (samlAttribute.getNamespace().equals("http://reference.e-government.gv.at/namespace/moa/20020822#")) {          
-          foundWBPK = true;
-          try {
-            Element attrValue = (Element)samlAttribute.getValue();
-            String value = ((Element)attrValue.getElementsByTagNameNS(Constants.PD_NS_URI, "Value").item(0)).getFirstChild().getNodeValue();
-            String type =  ((Element)attrValue.getElementsByTagNameNS(Constants.PD_NS_URI, "Type").item(0)).getFirstChild().getNodeValue();
-            if (!value.equals(identityLink.getIdentificationValue())) {
-              throw new ValidateException("validator.28", null); 
-            }
-            if (!type.equals(identityLink.getIdentificationType())) {
-              throw new ValidateException("validator.28", null); 
-            }
-          } catch (Exception ex) {
-            throw new ValidateException("validator.29", null);
-          }
-        } else {
-          throw new ValidateException("validator.30", null);
-        }    
-      } else {
-        if (!samlAttribute.getName().equals("Geschaeftsbereich")) {
-          if (samlAttribute.getName().equals("wbPK")) {
-            throw new ValidateException("validator.26", null);
-          } else {
-            throw new ValidateException(
-            "validator.37", 
-            new Object[] {samlAttribute.getName(), "Geschaeftsbereich", String.valueOf(1)});
-          }
-        }
-        if (samlAttribute.getNamespace().equals("http://reference.e-government.gv.at/namespace/moa/20020822#")) {          
-          foundGB = true;
-          String targetFriendlyName = session.getTargetFriendlyName();
-          String sectorName = TargetToSectorNameMapper.getSectorNameViaTarget(gbTarget);
-          if (StringUtils.isEmpty(sectorName)) {
-        	  if (targetFriendlyName != null)
-        		  sectorName = targetFriendlyName; 
-          }
-          gbTarget = gbTarget + " (" + sectorName + ")";
-          //gbTarget = gbTarget + " (" + TargetToSectorNameMapper.getSectorNameViaTarget(gbTarget) + ")";
-
-          if (!gbTarget.equals((String)samlAttribute.getValue())) {
-            throw new ValidateException("validator.13", null); 
-          }             
-        } else {
-          throw new ValidateException("validator.12", null);
-        }
-      }
-    } else {
-      offset--;
-    }
-
-    // check the second attribute (must be "OA")
-    samlAttribute = samlAttributes[1 + offset];
-    if (!samlAttribute.getName().equals("OA")) {
-      throw new ValidateException(
-          "validator.37", 
-          new Object[] {samlAttribute.getName(), "OA", String.valueOf(2)});
-    }
-    if (samlAttribute.getNamespace().equals("http://reference.e-government.gv.at/namespace/moa/20020822#")) {
-      foundOA = true;            
-      if (!oaURL.equals((String)samlAttribute.getValue())) {  // CHECKS für die AttributeVALUES fehlen noch             
-        throw new ValidateException("validator.16", new Object[] {":gefunden wurde '" + oaURL + "', erwartet wurde '" + samlAttribute.getValue()}); 
-      }             
-    } else {
-      throw new ValidateException("validator.15", null);
-    }
-      
-    // check the third attribute (must be "Geburtsdatum")
-    samlAttribute = samlAttributes[2 + offset];
-    if (!samlAttribute.getName().equals("Geburtsdatum")) {
-      throw new ValidateException(
-          "validator.37", 
-          new Object[] {samlAttribute.getName(), "Geburtsdatum", String.valueOf(3)});
-    }
-    if (samlAttribute.getNamespace().equals("http://reference.e-government.gv.at/namespace/moa/20020822#")) {
-      String samlDateOfBirth = (String)samlAttribute.getValue();
-      String dateOfBirth = identityLink.getDateOfBirth();
-      if (!samlDateOfBirth.equals(dateOfBirth)) {
-        throw new ValidateException("validator.34", new Object[] {samlDateOfBirth, dateOfBirth});
-      }
-    } else {
-      throw new ValidateException("validator.35", null);
-    }
-     
-    // check four attribute could be a special text
-    samlAttribute = samlAttributes[3 + offset];
-    if (!samlAttribute.getName().equals("SpecialText")) {
-      throw new ValidateException(
-          "validator.37", 
-          new Object[] {samlAttribute.getName(), "SpecialText", String.valueOf(4)});
-    }
-    if (samlAttribute.getNamespace().equals("http://reference.e-government.gv.at/namespace/moa/20020822#")) {
-      String samlSpecialText = (String)samlAttribute.getValue();
-      samlSpecialText = samlSpecialText.replaceAll("'", "&#39;");
-      
-      String text = "";
-      try {
-		OAAuthParameter oaparam = AuthConfigurationProviderFactory.getInstance().getOnlineApplicationParameter(session.getPublicOAURLPrefix());
-		if (MiscUtil.isNotEmpty(oaparam.getAditionalAuthBlockText())) {
-			Logger.info("Use addional AuthBlock Text from OA=" + oaparam.getPublicURLPrefix());
-			text = oaparam.getAditionalAuthBlockText();
-		}
-      } catch (ConfigurationException e) {
-    	  Logger.warn("Addional AuthBlock Text can not loaded from OA!", e);
-      }
-      
-      
-      String specialText = AuthenticationBlockAssertionBuilder.generateSpecialText(text, issuer, identityLink.getDateOfBirth(), issueInstant);
-      if (!samlSpecialText.equals(specialText)) {
-        throw new ValidateException("validator.67", new Object[] {samlSpecialText, specialText});
-      }
-    } else {
-      throw new ValidateException("validator.35", null);
-    }
-    
-    
-    //check unique AuthBlock tokken
-    samlAttribute = samlAttributes[4 + offset];
-    if (!samlAttribute.getName().equals("UniqueTokken")) {
-      throw new ValidateException(
-          "validator.37", 
-          new Object[] {samlAttribute.getName(), "UniqueTokken", String.valueOf(5)});
-    }
-    if (samlAttribute.getNamespace().equals("http://reference.e-government.gv.at/namespace/moa/20020822#")) {
-      String uniquetokken = (String)samlAttribute.getValue();
-           
-      if (!uniquetokken.equals(session.getAuthBlockTokken())) {
-        throw new ValidateException("validator.70", new Object[] {uniquetokken, session.getAuthBlockTokken()});
-      }
-    } else {
-      throw new ValidateException("validator.35", null);
-    }
-    
-    
-    // now check the extended SAML attributes
-    int i = AuthenticationBlockAssertionBuilder.NUM_OF_SAML_ATTRIBUTES + offset;
-    if (extendedSAMLAttributes != null) {
-      Iterator<ExtendedSAMLAttribute> it = extendedSAMLAttributes.iterator();
-      while (it.hasNext()) {
-        ExtendedSAMLAttribute extendedSAMLAttribute = (ExtendedSAMLAttribute)it.next();
-        samlAttribute = samlAttributes[i];
-        String actualName = samlAttribute.getName();
-        String expectedName = extendedSAMLAttribute.getName();
-        if (!actualName.equals(expectedName)) {
-          throw new ValidateException(
-            "validator.38", 
-            new Object[] {"Name", String.valueOf((i+1)), actualName, actualName, expectedName });
-        }
-        String actualNamespace = samlAttribute.getNamespace();
-        String expectedNamespace = extendedSAMLAttribute.getNameSpace();
-        if (!actualNamespace.equals(expectedNamespace)) {
-          throw new ValidateException(
-            "validator.38", 
-            new Object[] {"Namespace", String.valueOf((i+1)), actualName, actualNamespace, expectedNamespace, });
-        }
-        Object expectedValue = extendedSAMLAttribute.getValue();
-        Object actualValue = samlAttribute.getValue();
-        try {
-          if (expectedValue instanceof String) {
-            // replace \r\n because text might be base64-encoded
-            String expValue = StringUtils.replaceAll((String)expectedValue,"\r","");
-            expValue = StringUtils.replaceAll(expValue,"\n","");
-            String actValue = StringUtils.replaceAll((String)actualValue,"\r","");
-            actValue = StringUtils.replaceAll(actValue,"\n","");
-            if (!expValue.equals(actValue)) {
-              throw new ValidateException(
-              "validator.38", 
-              new Object[] {"Wert", String.valueOf((i+1)), actualName, actualValue, expectedValue });          
-            }
-          } else if (expectedValue instanceof Element) {
-            // only check the name of the element
-            String actualElementName = ((Element)actualValue).getNodeName();
-            String expectedElementName = ((Element)expectedValue).getNodeName();
-            if (!(expectedElementName.equals(actualElementName))){
-              throw new ValidateException(
-              "validator.38", 
-              new Object[] {"Wert", String.valueOf((i+1)), actualName, actualElementName, expectedElementName});          
-            }
-          } else {
-            // should not happen
-            throw new ValidateException(
-              "validator.38", 
-              new Object[] {"Typ", String.valueOf((i+1)), expectedName, "java.lang.String oder org.wrc.dom.Element", expectedValue.getClass().getName()});
-          }
-        } catch (ClassCastException e) {
-          throw new ValidateException(
-              "validator.38", 
-              new Object[] {"Typ", String.valueOf((i+1)), expectedName, expectedValue.getClass().getName(), actualValue.getClass().getName()});
-        }
-        i++;
-      }
-    }
-    
-    
-    if (!foundOA) throw new ValidateException("validator.14", null); 
-    if (businessService) {
-      if (session.getSAMLAttributeGebeORwbpk() && !foundWBPK) throw new ValidateException("validator.31", null);
-    } else {
-      if (!foundGB) throw new ValidateException("validator.11", null);
-    }
-  
-     //Check if dsig:Signature exists
-//    NodeList nl = createXMLSignatureResponse.getSamlAssertion().getElementsByTagNameNS(Constants.DSIG_NS_URI, "Signature");
-//    if (nl.getLength() != 1) {
-//      throw new ValidateException("validator.05", null);
-//    }
-    Element dsigSignature = (Element) XPathUtils.selectSingleNode(samlAssertion, SIGNATURE_XPATH);
-    if (dsigSignature == null) {    
-      throw new ValidateException("validator.05", new Object[] {"im AUTHBlock"}) ;
-    }
-  }
-  
-  /**
-   * The Method validate is used for validating an explicit {@link CreateXMLSignatureResponse}
-   * @param createXMLSignatureResponse
-   * @param session
-   * @throws ValidateException
-   */
-  public void validateSSO(CreateXMLSignatureResponse createXMLSignatureResponse, AuthenticationSession session)
-   throws ValidateException {
-      
-      // A3.056: more then one /saml:Assertion/saml:AttributeStatement/saml:Subject/saml:NameIdentifier
-    
-	String oaURL;
-    try {
-		oaURL = AuthConfigurationProviderFactory.getInstance().getPublicURLPrefix();
-	} catch (ConfigurationException e1) {
-		oaURL = new String();
-	} 
-    
-    IdentityLink identityLink = session.getIdentityLink();
-    
-    Element samlAssertion = createXMLSignatureResponse.getSamlAssertion(); 
-    String issuer = samlAssertion.getAttribute("Issuer");
-    if (issuer == null) {
-      // should not happen, because parser would dedect this
-      throw new ValidateException("validator.32", null);
-    }
-    // replace ' in name with &#39;
-    issuer = issuer.replaceAll("'", "&#39;");
-    
-    String issueInstant = samlAssertion.getAttribute("IssueInstant");
-    if (!issueInstant.equals(session.getIssueInstant())) {
-      throw new ValidateException("validator.39", new Object[] {issueInstant, session.getIssueInstant()});
-    }
-    
-    String name = identityLink.getName();
-    
-    if (!issuer.equals(name)) {
-      throw new ValidateException("validator.33", new Object[] {issuer, name});
-    }     
-       
-    SAMLAttribute[] samlAttributes = createXMLSignatureResponse.getSamlAttributes();
-
-    boolean foundOA = false;
-//    boolean foundGB = false;
-//    boolean foundWBPK = false;
-    int offset = 0;
-    
-    // check number of SAML aatributes
-    List<ExtendedSAMLAttribute> extendedSAMLAttributes = session.getExtendedSAMLAttributesAUTH();
-    int extendedSAMLAttributesNum = 0;
-    if (extendedSAMLAttributes != null) {
-      extendedSAMLAttributesNum = extendedSAMLAttributes.size();
-    }
-    int expectedSAMLAttributeNumber = 
-      AuthenticationBlockAssertionBuilder.NUM_OF_SAML_ATTRIBUTES_SSO + extendedSAMLAttributesNum;
-    if (!session.getSAMLAttributeGebeORwbpk()) expectedSAMLAttributeNumber--;
-    int actualSAMLAttributeNumber = samlAttributes.length;
-    if (actualSAMLAttributeNumber != expectedSAMLAttributeNumber) {
-      Logger.error("Wrong number of SAML attributes in CreateXMLSignatureResponse: expected " + 
-        expectedSAMLAttributeNumber + ", but was " + actualSAMLAttributeNumber);
-      throw new ValidateException(
-        "validator.36", 
-        new Object[] {String.valueOf(actualSAMLAttributeNumber), String.valueOf(expectedSAMLAttributeNumber)});
-    }
-    
-    SAMLAttribute samlAttribute;
-    if (!session.getSAMLAttributeGebeORwbpk()) {
-      offset--;
-    }
-
-    // check the first attribute (must be "OA")
-    samlAttribute = samlAttributes[0 + offset];
-    if (!samlAttribute.getName().equals("OA")) {
-      throw new ValidateException(
-          "validator.37", 
-          new Object[] {samlAttribute.getName(), "OA", String.valueOf(2)});
-    }
-    if (samlAttribute.getNamespace().equals("http://reference.e-government.gv.at/namespace/moa/20020822#")) {
-      foundOA = true;            
-      if (!oaURL.equals((String)samlAttribute.getValue())) {  // CHECKS für die AttributeVALUES fehlen noch             
-        throw new ValidateException("validator.16", new Object[] {":gefunden wurde '" + oaURL + "', erwartet wurde '" + samlAttribute.getValue()}); 
-      }             
-    } else {
-      throw new ValidateException("validator.15", null);
-    }
-      
-    // check the third attribute (must be "Geburtsdatum")
-    samlAttribute = samlAttributes[1 + offset];
-    if (!samlAttribute.getName().equals("Geburtsdatum")) {
-      throw new ValidateException(
-          "validator.37", 
-          new Object[] {samlAttribute.getName(), "Geburtsdatum", String.valueOf(3)});
-    }
-    if (samlAttribute.getNamespace().equals("http://reference.e-government.gv.at/namespace/moa/20020822#")) {
-      String samlDateOfBirth = (String)samlAttribute.getValue();
-      String dateOfBirth = identityLink.getDateOfBirth();
-      if (!samlDateOfBirth.equals(dateOfBirth)) {
-        throw new ValidateException("validator.34", new Object[] {samlDateOfBirth, dateOfBirth});
-      }
-    } else {
-      throw new ValidateException("validator.35", null);
-    }
-     
-    // check four attribute could be a special text
-    samlAttribute = samlAttributes[2 + offset];
-    if (!samlAttribute.getName().equals("SpecialText")) {
-      throw new ValidateException(
-          "validator.37", 
-          new Object[] {samlAttribute.getName(), "SpecialText", String.valueOf(4)});
-    }
-    if (samlAttribute.getNamespace().equals("http://reference.e-government.gv.at/namespace/moa/20020822#")) {
-      String samlSpecialText = (String)samlAttribute.getValue();
-      samlSpecialText = samlSpecialText.replaceAll("'", "&#39;");
-      
-      String text = "";
-      try {
-    	 if (MiscUtil.isNotEmpty(AuthConfigurationProviderFactory.getInstance().getSSOSpecialText())) {
-    		text = AuthConfigurationProviderFactory.getInstance().getSSOSpecialText();
-			Logger.info("Use addional AuthBlock Text from SSO=" +text);
-			
-    	 }
-		else
-			text = new String();
-      } catch (ConfigurationException e) {
-    	  Logger.warn("Addional AuthBlock Text can not loaded from SSO!", e);
-      }
-      
-      
-      	String specialText = AuthenticationBlockAssertionBuilder.generateSpecialText(text, issuer, identityLink.getDateOfBirth(), issueInstant);
-      	if (!samlSpecialText.equals(specialText)) {
-      		throw new ValidateException("validator.67", new Object[] {samlSpecialText, specialText});
-      	}
-    } else {
-      throw new ValidateException("validator.35", null);
-    }
-    
-    //check unique AuthBlock tokken
-    samlAttribute = samlAttributes[3 + offset];
-    if (!samlAttribute.getName().equals("UniqueTokken")) {
-      throw new ValidateException(
-          "validator.37", 
-          new Object[] {samlAttribute.getName(), "UniqueTokken", String.valueOf(5)});
-    }
-    if (samlAttribute.getNamespace().equals("http://reference.e-government.gv.at/namespace/moa/20020822#")) {
-      String uniquetokken = (String)samlAttribute.getValue();
-           
-      if (!uniquetokken.equals(session.getAuthBlockTokken())) {
-        throw new ValidateException("validator.70", new Object[] {uniquetokken, session.getAuthBlockTokken()});
-      }
-    } else {
-      throw new ValidateException("validator.35", null);
-    }
-    
-    
-    // now check the extended SAML attributes
-    int i = AuthenticationBlockAssertionBuilder.NUM_OF_SAML_ATTRIBUTES_SSO + offset;
-    if (extendedSAMLAttributes != null) {
-      Iterator<ExtendedSAMLAttribute> it = extendedSAMLAttributes.iterator();
-      while (it.hasNext()) {
-        ExtendedSAMLAttribute extendedSAMLAttribute = (ExtendedSAMLAttribute)it.next();
-        samlAttribute = samlAttributes[i];
-        String actualName = samlAttribute.getName();
-        String expectedName = extendedSAMLAttribute.getName();
-        if (!actualName.equals(expectedName)) {
-          throw new ValidateException(
-            "validator.38", 
-            new Object[] {"Name", String.valueOf((i+1)), actualName, actualName, expectedName });
-        }
-        String actualNamespace = samlAttribute.getNamespace();
-        String expectedNamespace = extendedSAMLAttribute.getNameSpace();
-        if (!actualNamespace.equals(expectedNamespace)) {
-          throw new ValidateException(
-            "validator.38", 
-            new Object[] {"Namespace", String.valueOf((i+1)), actualName, actualNamespace, expectedNamespace, });
-        }
-        Object expectedValue = extendedSAMLAttribute.getValue();
-        Object actualValue = samlAttribute.getValue();
-        try {
-          if (expectedValue instanceof String) {
-            // replace \r\n because text might be base64-encoded
-            String expValue = StringUtils.replaceAll((String)expectedValue,"\r","");
-            expValue = StringUtils.replaceAll(expValue,"\n","");
-            String actValue = StringUtils.replaceAll((String)actualValue,"\r","");
-            actValue = StringUtils.replaceAll(actValue,"\n","");
-            if (!expValue.equals(actValue)) {
-              throw new ValidateException(
-              "validator.38", 
-              new Object[] {"Wert", String.valueOf((i+1)), actualName, actualValue, expectedValue });          
-            }
-          } else if (expectedValue instanceof Element) {
-            // only check the name of the element
-            String actualElementName = ((Element)actualValue).getNodeName();
-            String expectedElementName = ((Element)expectedValue).getNodeName();
-            if (!(expectedElementName.equals(actualElementName))){
-              throw new ValidateException(
-              "validator.38", 
-              new Object[] {"Wert", String.valueOf((i+1)), actualName, actualElementName, expectedElementName});          
-            }
-          } else {
-            // should not happen
-            throw new ValidateException(
-              "validator.38", 
-              new Object[] {"Typ", String.valueOf((i+1)), expectedName, "java.lang.String oder org.wrc.dom.Element", expectedValue.getClass().getName()});
-          }
-        } catch (ClassCastException e) {
-          throw new ValidateException(
-              "validator.38", 
-              new Object[] {"Typ", String.valueOf((i+1)), expectedName, expectedValue.getClass().getName(), actualValue.getClass().getName()});
-        }
-        i++;
-      }
-    }
-    
-    
-    if (!foundOA) throw new ValidateException("validator.14", null); 
-  
-     //Check if dsig:Signature exists
-//    NodeList nl = createXMLSignatureResponse.getSamlAssertion().getElementsByTagNameNS(Constants.DSIG_NS_URI, "Signature");
-//    if (nl.getLength() != 1) {
-//      throw new ValidateException("validator.05", null);
-//    }
-    Element dsigSignature = (Element) XPathUtils.selectSingleNode(samlAssertion, SIGNATURE_XPATH);
-    if (dsigSignature == null) {    
-      throw new ValidateException("validator.05", new Object[] {"im AUTHBlock"}) ;
-    }
-  }
-  
-  public void validateSigningDateTime( CreateXMLSignatureResponse csresp) throws ValidateException {
-	
-	  Element dsigSignatureElement = csresp.getDsigSignature();
-	  if (dsigSignatureElement == null) {
-		  throw new ValidateException("validator.05", new Object[] {"im AUTHBlock"}) ;
-	  }
-	  else {
-		  Element signingTimeElem = (Element) XPathUtils.selectSingleNode(dsigSignatureElement, NS_CONTEXT, XADES_1_1_1_SIGNINGTIME_PATH);
-		  if (signingTimeElem == null) {
-			  signingTimeElem = (Element) XPathUtils.selectSingleNode(dsigSignatureElement, NS_CONTEXT, XADES_1_3_2_SIGNINGTIME_PATH);
-			  if (signingTimeElem == null)
-				  throw new ValidateException("validator.68", null) ;
-		  }
-			  
-			  
-		  String signingTimeStr = signingTimeElem.getTextContent();
-		  if (signingTimeStr == null)
-			  throw new ValidateException("validator.68", null) ;
-			  
-		  Calendar signingTimeCal = DatatypeConverter.parseDate(signingTimeStr);
-		  Calendar serverTimeCal = new GregorianCalendar();
-		  
-		  long diff = Math.abs(signingTimeCal.getTimeInMillis() - serverTimeCal.getTimeInMillis());
-		  
-		  if (diff > MAX_DIFFERENCE_IN_MILLISECONDS)
-			  throw new ValidateException("validator.69", new Object[] {"mehr als " + MAX_DIFFERENCE_IN_MILLISECONDS + " Millisekunden"}) ;
-
-		  Logger.debug("Compare \"" + signingTimeCal.getTime() + "\" (SigningTime) with \"" + serverTimeCal.getTime() + "\" (server time)");
-			
-		  
-	  }
-		  
-  }
-  
-}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/IdentityLinkValidator.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/IdentityLinkValidator.java
deleted file mode 100644
index fa6486afe..000000000
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/IdentityLinkValidator.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Federal Chancellery Austria
- * MOA-ID has been developed in a cooperation between BRZ, the Federal
- * Chancellery Austria - ICT staff unit, and Graz University of Technology.
- * 
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * http://www.osor.eu/eupl/
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- * 
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- ******************************************************************************/
-/*
- * Copyright 2003 Federal Chancellery Austria
- * MOA-ID has been developed in a cooperation between BRZ, the Federal
- * Chancellery Austria - ICT staff unit, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * http://www.osor.eu/eupl/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- */
-
-
-package at.gv.egovernment.moa.id.auth.validator;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-import at.gv.egovernment.moa.id.auth.data.IdentityLink;
-import at.gv.egovernment.moa.id.auth.exception.ValidateException;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.XPathUtils;
-
-/**
- * This class is used to validate an {@link IdentityLink} 
- * returned by the security layer
- * 
- * @author Stefan Knirsch
- * @version $Id$
- */
-public class IdentityLinkValidator implements Constants {
-
-  //
-  // XPath namespace prefix shortcuts
-  //
-  /** Xpath prefix for reaching PersonData Namespaces */
-  private static final String PDATA = PD_PREFIX + ":";
-  /** Xpath prefix for reaching SAML Namespaces */
-  private static final String SAML = SAML_PREFIX + ":";
-  /** Xpath prefix for reaching XML-DSIG Namespaces */
-  private static final String DSIG = DSIG_PREFIX + ":";
-  /** Xpath prefix for reaching ECDSA Namespaces */
-  private static final String ECDSA = ECDSA_PREFIX + ":";
-  /** Xpath expression to the root element */
-  private static final String ROOT = "";
-  /** Xpath expression to the SAML:SubjectConfirmationData element */
-  private static final String SAML_SUBJECT_CONFIRMATION_DATA_XPATH =
-    ROOT
-      + SAML
-      + "AttributeStatement/"
-      + SAML
-      + "Subject/"
-      + SAML
-      + "SubjectConfirmation/"
-      + SAML
-      + "SubjectConfirmationData";
-/** Xpath expression to the PersonData:Person element */
-  private static final String PERSON_XPATH =
-    SAML_SUBJECT_CONFIRMATION_DATA_XPATH + "/" + PDATA + "Person";
-  /** Xpath expression to the SAML:Attribute element */
-  private static final String ATTRIBUTE_XPATH =
-    ROOT + SAML + "AttributeStatement/" + SAML + "Attribute";
-//  /** Xpath expression to the SAML:AttributeName attribute */
-//  private static final String ATTRIBUTE_NAME_XPATH =
-//    ROOT + SAML + "AttributeStatement/" + SAML + "Attribute/@AttributeName";
-//  /** Xpath expression to the SAML:AttributeNamespace attribute */
-//  private static final String ATTRIBUTE_NAMESPACE_XPATH =
-//    ROOT
-//      + SAML
-//      + "AttributeStatement/"
-//      + SAML
-//      + "Attribute/@AttributeNamespace";
-//  /** Xpath expression to the SAML:AttributeValue element */
-//  private static final String ATTRIBUTE_VALUE_XPATH =
-//    ROOT
-//      + SAML
-//      + "AttributeStatement/"
-//      + SAML
-//      + "Attribute/"
-//      + SAML
-//      + "AttributeValue";
-
-  /** Singleton instance. <code>null</code>, if none has been created. */
-  private static IdentityLinkValidator instance;
-
-  /**
-   * Constructor for a singleton IdentityLinkValidator.
-   * @return a new IdentityLinkValidator instance
-   * @throws ValidateException if no instance can be created
-   */
-  public static synchronized IdentityLinkValidator getInstance()
-    throws ValidateException {
-    if (instance == null) {
-      instance = new IdentityLinkValidator();
-    }
-    return instance;
-  }
-
-  /**
-   * Method validate. Validates the {@link IdentityLink} 
-   * @param identityLink The identityLink to validate
-   * @throws ValidateException on any validation error
-   */
-  public void validate(IdentityLink identityLink) throws ValidateException {
-
-    Element samlAssertion = identityLink.getSamlAssertion();
-    //Search the SAML:ASSERTION Object (A2.054)
-    if (samlAssertion == null) {
-      throw new ValidateException("validator.00", null);
-    }
-
-    // Check how many saml:Assertion/saml:AttributeStatement/
-    //      saml:Subject/ saml:SubjectConfirmation/
-    //      saml:SubjectConfirmationData/pr:Person of type
-    //      PhysicalPersonType exist (A2.056)
-    NodeList nl = XPathUtils.selectNodeList(samlAssertion, PERSON_XPATH);
-    // If we have just one Person-Element we don't need to check the attributes
-    int counterPhysicalPersonType = 0;
-    if (nl.getLength() > 1)
-      for (int i = 0; i < nl.getLength(); i++) {
-        String xsiType =
-          ((Element) nl.item(i))
-            .getAttributeNodeNS(
-              "http://www.w3.org/2001/XMLSchema-instance",
-              "type")
-            .getNodeValue();
-        // We have to check if xsiType contains "PhysicalPersonType"
-        // An equal-check will fail because of the Namespace-prefix of the attribute value
-        if (xsiType.indexOf("PhysicalPersonType") > -1)
-          counterPhysicalPersonType++;
-      }
-    if (counterPhysicalPersonType > 1)
-      throw new ValidateException("validator.01", null);
-
-    //Check the SAML:ATTRIBUTES
-    nl = XPathUtils.selectNodeList(samlAssertion, ATTRIBUTE_XPATH);
-    for (int i = 0; i < nl.getLength(); i++) {
-      String attributeName =
-        XPathUtils.getAttributeValue(
-          (Element) nl.item(i),
-          "@AttributeName",
-          null);
-      String attributeNS =
-        XPathUtils.getAttributeValue(
-          (Element) nl.item(i),
-          "@AttributeNamespace",
-          null);
-      if (attributeName.equals("CitizenPublicKey")) {
-                
-        if (attributeNS.equals("http://www.buergerkarte.at/namespaces/personenbindung/20020506#") ||
-            attributeNS.equals("urn:publicid:gv.at:namespaces:identitylink:1.2")) {
-          Element attributeValue = 
-              (Element) XPathUtils.selectSingleNode((Element) nl.item(i),nSMap, SAML + "AttributeValue/" + DSIG + "RSAKeyValue");          
-           if (attributeValue==null) 
-             attributeValue = 
-               (Element) XPathUtils.selectSingleNode((Element)nl.item(i), nSMap, SAML + "AttributeValue/" + ECDSA + "ECDSAKeyValue");
-           if (attributeValue==null) 
-               attributeValue = 
-                 (Element) XPathUtils.selectSingleNode((Element)nl.item(i), nSMap, SAML + "AttributeValue/" + DSIG + "DSAKeyValue");
-           if (attributeValue == null)
-            throw new ValidateException("validator.02", null);
-                      
-        }
-        else
-          throw new ValidateException("validator.03", new Object [] {attributeNS} );
-      }
-      else
-        throw new ValidateException("validator.04", new Object [] {attributeName} );
-    }
-    
-    //Check if dsig:Signature exists
-     Element dsigSignature = (Element) XPathUtils.selectSingleNode(samlAssertion,ROOT + DSIG + "Signature");
-     if (dsigSignature==null) throw new ValidateException("validator.05", new Object[] {"in der Personenbindung"});
-  }
-
-}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/InfoboxValidator.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/InfoboxValidator.java
deleted file mode 100644
index e6e2539c9..000000000
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/InfoboxValidator.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Federal Chancellery Austria
- * MOA-ID has been developed in a cooperation between BRZ, the Federal
- * Chancellery Austria - ICT staff unit, and Graz University of Technology.
- * 
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * http://www.osor.eu/eupl/
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- * 
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- ******************************************************************************/
-/*
- * Copyright 2003 Federal Chancellery Austria
- * MOA-ID has been developed in a cooperation between BRZ, the Federal
- * Chancellery Austria - ICT staff unit, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * http://www.osor.eu/eupl/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- */
-
-
-package at.gv.egovernment.moa.id.auth.validator;
-
-import java.util.Map;
-
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.id.auth.data.InfoboxValidationResult;
-import at.gv.egovernment.moa.id.auth.data.InfoboxValidatorParams;
-import at.gv.egovernment.moa.id.auth.exception.ValidateException;
-
-/**
- * Validates an InfoboxReadResponse.
- * An implementing class has to validate the content of the InfoboxReadResponse  
- * according to the type specific rules and guidelines of the underlying 
- * application.
- */
-public interface InfoboxValidator {
-  
-  /**
-   * This method validates an InfoboxReadResponse.
-   * The method validates the content of the passed <code>infoboxReadResponse</code>
-   * according to the type specific rules and guidelines of the underlying
-   * application.
-   *
-   * @param params {@link at.gv.egovernment.moa.id.auth.data.InfoboxValidatorParams
-   *                Parameters} needed by the validator.
-   * 
-   * @return InfoboxValidationResult structure (@link at.gv.egovernment.moa.id.auth.data.InfoboxValidationResult}
-   *                            
-   * @throws ValidateException  If an error occurs on validating the 
-   *                            InfoboxReadResponse.
-   */
-  public InfoboxValidationResult validate (InfoboxValidatorParams params)
-    throws ValidateException;
-
-  /**
-   * This method is used to do intermediate processing before signing the auth block.
-   * If a infobox validator threw a form to gather user input, this method is used
-   * to validate this input. In no further input is needed the form must be empty to 
-   * proceed, and also a valid <code>InfoboxValidationResult</code> is necessary.
-   * If more input is needed, the validator can build a new form and it is then shown 
-   * to the citizen. 
-   * The implementation of <code>InfoboxValidator</code> must hold its necessary 
-   * data and configuration internally, if this method is called - the class is 
-   * reused at this call
-   *
-   * @param parameters the parameters got returned by the input fields
-   * 
-   * @return InfoboxValidationResult structure (@link at.gv.egovernment.moa.id.auth.data.InfoboxValidationResult}
-   *                            
-   * @throws ValidateException  If an error occurs on validating the 
-   *                            InfoboxReadResponse.
-   */
-  public InfoboxValidationResult validate (Map parameters)
-    throws ValidateException;
-
-  /**
-   * This method is used to do post processing after signing the auth block.
-   * The method validates the content of the <code>infoboxReadResponse</code 
-   * against the passed <code>samlAssertion</code> if needed.
-   * The implementation of <code>InfoboxValidator</code> must hold its necessary 
-   * data and configuration internally, if this method is called - the class is 
-   * reused at this call
-   *
-   * @param samlAssertion the SAML assertion needed by the validator
-   * 
-   * @return InfoboxValidationResult structure (@link at.gv.egovernment.moa.id.auth.data.InfoboxValidationResult}
-   *                            
-   * @throws ValidateException  If an error occurs on validating the 
-   *                            InfoboxReadResponse.
-   */
-  public InfoboxValidationResult validate (Element samlAssertion)
-    throws ValidateException;
-  
-  /**
-   * form for user interaction for intermediate processing of infobox validation
-   * 
-   * @return answer form of the servlet request.
-   */
-  public String getForm();
-  
-}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java
deleted file mode 100644
index ac528c89d..000000000
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Federal Chancellery Austria
- * MOA-ID has been developed in a cooperation between BRZ, the Federal
- * Chancellery Austria - ICT staff unit, and Graz University of Technology.
- * 
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * http://www.osor.eu/eupl/
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- * 
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- ******************************************************************************/
-/*
- * Copyright 2003 Federal Chancellery Austria
- * MOA-ID has been developed in a cooperation between BRZ, the Federal
- * Chancellery Austria - ICT staff unit, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * http://www.osor.eu/eupl/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- */
-
-
-package at.gv.egovernment.moa.id.auth.validator;
-
-import iaik.asn1.ObjectID;
-import iaik.asn1.structures.Name;
-import iaik.security.ecc.ecdsa.ECPublicKey;
-import iaik.utils.RFC2253NameParserException;
-import iaik.x509.X509Certificate;
-import iaik.x509.X509ExtensionInitException;
-
-import java.security.InvalidKeyException;
-import java.security.PublicKey;
-import java.security.interfaces.RSAPublicKey;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;
-import at.gv.egovernment.moa.id.auth.data.IdentityLink;
-import at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse;
-import at.gv.egovernment.moa.id.auth.exception.ValidateException;
-import at.gv.egovernment.moa.id.config.ConfigurationException;
-import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProviderFactory;
-import at.gv.egovernment.moa.id.config.auth.IOAAuthParameters;
-import at.gv.egovernment.moa.id.util.MOAIDMessageProvider;
-import at.gv.egovernment.moa.logging.Logger;
-
-/**
- * This class is used to validate an {@link VerifyXMLSignatureResponse} 
- * returned by MOA-SPSS
- * 
- * @author Stefan Knirsch
- * @version $Id$
- */
-public class VerifyXMLSignatureResponseValidator {
-  
-  /** Identification string for checking identity link */
-  public static final String CHECK_IDENTITY_LINK = "IdentityLink";
-  /** Identification string for checking authentication block */
-  public static final String CHECK_AUTH_BLOCK = "AuthBlock";
-  
-  /** Singleton instance. <code>null</code>, if none has been created. */
-  private static VerifyXMLSignatureResponseValidator instance;
-
-  /**
-   * Constructor for a singleton VerifyXMLSignatureResponseValidator.
-   */
-  public static synchronized VerifyXMLSignatureResponseValidator getInstance()
-    throws ValidateException {
-    if (instance == null) {
-      instance = new VerifyXMLSignatureResponseValidator();
-    }
-    return instance;
-  }
-
-  /**
-   * Validates a {@link VerifyXMLSignatureResponse} returned by MOA-SPSS. 
-   * 
-   * @param verifyXMLSignatureResponse the <code>&lt;VerifyXMLSignatureResponse&gt;</code>
-   * @param identityLinkSignersSubjectDNNames subject names configured
-   * @param whatToCheck is used to identify whether the identityLink or the Auth-Block is validated
-   * @param oaParam specifies whether the validation result of the 
-   *                                       manifest has to be ignored (identityLink validation if
-   *                                       the OA is a business service) or not
-   * @throws ValidateException on any validation error
- * @throws ConfigurationException 
-   */
-  public void validate(VerifyXMLSignatureResponse verifyXMLSignatureResponse,
-                       List<String> identityLinkSignersSubjectDNNames, 
-                       String whatToCheck,
-                       IOAAuthParameters oaParam)
-    throws ValidateException, ConfigurationException {
-
-    if (verifyXMLSignatureResponse.getSignatureCheckCode() != 0)
-      throw new ValidateException("validator.06", null);
-      
-    if (verifyXMLSignatureResponse.getCertificateCheckCode() != 0) {
-			String checkFailedReason ="";
-			if (verifyXMLSignatureResponse.getCertificateCheckCode() == 1) 
-				checkFailedReason = MOAIDMessageProvider.getInstance().getMessage("validator.21", null);
-			if (verifyXMLSignatureResponse.getCertificateCheckCode() == 2) 
-				checkFailedReason = MOAIDMessageProvider.getInstance().getMessage("validator.22", null);
-			if (verifyXMLSignatureResponse.getCertificateCheckCode() == 3) 
-				checkFailedReason = MOAIDMessageProvider.getInstance().getMessage("validator.23", null);
-			if (verifyXMLSignatureResponse.getCertificateCheckCode() == 4) 
-				checkFailedReason = MOAIDMessageProvider.getInstance().getMessage("validator.24", null);
-			if (verifyXMLSignatureResponse.getCertificateCheckCode() == 5) 
-				checkFailedReason = MOAIDMessageProvider.getInstance().getMessage("validator.25", null);
-
-//     TEST CARDS
-      if (whatToCheck.equals(CHECK_IDENTITY_LINK))
-        throw new ValidateException("validator.07", new Object[] { checkFailedReason } );
-      else
-        throw new ValidateException("validator.19", new Object[] { checkFailedReason } );
-    }
-    
-    //check QC 
-    if (AuthConfigurationProviderFactory.getInstance().isCertifiacteQCActive() &&
-    		!whatToCheck.equals(CHECK_IDENTITY_LINK) &&
-    		!verifyXMLSignatureResponse.isQualifiedCertificate()) {
-    	    	
-    	//check if testcards are active and certificate has an extension for test credentials
-    	if (oaParam.isTestCredentialEnabled()) {
-        	boolean foundTestCredentialOID = false;
-        	try {
-        		X509Certificate signerCert = verifyXMLSignatureResponse.getX509certificate();
-    		
-        		List<String> validOIDs = new ArrayList<String>();
-        		if (oaParam.getTestCredentialOIDs() != null)
-        			validOIDs.addAll(oaParam.getTestCredentialOIDs());
-        		else
-        			validOIDs.add(MOAIDAuthConstants.TESTCREDENTIALROOTOID);
-    		
-        		Set<String> extentsions = signerCert.getCriticalExtensionOIDs();
-        		extentsions.addAll(signerCert.getNonCriticalExtensionOIDs());
-        		Iterator<String> extit = extentsions.iterator();
-        		while(extit.hasNext()) {
-        			String certOID = extit.next();
-        			for (String el : validOIDs) {
-        				if (certOID.startsWith(el))
-        					foundTestCredentialOID = true;
-        			}    			
-        		}
-        		
-        	} catch (Exception e) {
-        		Logger.warn("Test credential OID extraction FAILED.", e);
-        		
-        	}
-        	//throw Exception if not TestCredentialOID is found
-        	if (!foundTestCredentialOID)
-        		throw new ValidateException("validator.72", null);
-    		
-    	} else    	
-    		throw new ValidateException("validator.71", null);        
-    }
-    
-    // if OA is type is business service the manifest validation result has
-    // to be ignored
-    boolean ignoreManifestValidationResult = false;
-    if (whatToCheck.equals(CHECK_IDENTITY_LINK))    	
-    	ignoreManifestValidationResult = (oaParam.getBusinessService()) ? true
-            : false;
-    
-    if (ignoreManifestValidationResult) {
-      Logger.debug("OA type is business service, thus ignoring DSIG manifest validation result");
-    } else {
-      if (verifyXMLSignatureResponse.isXmlDSIGManigest())
-        if (verifyXMLSignatureResponse.getXmlDSIGManifestCheckCode() != 0)
-          throw new ValidateException("validator.08", null);
-    }
-    
-    
-    // Check the signature manifest only when verifying the signed AUTHBlock
-    if (whatToCheck.equals(CHECK_AUTH_BLOCK)) {
-      if (verifyXMLSignatureResponse.getSignatureManifestCheckCode() > 0) {
-        throw new ValidateException("validator.50", null);
-      }
-    }
-        
-    //Check whether the returned X509 SubjectName is in the MOA-ID configuration or not
-    if (identityLinkSignersSubjectDNNames != null) {
-      String subjectDN = "";
-      X509Certificate x509Cert = verifyXMLSignatureResponse.getX509certificate();
-      try {
-        subjectDN = ((Name) x509Cert.getSubjectDN()).getRFC2253String();
-      }
-      catch (RFC2253NameParserException e) {
-        throw new ValidateException("validator.17", null);
-      }
-      //System.out.println("subjectDN: " + subjectDN);
-      // check the authorisation to sign the identity link
-      if (!identityLinkSignersSubjectDNNames.contains(subjectDN)) {
-        // subject DN check failed, try OID check:
-        try {
-          if (x509Cert.getExtension(MOAIDAuthConstants.IDENTITY_LINK_SIGNER_OID) == null) {
-            throw new ValidateException("validator.18", new Object[] { subjectDN });
-          } else {
-            Logger.debug("Identity link signer cert accepted for signing identity link: " +
-                         "subjectDN check failed, but OID check successfully passed.");
-          }
-        } catch (X509ExtensionInitException e) {
-          throw new ValidateException("validator.49", null);
-        }
-      } else {
-        Logger.debug("Identity link signer cert accepted for signing identity link: " +
-                     "subjectDN check successfully passed.");
-      }
-      
-    }
-  }
-  
-  /**
-   * Method validateCertificate.
-   * @param verifyXMLSignatureResponse The VerifyXMLSignatureResponse
-   * @param idl The Identitylink
-   * @throws ValidateException
-   */
-  public void validateCertificate(
-    VerifyXMLSignatureResponse verifyXMLSignatureResponse,
-    IdentityLink idl)
-    throws ValidateException {
-
-    X509Certificate x509Response = verifyXMLSignatureResponse.getX509certificate();
-    PublicKey[] pubKeysIdentityLink = (PublicKey[]) idl.getPublicKey();
-
-    PublicKey pubKeySignature = x509Response.getPublicKey();
-
-    boolean found = false;
-    for (int i = 0; i < pubKeysIdentityLink.length; i++) {
-      
-      //compare RSAPublicKeys
-      if ((idl.getPublicKey()[i] instanceof java.security.interfaces.RSAPublicKey) &&  
-      		(pubKeySignature instanceof java.security.interfaces.RSAPublicKey)) {
-
-          RSAPublicKey rsaPubKeySignature = (RSAPublicKey) pubKeySignature;
-          RSAPublicKey rsakey = (RSAPublicKey) pubKeysIdentityLink[i];
-          
-          if (rsakey.getModulus().equals(rsaPubKeySignature.getModulus())
-              && rsakey.getPublicExponent().equals(rsaPubKeySignature.getPublicExponent()))
-          found = true;      
-      }
-      
-      //compare ECDSAPublicKeys
-      if( ( (idl.getPublicKey()[i] instanceof java.security.interfaces.ECPublicKey) || 
-    		  (idl.getPublicKey()[i] instanceof iaik.security.ecc.ecdsa.ECPublicKey)) && 
-         ( (pubKeySignature instanceof java.security.interfaces.ECPublicKey) || 
-        		(pubKeySignature instanceof iaik.security.ecc.ecdsa.ECPublicKey) ) ) {
-
-		try {
-			ECPublicKey ecdsaPubKeySignature = new ECPublicKey(pubKeySignature.getEncoded());
-			ECPublicKey ecdsakey = new ECPublicKey(pubKeysIdentityLink[i].getEncoded());
-			
-	        if(ecdsakey.equals(ecdsaPubKeySignature))
-	              found = true;
-			
-		} catch (InvalidKeyException e) {
-			Logger.warn("ECPublicKey can not parsed into a iaik.ECPublicKey", e);
-			throw new ValidateException("validator.09", null);
-		}
-          
-          
-
-      }
-      
-//  		Logger.debug("IDL-Pubkey=" + idl.getPublicKey()[i].getClass().getName()
-//  				+ "  Resp-Pubkey=" + pubKeySignature.getClass().getName());
-      
-    }
-
-    if (!found) {
-       	
-      throw new ValidateException("validator.09", null);
-            
-    }
-  }
-
-}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepUtils.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepUtils.java
deleted file mode 100644
index 0e2251f21..000000000
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepUtils.java
+++ /dev/null
@@ -1,762 +0,0 @@
-/*******************************************************************************

- * Copyright 2014 Federal Chancellery Austria

- * MOA-ID has been developed in a cooperation between BRZ, the Federal

- * Chancellery Austria - ICT staff unit, and Graz University of Technology.

- * 

- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by

- * the European Commission - subsequent versions of the EUPL (the "Licence");

- * You may not use this work except in compliance with the Licence.

- * You may obtain a copy of the Licence at:

- * http://www.osor.eu/eupl/

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the Licence is distributed on an "AS IS" basis,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the Licence for the specific language governing permissions and

- * limitations under the Licence.

- * 

- * This product combines work with different licenses. See the "NOTICE" text

- * file for details on the various modules and licenses.

- * The "NOTICE" text file is part of the distribution. Any derivative works

- * that you distribute must include a readable copy of the "NOTICE" text file.

- ******************************************************************************/

-/*

- * Copyright 2003 Federal Chancellery Austria

- * MOA-ID has been developed in a cooperation between BRZ, the Federal

- * Chancellery Austria - ICT staff unit, and Graz University of Technology.

- *

- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by

- * the European Commission - subsequent versions of the EUPL (the "Licence");

- * You may not use this work except in compliance with the Licence.

- * You may obtain a copy of the Licence at:

- * http://www.osor.eu/eupl/

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the Licence is distributed on an "AS IS" basis,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the Licence for the specific language governing permissions and

- * limitations under the Licence.

- *

- * This product combines work with different licenses. See the "NOTICE" text

- * file for details on the various modules and licenses.

- * The "NOTICE" text file is part of the distribution. Any derivative works

- * that you distribute must include a readable copy of the "NOTICE" text file.

- */

-

-

-package at.gv.egovernment.moa.id.auth.validator.parep;

-

-import java.io.File;

-import java.io.FileOutputStream;

-import java.io.IOException;

-import java.io.InputStream;

-import java.io.OutputStream;

-import java.io.OutputStreamWriter;

-

-import javax.xml.parsers.DocumentBuilderFactory;

-

-import org.apache.xml.serialize.OutputFormat;

-import org.apache.xml.serialize.XMLSerializer;

-import org.apache.xpath.XPathAPI;

-import org.w3c.dom.Document;

-import org.w3c.dom.Element;

-import org.w3c.dom.Node;

-import org.w3c.dom.NodeList;

-

-import at.gv.egovernment.moa.id.auth.builder.BPKBuilder;

-import at.gv.egovernment.moa.id.auth.exception.BuildException;

-import at.gv.egovernment.moa.id.auth.exception.ParseException;

-import at.gv.egovernment.moa.id.auth.exception.ValidateException;

-import at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw.SZRGWClientException;

-import at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw.SZRGWConstants;

-import at.gv.egovernment.moa.id.config.ConfigurationException;

-import at.gv.egovernment.moa.logging.Logger;

-import at.gv.egovernment.moa.util.BoolUtils;

-import at.gv.egovernment.moa.util.Constants;

-import at.gv.egovernment.moa.util.DOMUtils;

-import at.gv.egovernment.moa.util.StringUtils;

-

-/**

- * This class implements a set of utility methods.

- * 

- * @author <a href="mailto:peter.danner@egiz.gv.at">Peter Danner</a>

- */

-public class ParepUtils {

-

-  /**

-   * Determines whether a string is null or empty

-   * 

-   * @param str the string to check.

-   * @return <code>true</code> if the string is null or empty,

-   *         <code>false</code> otherwise.

-   */

-  public static boolean isEmpty(String str) {

-    return str == null || "".equals(str);

-  }

-

-  /**

-   * Reads a XML document from an input stream (namespace-aware).

-   * 

-   * @param is

-   *          the input stream to read from.

-   * @return the read XML document.

-   * @throws SZRGWClientException

-   *           if an error occurs reading the document from the input stream.

-   */

-  public static Document readDocFromIs(InputStream is) throws SZRGWClientException {

-    try {

-      DocumentBuilderFactory f = DocumentBuilderFactory.newInstance();

-      f.setNamespaceAware(true);

-      return f.newDocumentBuilder().parse(is);

-    } catch (Exception e) {

-      throw new SZRGWClientException(e);

-    }

-  }

-

-//  /*

-//   * 

-//   */

-//  public static String extractRepresentativeID(Element mandate) throws ValidateException {

-//    try {

-//      Element nameSpaceNode = mandate.getOwnerDocument().createElement("NameSpaceNode");

-//      nameSpaceNode.setAttribute("xmlns:md", SZRGWConstants.MANDATE_NS);

-//      Node resultNode = XPathAPI.selectSingleNode(mandate, "//md:Mandate/attribute::MandateID", nameSpaceNode);

-//      if (resultNode != null) {

-//        // because following line is not ready for JDK 1.4.x we need to get the childnode; 

-//        // return resultNode.getTextContent();

-//        Node textNode = resultNode.getFirstChild();

-//        if (textNode != null) {

-//          return textNode.getNodeValue();

-//        }

-//      }

-//      return null;

-//    } catch (Exception e) {

-//      throw new ValidateException("validator.62", null);

-//    }

-//  }

-

-

-  /**

-   * Dumps all bytes from an input stream to the given output stream.

-   * 

-   * @param is

-   *          the input stream to dump from.

-   * @param os

-   *          the output stream to dump to.

-   * @throws IOException

-   *           if an error occurs while dumping.

-   */

-  public static void dumpInputOutputStream(InputStream is, OutputStream os) throws IOException {

-    if (is == null) {

-      return;

-    }

-    int ch;

-    while ((ch = is.read()) != -1) {

-      os.write(ch);

-    }

-  }

-

-  /**

-   * Gets a string that represents the date a mandate was issued.

-   * 

-   * @param mandate

-   *          the mandate to extract the issuing date from.

-   * @return the issuing date of the given mandate.

-   * @throws SZRGWClientException

-   *           if an exception occurs extracting the issuing date of the

-   *           mandate.

-   */

-  public static String getMandateIssuedDate(Element mandate) throws SZRGWClientException {

-    try {

-      Element nameSpaceNode = mandate.getOwnerDocument().createElement("NameSpaceNode");

-      nameSpaceNode.setAttribute("xmlns:md", SZRGWConstants.MANDATE_NS);

-

-      Node dateNode = XPathAPI.selectSingleNode(mandate, "//md:Issued/md:Date/text()", nameSpaceNode);

-

-      if (dateNode == null) {

-        throw new Exception("Date in Mandate-Issued not found.");

-      }

-      return dateNode.getNodeValue();

-    } catch (Exception e) {

-      throw new SZRGWClientException(e);

-    }

-  }

-

-  /**

-   * Gets a string that represents the place a mandate was issued.

-   * 

-   * @param mandate

-   *          the mandate to extract the issuing place from.

-   * @return the issuing place of the given mandate.

-   * @throws SZRGWClientException

-   *           if an exception occurs extracting the issuing place of the

-   *           mandate.

-   */

-  public static String getMandateIssuedPlace(Element mandate) throws SZRGWClientException {

-    try {

-      Element nameSpaceNode = mandate.getOwnerDocument().createElement("NameSpaceNode");

-      nameSpaceNode.setAttribute("xmlns:md", SZRGWConstants.MANDATE_NS);

-

-      Node placeNode = XPathAPI.selectSingleNode(mandate, "//md:Issued/md:Place/text()", nameSpaceNode);

-

-      if (placeNode == null) {

-        throw new Exception("Place in Mandate-Issued not found.");

-      }

-      return placeNode.getNodeValue();

-    } catch (Exception e) {

-      throw new SZRGWClientException(e);

-    }

-  }

-

-  /**

-   * Extracts the textual description of the mandate.

-   * 

-   * @param mandate

-   *          the mandate to extract the textual description from.

-   * @return the textual description of the mandate.

-   * @throws SZRGWClientException

-   *           if an exception occurs extracting the textual description.

-   */

-  public static String getMandateContent(Element mandate) throws SZRGWClientException {

-    try {

-      Element nameSpaceNode = mandate.getOwnerDocument().createElement("NameSpaceNode");

-      nameSpaceNode.setAttribute("xmlns:md", SZRGWConstants.MANDATE_NS);

-

-      Node contentNode = XPathAPI.selectSingleNode(mandate, "//md:SimpleMandateContent/md:TextualDescription/text()", nameSpaceNode);

-

-      if (contentNode == null) {

-        throw new Exception("Content in Mandate not found.");

-      }

-      return contentNode.getNodeValue();

-    } catch (Exception e) {

-      throw new SZRGWClientException(e);

-    }

-  }

-

-  /**

-   * Extracts the md:Mandator element from a XML mandate element.

-   * 

-   * @param mandate

-   *          the md:Mandate element to extract the md:Mandator from.

-   * @return the md:Mandator element.

-   * @throws SZRGWClientException

-   *           if an error occurs extracting the md:Mandator element.

-   */

-  public static Element extractMandator(Element mandate) throws ParseException {

-    try {

-      

-      Element nameSpaceNode = mandate.getOwnerDocument().createElement("NameSpaceNode");

-      nameSpaceNode.setAttribute("xmlns" + SZRGWConstants.MANDATE_POSTFIX, SZRGWConstants.MANDATE_NS);

-      Element mandator = (Element) XPathAPI.selectSingleNode(mandate, "//" + SZRGWConstants.MANDATE_PREFIX + SZRGWConstants.MANDATOR, nameSpaceNode);

-      if (mandator == null) {

-        // if we got the Mandator itself

-        if (mandate.getLocalName().equals(SZRGWConstants.MANDATOR)) return mandate;

-      }

-      if (mandator == null)

-        return null;

-      String nsPrefix = mandator.getPrefix();

-      String nsUri = mandator.getNamespaceURI();

-      Element mandatorClone = (Element) mandator.cloneNode(true);

-      mandatorClone.setAttribute("xmlns:" + nsPrefix, nsUri);

-      return mandatorClone;

-    } catch (Exception e) {

-      throw new ParseException(e.toString(), null);

-    }

-  }

-  

-  /**

-   * Tells wether a mandator is a physical person or not.

-   * 

-   * @param mandator

-   *          the XML md:Mandator element to extract from.

-   * @return <code>true<code> if the mandator is a physical person, <code>false</code> otherwise.

-   */

-  public static boolean isPhysicalPerson(Element mandator) {

-    try {

-      Element nameSpaceNode = mandator.getOwnerDocument().createElement("NameSpaceNode");

-      nameSpaceNode.setAttribute("xmlns" + SZRGWConstants.PD_POSTFIX, Constants.PD_NS_URI);

-

-      DOMUtils.serializeNode(mandator);

-      

-      // check if physical person

-      Element physicalPerson = (Element) XPathAPI.selectSingleNode(mandator, "descendant-or-self::pr:PhysicalPerson", nameSpaceNode);

-      

-      

-      // Element physicalPerson = (Element)XPathAPI.selectSingleNode(mandator,

-      // "descendant-or-self::pr:CorporateBody", nameSpaceNode);

-      return physicalPerson != null;

-    } catch (Exception e) {

-      e.printStackTrace();

-      return false;

-    }

-  }

-

-  /**

-   * Extracts the <code>pr:PhysicalPerson</code> or <code>pr:CorporateBody</code> 

-   * element from a XML mandate element.

-   * 

-   * @param mandate

-   *          the md:Mandate element to extract the person from.

-   * @return the <code>pr:PhysicalPerson</code> or <code>pr:CorporateBody</code> element.

-   * @throws ParseException

-   *           if an error occurs extracting the element.

-   */

-  public static Element extractPersonOfMandate(Element mandate) throws ParseException {

-    try {

-      

-      Element nameSpaceNode = mandate.getOwnerDocument().createElement("NameSpaceNode");

-      nameSpaceNode.setAttribute("xmlns" + SZRGWConstants.MANDATE_POSTFIX, SZRGWConstants.MANDATE_NS);

-      nameSpaceNode.setAttribute("xmlns" + SZRGWConstants.PD_POSTFIX, Constants.PD_NS_URI);

-      Element person = (Element) XPathAPI.selectSingleNode(mandate, "//" + SZRGWConstants.MANDATE_PREFIX + SZRGWConstants.MANDATOR + "/pr:PhysicalPerson", nameSpaceNode);

-      if (person == null) {

-        person = (Element) XPathAPI.selectSingleNode(mandate, "//" + SZRGWConstants.MANDATE_PREFIX + SZRGWConstants.MANDATOR + "/pr:CorporateBody", nameSpaceNode);

-      }

-      if (person == null) return null;

-      String nsPrefix = person.getPrefix();

-      String nsUri = person.getNamespaceURI();

-      Element personClone = (Element) person.cloneNode(true);

-      personClone.setAttribute("xmlns:" + nsPrefix, nsUri);

-      return personClone;

-    } catch (Exception e) {

-      //e.printStackTrace();

-      throw new ParseException(e.toString(), null);

-    }

-  }

-

-  /**

-   * Benerates the </code>pr:Person</code> element form a 

-   * <code>pr:PhysicalPerson</code> or <code>pr:CorporateBody</code> 

-   * element of a XML mandate element.

-   * 

-   * @param mandate

-   *          the md:Mandate element to extract the person from.

-   * @return the <code>pr:Person</code> element.

-   * @throws ParseException

-   *           if an error occurs extracting the element.

-   */

-  public static Element extractPrPersonOfMandate(Element mandate) throws ParseException {

-

-    try {

-      Document document = ParepUtils.createEmptyDocument();

-      Element root = document.createElement(SZRGWConstants.PD_PREFIX + SZRGWConstants.PERSON);

-      root.setAttribute("xmlns" + SZRGWConstants.PD_POSTFIX, Constants.PD_NS_URI);

-      root.setAttribute("xmlns:" + Constants.XSI_PREFIX, Constants.XSI_NS_URI);

-

-      Element nameSpaceNode = mandate.getOwnerDocument().createElement("NameSpaceNode");

-      nameSpaceNode.setAttribute("xmlns" + SZRGWConstants.MANDATE_POSTFIX, SZRGWConstants.MANDATE_NS);

-      nameSpaceNode.setAttribute("xmlns" + SZRGWConstants.PD_POSTFIX, Constants.PD_NS_URI);

-      Element person = (Element) XPathAPI.selectSingleNode(mandate, "//" 

-          + SZRGWConstants.MANDATE_PREFIX + SZRGWConstants.MANDATOR + "/" + SZRGWConstants.PD_PREFIX + SZRGWConstants.PHYSICALPERSON, nameSpaceNode);

-      if (person == null) {

-        person = (Element) XPathAPI.selectSingleNode(mandate, "//" 

-            + SZRGWConstants.MANDATE_PREFIX + SZRGWConstants.MANDATOR + "/" + SZRGWConstants.PD_PREFIX + SZRGWConstants.CORPORATEBODY, nameSpaceNode);

-      }

-      if (person != null) {

-        root.setAttribute(Constants.XSI_PREFIX + ":type", SZRGWConstants.PD_PREFIX + person.getLocalName());

-        if (person != null) {

-          NodeList nl = person.getChildNodes();

-          for (int i = 0; i < nl.getLength(); i++) {

-            Node testNode = nl.item(i);

-            if (Node.ELEMENT_NODE == testNode.getNodeType()) {

-              root.appendChild(document.importNode(testNode, true));

-            }

-          }

-        }

-      }

-      

-      return root;

-    } catch (Exception e) {

-      //e.printStackTrace();

-      throw new ParseException(e.toString(), null);

-    }

-  }

-  

-  /**

-   * Extracts the name of the mandator as a string representation.

-   * 

-   * @param mandator

-   *          the XML md:Mandator element to extract from.

-   * @return the mandator name as a string.

-   */

-  public static String extractMandatorName(Element mandator) {

-    try {

-      Element nameSpaceNode = mandator.getOwnerDocument().createElement("NameSpaceNode");

-      nameSpaceNode.setAttribute("xmlns" + SZRGWConstants.PD_POSTFIX, Constants.PD_NS_URI);

-

-      // first check if physical person

-      Element name = (Element) XPathAPI.selectSingleNode(mandator, "descendant-or-self::pr:Name/pr:GivenName", nameSpaceNode);

-      if (name != null) {

-        String givenName = XPathAPI.selectSingleNode(mandator, "descendant-or-self::pr:Name/pr:GivenName/text()", nameSpaceNode).getNodeValue();

-        String familyName = XPathAPI.selectSingleNode(mandator, "descendant-or-self::pr:Name/pr:FamilyName/text()", nameSpaceNode).getNodeValue();

-

-        return givenName + " " + familyName;

-      }

-

-      // check if corporate body

-      Node fullName = XPathAPI.selectSingleNode(mandator, "descendant-or-self::pr:FullName/text()", nameSpaceNode);

-      if (fullName != null) {

-        return fullName.getNodeValue();

-      }

-      return "";

-    } catch (Exception e) {

-      //e.printStackTrace();

-      return "";

-    }

-  }

-

-  /**

-   * Extracts specific text of an element of a given md:Mandator element.

-   * 

-   * @param mandator

-   *          the XML md:Mandator to extract from.

-   * @return the resulting text of the mandator element.

-   */

-  public static String extractText(Element mandator, String xpath) {

-    try {

-      Element nameSpaceNode = mandator.getOwnerDocument().createElement("NameSpaceNode");

-      nameSpaceNode.setAttribute("xmlns" + SZRGWConstants.PD_POSTFIX, Constants.PD_NS_URI);

-

-      Node textNode = XPathAPI.selectSingleNode(mandator, xpath, nameSpaceNode);

-      if (textNode == null)

-        return null;

-      return textNode.getNodeValue();

-    } catch (Exception e) {

-      e.printStackTrace();

-      return null;

-    }

-  }

-

-  /**

-   * Extracts the date of birth of the mandator of a given md:Mandator element.

-   * 

-   * @param mandator

-   *          the XML md:Mandator to extract from.

-   * @return the dob of the mandator.

-   */

-  public static String extractMandatorDateOfBirth(Element mandator) {

-    try {

-      Element nameSpaceNode = mandator.getOwnerDocument().createElement("NameSpaceNode");

-      nameSpaceNode.setAttribute("xmlns" + SZRGWConstants.PD_POSTFIX, Constants.PD_NS_URI);

-

-      Node dobName = XPathAPI.selectSingleNode(mandator, "descendant-or-self::pr:DateOfBirth/text()", nameSpaceNode);

-      if (dobName == null)

-        return null;

-      return dobName.getNodeValue();

-    } catch (Exception e) {

-      e.printStackTrace();

-      return null;

-    }

-  }

-

-  /**

-   * Extracts the full name of the mandators corporate body of a given

-   * md:Mandator element.

-   * 

-   * @param mandator

-   *          the XML md:Mandator to extract from.

-   * @return the full name of the mandator.

-   */

-  public static String extractMandatorFullName(Element mandator) {

-    try {

-      Element nameSpaceNode = mandator.getOwnerDocument().createElement("NameSpaceNode");

-      nameSpaceNode.setAttribute("xmlns" + SZRGWConstants.PD_POSTFIX, Constants.PD_NS_URI);

-

-      Node fullName = XPathAPI.selectSingleNode(mandator, "descendant-or-self::pr:CorporateBody/pr:FullName/text()", nameSpaceNode);

-      if (fullName == null)

-        return null;

-      return fullName.getNodeValue();

-    } catch (Exception e) {

-      e.printStackTrace();

-      return null;

-    }

-  }

-

-  /**

-   * Extracts the identification value of the mandator of a given mandate.

-   * 

-   * @param mandator

-   *          the XML md:Mandator element.

-   * @return the identification value.

-   */

-  public static String extractMandatorWbpk(Element mandator) {

-    try {

-      Element nameSpaceNode = mandator.getOwnerDocument().createElement("NameSpaceNode");

-      nameSpaceNode.setAttribute("xmlns" + SZRGWConstants.PD_POSTFIX, Constants.PD_NS_URI);

-

-      Node idValue = XPathAPI.selectSingleNode(mandator, "descendant-or-self::pr:Identification/pr:Value/text()", nameSpaceNode);

-      if (idValue != null) {

-        return idValue.getNodeValue();

-      }

-      return "";

-    } catch (Exception e) {

-      e.printStackTrace();

-      return "";

-    }

-  }

-

-  /**

-   * Extracts the identification type of the mandator of a given mandate.

-   * 

-   * @param mandator

-   *          the XML md:Mandator element.

-   * @return the identification type.

-   */

-  public static String extractMandatorIdentificationType(Element mandator) {

-    try {

-      Element nameSpaceNode = mandator.getOwnerDocument().createElement("NameSpaceNode");

-      nameSpaceNode.setAttribute("xmlns" + SZRGWConstants.PD_POSTFIX, Constants.PD_NS_URI);

-

-      Node idType = XPathAPI.selectSingleNode(mandator, "descendant-or-self::pr:Identification/pr:Type/text()", nameSpaceNode);

-      if (idType != null) {

-        return idType.getNodeValue();

-      }

-      return "";

-    } catch (Exception e) {

-      e.printStackTrace();

-      return "";

-    }

-  }

-

-  /*

-   * 

-   */

-  public static String getIdentification(Element personElement, String element) throws ParseException {

-    try {

-

-      Element nameSpaceNode = personElement.getOwnerDocument().createElement("NameSpaceNode");

-      nameSpaceNode.setAttribute("xmlns" + SZRGWConstants.PD_POSTFIX, Constants.PD_NS_URI);

-

-      return XPathAPI.selectSingleNode(personElement, "descendant-or-self::pr:Identification/pr:" + element + "/text()", nameSpaceNode)

-          .getNodeValue();

-    } catch (Exception e) {

-      throw new ParseException(e.toString(), null);

-    }

-  }

-

-//  /*

-//   * 

-//   */

-//  private static Element extractRepresentative(Element mandate) throws SZRGWClientException {

-//    try {

-//      Element nameSpaceNode = mandate.getOwnerDocument().createElement("NameSpaceNode");

-//      nameSpaceNode.setAttribute("xmlns:md", SZRGWConstants.MANDATE_NS);

-//      Element mandator = (Element) XPathAPI.selectSingleNode(mandate, "//md:Representative/child::*[1]", nameSpaceNode);

-//      String nsPrefix = mandator.getPrefix();

-//      String nsUri = mandator.getNamespaceURI();

-//

-//      Element mandatorClone = (Element) mandator.cloneNode(true);

-//      mandatorClone.setAttribute("xmlns:" + nsPrefix, nsUri);

-//

-//      return mandatorClone;

-//    } catch (Exception e) {

-//      throw new SZRGWClientException(e);

-//    }

-//  }

-

-  /**

-   * Serializes a XML element to a given output stream.

-   * 

-   * @param element

-   *          the XML element to serialize.

-   * @param out

-   *          the output streamt o serialize to.

-   * @throws IOException

-   *           if an I/O error occurs during serialization.

-   */

-  public static void serializeElement(Element element, OutputStream out) throws IOException {

-    OutputFormat format = new OutputFormat();

-    format.setOmitXMLDeclaration(true);

-    format.setEncoding("UTF-8");

-    format.setPreserveSpace(true);

-    XMLSerializer serializer = new XMLSerializer(new OutputStreamWriter(out, "UTF-8"), format);

-    serializer.serialize(element);

-  }

-

-  public static void serializeElementAsDocument(Element element, OutputStream out) throws IOException {

-    OutputFormat format = new OutputFormat();

-    format.setOmitXMLDeclaration(false);

-    format.setEncoding("UTF-8");

-    format.setPreserveSpace(true);

-    XMLSerializer serializer = new XMLSerializer(new OutputStreamWriter(out, "UTF-8"), format);

-    serializer.serialize(element);

-  }

-

-  public static void serializeElementWithoutEncoding(Element element, OutputStream out) throws IOException {

-    OutputFormat format = new OutputFormat();

-    format.setOmitXMLDeclaration(true);

-    format.setEncoding("UTF-8");

-    format.setPreserveSpace(true);

-    XMLSerializer serializer = new XMLSerializer(new OutputStreamWriter(out), format);

-    serializer.serialize(element);

-  }

-

-  public static void saveStringToFile(String str, File file) throws IOException {

-    FileOutputStream fos = new FileOutputStream(file);

-    fos.write(str.getBytes());

-    fos.flush();

-    fos.close();

-  }

-

-  public static void saveBytesToFile(byte[] str, File file) throws IOException {

-    FileOutputStream fos = new FileOutputStream(file);

-    fos.write(str);

-    fos.flush();

-    fos.close();

-  }

-

-  public static void saveElementToFile(Element elem, File file) throws IOException {

-    FileOutputStream fos = new FileOutputStream(file);

-    serializeElementWithoutEncoding(elem, fos);

-    fos.flush();

-    fos.close();

-  }

-

-  /**

-   * Creates an empty XML document.

-   * 

-   * @return a newly created empty XML document.

-   * @throws SZRGWClientException

-   *           if an error occurs creating the empty document.

-   */

-  public static Document createEmptyDocument() throws SZRGWClientException {

-    try {

-      DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();

-      factory.setNamespaceAware(true);

-      return factory.newDocumentBuilder().newDocument();

-    } catch (Exception e) {

-      throw new SZRGWClientException(e);

-    }

-  }

-

-

-  /**

-   * Tells if the Validator of an Infobox is enabled. If the corresponding application

-   * specific configuration element <code>EnableInfoboxValidator</code> is missing, a default value <code>true</code> is assumed

-   * 

-   * @param applicationSpecificParams

-   *          the XML element of the infobox configuration.

-   * @return the boolean value of the determination.

-   * @throws ConfigurationException

-   *           if an error occurs reading the configuration.

-   */

-  public static boolean isValidatorEnabled(Element applicationSpecificParams) throws ConfigurationException {

-    try {

-      Element nameSpaceNode = applicationSpecificParams.getOwnerDocument().createElement("NameSpaceNode");

-      nameSpaceNode.setAttribute("xmlns:" + Constants.MOA_ID_CONFIG_PREFIX, Constants.MOA_ID_CONFIG_NS_URI);

-      

-      //ParepUtils.serializeElement(applicationSpecificParams, System.out);

-      Node validatorEnabledNode = XPathAPI.selectSingleNode(applicationSpecificParams, Constants.MOA_ID_CONFIG_PREFIX

-          + ":EnableInfoboxValidator/text()", nameSpaceNode);

-      if (validatorEnabledNode != null) {

-        return BoolUtils.valueOf(validatorEnabledNode.getNodeValue());

-      }

-      return true;

-    } catch (Exception e) {

-      // e.printStackTrace();

-      throw new ConfigurationException("config.02", null);

-    }

-  }

-

-  /**

-   * Delivers a String with the description of the register which is described 

-   * through the identification Type of a corporate body of the persondata schema 

-   * 

-   * @param identificationType

-   *          the identification type.

-   * @return the register description.

-   */

-  public static String getRegisterString(String identificationType) {

-    String corporateBase = Constants.URN_PREFIX_BASEID + "+";

-    if (ParepUtils.isEmpty(identificationType) || !identificationType.startsWith(corporateBase)) return null;

-    String register = identificationType.substring(corporateBase.length());

-    if (ParepUtils.isEmpty(register)) return null;

-    if (register.equals("FN") || register.equals("XFN")) return "Firmenbuchnummer";

-    if (register.equals("VR") || register.equals("XZVR") || register.equals("XVR") || register.equals("ZVR")) return "Nummer im Vereinsregister";

-    if (register.equals("ERSB") || register.equals("XERSB")) return "Nummer im Ergänzungsregister für sonstige Betroffene";

-    return null;

-  }

-  

-  /**

-   * Hides Stammzahlen in the given element 

-   * 

-   * @param hideElement The element where Stammzahlen should be replaced.

-   * @param businessApplication For decision whether to calc a bPK or wbPK.

-   * @param target Target for calculating a bPK.

-   * @param registerID Necessary string for calculating a wbPK (example <code>FN+4096i</code>).

-   * @param blank Switch for behaviour.

-   *          <code>true</code> if Stammzahlen are blinded. All occurences will be replaced by empty strings.

-   *          <code>false</code> calculates (w)bPKs and changes also the <code>pr:Identifivation/pr:Type</code> elements.

-   * @return The element where Stammzahlen are hidden.

-   */

-  public static Element HideStammZahlen(Element hideElement, boolean businessApplication, String target, String registerID, boolean blank) 

-    throws BuildException {

-    try {

-      if (hideElement != null) {

-        Element nameSpaceNode = hideElement.getOwnerDocument().createElement("NameSpaceNode");

-        nameSpaceNode.setAttribute("xmlns" + SZRGWConstants.PD_POSTFIX, Constants.PD_NS_URI);

-        NodeList identifications = XPathAPI.selectNodeList(hideElement, "descendant-or-self::pr:Identification", nameSpaceNode);

-        for (int i = 0; i < identifications.getLength(); i++) {

-          Element identificationElement = (Element) identifications.item(i);

-          Node idTypeNode = XPathAPI.selectSingleNode(identificationElement, "descendant-or-self::pr:Identification/pr:Type/text()", nameSpaceNode);

-          if (idTypeNode != null && Constants.URN_PREFIX_BASEID.equals(idTypeNode.getNodeValue())) {

-            Node idValueNode = XPathAPI.selectSingleNode(identificationElement, "descendant-or-self::pr:Identification/pr:Value/text()", nameSpaceNode);

-            if (idValueNode == null || ParepUtils.isEmpty(idValueNode.getNodeValue())) {

-              Logger.error("HideStammZahlen: Problem beim Parsen des erhaltenen Elements - Value Element(-Inhalt) von pr:Identification nicht vorhanden.");

-              throw new BuildException("builder.02", null);

-            }

-            if (blank) {

-              idValueNode.setNodeValue("");

-            } else {

-              String idValue = idValueNode.getNodeValue();

-              if (businessApplication) {

-                // wbPK berechnen

-                idTypeNode.setNodeValue(Constants.URN_PREFIX_WBPK + "+" + registerID);

-                String bpkBase64 = new BPKBuilder().buildWBPK(idValueNode.getNodeValue(), registerID);

-                idValueNode.setNodeValue(bpkBase64);

-

-              } else {

-                // bPK berechnen

-                idTypeNode.setNodeValue(Constants.URN_PREFIX_BPK);

-                String bpkBase64 = new BPKBuilder().buildBPK(idValueNode.getNodeValue(), target);

-                idValueNode.setNodeValue(bpkBase64);

-              }

-            }

-          }

-        }

-      }

-    } catch (Exception e) {

-      throw new BuildException("builder.02", null);

-    }

-    return hideElement;

-  }

-

-  /**

-   * Replaces each substring of string <code>s</code> that matches the given

-   * <code>search</code> string by the given <code>replace</code> string.

-   * 

-   * @param s         The string where the replacement should take place.

-   * @param search    The pattern that should be replaced.

-   * @param replace   The string that should replace all each <code>search</code>

-   *                  string within <code>s</code>.

-   * @return          A string where all occurrence of <code>search</code> are

-   *                  replaced with <code>replace</code>.

-   */

-  public static String replaceAll (String s, String search, String replace) {

-    if (replace==null) replace = "";

-    return StringUtils.replaceAll(s, search, replace);

-  }

-

-  

-//  public static void main(String[] args) throws Exception {

-//    Document mandate = readDocFromIs(new FileInputStream("c:/Doku/work/Organwalter/schemas/Vertretung_OW_Max_Mustermann.xml"));

-//    Document mandate = readDocFromIs(new FileInputStream("c:/mandator.xml"));

-//    Document mandate = readDocFromIs(new FileInputStream("c:/vertetervollmacht_1.2.40.0.10.3.1.xml"));

-//    Element mandatorElement = extractMandator(mandate.getDocumentElement());

-//    System.out.println(extractMandatorName(mandatorElement));

-//    System.out.println(extractMandatorDateOfBirth(mandatorElement));

-//    System.out.println(extractMandatorWbpk(mandatorElement));

-//    //serializeElement(mandatorElement, System.out);

-//      serializeElement((extractPrPersonOfMandate(mandate.getDocumentElement())), System.out);

-//  }

-  

-}

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/CreateIdentityLinkResponse.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/CreateIdentityLinkResponse.java
deleted file mode 100644
index fca0b2dce..000000000
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/CreateIdentityLinkResponse.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************

- * Copyright 2014 Federal Chancellery Austria

- * MOA-ID has been developed in a cooperation between BRZ, the Federal

- * Chancellery Austria - ICT staff unit, and Graz University of Technology.

- * 

- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by

- * the European Commission - subsequent versions of the EUPL (the "Licence");

- * You may not use this work except in compliance with the Licence.

- * You may obtain a copy of the Licence at:

- * http://www.osor.eu/eupl/

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the Licence is distributed on an "AS IS" basis,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the Licence for the specific language governing permissions and

- * limitations under the Licence.

- * 

- * This product combines work with different licenses. See the "NOTICE" text

- * file for details on the various modules and licenses.

- * The "NOTICE" text file is part of the distribution. Any derivative works

- * that you distribute must include a readable copy of the "NOTICE" text file.

- ******************************************************************************/

-/*

- * Copyright 2003 Federal Chancellery Austria

- * MOA-ID has been developed in a cooperation between BRZ, the Federal

- * Chancellery Austria - ICT staff unit, and Graz University of Technology.

- *

- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by

- * the European Commission - subsequent versions of the EUPL (the "Licence");

- * You may not use this work except in compliance with the Licence.

- * You may obtain a copy of the Licence at:

- * http://www.osor.eu/eupl/

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the Licence is distributed on an "AS IS" basis,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the Licence for the specific language governing permissions and

- * limitations under the Licence.

- *

- * This product combines work with different licenses. See the "NOTICE" text

- * file for details on the various modules and licenses.

- * The "NOTICE" text file is part of the distribution. Any derivative works

- * that you distribute must include a readable copy of the "NOTICE" text file.

- */

-

-

-package at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw;

-

-

-import org.w3c.dom.Element;

-

-

-/**

- * This class implements a SZR-gateway GetIdentityLink Response.

- * 

- */

-public class CreateIdentityLinkResponse {

-  

-	private Element assertion;

-	private String error;

-	private boolean isError;

-

-	public Element getAssertion() {

-		return assertion;

-	}

-	public String getError() {

-		return error;

-	}

-	

-	public void setAssertion(Element assertion) {

-		isError = false;

-	  this.assertion = assertion;

-	}

-	public void setError(String error) {

-		isError = true;

-		this.error = error;

-	}

-	

-	public boolean isError() {

-		return isError;

-	}

-	

-

-}

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/CreateMandateResponse.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/CreateMandateResponse.java
deleted file mode 100644
index e6b7dee34..000000000
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/CreateMandateResponse.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************

- * Copyright 2014 Federal Chancellery Austria

- * MOA-ID has been developed in a cooperation between BRZ, the Federal

- * Chancellery Austria - ICT staff unit, and Graz University of Technology.

- * 

- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by

- * the European Commission - subsequent versions of the EUPL (the "Licence");

- * You may not use this work except in compliance with the Licence.

- * You may obtain a copy of the Licence at:

- * http://www.osor.eu/eupl/

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the Licence is distributed on an "AS IS" basis,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the Licence for the specific language governing permissions and

- * limitations under the Licence.

- * 

- * This product combines work with different licenses. See the "NOTICE" text

- * file for details on the various modules and licenses.

- * The "NOTICE" text file is part of the distribution. Any derivative works

- * that you distribute must include a readable copy of the "NOTICE" text file.

- ******************************************************************************/

-/*

- * Copyright 2003 Federal Chancellery Austria

- * MOA-ID has been developed in a cooperation between BRZ, the Federal

- * Chancellery Austria - ICT staff unit, and Graz University of Technology.

- *

- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by

- * the European Commission - subsequent versions of the EUPL (the "Licence");

- * You may not use this work except in compliance with the Licence.

- * You may obtain a copy of the Licence at:

- * http://www.osor.eu/eupl/

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the Licence is distributed on an "AS IS" basis,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the Licence for the specific language governing permissions and

- * limitations under the Licence.

- *

- * This product combines work with different licenses. See the "NOTICE" text

- * file for details on the various modules and licenses.

- * The "NOTICE" text file is part of the distribution. Any derivative works

- * that you distribute must include a readable copy of the "NOTICE" text file.

- */

-

-

-package at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw;

-

-

-import org.apache.xpath.XPathAPI;

-import org.w3c.dom.Element;

-import org.w3c.dom.Node;

-import org.w3c.dom.NodeList;

-

-

-/**

- * This class implements a SZR-gateway CreateMandate Response.

- * 

- * @author <a href="mailto:peter.danner@egiz.gv.at">Peter Danner</a>

- */

-public class CreateMandateResponse {

-  

-  /**

-   * Result code of the request.

-   */

-  private int resultCode;

-  

-  /**

-   * Description of the result.

-   */

-  private String resultInfo;

-  

-  /**

-   * The returned mandate.

-   */

-  private Element mandate;

-

-  /**

-   * @return the resultCode

-   */

-  public int getResultCode() {

-    return resultCode;

-  }

-

-  /**

-   * @param resultCode the resultCode to set

-   */

-  public void setResultCode(String resultCode) {

-    if (resultCode!=null) {

-      this.resultCode = Integer.parseInt(resultCode);

-    } else {

-      this.resultCode = 0;

-    }

-  }

-

-  /**

-   * @return the resultInfo

-   */

-  public String getInfo() {

-    return resultInfo;

-  }

-

-  /**

-   * @param resultInfo the resultInfo to set

-   */

-  public void setInfo(String resultInfo) {

-    this.resultInfo = resultInfo;

-  }

-

-  /**

-   * @return the mandate

-   */

-  public Element getMandate() {

-    return mandate;

-  }

-

-  /**

-   * @param mandate the mandate to set

-   */

-  public void setMandate(Element mandate) {

-    this.mandate = mandate;

-  }

-

-  

-  /**

-   * Parses the SZR-gateway response.

-   * 

-   * @param response the SZR-gateway response.

-   * @throws SZRGWClientException if an error occurs.

-   */

-  public void parse(Element response) throws SZRGWClientException {

-    try {

-      

-      //  first check if response is a soap error

-      NodeList list = response.getElementsByTagName("faultstring");

-      if (list.getLength() > 0) {

-        String faultCode = "";

-        String faultString = "";

-        Element snameSpaceNode = response.getOwnerDocument().createElement("NameSpaceNode");

-        snameSpaceNode.setAttribute("xmlns" + SOAPConstants.SOAP_ENV_POSTFIX, SOAPConstants.SOAP_ENV_NS);

-        Node faultCodeNode = XPathAPI.selectSingleNode(response, SOAPConstants.XPATH_SOAP_FAULTCODE, snameSpaceNode);

-        Node faultStringNode = XPathAPI.selectSingleNode(response, SOAPConstants.XPATH_SOAP_FAULTSTRING, snameSpaceNode);

-        if (faultCodeNode!=null) faultCode = faultCodeNode.getNodeValue();

-        if (faultStringNode!=null) faultString = faultStringNode.getNodeValue();

-        throw new SZRGWClientException("Fehler bei SZR-Gateway (SOAP-Error " + faultCode + "): " + faultString);

-      }

-      

-      this.mandate = null;

-      this.resultCode = 2000;

-      this.resultInfo = null;

-      // parse single SZR-gateway results

-      Element nameSpaceNode = response.getOwnerDocument().createElement("NameSpaceNode");

-      nameSpaceNode.setAttribute("xmlns" + SZRGWConstants.SZRGW_POSTFIX, SZRGWConstants.SZRGW_REQUEST_NS);

-      nameSpaceNode.setAttribute("xmlns" + SZRGWConstants.MANDATE_POSTFIX, SZRGWConstants.MANDATE_NS);

-      Node mandateNode = XPathAPI.selectSingleNode(response, "//" + SZRGWConstants.SZRGW_PREFIX + SZRGWConstants.CREATE_MANDATE_RESPONSE + "/" + SZRGWConstants.MANDATE_PREFIX + SZRGWConstants.MANDATE, nameSpaceNode);

-      if (mandateNode!=null) {

-        this.mandate = (Element) mandateNode;

-      } else {

-        String errorResponse = "//" + SZRGWConstants.SZRGW_PREFIX + SZRGWConstants.CREATE_MANDATE_RESPONSE + "/" + SZRGWConstants.SZRGW_PREFIX + SZRGWConstants.ERROR_RESPONSE + "/"; 

-        Node errorCode = XPathAPI.selectSingleNode(response, errorResponse + SZRGWConstants.SZRGW_PREFIX + "ErrorCode/text()", nameSpaceNode);

-        if (errorCode!=null) setResultCode(errorCode.getNodeValue());

-        Node errorInfo = XPathAPI.selectSingleNode(response, errorResponse + SZRGWConstants.SZRGW_PREFIX + "Info/text()", nameSpaceNode);

-        this.setInfo(errorInfo.getNodeValue());

-      }

-    } catch(Exception e) {

-      e.printStackTrace();

-      throw new SZRGWClientException(e);

-    }

-  }

-  

-  public static void main(String[] args) throws Exception {

-//    CreateMandateResponse resp = new CreateMandateResponse();

-//    Document doc = ParepUtils.readDocFromIs(new FileInputStream("c:/response2.xml"));

-//    Element response = doc.getDocumentElement();

-//    resp.parse(response);

-//    System.out.println(resp.getResultCode());

-//    System.out.println(resp.getInfo());

-//    if (resp.getMandate()!=null) ParepUtils.serializeElement(resp.getMandate(), System.out);

-  }

-

-}

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SOAPConstants.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SOAPConstants.java
deleted file mode 100644
index 0313814b1..000000000
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SOAPConstants.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************

- * Copyright 2014 Federal Chancellery Austria

- * MOA-ID has been developed in a cooperation between BRZ, the Federal

- * Chancellery Austria - ICT staff unit, and Graz University of Technology.

- * 

- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by

- * the European Commission - subsequent versions of the EUPL (the "Licence");

- * You may not use this work except in compliance with the Licence.

- * You may obtain a copy of the Licence at:

- * http://www.osor.eu/eupl/

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the Licence is distributed on an "AS IS" basis,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the Licence for the specific language governing permissions and

- * limitations under the Licence.

- * 

- * This product combines work with different licenses. See the "NOTICE" text

- * file for details on the various modules and licenses.

- * The "NOTICE" text file is part of the distribution. Any derivative works

- * that you distribute must include a readable copy of the "NOTICE" text file.

- ******************************************************************************/

-/*

- * Copyright 2003 Federal Chancellery Austria

- * MOA-ID has been developed in a cooperation between BRZ, the Federal

- * Chancellery Austria - ICT staff unit, and Graz University of Technology.

- *

- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by

- * the European Commission - subsequent versions of the EUPL (the "Licence");

- * You may not use this work except in compliance with the Licence.

- * You may obtain a copy of the Licence at:

- * http://www.osor.eu/eupl/

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the Licence is distributed on an "AS IS" basis,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the Licence for the specific language governing permissions and

- * limitations under the Licence.

- *

- * This product combines work with different licenses. See the "NOTICE" text

- * file for details on the various modules and licenses.

- * The "NOTICE" text file is part of the distribution. Any derivative works

- * that you distribute must include a readable copy of the "NOTICE" text file.

- */

-

-

-package at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw;

-

-

-/**

- * SOAP Envelope Constants.

- * 

- * @author <a href="mailto:arne.tauber@egiz.gv.at">Arne Tauber</a>

- * @version $ $

- **/

-public interface SOAPConstants {

-

-  /*

-   * Namespaces and namespace prefixes for SOAP message handling

-   */  

-  public static final String SOAP_ENV_NS = "http://schemas.xmlsoap.org/soap/envelope/";

-  public static final String SOAP_ENV_ENCODING_STYLE = "http://schemas.xmlsoap.org/soap/encoding/";

-  public static final String SOAP_ENV_PREFIX = "soapenv:";

-  public static final String SOAP_ENV_POSTFIX = ":soapenv";

-

-  public static final String ENVELOPE = "Envelope";

-  public static final String BODY = "Body";

-  public static final String FAULT = "Fault";

-  public static final String ENCODING_STYLE = "encodingStyle";

-

-  public static final String XPATH_SOAP_FAULT = "/" + SOAP_ENV_PREFIX + ENVELOPE + "/" + SOAP_ENV_PREFIX + BODY + "/" + SOAP_ENV_PREFIX + FAULT;

-  public static final String XPATH_SOAP_FAULTCODE = XPATH_SOAP_FAULT + "/faultcode/text()";

-  public static final String XPATH_SOAP_FAULTSTRING = XPATH_SOAP_FAULT + "/faultstring/text()";

-  

-  

-  

-}

-

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWClient.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWClient.java
deleted file mode 100644
index 61b26b59a..000000000
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWClient.java
+++ /dev/null
@@ -1,389 +0,0 @@
-/*******************************************************************************

- * Copyright 2014 Federal Chancellery Austria

- * MOA-ID has been developed in a cooperation between BRZ, the Federal

- * Chancellery Austria - ICT staff unit, and Graz University of Technology.

- * 

- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by

- * the European Commission - subsequent versions of the EUPL (the "Licence");

- * You may not use this work except in compliance with the Licence.

- * You may obtain a copy of the Licence at:

- * http://www.osor.eu/eupl/

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the Licence is distributed on an "AS IS" basis,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the Licence for the specific language governing permissions and

- * limitations under the Licence.

- * 

- * This product combines work with different licenses. See the "NOTICE" text

- * file for details on the various modules and licenses.

- * The "NOTICE" text file is part of the distribution. Any derivative works

- * that you distribute must include a readable copy of the "NOTICE" text file.

- ******************************************************************************/

-/*

- * Copyright 2003 Federal Chancellery Austria

- * MOA-ID has been developed in a cooperation between BRZ, the Federal

- * Chancellery Austria - ICT staff unit, and Graz University of Technology.

- *

- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by

- * the European Commission - subsequent versions of the EUPL (the "Licence");

- * You may not use this work except in compliance with the Licence.

- * You may obtain a copy of the Licence at:

- * http://www.osor.eu/eupl/

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the Licence is distributed on an "AS IS" basis,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the Licence for the specific language governing permissions and

- * limitations under the Licence.

- *

- * This product combines work with different licenses. See the "NOTICE" text

- * file for details on the various modules and licenses.

- * The "NOTICE" text file is part of the distribution. Any derivative works

- * that you distribute must include a readable copy of the "NOTICE" text file.

- */

-

-

-

-package at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw;

-

-import java.io.ByteArrayInputStream;

-import java.io.ByteArrayOutputStream;

-

-import javax.net.ssl.SSLSocketFactory;

-import javax.xml.parsers.DocumentBuilder;

-import javax.xml.parsers.DocumentBuilderFactory;

-import javax.xml.parsers.ParserConfigurationException;

-

-import org.apache.commons.httpclient.HttpClient;

-import org.apache.commons.httpclient.methods.PostMethod;

-import org.apache.commons.httpclient.protocol.Protocol;

-import org.apache.xpath.XPathAPI;

-import org.w3c.dom.Document;

-import org.w3c.dom.Element;

-import org.w3c.dom.NodeList;

-import org.w3c.dom.Text;

-

-import at.gv.egovernment.moa.id.auth.validator.parep.ParepUtils;

-import at.gv.egovernment.moa.id.commons.utils.HttpClientWithProxySupport;

-import at.gv.egovernment.moa.util.Constants;

-import at.gv.egovernment.moa.util.DOMUtils;

-

-

-

-/**

- * This class implements a client for communication with the SZR-gateway

- * <p>

- * Two types of requests are supported

- * <ol>

- * <li>Basic Request</li>

- * <li>Detailed Request</li>

- * </ol>

- * 

- * @author <a href="mailto:peter.danner@egiz.gv.at">Peter Danner</a>

- */

-public class SZRGWClient {

-  /**

-   * The URL of the SZR-gateway webservice.

-   */

-  private String address;

-  

-  /**

-   * The SSL socket factory when using a secure connection.

-   */

-  private SSLSocketFactory sSLSocketFactory;

-  

-  /**

-   * Constructor

-   */

-  public SZRGWClient() {

-  }

-

-  /**

-   * Constructor

-   * 

-   * @param address the URL of the SZR-gateway webservice.

-   */

-  public SZRGWClient(String address) {

-    this.address = address;

-  }

-  /**

-   * Sets the SSL socket factory.

-   * 

-   * @param factory the SSL socket factory.

-   */

-  public void setSSLSocketFactory(SSLSocketFactory factory) {

-    this.sSLSocketFactory = factory;

-  }

-  

-  /**

-   * Sets the SZR webservice URL

-   * 

-   * @param address the URL of the SZR-gateway webservice.

-   */

-  public void setAddress(String address) {

-    this.address = address;

-  }

-  

-  /**

-   * Creates a mandate.

-   * 

-   * @param reqElem the request.

-   * @return a SZR-gateway response containing the result

-   * @throws SZRGWException when an error occurs creating the mandate.

-   */

-  public CreateMandateResponse createMandateResponse(Element reqElem) throws SZRGWClientException {

-    //Logger.info("Connecting to SZR-gateway.");

-    try {

-      if (address == null) {

-        throw new NullPointerException("Address (SZR-gateway ServiceURL) must not be null.");

-      }

-      HttpClient client = HttpClientWithProxySupport.getHttpClient();

-      PostMethod method = new PostMethod(address);

-      method.setRequestHeader("SOAPAction", "");

-

-      

-      // ssl settings

-      if (sSLSocketFactory != null) {

-        SZRGWSecureSocketFactory fac = new SZRGWSecureSocketFactory(sSLSocketFactory); 

-        Protocol.registerProtocol("https", new Protocol("https", fac, 443));

-      }

-      

-      // create soap body

-      Element soapBody = getSOAPBody();

-      Document doc = soapBody.getOwnerDocument();

-      soapBody.appendChild(doc.importNode(reqElem, true));

-      Element requestElement = soapBody.getOwnerDocument().getDocumentElement();

-      

-      //ParepUtils.saveElementToFile(requestElement, new File("c:/temp/szrRequest.xml"));

-      ByteArrayOutputStream bos = new ByteArrayOutputStream();

-      ParepUtils.serializeElementAsDocument(requestElement, bos);

-      

-      method.setRequestBody(new ByteArrayInputStream(bos.toByteArray()));

-      client.executeMethod(method);

-      CreateMandateResponse response = new CreateMandateResponse();

-      

-      bos = new ByteArrayOutputStream();

-      doc = ParepUtils.readDocFromIs(method.getResponseBodyAsStream());

-      

-      //ParepUtils.saveElementToFile(doc.getDocumentElement(), new File("c:/temp/szrResponse.xml"));

-      response.parse(doc.getDocumentElement());

-      

-      

-      return response;

-    } catch(Exception e) {

-      //e.printStackTrace();

-      throw new SZRGWClientException(e);

-    }

-  }

-  

-  /**

-   * Gets a identity link.

-   * 

-   * @param reqElem the request.

-   * @return a SZR-gateway response containing the result

-   * @throws SZRGWException when an error occurs creating the mandate.

-   */

-  public CreateIdentityLinkResponse createIdentityLinkResponse(Element reqElem) throws SZRGWClientException {

-    

-	  try {

-      if (address == null) {

-        throw new NullPointerException("Address (SZR-gateway ServiceURL) must not be null.");

-      }

-      HttpClient client = new HttpClient();

-      PostMethod method = new PostMethod(address);

-      method.setRequestHeader("SOAPAction", "");

-

-      

-      // ssl settings

-      if (sSLSocketFactory != null) {

-        SZRGWSecureSocketFactory fac = new SZRGWSecureSocketFactory(sSLSocketFactory); 

-        Protocol.registerProtocol("https", new Protocol("https", fac, 443));

-      }

-      

-      // create soap body

-      Element soapBody = getSOAPBody();

-      Document doc = soapBody.getOwnerDocument();

-      soapBody.appendChild(doc.importNode(reqElem, true));

-      Element requestElement = soapBody.getOwnerDocument().getDocumentElement();

-      

-      //ParepUtils.saveElementToFile(requestElement, new File("c:/temp/szrRequest.xml"));

-      ByteArrayOutputStream bos = new ByteArrayOutputStream();

-      ParepUtils.serializeElementAsDocument(requestElement, bos);

-      

-      method.setRequestBody(new ByteArrayInputStream(bos.toByteArray()));

-      client.executeMethod(method);

-      CreateIdentityLinkResponse response = new CreateIdentityLinkResponse();

-      

-      bos = new ByteArrayOutputStream();

-      doc = ParepUtils.readDocFromIs(method.getResponseBodyAsStream());

-      //ParepUtils.saveElementToFile(doc.getDocumentElement(), new File("c:/temp/szrResponse.xml"));

-      

-      NodeList list = doc.getElementsByTagNameNS(SZRGWConstants.SZRGW_REQUEST_NS, "ErrorResponse");

-      if (list.getLength() > 0) {

-    	  // set error response

-    	  list = doc.getElementsByTagNameNS(SZRGWConstants.SZRGW_REQUEST_NS, "Info");

-    	  String error = DOMUtils.getText(list.item(0));

-

-    	  response.setError(error);

-      }

-      else {

-    	  // set assertion

-    	  DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();

-          Document newdoc = builder.newDocument();

-          

-          Element nameSpaceNode = newdoc.createElement("NameSpaceNode");

-          nameSpaceNode.setAttribute("xmlns:" + Constants.DSIG_PREFIX, Constants.DSIG_NS_URI);

-          nameSpaceNode.setAttribute("xmlns:" + Constants.SAML_PREFIX, Constants.SAML_NS_URI);

-          

-          Element samlAssertion = (Element)XPathAPI.selectSingleNode(doc, "//saml:Assertion[1]", nameSpaceNode);

-          

-          if (samlAssertion == null)

-        	  throw new SZRGWClientException("Could not found a saml:Assertion element in response.");

-          else

-        	  response.setAssertion(samlAssertion);

-      }

-    	

-      return response;

-      

-    } catch(Exception e) {

-      throw new SZRGWClientException(e);

-    }

-  }

-  

-  

-  /*

-   * builds an XML soap envelope

-   */

-  private Element getSOAPBody() throws SZRGWClientException {

-    Document doc_;

-	try {

-		doc_ = ParepUtils.createEmptyDocument();

-		Element root = doc_.createElementNS(SOAPConstants.SOAP_ENV_NS, SOAPConstants.SOAP_ENV_PREFIX + SOAPConstants.ENVELOPE);

-	    doc_.appendChild(root);

-	    

-	    root.setAttribute("xmlns" + SOAPConstants.SOAP_ENV_POSTFIX, SOAPConstants.SOAP_ENV_NS);

-	    //root.setAttribute(SOAPConstants.SOAP_ENV_PREFIX + SOAPConstants.ENCODING_STYLE, SOAPConstants.SOAP_ENV_ENCODING_STYLE);

-	    root.setAttribute("xmlns:xsd", "http://www.w3.org/2001/XMLSchema");

-	    root.setAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");

-	        

-	    Element body = doc_.createElementNS(SOAPConstants.SOAP_ENV_NS, SOAPConstants.SOAP_ENV_PREFIX + SOAPConstants.BODY);

-	    root.appendChild(body);

-	    

-	    return body;

-	} catch (SZRGWClientException e) {

-		throw new SZRGWClientException(e);

-	}

-    

-  }

-

-  public Document buildGetIdentityLinkRequest(String PEPSIdentifier, String PEPSFirstname, String PEPSFamilyname, String PEPSDateOfBirth, String signature, String representative, String represented, String mandateContent) throws SZRGWClientException {
-
-	  String SZRGW_NS = "http://reference.e-government.gv.at/namespace/szrgw/20070807#";

-		  try {

-			DocumentBuilderFactory factory =DocumentBuilderFactory.newInstance();

-			factory.setNamespaceAware(true);

-	        DocumentBuilder builder = factory.newDocumentBuilder();

-	        Document doc = builder.newDocument();

-	        

-	        Element getIdentityLink = doc.createElementNS(SZRGW_NS, "szrgw:GetIdentityLinkRequest");

-	        getIdentityLink.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:szrgw", SZRGW_NS);

-	        doc.appendChild(getIdentityLink);

-	            

-	        if ( (PEPSIdentifier != null) || (PEPSFirstname != null) || (PEPSFamilyname != null) || (PEPSDateOfBirth != null) ) {

-	        	

-	        	Element pepsDataElem = doc.createElementNS(SZRGW_NS, "szrgw:PEPSData");

-	        	getIdentityLink.appendChild(pepsDataElem);

-	        	

-	        	if (PEPSIdentifier != null) {

-	            	Element elem = doc.createElementNS(SZRGW_NS, "szrgw:Identifier");

-	            	pepsDataElem.appendChild(elem);

-	            	Text text= doc.createTextNode(PEPSIdentifier);

-	            	elem.appendChild(text);

-	            }

-	        	if (PEPSFirstname != null) {

-	            	Element elem = doc.createElementNS(SZRGW_NS, "szrgw:Firstname");

-	            	pepsDataElem.appendChild(elem);

-	            	Text text= doc.createTextNode(PEPSFirstname);

-	            	elem.appendChild(text);

-	            }

-

-	        	if (PEPSFamilyname != null) {

-	            	Element elem = doc.createElementNS(SZRGW_NS, "szrgw:Familyname");

-	            	pepsDataElem.appendChild(elem);

-	            	Text text= doc.createTextNode(PEPSFamilyname);

-	            	elem.appendChild(text);

-	            }

-

-	        	if (PEPSDateOfBirth != null) {

-	            	Element elem = doc.createElementNS(SZRGW_NS, "szrgw:DateOfBirth");

-	            	pepsDataElem.appendChild(elem);

-	            	Text text= doc.createTextNode(PEPSDateOfBirth);

-	            	elem.appendChild(text);

-	            }

-

-	        	if (representative != null) {
-	            	Element elem = doc.createElementNS(SZRGW_NS, "szrgw:Representative");
-	            	pepsDataElem.appendChild(elem);

-	            	Text text= doc.createTextNode(representative);
-	            	elem.appendChild(text);

-	        	}
-

-	        	if (represented != null) {
-	            	Element elem = doc.createElementNS(SZRGW_NS, "szrgw:Represented");
-	            	pepsDataElem.appendChild(elem);

-	            	Text text= doc.createTextNode(represented);
-	            	elem.appendChild(text);

-	            }

-

-	        	if (mandateContent != null) {
-	            	Element elem = doc.createElementNS(SZRGW_NS, "szrgw:MandateContent");
-	            	pepsDataElem.appendChild(elem);

-	            	Text text= doc.createTextNode(mandateContent);
-	            	elem.appendChild(text);

-	            }

-	        }

-	        

-	        if (signature == null)

-	        	throw new SZRGWClientException("Signature element must not be null!");

-	        else {

-	        	Element sig = doc.createElementNS(SZRGW_NS, "szrgw:Signature");

-	        	Element base64content = doc.createElementNS(SZRGW_NS, "szrgw:Base64Content");

-	        	sig.appendChild(base64content);	  

-	        	getIdentityLink.appendChild(sig);

-	        	Text text= doc.createTextNode(signature);

-	        	base64content.appendChild(text);

-	        }

-
-	        if(representative != null && represented != null && mandateContent != null) {
-	        	Element mis = doc.createElementNS(SZRGW_NS, "szrgw:MIS");
-	        	Element filters = doc.createElementNS(SZRGW_NS, "szrgw:Filters");
-	        	mis.appendChild(filters);
-	        	Element target = doc.createElementNS(SZRGW_NS, "szrgw:Target");
-	        	mis.appendChild(target);
-	        	Element friendlyName = doc.createElementNS(SZRGW_NS, "szrgw:OAFriendlyName");
-	        	mis.appendChild(friendlyName);
-	        	getIdentityLink.appendChild(mis);
-
-//				TODO fetch data from oa params
-//		    	String moasessionid = req.getParameter(MOAIDAuthConstants.PARAM_SESSIONID);
-//		    	moasessionid = StringEscapeUtils.escapeHtml(moasessionid);
-//	    	    AuthenticationSession moasession = AuthenticationSessionStoreage.getSession(moasessionid);
-//	    		OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter(moasession.getPublicOAURLPrefix());
-//	    		if (oaParam == null)
-//	    				throw new AuthenticationException("auth.00", new Object[] { moasession.getPublicOAURLPrefix() });
-//	        	Text text = doc.createTextNode(oaParam.getFriendlyName());
-	        }
-
-	        return doc;

-	    } catch (ParserConfigurationException e) {

-	    	throw new SZRGWClientException(e);

-	    } /*catch (CertificateEncodingException e) {

-	    	throw new SZRGWClientException(e);

-		}*/

-	    

-

-	}

-  

-}

-

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWClientException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWClientException.java
deleted file mode 100644
index 8e1f887f6..000000000
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWClientException.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************

- * Copyright 2014 Federal Chancellery Austria

- * MOA-ID has been developed in a cooperation between BRZ, the Federal

- * Chancellery Austria - ICT staff unit, and Graz University of Technology.

- * 

- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by

- * the European Commission - subsequent versions of the EUPL (the "Licence");

- * You may not use this work except in compliance with the Licence.

- * You may obtain a copy of the Licence at:

- * http://www.osor.eu/eupl/

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the Licence is distributed on an "AS IS" basis,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the Licence for the specific language governing permissions and

- * limitations under the Licence.

- * 

- * This product combines work with different licenses. See the "NOTICE" text

- * file for details on the various modules and licenses.

- * The "NOTICE" text file is part of the distribution. Any derivative works

- * that you distribute must include a readable copy of the "NOTICE" text file.

- ******************************************************************************/

-/*

- * Copyright 2003 Federal Chancellery Austria

- * MOA-ID has been developed in a cooperation between BRZ, the Federal

- * Chancellery Austria - ICT staff unit, and Graz University of Technology.

- *

- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by

- * the European Commission - subsequent versions of the EUPL (the "Licence");

- * You may not use this work except in compliance with the Licence.

- * You may obtain a copy of the Licence at:

- * http://www.osor.eu/eupl/

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the Licence is distributed on an "AS IS" basis,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the Licence for the specific language governing permissions and

- * limitations under the Licence.

- *

- * This product combines work with different licenses. See the "NOTICE" text

- * file for details on the various modules and licenses.

- * The "NOTICE" text file is part of the distribution. Any derivative works

- * that you distribute must include a readable copy of the "NOTICE" text file.

- */

-

-

-package at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw;

-

-/**

- * This class implements the basic exception type for the SZR-gateway client

- * 

- * @author <a href="mailto:peter.danner@egiz.gv.at">Peter Danner</a>

- */

-public class SZRGWClientException extends Exception {

-

-  /**

-	 * 

-	 */

-	private static final long serialVersionUID = 26538259471017714L;

-

-/*

-   * see super constructor.

-   */

-  public SZRGWClientException() {

-    super();

-  }

-

-  /*

-   * see super constructor.

-   */

-  public SZRGWClientException(String arg0) {

-    super(arg0);

-  }

-

-  /*

-   * see super construction.

-   */

-  public SZRGWClientException(Throwable arg0) {

-    super(arg0);

-  }

-

-  /*

-   * see super constructor

-   */

-  public SZRGWClientException(String arg0, Throwable arg1) {

-    super(arg0, arg1);

-  }

-}

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWSecureSocketFactory.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWSecureSocketFactory.java
deleted file mode 100644
index fd16c1586..000000000
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWSecureSocketFactory.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************

- * Copyright 2014 Federal Chancellery Austria

- * MOA-ID has been developed in a cooperation between BRZ, the Federal

- * Chancellery Austria - ICT staff unit, and Graz University of Technology.

- * 

- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by

- * the European Commission - subsequent versions of the EUPL (the "Licence");

- * You may not use this work except in compliance with the Licence.

- * You may obtain a copy of the Licence at:

- * http://www.osor.eu/eupl/

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the Licence is distributed on an "AS IS" basis,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the Licence for the specific language governing permissions and

- * limitations under the Licence.

- * 

- * This product combines work with different licenses. See the "NOTICE" text

- * file for details on the various modules and licenses.

- * The "NOTICE" text file is part of the distribution. Any derivative works

- * that you distribute must include a readable copy of the "NOTICE" text file.

- ******************************************************************************/

-/*

- * Copyright 2003 Federal Chancellery Austria

- * MOA-ID has been developed in a cooperation between BRZ, the Federal

- * Chancellery Austria - ICT staff unit, and Graz University of Technology.

- *

- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by

- * the European Commission - subsequent versions of the EUPL (the "Licence");

- * You may not use this work except in compliance with the Licence.

- * You may obtain a copy of the Licence at:

- * http://www.osor.eu/eupl/

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the Licence is distributed on an "AS IS" basis,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the Licence for the specific language governing permissions and

- * limitations under the Licence.

- *

- * This product combines work with different licenses. See the "NOTICE" text

- * file for details on the various modules and licenses.

- * The "NOTICE" text file is part of the distribution. Any derivative works

- * that you distribute must include a readable copy of the "NOTICE" text file.

- */

-

-

-package at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw;

-

-import java.io.IOException;

-import java.net.InetAddress;

-import java.net.Socket;

-import java.net.UnknownHostException;

-

-import javax.net.ssl.SSLSocketFactory;

-

-import org.apache.commons.httpclient.params.HttpConnectionParams;

-import org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory;

-

-/**

- * This class implements a secure protocol socket factory

- * for the Apache HTTP client.

- * 

- * @author <a href="mailto:peter.danner@egiz.gv.at">Peter Danner</a>

- */

-public class SZRGWSecureSocketFactory implements SecureProtocolSocketFactory {

-

-  /**

-   * The SSL socket factory.

-   */

-  private SSLSocketFactory factory;

-  

-  /**

-   * Creates a new Secure socket factory for the

-   * Apache HTTP client.

-   * 

-   * @param factory the SSL socket factory to use.

-   */

-  public SZRGWSecureSocketFactory(SSLSocketFactory factory) {

-    this.factory = factory;

-  }

-  

-  

-  /**

-   * @see SecureProtocolSocketFactory#createSocket(java.lang.String,int,java.net.InetAddress,int)

-   */

-  public Socket createSocket(

-      String host,

-      int port,

-      InetAddress clientHost,

-      int clientPort)

-      throws IOException, UnknownHostException {

-

-      return this.factory.createSocket(

-          host,

-          port,

-          clientHost,

-          clientPort

-      );

-  }

-

-  /**

-   * @see SecureProtocolSocketFactory#createSocket(java.lang.String,int)

-   */

-  public Socket createSocket(String host, int port)

-      throws IOException, UnknownHostException {

-      return this.factory.createSocket(

-          host,

-          port

-      );

-  }

-

-  /**

-   * @see SecureProtocolSocketFactory#createSocket(java.net.Socket,java.lang.String,int,boolean)

-   */

-  public Socket createSocket(

-      Socket socket,

-      String host,

-      int port,

-      boolean autoClose)

-      throws IOException, UnknownHostException {

-      return this.factory.createSocket(

-          socket,

-          host,

-          port,

-          autoClose

-      );

-  }

-  

-  /**

-   * @see SecureProtocolSocketFactory#createSocket(java.lang.String,int,java.net.InetAddress,int,org.apache.commons.httpclient.params.HttpConnectionParams)

-   */

-  public Socket createSocket(

-      String host,

-      int port,

-      InetAddress clientHost,

-      int clientPort,

-      HttpConnectionParams params)

-      throws IOException, UnknownHostException, org.apache.commons.httpclient.ConnectTimeoutException {

-

-      Socket socket = createSocket(host, port, clientHost, clientPort);

-      if (socket != null) {

-          // socket.setKeepAlive(false);

-          if (params.getReceiveBufferSize() >= 0)

-              socket.setReceiveBufferSize(params.getReceiveBufferSize());

-          if (params.getSendBufferSize() >= 0)

-              socket.setSendBufferSize(params.getSendBufferSize());

-          socket.setReuseAddress(true);

-          if (params.getSoTimeout() >= 0)

-              socket.setSoTimeout(params.getSoTimeout());

-      }

-      return socket;

-    

-  }

-

-  /**

-   * @see java.lang.Object#equals(java.lang.Object)

-   */

-  public boolean equals(Object obj) {

-      return ((obj != null) && obj.getClass().equals(SZRGWSecureSocketFactory.class));

-  }

-

-  /**

-   * @see java.lang.Object#hashCode()

-   */

-  public int hashCode() {

-      return SZRGWSecureSocketFactory.class.hashCode();

-  }

-  

-}

-