From 27be7994027944015c290e41e688e8723965bd48 Mon Sep 17 00:00:00 2001 From: kstranacher Date: Wed, 26 Aug 2009 11:00:54 +0000 Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1139 d688527b-c9ab-4aba-bd8d-4036d912da1d --- .project | 12 ++++++++++++ id/oa/.project | 5 ----- id/server/auth/.project | 5 ----- .../egovernment/moa/id/auth/servlet/AuthServlet.java | 18 +++++++++++++++++- id/server/proxy/.project | 5 ----- id/server/proxy/.settings/org.eclipse.jdt.core.prefs | 8 ++++---- id/templates/.project | 5 ----- id/templates/.settings/org.eclipse.jdt.core.prefs | 8 ++++---- spss/handbook/.settings/org.eclipse.jdt.core.prefs | 8 ++++---- spss/handbook/clients/referencedData/.project | 5 ----- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../moa/spss/server/invoke/DataObjectFactory.java | 18 ++++++++++-------- spss/server/serverws/.project | 5 ----- 13 files changed, 54 insertions(+), 54 deletions(-) diff --git a/.project b/.project index 94bbfd821..39ef529c0 100644 --- a/.project +++ b/.project @@ -5,13 +5,25 @@ + + org.eclipse.jdt.core.javabuilder + + + org.eclipse.wst.common.project.facet.core.builder + + org.maven.ide.eclipse.maven2Builder + + + + org.eclipse.jdt.core.javanature + org.maven.ide.eclipse.maven2Nature org.eclipse.wst.common.project.facet.core.nature diff --git a/id/oa/.project b/id/oa/.project index 8513e00a3..4624cabc7 100644 --- a/id/oa/.project +++ b/id/oa/.project @@ -5,11 +5,6 @@ - - org.eclipse.wst.jsdt.core.javascriptValidator - - - org.eclipse.wst.common.project.facet.core.builder diff --git a/id/server/auth/.project b/id/server/auth/.project index 90cbf1ff3..46166c2f3 100644 --- a/id/server/auth/.project +++ b/id/server/auth/.project @@ -8,11 +8,6 @@ moa-spss-lib - - org.eclipse.wst.jsdt.core.javascriptValidator - - - org.eclipse.jdt.core.javabuilder diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java index ddd1df628..0656d37d3 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java @@ -161,10 +161,26 @@ public class AuthServlet extends HttpServlet implements MOAIDAuthConstants { if (item.isFormField()) { // Process only form fields - no file upload items + String logString = item.getString("UTF-8"); + + // TODO use RegExp + String startS = ""; + String endS = "urn:publicid:gv.at:baseid"; + String logWithMaskedBaseid = logString; + int start = logString.indexOf(startS); + if (start > -1) { + int end = logString.indexOf(endS); + if (end > -1) { + logWithMaskedBaseid = logString.substring(0, start); + logWithMaskedBaseid += startS; + logWithMaskedBaseid += "xxxxxxxxxxxxxxxxxxxxxxxx"; + logWithMaskedBaseid += logString.substring(end, logString.length()); + } + } parameters.put(item.getFieldName(), item.getString("UTF-8")); Logger.debug("Processed multipart/form-data request parameter: \nName: " + item.getFieldName() + "\nValue: " + - item.getString("UTF-8")); + logWithMaskedBaseid); } } } diff --git a/id/server/proxy/.project b/id/server/proxy/.project index d58c7c25c..5aa808c31 100644 --- a/id/server/proxy/.project +++ b/id/server/proxy/.project @@ -5,11 +5,6 @@ - - org.eclipse.wst.jsdt.core.javascriptValidator - - - org.eclipse.wst.common.project.facet.core.builder diff --git a/id/server/proxy/.settings/org.eclipse.jdt.core.prefs b/id/server/proxy/.settings/org.eclipse.jdt.core.prefs index 5ffa1b7e5..d70bf9268 100644 --- a/id/server/proxy/.settings/org.eclipse.jdt.core.prefs +++ b/id/server/proxy/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ -#Wed Aug 22 09:50:03 CEST 2007 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.3 +#Mon Aug 17 10:06:16 CEST 2009 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.source=1.3 -org.eclipse.jdt.core.compiler.compliance=1.3 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 +org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.source=1.4 diff --git a/id/templates/.project b/id/templates/.project index ecd7cdf14..583a2a0e7 100644 --- a/id/templates/.project +++ b/id/templates/.project @@ -5,11 +5,6 @@ - - org.eclipse.wst.jsdt.core.javascriptValidator - - - org.eclipse.wst.common.project.facet.core.builder diff --git a/id/templates/.settings/org.eclipse.jdt.core.prefs b/id/templates/.settings/org.eclipse.jdt.core.prefs index c959c9def..f5e17a86f 100644 --- a/id/templates/.settings/org.eclipse.jdt.core.prefs +++ b/id/templates/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ -#Wed Aug 22 09:50:02 CEST 2007 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.3 +#Mon Aug 17 10:06:12 CEST 2009 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.source=1.3 -org.eclipse.jdt.core.compiler.compliance=1.3 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 +org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.source=1.4 diff --git a/spss/handbook/.settings/org.eclipse.jdt.core.prefs b/spss/handbook/.settings/org.eclipse.jdt.core.prefs index 93a06227e..af3df77d1 100644 --- a/spss/handbook/.settings/org.eclipse.jdt.core.prefs +++ b/spss/handbook/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ -#Fri Aug 31 11:22:24 CEST 2007 +#Mon Aug 17 10:06:15 CEST 2009 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.3 -org.eclipse.jdt.core.compiler.compliance=1.3 -org.eclipse.jdt.core.compiler.source=1.3 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 +org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.source=1.4 diff --git a/spss/handbook/clients/referencedData/.project b/spss/handbook/clients/referencedData/.project index e440a8d7a..23699368d 100644 --- a/spss/handbook/clients/referencedData/.project +++ b/spss/handbook/clients/referencedData/.project @@ -5,11 +5,6 @@ - - org.eclipse.wst.jsdt.core.javascriptValidator - - - org.eclipse.wst.common.project.facet.core.builder diff --git a/spss/handbook/clients/referencedData/.settings/org.eclipse.jdt.core.prefs b/spss/handbook/clients/referencedData/.settings/org.eclipse.jdt.core.prefs index fad2d811d..573b253b9 100644 --- a/spss/handbook/clients/referencedData/.settings/org.eclipse.jdt.core.prefs +++ b/spss/handbook/clients/referencedData/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ -#Tue Jul 07 16:07:24 CEST 2009 +#Mon Aug 17 10:06:17 CEST 2009 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 org.eclipse.jdt.core.compiler.compliance=1.4 org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning -org.eclipse.jdt.core.compiler.source=1.3 +org.eclipse.jdt.core.compiler.source=1.4 diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java index fab8a6dd7..566784796 100644 --- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java +++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java @@ -210,19 +210,21 @@ public class DataObjectFactory { // For logging in Debug-Mode: Mask baseid with xxx String logString = new String(contentBytes); + // TODO use RegExp String startS = ""; String endS = "urn:publicid:gv.at:baseid"; - String logWithMaskedBaseid; + String logWithMaskedBaseid = logString; int start = logString.indexOf(startS); if (start > -1) { - int end = logString.indexOf(endS); - logWithMaskedBaseid = logString.substring(0, start); - logWithMaskedBaseid += startS; - logWithMaskedBaseid += "xxxxxxxxxxxxxxxxxxxxxxxx"; - logWithMaskedBaseid += logString.substring(end, logString.length()); + int end = logString.indexOf(endS); + if (end > -1) { + logWithMaskedBaseid = logString.substring(0, start); + logWithMaskedBaseid += startS; + logWithMaskedBaseid += "xxxxxxxxxxxxxxxxxxxxxxxx"; + logWithMaskedBaseid += logString.substring(end, logString.length()); + } } - else - logWithMaskedBaseid = logString; + // try to parse validating Logger.trace(">>> parsing the following content: \n" + logWithMaskedBaseid); try { diff --git a/spss/server/serverws/.project b/spss/server/serverws/.project index a115e2dea..c7e484cc8 100644 --- a/spss/server/serverws/.project +++ b/spss/server/serverws/.project @@ -7,11 +7,6 @@ moa-spss-lib - - org.eclipse.wst.jsdt.core.javascriptValidator - - - org.eclipse.jdt.core.javabuilder -- cgit v1.2.3