TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #585 from lovenunu/firewall

Browse Source 
Apply firewall rules only in prod environment
This commit is contained in:
Manuel Raynaud
2014-08-13 10:18:44 +02:00
parent 9a43f5aa3c ff16587acf
commit 4d79acf06d
3 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/lib/Thelia/Controller/BaseController.php
View File

@@ -201,7 +201,9 @@ abstract class BaseController extends ContainerAware
$form->bind($aBaseForm->getRequest());
if ($form->isValid()) {
if ($aBaseForm instanceof FirewallForm && !$aBaseForm->isFirewallOk()) {
$env = $this->container->getParameter("kernel.environment");
if ($aBaseForm instanceof FirewallForm && !$aBaseForm->isFirewallOk($env)) {
throw new FormValidationException(
$this->getTranslator()->trans(
"You've submitted this form too many times. Further submissions will be ignored during %time",

56
core/lib/Thelia/Form/FirewallForm.php
View File

@@ -32,41 +32,43 @@ abstract class FirewallForm extends BaseForm
const DEFAULT_TIME_TO_WAIT = 60; // 1 hour
const DEFAULT_ATTEMPTS = 6;
public function isFirewallOk()
public function isFirewallOk($env)
{
/**
* Empty the firewall
*/
$deleteTime = date("Y-m-d G:i:s", time() - $this->getConfigTime() * 60 );
$collection = FormFirewallQuery::create()
->filterByFormName($this->getName())
->filterByUpdatedAt($deleteTime, Criteria::LESS_THAN)
->find();
if ($env === "prod") {
/**
* Empty the firewall
*/
$deleteTime = date("Y-m-d G:i:s", time() - $this->getConfigTime() * 60 );
$collection = FormFirewallQuery::create()
->filterByFormName($this->getName())
->filterByUpdatedAt($deleteTime, Criteria::LESS_THAN)
->find();
$collection->delete();
$collection->delete();
$firewallInstance = FormFirewallQuery::create()
->filterByFormName($this->getName())
->filterByIpAddress($this->request->getClientIp())
->findOne()
;
$firewallInstance = FormFirewallQuery::create()
->filterByFormName($this->getName())
->filterByIpAddress($this->request->getClientIp())
->findOne()
;
if ($this->isFirewallActive() && null !== $firewallInstance) {
if ($firewallInstance->getAttempts() < $this->getConfigAttempts()) {
$firewallInstance->incrementAttempts();
if ($this->isFirewallActive() && null !== $firewallInstance) {
if ($firewallInstance->getAttempts() < $this->getConfigAttempts()) {
$firewallInstance->incrementAttempts();
} else {
/** Set updated_at at NOW() */
$firewallInstance->save();
return false;
}
} else {
/** Set updated_at at NOW() */
$firewallInstance = (new FormFirewall())
->setIpAddress($this->request->getClientIp())
->setFormName($this->getName())
;
$firewallInstance->save();
return false;
}
} else {
$firewallInstance = (new FormFirewall())
->setIpAddress($this->request->getClientIp())
->setFormName($this->getName())
;
$firewallInstance->save();
}
return true;

10
core/lib/Thelia/Tests/Form/FirewallTest.php
View File

@@ -88,11 +88,11 @@ class FirewallTest extends \PHPUnit_Framework_TestCase
if ($i > 6) {
$this->assertFalse(
$this->form->isFirewallOk()
$this->form->isFirewallOk("prod")
);
} else {
$this->assertTrue(
$this->form->isFirewallOk()
$this->form->isFirewallOk("prod")
);
}
@@ -145,7 +145,7 @@ class FirewallTest extends \PHPUnit_Framework_TestCase
public function testAutoDelete()
{
/** Add two rows */
$this->form->isFirewallOk();
$this->form->isFirewallOk("prod");
$this->form
->expects($this->any())
@@ -153,7 +153,7 @@ class FirewallTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue("test_form_firewall_2"))
;
$this->form->isFirewallOk();
$this->form->isFirewallOk("prod");
/** Set the time to 1h and 1s after the limit */
FormFirewallQuery::create()
@@ -162,7 +162,7 @@ class FirewallTest extends \PHPUnit_Framework_TestCase
->save()
;
$this->form->isFirewallOk();
$this->form->isFirewallOk("prod");
/** Assert that the table is empty */
$this->assertEquals(