bitte warten...

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@56 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

2 files changed, 126 insertions, 124 deletions

diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/InfoBoxReadRequestHandler.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/InfoBoxReadRequestHandler.java
index 7dc2e202..25085b16 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/InfoBoxReadRequestHandler.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/InfoBoxReadRequestHandler.java
@@ -14,127 +14,128 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package at.gv.egiz.bku.smccstal;

-

-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.stal.ErrorResponse;

-import at.gv.egiz.stal.InfoboxReadRequest;

-import at.gv.egiz.stal.InfoboxReadResponse;

-import at.gv.egiz.stal.STALRequest;

-import at.gv.egiz.stal.STALResponse;

-

-public class InfoBoxReadRequestHandler extends AbstractRequestHandler implements

-    PINProvider {

-

-  private static Log log = LogFactory.getLog(InfoBoxReadRequestHandler.class);

-

-  private int retryCounter = 0;

-

-  @Override

-  public STALResponse handleRequest(STALRequest request) {

-    if (request instanceof InfoboxReadRequest) {

-      InfoboxReadRequest infoBox = (InfoboxReadRequest) request;

-      try {

-        if (infoBox.getInfoboxIdentifier().equals("IdentityLink")) {

-          newSTALMessage("Message.RequestCaption", "Message.IdentityLink");

-          log.debug("Handling identitylink infobox");

-          byte[] resp = card.getInfobox(infoBox.getInfoboxIdentifier(), this,

-              infoBox.getDomainIdentifier());

-          if (resp == null) {

-            log.info("Got null as result->user cancelled");

-            return new ErrorResponse(6001);

-          } else {

-            try {

-              resp = DomainIdConverter.convertDomainId(resp, infoBox

-                  .getDomainIdentifier());

-            } catch (Exception e) {

-              log.error("Cannot convert domain specific id", e);

-              return new ErrorResponse(1000);

-            }

-          }

-          InfoboxReadResponse stalResp = new InfoboxReadResponse();

-          stalResp.setInfoboxValue(resp);

-          return stalResp;

-        } else if (SignatureCard.KeyboxName.CERITIFIED_KEYPAIR.equals(infoBox

-            .getInfoboxIdentifier())) {

-          newSTALMessage("Message.RequestCaption", "Message.CertifiedKeypair");

-          log.debug("Handling certified keypair infobox");

-          byte[] resp = card

-              .getCertificate(SignatureCard.KeyboxName.CERITIFIED_KEYPAIR);

-          if (resp == null) {

-            return new ErrorResponse(6001);

-          }

-          InfoboxReadResponse stalResp = new InfoboxReadResponse();

-          stalResp.setInfoboxValue(resp);

-          return stalResp;

-        } else if (SignatureCard.KeyboxName.SECURE_SIGNATURE_KEYPAIR

-            .equals(infoBox.getInfoboxIdentifier())) {

-          newSTALMessage("Message.RequestCaption",

-              "Message.SecureSignatureKeypair");

-          log.debug("Handling secure signature keypair infobox");

-          byte[] resp = card

-              .getCertificate(SignatureCard.KeyboxName.SECURE_SIGNATURE_KEYPAIR);

-          if (resp == null) {

-            return new ErrorResponse(6001);

-          }

-          InfoboxReadResponse stalResp = new InfoboxReadResponse();

-          stalResp.setInfoboxValue(resp);

-          return stalResp;

-        } else {

-          newSTALMessage("Message.RequestCaption", "Message.InfoboxReadRequest");

-          log.warn("Unknown infobox identifier: "

-              + infoBox.getInfoboxIdentifier() + " trying generic request");

-          byte[] resp = card.getInfobox(infoBox.getInfoboxIdentifier(), this,

-              infoBox.getDomainIdentifier());

-          if (resp == null) {

-            return new ErrorResponse(6001);

-          }

-          InfoboxReadResponse stalResp = new InfoboxReadResponse();

-          stalResp.setInfoboxValue(resp);

-          return stalResp;

-        }

-      } catch (CancelledException cx) {

-        log.debug("User cancelled request", cx);

-        return new ErrorResponse(6001);

-      } catch (SignatureCardException e) {

-        log.info("Error while reading infobox: " + e);

-        return new ErrorResponse(4000);

-      }

-    } 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.showCardPINRetryDialog(spec, retries, this, "ok", this, "cancel");

-    } else {

-      gui.showCardPINDialog(spec, this, "ok", this, "cancel");

-    }

-    waitForAction();

-    if (actionCommand.equals("cancel")) {

-      return null;

-    }

-    return new String(gui.getPin());

-  }

-

-  @Override

-  public SMCCSTALRequestHandler newInstance() {

-    return new InfoBoxReadRequestHandler();

-  }

-}

