Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle the CSRF vulnerability #230

Merged
merged 6 commits into from
Sep 1, 2015
Merged

Handle the CSRF vulnerability #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e3f6bcc
Bug fix, add in CSRF nonce checks
Aug 26, 2015
ac79a8d
Updating the version numbers
Aug 26, 2015
4244f34
Bug fix, add in the nonce for the add language form as it POSTs data …
Aug 26, 2015
89706c4
UI improvement, set the primary button class on the Language form sub…
Aug 26, 2015
91ac160
Bug fix, switch deprecated instantiation of WP_Widget
Aug 26, 2015
69d0936
Update the plugin version
Aug 31, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion admin/qtx_admin_utils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ function qtranxf_get_term_joined($obj,$taxonomy=null) {
//'[:'.$q_config['language'].']'.$obj->name
$obj->name = qtranxf_join_b($q_config['term_name'][$obj->name]);
//qtranxf_dbg_log('qtranxf_get_term_joined: object:',$obj);
}
}
}elseif(isset($q_config['term_name'][$obj])) {
$obj = qtranxf_join_b($q_config['term_name'][$obj]);
//'[:'.$q_config['language'].']'.$obj.
Expand Down Expand Up @@ -822,6 +822,18 @@ function qtranxf_config_add_form( &$page_config, $nm){
else if(!isset($page_config['forms'][$nm]['fields'])) $page_config['forms'][$nm]['fields'] = array();
}

/**
* @since 3.4.5
* check the WP Nonce - OK if POST is empty
* @link https://codex.wordpress.org/Function_Reference/wp_nonce_field#Examples
* @param string $my_action Name specified when generating the nonce
* @param string $nonce_field Form input name for the nonce
* @return boolean True if the nonce is ok
*/
function qtranxf_verify_nonce($my_action, $nonce_field = '_wpnonce') {
return empty( $_POST ) || check_admin_referer( $my_action, $nonce_field );
}

add_filter('manage_language_columns', 'qtranxf_language_columns');
add_filter('manage_posts_columns', 'qtranxf_languageColumnHeader');
add_filter('manage_posts_custom_column', 'qtranxf_languageColumn');
Expand Down
18 changes: 13 additions & 5 deletions admin/qtx_configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function qtranxf_language_form() {
</div>
<div class="form-field">
<label for="language_flag"><?php _e('Flag', 'qtranslate') ?></label>
<?php
<?php
$files = array();
$flag_dir = trailingslashit(WP_CONTENT_DIR).$q_config['flag_location'];
if($dir_handle = @opendir($flag_dir)) {
Expand Down Expand Up @@ -163,10 +163,16 @@ function qtranxf_conf() {
<h2><?php _e('Edit Language', 'qtranslate') ?></h2>
<form action="" method="post" id="qtranxs-edit-language">
<?php qtranxf_language_form() ?>
<p class="submit"><input type="submit" name="submit" value="<?php _e('Save Changes &raquo;', 'qtranslate') ?>" /></p>
<p class="submit"><input type="submit" name="submit" class="button-primary" value="<?php _e('Save Changes &raquo;', 'qtranslate') ?>" /></p>
</form>
<p class="qtranxs_notes"><a href="<?php echo admin_url('options-general.php?page=qtranslate-x#languages') ?>"><?php _e('back to configuration page', 'qtranslate') ?></a></p>
<?php } else { ?>
<?php
} else {
$my_nonce_action = 'qtranslate-x_configuration_form';
if ( ! qtranxf_verify_nonce( $my_nonce_action ) ) {
return;
}
?>
<h2><?php _e('Language Management (qTranslate Configuration)', 'qtranslate') ?></h2>
<p class="qtranxs_heading" style="font-size: small"><?php printf(__('For help on how to configure qTranslate correctly, take a look at the <a href="%1$s">qTranslate FAQ</a> and the <a href="%2$s">Support Forum</a>.', 'qtranslate')
, 'https://qtranslatexteam.wordpress.com/faq/'
Expand Down Expand Up @@ -204,6 +210,7 @@ function qtranxf_conf() {
echo '</h2>'.PHP_EOL;
?>
<form id="qtranxs-configuration-form" action="<?php echo $clean_uri;?>" method="post">
<?php wp_nonce_field($my_nonce_action); // Prevent CSRF ?>
<div class="tabs-content"><?php //<!-- tabs-container --> ?>
<?php qtranxf_admin_section_start('general');
$permalink_is_query = qtranxf_is_permalink_structure_query();
Expand Down Expand Up @@ -314,7 +321,7 @@ function qtranxf_conf() {
<td>
<label for="post_types"><?php _e('Post types enabled for translation:', 'qtranslate') ?></label><p>
<?php
$post_types = get_post_types();
$post_types = get_post_types();
foreach ( $post_types as $post_type ) {
if(!qtranxf_post_type_optional($post_type)) continue;
$post_type_off = isset($q_config['post_type_excluded']) && in_array($post_type,$q_config['post_type_excluded']);
Expand Down Expand Up @@ -643,8 +650,9 @@ function qtranxf_conf() {
<h3><?php _e('Add Language', 'qtranslate') ?></h3>
<form name="addlang" id="addlang" method="post" class="add:the-list: validate">
<?php
wp_nonce_field($my_nonce_action); // Prevent CSRF
qtranxf_language_form();
qtranxf_admin_section_end('languages',__('Add Language &raquo;', 'qtranslate'), null);
qtranxf_admin_section_end('languages',__('Add Language &raquo;', 'qtranslate'));
?>
</form></div></div></div></div></div>
<?php } ?>
Expand Down
4 changes: 2 additions & 2 deletions qtranslate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Plugin Name: qTranslate-X
Plugin URI: http://wordpress.org/plugins/qtranslate-x/
Description: Adds user-friendly and database-friendly multilingual content support.
Version: 3.4.4
Version: 3.4.6
Author: qTranslate Team
Author URI: http://qtranslatexteam.wordpress.com/about
Tags: multilingual, multi, language, admin, tinymce, Polyglot, bilingual, widget, switcher, professional, human, translation, service, qTranslate, zTranslate, mqTranslate, qTranslate Plus, WPML
Expand Down Expand Up @@ -64,7 +64,7 @@
pt(pt_PT) by netolazaro, Pedro Mendonça
pb(pt_BR) by Pedro Mendonça
ro hu by Jani Monoses
sv by bear3556, johdah
sv by bear3556, johdah
vi by hathhai
zh(zh_CN) by Junyan Chen
ua(uk) Vadym Volos (https://google.com/+VadymVolos https://wordpress.org/support/profile/vadim-v)
Expand Down
2 changes: 1 addition & 1 deletion qtranslate_widget.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class qTranslateXWidget extends WP_Widget {

function qTranslateXWidget() {
$widget_ops = array('classname' => 'qtranxs_widget', 'description' => __('Allows your visitors to choose a Language.', 'qtranslate') );
$this->WP_Widget('qtranslate', __('qTranslate Language Chooser', 'qtranslate'), $widget_ops);
parent::__construct('qtranslate', __('qTranslate Language Chooser', 'qtranslate'), $widget_ops);
}

function widget($args, $instance) {
Expand Down
4 changes: 2 additions & 2 deletions readme.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Contributors: johnclause, chineseleper, Vavooon, grafcom
Tags: multilingual, language, admin, tinymce, bilingual, widget, switcher, i18n, l10n, multilanguage, translation
Requires at least: 3.9
Tested up to: 4.3
Stable tag: 3.4.4
Stable tag: 3.4.6
License: GPLv3 or later
Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QEXEK3HX8AR6U
License URI: http://www.gnu.org/licenses/gpl-3.0.html
Expand Down Expand Up @@ -111,7 +111,7 @@ Read [migration instructions](https://qtranslatexteam.wordpress.com/migration/ "

### 3.4.2 stable ###
* Fix: i18n configuration loading on the first installation, [WP Topic](https://wordpress.org/support/topic/update-that-makes-one-see-the-site-only-a-blank-page).
* Fix for qtranxf_updateGettextDatabases.
* Fix for qtranxf_updateGettextDatabases.

### 3.4.1 stable ###
* Fix: i18n configuration loading for integrated plugins.
Expand Down