aboutsummaryrefslogtreecommitdiff
path: root/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2015-07-03 12:47:58 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2015-07-03 12:47:58 +0200
commita1ee0567607fe43909cd7fc1b75ace3197a2fa0b (patch)
tree46eb59136ead983aada956c6238cfa434e440d9e /id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java
parent409e23a07616387d675e065ceac7172997fef5b7 (diff)
downloadmoa-id-spss-a1ee0567607fe43909cd7fc1b75ace3197a2fa0b.tar.gz
moa-id-spss-a1ee0567607fe43909cd7fc1b75ace3197a2fa0b.tar.bz2
moa-id-spss-a1ee0567607fe43909cd7fc1b75ace3197a2fa0b.zip
fix some configuration problems
Diffstat (limited to 'id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java')
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java19
1 files changed, 13 insertions, 6 deletions
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java
index 59c6687d5..974646ef0 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java
@@ -218,6 +218,10 @@ public class ConfigurationMigrationUtils {
result.put(MOAIDConfigurationConstants.SERVICE_AUTH_MANDATES_USE, Boolean.FALSE.toString());
}
+ //convert KeyBoxSelector
+ result.put(MOAIDConfigurationConstants.SERVICE_AUTH_BKU_KEYBOXIDENTIFIER,
+ oa.getKeyBoxIdentifier().value());
+
//convert securtiyLayer templates
TemplatesType templates = oaauth.getTemplates();
if (templates != null) {
@@ -1172,16 +1176,19 @@ public class ConfigurationMigrationUtils {
if (seclayer != null) {
List<TransformsInfoType> list = seclayer.getTransformsInfo();
if (!list.isEmpty()) {
- try {
+// try {
+ //TODO: check if Transformation is always BASE64 encoded
+// result.put(MOAIDConfigurationConstants.GENERAL_AUTH_AUTHBLOCK_TRANSFORMATION_BASE64,
+// Base64Utils.encode(list.get(0).getTransformation()));
result.put(MOAIDConfigurationConstants.GENERAL_AUTH_AUTHBLOCK_TRANSFORMATION_BASE64,
- Base64Utils.encode(list.get(0).getTransformation()));
+ new String(list.get(0).getTransformation()));
result.put(MOAIDConfigurationConstants.GENERAL_AUTH_AUTHBLOCK_TRANSFORMATION_NAME,
list.get(0).getFilename());
-
- } catch (IOException e) {
- Logger.warn("AuthBlockTransformation can not converted.", e);
- }
+// } catch (IOException e) {
+// Logger.warn("AuthBlockTransformation can not converted.", e);
+//
+// }
} else {
Logger.warn("AuthBlockTransformation can not converted.");