Append -X14 to UA string when using XAdES1.4

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@1157 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

1 files changed, 11 insertions, 6 deletions

diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/HTTPBindingProcessorImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/HTTPBindingProcessorImpl.java
index 3534636a..baadcc7d 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/binding/HTTPBindingProcessorImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/HTTPBindingProcessorImpl.java
@@ -103,7 +103,7 @@ public class HTTPBindingProcessorImpl extends AbstractBindingProcessor implement
 	 * The citizen card environment identifier for <code>Server</code> and
 	 * <code>UserAgent</code> headers.
 	 */
-	protected static String CITIZENC_CARD_ENVIRONMENT = "citizen-card-environment/1.2";
+	protected static String CITIZEN_CARD_ENVIRONMENT = "citizen-card-environment/1.2";
 
 	/**
 	 * The configuration facade used to access the MOCCA configuration.
@@ -118,6 +118,8 @@ public class HTTPBindingProcessorImpl extends AbstractBindingProcessor implement
 
 		public static final String USE_STYLESHEETURL_PROPERTY = "UseStylesheetURL";
 
+		public static final String USE_XADES_1_4 = "UseXAdES14";
+
 		public int getMaxDataUrlHops() {
 			return configuration.getInt(DATAURLCLIENT_MAXHOPS, 10);
 		}
@@ -129,10 +131,9 @@ public class HTTPBindingProcessorImpl extends AbstractBindingProcessor implement
 		}
 
 		public String getProductVersion() {
-			return configuration
-					.getString(
-							ConfigurationFactoryBean.MOCCA_IMPLEMENTATIONVERSION_PROPERTY,
-							"UNKNOWN");
+			return configuration.getString(
+					ConfigurationFactoryBean.MOCCA_IMPLEMENTATIONVERSION_PROPERTY,
+					"UNKNOWN") + (getUseXAdES14() ? "-X14" : "");
 		}
 
 		public String getSignatureLayout() {
@@ -164,6 +165,10 @@ public class HTTPBindingProcessorImpl extends AbstractBindingProcessor implement
 			}
 			return false;
 		}
+
+		public boolean getUseXAdES14() {
+			return configuration.getBoolean(USE_XADES_1_4, false);
+		}
 	}
 	
 	/**
@@ -615,7 +620,7 @@ public class HTTPBindingProcessorImpl extends AbstractBindingProcessor implement
 	//----------------------------------------------------------------------------
 
 	public String getServerHeaderValue() {
-		return CITIZENC_CARD_ENVIRONMENT + " "
+		return CITIZEN_CARD_ENVIRONMENT + " "
 				+ configurationFacade.getProductName() + "/"
 				+ configurationFacade.getProductVersion();
 	}