Changeset 3350768

Timestamp:

08/27/2025 03:42:35 AM (6 months ago)

Author:

bitslip6

Message:

wp-cli fix

Location:

bitfire/trunk

Files:

• bitfire-plugin.php (modified) (4 diffs)
• src/api.php (modified) (1 diff)
• src/bitfire_pure.php (modified) (3 diffs)
• src/botfilter.php (modified) (1 diff)
• src/server.php (modified) (3 diffs)

bitfire/trunk/bitfire-plugin.php

@@ -211 +211 @@
         include_once \plugin_dir_path(__FILE__) . "bitfire-admin.php";
     }
+
     $ins = BitFire::get_instance();
     $ins->inspect();
@@ -251 +252 @@
 
             } else {
-                header("X-valid: < 1");
                 $verify_effect = send_browser_verification($ins->_request, $ins->agent, false, true);
 
                 // add human detection, admin and frontend are hooked differently
                 if (icontains($_SERVER['REQUEST_URI'], "/wp-admin/") && !contains($_SERVER['REQUEST_URI'], 'admin-ajax.php')) {
-                    header("X-head: admin");
                     add_action('admin_head', function() use ($verify_effect) {
                         echo "<script>".$verify_effect->read_out()."</script>\n";
                     }, 1);
                 } else {
-                    header("X-head: inline");
                     add_action('wp_head', function() use ($verify_effect) {
                         wp_add_inline_script("bitfire", $verify_effect->read_out(), "after");
@@ -268 +266 @@
 
             }
-        } else {
-            header("X-valid: >= 1");
         }
     }
@@ -524 +520 @@
 // plugin run once wordpress is loaded
 // TODO: this should not be run AFTER wp_loaded, only things that have dep on wp_loaded
+if (php_sapi_name() === "cli") {
+    return;
+}
+
 \add_action("wp_loaded", "BitFirePlugin\bitfire_init");
 // update logout function to remove our cookie as well

bitfire/trunk/src/api.php

@@ -1762 +1762 @@
 
 
-    $r = ['clazz' => $include_class, "days" => $days, "weblog_file" => $log_file->file, "forward" => $request->post['page_direction'], "m1" => $x4, "m2" => $z1 , "m3" => $r0, "must_hydrate" => $must_hydrate, "ctr" => $ctr, "t2" => $total, "ln" => $total, "cres" => count($result), "len" => $l, "stime" => date("Y-m-d H:i:s", $start_time), "etime" => date("Y-m-d H:i:s", $end_time), "total" => $total, "skip" => $page_skip, "start" => $page_start, "end" => $page_start + count($result), "ctr" => $ctr, "pos" => $log_file->pos, "m" => $m, "duration" => $t2 - $t1, "data" => $result];
+    $r = ['clazz' => $include_class, "days" => $days, "weblog_file" => $log_file->file, "forward" => $request->post['page_direction'], "m1" => $x4, "m2" => $z1 , "must_hydrate" => $must_hydrate, "ctr" => $ctr, "t2" => $total, "ln" => $total, "cres" => count($result), "len" => $l, "stime" => date("Y-m-d H:i:s", $start_time), "etime" => date("Y-m-d H:i:s", $end_time), "total" => $total, "skip" => $page_skip, "start" => $page_start, "end" => $page_start + count($result), "ctr" => $ctr, "pos" => $log_file->pos, "m" => $m, "duration" => $t2 - $t1, "data" => $result];
     /*
     $t2 = $total;

bitfire/trunk/src/bitfire_pure.php

@@ -535 +535 @@
 
     $learning_mode = (CFG::int('dynamic_exceptions') > time() && $verified);
-    header("x-Learn-mode: $learning_mode");
     $file_name  = basename($request->path, '/');
     $pos  = stripos($request->path, '/wp-json/');
@@ -620 +619 @@
     if (count($request->get) > 0) {
 
-        header("x-params: >0");
         $user_params = array_fill_keys(explode(',', CFG::str('ok_params')), 1);
         $wild_cards  = array_filter($user_params, fn($x) => strpos($x, '*') !== false, ARRAY_FILTER_USE_KEY);
@@ -627 +625 @@
             $user_params, array_merge($wild_cards, COMMON_WILDCARDS)), ARRAY_FILTER_USE_BOTH);
 
-        header("x-unknown: " . count($unknown_params));
         if (count($unknown_params) > 0) {
 
             if ($learning_mode) {
-                header("x-unknown-learn: 1");
                 update_ini_list('ok_params', ',' . implode(',', array_keys($unknown_params)));
             } else {
-                header("x-unknown-restricted: 1");
                 $class |= REQ_UNCOMMON | REQ_RESTRICTED;
             }

bitfire/trunk/src/botfilter.php

@@ -1083 +1083 @@
         // $cookie->valid_print = $cookie->valid_print ?: validate_header($agent->browser_name, $agent->fingerprint, FINGERPRINT_MAP);
         //$ip_data = $ins->ip_data;
-        //header("x-ip-time: [{$ip_data->rr_time2}]");
 
         // rewrite wordpress and jetpack user-agents.

bitfire/trunk/src/server.php

@@ -1644 +1644 @@
         $user_params, array_merge($wild_cards, COMMON_WILDCARDS)), ARRAY_FILTER_USE_BOTH);
 
-
-
-    header("X-UCP: " . join(',', array_keys($get)));
-    header("X-UUP: " . join(',', array_keys($user_params)));
-    header("X-UUKP: " . join(',', array_keys($unknown_params)));
-
-
     // this should be the common case
     if (empty($unknown_params)) {
-        header("X-UCP-OK: 1 [$learning_mode]");
         return false;
     }
@@ -1661 +1653 @@
         $keys = array_keys($unknown_params);
         $list = join(',', $keys);
-        header("X-UCP-OK: add [$list]");
         update_ini_value("ok_params", str_replace(',,', ',', "$params,$list"))->run();
         return false;
@@ -1678 +1669 @@
         $clean = preg_replace("/[^a-z0-9_-]/i", "_", $param);
         if ($clean != $param) {
-            header("X-UCP-UNCLEAN: $param -> $clean");
             $unknown = true;
             continue;