-
+ { icon &&
}
{ children }
{ isLoading &&
}
{ action &&
{ action }
}
diff --git a/projects/packages/videopress/src/client/block-editor/blocks/video/components/banner/style.scss b/projects/packages/videopress/src/client/block-editor/blocks/video/components/banner/style.scss
index 3cf78ee0e8ce9..8964f84b82a95 100644
--- a/projects/packages/videopress/src/client/block-editor/blocks/video/components/banner/style.scss
+++ b/projects/packages/videopress/src/client/block-editor/blocks/video/components/banner/style.scss
@@ -1,15 +1,39 @@
.block-banner {
display: flex;
- height: 48px;
+ justify-content: space-between;
font-size: 14px;
align-self: center;
align-items: center;
- background: #F6F7F7;
- padding: 0 16px;
+ background: black;
+ border-radius: 2px;
+ padding: 0 20px;
+ box-shadow: 0 0 1px inset white;
.block-banner__content {
- color: #01283d;
- flex-grow: 2;
- margin: 0 8px;
+ color: white;
+ margin: 10px 10px 10px 0;
+ }
+
+ .block-banner__action {
+ padding: 0;
+
+ .components-button.is-primary {
+ background: white;
+ color: black;
+ font-weight: 600;
+ font-size: 14px;
+ padding: 4px 8px;
+ height: 28px;
+ margin: 8px 0 8px auto;
+
+ &:hover:not(:disabled) {
+ background: #F6F7F7;
+ }
+ }
+
+ .components-button.is-primary.is-busy {
+ background-size: 100px 100%;
+ background-image: linear-gradient(-45deg, #e34c84 28%, #ab235a 28%, #ab235a 72%, #e34c84 72%);
+ }
}
}
diff --git a/projects/packages/videopress/src/client/block-editor/blocks/video/components/videopress-uploader/index.js b/projects/packages/videopress/src/client/block-editor/blocks/video/components/videopress-uploader/index.js
index e7c2b99039535..660e7833e7721 100644
--- a/projects/packages/videopress/src/client/block-editor/blocks/video/components/videopress-uploader/index.js
+++ b/projects/packages/videopress/src/client/block-editor/blocks/video/components/videopress-uploader/index.js
@@ -10,6 +10,7 @@ import { __ } from '@wordpress/i18n';
/**
* Internal dependencies
*/
+import { usePermission } from '../../../../../admin/hooks/use-permission';
import useResumableUploader from '../../../../../hooks/use-resumable-uploader';
import { uploadFromLibrary } from '../../../../../hooks/use-uploader';
import { buildVideoPressURL, pickVideoBlockAttributesFromUrl } from '../../../../../lib/url';
@@ -29,12 +30,15 @@ const VideoPressUploader = ( {
fileToUpload,
isReplacing,
onReplaceCancel,
+ isActive,
} ) => {
const [ uploadPaused, setUploadPaused ] = useState( false );
const [ uploadedVideoData, setUploadedVideoData ] = useState( false );
const [ isUploadingInProgress, setIsUploadingInProgress ] = useState( false );
const [ isVerifyingLocalMedia, setIsVerifyingLocalMedia ] = useState( false );
+ const { hasConnectedOwner } = usePermission();
+
/*
* When the file to upload is set, start the upload process
* just after the component is mounted.
@@ -314,6 +318,24 @@ const VideoPressUploader = ( {
);
}
+ if ( ! isActive ) {
+ const needsConnectionText = __(
+ 'Connect your WordPress.com account to enable high-quality, ad-free video.',
+ 'jetpack-videopress-pkg'
+ );
+
+ const needsActivationText = __(
+ 'Activate the VideoPress module to enable high-quality, ad-free video.',
+ 'jetpack-videopress-pkg'
+ );
+
+ return (
+
+ { ! hasConnectedOwner ? needsConnectionText : needsActivationText }
+
+ );
+ }
+
// Default view to select file to upload
return (
{
if ( ! errorMessage ) {
@@ -87,6 +89,7 @@ export const PlaceholderWrapper = withNotices( function ( {
label={ title }
instructions={ disableInstructions ? null : instructions }
notices={ noticeUI }
+ className={ className }
>
{ children }
@@ -148,6 +151,7 @@ export default function VideoPressEdit( {
// Get the redirect URI for the connection flow.
const [ isRedirectingToMyJetpack, setIsRedirectingToMyJetpack ] = useState( false );
+ const { hasConnectedOwner } = usePermission();
// Detect if the chapter file is auto-generated.
const chapter = tracks?.filter( track => track.kind === 'chapters' )?.[ 0 ];
@@ -395,15 +399,15 @@ export default function VideoPressEdit( {
<>
{
setIsRedirectingToMyJetpack( true );
- if ( ! isStandalonePluginActive ) {
- return ( window.location.href = jetpackVideoPressSettingUrl );
+ if ( ! hasConnectedOwner ) {
+ return ( window.location.href = myJetpackConnectUrl );
}
- window.location.href = myJetpackConnectUrl;
+ window.location.href = jetpackVideoPressSettingUrl;
} }
/>
@@ -414,6 +418,7 @@ export default function VideoPressEdit( {
fileToUpload={ fileToUpload }
isReplacing={ isReplacingFile?.isReplacing }
onReplaceCancel={ cancelReplacingVideoFile }
+ isActive={ isActive }
/>
@@ -592,15 +597,15 @@ export default function VideoPressEdit( {
{
setIsRedirectingToMyJetpack( true );
- if ( ! isStandalonePluginActive ) {
- return ( window.location.href = jetpackVideoPressSettingUrl );
+ if ( ! hasConnectedOwner ) {
+ return ( window.location.href = myJetpackConnectUrl );
}
- window.location.href = myJetpackConnectUrl;
+ window.location.href = jetpackVideoPressSettingUrl;
} }
/>
diff --git a/projects/packages/videopress/src/client/block-editor/blocks/video/editor.scss b/projects/packages/videopress/src/client/block-editor/blocks/video/editor.scss
index 6dfbaa03c6fb1..a75c2c96c1592 100644
--- a/projects/packages/videopress/src/client/block-editor/blocks/video/editor.scss
+++ b/projects/packages/videopress/src/client/block-editor/blocks/video/editor.scss
@@ -52,6 +52,10 @@
}
}
+.components-placeholder.disabled {
+ min-height: 0;
+}
+
.loading-wrapper {
display: flex;
width: 100%;
diff --git a/projects/packages/waf/changelog/add-waf-body-processor b/projects/packages/waf/changelog/add-waf-body-processor
new file mode 100644
index 0000000000000..df675355a4f53
--- /dev/null
+++ b/projects/packages/waf/changelog/add-waf-body-processor
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Firewall Runtime: Added support for rule files to specify body parser type.
diff --git a/projects/packages/waf/src/class-waf-request.php b/projects/packages/waf/src/class-waf-request.php
index 5017a2e25f46c..bbb8bcf3e17f9 100644
--- a/projects/packages/waf/src/class-waf-request.php
+++ b/projects/packages/waf/src/class-waf-request.php
@@ -328,28 +328,59 @@ public function get_get_vars() {
return flatten_array( $_GET );
}
+ /**
+ * Returns the POST variables from a JSON body
+ *
+ * @return array{string, scalar}[]
+ */
+ private function get_json_post_vars() {
+ $decoded_json = json_decode( $this->get_body(), true ) ?? array();
+ return flatten_array( $decoded_json, 'json', true );
+ }
+
+ /**
+ * Returns the POST variables from a urlencoded body
+ *
+ * @return array{string, scalar}[]
+ */
+ private function get_urlencoded_post_vars() {
+ parse_str( $this->get_body(), $params );
+ return flatten_array( $params );
+ }
+
/**
* Returns the POST variables
*
+ * @param string $body_processor Manually specifiy the method to use to process the body. Options are 'URLENCODED' and 'JSON'.
+ *
* @return array{string, scalar}[]
*/
- public function get_post_vars() {
+ public function get_post_vars( string $body_processor = '' ) {
$content_type = $this->get_header( 'content-type' );
+
+ // If the body processor is specified by the rules file, trust it.
+ if ( 'URLENCODED' === $body_processor ) {
+ return $this->get_urlencoded_post_vars();
+ }
+ if ( 'JSON' === $body_processor ) {
+ return $this->get_json_post_vars();
+ }
+
+ // Otherwise, use $_POST if it's not empty.
if ( ! empty( $_POST ) ) {
- // If $_POST is populated, use it.
return flatten_array( $_POST );
- } elseif ( strpos( $content_type, 'application/json' ) !== false ) {
- // Attempt to decode JSON requests.
- $decoded_json = json_decode( $this->get_body(), true ) ?? array();
- return flatten_array( $decoded_json, 'json', true );
- } elseif ( strpos( $content_type, 'application/x-www-form-urlencoded' ) !== false ) {
- // Attempt to decode url-encoded data
- parse_str( $this->get_body(), $params );
- return flatten_array( $params );
- } else {
- // Don't try to parse any other content types
- return array();
}
+
+ // Lastly, try to parse the body based on the content type.
+ if ( strpos( $content_type, 'application/json' ) !== false ) {
+ return $this->get_json_post_vars();
+ }
+ if ( strpos( $content_type, 'application/x-www-form-urlencoded' ) !== false ) {
+ return $this->get_urlencoded_post_vars();
+ }
+
+ // Don't try to parse any other content types.
+ return array();
}
/**
diff --git a/projects/packages/waf/src/class-waf-runtime.php b/projects/packages/waf/src/class-waf-runtime.php
index 394d46aa5a6f1..19300ea804582 100644
--- a/projects/packages/waf/src/class-waf-runtime.php
+++ b/projects/packages/waf/src/class-waf-runtime.php
@@ -38,6 +38,14 @@ class Waf_Runtime {
*/
const NORMALIZE_ARRAY_MATCH_VALUES = 2;
+ /**
+ * The version of this runtime class. Used by rule files to ensure compatibility.
+ *
+ * @since $$next-version$$
+ *
+ * @var int
+ */
+ public $version = 1;
/**
* Last rule.
*
@@ -68,6 +76,12 @@ class Waf_Runtime {
* @var string
*/
public $matched_var_name = '';
+ /**
+ * Body Processor.
+ *
+ * @var string 'URLENCODED' | 'JSON' | ''
+ */
+ private $body_processor = '';
/**
* State.
@@ -438,7 +452,7 @@ public function meta( $key ) {
$value = $this->args_names( $this->meta( 'args_get' ) );
break;
case 'args_post':
- $value = $this->request->get_post_vars();
+ $value = $this->request->get_post_vars( $this->get_body_processor() );
break;
case 'args_post_names':
$value = $this->args_names( $this->meta( 'args_post' ) );
@@ -488,6 +502,28 @@ private function state_values( $prefix ) {
return $output;
}
+ /**
+ * Get the body processor.
+ *
+ * @return string
+ */
+ private function get_body_processor() {
+ return $this->body_processor;
+ }
+
+ /**
+ * Set the body processor.
+ *
+ * @param string $processor Processor to set. Either 'URLENCODED' or 'JSON'.
+ *
+ * @return void
+ */
+ public function set_body_processor( $processor ) {
+ if ( $processor === 'URLENCODED' || $processor === 'JSON' ) {
+ $this->body_processor = $processor;
+ }
+ }
+
/**
* Change a string to all lowercase and replace spaces and underscores with dashes.
*
diff --git a/projects/packages/waf/tests/php/unit/test-waf-request.php b/projects/packages/waf/tests/php/unit/test-waf-request.php
index ce409a4b9e5ac..01c68e5aa5bea 100644
--- a/projects/packages/waf/tests/php/unit/test-waf-request.php
+++ b/projects/packages/waf/tests/php/unit/test-waf-request.php
@@ -301,6 +301,64 @@ public function testGetVarsPost() {
$_POST = array();
}
+ /**
+ * Test that the Waf_Request class returns POST-ed data correctly decoded from JSON via Waf_Request::get_post_vars().
+ */
+ public function testGetVarsPostWithJsonBodyProcessor() {
+ $_SERVER['CONTENT_TYPE'] = 'irrelevant';
+
+ $request = $this->mock_request(
+ array(
+ 'body' => json_encode(
+ array(
+ 'str' => 'value',
+ 'arr' => array( 'a', 'b', 'c' ),
+ 'obj' => (object) array( 'foo' => 'bar' ),
+ )
+ ),
+ )
+ );
+ $value = $request->get_post_vars( 'JSON' );
+ $this->assertIsArray( $value );
+ $this->assertContains( array( 'json.str', 'value' ), $value );
+ $this->assertContains( array( 'json.arr.0', 'a' ), $value );
+ $this->assertContains( array( 'json.arr.1', 'b' ), $value );
+ $this->assertContains( array( 'json.arr.2', 'c' ), $value );
+ $this->assertContains( array( 'json.obj.foo', 'bar' ), $value );
+
+ unset( $_SERVER['CONTENT_TYPE'] );
+ }
+
+ /**
+ * Test that the Waf_Request class returns POST-ed data correctly decoded from URLENCODED body via Waf_Request::get_post_vars().
+ */
+ public function testGetVarsPostWithUrlencodedBodyProcessor() {
+ $_SERVER['CONTENT_TYPE'] = 'irrelevant';
+
+ $request = $this->mock_request(
+ array(
+ 'body' => (
+ http_build_query(
+ array(
+ 'str' => 'value',
+ 'arr' => array( 'a', 'b', 'c' ),
+ 'obj' => (object) array( 'foo' => 'bar' ),
+ )
+ )
+ ),
+ )
+ );
+ $value = $request->get_post_vars( 'URLENCODED' );
+ $this->assertIsArray( $value );
+ $this->assertContains( array( 'str', 'value' ), $value );
+ $this->assertContains( array( 'arr[0]', 'a' ), $value );
+ $this->assertContains( array( 'arr[1]', 'b' ), $value );
+ $this->assertContains( array( 'arr[2]', 'c' ), $value );
+ $this->assertContains( array( 'obj[foo]', 'bar' ), $value );
+
+ unset( $_SERVER['CONTENT_TYPE'] );
+ }
+
/**
* Test that the Waf_Request class returns POST-ed data correctly decoded from JSON via Waf_Request::get_post_vars().
*/
diff --git a/projects/plugins/boost/app/modules/image-guide/Image_Guide_Proxy.php b/projects/plugins/boost/app/modules/image-guide/Image_Guide_Proxy.php
index 4d6ef31835cb7..8b08c45ca41b3 100644
--- a/projects/plugins/boost/app/modules/image-guide/Image_Guide_Proxy.php
+++ b/projects/plugins/boost/app/modules/image-guide/Image_Guide_Proxy.php
@@ -36,10 +36,8 @@ public static function handle_proxy() {
wp_send_json_error( 'Invalid URL', 400 );
}
- $photon_url = Image_CDN_Core::cdn_url( $proxy_url );
- $photon_url_domain = wp_parse_url( $photon_url, PHP_URL_HOST );
- $photon_domain = wp_parse_url( apply_filters( 'jetpack_photon_domain', 'https://i0.wp.com' ), PHP_URL_HOST );
- if ( $photon_url_domain !== $photon_domain ) {
+ $photon_url = Image_CDN_Core::cdn_url( $proxy_url );
+ if ( ! Image_CDN_Core::is_cdn_url( $proxy_url ) ) {
wp_send_json_error( 'Failed to proxy the image.', 400 );
}
diff --git a/projects/plugins/boost/changelog/improve-cdn-url-check b/projects/plugins/boost/changelog/improve-cdn-url-check
new file mode 100644
index 0000000000000..691d511e8f3a3
--- /dev/null
+++ b/projects/plugins/boost/changelog/improve-cdn-url-check
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Image Guide: Improve check for Jetpack Image CDN URLs
diff --git a/projects/plugins/jetpack/changelog/add-nice-fatal-message b/projects/plugins/jetpack/changelog/add-nice-fatal-message
new file mode 100644
index 0000000000000..70f2483520a3d
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/add-nice-fatal-message
@@ -0,0 +1,5 @@
+Significance: patch
+Type: other
+Comment: Just adding a nicer error message that would only display in dev environments.
+
+
diff --git a/projects/plugins/jetpack/changelog/fix-social-share-status-tooltip-text-overflow b/projects/plugins/jetpack/changelog/fix-social-share-status-tooltip-text-overflow
new file mode 100644
index 0000000000000..c45f928f60d33
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/fix-social-share-status-tooltip-text-overflow
@@ -0,0 +1,4 @@
+Significance: patch
+Type: bugfix
+
+Social: Fixed share status tooltip text overflow
diff --git a/projects/plugins/jetpack/changelog/update-e2e-encryption-key b/projects/plugins/jetpack/changelog/update-e2e-encryption-key
new file mode 100644
index 0000000000000..e24693901dddf
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-e2e-encryption-key
@@ -0,0 +1,4 @@
+Significance: patch
+Type: other
+
+e2e tests: update encryption key.
diff --git a/projects/plugins/jetpack/class.jetpack-gutenberg.php b/projects/plugins/jetpack/class.jetpack-gutenberg.php
index 7968f0452f7df..6fa4dd4ed04cf 100644
--- a/projects/plugins/jetpack/class.jetpack-gutenberg.php
+++ b/projects/plugins/jetpack/class.jetpack-gutenberg.php
@@ -674,6 +674,10 @@ public static function enqueue_block_editor_assets() {
// wp-edit-post but wp-edit-post's styles break the Widget Editor and
// Site Editor) until a real fix gets unblocked.
// @todo Remove this once #20357 is properly fixed.
+ $wp_styles_fix = wp_styles()->query( 'jetpack-blocks-editor', 'registered' );
+ if ( empty( $wp_styles_fix ) ) {
+ wp_die( 'Your installation of Jetpack is incomplete. Please run "jetpack build plugins/jetpack" in your dev env.' );
+ }
wp_styles()->query( 'jetpack-blocks-editor', 'registered' )->deps = array();
Assets::enqueue_script( 'jetpack-blocks-editor' );
diff --git a/projects/plugins/jetpack/tests/e2e/config/encrypted.enc b/projects/plugins/jetpack/tests/e2e/config/encrypted.enc
index 19bbaca0ccd78..2b7a724cefde0 100644
--- a/projects/plugins/jetpack/tests/e2e/config/encrypted.enc
+++ b/projects/plugins/jetpack/tests/e2e/config/encrypted.enc
@@ -1,2 +1,2 @@
-Salted__E>'Xyٖ977ebs)۫ b}Z!%!#N=1BF
Ju]0 p
-8Dt2
\ No newline at end of file
+Salted__B Hø߂Uj/XП_T3 'AxM{(
+J"Fr A%&+GMNj|mFP
\ No newline at end of file
diff --git a/projects/plugins/social/changelog/fix-social-share-status-tooltip-text-overflow b/projects/plugins/social/changelog/fix-social-share-status-tooltip-text-overflow
new file mode 100644
index 0000000000000..9a6eda0cf22bb
--- /dev/null
+++ b/projects/plugins/social/changelog/fix-social-share-status-tooltip-text-overflow
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Social: Fixed share status tooltip text overflow
diff --git a/projects/plugins/wpcomsh/changelog/test-redirect b/projects/plugins/wpcomsh/changelog/test-redirect
new file mode 100644
index 0000000000000..e4f7362752dbe
--- /dev/null
+++ b/projects/plugins/wpcomsh/changelog/test-redirect
@@ -0,0 +1,4 @@
+Significance: patch
+Type: removed
+
+test remove redirection
diff --git a/projects/plugins/wpcomsh/feature-plugins/hooks.php b/projects/plugins/wpcomsh/feature-plugins/hooks.php
index 908c679a1f123..f049cf5673b66 100644
--- a/projects/plugins/wpcomsh/feature-plugins/hooks.php
+++ b/projects/plugins/wpcomsh/feature-plugins/hooks.php
@@ -307,11 +307,6 @@ function wpcomsh_maybe_redirect_to_calypso_plugin_pages() {
wp_safe_redirect( 'https://wordpress.com/plugins/' . $site );
exit;
}
-
- if ( 0 === strpos( $request_uri, '/wp-admin/plugins.php' ) ) {
- wp_safe_redirect( 'https://wordpress.com/plugins/manage/' . $site );
- exit;
- }
}
add_action( 'plugins_loaded', 'wpcomsh_maybe_redirect_to_calypso_plugin_pages' );
diff --git a/tools/e2e-commons/config/encrypted.enc b/tools/e2e-commons/config/encrypted.enc
index 6e0d2a4b0f10f..7d473c171f2f9 100644
Binary files a/tools/e2e-commons/config/encrypted.enc and b/tools/e2e-commons/config/encrypted.enc differ