From 476b71f4701e40a48b7951ee82be2c4ee1ef2df7 Mon Sep 17 00:00:00 2001
From: Polonkai Gergely <polesz@w00d5t0ck.info>
Date: Thu, 14 Jun 2012 23:38:42 +0200
Subject: [PATCH] Moved development IP address list to dev-ips.php

Signed-off-by: Gergely POLONKAI (W00d5t0ck) <polesz@w00d5t0ck.info>
---
 .gitmodules                                   | 45 +++++++++++++++++++
 vendor/assetic                                |  1 +
 vendor/bundles/JMS/SecurityExtraBundle        |  1 +
 .../bundles/Sensio/Bundle/DistributionBundle  |  1 +
 .../Sensio/Bundle/FrameworkExtraBundle        |  1 +
 vendor/bundles/Sensio/Bundle/GeneratorBundle  |  1 +
 vendor/bundles/Symfony/Bundle/AsseticBundle   |  1 +
 vendor/doctrine                               |  1 +
 vendor/doctrine-common                        |  1 +
 vendor/doctrine-dbal                          |  1 +
 vendor/metadata                               |  1 +
 vendor/monolog                                |  1 +
 vendor/swiftmailer                            |  1 +
 vendor/symfony                                |  1 +
 vendor/twig                                   |  1 +
 vendor/twig-extensions                        |  1 +
 web/app_dev.php                               |  7 ++-
 web/config.php                                |  7 ++-
 web/dev-ips.php                               |  6 +++
 19 files changed, 72 insertions(+), 8 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 vendor/assetic
 create mode 160000 vendor/bundles/JMS/SecurityExtraBundle
 create mode 160000 vendor/bundles/Sensio/Bundle/DistributionBundle
 create mode 160000 vendor/bundles/Sensio/Bundle/FrameworkExtraBundle
 create mode 160000 vendor/bundles/Sensio/Bundle/GeneratorBundle
 create mode 160000 vendor/bundles/Symfony/Bundle/AsseticBundle
 create mode 160000 vendor/doctrine
 create mode 160000 vendor/doctrine-common
 create mode 160000 vendor/doctrine-dbal
 create mode 160000 vendor/metadata
 create mode 160000 vendor/monolog
 create mode 160000 vendor/swiftmailer
 create mode 160000 vendor/symfony
 create mode 160000 vendor/twig
 create mode 160000 vendor/twig-extensions
 create mode 100644 web/dev-ips.php

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..8af9e2a
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,45 @@
+[submodule "vendor/symfony"]
+	path = vendor/symfony
+	url = http://github.com/symfony/symfony.git
+[submodule "vendor/twig"]
+	path = vendor/twig
+	url = http://github.com/fabpot/Twig.git
+[submodule "vendor/monolog"]
+	path = vendor/monolog
+	url = http://github.com/Seldaek/monolog.git
+[submodule "vendor/doctrine-common"]
+	path = vendor/doctrine-common
+	url = http://github.com/doctrine/common.git
+[submodule "vendor/doctrine-dbal"]
+	path = vendor/doctrine-dbal
+	url = http://github.com/doctrine/dbal.git
+[submodule "vendor/doctrine"]
+	path = vendor/doctrine
+	url = http://github.com/doctrine/doctrine2.git
+[submodule "vendor/swiftmailer"]
+	path = vendor/swiftmailer
+	url = http://github.com/swiftmailer/swiftmailer.git
+[submodule "vendor/assetic"]
+	path = vendor/assetic
+	url = http://github.com/kriswallsmith/assetic.git
+[submodule "vendor/twig-extensions"]
+	path = vendor/twig-extensions
+	url = http://github.com/fabpot/Twig-extensions.git
+[submodule "vendor/metadata"]
+	path = vendor/metadata
+	url = http://github.com/schmittjoh/metadata.git
+[submodule "vendor/bundles/Sensio/Bundle/FrameworkExtraBundle"]
+	path = vendor/bundles/Sensio/Bundle/FrameworkExtraBundle
+	url = http://github.com/sensio/SensioFrameworkExtraBundle.git
+[submodule "vendor/bundles/JMS/SecurityExtraBundle"]
+	path = vendor/bundles/JMS/SecurityExtraBundle
+	url = http://github.com/schmittjoh/JMSSecurityExtraBundle.git
+[submodule "vendor/bundles/Sensio/Bundle/DistributionBundle"]
+	path = vendor/bundles/Sensio/Bundle/DistributionBundle
+	url = http://github.com/sensio/SensioDistributionBundle.git
+[submodule "vendor/bundles/Sensio/Bundle/GeneratorBundle"]
+	path = vendor/bundles/Sensio/Bundle/GeneratorBundle
+	url = http://github.com/sensio/SensioGeneratorBundle.git
+[submodule "vendor/bundles/Symfony/Bundle/AsseticBundle"]
+	path = vendor/bundles/Symfony/Bundle/AsseticBundle
+	url = http://github.com/symfony/AsseticBundle.git
diff --git a/vendor/assetic b/vendor/assetic
new file mode 160000
index 0000000..d6f89a3
--- /dev/null
+++ b/vendor/assetic
@@ -0,0 +1 @@
+Subproject commit d6f89a3170c5280ad554347dc113eb25fdf00ad7
diff --git a/vendor/bundles/JMS/SecurityExtraBundle b/vendor/bundles/JMS/SecurityExtraBundle
new file mode 160000
index 0000000..b564463
--- /dev/null
+++ b/vendor/bundles/JMS/SecurityExtraBundle
@@ -0,0 +1 @@
+Subproject commit b564463433aed66e9dddad8cbb761afff5a80cb4
diff --git a/vendor/bundles/Sensio/Bundle/DistributionBundle b/vendor/bundles/Sensio/Bundle/DistributionBundle
new file mode 160000
index 0000000..7d75b22
--- /dev/null
+++ b/vendor/bundles/Sensio/Bundle/DistributionBundle
@@ -0,0 +1 @@
+Subproject commit 7d75b222c8e4ead64ff82e5c9b2fa3ba71c70cf0
diff --git a/vendor/bundles/Sensio/Bundle/FrameworkExtraBundle b/vendor/bundles/Sensio/Bundle/FrameworkExtraBundle
new file mode 160000
index 0000000..e00b525
--- /dev/null
+++ b/vendor/bundles/Sensio/Bundle/FrameworkExtraBundle
@@ -0,0 +1 @@
+Subproject commit e00b525b14784ea4f21c14945e58b4a76a530a6a
diff --git a/vendor/bundles/Sensio/Bundle/GeneratorBundle b/vendor/bundles/Sensio/Bundle/GeneratorBundle
new file mode 160000
index 0000000..55ad81e
--- /dev/null
+++ b/vendor/bundles/Sensio/Bundle/GeneratorBundle
@@ -0,0 +1 @@
+Subproject commit 55ad81e65a1023ae07c67075ca49c55556e047bf
diff --git a/vendor/bundles/Symfony/Bundle/AsseticBundle b/vendor/bundles/Symfony/Bundle/AsseticBundle
new file mode 160000
index 0000000..ca447e2
--- /dev/null
+++ b/vendor/bundles/Symfony/Bundle/AsseticBundle
@@ -0,0 +1 @@
+Subproject commit ca447e29f8ee2d38643f2f3a9faae1164aa708fb
diff --git a/vendor/doctrine b/vendor/doctrine
new file mode 160000
index 0000000..91ffd30
--- /dev/null
+++ b/vendor/doctrine
@@ -0,0 +1 @@
+Subproject commit 91ffd30f5210135c9aa43451ef721f28d7e399d9
diff --git a/vendor/doctrine-common b/vendor/doctrine-common
new file mode 160000
index 0000000..8083888
--- /dev/null
+++ b/vendor/doctrine-common
@@ -0,0 +1 @@
+Subproject commit 80838882abc04270fb9bc5812da4ab64e2ee3f88
diff --git a/vendor/doctrine-dbal b/vendor/doctrine-dbal
new file mode 160000
index 0000000..2cac730
--- /dev/null
+++ b/vendor/doctrine-dbal
@@ -0,0 +1 @@
+Subproject commit 2cac730bf48b384e3fdb4daf7d7847e3e42c5684
diff --git a/vendor/metadata b/vendor/metadata
new file mode 160000
index 0000000..dbfbb15
--- /dev/null
+++ b/vendor/metadata
@@ -0,0 +1 @@
+Subproject commit dbfbb15b3ffdf96c5ff14e5cd4451d78a7083a36
diff --git a/vendor/monolog b/vendor/monolog
new file mode 160000
index 0000000..da33c84
--- /dev/null
+++ b/vendor/monolog
@@ -0,0 +1 @@
+Subproject commit da33c84d07607d5a0ecb1c629fbaa9ae60554542
diff --git a/vendor/swiftmailer b/vendor/swiftmailer
new file mode 160000
index 0000000..d33d54c
--- /dev/null
+++ b/vendor/swiftmailer
@@ -0,0 +1 @@
+Subproject commit d33d54cc8a081b0b85734744936ede1ba230dd64
diff --git a/vendor/symfony b/vendor/symfony
new file mode 160000
index 0000000..7c91ee5
--- /dev/null
+++ b/vendor/symfony
@@ -0,0 +1 @@
+Subproject commit 7c91ee5755499bc3be26ed4ff5c547db58e32c20
diff --git a/vendor/twig b/vendor/twig
new file mode 160000
index 0000000..4c9e394
--- /dev/null
+++ b/vendor/twig
@@ -0,0 +1 @@
+Subproject commit 4c9e394c388a88e15b125175587b9d8a0adc17c2
diff --git a/vendor/twig-extensions b/vendor/twig-extensions
new file mode 160000
index 0000000..feb6d3f
--- /dev/null
+++ b/vendor/twig-extensions
@@ -0,0 +1 @@
+Subproject commit feb6d3f10c411e2631997c0a905aa581c80305c1
diff --git a/web/app_dev.php b/web/app_dev.php
index 48b9afd..717b6c1 100644
--- a/web/app_dev.php
+++ b/web/app_dev.php
@@ -1,5 +1,7 @@
 <?php
 
