← All changes | classes/Auth/Basic.php +11 -8 1.10 → trunk View file →

		@@ -1,8 +1,8 @@
1	1	<?php
2	2	namespace Imagify\Auth;
3	3
4		-defined( 'ABSPATH' ) || die( 'Cheatin’ uh?' );
	4	+use Imagify\Traits\InstanceGetterTrait;
5	5
6	6	/**
7	7	* Class that allows the use of Basic Auth for internal requests.
8	8	* If this doesn’t work automatically, define the constants IMAGIFY_AUTH_USER and IMAGIFY_AUTH_PASSWORD.
		@@ -9,10 +9,10 @@
9	9	*
10	10	* @since 1.9.5
11	11	* @author Grégory Viguier
12	12	*/
13		-class Basic {
14		- use \Imagify\Traits\InstanceGetterTrait;
	13	+final class Basic {
	14	+ use InstanceGetterTrait;
15	15
16	16	/**
17	17	* Class init: launch hooks.
18	18	*
		@@ -21,11 +21,11 @@
21	21	* @author Grégory Viguier
22	22	*/
23	23	public function init() {
24	24	add_filter( 'imagify_background_process_url', [ $this, 'get_auth_url' ] );
25		- add_filter( 'imagify_async_job_url', [ $this, 'get_auth_url' ] );
26		- add_filter( 'imagify_internal_request_url', [ $this, 'get_auth_url' ] );
27		- add_filter( 'cron_request', [ $this, 'cron_request_args' ] );
	25	+ add_filter( 'imagify_async_job_url', [ $this, 'get_auth_url' ] );
	26	+ add_filter( 'imagify_internal_request_url', [ $this, 'get_auth_url' ] );
	27	+ add_filter( 'cron_request', [ $this, 'cron_request_args' ] );
28	28	}
29	29
30	30	/**
31	31	* If the site uses basic authentication, add the required user and password to the given URL.
		@@ -47,13 +47,16 @@
47	47	// Credentials already in the URL.
48	48	return $url;
49	49	}
50	50
	51	+ $user = '';
	52	+ $pass = '';
	53	+
51	54	if ( defined( 'IMAGIFY_AUTH_USER' ) && defined( 'IMAGIFY_AUTH_PASSWORD' ) && IMAGIFY_AUTH_USER && IMAGIFY_AUTH_PASSWORD ) {
52	55	$user = IMAGIFY_AUTH_USER;
53	56	$pass = IMAGIFY_AUTH_PASSWORD;
54	57	} else {
55		- $auth_type = ! empty( $_SERVER['AUTH_TYPE'] ) ? strtolower( wp_unslash( $_SERVER['AUTH_TYPE'] ) ) : '';
	58	+ $auth_type = ! empty( $_SERVER['AUTH_TYPE'] ) ? strtolower( sanitize_text_field( wp_unslash( $_SERVER['AUTH_TYPE'] ) ) ) : '';
56	59
57	60	if ( 'basic' === $auth_type && ! empty( $_SERVER['PHP_AUTH_USER'] ) && ! empty( $_SERVER['PHP_AUTH_PW'] ) ) {
58	61	$user = sanitize_text_field( wp_unslash( $_SERVER['PHP_AUTH_USER'] ) );
59	62	$pass = sanitize_text_field( wp_unslash( $_SERVER['PHP_AUTH_PW'] ) );
		@@ -59,9 +62,9 @@
59	62	$pass = sanitize_text_field( wp_unslash( $_SERVER['PHP_AUTH_PW'] ) );
60	63	}
61	64	}
62	65
63		- if ( empty( $user ) || empty( $pass ) ) {
	66	+ if ( empty( $user ) ) {
64	67	// No credentials.
65	68	return $url;
66	69	}
67	70