1 files changed, 187 insertions, 150 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 6ae4fa01..2fe77c5d 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
@@ -1,151 +1,188 @@
 /*
-* Copyright 2008 Federal Chancellery Austria and
-* Graz University of Technology
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-package at.gv.egiz.bku.smccstal;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import at.gv.egiz.smcc.CancelledException;
-import at.gv.egiz.smcc.PINProvider;
-import at.gv.egiz.smcc.PINSpec;
-import at.gv.egiz.smcc.SignatureCard;
-import at.gv.egiz.smcc.SignatureCardException;
-import at.gv.egiz.smcc.SignatureCard.KeyboxName;
-import at.gv.egiz.stal.ErrorResponse;
-import at.gv.egiz.stal.STALRequest;
-import at.gv.egiz.stal.STALResponse;
-import at.gv.egiz.stal.SignRequest;
-import at.gv.egiz.stal.SignResponse;
-import at.gv.egiz.stal.signedinfo.ObjectFactory;
-import at.gv.egiz.stal.signedinfo.SignedInfoType;
-import at.gv.egiz.stal.util.JCEAlgorithmNames;
-
-public class SignRequestHandler extends AbstractRequestHandler implements
-    PINProvider {
-  private static Log log = LogFactory.getLog(SignRequestHandler.class);
-
-  private static JAXBContext jaxbContext;
-
-  static {
-    try {
-      jaxbContext = JAXBContext.newInstance(ObjectFactory.class.getPackage()
-          .getName());
-    } catch (JAXBException e) {
-      log.fatal("Cannot init jaxbContext", e);
-    }
-  }
-
-  private int retryCounter = 0;
-
-  public SignRequestHandler() {
-  }
-
-  @SuppressWarnings("unchecked")
-  @Override
-  public STALResponse handleRequest(STALRequest request) {
-    if (request instanceof SignRequest) {
-      SignRequest signReq = (SignRequest) request;
-      newSTALMessage("Message.RequestCaption", "Message.SignRequest");
-      try {
-        Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
-        InputStream is = new ByteArrayInputStream(signReq.getSignedInfo());
-        JAXBElement<SignedInfoType> signedInfo = (JAXBElement<SignedInfoType>) unmarshaller
-            .unmarshal(is);
-        String signatureMethod = signedInfo.getValue().getSignatureMethod()
-            .getAlgorithm();
-        log.debug("Found signature method: " + signatureMethod);
-        String jceName = JCEAlgorithmNames.getJCEHashName(signatureMethod);
-        if (jceName == null) {
-          log.error("Hash algorithm not supported:");
-          return new ErrorResponse(1000);
-        }
-        MessageDigest md = MessageDigest.getInstance(jceName);
-        md.update(signReq.getSignedInfo());
-        KeyboxName kb = SignatureCard.KeyboxName.getKeyboxName(signReq
-            .getKeyIdentifier());
-        byte[] resp = card.createSignature(md.digest(), kb, this);
-        if (resp == null) {
-          return new ErrorResponse(6001);
-        }
-        SignResponse stalResp = new SignResponse();
-        stalResp.setSignatureValue(resp);
-        return stalResp;
-      } catch (CancelledException cx) {
-        log.debug("User cancelled request");
-        return new ErrorResponse(6001);
-      } catch (SignatureCardException e) {
-        log.error("Error while creating signature: " + e);
-        return new ErrorResponse(4000);
-      } catch (JAXBException e) {
-        log.error("Cannot unmarshall signed info", e);
-        return new ErrorResponse(1000);
-      } catch (NoSuchAlgorithmException e) {
-        log.error(e);
-        return new ErrorResponse(1000);
-      }
-    } else {
-      log.fatal("Got unexpected STAL request: " + request);
-      return new ErrorResponse(1000);
-    }
-  }
-
-  @Override
-  public boolean requireCard() {
-    return true;
-  }
-
-  @Override
-  public String providePIN(PINSpec spec, int retries) {
-    if (retryCounter++ > 0) {
-      log.info("PIN wrong retrying ...");
-      gui.showSignaturePINRetryDialog(spec, retries, this, "sign", this,
-          "cancel", this, "hashData");
-    } else {
-      gui.showSignaturePINDialog(spec, this, "sign", this, "cancel", this,
-          "hashData");
-    }
-    do {
-      waitForAction();
-      if (actionCommand.equals("cancel")) {
-        return null;
-      } else if (actionCommand.equals("hashData")) {
-        // FIXME provide hashdata input
-        gui.showHashDataInputDialog(null, this, "ok");
-      } else if (actionCommand.equals("sign")) {
-        return new String(gui.getPin());
-      } else if (actionCommand.equals("ok")) {
-        gui.showSignaturePINDialog(spec, this, "sign", this, "cancel", this,
-        "hashData"); 
-      }
-    } while (true);
-  }
-
-  @Override
-  public SMCCSTALRequestHandler newInstance() {
-    return new SignRequestHandler();
-  }
-}
+ * Copyright 2008 Federal Chancellery Austria and
+ * Graz University of Technology
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package at.gv.egiz.bku.smccstal;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import at.gv.egiz.smcc.CancelledException;
+import at.gv.egiz.smcc.PINProvider;
+import at.gv.egiz.smcc.PINSpec;
+import at.gv.egiz.smcc.SignatureCard;
+import at.gv.egiz.smcc.SignatureCardException;
+import at.gv.egiz.smcc.SignatureCard.KeyboxName;
+import at.gv.egiz.stal.ErrorResponse;
+import at.gv.egiz.stal.HashDataInput;
+import at.gv.egiz.stal.STALRequest;
+import at.gv.egiz.stal.STALResponse;
+import at.gv.egiz.stal.SignRequest;
+import at.gv.egiz.stal.SignResponse;
+import at.gv.egiz.stal.signedinfo.ObjectFactory;
+import at.gv.egiz.stal.signedinfo.ReferenceType;
+import at.gv.egiz.stal.signedinfo.SignedInfoType;
+import at.gv.egiz.stal.util.JCEAlgorithmNames;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * This class is NOT thread-safe. 
+ * handleRequest() sets the SignedInfo which is used in providePIN.
+ */
+public class SignRequestHandler extends AbstractRequestHandler implements
+  PINProvider {
+
+    private static Log log = LogFactory.getLog(SignRequestHandler.class);
+    private static JAXBContext jaxbContext;
+    
+
+    static {
+        try {
+            jaxbContext = JAXBContext.newInstance(ObjectFactory.class.getPackage().getName());
+        } catch (JAXBException e) {
+            log.fatal("Cannot init jaxbContext", e);
+        }
+    }
+    /** the SignedInfo of the current SignRequest */
+    protected SignedInfoType signedInfo;
+    protected List<HashDataInput> hashDataInputs;
+    
+    private int retryCounter = 0;
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public STALResponse handleRequest(STALRequest request) {
+        if (request instanceof SignRequest) {
+            SignRequest signReq = (SignRequest) request;
+            newSTALMessage("Message.RequestCaption", "Message.SignRequest");
+            try {
+                Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
+                InputStream is = new ByteArrayInputStream(signReq.getSignedInfo());
+                JAXBElement<SignedInfoType> si = (JAXBElement<SignedInfoType>) unmarshaller.unmarshal(is);
+                signedInfo = si.getValue();
+                String signatureMethod = signedInfo.getSignatureMethod().getAlgorithm();
+                log.debug("Found signature method: " + signatureMethod);
+                String jceName = JCEAlgorithmNames.getJCEHashName(signatureMethod);
+                if (jceName == null) {
+                    log.error("Hash algorithm not supported:");
+                    return new ErrorResponse(1000);
+                }
+                MessageDigest md = MessageDigest.getInstance(jceName);
+                md.update(signReq.getSignedInfo());
+                KeyboxName kb = SignatureCard.KeyboxName.getKeyboxName(signReq.getKeyIdentifier());
+                byte[] resp = card.createSignature(md.digest(), kb, this);
+                if (resp == null) {
+                    return new ErrorResponse(6001);
+                }
+                SignResponse stalResp = new SignResponse();
+                stalResp.setSignatureValue(resp);
+                return stalResp;
+            } catch (CancelledException cx) {
+                log.debug("User cancelled request");
+                return new ErrorResponse(6001);
+            } catch (SignatureCardException e) {
+                log.error("Error while creating signature: " + e);
+                return new ErrorResponse(4000);
+            } catch (JAXBException e) {
+                log.error("Cannot unmarshall signed info", e);
+                return new ErrorResponse(1000);
+            } catch (NoSuchAlgorithmException e) {
+                log.error(e);
+                return new ErrorResponse(1000);
+            } finally {
+                signedInfo = null;
+            }
+        } else {
+            log.fatal("Got unexpected STAL request: " + request);
+            return new ErrorResponse(1000);
+        }
+    }
+
+    @Override
+    public boolean requireCard() {
+        return true;
+    }
+
+    @Override
+    public String providePIN(PINSpec spec, int retries) {
+        if (retryCounter++ > 0) {
+            log.info("PIN wrong retrying ...");
+            gui.showSignaturePINRetryDialog(spec, retries, this, "sign", this,
+              "cancel", this, "hashData");
+        } else {
+            gui.showSignaturePINDialog(spec, this, "sign", this, "cancel", this,
+              "hashData");
+        }
+        do {
+            waitForAction();
+            if (actionCommand.equals("cancel")) {
+                return null;
+            } else if (actionCommand.equals("hashData")) {
+                if (signedInfo != null) {
+                    try {
+                        gui.showWaitDialog(null);
+                        if (hashDataInputs == null) {
+                            hashDataInputs = getHashDataInputs(signedInfo.getReference());
+                        }
+                        gui.showHashDataInputDialog(hashDataInputs, this, "ok");
+                        waitForAction();
+                        gui.showSignaturePINDialog(spec, this, "sign", this, "cancel", this,
+                            "hashData");
+                    } catch (Exception ex) {
+                        //FIXME localize messages
+                        log.error("Failed to obtain HashDataInputs: " + ex.getMessage());
+                        gui.showErrorDialog("Failed to obtain HashDataInputs: " + ex.getMessage(), this, "ok");
+                    }
+                } else {
+                    //FIXME get all hashdatainputs
+                    gui.showErrorDialog("Failed to obtain HashDataInputs: No dsig:SignedInfo provided.", this, "ok");
+                }
+            } else if (actionCommand.equals("sign")) {
+                return new String(gui.getPin());
+            } else if (actionCommand.equals("ok")) {
+                gui.showSignaturePINDialog(spec, this, "sign", this, "cancel", this,
+                  "hashData");
+            }
+        } while (true);
+    }
+
+    @Override
+    public SMCCSTALRequestHandler newInstance() {
+        return new SignRequestHandler();
+    }
+
+    /**
+     * override by subclass
+     * @return
+     */
+    protected List<HashDataInput> getHashDataInputs(List<ReferenceType> signedReferences) throws Exception {
+        //TODO
+        log.warn("Return empty HashDataInput");
+        return new ArrayList<HashDataInput>();
+    }
+}