+require 'dev-ips.php';
+
 // if you don't want to setup permissions the proper way, just uncomment the following PHP line
 // read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information
 //umask(0000);
@@ -8,10 +10,7 @@
 // feel free to remove this, extend it, or make something more sophisticated.
 if (isset($_SERVER['HTTP_CLIENT_IP'])
     || isset($_SERVER['HTTP_X_FORWARDED_FOR'])
-    || !in_array(@$_SERVER['REMOTE_ADDR'], array(
-        '127.0.0.1',
-        '::1',
-    ))
+    || !in_array(@$_SERVER['REMOTE_ADDR'], $dev_ips)
 ) {
     header('HTTP/1.0 403 Forbidden');
     exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');
diff --git a/web/config.php b/web/config.php
index 4ad46b9..d2eb342 100644
--- a/web/config.php
+++ b/web/config.php
@@ -1,13 +1,12 @@
 <?php
 
+require 'dev-ips.php';
+
 if (!isset($_SERVER['HTTP_HOST'])) {
     exit('This script cannot be run from the CLI. Run it from a browser.');
 }
 
-if (!in_array(@$_SERVER['REMOTE_ADDR'], array(
-    '127.0.0.1',
-    '::1',
-))) {
+if (!in_array(@$_SERVER['REMOTE_ADDR'], $dev_ips)) {
     header('HTTP/1.0 403 Forbidden');
     exit('This script is only accessible from localhost.');
 }
diff --git a/web/dev-ips.php b/web/dev-ips.php
new file mode 100644
index 0000000..67bc669
--- /dev/null
+++ b/web/dev-ips.php
@@ -0,0 +1,6 @@
+<?php
+$dev_ips = array(
+	'127.0.0.1',
+	'::1',
+);
+