From 2476bca83442dbce0d3dfce744e9c320ce802a4e Mon Sep 17 00:00:00 2001 From: tkellner Date: Mon, 2 Apr 2012 16:39:06 +0000 Subject: Renamed PersonIdentityLink to IdentityLink git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@1046 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- .../egiz/bku/smccstal/IdentityLinkExtractor.java | 14 +-- .../bku/smccstal/IdentityLinkRequestHandler.java | 119 +++++++++++++++++++++ .../smccstal/PersonIdentityLinkRequestHandler.java | 119 --------------------- 3 files changed, 126 insertions(+), 126 deletions(-) create mode 100644 smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/IdentityLinkRequestHandler.java delete mode 100644 smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/PersonIdentityLinkRequestHandler.java (limited to 'smccSTALExt/src/main/java/at/gv/egiz') diff --git a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/IdentityLinkExtractor.java b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/IdentityLinkExtractor.java index b1aa9326..6fbeda1d 100644 --- a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/IdentityLinkExtractor.java +++ b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/IdentityLinkExtractor.java @@ -35,7 +35,7 @@ public class IdentityLinkExtractor { private static final Logger log = LoggerFactory.getLogger(IdentityLinkExtractor.class); - private static ASN1 getPersonData(ASN1 identityLink) throws IOException + private static ASN1 getData(ASN1 identityLink) throws IOException { if(identityLink.getSize() > 4 ) { @@ -54,9 +54,9 @@ public class IdentityLinkExtractor { } } - public static String getPersonFirstName(ASN1 identityLink) throws IOException + public static String getFirstName(ASN1 identityLink) throws IOException { - ASN1 personData = getPersonData(identityLink); + ASN1 personData = getData(identityLink); if(personData != null) { return personData.getElementAt(1).gvString(); @@ -64,9 +64,9 @@ public class IdentityLinkExtractor { return null; } - public static String getPersonLastName(ASN1 identityLink) throws IOException + public static String getLastName(ASN1 identityLink) throws IOException { - ASN1 personData = getPersonData(identityLink); + ASN1 personData = getData(identityLink); if(personData != null) { return personData.getElementAt(2).gvString(); @@ -74,9 +74,9 @@ public class IdentityLinkExtractor { return null; } - public static String getPersonDateOfBirth(ASN1 identityLink) throws IOException + public static String getDateOfBirth(ASN1 identityLink) throws IOException { - ASN1 personData = getPersonData(identityLink); + ASN1 personData = getData(identityLink); if(personData != null) { return personData.getElementAt(3).gvString(); diff --git a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/IdentityLinkRequestHandler.java b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/IdentityLinkRequestHandler.java new file mode 100644 index 00000000..9ba63a89 --- /dev/null +++ b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/IdentityLinkRequestHandler.java @@ -0,0 +1,119 @@ +/* + * Copyright 2011 by Graz University of Technology, Austria + * MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint + * initiative of the Federal Chancellery Austria 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.egiz.bku.smccstal; + +import iaik.me.asn1.ASN1; + +import java.io.IOException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import at.gv.egiz.bku.gui.PINManagementGUIFacade; +import at.gv.egiz.bku.gui.IdentityLinkGUIFacade; +import at.gv.egiz.bku.pin.gui.VerifyPINGUI; +import at.gv.egiz.smcc.SignatureCardException; +import at.gv.egiz.stal.ErrorResponse; +import at.gv.egiz.stal.STALRequest; +import at.gv.egiz.stal.STALResponse; +import at.gv.egiz.stal.ext.IdentityLinkRequest; +import at.gv.egiz.stal.ext.IdentityLinkResponse; + +/** + * + * @author Andreas Fitzek + */ +public class IdentityLinkRequestHandler extends AbstractRequestHandler { + + private final static String IdentityInfoBox = "IdentityLink"; + + private final Logger log = LoggerFactory.getLogger(IdentityLinkRequestHandler.class); + + //IdentityLinkGUIFacade il_gui = (IdentityLinkGUIFacade) this.gui; + + @Override + public boolean requireCard() { + return true; + } + + @Override + public STALResponse handleRequest(STALRequest request) + throws InterruptedException { + if(request instanceof IdentityLinkRequest) + { + try + { + byte[] identity_asn1 = card.getInfobox(IdentityInfoBox, new VerifyPINGUI(gui), ""); + + ASN1 identity_object = new ASN1(identity_asn1); + + String firstname = IdentityLinkExtractor.getFirstName(identity_object); + String lastname = IdentityLinkExtractor.getLastName(identity_object); + String dateofBirth = IdentityLinkExtractor.getDateOfBirth(identity_object); + + // TODO: correct error handling ... + IdentityLinkGUIFacade il_gui = null; + + if(gui instanceof IdentityLinkGUIFacade) + { + il_gui = (IdentityLinkGUIFacade) gui; + } + + if(il_gui == null) + { + log.warn("Failed to cast gui to IdentityLinkGUIFacade!"); + return new ErrorResponse(1000); + } + + il_gui.showIdentityLinkInformationDialog(this, "ok_action", + firstname, + lastname, + dateofBirth); + + waitForAction(); + + return new IdentityLinkResponse(); + } + catch(SignatureCardException ex) + { + log.error(ex.getMessage(), ex); + gui.showErrorDialog(PINManagementGUIFacade.ERR_CARD_NOTACTIVATED, + null, this, "cancel"); + waitForAction(); + return new ErrorResponse(1000); + } catch (IOException ex) { + log.error(ex.getMessage(), ex); + gui.showErrorDialog(IdentityLinkGUIFacade.ERR_INFOBOX_INVALID, + null, this, "cancel"); + waitForAction(); + return new ErrorResponse(1000); + } + } + else + { + log.error("Got unexpected STAL request: {}.", request); + return new ErrorResponse(1000); + } + } +} diff --git a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/PersonIdentityLinkRequestHandler.java b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/PersonIdentityLinkRequestHandler.java deleted file mode 100644 index d8873f77..00000000 --- a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/PersonIdentityLinkRequestHandler.java +++ /dev/null @@ -1,119 +0,0 @@ -/* - * Copyright 2011 by Graz University of Technology, Austria - * MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint - * initiative of the Federal Chancellery Austria 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.egiz.bku.smccstal; - -import iaik.me.asn1.ASN1; - -import java.io.IOException; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import at.gv.egiz.bku.gui.PINManagementGUIFacade; -import at.gv.egiz.bku.gui.PersonIdentityLinkGUIFacade; -import at.gv.egiz.bku.pin.gui.VerifyPINGUI; -import at.gv.egiz.smcc.SignatureCardException; -import at.gv.egiz.stal.ErrorResponse; -import at.gv.egiz.stal.STALRequest; -import at.gv.egiz.stal.STALResponse; -import at.gv.egiz.stal.ext.PersonIdentityLinkRequest; -import at.gv.egiz.stal.ext.PersonIdentityLinkResponse; - -/** - * - * @author Andreas Fitzek - */ -public class PersonIdentityLinkRequestHandler extends AbstractRequestHandler { - - private final static String IdentityInfoBox = "IdentityLink"; - - private final Logger log = LoggerFactory.getLogger(PersonIdentityLinkRequestHandler.class); - - //PersonIdentityLinkGUIFacade person_gui = (PersonIdentityLinkGUIFacade) this.gui; - - @Override - public boolean requireCard() { - return true; - } - - @Override - public STALResponse handleRequest(STALRequest request) - throws InterruptedException { - if(request instanceof PersonIdentityLinkRequest) - { - try - { - byte[] identity_asn1 = card.getInfobox(IdentityInfoBox, new VerifyPINGUI(gui), ""); - - ASN1 identity_object = new ASN1(identity_asn1); - - String firstname = IdentityLinkExtractor.getPersonFirstName(identity_object); - String lastname = IdentityLinkExtractor.getPersonLastName(identity_object); - String dateofBirth = IdentityLinkExtractor.getPersonDateOfBirth(identity_object); - - // TODO: correct error handling ... - PersonIdentityLinkGUIFacade person_gui = null; - - if(gui instanceof PersonIdentityLinkGUIFacade) - { - person_gui = (PersonIdentityLinkGUIFacade) gui; - } - - if(person_gui == null) - { - log.warn("Failed to cast gui to PersonIdentityLinkGUIFacade!"); - return new ErrorResponse(1000); - } - - person_gui.showPersonIdentityLinkInformationDialog(this, "ok_action", - firstname, - lastname, - dateofBirth); - - waitForAction(); - - return new PersonIdentityLinkResponse(); - } - catch(SignatureCardException ex) - { - log.error(ex.getMessage(), ex); - gui.showErrorDialog(PINManagementGUIFacade.ERR_CARD_NOTACTIVATED, - null, this, "cancel"); - waitForAction(); - return new ErrorResponse(1000); - } catch (IOException ex) { - log.error(ex.getMessage(), ex); - gui.showErrorDialog(PersonIdentityLinkGUIFacade.ERR_INFOBOX_INVALID, - null, this, "cancel"); - waitForAction(); - return new ErrorResponse(1000); - } - } - else - { - log.error("Got unexpected STAL request: {}.", request); - return new ErrorResponse(1000); - } - } -} -- cgit v1.2.3