zuul-core: Add overload for OriginName trust

Netflix · May 20, 2021 · 56fa761 · 56fa761
1 parent e22dc37
commit 56fa761
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 31 deletions.
diff --git a/zuul-core/src/main/java/com/netflix/zuul/origins/OriginName.java b/zuul-core/src/main/java/com/netflix/zuul/origins/OriginName.java
@@ -19,8 +19,6 @@
 import com.netflix.zuul.util.VipUtils;
 import java.util.Locale;
 import java.util.Objects;
-import java.util.Optional;
-import javax.annotation.CheckReturnValue;
 
 public final class OriginName {
     /**
@@ -44,30 +42,36 @@ public final class OriginName {
      * used for establishing a secure connection, as well as logging.
      */
     private final String authority;
+
     /**
-     * Indicates if the authority comes from a trusted source.
+     * @deprecated use {@link #fromVipAndApp(String, String)}
      */
-    private final boolean authorityTrusted;
-
+    @Deprecated
     public static OriginName fromVip(String vip) {
-        return fromVip(vip, vip);
+        return fromVipAndApp(vip, VipUtils.extractUntrustedAppNameFromVIP(vip));
     }
 
+    /**
+     * @deprecated use {@link #fromVipAndApp(String, String, String)}
+     */
+    @Deprecated
     public static OriginName fromVip(String vip, String niwsClientName) {
-        return new OriginName(niwsClientName, vip, VipUtils.extractUntrustedAppNameFromVIP(vip), false);
+        return fromVipAndApp(vip, VipUtils.extractUntrustedAppNameFromVIP(vip), niwsClientName);
     }
 
-    @CheckReturnValue
-    public OriginName withTrustedAuthority(String authority) {
-        return new OriginName(niwsClientName, target, authority, true);
+    public static OriginName fromVipAndApp(String vip, String appName) {
+        return fromVipAndApp(vip, appName, vip);
     }
 
-    private OriginName(String niwsClientName, String target, String authority, boolean authorityTrusted) {
-        this.niwsClientName = Objects.requireNonNull(niwsClientName, "niwsClientName");
-        this.metricId = niwsClientName.toLowerCase(Locale.ROOT);
+    public static OriginName fromVipAndApp(String vip, String appName, String niwsClientName) {
+        return new OriginName(vip, appName, niwsClientName);
+    }
+
+    private OriginName(String target, String authority, String niwsClientName) {
         this.target = Objects.requireNonNull(target, "target");
         this.authority = Objects.requireNonNull(authority, "authority");
-        this.authorityTrusted = authorityTrusted;
+        this.niwsClientName = Objects.requireNonNull(niwsClientName, "niwsClientName");
+        this.metricId = niwsClientName.toLowerCase(Locale.ROOT);
     }
 
     /**
@@ -97,11 +101,8 @@ public String getMetricId() {
      * Returns the Authority of this origin.   This is used for establishing secure connections.  May be absent
      * if the authority is not trusted.
      */
-    public Optional<String> getTrustedAuthority() {
-        if (authorityTrusted) {
-            return Optional.of(authority);
-        }
-        return Optional.empty();
+    public String getAuthority() {
+        return authority;
     }
 
     @Override
@@ -110,15 +111,14 @@ public boolean equals(Object o) {
             return false;
         }
         OriginName that = (OriginName) o;
-        return authorityTrusted == that.authorityTrusted
-                && Objects.equals(niwsClientName, that.niwsClientName)
+        return Objects.equals(niwsClientName, that.niwsClientName)
                 && Objects.equals(target, that.target)
                 && Objects.equals(authority, that.authority);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(authorityTrusted, niwsClientName, target, authority);
+        return Objects.hash(niwsClientName, target, authority);
     }
 
     @Override
@@ -127,7 +127,6 @@ public String toString() {
                 "niwsClientName='" + niwsClientName + '\'' +
                 ", target='" + target + '\'' +
                 ", authority='" + authority + '\'' +
-                ", authorityTrusted=" + authorityTrusted +
                 '}';
     }
 }
diff --git a/zuul-core/src/test/java/com/netflix/zuul/origins/OriginNameTest.java b/zuul-core/src/test/java/com/netflix/zuul/origins/OriginNameTest.java
@@ -18,7 +18,6 @@
 package com.netflix.zuul.origins;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -27,13 +26,9 @@
 @RunWith(JUnit4.class)
 public class OriginNameTest {
     @Test
-    public void getTrustedAuthority() {
-        OriginName originName = OriginName.fromVip("woodly-doodly");
+    public void getAuthority() {
+        OriginName trusted = OriginName.fromVipAndApp("woodly-doodly", "westerndigital");
 
-        assertFalse(originName.getTrustedAuthority().isPresent());
-
-        OriginName trusted = originName.withTrustedAuthority("westerndigital");
-
-        assertEquals("westerndigital", trusted.getTrustedAuthority().get());
+        assertEquals("westerndigital", trusted.getAuthority());
     }
 }