From 1c567f6eb16fa10d3811fbaaf70c4ab04fb08077 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 6 Feb 2014 15:42:53 +0100
Subject: BRZ:  -add SAML1 SourceID parameter in moa-id general

Bugfix:
 -SSO target had an error in case of business-service
 -OA with business-service whichout single sign-on produce an error
---
 id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'id/ConfigWebTool/src/main/webapp/jsp')

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index 41702cbbb..2e0e5ea2a 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -300,6 +300,19 @@
 							
 							<br>
 							
+							<div class="moageneral_protocol_area">
+								<h4><%=LanguageHelper.getGUIString("webpages.moaconfig.protocols.saml1.header", request) %></h4>
+									
+									<s:textfield name="moaconfig.saml1SourceID " 
+										value="%{moaconfig.saml1SourceID}" 
+										labelposition="left"
+										key="webpages.moaconfig.protocols.saml1.sourceID"
+										cssClass="textfield_long">
+									</s:textfield>
+							</div>
+							
+							<br>
+							
 							<div class="moageneral_protocol_area">
 								<h4><%=LanguageHelper.getGUIString("webpages.moaconfig.protocols.pvp2.header", request) %></h4>
 									
-- 
cgit v1.2.3


From b905c43b4630d290026d03e744413b20f1b73551 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 11 Feb 2014 08:13:51 +0100
Subject: * add OA specific BKU selection template * add OA specific
 send-assertion template * add OA specific applet height and width
 configuration * add PVP2.x reload checkbox in PVP2.x OA configuration

* add new elements to MOA-ID configuration
---
 .../src/main/webapp/jsp/editMOAConfig.jsp          |  1 +
 .../src/main/webapp/jsp/editOAGeneral.jsp          | 74 ++++++++++++++++++++--
 2 files changed, 70 insertions(+), 5 deletions(-)

(limited to 'id/ConfigWebTool/src/main/webapp/jsp')

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index 2e0e5ea2a..1bb429afa 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -399,6 +399,7 @@
 									<s:file name="moaconfig.fileUpload" key="webpages.moaconfig.sl.transormations.upload" cssClass="textfield_long"></s:file>
 								</div>
 							</s:iterator>
+							
 							<s:if test="moaconfig.fileUploadFileName.size() == 0">
 									<div id="pvp2_certificate_upload">
 									<s:file name="moaconfig.fileUpload" key="webpages.moaconfig.sl.transormations.upload" cssClass="textfield_long"></s:file>
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index 4e8dfc259..fadf528d1 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -240,6 +240,49 @@
 									cssClass="textfield_long">
 								</s:textfield>
 							</div>
+							
+							<div class="oa_protocol_area">
+								<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.general.bku.bkuselection.header", request) %></h4>
+								<s:iterator value="%{generalOA.bkuSelectionFileUploadFileName}" var="fileNameBKU">
+									<div class="floatClass">
+										<s:label key="webpages.oaconfig.general.bku.bkuselection.filename" value="%{fileNameBKU}"/>
+										<s:checkbox key="webpages.oaconfig.general.bku.delete"
+																labelposition="left"														
+																cssClass="checkbox"
+																name="generalOA.deleteBKUTemplate"></s:checkbox>
+									</div>
+									<div id="pvp2_certificate_upload">
+										<s:file name="generalOA.bkuSelectionFileUpload" key="webpages.oaconfig.general.bku.bkuselection.upload" cssClass="textfield_long"></s:file>
+									</div>
+								</s:iterator>
+								<s:if test="generalOA.bkuSelectionFileUploadFileName.size() == 0">
+										<div id="pvp2_certificate_upload">
+										<s:file name="generalOA.bkuSelectionFileUpload" key="webpages.oaconfig.general.bku.bkuselection.upload" cssClass="textfield_long"></s:file>
+									</div>
+								</s:if>
+							</div>
+							<div class="oa_protocol_area">
+								<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.general.bku.sendassertion.header", request) %></h4>
+								<s:iterator value="%{generalOA.sendAssertionFileUploadFileName}" var="fileNameBKU">
+									<div class="floatClass">
+										<s:label 	key="webpages.oaconfig.general.bku.sendassertion.filename" 
+															value="%{fileNameBKU}"/>
+										<s:checkbox key="webpages.oaconfig.general.bku.delete"
+																labelposition="left"														
+																cssClass="checkbox"
+																name="generalOA.deleteSendAssertionTemplate"></s:checkbox>
+									</div>
+									<div id="pvp2_certificate_upload">
+										<s:file name="generalOA.sendAssertionFileUpload" key="webpages.oaconfig.general.bku.sendassertion.upload" cssClass="textfield_long"></s:file>
+									</div>
+								</s:iterator>
+								<s:if test="generalOA.sendAssertionFileUploadFileName.size() == 0">
+										<div id="pvp2_certificate_upload">
+										<s:file name="generalOA.sendAssertionFileUpload" key="webpages.oaconfig.general.bku.sendassertion.upload" cssClass="textfield_long"></s:file>
+									</div>
+								</s:if>
+							</div>
+							
 						</div>
 					</s:if>
 					
@@ -271,7 +314,7 @@
 					</div>
 
 					<div class="oa_config_block">
-						<p><strong><%=LanguageHelper.getGUIString("webpages.oaconfig.sso.header", request) %></strong></p>
+						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.sso.header", request) %></h3>
 						
 						<s:checkbox name="ssoOA.useSSO" 
 							value="%{ssoOA.useSSO}"
@@ -356,7 +399,7 @@
 								<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.oauth20.hidden", request) %>
 						  </button>
 						  						
-						<div id="oa_saml1_area" class="oa_protocol_area">
+						<div id="oa_saml1_area" class="oa_protocol_area hidden">
 							<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.protocols.saml1.header", request) %></h4>
 							
 							<s:if test="authUser.isAdmin()">
