Update mod_cloudflare to 1.2.0: unify source file, add autotools, upd…

…ate CloudFlare IP ranges to latest

ChangeLog

@@ -0,0 +1,15 @@
+* Mar 20 2013 CloudFlare Inc <[email protected]> - 1.2.0
+- Refactor for Apache 2.4, utilize autotools for RPM/DEB builds
+
+* Aug 30 2012 CloudFlare Inc <[email protected]> - 1.1.2
+- Bugfix for intermittent segfaults under some conditions.
+- Pulled from remoteip codebase.
+
+* Jun 03 2012 CloudFlare Inc <[email protected]> - 1.1.1
+- Bugfix for DenyAll behavior when CF-Connecting-IP header not available
+
+* May 20 2012 CloudFlare Inc <[email protected]> - 1.1.0
+- .deb and .rpm release tested on Debian 6.0, Ubuntu 8.04, Ubuntu 10.04,
+CentOS 5, CentOS 6, RHEL 5, RHEL 6, OpenSuSE 11.4, OpenSuSE 12.1 all on 32-bit
+and 64-bit architectures. These were produced on Fedora 16, Ubuntu 12.04 and
+OpenSuSE 12.1

LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Makefile.in

@@ -0,0 +1,46 @@
+srcdir = @srcdir@
+
+DESTDIR =
+LIBEXECDIR = @LIBEXECDIR@
+
+CPPFLAGS = @CPPFLAGS@
+CFLAGS = @CFLAGS@
+LDFLAGS = @LDFLAGS@
+LDLIBS = @LDLIBS@
+
+APXS = @APXS@
+
+all : mod_cloudflare.la
+
+mod_cloudflare.la : mod_cloudflare.c
+	$(APXS) -c $(CPPFLAGS) $(CFLAGS) $(srcdir)/mod_cloudflare.c $(LDFLAGS) $(LDLIBS)
+
+$(DESTDIR)$(LIBEXECDIR) :
+	mkdir -p $@
+
+install : all $(DESTDIR)$(LIBEXECDIR)
+	$(APXS) -i -S LIBEXECDIR=$(DESTDIR)$(LIBEXECDIR) -n 'mod_cloudflare' $(srcdir)/mod_cloudflare.la
+
+clean :
+	-rm -f $(srcdir)/.libs/*
+	-rm -f $(srcdir)/*.o
+	-rm -f $(srcdir)/*.lo
+	-rm -f $(srcdir)/*.la
+	-rm -f $(srcdir)/*.slo
+	-rm -rf $(srcdir)/.libs
+	-rm -rf autom4te.cache
+	-rm -f config.log config.status
+
+distclean : clean
+	-rm -f Makefile
+
+gitclean : distclean
+	-rm -f configure src-package.tar.gz
+
+src-package:
+	@tar cz *.c configure.ac Makefile.in LICENSE ChangeLog README > $@.tar.gz 
+
+$(srcdir)/configure: configure.ac
+	cd '$(srcdir)' && autoconf && ./configure
+
+Makefile: Makefile.in configure

README

@@ -1,65 +1,64 @@
-Copyright CloudFlare 2012 cloudflare.com
+mod_cloudflare for Apache
 
-======> mod_cloudflare.c
+Copyright CloudFlare Inc. 2013
 
-Based on mod_remoteip.c, this apache extension will replace the remote_ip variable in user's logs with the correct remote_ip sent from CloudFlare. 
-This also does authentication, only performing the switch for requests originating from 204.93.173.0/24 (by default).
+## mod_cloudflare.c ##
 
-To install: 
+Based on mod_remoteip.c, this Apache extension will replace the remote_ip
+variable in user's logs with the correct remote IP sent from CloudFlare. The
+module only performs the IP substitution for requests originating from
+CloudFlare IPs by default.
 
-# apxs2 -a -i -c mod_cloudflare.c
+To install, either run apxs2 directly against the .c source file:
 
-No further configuration is needed. However, if you wish to override the default values, the following directives are exposed:
+    $ apxs2 -a -i -c mod_cloudflare.c
 
-* CloudFlareRemoteIPHeader 
+An alternative way to install is to use GNU autotools, which requires that
+autoconf and automake already be installed:
 
-This specifies the header which contains the original IP. Default:
-
-CloudFlareRemoteIPHeader CF-Connecting-IP
+    $ autoconf
+    $ ./configure
+    $ make
+    $ make install
 
-* CloudFlareRemoteIPTrustedProxy 
+No further configuration is needed. However, if you wish to override the
+default values, the following directives are exposed:
 
-This is the IP range from which we will allow the CloudFlareRemoteIPHeader to be used from. See https://www.cloudflare.com/wiki/What_are_the_CloudFlare_IP_address_ranges.
+### CloudFlareRemoteIPHeader ###
 
-Note that on some Debian systems, you may have to add a LoadModule directive manually. This should look like:
-
-LoadModule cloudflare_module /usr/lib/apache2/modules/mod_cloudflare.so
+This specifies the header which contains the original IP. Default:
 
-Replace /usr/lib/apache2/modules/mod_cloudflare.so with the path to mod_cloudflare.so on your system.
+    CloudFlareRemoteIPHeader CF-Connecting-IP
 
-If you cannot find apxs or apxs2, on a Debian or Ubuntu distro you can install this tool with:
+### CloudFlareRemoteIPTrustedProxy ###
 
-# apt-get install apache2-prefork-dev
+This is the IP range from which we will allow the CloudFlareRemoteIPHeader to
+be used from. See https://www.cloudflare.com/wiki/What_are_the_CloudFlare_IP_address_ranges
+for a complete list.
 
-NOTES: 
+Note that on some systems, you may have to add a LoadModule directive
+manually. This should look like:
 
-*) If mod_cloudflare and mod_remoteip are enabled on the same web server, the server will crash if they both try to set the remote IP to a different value.
-*) Enableing mod_cloudflare will not effect the performance of Apache in any noticable maner. AB testing both over LAN and WAN show no equalilent numbers with and without mod_cloudflare.
-*) If you like, you may also add the directive DenyAllButCloudFlare. This will result in all requests from IPs which are not in the CloudFlareRemoteIPTrustedProxy range being denied with a status of 403.
+    LoadModule cloudflare_module /usr/lib/apache2/modules/mod_cloudflare.so
 
-Packaging
-The packaging directory contains a makefile to run the package process. For each class of system you wish to target, run the approriate rules:
-  debian (& ubuntu)
-      sudo make pkg-deb-system-prep
-      make pkg-deb
+Replace /usr/lib/apache2/modules/mod_cloudflare.so with the path to
+mod_cloudflare.so on your system.
 
-  redhat (& centos)
-      sudo make pkg-rpm-system-prep
-      make pkg-rpm
+If you cannot find apxs or apxs2, install apache2-dev on Debian and Ubuntu, or
+httpd-devel on Red Hat and CentOS:
 
-  suse
-      sudo make pkg-rpm-suse-system-prep
-      make pkg-rpm-suse
+    $ apt-get install apache2-dev
+    $ yum install httpd-devel
 
-Testing
-To test a package run the test_debian, test_rpm or test_rpm.suse scripts on the target machine:
-test_debian.sh libapache2-mod-cloudflare_1.1_i386.deb
-test_rpm.suse.sh mod_cloudflare-1.1.0-3.fc16.x86_64.rpm
-test_rpm.suse.sh mod_cloudflare-1.1.0-3.x86_64.suse.rpm
+NOTES:
 
+- If mod_cloudflare and mod_remoteip are enabled on the same web server, the
+server will crash if they both try to set the remote IP to a different value.
 
-Releases
-2012-08-30 1.1.2 Bugfix for intermittent segfaults under some conditions. Pulled from remoteip codebase.
-2012-06-03 1.1.1 Bugfix for DenyAll behavior when CF-Connecting-IP header not available.
-2012-05-20 1.1.0 .deb and .rpm release tested on Debian 6.0, Ubuntu 8.04, Ubuntu 10.04, CentOS 5, CentOS 6, RHEL 5, RHEL 6, OpenSuSE 11.4, OpenSuSE 12.1 all on 32-bit and 64-bit architectures. These were produced on Fedora 16, Ubuntu 12.04 and OpenSuSE 12.1
+- Enabling mod_cloudflare will not effect the performance of Apache in any
+noticeable manner. AB testing both over LAN and WAN show no equivalent numbers
+with and without mod_cloudflare.
 
+- If you like, you may also add the directive DenyAllButCloudFlare. This will result 
+in all requests from IPs which are not in the CloudFlareRemoteIPTrustedProxy range 
+being denied with a status of 403.