From 84a86ceddf89f4a1a04396a37742a892f09ffafb Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Fri, 20 Jul 2018 10:57:08 +0200
Subject: some small modifications in attribute builder update internal
messages-codes
---
.../egiz/eaaf/modules/pvp2/impl/binding/PostBinding.java | 6 ++++--
.../metadata/AbstractMetadataSignatureFilter.java | 14 ++++++++------
.../impl/validation/metadata/PVPEntityCategoryFilter.java | 3 ++-
.../impl/validation/metadata/SchemaValidationFilter.java | 3 ++-
4 files changed, 16 insertions(+), 10 deletions(-)
(limited to 'eaaf_modules/eaaf_module_pvp2_core')
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/binding/PostBinding.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/binding/PostBinding.java
index e355a670..559fd692 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/binding/PostBinding.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/binding/PostBinding.java
@@ -117,8 +117,9 @@ public class PostBinding implements IDecoder, IEncoder {
encoder.encode(context);
} catch (Exception e) {
- e.printStackTrace();
+ log.warn("Can not encode SAML2 request", e);
throw new SecurityException(e);
+
}
}
@@ -158,8 +159,9 @@ public class PostBinding implements IDecoder, IEncoder {
encoder.encode(context);
} catch (Exception e) {
- e.printStackTrace();
+ log.warn("Can not encode SAML2 response", e);
throw new SecurityException(e);
+
}
}
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/AbstractMetadataSignatureFilter.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/AbstractMetadataSignatureFilter.java
index 994d66df..cedd8bad 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/AbstractMetadataSignatureFilter.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/AbstractMetadataSignatureFilter.java
@@ -49,14 +49,15 @@ public abstract class AbstractMetadataSignatureFilter implements MetadataFilter
if (metadata instanceof EntitiesDescriptor) {
EntitiesDescriptor entitiesDescriptor = (EntitiesDescriptor) metadata;
if(entitiesDescriptor.getSignature() == null) {
- throw new PVP2MetadataException("Root element of metadata file has to be signed", null);
+ throw new PVP2MetadataException("pvp2.26",
+ new Object[] {"Root element of metadata file has to be signed"});
}
processEntitiesDescriptor(entitiesDescriptor);
if (entitiesDescriptor.getEntityDescriptors().size() == 0) {
- throw new PVP2MetadataException("No valid entity in metadata "
- + entitiesDescriptor.getName() + ". Metadata is not loaded.", null);
+ throw new PVP2MetadataException("pvp2.26",
+ new Object[] {"No valid entity in metadata " + entitiesDescriptor.getName()});
}
@@ -64,9 +65,9 @@ public abstract class AbstractMetadataSignatureFilter implements MetadataFilter
EntityDescriptor entityDescriptor = (EntityDescriptor) metadata;
processEntityDescriptorr(entityDescriptor);
- } else {
- throw new PVP2MetadataException("Invalid Metadata file Root element is no EntitiesDescriptor", null);
- }
+ } else
+ throw new PVP2MetadataException("pvp2.26",
+ new Object[] {"Invalid Metadata file Root element is unknown"});
@@ -74,6 +75,7 @@ public abstract class AbstractMetadataSignatureFilter implements MetadataFilter
} catch (EAAFException e) {
log.warn("Metadata signature policy check FAILED.", e);
throw new SignatureValidationException(e);
+
}
}
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/PVPEntityCategoryFilter.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/PVPEntityCategoryFilter.java
index 390879aa..4bb7c821 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/PVPEntityCategoryFilter.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/PVPEntityCategoryFilter.java
@@ -97,7 +97,8 @@ public class PVPEntityCategoryFilter implements MetadataFilter {
} else
- throw new PVP2MetadataException("Invalid Metadata file Root element is no Entities- or EntityDescriptor", null);
+ throw new PVP2MetadataException("pvp2.26",
+ new Object[] {"Invalid Metadata file Root element is no Entities- or EntityDescriptor"});
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/SchemaValidationFilter.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/SchemaValidationFilter.java
index 89335da5..1b9bc7c6 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/SchemaValidationFilter.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/SchemaValidationFilter.java
@@ -95,7 +95,8 @@ public class SchemaValidationFilter implements MetadataFilter {
}
throw new FilterException(
- new SchemaValidationException("Metadata Schema validation FAILED with message: "+ errString, null));
+ new SchemaValidationException("pvp2.26",
+ new Object[] {"Metadata Schema validation FAILED with message: " + errString}));
} else
log.info("Metadata Schema validation check is DEACTIVATED!");
--
cgit v1.2.3