feat: add support for $_ENV and $_SERVER in CredentialsLoader (#612)

Author: jannes-io

src/CredentialsLoader.php

@@ -76,7 +76,7 @@ private static function isOnWindows()
      */
     public static function fromEnv()
     {
-        $path = getenv(self::ENV_VAR);
+        $path = self::getEnv(self::ENV_VAR);
         if (empty($path)) {
             return null;
         }
@@ -104,7 +104,7 @@ public static function fromEnv()
     public static function fromWellKnownFile()
     {
         $rootEnv = self::isOnWindows() ? 'APPDATA' : 'HOME';
-        $path = [getenv($rootEnv)];
+        $path = [self::getEnv($rootEnv)];
         if (!self::isOnWindows()) {
             $path[] = self::NON_WINDOWS_WELL_KNOWN_PATH_BASE;
         }
@@ -215,7 +215,7 @@ public static function makeInsecureCredentials()
      */
     public static function quotaProjectFromEnv()
     {
-        return getenv(self::QUOTA_PROJECT_ENV_VAR) ?: null;
+        return self::getEnv(self::QUOTA_PROJECT_ENV_VAR) ?: null;
     }
 
     /**
@@ -251,7 +251,7 @@ public static function getDefaultClientCertSource()
      */
     public static function shouldLoadClientCertSource()
     {
-        return filter_var(getenv(self::MTLS_CERT_ENV_VAR), FILTER_VALIDATE_BOOLEAN);
+        return filter_var(self::getEnv(self::MTLS_CERT_ENV_VAR), FILTER_VALIDATE_BOOLEAN);
     }
 
     /**
@@ -260,7 +260,7 @@ public static function shouldLoadClientCertSource()
     private static function loadDefaultClientCertSourceFile()
     {
         $rootEnv = self::isOnWindows() ? 'APPDATA' : 'HOME';
-        $path = sprintf('%s/%s', getenv($rootEnv), self::MTLS_WELL_KNOWN_PATH);
+        $path = sprintf('%s/%s', self::getEnv($rootEnv), self::MTLS_WELL_KNOWN_PATH);
         if (!file_exists($path)) {
             return null;
         }
@@ -292,4 +292,9 @@ public function getUniverseDomain(): string
     {
         return self::DEFAULT_UNIVERSE_DOMAIN;
     }
+
+    private static function getEnv(string $env): mixed
+    {
+        return getenv($env) ?: $_SERVER[$env] ?? $_ENV[$env] ?? null;
+    }
 }

tests/CredentialsLoaderTest.php

@@ -154,6 +154,59 @@ public function testShouldLoadClientCertSourceIsTrue()
 
         $this->assertTrue(CredentialsLoader::shouldLoadClientCertSource());
     }
+
+    /**
+     * @runInSeparateProcess
+     */
+    public function testLoadJsonFromGetEnv(): void
+    {
+        putenv(CredentialsLoader::ENV_VAR . '=' . __DIR__ . '/fixtures7/getenv.json');
+
+        $json = CredentialsLoader::fromEnv();
+
+        $this->assertArrayHasKey('type', $json);
+        $this->assertEquals('getenv', $json['type']);
+    }
+
+    /**
+     * @runInSeparateProcess
+     */
+    public function testLoadJsonFromServer(): void
+    {
+        $_SERVER[CredentialsLoader::ENV_VAR] = __DIR__ . '/fixtures7/server.json';
+
+        $json = CredentialsLoader::fromEnv();
+
+        $this->assertArrayHasKey('type', $json);
+        $this->assertEquals('server', $json['type']);
+    }
+
+    /**
+     * @runInSeparateProcess
+     */
+    public function testLoadJsonFromEnv(): void
+    {
+        $_ENV[CredentialsLoader::ENV_VAR] = __DIR__ . '/fixtures7/env.json';
+
+        $json = CredentialsLoader::fromEnv();
+
+        $this->assertArrayHasKey('type', $json);
+        $this->assertEquals('env', $json['type']);
+    }
+
+    /**
+     * @runInSeparateProcess
+     */
+    public function testLoadJsonFromGetEnvBackwardsCompatibility(): void
+    {
+        $_SERVER[CredentialsLoader::ENV_VAR] = __DIR__ . '/fixtures7/server.json';
+        putenv(CredentialsLoader::ENV_VAR . '=' . __DIR__ . '/fixtures7/getenv.json');
+
+        $json = CredentialsLoader::fromEnv();
+
+        $this->assertArrayHasKey('type', $json);
+        $this->assertEquals('getenv', $json['type']);
+    }
 }
 
 class TestCredentialsLoader extends CredentialsLoader

tests/fixtures7/env.json

@@ -0,0 +1 @@
+{"type": "env"}

tests/fixtures7/getenv.json

@@ -0,0 +1 @@
+{"type": "getenv"}

tests/fixtures7/server.json

@@ -0,0 +1 @@
+{"type": "server"}