From 239ec1a50524e2380d778956bbb75a539f468e2c Mon Sep 17 00:00:00 2001 From: tkellner Date: Mon, 2 Apr 2012 16:39:18 +0000 Subject: Case change git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@1056 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- .../bku/online/applet/GETCertificateApplet.java | 61 --------- .../bku/online/applet/GETCertificateBKUWorker.java | 100 --------------- .../bku/online/applet/GetCertificateApplet.java | 61 +++++++++ .../bku/online/applet/GetCertificateBKUWorker.java | 100 +++++++++++++++ .../bku/online/applet/HardwareInfoBKUWorker.java | 12 +- .../java/at/gv/egiz/bku/gui/GetCertificateGUI.java | 2 +- .../gv/egiz/bku/gui/GetCertificateGUIFacade.java | 2 +- .../at/gv/egiz/bku/local/stal/LocalBKUWorker.java | 12 +- .../local/stal/LocalGETCertificateSTALFactory.java | 136 --------------------- .../local/stal/LocalGetCertificateSTALFactory.java | 136 +++++++++++++++++++++ .../bku/local/webapp/GETCertificateServlet.java | 133 -------------------- .../bku/local/webapp/GetCertificateServlet.java | 133 ++++++++++++++++++++ .../bku/local/webapp/GetHardwareInfoServlet.java | 6 +- BKULocal/src/main/webapp/WEB-INF/web.xml | 14 +-- .../java/at/gv/egiz/bku/webstart/Launcher.java | 4 +- .../at/gv/egiz/stal/ext/GETCertificateRequest.java | 35 ------ .../gv/egiz/stal/ext/GETCertificateResponse.java | 35 ------ .../gv/egiz/stal/ext/GETHardwareInfoRequest.java | 35 ------ .../gv/egiz/stal/ext/GETHardwareInfoResponse.java | 35 ------ .../at/gv/egiz/stal/ext/GetCertificateRequest.java | 35 ++++++ .../gv/egiz/stal/ext/GetCertificateResponse.java | 35 ++++++ .../gv/egiz/stal/ext/GetHardwareInfoRequest.java | 35 ++++++ .../gv/egiz/stal/ext/GetHardwareInfoResponse.java | 35 ++++++ .../bku/smccstal/GETCertificateRequestHandler.java | 126 ------------------- .../smccstal/GETHardwareInfoRequestHandler.java | 99 --------------- .../bku/smccstal/GetCertificateRequestHandler.java | 126 +++++++++++++++++++ .../smccstal/GetHardwareInfoRequestHandler.java | 99 +++++++++++++++ 27 files changed, 821 insertions(+), 821 deletions(-) delete mode 100644 BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/GETCertificateApplet.java delete mode 100644 BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/GETCertificateBKUWorker.java create mode 100644 BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/GetCertificateApplet.java create mode 100644 BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/GetCertificateBKUWorker.java delete mode 100644 BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalGETCertificateSTALFactory.java create mode 100644 BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalGetCertificateSTALFactory.java delete mode 100644 BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GETCertificateServlet.java create mode 100644 BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GetCertificateServlet.java delete mode 100644 STALExt/src/main/java/at/gv/egiz/stal/ext/GETCertificateRequest.java delete mode 100644 STALExt/src/main/java/at/gv/egiz/stal/ext/GETCertificateResponse.java delete mode 100644 STALExt/src/main/java/at/gv/egiz/stal/ext/GETHardwareInfoRequest.java delete mode 100644 STALExt/src/main/java/at/gv/egiz/stal/ext/GETHardwareInfoResponse.java create mode 100644 STALExt/src/main/java/at/gv/egiz/stal/ext/GetCertificateRequest.java create mode 100644 STALExt/src/main/java/at/gv/egiz/stal/ext/GetCertificateResponse.java create mode 100644 STALExt/src/main/java/at/gv/egiz/stal/ext/GetHardwareInfoRequest.java create mode 100644 STALExt/src/main/java/at/gv/egiz/stal/ext/GetHardwareInfoResponse.java delete mode 100644 smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GETCertificateRequestHandler.java delete mode 100644 smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GETHardwareInfoRequestHandler.java create mode 100644 smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GetCertificateRequestHandler.java create mode 100644 smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GetHardwareInfoRequestHandler.java diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/GETCertificateApplet.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/GETCertificateApplet.java deleted file mode 100644 index 4a46f397..00000000 --- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/GETCertificateApplet.java +++ /dev/null @@ -1,61 +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.online.applet; - -import java.awt.Container; -import java.net.URL; -import java.util.Locale; - -import at.gv.egiz.bku.gui.BKUGUIFacade; -import at.gv.egiz.bku.gui.GetCertificateGUI; -import at.gv.egiz.bku.gui.GetCertificateGUIFacade; -import at.gv.egiz.bku.gui.HelpListener; -import at.gv.egiz.bku.gui.SwitchFocusListener; -import at.gv.egiz.bku.gui.viewer.FontProvider; - -/** -* -* @author Thomas Lenz -*/ - -public class GETCertificateApplet extends BKUApplet { - - private static final long serialVersionUID = 1L; - - @Override - protected BKUGUIFacade createGUI(Container contentPane, Locale locale, - BKUGUIFacade.Style guiStyle, URL backgroundImgURL, - FontProvider fontProvider, HelpListener helpListener, - SwitchFocusListener switchFocusListener) { - return new GetCertificateGUI(contentPane, locale, - backgroundImgURL, fontProvider, helpListener, - switchFocusListener); - } - - @Override - protected AppletBKUWorker createBKUWorker(BKUApplet applet, BKUGUIFacade gui) { - return new GETCertificateBKUWorker(applet, (GetCertificateGUIFacade) gui); - } - -} diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/GETCertificateBKUWorker.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/GETCertificateBKUWorker.java deleted file mode 100644 index 5b04e28b..00000000 --- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/GETCertificateBKUWorker.java +++ /dev/null @@ -1,100 +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.online.applet; - -import java.util.Collections; -import java.util.List; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import at.gv.egiz.bku.gui.BKUGUIFacade; -import at.gv.egiz.bku.gui.GetCertificateGUIFacade; -import at.gv.egiz.bku.smccstal.GETCertificateRequestHandler; -import at.gv.egiz.stal.ErrorResponse; -import at.gv.egiz.stal.InfoboxReadRequest; -import at.gv.egiz.stal.QuitRequest; -import at.gv.egiz.stal.STALResponse; -import at.gv.egiz.stal.SignRequest; -import at.gv.egiz.stal.ext.GETCertificateRequest; -import at.gv.egiz.stal.ext.GETCertificateResponse; - -/** -* -* @author Thomas Lenz -*/ - -public class GETCertificateBKUWorker extends AppletBKUWorker { - - private final Logger log = LoggerFactory.getLogger(GETCertificateBKUWorker.class); - - public GETCertificateBKUWorker(BKUApplet applet, GetCertificateGUIFacade gui) { - super(applet, gui); - removeRequestHandler(InfoboxReadRequest.class); - removeRequestHandler(SignRequest.class); - addRequestHandler(GETCertificateRequest.class, new GETCertificateRequestHandler()); - } - - @Override - public void run() { - gui.showMessageDialog(BKUGUIFacade.TITLE_WELCOME, - BKUGUIFacade.MESSAGE_WELCOME); - - try { - - List responses = handleRequest(Collections.singletonList(new GETCertificateRequest())); - handleRequest(Collections.singletonList(new QuitRequest())); - - if (responses.size() == 1) { - STALResponse response = responses.get(0); - if (response instanceof GETCertificateResponse) { - log.debug("GET certificate dialog terminated."); - } else if (response instanceof ErrorResponse) { - log.debug("GET certificate dialog terminated with error."); - } else { - throw new RuntimeException("Invalid STAL response: " + response.getClass().getName()); - } - } else { - throw new RuntimeException("invalid number of STAL responses: " + responses.size()); - } - - } catch (RuntimeException ex) { - log.error(ex.getMessage()); - Throwable cause = ex.getCause(); - if (cause != null) { // && cause instanceof InterruptedException) { - log.info(cause.getMessage()); - } - showErrorDialog(BKUGUIFacade.ERR_UNKNOWN, null); - } catch (Exception ex) { - log.error(ex.getMessage(), ex); - showErrorDialog(BKUGUIFacade.ERR_UNKNOWN_WITH_PARAM, ex); - } finally { - if (signatureCard != null) { - signatureCard.disconnect(false); - } - } - - applet.sendRedirect(); - } -} diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/GetCertificateApplet.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/GetCertificateApplet.java new file mode 100644 index 00000000..06b7f249 --- /dev/null +++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/GetCertificateApplet.java @@ -0,0 +1,61 @@ +/* + * 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.online.applet; + +import java.awt.Container; +import java.net.URL; +import java.util.Locale; + +import at.gv.egiz.bku.gui.BKUGUIFacade; +import at.gv.egiz.bku.gui.GetCertificateGUI; +import at.gv.egiz.bku.gui.GetCertificateGUIFacade; +import at.gv.egiz.bku.gui.HelpListener; +import at.gv.egiz.bku.gui.SwitchFocusListener; +import at.gv.egiz.bku.gui.viewer.FontProvider; + +/** +* +* @author Thomas Lenz +*/ + +public class GetCertificateApplet extends BKUApplet { + + private static final long serialVersionUID = 1L; + + @Override + protected BKUGUIFacade createGUI(Container contentPane, Locale locale, + BKUGUIFacade.Style guiStyle, URL backgroundImgURL, + FontProvider fontProvider, HelpListener helpListener, + SwitchFocusListener switchFocusListener) { + return new GetCertificateGUI(contentPane, locale, + backgroundImgURL, fontProvider, helpListener, + switchFocusListener); + } + + @Override + protected AppletBKUWorker createBKUWorker(BKUApplet applet, BKUGUIFacade gui) { + return new GetCertificateBKUWorker(applet, (GetCertificateGUIFacade) gui); + } + +} diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/GetCertificateBKUWorker.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/GetCertificateBKUWorker.java new file mode 100644 index 00000000..adf5fd81 --- /dev/null +++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/GetCertificateBKUWorker.java @@ -0,0 +1,100 @@ +/* + * 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.online.applet; + +import java.util.Collections; +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import at.gv.egiz.bku.gui.BKUGUIFacade; +import at.gv.egiz.bku.gui.GetCertificateGUIFacade; +import at.gv.egiz.bku.smccstal.GetCertificateRequestHandler; +import at.gv.egiz.stal.ErrorResponse; +import at.gv.egiz.stal.InfoboxReadRequest; +import at.gv.egiz.stal.QuitRequest; +import at.gv.egiz.stal.STALResponse; +import at.gv.egiz.stal.SignRequest; +import at.gv.egiz.stal.ext.GetCertificateRequest; +import at.gv.egiz.stal.ext.GetCertificateResponse; + +/** +* +* @author Thomas Lenz +*/ + +public class GetCertificateBKUWorker extends AppletBKUWorker { + + private final Logger log = LoggerFactory.getLogger(GetCertificateBKUWorker.class); + + public GetCertificateBKUWorker(BKUApplet applet, GetCertificateGUIFacade gui) { + super(applet, gui); + removeRequestHandler(InfoboxReadRequest.class); + removeRequestHandler(SignRequest.class); + addRequestHandler(GetCertificateRequest.class, new GetCertificateRequestHandler()); + } + + @Override + public void run() { + gui.showMessageDialog(BKUGUIFacade.TITLE_WELCOME, + BKUGUIFacade.MESSAGE_WELCOME); + + try { + + List responses = handleRequest(Collections.singletonList(new GetCertificateRequest())); + handleRequest(Collections.singletonList(new QuitRequest())); + + if (responses.size() == 1) { + STALResponse response = responses.get(0); + if (response instanceof GetCertificateResponse) { + log.debug("Get certificate dialog terminated."); + } else if (response instanceof ErrorResponse) { + log.debug("Get certificate dialog terminated with error."); + } else { + throw new RuntimeException("Invalid STAL response: " + response.getClass().getName()); + } + } else { + throw new RuntimeException("invalid number of STAL responses: " + responses.size()); + } + + } catch (RuntimeException ex) { + log.error(ex.getMessage()); + Throwable cause = ex.getCause(); + if (cause != null) { // && cause instanceof InterruptedException) { + log.info(cause.getMessage()); + } + showErrorDialog(BKUGUIFacade.ERR_UNKNOWN, null); + } catch (Exception ex) { + log.error(ex.getMessage(), ex); + showErrorDialog(BKUGUIFacade.ERR_UNKNOWN_WITH_PARAM, ex); + } finally { + if (signatureCard != null) { + signatureCard.disconnect(false); + } + } + + applet.sendRedirect(); + } +} diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/HardwareInfoBKUWorker.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/HardwareInfoBKUWorker.java index bfa4d71e..60dd94d3 100644 --- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/HardwareInfoBKUWorker.java +++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/HardwareInfoBKUWorker.java @@ -31,14 +31,14 @@ import org.slf4j.LoggerFactory; import at.gv.egiz.bku.gui.BKUGUIFacade; import at.gv.egiz.bku.gui.GetHardwareInfoGUIFacade; -import at.gv.egiz.bku.smccstal.GETHardwareInfoRequestHandler; +import at.gv.egiz.bku.smccstal.GetHardwareInfoRequestHandler; import at.gv.egiz.stal.ErrorResponse; import at.gv.egiz.stal.InfoboxReadRequest; import at.gv.egiz.stal.QuitRequest; import at.gv.egiz.stal.STALResponse; import at.gv.egiz.stal.SignRequest; -import at.gv.egiz.stal.ext.GETHardwareInfoRequest; -import at.gv.egiz.stal.ext.GETHardwareInfoResponse; +import at.gv.egiz.stal.ext.GetHardwareInfoRequest; +import at.gv.egiz.stal.ext.GetHardwareInfoResponse; /** * @@ -52,7 +52,7 @@ public class HardwareInfoBKUWorker extends AppletBKUWorker { super(applet, gui); removeRequestHandler(InfoboxReadRequest.class); removeRequestHandler(SignRequest.class); - addRequestHandler(GETHardwareInfoRequest.class, new GETHardwareInfoRequestHandler()); + addRequestHandler(GetHardwareInfoRequest.class, new GetHardwareInfoRequestHandler()); } @Override @@ -62,12 +62,12 @@ public class HardwareInfoBKUWorker extends AppletBKUWorker { try { - List responses = handleRequest(Collections.singletonList(new GETHardwareInfoRequest())); + List responses = handleRequest(Collections.singletonList(new GetHardwareInfoRequest())); handleRequest(Collections.singletonList(new QuitRequest())); if (responses.size() == 1) { STALResponse response = responses.get(0); - if (response instanceof GETHardwareInfoResponse) { + if (response instanceof GetHardwareInfoResponse) { log.debug("hardware-info dialog terminated."); } else if (response instanceof ErrorResponse) { log.debug("hardware-info dialog terminated with error."); diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUI.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUI.java index e048e877..513aa241 100644 --- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUI.java +++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUI.java @@ -65,7 +65,7 @@ public class GetCertificateGUI extends CardMgmtGUI implements } @Override - public void showGETCertificateDialog(final ActionListener certificateListener, + public void showGetCertificateDialog(final ActionListener certificateListener, final String showGetQualCert, final String showGetSimCert, final ActionListener cancelListener, final String cancelCmd) { diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUIFacade.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUIFacade.java index b327f385..2b1d6188 100644 --- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUIFacade.java +++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUIFacade.java @@ -43,7 +43,7 @@ public interface GetCertificateGUIFacade extends BKUGUIFacade { public static final String FILENAME_SIM_CERT = "simple.cer"; - public void showGETCertificateDialog(ActionListener certificateListener, String showGetQualCert, + public void showGetCertificateDialog(ActionListener certificateListener, String showGetQualCert, String showGetSimCert, ActionListener cancelListener, String cancelCmd); public File showSaveDialog(String defaultfilename); diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java index 7947c117..a7d930b3 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java @@ -26,8 +26,8 @@ package at.gv.egiz.bku.local.stal; import at.gv.egiz.bku.gui.BKUGUIFacade; import at.gv.egiz.bku.smccstal.AbstractBKUWorker; -import at.gv.egiz.bku.smccstal.GETCertificateRequestHandler; -import at.gv.egiz.bku.smccstal.GETHardwareInfoRequestHandler; +import at.gv.egiz.bku.smccstal.GetCertificateRequestHandler; +import at.gv.egiz.bku.smccstal.GetHardwareInfoRequestHandler; import at.gv.egiz.bku.smccstal.PINManagementRequestHandler; import at.gv.egiz.bku.smccstal.IdentityLinkRequestHandler; import at.gv.egiz.stal.QuitRequest; @@ -36,8 +36,8 @@ import at.gv.egiz.stal.STALResponse; import at.gv.egiz.stal.SignRequest; import at.gv.egiz.stal.ext.IdentityLinkRequest; -import at.gv.egiz.stal.ext.GETCertificateRequest; -import at.gv.egiz.stal.ext.GETHardwareInfoRequest; +import at.gv.egiz.stal.ext.GetCertificateRequest; +import at.gv.egiz.stal.ext.GetHardwareInfoRequest; import at.gv.egiz.stal.ext.PINManagementRequest; import java.util.List; import javax.swing.JFrame; @@ -57,8 +57,8 @@ public class LocalBKUWorker extends AbstractBKUWorker { new LocalSignRequestHandler(new LocalSecureViewer(gui))); addRequestHandler(PINManagementRequest.class, new PINManagementRequestHandler()); addRequestHandler(IdentityLinkRequest.class, new IdentityLinkRequestHandler()); - addRequestHandler(GETCertificateRequest.class, new GETCertificateRequestHandler()); - addRequestHandler(GETHardwareInfoRequest.class, new GETHardwareInfoRequestHandler()); + addRequestHandler(GetCertificateRequest.class, new GetCertificateRequestHandler()); + addRequestHandler(GetHardwareInfoRequest.class, new GetHardwareInfoRequestHandler()); } /** does not change container's visibility (use quit request to close) */ diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalGETCertificateSTALFactory.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalGETCertificateSTALFactory.java deleted file mode 100644 index 50c6c632..00000000 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalGETCertificateSTALFactory.java +++ /dev/null @@ -1,136 +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.local.stal; - -import at.gv.egiz.bku.viewer.ResourceFontLoader; -import java.awt.Dimension; -import java.awt.Toolkit; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Locale; - - -import at.gv.egiz.bku.gui.BKUGUIFacade; -import at.gv.egiz.bku.gui.BKUIcons; -import at.gv.egiz.bku.gui.GetCertificateGUI; -import at.gv.egiz.bku.gui.GetCertificateGUIFacade; -import at.gv.egiz.bku.local.gui.GUIProxy; -import at.gv.egiz.bku.local.gui.LocalHelpListener; -import at.gv.egiz.stal.STAL; -import at.gv.egiz.stal.STALFactory; -import javax.swing.JFrame; - -import org.apache.commons.configuration.Configuration; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** -* -* @author Thomas Lenz -*/ - -public class LocalGETCertificateSTALFactory implements STALFactory { - - private final Logger log = LoggerFactory.getLogger(LocalGETCertificateSTALFactory.class); - protected static final Dimension PREFERRED_SIZE = new Dimension(318, 200); - protected URL helpURL; - protected Locale locale; - - protected Configuration configuration; - - @Override - public STAL createSTAL() { - final LocalBKUWorker stal; - //http://java.sun.com/docs/books/tutorial/uiswing/misc/focus.html - // use undecorated JFrame instead of JWindow, - // which creates an invisible owning frame and therefore cannot getFocusInWindow() - JFrame dialog = new JFrame("Bürgerkarte"); - log.debug("AlwaysOnTop supported: {}.", dialog.isAlwaysOnTopSupported()); - // [#439] make mocca dialog alwaysOnTop - dialog.setAlwaysOnTop(true); - dialog.setIconImages(BKUIcons.icons); -// dialog.setUndecorated(true); -// dialog.getRootPane().setWindowDecorationStyle(JRootPane.NONE); - - if (locale != null) { - dialog.setLocale(locale); - } - LocalHelpListener helpListener = null; - if (helpURL != null) { - helpListener = new LocalHelpListener(helpURL, locale); - } else { - log.warn("No HELP URL configured, help system disabled."); - } - GetCertificateGUIFacade gui = new GetCertificateGUI(dialog.getContentPane(), - dialog.getLocale(), - null, - new ResourceFontLoader(), - helpListener, - null); - BKUGUIFacade proxy = (BKUGUIFacade) GUIProxy.newInstance(gui, dialog, new Class[] { GetCertificateGUIFacade.class, } ); - stal = new LocalBKUWorker(proxy, dialog); - dialog.setPreferredSize(PREFERRED_SIZE); - dialog.pack(); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - Dimension frameSize = dialog.getSize(); - if (frameSize.height > screenSize.height) { - frameSize.height = screenSize.height; - } - if (frameSize.width > screenSize.width) { - frameSize.width = screenSize.width; - } - dialog.setLocation((screenSize.width - frameSize.width) / 2, - (screenSize.height - frameSize.height) / 2); - - return stal; - } - - @Override - public void setLocale(Locale locale) { - this.locale = locale; - } - - /** - * spring injects helpURL - * @param helpURL - * @throws MalformedURLException if helpURL is not a valid URL - */ - public void setHelpURL(String helpURL) throws MalformedURLException { - this.helpURL = new URL(helpURL); - } - - /** - * @return the configuration - */ - public Configuration getConfiguration() { - return configuration; - } - - /** - * @param configuration the configuration to set - */ - public void setConfiguration(Configuration configuration) { - this.configuration = configuration; - } -} diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalGetCertificateSTALFactory.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalGetCertificateSTALFactory.java new file mode 100644 index 00000000..56d6e251 --- /dev/null +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalGetCertificateSTALFactory.java @@ -0,0 +1,136 @@ +/* + * 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.local.stal; + +import at.gv.egiz.bku.viewer.ResourceFontLoader; +import java.awt.Dimension; +import java.awt.Toolkit; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Locale; + + +import at.gv.egiz.bku.gui.BKUGUIFacade; +import at.gv.egiz.bku.gui.BKUIcons; +import at.gv.egiz.bku.gui.GetCertificateGUI; +import at.gv.egiz.bku.gui.GetCertificateGUIFacade; +import at.gv.egiz.bku.local.gui.GUIProxy; +import at.gv.egiz.bku.local.gui.LocalHelpListener; +import at.gv.egiz.stal.STAL; +import at.gv.egiz.stal.STALFactory; +import javax.swing.JFrame; + +import org.apache.commons.configuration.Configuration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** +* +* @author Thomas Lenz +*/ + +public class LocalGetCertificateSTALFactory implements STALFactory { + + private final Logger log = LoggerFactory.getLogger(LocalGetCertificateSTALFactory.class); + protected static final Dimension PREFERRED_SIZE = new Dimension(318, 200); + protected URL helpURL; + protected Locale locale; + + protected Configuration configuration; + + @Override + public STAL createSTAL() { + final LocalBKUWorker stal; + //http://java.sun.com/docs/books/tutorial/uiswing/misc/focus.html + // use undecorated JFrame instead of JWindow, + // which creates an invisible owning frame and therefore cannot getFocusInWindow() + JFrame dialog = new JFrame("Bürgerkarte"); + log.debug("AlwaysOnTop supported: {}.", dialog.isAlwaysOnTopSupported()); + // [#439] make mocca dialog alwaysOnTop + dialog.setAlwaysOnTop(true); + dialog.setIconImages(BKUIcons.icons); +// dialog.setUndecorated(true); +// dialog.getRootPane().setWindowDecorationStyle(JRootPane.NONE); + + if (locale != null) { + dialog.setLocale(locale); + } + LocalHelpListener helpListener = null; + if (helpURL != null) { + helpListener = new LocalHelpListener(helpURL, locale); + } else { + log.warn("No HELP URL configured, help system disabled."); + } + GetCertificateGUIFacade gui = new GetCertificateGUI(dialog.getContentPane(), + dialog.getLocale(), + null, + new ResourceFontLoader(), + helpListener, + null); + BKUGUIFacade proxy = (BKUGUIFacade) GUIProxy.newInstance(gui, dialog, new Class[] { GetCertificateGUIFacade.class, } ); + stal = new LocalBKUWorker(proxy, dialog); + dialog.setPreferredSize(PREFERRED_SIZE); + dialog.pack(); + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + Dimension frameSize = dialog.getSize(); + if (frameSize.height > screenSize.height) { + frameSize.height = screenSize.height; + } + if (frameSize.width > screenSize.width) { + frameSize.width = screenSize.width; + } + dialog.setLocation((screenSize.width - frameSize.width) / 2, + (screenSize.height - frameSize.height) / 2); + + return stal; + } + + @Override + public void setLocale(Locale locale) { + this.locale = locale; + } + + /** + * spring injects helpURL + * @param helpURL + * @throws MalformedURLException if helpURL is not a valid URL + */ + public void setHelpURL(String helpURL) throws MalformedURLException { + this.helpURL = new URL(helpURL); + } + + /** + * @return the configuration + */ + public Configuration getConfiguration() { + return configuration; + } + + /** + * @param configuration the configuration to set + */ + public void setConfiguration(Configuration configuration) { + this.configuration = configuration; + } +} diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GETCertificateServlet.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GETCertificateServlet.java deleted file mode 100644 index d23937f9..00000000 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GETCertificateServlet.java +++ /dev/null @@ -1,133 +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.local.webapp; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Collections; -import java.util.List; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import at.gv.egiz.bku.local.stal.LocalGETCertificateSTALFactory; -import at.gv.egiz.stal.QuitRequest; -import at.gv.egiz.stal.STAL; -import at.gv.egiz.stal.STALResponse; -import at.gv.egiz.stal.ext.GETCertificateRequest; - -/** -* -* @author Thomas Lenz -*/ - -public class GETCertificateServlet extends HttpServlet { - private static final long serialVersionUID = 1L; - - private final Logger log = LoggerFactory.getLogger(GETCertificateServlet.class); - - LocalGETCertificateSTALFactory stalFactory; - - public GETCertificateServlet() { - log.debug("Constuctor: " + GETCertificateServlet.class); - stalFactory = new LocalGETCertificateSTALFactory(); - try { - stalFactory.setHelpURL("http://localhost:3495/help/"); - } catch (MalformedURLException e) { - log.info("Failed to set help URL.", e); - } - } - - /** - * Processes requests for both HTTP GET and POST methods. - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - - STAL getCerTificateSTAL = stalFactory.createSTAL(); - - List stalResps = getCerTificateSTAL.handleRequest(Collections.singletonList(new GETCertificateRequest())); - - log.debug("Received STAL reponse {}.", stalResps.get(0).getClass()); - - getCerTificateSTAL.handleRequest(Collections.singletonList(new QuitRequest())); - - String redirect = request.getParameter("redirect"); - if (redirect != null) { - String referer = request.getHeader("Referer"); - if (referer != null) { - redirect = new URL(new URL(referer), redirect).toExternalForm(); - } - response.sendRedirect(redirect); - } else { - response.setStatus(HttpServletResponse.SC_OK); - } - } - - // - /** - * Handles the HTTP GET method. - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - processRequest(request, response); - } - - /** - * Handles the HTTP POST method. - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - processRequest(request, response); - } - - /** - * Returns a short description of the servlet. - * @return a String containing servlet description - */ - @Override - public String getServletInfo() { - return "Short description"; - } -} diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GetCertificateServlet.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GetCertificateServlet.java new file mode 100644 index 00000000..23c08bd5 --- /dev/null +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GetCertificateServlet.java @@ -0,0 +1,133 @@ +/* + * 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.local.webapp; + +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Collections; +import java.util.List; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import at.gv.egiz.bku.local.stal.LocalGetCertificateSTALFactory; +import at.gv.egiz.stal.QuitRequest; +import at.gv.egiz.stal.STAL; +import at.gv.egiz.stal.STALResponse; +import at.gv.egiz.stal.ext.GetCertificateRequest; + +/** +* +* @author Thomas Lenz +*/ + +public class GetCertificateServlet extends HttpServlet { + private static final long serialVersionUID = 1L; + + private final Logger log = LoggerFactory.getLogger(GetCertificateServlet.class); + + LocalGetCertificateSTALFactory stalFactory; + + public GetCertificateServlet() { + log.debug("Constuctor: " + GetCertificateServlet.class); + stalFactory = new LocalGetCertificateSTALFactory(); + try { + stalFactory.setHelpURL("http://localhost:3495/help/"); + } catch (MalformedURLException e) { + log.info("Failed to set help URL.", e); + } + } + + /** + * Processes requests for both HTTP GET and POST methods. + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + * @throws IOException if an I/O error occurs + */ + protected void processRequest(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + + STAL getCerTificateSTAL = stalFactory.createSTAL(); + + List stalResps = getCerTificateSTAL.handleRequest(Collections.singletonList(new GetCertificateRequest())); + + log.debug("Received STAL reponse {}.", stalResps.get(0).getClass()); + + getCerTificateSTAL.handleRequest(Collections.singletonList(new QuitRequest())); + + String redirect = request.getParameter("redirect"); + if (redirect != null) { + String referer = request.getHeader("Referer"); + if (referer != null) { + redirect = new URL(new URL(referer), redirect).toExternalForm(); + } + response.sendRedirect(redirect); + } else { + response.setStatus(HttpServletResponse.SC_OK); + } + } + + // + /** + * Handles the HTTP GET method. + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + * @throws IOException if an I/O error occurs + */ + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + processRequest(request, response); + } + + /** + * Handles the HTTP POST method. + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + * @throws IOException if an I/O error occurs + */ + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + processRequest(request, response); + } + + /** + * Returns a short description of the servlet. + * @return a String containing servlet description + */ + @Override + public String getServletInfo() { + return "Short description"; + } +} diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GetHardwareInfoServlet.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GetHardwareInfoServlet.java index dc7762a8..51ed2d8d 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GetHardwareInfoServlet.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GetHardwareInfoServlet.java @@ -41,7 +41,7 @@ import at.gv.egiz.bku.local.stal.LocalGetHardwareInfoSTALFactory; import at.gv.egiz.stal.QuitRequest; import at.gv.egiz.stal.STAL; import at.gv.egiz.stal.STALResponse; -import at.gv.egiz.stal.ext.GETHardwareInfoRequest; +import at.gv.egiz.stal.ext.GetHardwareInfoRequest; /** * @@ -56,7 +56,7 @@ public class GetHardwareInfoServlet extends HttpServlet { LocalGetHardwareInfoSTALFactory stalFactory; public GetHardwareInfoServlet() { - log.debug("Constuctor: " + GetHardwareInfoServlet.class); + log.debug("Constructor: " + GetHardwareInfoServlet.class); stalFactory = new LocalGetHardwareInfoSTALFactory(); try { stalFactory.setHelpURL("http://localhost:3495/help/"); @@ -77,7 +77,7 @@ public class GetHardwareInfoServlet extends HttpServlet { STAL getHardwareInfoSTAL = stalFactory.createSTAL(); - List stalResps = getHardwareInfoSTAL.handleRequest(Collections.singletonList(new GETHardwareInfoRequest())); + List stalResps = getHardwareInfoSTAL.handleRequest(Collections.singletonList(new GetHardwareInfoRequest())); log.debug("Received STAL reponse {}.", stalResps.get(0).getClass()); diff --git a/BKULocal/src/main/webapp/WEB-INF/web.xml b/BKULocal/src/main/webapp/WEB-INF/web.xml index 41d5ab37..136905b6 100644 --- a/BKULocal/src/main/webapp/WEB-INF/web.xml +++ b/BKULocal/src/main/webapp/WEB-INF/web.xml @@ -52,11 +52,11 @@ at.gv.egiz.bku.local.webapp.IdentityLinkServlet - GETCertificateServlet - at.gv.egiz.bku.local.webapp.GETCertificateServlet + GetCertificateServlet + at.gv.egiz.bku.local.webapp.GetCertificateServlet - GETHardwareInfoServlet + GetHardwareInfoServlet at.gv.egiz.bku.local.webapp.GetHardwareInfoServlet @@ -77,12 +77,12 @@ /IdentityLink - GETCertificateServlet - /GETCertificate + GetCertificateServlet + /GetCertificate - GETHardwareInfoServlet - /GETHardwareinfo + GetHardwareInfoServlet + /GetHardwareinfo index.html diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java index 4cf5ed1f..74b06b72 100644 --- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java +++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java @@ -83,8 +83,8 @@ public class Launcher implements BKUControllerInterface { http = new URL("http://localhost:" + Integer.getInteger(Container.HTTPS_PORT_PROPERTY, 3495).intValue() + '/'); https = new URL("https://localhost:" + Integer.getInteger(Container.HTTPS_PORT_PROPERTY, 3496).intValue() + '/'); pin = new URL(http, "/PINManagement"); - getcertificate = new URL(http, "/GETCertificate"); - hardwareinfo = new URL(http, "/GETHardwareinfo"); + getcertificate = new URL(http, "/GetCertificate"); + hardwareinfo = new URL(http, "/GetHardwareinfo"); cert = new URL(http, "/ca.crt"); help = new URL(http, "/help/"); ident = new URL(http, "/IdentityLink"); diff --git a/STALExt/src/main/java/at/gv/egiz/stal/ext/GETCertificateRequest.java b/STALExt/src/main/java/at/gv/egiz/stal/ext/GETCertificateRequest.java deleted file mode 100644 index 7d488170..00000000 --- a/STALExt/src/main/java/at/gv/egiz/stal/ext/GETCertificateRequest.java +++ /dev/null @@ -1,35 +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.stal.ext; - -import at.gv.egiz.stal.STALRequest; - -/** -* -* @author Thomas Lenz -*/ - -public class GETCertificateRequest extends STALRequest { - -} diff --git a/STALExt/src/main/java/at/gv/egiz/stal/ext/GETCertificateResponse.java b/STALExt/src/main/java/at/gv/egiz/stal/ext/GETCertificateResponse.java deleted file mode 100644 index bb95cc5b..00000000 --- a/STALExt/src/main/java/at/gv/egiz/stal/ext/GETCertificateResponse.java +++ /dev/null @@ -1,35 +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.stal.ext; - -import at.gv.egiz.stal.STALResponse; - -/** -* -* @author Thomas Lenz -*/ - -public class GETCertificateResponse extends STALResponse { - -} diff --git a/STALExt/src/main/java/at/gv/egiz/stal/ext/GETHardwareInfoRequest.java b/STALExt/src/main/java/at/gv/egiz/stal/ext/GETHardwareInfoRequest.java deleted file mode 100644 index e4204a9e..00000000 --- a/STALExt/src/main/java/at/gv/egiz/stal/ext/GETHardwareInfoRequest.java +++ /dev/null @@ -1,35 +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.stal.ext; - -import at.gv.egiz.stal.STALRequest; - -/** -* -* @author Thomas Lenz -*/ - -public class GETHardwareInfoRequest extends STALRequest { - -} diff --git a/STALExt/src/main/java/at/gv/egiz/stal/ext/GETHardwareInfoResponse.java b/STALExt/src/main/java/at/gv/egiz/stal/ext/GETHardwareInfoResponse.java deleted file mode 100644 index cbe5c965..00000000 --- a/STALExt/src/main/java/at/gv/egiz/stal/ext/GETHardwareInfoResponse.java +++ /dev/null @@ -1,35 +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.stal.ext; - -import at.gv.egiz.stal.STALResponse; - -/** -* -* @author Thomas Lenz -*/ - -public class GETHardwareInfoResponse extends STALResponse { - -} diff --git a/STALExt/src/main/java/at/gv/egiz/stal/ext/GetCertificateRequest.java b/STALExt/src/main/java/at/gv/egiz/stal/ext/GetCertificateRequest.java new file mode 100644 index 00000000..747564e3 --- /dev/null +++ b/STALExt/src/main/java/at/gv/egiz/stal/ext/GetCertificateRequest.java @@ -0,0 +1,35 @@ +/* + * 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.stal.ext; + +import at.gv.egiz.stal.STALRequest; + +/** +* +* @author Thomas Lenz +*/ + +public class GetCertificateRequest extends STALRequest { + +} diff --git a/STALExt/src/main/java/at/gv/egiz/stal/ext/GetCertificateResponse.java b/STALExt/src/main/java/at/gv/egiz/stal/ext/GetCertificateResponse.java new file mode 100644 index 00000000..a19be9d3 --- /dev/null +++ b/STALExt/src/main/java/at/gv/egiz/stal/ext/GetCertificateResponse.java @@ -0,0 +1,35 @@ +/* + * 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.stal.ext; + +import at.gv.egiz.stal.STALResponse; + +/** +* +* @author Thomas Lenz +*/ + +public class GetCertificateResponse extends STALResponse { + +} diff --git a/STALExt/src/main/java/at/gv/egiz/stal/ext/GetHardwareInfoRequest.java b/STALExt/src/main/java/at/gv/egiz/stal/ext/GetHardwareInfoRequest.java new file mode 100644 index 00000000..728aa4f1 --- /dev/null +++ b/STALExt/src/main/java/at/gv/egiz/stal/ext/GetHardwareInfoRequest.java @@ -0,0 +1,35 @@ +/* + * 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.stal.ext; + +import at.gv.egiz.stal.STALRequest; + +/** +* +* @author Thomas Lenz +*/ + +public class GetHardwareInfoRequest extends STALRequest { + +} diff --git a/STALExt/src/main/java/at/gv/egiz/stal/ext/GetHardwareInfoResponse.java b/STALExt/src/main/java/at/gv/egiz/stal/ext/GetHardwareInfoResponse.java new file mode 100644 index 00000000..53952618 --- /dev/null +++ b/STALExt/src/main/java/at/gv/egiz/stal/ext/GetHardwareInfoResponse.java @@ -0,0 +1,35 @@ +/* + * 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.stal.ext; + +import at.gv.egiz.stal.STALResponse; + +/** +* +* @author Thomas Lenz +*/ + +public class GetHardwareInfoResponse extends STALResponse { + +} diff --git a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GETCertificateRequestHandler.java b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GETCertificateRequestHandler.java deleted file mode 100644 index a11f9d16..00000000 --- a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GETCertificateRequestHandler.java +++ /dev/null @@ -1,126 +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; - -/** -* -* @author Thomas Lenz -*/ - -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import at.gv.egiz.bku.gui.GetCertificateGUIFacade; -import at.gv.egiz.bku.pin.gui.VerifyPINGUI; -import at.gv.egiz.smcc.SignatureCard; -import at.gv.egiz.smcc.SignatureCardException; -import at.gv.egiz.stal.STALRequest; -import at.gv.egiz.stal.STALResponse; -import at.gv.egiz.stal.ext.GETCertificateRequest; -import at.gv.egiz.stal.ext.GETCertificateResponse; - -public class GETCertificateRequestHandler extends AbstractRequestHandler { - - private final Logger log = LoggerFactory.getLogger(GETCertificateRequestHandler.class); - - @Override - public boolean requireCard() { - return true; - } - - @Override - public STALResponse handleRequest(STALRequest request) - throws InterruptedException { - - log.debug("handle a GETCertificateRequest"); - - if (request instanceof GETCertificateRequest) { - - GetCertificateGUIFacade gui = (GetCertificateGUIFacade) this.gui; - - gui.showGETCertificateDialog(this, "getqualcert", "getsimcert", this, "cancel"); - - while (true) { - - waitForAction(); - - try { - - if ("cancel".equals(actionCommand)) { - log.debug("get certificate response cancel."); - return new GETCertificateResponse(); - - } else if ("getqualcert".equals(actionCommand)) { - - File file = gui.showSaveDialog(GetCertificateGUIFacade.FILENAME_QUAL_CERT); - byte[] cert = card.getCertificate(SignatureCard.KeyboxName.SECURE_SIGNATURE_KEYPAIR, - new VerifyPINGUI(gui)); - - FileOutputStream fstream = new FileOutputStream(file); - fstream.write(cert); - fstream.close(); - - log.debug("qualified certificate are saved to | " + file.getAbsolutePath() + "."); - - } else if ("getsimcert".equals(actionCommand)) { - - File file = gui.showSaveDialog(GetCertificateGUIFacade.FILENAME_SIM_CERT); - - FileOutputStream fstream = new FileOutputStream(file); - fstream.write(card.getCertificate(SignatureCard.KeyboxName.CERTIFIED_KEYPAIR, - new VerifyPINGUI(gui))); - fstream.close(); - - log.debug("simple certificate are saved to | " + file.getAbsolutePath() + "."); - - } - else { - log.info("unknown command resolved."); - } - - } catch (FileNotFoundException e) { - log.error("file to save the certificate could not be found.", e); - - } catch (SignatureCardException e) { - log.error("Card not activated or certificate is not available.", e); - gui.showErrorDialog(GetCertificateGUIFacade.ERR_CARD_NOTACTIVATED, - null, this, "cancel"); - - } catch (NullPointerException e) { - log.error("save certificate file selection aborted.", e); - - } catch (Exception e) { - log.error("a general error occur during the certificate save operation.", e); - } - } - } - - return new GETCertificateResponse(); - } - -} diff --git a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GETHardwareInfoRequestHandler.java b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GETHardwareInfoRequestHandler.java deleted file mode 100644 index 4e7fec6c..00000000 --- a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GETHardwareInfoRequestHandler.java +++ /dev/null @@ -1,99 +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 org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import at.gv.egiz.bku.gui.GetHardwareInfoGUIFacade; -import at.gv.egiz.smcc.SignatureCardException; -import at.gv.egiz.stal.STALRequest; -import at.gv.egiz.stal.STALResponse; -import at.gv.egiz.stal.ext.GETHardwareInfoRequest; -import at.gv.egiz.stal.ext.GETHardwareInfoResponse; - -/** -* -* @author Thomas Lenz -*/ - -public class GETHardwareInfoRequestHandler extends AbstractRequestHandler { - - private final Logger log = LoggerFactory.getLogger(GETHardwareInfoRequestHandler.class); - - @Override - public boolean requireCard() { - return true; - } - - @Override - public STALResponse handleRequest(STALRequest request) - throws InterruptedException { - - log.debug("handle a get-hardware info request"); - - if (request instanceof GETHardwareInfoRequest) { - - GetHardwareInfoGUIFacade gui = (GetHardwareInfoGUIFacade) this.gui; - - String terminal = card.getTerminalName(); - String smartcard = card.toString(); - String smartcard_ATR = toString(card.getCard().getATR().getBytes()); - - gui.showHardwareInfoDialog(this, "back", terminal, smartcard, smartcard_ATR); - - while (true) { - - waitForAction(); - - if ("back".equals(actionCommand)) { - log.debug("show hardware info response back."); - return new GETHardwareInfoResponse(); - - } else { - log.info("unknown command resolved."); - } - } - - } - return new GETHardwareInfoResponse(); - } - - private static String toString(byte[] b) { - StringBuffer sb = new StringBuffer(); - sb.append('['); - if (b != null && b.length > 0) { - sb.append(Integer.toHexString((b[0] & 240) >> 4)); - sb.append(Integer.toHexString(b[0] & 15)); - for (int i = 1; i < b.length; i++) { - sb.append((i % 32 == 0) ? '\n' : ':'); - sb.append(Integer.toHexString((b[i] & 240) >> 4)); - sb.append(Integer.toHexString(b[i] & 15)); - } - } - sb.append(']'); - return sb.toString(); - } - -} diff --git a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GetCertificateRequestHandler.java b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GetCertificateRequestHandler.java new file mode 100644 index 00000000..320fa82f --- /dev/null +++ b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GetCertificateRequestHandler.java @@ -0,0 +1,126 @@ +/* + * 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; + +/** +* +* @author Thomas Lenz +*/ + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import at.gv.egiz.bku.gui.GetCertificateGUIFacade; +import at.gv.egiz.bku.pin.gui.VerifyPINGUI; +import at.gv.egiz.smcc.SignatureCard; +import at.gv.egiz.smcc.SignatureCardException; +import at.gv.egiz.stal.STALRequest; +import at.gv.egiz.stal.STALResponse; +import at.gv.egiz.stal.ext.GetCertificateRequest; +import at.gv.egiz.stal.ext.GetCertificateResponse; + +public class GetCertificateRequestHandler extends AbstractRequestHandler { + + private final Logger log = LoggerFactory.getLogger(GetCertificateRequestHandler.class); + + @Override + public boolean requireCard() { + return true; + } + + @Override + public STALResponse handleRequest(STALRequest request) + throws InterruptedException { + + log.debug("handle a GetCertificateRequest"); + + if (request instanceof GetCertificateRequest) { + + GetCertificateGUIFacade gui = (GetCertificateGUIFacade) this.gui; + + gui.showGetCertificateDialog(this, "getqualcert", "getsimcert", this, "cancel"); + + while (true) { + + waitForAction(); + + try { + + if ("cancel".equals(actionCommand)) { + log.debug("get certificate response cancel."); + return new GetCertificateResponse(); + + } else if ("getqualcert".equals(actionCommand)) { + + File file = gui.showSaveDialog(GetCertificateGUIFacade.FILENAME_QUAL_CERT); + byte[] cert = card.getCertificate(SignatureCard.KeyboxName.SECURE_SIGNATURE_KEYPAIR, + new VerifyPINGUI(gui)); + + FileOutputStream fstream = new FileOutputStream(file); + fstream.write(cert); + fstream.close(); + + log.debug("qualified certificate are saved to | " + file.getAbsolutePath() + "."); + + } else if ("getsimcert".equals(actionCommand)) { + + File file = gui.showSaveDialog(GetCertificateGUIFacade.FILENAME_SIM_CERT); + + FileOutputStream fstream = new FileOutputStream(file); + fstream.write(card.getCertificate(SignatureCard.KeyboxName.CERTIFIED_KEYPAIR, + new VerifyPINGUI(gui))); + fstream.close(); + + log.debug("simple certificate are saved to | " + file.getAbsolutePath() + "."); + + } + else { + log.info("unknown command resolved."); + } + + } catch (FileNotFoundException e) { + log.error("file to save the certificate could not be found.", e); + + } catch (SignatureCardException e) { + log.error("Card not activated or certificate is not available.", e); + gui.showErrorDialog(GetCertificateGUIFacade.ERR_CARD_NOTACTIVATED, + null, this, "cancel"); + + } catch (NullPointerException e) { + log.error("save certificate file selection aborted.", e); + + } catch (Exception e) { + log.error("a general error occur during the certificate save operation.", e); + } + } + } + + return new GetCertificateResponse(); + } + +} diff --git a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GetHardwareInfoRequestHandler.java b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GetHardwareInfoRequestHandler.java new file mode 100644 index 00000000..c3cb7df0 --- /dev/null +++ b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GetHardwareInfoRequestHandler.java @@ -0,0 +1,99 @@ +/* + * 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 org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import at.gv.egiz.bku.gui.GetHardwareInfoGUIFacade; +import at.gv.egiz.smcc.SignatureCardException; +import at.gv.egiz.stal.STALRequest; +import at.gv.egiz.stal.STALResponse; +import at.gv.egiz.stal.ext.GetHardwareInfoRequest; +import at.gv.egiz.stal.ext.GetHardwareInfoResponse; + +/** +* +* @author Thomas Lenz +*/ + +public class GetHardwareInfoRequestHandler extends AbstractRequestHandler { + + private final Logger log = LoggerFactory.getLogger(GetHardwareInfoRequestHandler.class); + + @Override + public boolean requireCard() { + return true; + } + + @Override + public STALResponse handleRequest(STALRequest request) + throws InterruptedException { + + log.debug("handle a get-hardware info request"); + + if (request instanceof GetHardwareInfoRequest) { + + GetHardwareInfoGUIFacade gui = (GetHardwareInfoGUIFacade) this.gui; + + String terminal = card.getTerminalName(); + String smartcard = card.toString(); + String smartcard_ATR = toString(card.getCard().getATR().getBytes()); + + gui.showHardwareInfoDialog(this, "back", terminal, smartcard, smartcard_ATR); + + while (true) { + + waitForAction(); + + if ("back".equals(actionCommand)) { + log.debug("show hardware info response back."); + return new GetHardwareInfoResponse(); + + } else { + log.info("unknown command resolved."); + } + } + + } + return new GetHardwareInfoResponse(); + } + + private static String toString(byte[] b) { + StringBuffer sb = new StringBuffer(); + sb.append('['); + if (b != null && b.length > 0) { + sb.append(Integer.toHexString((b[0] & 240) >> 4)); + sb.append(Integer.toHexString(b[0] & 15)); + for (int i = 1; i < b.length; i++) { + sb.append((i % 32 == 0) ? '\n' : ':'); + sb.append(Integer.toHexString((b[i] & 240) >> 4)); + sb.append(Integer.toHexString(b[i] & 15)); + } + } + sb.append(']'); + return sb.toString(); + } + +} -- cgit v1.2.3