summaryrefslogtreecommitdiff
path: root/smccSTAL/src
diff options
context:
space:
mode:
authortkellner <tkellner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2012-09-21 15:50:48 +0000
committertkellner <tkellner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2012-09-21 15:50:48 +0000
commit583630aa62be7f80d1e4904d5237e6836e8cdbe8 (patch)
tree2e74f55acc01c680fde18bdf1ac6d62cf3b3fe7f /smccSTAL/src
parent106f1a93d634af44da934aa4a61ef5bbc4426ae3 (diff)
downloadmocca-583630aa62be7f80d1e4904d5237e6836e8cdbe8.tar.gz
mocca-583630aa62be7f80d1e4904d5237e6836e8cdbe8.tar.bz2
mocca-583630aa62be7f80d1e4904d5237e6836e8cdbe8.zip
Create (client) & Log (server) STAL error messages
git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@1136 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
Diffstat (limited to 'smccSTAL/src')
-rw-r--r--smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java36
-rw-r--r--smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/StatusRequestHandler.java4
2 files changed, 21 insertions, 19 deletions
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
index a6a58806..41ef90a5 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java
@@ -55,7 +55,7 @@ import at.gv.egiz.stal.signedinfo.SignedInfoType;
public class SignRequestHandler extends AbstractRequestHandler {
- private final Logger log = LoggerFactory.getLogger(SignRequestHandler.class);
+ private final static Logger log = LoggerFactory.getLogger(SignRequestHandler.class);
private static JAXBContext jaxbContext;
static {
@@ -73,6 +73,14 @@ public class SignRequestHandler extends AbstractRequestHandler {
this.secureViewer = secureViewer;
}
+ private ErrorResponse errorResponse(int errorCode, String errorMessage, Exception e)
+ {
+ log.error(errorMessage, e);
+ ErrorResponse err = new ErrorResponse(errorCode);
+ err.setErrorMessage(errorMessage + (e == null ? "" : " " + e));
+ return err;
+ }
+
@SuppressWarnings("unchecked")
@Override
public STALResponse handleRequest(STALRequest request) throws InterruptedException {
@@ -89,50 +97,42 @@ public class SignRequestHandler extends AbstractRequestHandler {
byte[] resp = card.createSignature(new ByteArrayInputStream(signReq.getSignedInfo()), kb,
new SignPINGUI(gui, secureViewer, si.getValue()), signatureMethod);
if (resp == null) {
- return new ErrorResponse(6001);
+ return errorResponse(6001, "Response is null", null);
}
SignResponse stalResp = new SignResponse();
stalResp.setSignatureValue(resp);
return stalResp;
} catch (NotActivatedException e) {
- log.info("Citizen card not activated.", e);
gui.showErrorDialog(BKUGUIFacade.ERR_CARD_NOTACTIVATED, null, this, null);
waitForAction();
gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
BKUGUIFacade.MESSAGE_WAIT);
- return new ErrorResponse(6001);
+ return errorResponse(6001, "Citizen card not activated.", e);
} catch (LockedException e) {
- log.info("Citizen card locked.", e);
gui.showErrorDialog(BKUGUIFacade.ERR_CARD_LOCKED, null, this, null);
waitForAction();
gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
BKUGUIFacade.MESSAGE_WAIT);
- return new ErrorResponse(6001);
+ return errorResponse(6001, "Citizen card locked.", e);
} catch (CancelledException cx) {
- log.debug("User cancelled request.");
- return new ErrorResponse(6001);
+ return errorResponse(6001, "User cancelled request.", null);
} catch (TimeoutException ex) {
- log.error("Timeout during pin entry");
gui.showMessageDialog(BKUGUIFacade.TITLE_ENTRY_TIMEOUT,
BKUGUIFacade.ERR_PIN_TIMEOUT, null,
BKUGUIFacade.BUTTON_CANCEL, this, null);
waitForAction();
gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
BKUGUIFacade.MESSAGE_WAIT);
- return new ErrorResponse(6001);
+ return errorResponse(6001, "Timeout during pin entry.", null);
} catch (SignatureCardException e) {
- log.error("Error while creating signature: " + e);
- return new ErrorResponse(4000);
+ return errorResponse(4000,"Error while creating signature.", e);
} catch (JAXBException e) {
- log.error("Cannot unmarshall signed info.", e);
- return new ErrorResponse(1000);
+ return errorResponse(1000, "Cannot unmarshall signed info.", e);
} catch (IOException e) {
- log.error("Error while creating signature: " + e);
- return new ErrorResponse(4000);
+ return errorResponse(4000, "Error while creating signature.", e);
}
} else {
- log.error("Got unexpected STAL request: {}.", request);
- return new ErrorResponse(1000);
+ return errorResponse(1000, "Got unexpected STAL request: " + request + ".", null);
}
}
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/StatusRequestHandler.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/StatusRequestHandler.java
index 706774e4..86711ca4 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/StatusRequestHandler.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/StatusRequestHandler.java
@@ -69,7 +69,9 @@ public class StatusRequestHandler extends AbstractRequestHandler {
return response;
} else {
log.error("Got unexpected STAL request: {}.", request);
- return new ErrorResponse(1000);
+ ErrorResponse err = new ErrorResponse(1000);
+ err.setErrorMessage("Got unexpected STAL request: " + request);
+ return err;
}
}