Commit 2c7a6b9d authored by Vasilis Katopodis's avatar Vasilis Katopodis
Browse files

fix: remove logging Vault tokens and secrets

parent 2c0b9210

src/main/java/org/etsi/osl/hypo/registry/config/ApplicationProperties.java

+0 −2
Changes for src/main/java/org/etsi/osl/hypo/registry/config/ApplicationProperties.java: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -12,8 +12,6 @@ public final class ApplicationProperties { 
  public static final String POLICY_DOES_NOT_EXISTS = "Policy does not exist";

  public static final String GROUP_DOES_NOT_EXISTS = "Group does not exist";



  public static final String PAYLOAD_S = "Payload: \n %s";



  public static final String VAULT_SERVICE_SECRET_PATH_FORMAT = "%s/%s";

  public static final String REGISTRY_SERVICE_SECRET_PATH_FORMAT = "%s/%s/%s";

src/main/java/org/etsi/osl/hypo/registry/kafka/outgoing/RegistryKafkaProducer.java

+9 −7
Changes for src/main/java/org/etsi/osl/hypo/registry/kafka/outgoing/RegistryKafkaProducer.java: 9 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ import org.eclipse.microprofile.reactive.messaging.Message; 
import org.eclipse.microprofile.reactive.messaging.Metadata;

import org.etsi.osl.hypo.core.common.registry.CloudEventRegistryOrganizationCredentialsResult;

import org.etsi.osl.hypo.core.common.registry.CloudEventRegistryStoreKubernetesInfoResult;

import org.etsi.osl.hypo.registry.config.ApplicationProperties;

import org.etsi.osl.hypo.registry.model.kafka.incoming.KafkaRequestPayload;

import org.etsi.osl.hypo.registry.model.kafka.incoming.KubeConfigRequest;

import org.etsi.osl.hypo.registry.model.kafka.incoming.RegistryURLRequest;
@@ -61,7 +60,7 @@ public class RegistryKafkaProducer { 
        logger.debugf(

                "Response message sent to KAFKA topic: %s", RESPONSE_PACKAGE_REGISTRY_KAFKA_CHANNEL);



        logger.debugf(ApplicationProperties.PAYLOAD_S, response.toStringAsJson());

        logResponseSummary(response.getId(), response.getStatus());

    }



    public void sendResponse(KafkaResponsePayload response, Headers headers) {
@@ -73,7 +72,7 @@ public class RegistryKafkaProducer { 
                "Response message with headers sent to KAFKA topic: %s",

                RESPONSE_PACKAGE_REGISTRY_KAFKA_CHANNEL);



        logger.debugf(ApplicationProperties.PAYLOAD_S, response.toStringAsJson());

        logResponseSummary(response.getId(), response.getStatus());

    }



    public void sendKubeConfigResponseMessage(VaultSecretResponseMessage responseMessage) {
@@ -83,7 +82,7 @@ public class RegistryKafkaProducer { 
                "Kube Conf Response data message sent to KAFKA topic: %s",

                REGISTRY_RESPONSE_KUBE_CONF_CHANNEL);



        logger.debugf(ApplicationProperties.PAYLOAD_S, responseMessage.toStringAsJson());

        logResponseSummary(responseMessage.getId(), responseMessage.getStatus());

    }



    public void sendKubeConfigResponseMessage(
@@ -96,7 +95,7 @@ public class RegistryKafkaProducer { 
                "Kube Conf Response data message with headers sent to KAFKA topic: %s",

                REGISTRY_RESPONSE_KUBE_CONF_CHANNEL);



        logger.debugf(ApplicationProperties.PAYLOAD_S, responseMessage.toStringAsJson());

        logResponseSummary(responseMessage.getId(), responseMessage.getStatus());

    }



    public void sendOrganizationCredentialsResponseMessage(
@@ -106,8 +105,6 @@ public class RegistryKafkaProducer { 
        logger.debugf(

                "Kube Conf Response data message sent to KAFKA topic: %s",

                REGISTRY_ORGANIZATION_GET_CREDENTIALS_RESULT);



        logger.debugf(ApplicationProperties.PAYLOAD_S, responseMessage.toStringAsJson());

    }



    public void sendKubeConfigStoreResult(CloudEventRegistryStoreKubernetesInfoResult result) {
@@ -122,6 +119,11 @@ public class RegistryKafkaProducer { 
                serviceId, status, REGISTRY_STORE_KUBE_CONF_CHANNEL_RESULT);

    }



    // Remove kubeconfigs and registry credentials

    private static void logResponseSummary(String id, Status status) {

        logger.debugf("Response summary: id=%s, status=%s", id, status);

    }



    // --- Failure Handlers ---

    public void sendDeserializationFailure() {

        String serviceId = "unknown";

src/main/resources/application.properties

+2 −2
Changes for src/main/resources/application.properties: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -149,8 +149,8 @@ mp.messaging.outgoing.registry-store-kubernetes-config-result.value.deserializer 


%prod.quarkus.rest-client.vault-api.url=http://192.168.5.196:31084

%prod.quarkus.rest-client.vault-api.scope=jakarta.inject.Singleton

%prod.quarkus.rest-client.logging.scope=request-response

%prod.quarkus.rest-client.logging.body-limit=500

# Request/response logging prints secret bodies

%prod.quarkus.rest-client.logging.scope=none



# vault url

%prod.quarkus.vault.url=${quarkus.rest-client.vault-api.url}