aboutsummaryrefslogtreecommitdiff
path: root/id/server/idserverlib/src/main
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-04-02 07:30:08 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-04-02 07:30:08 +0200
commit218739bfaf182079122271ce8676695993177f23 (patch)
treec9611016c52cb5166bc4a5cf7599e0d8e86b168c /id/server/idserverlib/src/main
parent7700a426db02fe0e44d8ff1e19595f45dc337806 (diff)
parentde45801008d1029ac7724950da329676fd6bf7b8 (diff)
downloadmoa-id-spss-218739bfaf182079122271ce8676695993177f23.tar.gz
moa-id-spss-218739bfaf182079122271ce8676695993177f23.tar.bz2
moa-id-spss-218739bfaf182079122271ce8676695993177f23.zip
Merge remote-tracking branch 'remotes/origin/vidp_2.1_bs' into moa-2.1-Snapshot
Diffstat (limited to 'id/server/idserverlib/src/main')
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java6
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java3
2 files changed, 7 insertions, 2 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java
index 5b844580d..00f919c82 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java
@@ -73,7 +73,11 @@ public class STORKProtocol implements IModulInfo, MOAIDAuthConstants {
try {
decSamlToken = PEPSUtil.decodeSAMLToken(request.getParameter("SAMLRequest"));
} catch (NullPointerException e) {
- Logger.error("Unable to retrieve STORK Request", e);
+ if (request.getRemoteHost().contains("129.27.142")) {
+ Logger.warn("Availability check by " + request.getRemoteHost() + " on URI: " + request.getRequestURI());
+ } else {
+ Logger.error("Unable to retrieve STORK Request for host: " + request.getRemoteHost() + " and URI: " + request.getRequestURI(), e);
+ }
throw new MOAIDException("stork.04", null);
}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java
index 6efe9b39c..0cb11cf5f 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java
@@ -233,7 +233,8 @@ public class ParamValidatorUtils implements MOAIDAuthConstants{
}
else {
Logger.error("Fehler Ueberpruefung Parameter bkuURI. bkuURI ist nicht auf Liste der vertrauenswuerdigen BKUs (Konfigurationselement: MOA-IDConfiguration/TrustedBKUs)");
- return false;
+ Logger.error("Ueberpruefte bkuURI: " + bkuURI);
+ return false;
}
}
}