From 90f7f3ea1674e7cd5ead84247ca881ca101ba72a Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 11 Feb 2009 20:03:29 +0000
Subject: div. changes for A-Trust Activation Support (User-Agent header,
 GetStatusRequest, ...)

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@296 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../src/main/java/at/gv/egiz/bku/conf/Configurator.java  | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java')

diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java b/bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java
index 7f180ad0..a6c70d2c 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java
@@ -46,6 +46,7 @@ import at.gv.egiz.bku.slexceptions.SLRuntimeException;
 import at.gv.egiz.bku.utils.urldereferencer.URLDereferencer;
 
 public abstract class Configurator {
+
   private Log log = LogFactory.getLog(Configurator.class);
 
   protected Properties properties;
@@ -202,22 +203,22 @@ public abstract class Configurator {
   }
 
   public void configureVersion() {
-    if (properties.getProperty(DataUrlConnection.USER_AGENT_PROPERTY_KEY) == null) {
+    if (properties.getProperty(DataUrlConnection.USERAGENT_CONFIG_P) == null) {
       Properties p = new Properties();
       try {
         InputStream is = getManifest();
         if (is != null) {
           p.load(getManifest());
           String version = p.getProperty("Implementation-Build");
-          properties.setProperty(DataUrlConnection.USER_AGENT_PROPERTY_KEY,
-              "citizen-card-environment/1.2 MOCCA " + version);
+          properties.setProperty(DataUrlConnection.USERAGENT_CONFIG_P,
+                  DataUrlConnection.USERAGENT_BASE + version);
           log.debug("Setting user agent to: "
               + properties
-                  .getProperty(DataUrlConnection.USER_AGENT_PROPERTY_KEY));
+                  .getProperty(DataUrlConnection.USERAGENT_CONFIG_P));
         } else {
           log.warn("Cannot read manifest");
-          properties.setProperty(DataUrlConnection.USER_AGENT_PROPERTY_KEY,
-              "citizen-card-environment/1.2 MOCCA UNKNOWN");
+          properties.setProperty(DataUrlConnection.USERAGENT_CONFIG_P,
+                  DataUrlConnection.USERAGENT_DEFAULT);
         }
       } catch (IOException e) {
         log.error(e);
@@ -254,6 +255,7 @@ public abstract class Configurator {
       log.error("Cannot load CA certificates", e1);
     }
     String disableAll = getProperty("SSL.disableAllChecks");
+    String disableHostnameVerification = getProperty("SSL.disableHostnameVerification");
     try {
       KeyManager[] km = null;
       SSLContext sslCtx = SSLContext
@@ -275,7 +277,7 @@ public abstract class Configurator {
     } catch (Exception e) {
       log.error("Cannot configure SSL", e);
     }
-    if ((disableAll != null) && (Boolean.parseBoolean(disableAll))) {
+    if ((disableAll != null && Boolean.parseBoolean(disableAll)) || (disableHostnameVerification != null && Boolean.parseBoolean(disableHostnameVerification))) {
       log.warn("---------------------------------");
       log.warn(" Disabling Hostname Verification ");
       log.warn("---------------------------------");
-- 
cgit v1.2.3