Revert "Move classes in com.yahoo.security to security-utils"

1 files changed, 0 insertions, 66 deletions

diff --git a/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityUtils.java b/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityUtils.java
deleted file mode 100644
index 5595d33a9b5..00000000000
--- a/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityUtils.java
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.security.tls;
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.Optional;
-
-/**
- * Utility class for retrieving {@link TransportSecurityOptions} from the system.
- *
- * @author bjorncs
- */
-public class TransportSecurityUtils {
-
-    public static final String CONFIG_FILE_ENVIRONMENT_VARIABLE = "VESPA_TLS_CONFIG_FILE";
-    public static final String INSECURE_MIXED_MODE_ENVIRONMENT_VARIABLE = "VESPA_TLS_INSECURE_MIXED_MODE";
-
-    public enum MixedMode {
-        PLAINTEXT_CLIENT_MIXED_SERVER("plaintext_client_mixed_server"),
-        TLS_CLIENT_MIXED_SERVER("tls_client_mixed_server");
-
-        final String configValue;
-
-        MixedMode(String configValue) {
-            this.configValue = configValue;
-        }
-
-        static MixedMode fromConfigValue(String configValue) {
-            return Arrays.stream(values())
-                    .filter(v -> v.configValue.equals(configValue))
-                    .findFirst()
-                    .orElseThrow(() -> new IllegalArgumentException("Unknown value: " + configValue));
-        }
-    }
-
-    private TransportSecurityUtils() {}
-
-    public static boolean isTransportSecurityEnabled() {
-        return getConfigFile().isPresent();
-    }
-
-    public static boolean isInsecureMixedModeEnabled() {
-        return getInsecureMixedMode().isPresent();
-    }
-
-    public static Optional<MixedMode> getInsecureMixedMode() {
-        if (!isTransportSecurityEnabled()) return Optional.empty();
-        return getEnvironmentVariable(INSECURE_MIXED_MODE_ENVIRONMENT_VARIABLE)
-                .map(MixedMode::fromConfigValue);
-    }
-
-    public static Optional<Path> getConfigFile() {
-        return getEnvironmentVariable(CONFIG_FILE_ENVIRONMENT_VARIABLE).map(Paths::get);
-    }
-
-    public static Optional<TransportSecurityOptions> getOptions() {
-        return getConfigFile()
-                .map(TransportSecurityOptions::fromJsonFile);
-    }
-
-    private static Optional<String> getEnvironmentVariable(String environmentVariable) {
-        return Optional.ofNullable(System.getenv(environmentVariable))
-                .filter(var -> !var.isEmpty());
-    }
-}