add additional errorcodes to protcols

2 files changed, 120 insertions, 16 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ErrorResponseUtils.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ErrorResponseUtils.java
new file mode 100644
index 000000000..778351d1f
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ErrorResponseUtils.java
@@ -0,0 +1,103 @@
+/*
+ * 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.
+ */
+package at.gv.egovernment.moa.id.util;
+
+import java.util.Locale;
+
+import at.gv.egovernment.moa.id.auth.exception.BKUException;
+import at.gv.egovernment.moa.id.auth.exception.MISSimpleClientException;
+import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
+import at.gv.egovernment.moa.id.protocols.oauth20.exceptions.OAuth20Exception;
+import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.PVP2Exception;
+import at.gv.egovernment.moa.util.Messages;
+import at.gv.egovernment.moa.util.MiscUtil;
+
+/**
+ * @author tlenz
+ *
+ */
+public class ErrorResponseUtils {
+
+	public static final String INTERNALERRORCODE = "9199"; 
+	
+	private static ErrorResponseUtils instance = null;
+	private static final String[] DEFAULT_MESSAGE_RESOURCES =
+		    { "resources/properties/id_messages" };  
+	private static final Locale[] DEFAULT_MESSAGE_LOCALES =
+		    new Locale[] { new Locale("de", "AT") };
+	private Messages messages = null;
+	
+	
+	public static ErrorResponseUtils getInstance() {
+		if (instance == null) {
+			instance = new ErrorResponseUtils(DEFAULT_MESSAGE_RESOURCES, DEFAULT_MESSAGE_LOCALES);
+			
+		}
+		return instance;
+	}
+	
+	private ErrorResponseUtils(String[] resourceNames, Locale[] locales) {
+		this.messages = new Messages(resourceNames, locales);
+	}
+	
+	public String getResponseErrorCode(Throwable throwable) {
+		String errorCode = null;
+		
+		if (throwable instanceof BKUException) {
+			BKUException error = (BKUException) throwable;			
+			errorCode = mapInternalErrorToExternalError(error.getMessageId()) + 
+					error.getBkuErrorCode();			
+			
+		} else if (throwable instanceof MISSimpleClientException) {
+			MISSimpleClientException error = (MISSimpleClientException) throwable;
+			
+			if (MiscUtil.isNotEmpty(error.getMISErrorCode()))
+				errorCode = mapInternalErrorToExternalError(error.getMessageId()) + 
+						error.getMISErrorCode();							
+			else
+				errorCode = mapInternalErrorToExternalError(error.getMessageId());
+						
+		} else if (throwable instanceof MOAIDException) {
+			MOAIDException error = (MOAIDException) throwable;
+			errorCode = mapInternalErrorToExternalError(error.getMessageId());
+						
+		} else {
+			errorCode = INTERNALERRORCODE;
+						
+		}
+				
+		return errorCode;
+		
+	}
+	
+	public String mapInternalErrorToExternalError(String intErrorCode) {		
+		String extErrorCode = messages.getMessage(intErrorCode, null);
+		
+		if (MiscUtil.isEmpty(extErrorCode))
+			extErrorCode = INTERNALERRORCODE;
+				
+		return extErrorCode;
+		
+	}
+	
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClient.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClient.java
index b9c4e88b7..3025e626f 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClient.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClient.java
@@ -149,17 +149,17 @@ public class MISSimpleClient {
 			}

 			return foundMandates;

 		} catch (ParserConfigurationException e) {

-			throw new MISSimpleClientException(e);

+			throw new MISSimpleClientException("service.06", e);

 		} catch (DOMException e) {

-			throw new MISSimpleClientException(e);

+			throw new MISSimpleClientException("service.06", e);

 		} catch (TransformerException e) {

-			throw new MISSimpleClientException(e);

+			throw new MISSimpleClientException("service.06", e);

 		} 

 	}

 	

 	public static MISSessionId sendSessionIdRequest(String webServiceURL, byte[] idl, byte[] cert, String oaFriendlyName, String redirectURL, String referenceValue, List<String> mandateIdentifier, String targetType, SSLSocketFactory sSLSocketFactory) throws MISSimpleClientException {

 		if (webServiceURL == null) {

-			throw new NullPointerException("Argument webServiceURL must not be null.");

+			throw new MISSimpleClientException("service.04");

 		}

 		if (idl == null) {

 			throw new NullPointerException("Argument idl must not be null.");

@@ -253,11 +253,11 @@ public class MISSimpleClient {
 	    

 			return msid;

 		} catch (ParserConfigurationException e) {

-			throw new MISSimpleClientException(e);

+			throw new MISSimpleClientException("service.06", e);

 		} catch (DOMException e) {

-			throw new MISSimpleClientException(e);

+			throw new MISSimpleClientException("service.06", e);

 		} catch (TransformerException e) {

-			throw new MISSimpleClientException(e);

+			throw new MISSimpleClientException("service.06", e);

 		}

 		

 	}

@@ -271,9 +271,10 @@ public class MISSimpleClient {
 		    if (errorElement != null) {

 		    	String code = ((Node) XPathAPI.selectSingleNode(mandateIssueResponseElement, "//mis:MandateIssueResponse/mis:Error/mis:Code/text()", NS_NODE)).getNodeValue();

 		    	String text = ((Node) XPathAPI.selectSingleNode(mandateIssueResponseElement, "//mis:MandateIssueResponse/mis:Error/mis:Text/text()", NS_NODE)).getNodeValue();

-		    	throw new MISSimpleClientException("Fehler beim Abfragen des Online-Vollmachten Services: " + code + " / " + text, code, text);	    }

+		    	throw new MISSimpleClientException("service.05", code, text);	    }

+		    

 		} catch (TransformerException e) {

-			throw new MISSimpleClientException(e);

+			throw new MISSimpleClientException("auth.15", e);

 		}

 	}

 	

@@ -308,19 +309,19 @@ public class MISSimpleClient {
 			return unpackFromSOAP(doc.getDocumentElement());

 			

 		} catch(IOException e) {

-			throw new MISSimpleClientException(e.getLocalizedMessage(), e);

+			throw new MISSimpleClientException("service.04", e);

 			

 		} catch (TransformerException e) {

-			throw new MISSimpleClientException(e);

+			throw new MISSimpleClientException("service.06", e);

 			

 		} catch (SAXException e) {

-			throw new MISSimpleClientException(e);

+			throw new MISSimpleClientException("service.06", e);

 			

 		} catch (ParserConfigurationException e) {

-			throw new MISSimpleClientException(e);

+			throw new MISSimpleClientException("service.06", e);

 			

 		} catch (Exception e) {

-			throw new MISSimpleClientException(e.getLocalizedMessage(), e);

+			throw new MISSimpleClientException("service.06", e);

 			

 		}

 		

@@ -336,7 +337,7 @@ public class MISSimpleClient {
 			soapBody.appendChild(doc.importNode(element, true));

 			return soapEnvelope;

 		} catch(ParserConfigurationException e) {

-			throw new MISSimpleClientException(e);

+			throw new MISSimpleClientException("service.06", e);

 		}

 	}

 	

@@ -344,7 +345,7 @@ public class MISSimpleClient {
 		try {

 			return (Element) XPathAPI.selectSingleNode(element, "/soap:Envelope/soap:Body/child::*[position()=1]", NS_NODE);

 		} catch(TransformerException e) {

-			throw new MISSimpleClientException(e);

+			throw new MISSimpleClientException("service.06", e);

 		}

 	}	

 }