← All changes | includes/Api.php +4 -9 trunk → 0.3 View file →

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