few fixes

Author: Christian Cordiviola

batchtool/wpt_batch.py

@@ -103,7 +103,7 @@ def RunBatch(options):
   submitted_urls = set(id_url_dict.values())
   for url in requested_urls:
     if url not in submitted_urls:
-      logging.warn('URL submission failed: %s', url)
+      logging.warning('URL submission failed: %s', url)
 
   pending_test_ids = id_url_dict.keys()
   if not os.path.isdir(options.outputdir):
@@ -127,13 +127,13 @@ def RunBatch(options):
         if test_status == '200':
           completed_test_ids.append(test_id)
         else:
-          logging.warn('Tests failed with status $s: %s', test_status, test_id)
+          logging.warning('Tests failed with status $s: %s', test_status, test_id)
     test_results = wpt_batch_lib.GetXMLResult(completed_test_ids,
                                               server_url=options.server)
     result_test_ids = set(test_results.keys())
     for test_id in completed_test_ids:
       if test_id not in result_test_ids:
-        logging.warn('The XML failed to retrieve: %s', test_id)
+        logging.warning('The XML failed to retrieve: %s', test_id)
 
     for test_id, dom in test_results.iteritems():
       SaveTestResult(options.outputdir, id_url_dict[test_id], test_id,

www/addresses.php

@@ -6,7 +6,7 @@
 require_once __DIR__ . '/common.inc';
 
 $user_api_key = $request_context->getApiKeyInUse();
-if (strlen($user_api_key)) {
+if (!empty($user_api_key)) {
     $keys_file = SETTINGS_PATH . '/keys.ini';
     if (file_exists(SETTINGS_PATH . '/common/keys.ini')) {
         $keys_file = SETTINGS_PATH . '/common/keys.ini';

www/getLocations.php

@@ -202,7 +202,7 @@ function LoadLocations($isPaid = false)
     $locations = array();
     $loc = LoadLocationsIni();
     $user_api_key = $request_context->getApiKeyInUse();
-    if (strlen($user_api_key)) {
+    if (!empty($user_api_key)) {
         foreach ($loc as $name => $location) {
             if (isset($location['browser']) && isset($location['noapi'])) {
                 unset($loc[$name]);
@@ -215,7 +215,7 @@ function LoadLocations($isPaid = false)
             }
         }
     }
-    $isPaid =  !is_null($request_context->getUser()) && $request_context->getUser()->isPaid();
+    $isPaid = !is_null($request_context->getUser()) && $request_context->getUser()->isPaid();
     $includePaid = $isPaid || $admin;
 
     FilterLocations($loc, $includePaid);

www/src/RequestContext.php

@@ -25,7 +25,7 @@ class RequestContext
     private ?BannerMessageManager $banner_message_manager;
     // Should use an enum, TODO
     private string $environment;
-    private string $api_key_in_use;
+    private ?string $api_key_in_use;
 
     private string $user_api_key_header = 'X-WPT-API-KEY';
 
@@ -49,7 +49,7 @@ public function __construct(array $global_request, array $server = [], array $op
         $this->host = $options['host'] ?? Util::getSetting('host', "");
 
         $this->environment = Environment::$Production;
-        $this->api_key_in_use = "";
+        $this->api_key_in_use = null;
     }
 
     public function getRaw(): array
@@ -160,19 +160,20 @@ public function getEnvironment(): string
      * */
     public function getApiKeyInUse(): string
     {
-        if (empty($this->api_key_in_use)) {
-            $user_api_key_header = $this->user_api_key_header;
-            $request_headers = getallheaders();
-            $matching_headers = array_filter($request_headers, function ($k) use ($user_api_key_header) {
-                return strtolower($k) == strtolower($user_api_key_header);
-            }, ARRAY_FILTER_USE_KEY);
-            if (!empty($matching_headers)) {
-                $user_api_key = array_values($matching_headers)[0];
-            }
-
-            $this->api_key_in_use = $user_api_key;
+        if ($this->api_key_in_use == null) {
+            $this->api_key_in_use = $this->readApiKey();
         }
-
         return $this->api_key_in_use;
     }
+
+    private function readApiKey()
+    {
+        $request_headers = getallheaders();
+        foreach ($request_headers as $k => $value) {
+            if (strtolower($k) == strtolower($this->user_api_key_header)) {
+                return trim($value);
+            }
+        }
+        return '';
+    }
 }

www/usage.php

@@ -27,8 +27,7 @@
 
 <?php
 $user_api_key = $request_context->getApiKeyInUse();
-if (strlen($user_api_key)) {
-    $key = trim($user_api_key);
+if (!empty($user_api_key)) {
     $keys_file = SETTINGS_PATH . '/keys.ini';
     if (file_exists(SETTINGS_PATH . '/common/keys.ini')) {
         $keys_file = SETTINGS_PATH . '/common/keys.ini';
@@ -38,7 +37,7 @@
     }
     $keys = parse_ini_file($keys_file, true);
 
-    if ($admin && $key == 'all') {
+    if ($admin && $user_api_key == 'all') {
         if (!isset($_REQUEST['days'])) {
             $days = 1;
         }
@@ -66,7 +65,7 @@
         }
         $used = array();
         foreach ($keys as $key => &$keyUser) {
-            $u = isset($usage[$key]) ? (int)$usage[$key] : 0;
+            $u = isset($usage[$key]) ? (int) $usage[$key] : 0;
             if ($u) {
                 $used[] = array('used' => $u, 'description' => $keyUser['description'], 'contact' => $keyUser['contact'], 'limit' => $keyUser['limit']);
             }
@@ -101,9 +100,9 @@
             }
         }
     } else {
-        if (isset($keys[$key])) {
+        if (isset($keys[$user_api_key])) {
             $out = array();
-            $limit = (int)@$keys[$key]['limit'];
+            $limit = (int) @$keys[$user_api_key]['limit'];
             if (!$json) {
                 echo "<table class=\"table\"><tr><th>Date</th><th>Used</th><th>Limit</th></tr>";
             }
@@ -114,7 +113,7 @@
                 $used = 0;
                 if (is_file($keyfile)) {
                     $usage = json_decode(file_get_contents($keyfile), true);
-                    $used = (int)@$usage[$key];
+                    $used = (int) @$usage[$user_api_key];
                 }
                 $date = $targetDate->format("Y/m/d");
                 if ($json) {
@@ -128,9 +127,9 @@
                 echo '</table>';
             }
 
-            $limit = (int)$keys[$key]['limit'];
-            if (isset($usage[$key])) {
-                $used = (int)$usage[$key];
+            $limit = (int) $keys[$user_api_key]['limit'];
+            if (isset($usage[$user_api_key])) {
+                $used = (int) $usage[$user_api_key];
             } else {
                 $used = 0;
             }