+package at.gv.egiz.bku.smccstal;
+
+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.stal.ErrorResponse;
+import at.gv.egiz.stal.InfoboxReadRequest;
+import at.gv.egiz.stal.InfoboxReadResponse;
+import at.gv.egiz.stal.STALRequest;
+import at.gv.egiz.stal.STALResponse;
+
+public class InfoBoxReadRequestHandler extends AbstractRequestHandler implements
+    PINProvider {
+
+  private static Log log = LogFactory.getLog(InfoBoxReadRequestHandler.class);
+
+  private int retryCounter = 0;
+
+  @Override
+  public STALResponse handleRequest(STALRequest request) {
+    if (request instanceof InfoboxReadRequest) {
+      InfoboxReadRequest infoBox = (InfoboxReadRequest) request;
+      try {
+        if (infoBox.getInfoboxIdentifier().equals("IdentityLink")) {
+          newSTALMessage("Message.RequestCaption", "Message.IdentityLink");
+          log.debug("Handling identitylink infobox");
+          byte[] resp = card.getInfobox(infoBox.getInfoboxIdentifier(), this,
+              infoBox.getDomainIdentifier());
+          if (resp == null) {
+            log.info("Got null as result->user cancelled");
+            return new ErrorResponse(6001);
+          } else {
+            try {
+              resp = DomainIdConverter.convertDomainId(resp, infoBox
+                  .getDomainIdentifier());
+            } catch (Exception e) {
+              log.error("Cannot convert domain specific id", e);
+              return new ErrorResponse(1000);
+            }
+          }
+          InfoboxReadResponse stalResp = new InfoboxReadResponse();
+          stalResp.setInfoboxValue(resp);
+          return stalResp;
+        } else if (SignatureCard.KeyboxName.CERITIFIED_KEYPAIR.equals(infoBox
+            .getInfoboxIdentifier())) {
+          newSTALMessage("Message.RequestCaption", "Message.CertifiedKeypair");
+          log.debug("Handling certified keypair infobox");
+          byte[] resp = card
+              .getCertificate(SignatureCard.KeyboxName.CERITIFIED_KEYPAIR);
+          if (resp == null) {
+            return new ErrorResponse(6001);
+          }
+          InfoboxReadResponse stalResp = new InfoboxReadResponse();
+          stalResp.setInfoboxValue(resp);
+          return stalResp;
+        } else if (SignatureCard.KeyboxName.SECURE_SIGNATURE_KEYPAIR
+            .equals(infoBox.getInfoboxIdentifier())) {
+          newSTALMessage("Message.RequestCaption",
+              "Message.SecureSignatureKeypair");
+          log.debug("Handling secure signature keypair infobox");
+          byte[] resp = card
+              .getCertificate(SignatureCard.KeyboxName.SECURE_SIGNATURE_KEYPAIR);
+          if (resp == null) {
+            return new ErrorResponse(6001);
+          }
+          InfoboxReadResponse stalResp = new InfoboxReadResponse();
+          stalResp.setInfoboxValue(resp);
+          return stalResp;
+        } else {
+          newSTALMessage("Message.RequestCaption", "Message.InfoboxReadRequest");
+          log.warn("Unknown infobox identifier: "
+              + infoBox.getInfoboxIdentifier() + " trying generic request");
+          byte[] resp = card.getInfobox(infoBox.getInfoboxIdentifier(), this,
+              infoBox.getDomainIdentifier());
+          if (resp == null) {
+            return new ErrorResponse(6001);
+          }
+          InfoboxReadResponse stalResp = new InfoboxReadResponse();
+          stalResp.setInfoboxValue(resp);
+          return stalResp;
+        }
+      } catch (CancelledException cx) {
+        log.debug("User cancelled request", cx);
+        return new ErrorResponse(6001);
+      } catch (SignatureCardException e) {
+        log.info("Error while reading infobox: " + e);
+        return new ErrorResponse(4000);
+      }
+    } 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.showCardPINRetryDialog(spec, retries, this, "ok", this, "cancel");
+    } else {
+      gui.showCardPINDialog(spec, this, "ok", this, "cancel");
+    }
+    waitForAction();
+    gui.showWaitDialog(null);
+    if (actionCommand.equals("cancel")) {
+      return null;
+    }
+    return new String(gui.getPin());
+  }
+
+  @Override
+  public SMCCSTALRequestHandler newInstance() {
+    return new InfoBoxReadRequestHandler();
+  }
+}
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 59eed55f..8f380eec 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
@@ -305,6 +305,7 @@ public abstract class SignRequestHandler extends AbstractRequestHandler implemen
     }
     do {
       waitForAction();
+      gui.showWaitDialog(null);
       if (actionCommand.equals("cancel")) {
         return null;
       } else if (actionCommand.equals("hashData")) {