Changeset 14699

Timestamp:

03/12/2026 03:25:55 AM (41 hours ago)

Author:

dd32

Message:

Plugin Directory: Guard SVN credential constants behind defined() checks.

Avoid fatal errors when PLUGIN_SVN_MANAGEMENT_USER is not defined by checking before use, and returning early with an error when no credentials are available.

Additionally, a quickfix for a potential fatal in svn ls XML parsing.

See ​https://github.com/WordPress/wordpress.org/pull/555

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/tools/class-svn.php (modified) (6 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/tools/class-svn.php

@@ -25 +25 @@
 
         $options[]   = 'non-interactive';
-        if ( empty( $options['username'] ) ) {
+        if ( empty( $options['username'] ) && defined( 'PLUGIN_SVN_MANAGEMENT_USER' ) ) {
             $options['username'] = PLUGIN_SVN_MANAGEMENT_USER;
             $options['password'] = PLUGIN_SVN_MANAGEMENT_PASS;
@@ -75 +75 @@
         $options[] = 'non-interactive';
         $options['m'] = $message;
-        if ( empty( $options['username'] ) ) {
+        if ( empty( $options['username'] ) && defined( 'PLUGIN_SVN_MANAGEMENT_USER' ) ) {
             $options['username'] = PLUGIN_SVN_MANAGEMENT_USER;
             $options['password'] = PLUGIN_SVN_MANAGEMENT_PASS;
+        }
+
+        if ( empty( $options['username'] ) ) {
+            return [
+                'result'   => false,
+                'revision' => false,
+                'errors'   => [ 'No SVN credentials configured.' ],
+            ];
         }
 
@@ -250 +258 @@
         $options[] = 'non-interactive';
         $options['m'] = $message;
-        if ( empty( $options['username'] ) ) {
+        if ( empty( $options['username'] ) && defined( 'PLUGIN_SVN_MANAGEMENT_USER' ) ) {
             $options['username'] = PLUGIN_SVN_MANAGEMENT_USER;
             $options['password'] = PLUGIN_SVN_MANAGEMENT_PASS;
+        }
+
+        if ( empty( $options['username'] ) ) {
+            return [
+                'result'   => false,
+                'revision' => false,
+                'errors'   => [ 'No SVN credentials configured.' ],
+            ];
         }
 
@@ -290 +306 @@
         $options[] = 'non-interactive';
         $options['m'] = $message;
-        if ( empty( $options['username'] ) ) {
+        if ( empty( $options['username'] ) && defined( 'PLUGIN_SVN_MANAGEMENT_USER' ) ) {
             $options['username'] = PLUGIN_SVN_MANAGEMENT_USER;
             $options['password'] = PLUGIN_SVN_MANAGEMENT_PASS;
+        }
+
+        if ( empty( $options['username'] ) ) {
+            return [
+                'result'   => false,
+                'revision' => false,
+                'errors'   => [ 'No SVN credentials configured.' ],
+            ];
         }
 
@@ -342 +366 @@
         $xml    = simplexml_load_string( $output );
         libxml_use_internal_errors( $errors );
+
+        if ( ! $xml || ! isset( $xml->list ) ) {
+            return false;
+        }
 
         $files = [];
@@ -496 +524 @@
             }
 
-            if ( empty( $options['username'] ) ) {
+            if ( empty( $options['username'] ) && defined( 'PLUGIN_SVN_MANAGEMENT_USER' ) ) {
                 $options['username'] = PLUGIN_SVN_MANAGEMENT_USER;
                 $options['password'] = PLUGIN_SVN_MANAGEMENT_PASS;
+            }
+
+            if ( empty( $options['username'] ) ) {
+                return [
+                    'result'   => false,
+                    'revision' => false,
+                    'errors'   => [ 'No SVN credentials configured.' ],
+                ];
             }
         }