WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Press This: Verify intent before fetching in-page resources using Press This. 

Props vortfu

Merges [40195] to the 4.2 branch.

Built from https://develop.svn.wordpress.org/branches/4.2@40201


git-svn-id: http://core.svn.wordpress.org/branches/4.2@40140 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2017-03-06 14:04:31 +00:00
parent db266e95e1
commit 8299a48476
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-admin/includes/class-wp-press-this.php
View File

@ -697,7 +697,11 @@ class WP_Press_This {
* making PT fully backward compatible with the older bookmarklet. * making PT fully backward compatible with the older bookmarklet.
*/ */
if ( empty( $_POST ) && ! empty( $data['u'] ) ) { if ( empty( $_POST ) && ! empty( $data['u'] ) ) {
if ( isset( $_GET['_wpnonce'] ) && wp_verify_nonce( $_GET['_wpnonce'], 'scan-site' ) ) {
$data = $this->source_data_fetch_fallback( $data['u'], $data ); $data = $this->source_data_fetch_fallback( $data['u'], $data );
} else {
$data['errors'] = 'missing nonce';
}
} else { } else {
foreach ( array( '_images', '_embeds' ) as $type ) { foreach ( array( '_images', '_embeds' ) as $type ) {
if ( empty( $_POST[ $type ] ) ) { if ( empty( $_POST[ $type ] ) ) {
@ -1197,7 +1201,7 @@ class WP_Press_This {
$site_data = array( $site_data = array(
'v' => ! empty( $data['v'] ) ? $data['v'] : '', 'v' => ! empty( $data['v'] ) ? $data['v'] : '',
'u' => ! empty( $data['u'] ) ? $data['u'] : '', 'u' => ! empty( $data['u'] ) ? $data['u'] : '',
'hasData' => ! empty( $data ), 'hasData' => ! empty( $data ) && ! isset( $data['errors'] ),
); );
if ( ! empty( $images ) ) { if ( ! empty( $images ) ) {
@ -1329,8 +1333,9 @@ class WP_Press_This {
<div id="scanbar" class="scan"> <div id="scanbar" class="scan">
<form method="GET"> <form method="GET">
<label for="url-scan" class="screen-reader-text"><?php _e( 'Scan site for content' ); ?></label> <label for="url-scan" class="screen-reader-text"><?php _e( 'Scan site for content' ); ?></label>
<input type="url" name="u" id="url-scan" class="scan-url" value="" placeholder="<?php esc_attr_e( 'Enter a URL to scan' ) ?>" /> <input type="url" name="u" id="url-scan" class="scan-url" value="<?php echo esc_attr( $site_data['u'] ) ?>" placeholder="<?php esc_attr_e( 'Enter a URL to scan' ) ?>" />
<input type="submit" name="url-scan-submit" id="url-scan-submit" class="scan-submit" value="<?php esc_attr_e( 'Scan' ) ?>" /> <input type="submit" name="url-scan-submit" id="url-scan-submit" class="scan-submit" value="<?php esc_attr_e( 'Scan' ) ?>" />
<?php wp_nonce_field( 'scan-site' ); ?>
</form> </form>
</div> </div>