aboutsummaryrefslogtreecommitdiff
path: root/id/ConfigWebTool/src/main/java/at/gv/egovernment
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2016-10-24 12:45:47 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2016-10-24 12:45:47 +0200
commitd1a5528b2f542c1f7004f6f47fba0b083ff03277 (patch)
tree8e64bf5e8d51a81c449f79671f799fc6df43eb97 /id/ConfigWebTool/src/main/java/at/gv/egovernment
parent479fb49056c4603069c50c43d38e7988efd733ee (diff)
downloadmoa-id-spss-d1a5528b2f542c1f7004f6f47fba0b083ff03277.tar.gz
moa-id-spss-d1a5528b2f542c1f7004f6f47fba0b083ff03277.tar.bz2
moa-id-spss-d1a5528b2f542c1f7004f6f47fba0b083ff03277.zip
remove MOA-ID specific certStore directory.
From now, MOA-ID always use the MOA-SPSS certStore directory for chain building
Diffstat (limited to 'id/ConfigWebTool/src/main/java/at/gv/egovernment')
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java30
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java4
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java22
3 files changed, 28 insertions, 28 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java
index 86ac6f779..82eb5592a 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java
@@ -69,7 +69,7 @@ public class GeneralMOAIDConfig {
public static final String LINE_DELIMITER = ";";
private String alternativeSourceID = null;
- private String certStoreDirectory = null;
+// private String certStoreDirectory = null;
private boolean trustmanagerrevocationcheck = true;
private String timeoutAssertion = String.valueOf(DEFAULTTIMEOUTASSERTION);
@@ -217,7 +217,7 @@ public class GeneralMOAIDConfig {
GeneralConfiguration authgen = auth.getGeneralConfiguration();
if (authgen != null) {
alternativeSourceID = authgen.getAlternativeSourceID();
- certStoreDirectory = authgen.getCertStoreDirectory();
+ //certStoreDirectory = authgen.getCertStoreDirectory();
if (authgen.isTrustManagerRevocationChecking() != null)
trustmanagerrevocationcheck = authgen.isTrustManagerRevocationChecking();
@@ -449,19 +449,19 @@ public class GeneralMOAIDConfig {
this.szrgwURL = szrgwURL;
}
- /**
- * @return the certStoreDirectory
- */
- public String getCertStoreDirectory() {
- return certStoreDirectory;
- }
-
- /**
- * @param certStoreDirectory the certStoreDirectory to set
- */
- public void setCertStoreDirectory(String certStoreDirectory) {
- this.certStoreDirectory = certStoreDirectory;
- }
+// /**
+// * @return the certStoreDirectory
+// */
+// public String getCertStoreDirectory() {
+// return certStoreDirectory;
+// }
+//
+// /**
+// * @param certStoreDirectory the certStoreDirectory to set
+// */
+// public void setCertStoreDirectory(String certStoreDirectory) {
+// this.certStoreDirectory = certStoreDirectory;
+// }
/**
* @return the timeoutAssertion
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
index 74a19dd0b..cf5911b3a 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
@@ -287,8 +287,8 @@ public class EditGeneralConfigAction extends BasicAction {
// dbauthgeneral.setAlternativeSourceID(oldauthgeneral.getAlternativeSourceID());
// }
- if (MiscUtil.isNotEmpty(moaconfig.getCertStoreDirectory()))
- dbauthgeneral.setCertStoreDirectory(moaconfig.getCertStoreDirectory());
+// if (MiscUtil.isNotEmpty(moaconfig.getCertStoreDirectory()))
+// dbauthgeneral.setCertStoreDirectory(moaconfig.getCertStoreDirectory());
TimeOuts dbtimeouts = dbauthgeneral.getTimeOuts();
if (dbtimeouts == null) {
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java
index cb546c5a8..70c43d9b4 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java
@@ -113,17 +113,17 @@ public class MOAConfigValidator {
}
}
- check = form.getCertStoreDirectory();
- if (MiscUtil.isNotEmpty(check)) {
- if (ValidationHelper.isValidOAIdentifier(check)) {
- log.warn("CertStoreDirectory contains potentail XSS characters: " + check);
- errors.add(LanguageHelper.getErrorString("validation.general.certStoreDirectory.valid",
- new Object[] {ValidationHelper.getNotValidOAIdentifierCharacters()}, request ));
- }
- } else {
- log.info("CertStoreDirectory is empty.");
- errors.add(LanguageHelper.getErrorString("validation.general.certStoreDirectory.empty", request));
- }
+// check = form.getCertStoreDirectory();
+// if (MiscUtil.isNotEmpty(check)) {
+// if (ValidationHelper.isValidOAIdentifier(check)) {
+// log.warn("CertStoreDirectory contains potentail XSS characters: " + check);
+// errors.add(LanguageHelper.getErrorString("validation.general.certStoreDirectory.valid",
+// new Object[] {ValidationHelper.getNotValidOAIdentifierCharacters()}, request ));
+// }
+// } else {
+// log.info("CertStoreDirectory is empty.");
+// errors.add(LanguageHelper.getErrorString("validation.general.certStoreDirectory.empty", request));
+// }
check = form.getDefaultBKUHandy();
if (MiscUtil.isNotEmpty(check)) {