OWLS-84517: Scaling failed when setting Dedicated to true

operator/src/main/java/oracle/kubernetes/operator/Main.java

@@ -497,6 +497,10 @@ public static DomainNamespaceSelectionStrategy getDomainNamespaceSelectionStrate
     return strategy;
   }
 
+  public static String getOperatorNamespace() {
+    return operatorNamespace;
+  }
+
   public static boolean isDedicated() {
     return DomainNamespaceSelectionStrategy.Dedicated.equals(getDomainNamespaceSelectionStrategy());
   }

operator/src/main/java/oracle/kubernetes/operator/helpers/AuthenticationProxy.java

@@ -15,7 +15,7 @@
 public class AuthenticationProxy {
   private static final LoggingFacade LOGGER = LoggingFactory.getLogger("Operator", "Operator");
 
-  private static final AuthorizationProxy authorizationProxy = new AuthorizationProxy();
+  private static AuthorizationProxy authorizationProxy = new AuthorizationProxy();
 
   /**
    * Check if the specified access token can be authenticated.
@@ -25,7 +25,7 @@ public class AuthenticationProxy {
    * @return V1TokenReviewStatus containing either info about the authenticated user or an error
    *     explaining why the user couldn't be authenticated
    */
-  public V1TokenReviewStatus check(String principal, String token) {
+  public V1TokenReviewStatus check(String principal, String token, String namespace) {
 
     LOGGER.entering(principal); // Don't expose the token since it's a credential
 
@@ -37,8 +37,8 @@ public V1TokenReviewStatus check(String principal, String token) {
               AuthorizationProxy.Operation.create,
               AuthorizationProxy.Resource.TOKENREVIEWS,
               null,
-              AuthorizationProxy.Scope.cluster,
-              null);
+              namespace == null ? AuthorizationProxy.Scope.cluster : AuthorizationProxy.Scope.namespace,
+              namespace);
       if (allowed) {
         result = new CallBuilder().createTokenReview(prepareTokenReview(token));
       } else {

operator/src/main/java/oracle/kubernetes/operator/rest/RestBackendImpl.java

@@ -25,6 +25,7 @@
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
 import io.kubernetes.client.openapi.models.V1TokenReviewStatus;
 import io.kubernetes.client.openapi.models.V1UserInfo;
+import oracle.kubernetes.operator.Main;
 import oracle.kubernetes.operator.helpers.AuthenticationProxy;
 import oracle.kubernetes.operator.helpers.AuthorizationProxy;
 import oracle.kubernetes.operator.helpers.AuthorizationProxy.Operation;
@@ -133,7 +134,8 @@ private String getNamespace(String domainUid) {
 
   private V1UserInfo authenticate(String accessToken) {
     LOGGER.entering();
-    V1TokenReviewStatus status = atn.check(principal, accessToken);
+    V1TokenReviewStatus status = atn.check(principal, accessToken,
+        Main.isDedicated() ? Main.getOperatorNamespace() : null);
     if (status == null) {
       throw new AssertionError(LOGGER.formatMessage(MessageKeys.NULL_TOKEN_REVIEW_STATUS));
     }

operator/src/test/java/oracle/kubernetes/operator/helpers/AuthenticationProxyTest.java

@@ -0,0 +1,71 @@
+// Copyright (c) 2020, Oracle Corporation and/or its affiliates.
+// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+package oracle.kubernetes.operator.helpers;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.meterware.simplestub.Memento;
+import com.meterware.simplestub.StaticStubSupport;
+import oracle.kubernetes.operator.helpers.AuthorizationProxy.Scope;
+import oracle.kubernetes.utils.TestUtils;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.junit.MatcherAssert.assertThat;
+
+public class AuthenticationProxyTest {
+
+  private final List<Memento> mementos = new ArrayList<>();
+  private final KubernetesTestSupport testSupport = new KubernetesTestSupport();
+  private final AuthorizationProxyStub authorizationProxyStub = new AuthorizationProxyStub();
+
+  /**
+   * Setup test.
+   * @throws Exception on failure
+   */
+  @Before
+  public void setUp() throws Exception {
+    mementos.add(TestUtils.silenceOperatorLogger());
+    mementos.add(testSupport.install());
+    mementos.add(
+        StaticStubSupport.install(AuthenticationProxy.class, "authorizationProxy", authorizationProxyStub));
+  }
+
+  @After
+  public void tearDown() {
+    mementos.forEach(Memento::revert);
+  }
+
+  @Test
+  public void verify_authorizationScope_isCluster_whenNamespaceIsNull() {
+    AuthenticationProxy authorizationProxy = new AuthenticationProxy();
+    authorizationProxy.check("", "", null);
+    assertThat(authorizationProxyStub.scope, equalTo(Scope.cluster));
+  }
+
+  @Test
+  public void verify_authorizationScope_isNamespace_whenNamespaceIsDefined() {
+    AuthenticationProxy authorizationProxy = new AuthenticationProxy();
+    authorizationProxy.check("", "", "NS");
+    assertThat(authorizationProxyStub.scope, equalTo(Scope.namespace));
+  }
+
+  private class AuthorizationProxyStub extends AuthorizationProxy {
+    Scope scope;
+
+    public boolean check(
+        String principal,
+        Operation operation,
+        Resource resource,
+        String resourceName,
+        Scope scope,
+        String namespaceName) {
+      this.scope = scope;
+      return true;
+    }
+  }
+}