← All changes | includes/seo/class-schema-input-validator.php +119 -12 1.30.0 → 2.10.0 View file →

		@@ -118,8 +118,48 @@
118	118	'VideoObject' => [
119	119	'required_fields' => ['@type', 'name', 'thumbnailUrl', 'uploadDate'],
120	120	'optional_fields' => ['description', 'contentUrl', 'embedUrl', 'duration', 'url'],
121	121	'max_length' => ['name' => 110, 'description' => 160]
	122	+ ],
	123	+ // Offered by the metabox Schema Type dropdown and registered in
	124	+ // Schema_Factory, but missing here — so a Review could be generated and
	125	+ // never deployed (#462). Field list mirrors Schema_Factory::Review.
	126	+ 'Review' => [
	127	+ 'required_fields' => ['@type', 'itemReviewed', 'reviewRating', 'author'],
	128	+ 'optional_fields' => ['reviewBody', 'datePublished', 'publisher', 'name', 'url'],
	129	+ 'max_length' => ['name' => 110, 'reviewBody' => 500]
	130	+ ],
	131	+ // The WebPage family. #624 made all four selectable in the metabox and
	132	+ // taught the generate/validate/optimize/preview routes, Schema_Builder,
	133	+ // Schema_Factory and Schema_Graph about them — but not this array, and
	134	+ // deploy_schema_markup() gates every entry on it. So each one generated
	135	+ // cleanly, validated at a score of 100, reported deployment_ready, then
	136	+ // failed deployment with "Invalid schema type: AboutPage" and no row
	137	+ // written. Exactly the #462 Review bug, one array and two releases
	138	+ // later, which is why SchemaInputValidatorCoverageTest now scans the
	139	+ // dropdown instead of trusting this list to be extended by hand.
	140	+ //
	141	+ // `name` and `url` are the two populate_webpage_schema() always sets;
	142	+ // the rest are conditional, so they are optional here.
	143	+ 'WebPage' => [
	144	+ 'required_fields' => ['@type', 'name', 'url'],
	145	+ 'optional_fields' => ['description', 'datePublished', 'dateModified', 'isPartOf', 'breadcrumb', 'primaryImageOfPage', 'inLanguage', 'mainEntity'],
	146	+ 'max_length' => ['name' => 110, 'description' => 160]
	147	+ ],
	148	+ 'AboutPage' => [
	149	+ 'required_fields' => ['@type', 'name', 'url'],
	150	+ 'optional_fields' => ['description', 'datePublished', 'dateModified', 'isPartOf', 'breadcrumb', 'primaryImageOfPage', 'inLanguage', 'mainEntity'],
	151	+ 'max_length' => ['name' => 110, 'description' => 160]
	152	+ ],
	153	+ 'ContactPage' => [
	154	+ 'required_fields' => ['@type', 'name', 'url'],
	155	+ 'optional_fields' => ['description', 'datePublished', 'dateModified', 'isPartOf', 'breadcrumb', 'primaryImageOfPage', 'inLanguage', 'mainEntity'],
	156	+ 'max_length' => ['name' => 110, 'description' => 160]
	157	+ ],
	158	+ 'ProfilePage' => [
	159	+ 'required_fields' => ['@type', 'name', 'url'],
	160	+ 'optional_fields' => ['description', 'datePublished', 'dateModified', 'isPartOf', 'breadcrumb', 'primaryImageOfPage', 'inLanguage', 'mainEntity'],
	161	+ 'max_length' => ['name' => 110, 'description' => 160]
122	162	]
123	163	];
124	164
125	165	/**
		@@ -363,15 +403,29 @@
363	403	$result['errors'][] = 'Invalid @context value. Must be "https://schema.org"';
364	404	$result['valid'] = false;
365	405	}
366	406
367		- // Check for required @type
	407	+ // Check for required @type.
	408	+ // `@type` may be an array — "@type": ["Product","Offer"] is valid
	409	+ // JSON-LD. Comparing an array against a string emitted an "Array to
	410	+ // string conversion" warning and always failed (#468), so match if the
	411	+ // expected type appears anywhere in the list.
368	412	if (!isset($schema_data['@type'])) {
369	413	$result['errors'][] = 'Missing required @type field';
370	414	$result['valid'] = false;
371		- } elseif ($schema_data['@type'] !== $schema_type) {
372		- $result['errors'][] = "Schema @type '{$schema_data['@type']}' does not match expected type '{$schema_type}'";
373		- $result['valid'] = false;
	415	+ } else {
	416	+ $declared_types = is_array($schema_data['@type'])
	417	+ ? array_map('strval', $schema_data['@type'])
	418	+ : [(string) $schema_data['@type']];
	419	+
	420	+ if (!in_array($schema_type, $declared_types, true)) {
	421	+ $result['errors'][] = sprintf(
	422	+ "Schema @type '%s' does not match expected type '%s'",
	423	+ implode(', ', $declared_types),
	424	+ $schema_type
	425	+ );
	426	+ $result['valid'] = false;
	427	+ }
374	428	}
375	429
376	430	return $result;
377	431	}
		@@ -534,8 +588,26 @@
534	588	private function validate_data_formats(array $schema_data, string $schema_type): array {
535	589	$result = ['valid' => true, 'errors' => [], 'warnings' => []];
536	590
537	591	foreach ($schema_data as $field => $value) {
	592	+ // sameAs is a list, so its members never reached the string branch
	593	+ // below and free text entered in a social-profile field saved
	594	+ // cleanly, then shipped as invalid structured data (#480).
	595	+ if (is_array($value) && in_array($field, ['url', 'sameAs', 'logo', 'image'], true)) {
	596	+ foreach ($value as $item) {
	597	+ if (!is_string($item) || '' === trim($item)) {
	598	+ continue;
	599	+ }
	600	+
	601	+ if (!$this->is_valid_url($item)) {
	602	+ $result['errors'][] = "Invalid URL format for field: {$field} ({$item})";
	603	+ $result['valid'] = false;
	604	+ }
	605	+ }
	606	+
	607	+ continue;
	608	+ }
	609	+
538	610	if (is_string($value)) {
539	611	// Validate URLs
540	612	if (in_array($field, ['url', 'sameAs', 'logo', 'image'], true) && !empty($value)) {
541	613	if (!$this->is_valid_url($value)) {
		@@ -721,14 +793,25 @@
721	793	$result['errors'][] = 'Invalid user or user not logged in';
722	794	return $result;
723	795	}
724	796
725		- // Check operation-specific permissions
	797	+ // Check operation-specific permissions.
	798	+ //
	799	+ // #457 loosened the route permission_callbacks to the delegable
	800	+ // `thinkrank_schema` capability, but these handler-level checks still
	801	+ // demanded edit_posts / publish_posts / manage_options — so a role
	802	+ // granted Schema access could generate and validate but was denied on
	803	+ // deploy, bulk operations and everything site-context. That is exactly
	804	+ // the symptom #457 set out to fix (#470). A holder of thinkrank_schema
	805	+ // satisfies any schema operation; the built-in caps remain as the
	806	+ // fallback for roles that never went through the Role Manager.
	807	+ $has_schema_cap = user_can($user_id, 'thinkrank_schema');
	808	+
726	809	switch ($operation) {
727	810	case 'generate':
728	811	case 'validate':
729	812	case 'optimize':
730		- if (!user_can($user_id, 'edit_posts')) {
	813	+ if (!$has_schema_cap && !user_can($user_id, 'edit_posts')) {
731	814	$result['errors'][] = 'Insufficient permissions for schema generation/validation';
732	815	return $result;
733	816	}
734	817	break;
		@@ -733,9 +816,9 @@
733	816	}
734	817	break;
735	818
736	819	case 'deploy':
737		- if (!user_can($user_id, 'publish_posts')) {
	820	+ if (!$has_schema_cap && !user_can($user_id, 'publish_posts')) {
738	821	$result['errors'][] = 'Insufficient permissions for schema deployment';
739	822	return $result;
740	823	}
741	824	break;
		@@ -741,9 +824,9 @@
741	824	break;
742	825
743	826	case 'manage_settings':
744	827	case 'bulk_operations':
745		- if (!user_can($user_id, 'manage_options')) {
	828	+ if (!$has_schema_cap && !user_can($user_id, 'manage_options')) {
746	829	$result['errors'][] = 'Insufficient permissions for schema management';
747	830	return $result;
748	831	}
749	832	break;
		@@ -824,9 +907,14 @@
824	907	// SECURITY: Check site-level permissions for site context.
825	908	// user_can($user_id, …) rather than current_user_can() so this
826	909	// agrees with the rest of the validator outside a REST request,
827	910	// where the current user and $user_id can differ (cron, CLI).
828		- if (!$user_id || !user_can($user_id, 'manage_options')) {
	911	+ //
	912	+ // Accepts the delegable `thinkrank_schema` capability as well as
	913	+ // manage_options: /schema/settings already lets a delegated role
	914	+ // edit site schema settings, so blocking site-context generate and
	915	+ // deploy for the same role was inconsistent (#470).
	916	+ if (!$user_id || (!user_can($user_id, 'thinkrank_schema') && !user_can($user_id, 'manage_options'))) {
829	917	$result['errors'][] = 'Access denied: You need administrator privileges for site-level schema operations';
830	918	return $result;
831	919	}
832	920	}
		@@ -901,14 +989,33 @@
901	989	* @return array Sanitized options
902	990	*/
903	991	public function sanitize_options(array $options): array {
904	992	$sanitized = [];
	993	+ // Anything omitted here is dropped before the manager sees it, which is
	994	+ // why apply_content_schema_settings_from_options() and the per-request
	995	+ // schema-type opt-in were unreachable from REST (#470). The list now
	996	+ // covers every option the generate path actually reads.
	997	+ //
	998	+ // `validation_level` previously allowed 'basic' and rejected 'lenient',
	999	+ // disagreeing with Schema_Settings_Config, validate_settings() and the
	1000	+ // update-settings ability, which all use 'lenient'.
	1001	+ // `deployment_method` no longer advertises microdata/rdfa, which
	1002	+ // determine_deployment_method() hardcodes away to json_ld anyway.
905	1003	$allowed_options = [
906		- 'deployment_method' => ['json_ld', 'microdata', 'rdfa'],
907		- 'validation_level' => ['strict', 'moderate', 'basic'],
	1004	+ 'deployment_method' => ['json_ld'],
	1005	+ 'validation_level' => ['strict', 'moderate', 'lenient'],
908	1006	'include_meta' => 'boolean',
909	1007	'minify_output' => 'boolean',
910		- 'cache_duration' => 'integer'
	1008	+ 'cache_duration' => 'integer',
	1009	+ 'rich_snippets_optimization' => 'boolean',
	1010	+ 'knowledge_graph' => 'boolean',
	1011	+ 'auto_generate_schema' => 'boolean',
	1012	+ 'enable_article_schema' => 'boolean',
	1013	+ 'enable_faq_schema' => 'boolean',
	1014	+ 'enable_howto_schema' => 'boolean',
	1015	+ 'enable_product_schema' => 'boolean',
	1016	+ 'enable_local_business' => 'boolean',
	1017	+ 'enable_breadcrumbs_schema' => 'boolean',
911	1018	];
912	1019
913	1020	foreach ($options as $key => $value) {
914	1021	$sanitized_key = sanitize_key($key);