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.

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

Fix an instance of xss #677

Closed
wants to merge 6 commits into from
Closed

Fix an instance of xss #677

wants to merge 6 commits into from

Conversation

greggles
Copy link
Contributor

@greggles greggles commented Oct 9, 2015

Hi,

There's an xss issue in https://github.com/minkphp/Mink/blob/master/driver-testsuite/web-fixtures/issue130.php

That issue was highlighted in an email to full disclosure at http://seclists.org/fulldisclosure/2015/Oct/42

The Drupal project attempts to solve this xss issue with an .htaccess file, but that's not very reliable. Another solution is to keep Mink code outside of the webroot, but that's not always possible on all servers.

It would be ideal, in my opinion, to just filter the text.

I did a quick grep to look for other similar problems and it seems there are some:

 ✗ grep -r echo . | grep \$_
./driver-testsuite/web-fixtures/advanced_form_post.php:echo str_replace('>', '', var_export($_POST, true)) . "\n";
./driver-testsuite/web-fixtures/advanced_form_post.php:    echo $_FILES['about']['name'] . "\n";
./driver-testsuite/web-fixtures/advanced_form_post.php:    echo file_get_contents($_FILES['about']['tmp_name']);
./driver-testsuite/web-fixtures/basic_form_post.php:    <h1>Anket for <?php echo $_POST['first_name'] ?></h1>
./driver-testsuite/web-fixtures/basic_form_post.php:    <span id="first">Firstname: <?php echo $_POST['first_name'] ?></span>
./driver-testsuite/web-fixtures/basic_form_post.php:    <span id="last">Lastname: <?php echo $_POST['last_name'] ?></span>
./driver-testsuite/web-fixtures/basic_get_form.php:        <?php echo isset($_GET['q']) && $_GET['q'] ? $_GET['q'] : 'No search query' ?>
./driver-testsuite/web-fixtures/cookie_page2.php:    Previous cookie: <?php echo isset($_COOKIE['srvr_cookie']) ? $_COOKIE['srvr_cookie'] : 'NO'; ?>
./driver-testsuite/web-fixtures/issue130.php:        echo '<strong>'.htmlspecialchars($_SERVER['HTTP_REFERER'], ENT_QUOTES, 'UTF-8');).'</strong>';
./driver-testsuite/web-fixtures/issue140.php:    echo $_COOKIE["tc"];
./driver-testsuite/web-fixtures/print_cookies.php:    <?php echo str_replace('>', '', var_export($_COOKIE, true)); ?>

I didn't look into fixing any more of them.

@aik099
Copy link
Member

aik099 commented Oct 9, 2015

The Mink test suite passes, but since file is located in driver test suite, then each driver needs to use it and pass as well.

@stof
Copy link
Member

stof commented Oct 9, 2015

Yeah, the Mink testsuite itself does not rely on these files at all.

@greggles
Copy link
Contributor Author

greggles commented Oct 9, 2015

So...if I patched the instances that seem clearly like XSS would that be OK to merge or are there other people we should ping to get their feedback on these changes (at least advise them it's coming)?

@greggles
Copy link
Contributor Author

This is some rather interesting code ;)

I'm pretty sure the htmlspecialchars on the file contents will break some uses of that form, but I have a hard time imagining the purpose of that form. When trying to sanitize synthetic code it seems natural that the outputs will be rather synthetic as well - as long as the behavior is well known it seems fine for any consuming code to modify itself to be more synthetic as well.

@stof
Copy link
Member

stof commented Oct 12, 2015

@greggles try running the MinkSelenium2Driver testsuite using this modified version of the testsuite (start the webserver in the modified version rather than the current version of fixtures) to see whether the driver testsuite still works

@@ -13,11 +13,15 @@
}

