← All changes | includes/Api.php +5 -8 trunk → 1.0 View file →

		@@ -24,11 +24,10 @@
24	24
25	25	new Api\Plugins();
26	26	new Api\Themes();
27	27	new Api\Updates();
28		- new Api\Cache();
	28	+ new Api\Fastcgi_Cache();
29	29	new Api\Health();
30		- new Api\UpdatesData();
31	30	}
32	31
33	32	/**
34	33	* Check if API key is valid.
		@@ -35,15 +34,13 @@
35	34	*
36	35	* @return bool
37	36	*/
38	37	public function has_valid_key() {
39		- $token = $this->get_bearer_token();
40		-
41		- if ( ! flywp()->has_key() || ! is_string( $token ) ) {
42		- return false;
	38	+ if ( flywp()->has_key() && flywp()->get_key() === $this->get_bearer_token() ) {
	39	+ return true;
43	40	}
44	41
45		- return hash_equals( flywp()->get_key(), $token );
	42	+ return false;
46	43	}
47	44
48	45	/**
49	46	* Get bearer token from Authorization header.
		@@ -54,9 +51,9 @@
54	51	if ( ! isset( $_SERVER['HTTP_AUTHORIZATION'] ) ) {
55	52	return false;
56	53	}
57	54
58		- $auth_header = sanitize_text_field( wp_unslash( $_SERVER['HTTP_AUTHORIZATION'] ) );
	55	+ $auth_header = $_SERVER['HTTP_AUTHORIZATION'];
59	56
60	57	if ( ! preg_match( '/Bearer\s(\S+)/', $auth_header, $matches ) ) {
61	58	return false;
62	59	}