@@ -416,9 +459,14 @@
 							
 						</div>
 						
-						<div id="oa_pvp2_area" class="oa_protocol_area">
+						<div id="oa_pvp2_area" class="oa_protocol_area hidden">
 							<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.protocols.pvp2.header", request) %></h4>
 						
+							<s:checkbox 	key="webpages.oaconfig.pvp2.reload"
+														labelposition="left"														
+														cssClass="checkbox"
+														name="pvp2OA.reLoad"></s:checkbox>
+						
 						  <s:textfield name="pvp2OA.metaDataURL" 
 								value="%{pvp2OA.metaDataURL}" 
 								labelposition="left"
@@ -433,7 +481,7 @@
 							</div>
 						</div>
 						
-						<div id="oa_oauth20_area" class="oa_protocol_area">
+						<div id="oa_oauth20_area" class="oa_protocol_area hidden">
 							<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.protocols.oauth20.header", request) %></h4>
 						
 							<s:label key="webpages.oaconfig.oauth20.clientId" value="%{oauth20OA.clientId}"/>
@@ -483,7 +531,7 @@
 								<%=LanguageHelper.getGUIString("webpages.oaconfig.general.BKUSelection.button.hidden", request) %>
 						  </button>
 						  						
-							<div id="formcustom_area" class="oa_protocol_area">
+							<div id="formcustom_area" class="oa_protocol_area hidden">
 								<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.general.BKUSelection.header", request) %></h4>
 																
 								<div id="formCustomValues">													
@@ -562,6 +610,22 @@
 														name="formOA.appletRedirectTarget">
 									</s:select>
 									
+									<s:textfield name="formOA.applet_height" 
+										value="%{formOA.applet_height}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.BKUSelection.header.applet.height"
+										cssClass="textfield_middle"
+										id="HEADER_HEIGHT">
+									</s:textfield>
+									
+									<s:textfield name="formOA.applet_width" 
+										value="%{formOA.applet_width}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.BKUSelection.header.applet.width"
+										cssClass="textfield_middle"
+										id="HEADER_WIDTH">
+									</s:textfield>
+									
 									<s:select list="formOA.fontTypeList"
 														key="webpages.oaconfig.general.BKUSelection.fonttype.list"
 														labelposition="left"
-- 
cgit v1.2.3


From f1d374bb66f3b48f2a14a8d550c4125c04dde7a8 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 24 Feb 2014 11:40:49 +0100
Subject: * add default configuration values * add MOA-ID-Auth publicURLPreFix
 as mandatory configuration value * remove ReloadConfiguration serlet * change
 moa-id-lib to use publicURLPreFix * update repository

---
 id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp | 16 ++++++++++++----
 id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp |  5 +++--
 2 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'id/ConfigWebTool/src/main/webapp/jsp')

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index 1bb429afa..de5e4841b 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -33,6 +33,14 @@
 				<s:if test="authUser.isAdmin()">
 								
 					<s:form namespace="/secure" method="POST" enctype="multipart/form-data">
+							
+							<s:textfield name="moaconfig.publicURLPrefix" 
+								value="%{moaconfig.publicURLPrefix}" 
+								labelposition="left"
+								key="webpages.oaconfig.general.publicURLPreFix"
+								cssClass="textfield_long">
+							</s:textfield>
+					
 				
 						<div class="oa_config_block">
 							<h3><%=LanguageHelper.getGUIString("webpages.moaconfig.defaultbkus.header", request) %></h3>
@@ -200,12 +208,12 @@
 						
 						<div class="oa_config_block" >
 							<h3><%=LanguageHelper.getGUIString("webpages.moaconfig.sso.header", request) %></h3>
-							<s:textfield name="moaconfig.ssoPublicUrl" 
+<%-- 							<s:textfield name="moaconfig.ssoPublicUrl" 
 								value="%{moaconfig.ssoPublicUrl}" 
 								labelposition="left"
 								key="webpages.moaconfig.sso.PublicUrl"
 								cssClass="textfield_long">
-							</s:textfield>
+							</s:textfield> --%>
 							<s:textfield name="moaconfig.ssoFriendlyName" 
 								value="%{moaconfig.ssoFriendlyName}" 
 								labelposition="left"
@@ -316,12 +324,12 @@
 							<div class="moageneral_protocol_area">
 								<h4><%=LanguageHelper.getGUIString("webpages.moaconfig.protocols.pvp2.header", request) %></h4>
 									
-									<s:textfield name="moaconfig.pvp2PublicUrlPrefix " 
+<%-- 									<s:textfield name="moaconfig.pvp2PublicUrlPrefix " 
 										value="%{moaconfig.pvp2PublicUrlPrefix}" 
 										labelposition="left"
 										key="webpages.moaconfig.protocols.pvp2.PublicUrlPrefix"
 										cssClass="textfield_long">
-									</s:textfield>
+									</s:textfield> --%>
 									<s:textfield name="moaconfig.pvp2IssuerName" 
 										value="%{moaconfig.pvp2IssuerName}" 
 										labelposition="left"
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index fadf528d1..e182fd805 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -336,12 +336,13 @@
 								</s:checkbox>
 							</s:if>
 					
-							<s:textfield name="ssoOA.singleLogOutURL" 
+<%--TODO: insert if SLO is implemented!!!--%> 
+<%--							<s:textfield name="ssoOA.singleLogOutURL" 
 								value="%{ssoOA.singleLogOutURL}" 
 								labelposition="left"
 								key="webpages.oaconfig.sso.singlelogouturl"
 								cssClass="textfield_long">
-							</s:textfield>
+							</s:textfield> --%>
 						</div>
 					</div>
 
-- 
cgit v1.2.3