$_POST['agreement'] = isset($_POST['agreement']) ? 'on' : 'off';
foreach ($_POST as $key => $value) {
unset($_POST[$key]);
$_POST[htmlspecialchars($key, ENT_QUOTES, 'UTF-8')] = htmlspecialchars($value, ENT_QUOTES, 'UTF-8');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rather than replacing $_POST, I would rather use a separate array if we go this way

@greggles
Copy link
Contributor Author

Sadly I'm not currently setup to run MinkSelenium2Driver. Not sure I'll be able to do it.

@stof
Copy link
Member

stof commented Oct 12, 2015

@greggles this is not complex: you just need to have java and firefox installed locally, and to download the selenium jar (well, you also need to clone the driver repo and run composer install in it, but you should be setup for that already)

@aik099
Copy link
Member

aik099 commented Oct 12, 2015

@stof, maybe we should explain on each driver repo page how to setup local development in detail. For Selenium it would be:

  1. going to http://www.seleniumhq.org/download/
  2. downloading the server JAR file
  3. running it locally using java -jar downloaded_file.jar
  4. cloning repo
  5. installing composer dependencies
  6. creating phpunit.xml from phpunit.xml.dist
  7. putting correct local/remote urls to location of cloned repo on web server

@stof
Copy link
Member

stof commented Oct 12, 2015

@aik099 this would be a good idea

@aik099
Copy link
Member

aik099 commented Oct 20, 2015

I've created corresponding tasks in each driver repo so we don't forget to do this at some point.

ksort($_POST);
echo str_replace('>', '', var_export($_POST, true)) . "\n";
foreach ($_POST as $key => $value) {
$post_for_printing[htmlspecialchars($key, ENT_QUOTES, 'UTF-8')] = htmlspecialchars($value, ENT_QUOTES, 'UTF-8');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is broken in case the value is an array (for a multiple select for instance)

@barryvdh
Copy link
Contributor

Another solution for most cases: exclude the testsuite from the archives; as they aren't needed for other projects, right? See #691

@aik099
Copy link
Member

aik099 commented Feb 24, 2016

This would only help if archives are used for install this package.

@barryvdh
Copy link
Contributor

Yes, which is most cases. Not saying you shouldn't fix this issue also :)

@aik099
Copy link
Member

aik099 commented Feb 24, 2016

Absolutely (about issue needs to be fixed). I saw people using Mink for crawling purposes in which case tests might end up in production as well.

Unfortunately @greggles seems to have abandoned this PR (I see no changes requested during code review being made).

@aik099
Copy link
Member

aik099 commented Feb 24, 2016

As for implementation to avoid massive code duplication I'm proposing to create a function like htmlspecialchars_array that would recursively process any data that comes in (including arrays) so that we don't need to:

  • repeat code in every fixture file
  • pass 2nd+ parameters to htmlspecialchars call

Then we can make this function available across test suite (e.g. via Composer's autoload-dev functionality).

@barryvdh
Copy link
Contributor

But the tests are autoload only in dev, so that wouldn't work properly right? Imho package specific tests are not public API and should not be relied upon.

@aik099
Copy link
Member

aik099 commented Feb 24, 2016

Ah, you're right, that autoload-dev works on that repo only and doesn't, when repo is included as dependency on other repo.

@barryvdh
Copy link
Contributor

Okay, so removing the driver-testsuite isn't an option apparently, so I suggest it either gets moved to a seperate issue soonish, or the XSS gets fixed (also soonish ;))

@aik099
Copy link
Member

aik099 commented Feb 24, 2016

As I've mentioned before issue fixing is the right way, but PR author has abandoned it. If you're willing you can create your PR, that will replace this one.

@barryvdh
Copy link
Contributor

I have zero knowledge of Mink. I just find it odd that a XSS issue is known for months, but no action is taken by the maintainers of this repo, even if the person who reported it abandoned the issue.

@stof
Copy link
Member

stof commented Feb 24, 2016

@barryvdh the question is why you are installing vendors inside the webroot though.

@barryvdh
Copy link
Contributor

I'm not, but you need to ask Drupal that ;)
Coming from this Drupal issue: https://www.drupal.org/node/2585165

@greggles
Copy link
Contributor Author

I just tried to address the feedback on the PR. Scrutinizer has said 2 new style issues were introduced, but when I look at their website it seems the issues are in files that were not modified in this PR, so I'm not sure what needs to be fixed (probably I can't read that output).

I don't use Mink. I was trying to fix a bug that affected Drupal 8 (which I also don't currently use).

It doesn't feel great to hear comments that I abandoned this, but it is accurate that I stopped working on it. I'd say the reason I stopped working was 2 fold:

  • the barriers to contribution are quite high (requires me to download multiple pieces of software I don't generally need)
  • my motivation was fairly low (given I don't use the software)

Guides for new contributors would help to lower the barrier. Seems there's been no progress on those? If you could automatically run the tests you're asking me to run that would also lower the barrier.

@greggles
Copy link
Contributor Author

BTW, Drupal includes it in the webroot because that's how most people who download Drupal expect to use the file they've downloaded: Extract a tarball it into the webroot and installation is done. I know that's considered by "modern" php folks to be an outdated philosophy, but it's the reality that most people running PHP sites expect.

There aren't (yet) any good guides about how to modify an installation to move vendor outside the webroot.

@aik099
Copy link
Member

aik099 commented Feb 24, 2016

It doesn't feel great to hear comments that I abandoned this, but it is accurate that I stopped working on it.

Sorry about that, but when you realized that you won't be able to continue with a PR development I recommend informing maintainers so that they can reassign it to another contributor. In this case you haven't replied at all (for 5 months) and maintainers (including me) had no idea if PR is abandoned or just delayed.

@aik099
Copy link
Member

aik099 commented Feb 24, 2016

I just tried to address the feedback on the PR. Scrutinizer has said 2 new style issues were introduced, but when I look at their website it seems the issues are in files that were not modified in this PR, so I'm not sure what needs to be fixed (probably I can't read that output).

That may happen due the fact, that used standard have changed since last inspection was run and therefore errors on non-changed files were raised. You can safely ignore those.

I don't use Mink. I was trying to fix a bug that affected Drupal 8 (which I also don't currently use).

I see.

  • the barriers to contribution are quite high (requires me to download multiple pieces of software I don't generally need)
  • my motivation was fairly low (given I don't use the software)

As a maintainer I'm a bit biased, but I do understand that it's hard to get new contributors on board due specifics of installing the software.

Guides for new contributors would help to lower the barrier. Seems there's been no progress on those?

Unfortunately. I guess we (as maintainers) are expecting for somebody else to change the guidelines as they see fit to make contribution easier.

If you could automatically run the tests you're asking me to run that would also lower the barrier.

I can. Please made necessary changes and at least make sure there are no PHP syntax errors.

@greggles
Copy link
Contributor Author

I fixed the syntax error - sorry about that.

I don't currently plan to work more on this PR.

@aik099
Copy link
Member

aik099 commented Feb 27, 2016

Closing in favor of #694 , where I've applied all code from this PR and improved it further to reduce duplication in escaping code.

@aik099 aik099 closed this Feb 27, 2016
@barryvdh
Copy link
Contributor

barryvdh commented Mar 9, 2016

@aik099 Thanks for finishing this!

@aik099
Copy link
Member

aik099 commented Mar 9, 2016

You're welcome. At least now people having vendor folder inside DocumentRoot won't have any XSS-related problems.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants