fix: full-form internal links follow the {{link:}} target rules (ruling P10)
One PostIdParser for {{link:}} and select_post; post_link_url_<type> needs a
living, readable, non-attachment target of exactly that type.
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -68,6 +68,9 @@ final class DynamicContentRules
|
||||
|
||||
private const META_PREFIX = 'custom_meta_';
|
||||
|
||||
/** Divi's internal link options: post_link_url_<post type> (F27). */
|
||||
public const LINK_PREFIX = 'post_link_url_';
|
||||
|
||||
/**
|
||||
* Prefixes Divi strips from a meta key option with str_replace – every occurrence, not just
|
||||
* the leading one (DynamicContentOptionPostMetaKey.php:232,249,275,286;
|
||||
@@ -135,8 +138,13 @@ final class DynamicContentRules
|
||||
*
|
||||
* @throws InvalidArgumentException
|
||||
*/
|
||||
public static function cleanSetting(string $key, mixed $value, string $fieldType, ValueSanitizer $sanitizer): mixed
|
||||
{
|
||||
public static function cleanSetting(
|
||||
string $key,
|
||||
mixed $value,
|
||||
string $fieldType,
|
||||
ValueSanitizer $sanitizer,
|
||||
string $option = ''
|
||||
): mixed {
|
||||
// Ruling S32/S32a: control characters go on the RAW value, before every check and the
|
||||
// sanitizer ("<" + VT stays a literal "<" for strip_tags; a later strip would build a tag).
|
||||
if (is_string($value)) {
|
||||
@@ -149,7 +157,7 @@ final class DynamicContentRules
|
||||
|
||||
$clean = match ($fieldType) {
|
||||
'text', 'richtext', 'html', 'url' => self::textSetting($key, $value, $fieldType, $sanitizer),
|
||||
'select_post' => self::selectPostSetting($key, $value, $sanitizer),
|
||||
'select_post' => self::selectPostSetting($key, $value, $sanitizer, $option),
|
||||
'select', 'yes_no_button', 'number' => self::scalarSetting($key, $value, $sanitizer),
|
||||
// Ruling S37: map types come from a filter (untrusted) – unknown types are refused.
|
||||
default => throw new InvalidArgumentException(sprintf(
|
||||
@@ -238,19 +246,28 @@ final class DynamicContentRules
|
||||
}
|
||||
|
||||
/**
|
||||
* Ruling S37: a numeric post id the user may read – no slugs (Divi resolves those itself).
|
||||
* Returned as sent (int or digit string).
|
||||
* Ruling S37/P10: a numeric post id (PostIdParser). In an internal link post_link_url_<type> the
|
||||
* id must name a link target of exactly that type (LinkTargets rules, like {{link:}}); in any
|
||||
* other option a post the user may read. Returned as sent (int or digit string).
|
||||
*
|
||||
* @throws InvalidArgumentException
|
||||
*/
|
||||
private static function selectPostSetting(string $key, mixed $value, ValueSanitizer $sanitizer): mixed
|
||||
{
|
||||
$digits = is_string($value) && preg_match('/^[1-9][0-9]*$/D', $value) === 1;
|
||||
$id = is_int($value) ? $value : ($digits ? (int) $value : 0);
|
||||
if ($id <= 0 || ! $sanitizer->canReadPost($id)) {
|
||||
private static function selectPostSetting(
|
||||
string $key,
|
||||
mixed $value,
|
||||
ValueSanitizer $sanitizer,
|
||||
string $option
|
||||
): mixed {
|
||||
$id = PostIdParser::parse($value);
|
||||
$linkType = str_starts_with($option, self::LINK_PREFIX) ? substr($option, strlen(self::LINK_PREFIX)) : null;
|
||||
$valid = $id !== null && ($linkType === null
|
||||
? $sanitizer->canReadPost($id)
|
||||
: $sanitizer->linkTargetType($id) === $linkType);
|
||||
if (! $valid) {
|
||||
throw new InvalidArgumentException(sprintf(
|
||||
'Einstellung "%s" im Divi-Verweis: Beitrags-ID eines lesbaren Eintrags erwartet.',
|
||||
$key
|
||||
'Einstellung "%s" im Divi-Verweis: Beitrags-ID eines lesbaren Eintrags erwartet%s.',
|
||||
$key,
|
||||
$linkType === null ? '' : sprintf(' (Typ „%s“, nicht im Papierkorb, kein Anhang)', $linkType)
|
||||
));
|
||||
}
|
||||
|
||||
|
||||
@@ -158,15 +158,14 @@ final class Placeholders
|
||||
* {{link:<ID>}} → Divi's own internal link post_link_url_<type> with settings.post_id (F27):
|
||||
* rendered as get_permalink() at view time, so a draft target gets its pretty URL once published.
|
||||
* Whether Divi offers that option (public post types only) VariableRef checks against the registry;
|
||||
* that the value goes into a URL field and the target is readable (S37) the choke point checks again.
|
||||
* that the value goes into a URL field and names a link target of that type (P10) the choke point checks again.
|
||||
*
|
||||
* @throws InvalidArgumentException
|
||||
*/
|
||||
private function link(string $name): string
|
||||
{
|
||||
// FILTER_VALIDATE_INT: no id beyond PHP_INT_MAX that would saturate to another entry.
|
||||
$id = preg_match('/^[1-9][0-9]{0,18}$/D', $name) === 1 ? filter_var($name, FILTER_VALIDATE_INT) : false;
|
||||
if (! is_int($id)) {
|
||||
$id = PostIdParser::parse($name);
|
||||
if ($id === null) {
|
||||
throw new InvalidArgumentException(sprintf(
|
||||
'Ungültige Beitrags-ID "%s" in {{link:…}} (positive Zahl erwartet, z. B. {{link:42}}).',
|
||||
$name
|
||||
@@ -181,7 +180,7 @@ final class Placeholders
|
||||
));
|
||||
}
|
||||
|
||||
return VariableRef::serialize('content', 'post_link_url_' . $type, ['post_id' => $name]);
|
||||
return VariableRef::serialize('content', DynamicContentRules::LINK_PREFIX . $type, ['post_id' => $name]);
|
||||
}
|
||||
|
||||
private function field(string $name): string
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace LIT\MCP\Integrations\Divi\Compose;
|
||||
|
||||
defined('ABSPATH') || exit;
|
||||
|
||||
/**
|
||||
* The one rule for post IDs a client or a stored reference names (ruling P10): {{link:<ID>}},
|
||||
* post_link_url_* settings.post_id and Theme Builder conditions. A positive int, or its plain
|
||||
* decimal digits without sign, padding or spaces; nothing beyond PHP_INT_MAX (FILTER_VALIDATE_INT
|
||||
* refuses it instead of saturating to another entry). Pure PHP.
|
||||
*/
|
||||
final class PostIdParser
|
||||
{
|
||||
public static function parse(mixed $value): ?int
|
||||
{
|
||||
if (is_int($value)) {
|
||||
return $value > 0 ? $value : null;
|
||||
}
|
||||
|
||||
if (! is_string($value) || preg_match('/^[1-9][0-9]{0,18}$/D', $value) !== 1) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$id = filter_var($value, FILTER_VALIDATE_INT);
|
||||
|
||||
return is_int($id) ? $id : null;
|
||||
}
|
||||
}
|
||||
@@ -34,7 +34,14 @@ interface ValueSanitizer
|
||||
|
||||
/**
|
||||
* Whether the current user may read post $id: select_post settings of dynamic content
|
||||
* references (post_link_url_*) name a post whose link Divi renders (ruling S37).
|
||||
* references outside internal links (ruling S37); post_link_url_* use linkTargetType() (P10).
|
||||
*/
|
||||
public function canReadPost(int $id): bool;
|
||||
|
||||
/**
|
||||
* Ruling P10: the post type of entry $id when it is a link target – exists, lives (no trash,
|
||||
* auto-draft or revision/attachment status), is no attachment and is readable – like {{link:}}
|
||||
* (LinkTargets); else null.
|
||||
*/
|
||||
public function linkTargetType(int $id): ?string;
|
||||
}
|
||||
|
||||
@@ -252,7 +252,7 @@ final class VariableRef
|
||||
*/
|
||||
private function contentSettings(string $name, array $settings, ValueSanitizer $sanitizer, bool $url): array
|
||||
{
|
||||
if (! $url && str_starts_with($name, 'post_link_url_')) {
|
||||
if (! $url && str_starts_with($name, DynamicContentRules::LINK_PREFIX)) {
|
||||
throw new InvalidArgumentException(sprintf(
|
||||
'"%s" (Link auf einen Eintrag, {{link:…}}) nur in Link- und URL-Feldern.',
|
||||
$name
|
||||
@@ -269,7 +269,7 @@ final class VariableRef
|
||||
if ($url && ($key === 'before' || $key === 'after') && $value !== '') {
|
||||
throw new InvalidArgumentException(sprintf('"%s" im Divi-Verweis: in URL-Feldern verboten.', $key));
|
||||
}
|
||||
$clean[$key] = DynamicContentRules::cleanSetting($key, $value, $fields[$key], $sanitizer);
|
||||
$clean[$key] = DynamicContentRules::cleanSetting($key, $value, $fields[$key], $sanitizer, $name);
|
||||
}
|
||||
|
||||
return $clean;
|
||||
|
||||
@@ -205,12 +205,12 @@ final class DiviDynamicSourcesAbility implements Ability
|
||||
return '{{post:' . $post . '}}';
|
||||
}
|
||||
|
||||
if (! str_starts_with($name, 'post_link_url_')) {
|
||||
if (! str_starts_with($name, DynamicContentRules::LINK_PREFIX)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
// Review M-9: {{link:}} refuses attachments (status inherit); internal types ("_…") are no link targets.
|
||||
$type = substr($name, strlen('post_link_url_'));
|
||||
// Review M-9/P10: {{link:}} and the full form refuse attachments; internal types ("_…") are no link targets.
|
||||
$type = substr($name, strlen(DynamicContentRules::LINK_PREFIX));
|
||||
|
||||
return $type === 'attachment' || str_starts_with($type, '_') ? null : '{{link:<ID>}}';
|
||||
}
|
||||
|
||||
@@ -10,9 +10,10 @@ use WP_Post;
|
||||
defined('ABSPATH') || exit;
|
||||
|
||||
/**
|
||||
* {{link:<ID>}} targets from WordPress: the entry exists, lives (no trash, auto-draft or
|
||||
* revision) and the current user may read it (read_post, like select_post settings, S37).
|
||||
* Missing and unreadable entries give the same null (no existence oracle).
|
||||
* {{link:<ID>}} and post_link_url_* targets from WordPress (ruling P10): the entry exists, lives
|
||||
* (no trash, auto-draft or revision), is no attachment (whatever its status) and the current user
|
||||
* may read it (read_post, like select_post settings, S37). Missing and unreadable entries give the
|
||||
* same null (no existence oracle).
|
||||
*/
|
||||
final class WpLinkTargets implements LinkTargets
|
||||
{
|
||||
@@ -21,7 +22,11 @@ final class WpLinkTargets implements LinkTargets
|
||||
public function postTypeOf(int $id): ?string
|
||||
{
|
||||
$post = get_post($id);
|
||||
if (! $post instanceof WP_Post || in_array((string) $post->post_status, self::DEAD, true)) {
|
||||
if (
|
||||
! $post instanceof WP_Post
|
||||
|| in_array((string) $post->post_status, self::DEAD, true)
|
||||
|| $post->post_type === 'attachment'
|
||||
) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
@@ -48,4 +48,9 @@ final class WpValueSanitizer implements ValueSanitizer
|
||||
{
|
||||
return current_user_can('read_post', $id);
|
||||
}
|
||||
|
||||
public function linkTargetType(int $id): ?string
|
||||
{
|
||||
return (new WpLinkTargets())->postTypeOf($id);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user