From a224cf660ce0f4b0faa4e13cd7d8789a6e5ea988 Mon Sep 17 00:00:00 2001
From: Antti Luomi <antti.luomi@id.ethz.ch>
Date: Wed, 16 May 2018 15:59:48 +0200
Subject: [PATCH] SSDM-6043: fine grained logging features for sensitive
information
---
.../openbis/plugin/query/server/api/v1/QueryApiLogger.java | 2 +-
.../execute/AbstractExecutionOptionsWithParameters.java | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiLogger.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiLogger.java
index a03daa6f49a..daf117d51e3 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiLogger.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiLogger.java
@@ -111,7 +111,7 @@ class QueryApiLogger extends AbstractServerLogger implements IQueryApiServer
String dataStoreCode, String serviceKey, Map<String, Object> parameters)
{
logAccess(sessionToken, "create_report_from_aggregation_service",
- "DATA_STORE(%s) SERVICE(%s) PARAMETERS(%s)", dataStoreCode, serviceKey, parameters);
+ "DATA_STORE(%s) SERVICE(%s) PARAMETER_KEYS(%s)", dataStoreCode, serviceKey, parameters.keySet());
return null;
}
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/AbstractExecutionOptionsWithParameters.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/AbstractExecutionOptionsWithParameters.java
index 3e71de2ce6a..a3b8efc0c5b 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/AbstractExecutionOptionsWithParameters.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/AbstractExecutionOptionsWithParameters.java
@@ -24,13 +24,12 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author Franz-Josef Elmer
- *
*/
@JsonObject("as.dto.service.execute.AbstractExecutionOptionsWithParameters")
public abstract class AbstractExecutionOptionsWithParameters<EO extends AbstractExecutionOptionsWithParameters<EO, V>, V> implements Serializable
{
private static final long serialVersionUID = 1L;
-
+
private final Map<String, V> parameters = new HashMap<String, V>();
@SuppressWarnings("unchecked")
@@ -48,7 +47,7 @@ public abstract class AbstractExecutionOptionsWithParameters<EO extends Abstract
@Override
public String toString()
{
- return getClass().getSimpleName() + ": parameters=" + parameters;
+ return getClass().getSimpleName() + ": parameterKeys=" + parameters.keySet();
}
}
--
GitLab