diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2018-01-23 14:23:39 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2018-01-23 14:23:39 +0100 |
| commit | 731ab39b8ef05a4e84b72fb4243d59c9f6dd48cb (patch) | |
| tree | 52ce23ebe8191f99a187b9ff90af8cef01d63030 /id/server/moa-id-frontend-resources/src/main | |
| parent | 869a07573fb6295174fd57aced1ba888f3015910 (diff) | |
| download | moa-id-spss-731ab39b8ef05a4e84b72fb4243d59c9f6dd48cb.tar.gz moa-id-spss-731ab39b8ef05a4e84b72fb4243d59c9f6dd48cb.tar.bz2 moa-id-spss-731ab39b8ef05a4e84b72fb4243d59c9f6dd48cb.zip | |
update mostly all GUI forms to split JavaScript and CSS from html code to support "Content Security-Policy" http headers
Diffstat (limited to 'id/server/moa-id-frontend-resources/src/main')
17 files changed, 123 insertions, 109 deletions
diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/autocommit.js b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/autocommit.js new file mode 100644 index 000000000..d21a5651d --- /dev/null +++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/autocommit.js @@ -0,0 +1,5 @@ +function autoCommmit() { + document.forms[0].submit(); +} + +document.addEventListener('DOMContentLoaded', autoCommmit);
\ No newline at end of file diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/basic.css b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/basic.css new file mode 100644 index 000000000..4bec163a9 --- /dev/null +++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/basic.css @@ -0,0 +1,4 @@ +@charset "utf-8"; + .bgTrans { + background-color:transparent + }
\ No newline at end of file diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/bkudetected.js b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/bkudetected.js new file mode 100644 index 000000000..7e4d2b12f --- /dev/null +++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/bkudetected.js @@ -0,0 +1,3 @@ +document.addEventListener('DOMContentLoaded', function () { + parent.setBKUAvailable(true); +});
\ No newline at end of file diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/bkudetection.js b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/bkudetection.js new file mode 100644 index 000000000..b991beb60 --- /dev/null +++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/bkudetection.js @@ -0,0 +1,6 @@ +function autoCommmit() { + parent.setBKUAvailable(false); + document.forms[0].submit(); +} + +document.addEventListener('DOMContentLoaded', autoCommmit);
\ No newline at end of file diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/iframeLBKUdetect.html b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/iframeLBKUdetect.html index cbc16cb38..1be548979 100644 --- a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/iframeLBKUdetect.html +++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/iframeLBKUdetect.html @@ -1,31 +1,14 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html lang="de"> <head> -<title>BKU-Erkennung</title> -<script type="text/javascript"> -<!-- - bkuprot = location.protocol; - bkuhost = "localhost"; - bkuport = (bkuprot == "https:" ? 3496 : 3495); - bkupath = "https-security-layer-request"; - bkuurl = bkuprot + "//" + bkuhost + ":" + bkuport + "/" + bkupath; -//--> -</script> + <title>BKU-Erkennung</title> + <script src="$contextPath/bkudetection.js"></script> + <link rel="stylesheet" href="$contextPath/basic.css" /> </head> -<body style="background-color:transparent"> -<script type="text/javascript"> -<!-- - if (bkuprot == "https:" || bkuprot == "http:") { - parent.setBKUAvailable(false); - document.write('<form name="bkudetectform" method="POST" target="bkudetect" action="' + bkuurl + '" enctype="application/x-www-form-urlencoded">'); - document.write('<input type="hidden" name="XMLRequest" value="<?xml version="1.0" encoding="UTF-8"?><NullOperationRequest xmlns="http://www.buergerkarte.at/namespaces/securitylayer/1.2#"/>" />'); - document.write('<input type="hidden" name="RedirectURL" value="$contextPath/iframeLBKUdetected.html"/>'); - document.write('</form>'); - try { - document.bkudetectform.submit(); - } catch(e) {console.log(e)} - } -//--> -</script> +<body class="bgTrans"> + <form name="bkudetectform" method="POST" target="bkudetect" action="https://localhost:3496/https-security-layer-request" enctype="application/x-www-form-urlencoded"> + <input type="hidden" name="XMLRequest" value="<?xml version="1.0" encoding="UTF-8"?><NullOperationRequest xmlns="http://www.buergerkarte.at/namespaces/securitylayer/1.2#"/>" /> + <input type="hidden" name="RedirectURL" value="$contextPath/iframeLBKUdetected.html"/> + </form> </body> </html> diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/iframeLBKUdetected.html b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/iframeLBKUdetected.html index 8769c38ad..566ca01bc 100644 --- a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/iframeLBKUdetected.html +++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/iframeLBKUdetected.html @@ -1,14 +1,10 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html lang="de"> <head> -<title>BKU-Erkennung</title> -<script type="text/javascript"> - parent.setBKUAvailable(true); -</script> + <title>BKU-Erkennung</title> + <script src="bkudetected.js"></script> + <link rel="stylesheet" href="basic.css" /> </head> -<body style="background-color:transparent"> -<script type="text/javascript"> - parent.setBKUAvailable(true); -</script> +<body class="bgTrans"> </body> </html> diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/redirect.js b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/redirect.js new file mode 100644 index 000000000..1bba3d5e0 --- /dev/null +++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/redirect.js @@ -0,0 +1,5 @@ +function autoCommmit() { + document.getElementById('link').click(); +} + +document.addEventListener('DOMContentLoaded', autoCommmit);
\ No newline at end of file diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/slo.js b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/slo.js new file mode 100644 index 000000000..c85837c8a --- /dev/null +++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/slo.js @@ -0,0 +1,20 @@ +function sloTimeOut() { + document.getElementById("timeoutURL").click(); +} +function RestartAfterDelay() { + var eDate = null; + var MilliSekZeit = 0; + var SysDatumJetzt = new Date(); + var SysDatumJetztMilli = SysDatumJetzt.getTime(); + + do { + eDate = new Date(); + MilliSekZeit = eDate.getTime(); + } while ((MilliSekZeit-SysDatumJetztMilli) < $timeout); + + sloTimeOut(); +} + +document.addEventListener('DOMContentLoaded', function () { + setTimeout(sloTimeOut, 30000); +});
\ No newline at end of file diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_handyBKU.html b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_handyBKU.html index 08071ac3a..7a25367e0 100644 --- a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_handyBKU.html +++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_handyBKU.html @@ -3,14 +3,9 @@ <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <script language="javascript" type="text/javascript"> - function onAnmeldeSubmit() { - document.CustomizedForm.submit(); - document.CustomizedForm.Senden.disabled=true; - } - </script> + <script src="<ContextURL>/autocommit.js"></script> </head> - <body onLoad="onAnmeldeSubmit()"> + <body> <form name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data"> Falls Sie nicht automatisch weitergeleitet werden klicken Sie bitte hier: <input class="button" type="submit" value="Starte Anmeldung" name="Senden"> diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_localBKU.html b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_localBKU.html index b9905c4af..ef2c1ed8e 100644 --- a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_localBKU.html +++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_localBKU.html @@ -3,14 +3,9 @@ <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <script language="javascript" type="text/javascript"> - function onAnmeldeSubmit() { - document.CustomizedForm.submit(); - document.CustomizedForm.Senden.disabled=true; - } - </script> + <script src="<ContextURL>/autocommit.js"></script> </head> - <body onLoad="onAnmeldeSubmit()"> + <body> <form target=<REDIRECTTARGET> name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data"> Falls Sie nicht automatisch weitergeleitet werden klicken Sie bitte hier: <input class="button" type="submit" value="Starte Anmeldung" name="Senden"> diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_onlineBKU.html b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_onlineBKU.html index a9932d49d..7a0ae51ad 100644 --- a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_onlineBKU.html +++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_onlineBKU.html @@ -3,14 +3,9 @@ <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <script language="javascript" type="text/javascript"> - function onAnmeldeSubmit() { - document.CustomizedForm.submit(); - document.CustomizedForm.Senden.disabled=true; - } - </script> + <script src="<ContextURL>/autocommit.js"></script> </head> - <body onLoad="onAnmeldeSubmit()"> + <body> <form name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data"> Falls Sie nicht automatisch weitergeleitet werden klicken Sie bitte hier: <input class="button" type="hidden" value="Starte Anmeldung" name="Senden"> diff --git a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_thirdBKU.html b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_thirdBKU.html index a9932d49d..be8d7aab1 100644 --- a/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_thirdBKU.html +++ b/id/server/moa-id-frontend-resources/src/main/resources/mainGUI/template_thirdBKU.html @@ -3,14 +3,9 @@ <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <script language="javascript" type="text/javascript"> - function onAnmeldeSubmit() { - document.CustomizedForm.submit(); - document.CustomizedForm.Senden.disabled=true; - } - </script> + <script src="<ContextURL>/autocommit.js"></script> </head> - <body onLoad="onAnmeldeSubmit()"> + <body> <form name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data"> Falls Sie nicht automatisch weitergeleitet werden klicken Sie bitte hier: <input class="button" type="hidden" value="Starte Anmeldung" name="Senden"> diff --git a/id/server/moa-id-frontend-resources/src/main/resources/templates/iframeLBKUdetectSPSpecific.html b/id/server/moa-id-frontend-resources/src/main/resources/templates/iframeLBKUdetectSPSpecific.html index 79a217946..aadc3d4cf 100644 --- a/id/server/moa-id-frontend-resources/src/main/resources/templates/iframeLBKUdetectSPSpecific.html +++ b/id/server/moa-id-frontend-resources/src/main/resources/templates/iframeLBKUdetectSPSpecific.html @@ -2,8 +2,10 @@ <html lang="de"> <head> <title>BKU-Erkennung</title> + <script src="$contextPath/bkudetection.js"></script> + <link rel="stylesheet" href="$contextPath/basic.css" /> </head> -<body style="background-color:transparent" onload="parent.setBKUAvailable(false);document.forms[0].submit();"> +<body class="bgTrans"> <form name="bkudetectform" method="POST" target="bkudetect" action="$bkuURLLocal" enctype="application/x-www-form-urlencoded"> <input type="hidden" name="XMLRequest" value="<?xml version="1.0" encoding="UTF-8"?><NullOperationRequest xmlns="http://www.buergerkarte.at/namespaces/securitylayer/1.2#"/>" /> <input type="hidden" name="RedirectURL" value="$contextPath/iframeLBKUdetected.html"/> diff --git a/id/server/moa-id-frontend-resources/src/main/resources/templates/javascript_tempalte.js b/id/server/moa-id-frontend-resources/src/main/resources/templates/javascript_tempalte.js index 0c1f6a561..cc4714006 100644 --- a/id/server/moa-id-frontend-resources/src/main/resources/templates/javascript_tempalte.js +++ b/id/server/moa-id-frontend-resources/src/main/resources/templates/javascript_tempalte.js @@ -126,13 +126,12 @@ function isIE() { } } } - function onChangeChecks() { + function onChangeChecks() { if (self.innerWidth < 650) { document.getElementById("moaidform").setAttribute("target","_parent"); } else { document.getElementById("moaidform").removeAttribute("target"); } - } function checkIfBrowserSupportsJava(){ @@ -234,8 +233,21 @@ function isIE() { console.log("Local BKU NOT available") } } catch(e) {console.log("Local BKU detection is not possible! Msg: "+e);} - - } + + } + function setUseMandateFlag(e) { + /*document.getElementById("mandateCheckBox").setAttribute("aria-checked", document.getElementById("mandateCheckBox").checked);*/ + e.setAttribute("aria-checked", e.checked); + } + + document.addEventListener('resize', onChangeChecks); + document.addEventListener('DOMContentLoaded', function () { + document.querySelector('#mandateCheckBox').addEventListener('click', setUseMandateFlag); + document.querySelector('#moaidform>input[type=submit]').addEventListener('click', setMandateSelection); + document.querySelector('#bkuhandy>input[type=button]').addEventListener('click', bkuHandyClicked); + document.querySelector('#stork button[type=button]').addEventListener('click', storkClicked); + onChangeChecks(); + }); /* function setSSOSelection() { document.getElementById("useSSO").value = "false"; diff --git a/id/server/moa-id-frontend-resources/src/main/resources/templates/loginFormFull.html b/id/server/moa-id-frontend-resources/src/main/resources/templates/loginFormFull.html index c4da51dc1..5a4ca66b7 100644 --- a/id/server/moa-id-frontend-resources/src/main/resources/templates/loginFormFull.html +++ b/id/server/moa-id-frontend-resources/src/main/resources/templates/loginFormFull.html @@ -13,7 +13,7 @@ <title>Anmeldung mittels Bürgerkarte oder Handy-Signatur</title> </head> <!--body onload="onChangeChecks();checkIfBrowserSupportsJava();" onresize="onChangeChecks();"--> -<body onload="onChangeChecks();" onresize="onChangeChecks();"> +<body> <div id="page"> <div id="page1" class="case selected-case" role="main"> <h2 class="OA_header" role="heading">Anmeldung an: $OAName</h2> @@ -26,8 +26,7 @@ <div id="mandateLogin" style="$MANDATEVISIBLE"> <div> <input tabindex="1" type="checkbox" name="Mandate" - id="mandateCheckBox" class="verticalcenter" role="checkbox" - onClick='document.getElementById("mandateCheckBox").setAttribute("aria-checked", document.getElementById("mandateCheckBox").checked);'$MANDATECHECKED> + id="mandateCheckBox" class="verticalcenter" role="checkbox" $MANDATECHECKED> <label for="mandateCheckBox" class="verticalcenter">in Vertretung anmelden</label> <!--a href="info_mandates.html" @@ -49,20 +48,20 @@ <input type="hidden" name="SSO" id="useSSO" /> <input type="hidden" name="ccc" id="ccc" /> <input type="hidden" name="pendingid" value="$pendingReqID" /> - <input type="submit" value=" Karte " tabindex="4" role="button" onclick="setMandateSelection();"> - </form> + <input type="submit" value=" Karte " tabindex="4" role="button"> + </form> + <iframe name="bkudetect" width="0" height="0" scrolling="no" marginheight="0" marginwidth="0" frameborder="0" src="$contextPath/feature/bkuDetection?pendingid=$pendingReqID"></iframe> <!-- BKU detection with static template--> <!--iframe name="bkudetect" width="0" height="0" scrolling="no" marginheight="0" marginwidth="0" frameborder="0" src="$contextPath/iframeLBKUdetect.html"></iframe--> - + </div> <div id="bkuhandy"> <img class="bkuimage" src="$contextPath/img/handysign.png" alt="HandyBKU" /> - <input name="bkuButtonHandy" type="button" onClick="bkuHandyClicked();" tabindex="3" role="button" value="HANDY" /> + <input name="bkuButtonHandy" type="button" tabindex="3" role="button" value="HANDY" /> </div> </div> - <!--div id="localBKU"> <form method="get" id="moaidform" action="$contextPath$submitEndpoint" class="verticalcenter" target="_parent"> @@ -74,7 +73,7 @@ <input type="submit" value=" Lokale Bürgerkartenumgebung " tabindex="4" role="button" onclick="setMandateSelection();"> </form> - <iframe name="bkudetect" width="0" height="0" scrolling="no" marginheight="0" marginwidth="0" frameborder="0" src="$contextPath/feature/bkuDetection"><\/iframe> + <iframe name="bkudetect" width="0" height="0" scrolling="no" marginheight="0" marginwidth="0" frameborder="0" src="$contextPath/feature/bkuDetection?pendingid=$pendingReqID"><\/iframe> </div--> <!-- Single Sign-On Session transfer functionality --> @@ -88,7 +87,7 @@ <select name="cccSelection" id="cccSelection" size="1" style="width: 120px; margin-right: 5px;" > $countryList </select> - <button name="bkuButton" type="button" onClick="storkClicked();">Proceed</button> + <button name="bkuButton" type="button">Proceed</button> <a href="info_stork.html" target="_blank" class="infobutton" style="color:#FFF">i</a> </p> </div> diff --git a/id/server/moa-id-frontend-resources/src/main/resources/templates/redirectForm.html b/id/server/moa-id-frontend-resources/src/main/resources/templates/redirectForm.html index ac3242c89..a27a7ba10 100644 --- a/id/server/moa-id-frontend-resources/src/main/resources/templates/redirectForm.html +++ b/id/server/moa-id-frontend-resources/src/main/resources/templates/redirectForm.html @@ -1,13 +1,31 @@ <html> <head> <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> -<script type="text/javascript"> - </script> + <script src="$contextPath/redirect.js"></script> </head> +<body> + <div id="page"> -<body onload="document.getElementById('link').click();"> - <a href="$URL" target="$TARGET" id="link">CLICK to perform a - redirect back to Online Application</a> + <div id="page1" class="case selected-case" role="main"> + +<!-- <h2 class="OA_header">Anmeldung an: #OAName#</h2> --> + + <div id="main"> + <div id="leftcontent" class="hell"> + <div id="bku_header" class="dunkel"> + <h2 id="tabheader" class="dunkel" role="heading"> + >You get redirected ... + </h2> + </div> + + <div id="selectArea" class="hell" role="application"> + <a href="$URL" target="$TARGET" id="link">Click here if it does not resume</a> + + </div> + </div> + </div> + </div> + </div> </body> </html> diff --git a/id/server/moa-id-frontend-resources/src/main/resources/templates/slo_template.html b/id/server/moa-id-frontend-resources/src/main/resources/templates/slo_template.html index b3eb18082..4f86f9f14 100644 --- a/id/server/moa-id-frontend-resources/src/main/resources/templates/slo_template.html +++ b/id/server/moa-id-frontend-resources/src/main/resources/templates/slo_template.html @@ -6,37 +6,12 @@ <link rel="stylesheet" href="$contextPath/css/buildCSS" /> #if($timeoutURL) - <script type="text/javascript"> - function sloTimeOut() { - window.location.href="$timeoutURL"; - - } - function RestartAfterDelay() { - var eDate = null; - var MilliSekZeit = 0; - var SysDatumJetzt = new Date(); - var SysDatumJetztMilli = SysDatumJetzt.getTime(); - - do { - eDate = new Date(); - MilliSekZeit = eDate.getTime(); - - } while ((MilliSekZeit-SysDatumJetztMilli) < $timeout); - - sloTimeOut(); - } - - </script> + <script src="$contextPath/slo.js"></script> #end <title>Single LogOut Vorgang ... </title> </head> - -#if($timeoutURL) - <body onload='setTimeout(sloTimeOut, $timeout);'> -#else - <body> -#end +<body> <noscript> <p> <strong>Note:</strong> Since your browser does not support @@ -68,6 +43,11 @@ Sie werden von allen Online-Applikationen abgemeldet. <br> Dieser Vorgang kann einige Zeit in Anspruch nehmen. </p> + + #if($timeoutURL) + <a id="timeoutURL" href="$timeoutURL">Click here if it does not resume after 30 seconds</a> + #end + </div> #end @@ -77,7 +57,7 @@ <!--div id="validation"> <a href="http://validator.w3.org/check?uri="> <img style="border: 0; width: 88px; height: 31px" - src="$contextpath/img/valid-html5-blue.png" alt="HTML5 ist valide!" /> + src="$contextPath/img/valid-html5-blue.png" alt="HTML5 ist valide!" /> </a> <a href="http://jigsaw.w3.org/css-validator/"> <img style="border: 0; width: 88px; height: 31px" src="http://jigsaw.w3.org/css-validator/images/vcss-blue" @@ -90,5 +70,6 @@ #foreach( $el in $redirectURLs ) <iframe src=$el class="reqframe"></iframe> #end + </body> </html>
\ No newline at end of file |