aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>2011-04-06 19:44:10 +0000
committerkstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>2011-04-06 19:44:10 +0000
commite2cdcaf1adc00a92ca4d21febd0a9be9e3aaf34c (patch)
treec70e319802d891ecd17b81d98dfcc2bbb495b472
parentac9a6c52e96f4c737de3392a7ba16b8fa8958b85 (diff)
downloadmoa-id-spss-e2cdcaf1adc00a92ca4d21febd0a9be9e3aaf34c.tar.gz
moa-id-spss-e2cdcaf1adc00a92ca4d21febd0a9be9e3aaf34c.tar.bz2
moa-id-spss-e2cdcaf1adc00a92ca4d21febd0a9be9e3aaf34c.zip
Update MOA Template
git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1200 d688527b-c9ab-4aba-bd8d-4036d912da1d
-rw-r--r--id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdfbin175412 -> 191806 bytes
-rw-r--r--id/server/auth/src/main/webapp/iframeHandyBKU.html68
-rw-r--r--id/server/auth/src/main/webapp/iframeOnlineBKU.html70
-rw-r--r--id/server/auth/src/main/webapp/index.html80
4 files changed, 102 insertions, 116 deletions
diff --git a/id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf b/id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf
index bb0e11a80..dcf38c218 100644
--- a/id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf
+++ b/id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf
Binary files differ
diff --git a/id/server/auth/src/main/webapp/iframeHandyBKU.html b/id/server/auth/src/main/webapp/iframeHandyBKU.html
index 4661eea70..f07b73265 100644
--- a/id/server/auth/src/main/webapp/iframeHandyBKU.html
+++ b/id/server/auth/src/main/webapp/iframeHandyBKU.html
@@ -6,45 +6,55 @@
<meta http-equiv="CACHE-CONTROL" content="NO-CACHE">
<meta http-equiv="PRAGMA" content="NO-CACHE">
<script type="text/javascript">
+ // [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an
+ // z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at
+ var MOA_ID_STARTAUTHENTICATION = "[MOA_ID_STARTAUTHENTICATION]";
+
+ // [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die Handy Signatur an -->
+ <!-- z.B.: value="https://yoururl.at/moa-id-auth/template_handyBKU.html"-->
+ var URL_TO_HANDYSIGNATUR_TEMPLATE = "[URL_TO_HANDYSIGNATUR_TEMPLATE]";
+
+
window.onload=function() {
- var Template = get_url_param("Template", "startAuth");
- var startAuth = get_url_param("startAuth", "useMandate");
- var useMandate = get_url_param("useMandate", "");
-
- document.moaidform.useMandate.value = useMandate;
- document.moaidform.action = startAuth;
- document.moaidform.Template.value = Template;
+
+ document.getElementById('moaidform').action = MOA_ID_STARTAUTHENTICATION;
+ document.getElementById('Template').value = URL_TO_HANDYSIGNATUR_TEMPLATE;
+
+ var useMandate = gup("useMandate");
+
+ if (useMandate == "true")
+ document.getElementById('useMandate').value = "true";
+ else
+ document.getElementById('useMandate').value = "false";
+
document.moaidform.submit();
return;
}
-
- function get_url_param(name, follower) {
-
- var url = window.location.href;
- var i = url.indexOf(name);
- url = url.substring(i + name.length+1, url.length);
- if (follower.length != 0) {
- i = url.indexOf(follower);
- url = url.substring(0, i-1);
- }
-
- return url;
-
+
+ function gup(name) {
+ name = name.replace(/[\[]/,"\\\[").replace(/[\]]/,"\\\]");
+ var regexS = "[\\?&]"+name+"=([^&#]*)";
+ var regex = new RegExp( regexS );
+ var results = regex.exec( window.location.href );
+ if( results == null )
+ return "";
+ else
+ return results[1];
}
+
</script>
</head>
<body>
- Bitte warten...
+
+ Bitte warten...
+
+ <FORM name="moaidform" method="post" id="moaidform">
+ <input type="hidden" name="Template" id="Template">
+ <input type="hidden" name="bkuURI" value="https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx">
+ <input type="hidden" name="useMandate" id="useMandate">
+ </FORM>
- <form method="POST" name="moaidform">
- <input type="hidden" name="Template">
- <input type="hidden" name="bkuURI" value="https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx">
- <input type="hidden" name="useMandate">
- </form>
-
-
-
<hr>
</body>
diff --git a/id/server/auth/src/main/webapp/iframeOnlineBKU.html b/id/server/auth/src/main/webapp/iframeOnlineBKU.html
index b0f6b8bb0..4873245be 100644
--- a/id/server/auth/src/main/webapp/iframeOnlineBKU.html
+++ b/id/server/auth/src/main/webapp/iframeOnlineBKU.html
@@ -6,50 +6,54 @@
<meta http-equiv="CACHE-CONTROL" content="NO-CACHE">
<meta http-equiv="PRAGMA" content="NO-CACHE">
<script type="text/javascript">
- window.onload=function() {
-
- var bkuURI = get_url_param("bkuURI", "Template");
- var Template = get_url_param("Template", "startAuth");
- var startAuth = get_url_param("startAuth", "useMandate");
- var useMandate = get_url_param("useMandate", "");
+ // [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an
+ // z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at
+ var MOA_ID_STARTAUTHENTICATION = "[MOA_ID_STARTAUTHENTICATION]";
- document.moaidform.useMandate.value = useMandate;
- document.moaidform.action = startAuth;
- document.moaidform.Template.value = Template;
- document.moaidform.bkuURI.value = bkuURI;
+ // [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die Online BKU an
+ // z.B.: "https://yoururl.at/moa-id-auth/template_onlineBKU.html"
+ var URL_TO_ONLINEBKU_TEMPLATE = "[URL_TO_ONLINEBKU_TEMPLATE]";
+
+ // [MUSS] Geben Sie hier die URL zur Online BKU an
+ // z.B.: value="https://yoururl.at/bkuonline/https-security-layer-request"
+ // Hinweis: Diese URL muss auch bei den vertrauenswürdigen BKUs in der MOA-ID Konfiguration angegeben werden (siehe Element MOA-IDConfiguration/TrustedBKUs/BKUURL)
+ var URL_TO_ONLINEBKU = "[URL_TO_ONLINEBKU]";
+
+ window.onload=function() {
+ document.getElementById('moaidform').action = MOA_ID_STARTAUTHENTICATION;
+ document.getElementById('Template').value = URL_TO_ONLINEBKU_TEMPLATE;
+ document.getElementById('bkuURI').value = URL_TO_ONLINEBKU;
- document.moaidform.submit();
+ var useMandate = gup("useMandate");
+
+ if (useMandate == "true")
+ document.getElementById('useMandate').value = "true";
+ else
+ document.getElementById('useMandate').value = "false";
+ document.moaidform.submit();
return;
}
- function get_url_param(name, follower) {
-
- var url = window.location.href;
- var i = url.indexOf(name);
- url = url.substring(i + name.length+1, url.length);
- if (follower.length != 0) {
- i = url.indexOf(follower);
- url = url.substring(0, i-1);
- }
-
-
- // alert (name + ": " + url);
-
- return url;
-
+ function gup(name) {
+ name = name.replace(/[\[]/,"\\\[").replace(/[\]]/,"\\\]");
+ var regexS = "[\\?&]"+name+"=([^&#]*)";
+ var regex = new RegExp( regexS );
+ var results = regex.exec( window.location.href );
+ if( results == null )
+ return "";
+ else
+ return results[1];
}
-
-
</script>
</head>
<body>
Bitte warten...
-
- <form method="POST" name="moaidform">
- <input type="hidden" name="Template">
- <input type="hidden" name="bkuURI">
- <input type="hidden" name="useMandate">
+
+ <form method="POST" name="moaidform" id="moaidform">
+ <input type="hidden" name="Template" id="Template">
+ <input type="hidden" name="bkuURI" id="bkuURI">
+ <input type="hidden" name="useMandate" id="useMandate">
</form>
<hr>
diff --git a/id/server/auth/src/main/webapp/index.html b/id/server/auth/src/main/webapp/index.html
index 51bcc7156..62576b15e 100644
--- a/id/server/auth/src/main/webapp/index.html
+++ b/id/server/auth/src/main/webapp/index.html
@@ -9,47 +9,28 @@
<meta http-equiv="Content-Style-Type" content="text/css">
<link rel="stylesheet" type="text/css" href="css/index.css">
<script type="text/javascript">
-
// [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an
// z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at
- // var MOA_ID_STARTAUTHENTICATION = "[MOA_ID_STARTAUTHENTICATION]";
- var MOA_ID_STARTAUTHENTICATION = "https://localhost:8443/moa-id-auth/StartAuthentication?Target=sss&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample";
+ var MOA_ID_STARTAUTHENTICATION = "[MOA_ID_STARTAUTHENTICATION]";
// [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die lokale BKU an
// z.B.: https://yoururl.at/moa-id-auth/template_localBKU.html
- //var URL_TO_LOKALBKU_TEMPLATE = "[URL_TO_LOKALBKU_TEMPLATE]";
- var URL_TO_LOKALBKU_TEMPLATE = "https://localhost:8443/moa-id-auth/template_localBKU.html";
+ var URL_TO_LOKALBKU_TEMPLATE = "[URL_TO_LOKALBKU_TEMPLATE]";
- // [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die Online BKU an
- // z.B.: "https://yoururl.at/moa-id-auth/template_onlineBKU.html"
- //var URL_TO_ONLINEBKU_TEMPLATE = "[URL_TO_ONLINEBKU_TEMPLATE]";
- var URL_TO_ONLINEBKU_TEMPLATE = "https://localhost:8443/moa-id-auth/template_onlineBKU.html";
- // [MUSS] Geben Sie hier die URL zur Online BKU an
- // z.B.: value="https://yoururl.at/bkuonline/https-security-layer-request"
- //var URL_TO_ONLINEBKU = "[URL_TO_ONLINEBKU]";
- //var URL_TO_ONLINEBKU = "http://localhost:8082/bkuonline/http-security-layer-request";
- var URL_TO_ONLINEBKU = "https://localhost:8444/bkuonline/https-security-layer-request";
-
- // [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die Handy Signatur an -->
- <!-- z.B.: value="https://yoururl.at/moa-id-auth/template_handyBKU.html"-->
- //var URL_TO_HANDYSIGNATUR_TEMPLATE = "[URL_TO_HANDYSIGNATUR_TEMPLATE]";
- var URL_TO_HANDYSIGNATUR_TEMPLATE = "https://localhost:8443/moa-id-auth/template_handyBKU.html";
-
window.onload=function() {
- document.getElementById("localBKU").style.display="none";
+ document.getElementById("localBKU").style.display="none";
return;
}
-
function bkuOnlineClicked() {
<!-- [OPTIONAL] Um die lokale BKU auszublenden, ersetzen Sie in der folgenden Zeile "block" durch "none" -->
document.getElementById("localBKU").style.display="block";
- // set values for local BKU
- document.getElementById("form_local_bku").action = MOA_ID_STARTAUTHENTICATION;
- document.getElementById("input_localBKU_template").value = URL_TO_LOKALBKU_TEMPLATE;
+ document.getElementById("moaidform").action = MOA_ID_STARTAUTHENTICATION;
+ document.getElementById("Template").value = URL_TO_LOKALBKU_TEMPLATE;
+
document.getElementById("useMandate").value = "false";
var checkbox = document.getElementById("mandateCheckBox")
if (checkbox != null) {
@@ -57,20 +38,16 @@
document.getElementById("useMandate").value = "true";
}
}
-
- // set values for online BKU
+
var el = document.getElementById("bkulogin");
var parent = el.parentNode;
-
+
var iFrameURL = "iframeOnlineBKU.html" + "?";
- iFrameURL += "bkuURI=" + URL_TO_ONLINEBKU + "&";
- iFrameURL += "Template=" + URL_TO_ONLINEBKU_TEMPLATE + "&";
- iFrameURL += "startAuth=" + MOA_ID_STARTAUTHENTICATION + "&";
iFrameURL += "useMandate=" + document.getElementById("useMandate").value;
-
- var iframe = document.createElement("iframe");
+
+ var iframe = document.createElement("iframe");
iframe.setAttribute("src", iFrameURL);
- iframe.setAttribute("width", "220");
+ iframe.setAttribute("width", "220");
iframe.setAttribute("height", "165");
iframe.setAttribute("frameborder", "0");
iframe.setAttribute("scrolling", "no");
@@ -82,8 +59,8 @@
function bkuHandyClicked() {
document.getElementById("localBKU").style.display="none";
-
- document.getElementById("useMandate").value = "false";
+
+ document.getElementById("useMandate").value = "false";
var checkbox = document.getElementById("mandateCheckBox")
if (checkbox != null) {
if (document.getElementById("mandateCheckBox").checked) {
@@ -91,19 +68,15 @@
}
}
- // set values for Handy Signatur
- var el = document.getElementById("bkulogin");
+ var el = document.getElementById("bkulogin");
var parent = el.parentNode;
-
var iFrameURL = "iframeHandyBKU.html" + "?";
- iFrameURL += "Template=" + URL_TO_HANDYSIGNATUR_TEMPLATE + "&";
- iFrameURL += "startAuth=" + MOA_ID_STARTAUTHENTICATION + "&";
iFrameURL += "useMandate=" + document.getElementById("useMandate").value;
- var iframe = document.createElement("iframe");
+ var iframe = document.createElement("iframe");
iframe.setAttribute("src", iFrameURL);
- iframe.setAttribute("width", "220");
+ iframe.setAttribute("width", "220");
iframe.setAttribute("height", "159");
iframe.setAttribute("frameborder", "0");
iframe.setAttribute("scrolling", "no");
@@ -147,29 +120,28 @@
<!-- [OPTIONAL] Um die Mobile BKU auszublenden, kommentieren sie das folgende div (bkukhandy) aus -->
<div id="bkuhandy" class="hell">
<button name="bkuButton" type="button" onClick="bkuHandyClicked();">HANDY</button>
- </div>
+ </div>
<!-- [OPTIONAL] Um die Anmeldung mit Vollmachten auszublenden, kommentieren Sie das folgende div (mandate) aus -->
<div id="mandate">
<input type="checkbox" name="Mandate" style="vertical-align: middle; margin-right: 5px;" id="mandateCheckBox"><label>in Vertretung anmelden</label>
- </div>
-
+ </div>
</div>
-
-
-
+
<div id="localBKU" style="display:none" class="hell">
<hr>
- <form id="form_local_bku" method="post">
+ <!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an -->
+ <!-- z.B.: action="https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at"-->
+ <form method="post" id="moaidform">
<input type="hidden" name="show" value="false">
<!-- [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die lokale BKU an -->
<!-- z.B.: value="https://yoururl.at/moa-id-auth/template_localBKU.html"-->
- <input type="hidden" name="Template" id="input_localBKU_template" >
- <input type="hidden" name="bkuURI" value="https://localhost:3496/https-security-layer-request">
- <input type="hidden" name="useMandate" id="useMandate">
- <input type="submit" size="400" value="Lokale BKU">
+ <input type="hidden" name="Template" id="Template">
+ <input type="hidden" name="bkuURI" value="https://localhost:3496/https-security-layer-request">
+ <input type="hidden" name="useMandate" id="useMandate">
+ <input type="submit" size="400" value="Lokale BKU">
</form>
<p>
<small>Alternativ k&ouml;nnen Sie eine lokal installierte BKU verwenden.</small>