summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org>2020-03-20 16:56:01 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2020-03-21 13:37:37 (GMT)
commit38b9f8aecf80d5e002e3684b72a17cd0dafe9e33 (patch) (side-by-side diff)
tree25d70d5a7338c2ad80eebfbbd6e794d28dd96ab9
downloadvmod-remoteip-38b9f8aecf80d5e002e3684b72a17cd0dafe9e33.tar.gz
vmod-remoteip-38b9f8aecf80d5e002e3684b72a17cd0dafe9e33.tar.bz2
Initial commit
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--.gitignore29
-rw-r--r--.gitmodules3
-rw-r--r--AUTHORS1
-rw-r--r--COPYING674
-rw-r--r--Makefile.am23
-rw-r--r--NEWS33
-rw-r--r--README95
m---------acvmod0
-rwxr-xr-xbootstrap9
-rw-r--r--configure.ac61
-rw-r--r--src/.gitignore5
-rw-r--r--src/Makefile.am53
-rw-r--r--src/vmod_remoteip.c370
-rw-r--r--src/vmod_remoteip.vcc62
-rw-r--r--tests/.gitignore6
-rw-r--r--tests/Makefile.am73
-rw-r--r--tests/atlocal.in3
-rw-r--r--tests/ipv4found.at33
-rw-r--r--tests/ipv4notfound.at33
-rw-r--r--tests/ipv6found.at33
-rw-r--r--tests/ipv6notfound.at33
-rw-r--r--tests/testsuite.at7
22 files changed, 1639 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c6b48ed
--- a/dev/null
+++ b/.gitignore
@@ -0,0 +1,29 @@
+*.a
+*.la
+*.lo
+*.o
+*.tar.*
+*~
+.deps
+.emacs*
+.gdbinit
+.libs
+ABOUT-NLS
+ChangeLog
+INSTALL
+Makefile
+Makefile.in
+TAGS
+aclocal.m4
+autom4te.cache/
+build-aux
+config.h
+config.h.in
+config.log
+config.status
+configure
+core
+libtool
+m4
+stamp-h1
+tmp/
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..00ae21c
--- a/dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "acvmod"]
+ path = acvmod
+ url = git://git.gnu.org.ua/acvmod.git
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..c5a9530
--- a/dev/null
+++ b/AUTHORS
@@ -0,0 +1 @@
+Sergey Poznyakoff <gray@gnu.org>
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..94a9ed0
--- a/dev/null
+++ b/COPYING
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..5d55040
--- a/dev/null
+++ b/Makefile.am
@@ -0,0 +1,23 @@
+# This file is part of vmod_remoteip.
+# Copyright (C) 2020 Sergey Poznyakoff
+#
+# Vmod_remoteip is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# Vmod_remoteip is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with vmod_remoteip. If not, see <http://www.gnu.org/licenses/>.
+
+ACLOCAL_AMFLAGS = -I m4 -I acvmod
+
+SUBDIRS = src tests
+
+include acvmod/top.am
+
+
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..b167c83
--- a/dev/null
+++ b/NEWS
@@ -0,0 +1,33 @@
+vmod_remoteip -- history of user-visible changes. 2020-03-21
+See the end of file for copying conditions.
+
+Please send vmod_remoteip bug reports to <gray@gnu.org>
+
+Version 0.90 (Git)
+
+Initial release
+
+=========================================================================
+Copyright information:
+
+Copyright (C) 2020 Sergey Poznyakoff
+
+ Permission is granted to anyone to make or distribute verbatim copies
+ of this document as received, in any medium, provided that the
+ copyright notice and this permission notice are preserved,
+ thus giving the recipient permission to redistribute in turn.
+
+ Permission is granted to distribute modified versions
+ of this document, or of portions of it,
+ under the above conditions, provided also that they
+ carry prominent notices stating who last changed them.
+
+Local variables:
+mode: outline
+paragraph-separate: "[ ]*$"
+eval: (add-hook 'write-file-hooks 'time-stamp)
+time-stamp-start: "changes. "
+time-stamp-format: "%:y-%02m-%02d"
+time-stamp-end: "\n"
+end:
+
diff --git a/README b/README
new file mode 100644
index 0000000..18e8653
--- a/dev/null
+++ b/README
@@ -0,0 +1,95 @@
+Vmod_remoteip
+=============
+
+Overview
+--------
+
+This modules is for Varnish Cache what mod_remoteip is for Apache. It
+determines the actual client IP address for the connection, using the
+useragent IP address list presented by a proxies or a load balancer
+via the request headers and a preconfigred list of trusted IP
+addresses. For example, if your Varnish server works behind a load
+balancer or yet another reverse proxy (such as pound or haproxy to
+handle the TLS connection), you can use this module to get the real
+incoming connection IP address from the "X-Forwarded-For" header.
+
+Example
+-------
+
+An example of using this module:
+
+ import std;
+ import remoteip;
+
+ sub vcl_init {
+ remoteip.init("192.0.2.1, 127.0.0.0/8");
+ }
+
+ acl allowed {
+ "127.0.0.1";
+ ...
+ }
+
+ sub vcl_recv {
+ set resp.http.x-real-ip = remoteip.get(resp.http.X-Forwarded-For);
+ if (std.ip(resp.http.x-real-ip) ~ allowed) {
+ ...
+ }
+ }
+
+Installation
+------------
+
+In order to compile the package you need to have installed
+varnishd and varnishapi package. The module has been tested with
+Varnish version 6.3.1.
+
+Supposing that condition is met, run:
+
+ ./configure
+
+If your system offers Python versions 2.x and 3.x, it is quite often that
+version 2.x is used by default. In that case, we recommend to explicitly
+require version 3.x, as shown in this example:
+
+ ./configure PYTHON=python3
+
+Otherwise, the configure script should be able to automatically find
+the necessary components. In case it doesn't, tweak the configuration
+variables as necessary. The most important one is PKG_CONFIG_PATH,
+which contains a path (in the UNIX sense) where the .pc files are
+located. It should contain a directory where the 'varnishapi.pc' file
+lives. Example usage:
+
+ ./configure PKG_CONFIG_PATH=/opt/varnish/lib/pkgconfig:$PKG_CONFIG_PATH
+
+Please read the file INSTALL for a detailed discussion of available variables
+and command line options.
+
+Once configured, do
+
+ make
+
+This will build the module. After this step you can optionally run
+'make test' to test the package.
+
+Finally, run the following command as root:
+
+ make install
+
+Documentation
+-------------
+
+The manual page vmod_remoteip(3) will be available after a successful
+install. To read it without actually installing the module, run
+`man src/vmod_remoteip.3'.
+
+An online copy of the documentation is available from
+http://ps.gnu.org.ua/software/vmod-remoteip.
+
+* Bug reporting
+
+Send bug reports and suggestions to <gray@gnu.org>
+
+
+
diff --git a/acvmod b/acvmod
new file mode 160000
+Subproject 5b214e3d72f9e261a37cf31deb41e7f8a61a181
diff --git a/bootstrap b/bootstrap
new file mode 100755
index 0000000..1c8ddcb
--- a/dev/null
+++ b/bootstrap
@@ -0,0 +1,9 @@
+#!/bin/sh
+for dir in m4 build-aux
+do
+ test -d $dir || mkdir $dir
+done
+git submodule init
+git submodule update
+> ChangeLog
+autoreconf -f -i -s
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..0545796
--- a/dev/null
+++ b/configure.ac
@@ -0,0 +1,61 @@
+# This file is part of vmod_remoteip.
+# Copyright (C) 2017-2018 Sergey Poznyakoff
+#
+# Vmod_remoteip is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# Vmod_remoteip is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with vmod_remoteip. If not, see <http://www.gnu.org/licenses/>.
+
+AC_PREREQ(2.69)
+AC_INIT([vmod-remoteip], [0.90], [gray@gnu.org])
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_SRCDIR(src/vmod_remoteip.vcc)
+AM_CONFIG_HEADER(config.h)
+
+AC_SUBST([AC_VMOD_BASENAME],[remoteip])
+AC_CANONICAL_SYSTEM
+AC_LANG(C)
+
+AM_INIT_AUTOMAKE([1.14 gnu tar-ustar silent-rules])
+AM_SILENT_RULES([yes])
+
+AC_GNU_SOURCE
+AC_PROG_CC
+AC_PROG_CC_STDC
+if test "x$ac_cv_prog_cc_c99" = xno; then
+ AC_MSG_ERROR([could not find a C99 compatible compiler])
+fi
+AC_PROG_CPP
+
+AC_PROG_INSTALL
+AC_PROG_LIBTOOL
+AC_PROG_MAKE_SET
+
+# Checks for header files.
+AC_HEADER_STDC
+
+# Check for functions
+
+AM_VARNISHAPI([6.0],[6.3.1])
+AC_DEFINE_UNQUOTED([VARNISHAPI_MAJOR],[$VARNISHAPI_MAJOR],
+ [Varnish API major version number])
+
+AC_CONFIG_TESTDIR(tests)
+AC_CONFIG_FILES([tests/Makefile tests/atlocal])
+AM_MISSING_PROG([AUTOM4TE], [autom4te])
+
+AC_CONFIG_FILES([
+ Makefile
+ src/Makefile
+])
+AC_OUTPUT
+
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 0000000..b5c2634
--- a/dev/null
+++ b/src/.gitignore
@@ -0,0 +1,5 @@
+vcc_if.c
+vcc_if.h
+*.rst
+*.man
+*.3
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..a3747ef
--- a/dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,53 @@
+# This file is part of vmod_remoteip.
+# Copyright (C) 2017-2018 Sergey Poznyakoff
+#
+# Vmod_remoteip is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# Vmod_remoteip is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with vmod_remoteip. If not, see <http://www.gnu.org/licenses/>.
+
+AM_CPPFLAGS=\
+ $(VARNISHAPI_CFLAGS)
+
+vmoddir = $(VMODDIR)
+vmod_LTLIBRARIES = libvmod_remoteip.la
+
+libvmod_remoteip_la_LDFLAGS = -module -export-dynamic -avoid-version
+
+libvmod_remoteip_la_SOURCES = \
+ vmod_remoteip.c
+
+nodist_libvmod_remoteip_la_SOURCES = vcc_if.c vcc_if.h
+
+vmod_remoteip.lo: vcc_if.h
+
+CLEANFILES = vcc_if.c vcc_if.h *.rst
+
+vmodtoolargs = --strict
+vccfile = $(top_srcdir)/src/vmod_remoteip.vcc
+
+vcc_if.c vcc_if.h: $(vmodtool) $(vccfile)
+ $(AM_V_GEN)$(PYTHON) $(VARNISHAPI_VMODTOOL) $(vmodtoolargs) $(vccfile)
+
+EXTRA_DIST = \
+ vmod_remoteip.vcc\
+ vmod_remoteip.man.rst\
+ vmod_remoteip.rst
+
+dist_man_MANS=vmod_remoteip.3
+
+DISTCLEANFILES=vmod_remoteip.3
+
+vmod_remoteip.3: vmod_remoteip.man.rst
+ @$(abs_top_srcdir)/build-aux/missing rst2man.py \
+ vmod_remoteip.man.rst > vmod_remoteip.3
+
+
diff --git a/src/vmod_remoteip.c b/src/vmod_remoteip.c
new file mode 100644
index 0000000..528b0a4
--- a/dev/null
+++ b/src/vmod_remoteip.c
@@ -0,0 +1,370 @@
+/* This file is part of vmod_remoteip.
+ * Copyright (C) 2020 Sergey Poznyakoff
+ *
+ * Vmod_remoteip is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * Vmod_remoteip is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with vmod_remoteip. If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <config.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <syslog.h>
+#include <ctype.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+
+#include <cache/cache.h>
+#include <vcl.h>
+#include <vcc_if.h>
+#include <vqueue.h>
+#ifdef VPFX
+# define VEVENT(a) VPFX(a)
+#else
+/* For compatibility with varnish prior to 6.2 */
+# define VEVENT(a) a
+#endif
+
+/* Max. number of bytes in an IPv6 address */
+#define MU_INADDR_BYTES 16
+
+/* CIDR representation */
+struct cidr {
+ int family; /* Address family */
+ int len; /* Number of bytes in the address */
+ unsigned char address[MU_INADDR_BYTES];
+ unsigned char netmask[MU_INADDR_BYTES];
+ VSLIST_ENTRY(cidr) next;
+};
+
+typedef VSLIST_HEAD(,cidr) CIDRHEAD;
+
+/* Returns 1 if ADDR is a valid string representation of IPv4 address */
+static int
+str_is_ipv4(const char *addr, size_t len)
+{
+ int dot_count = 0;
+ int digit_count = 0;
+
+ for (; len; addr++, len--) {
+ if (!isascii(*addr))
+ return 0;
+ if (*addr == '.') {
+ if (++dot_count > 3)
+ break;
+ digit_count = 0;
+ }
+ else if (!(isdigit(*addr) && ++digit_count <= 3))
+ return 0;
+ }
+ return (dot_count == 3);
+}
+
+#define PFXSTR_IPV4_MAPPED "::ffff:"
+#define PFXLEN_IPV4_MAPPED (sizeof PFXSTR_IPV4_MAPPED - 1)
+
+static int
+str_is_ipv4mapped(const char *addr, size_t len)
+{
+ return len > PFXLEN_IPV4_MAPPED
+ && strncasecmp(PFXSTR_IPV4_MAPPED, addr, PFXLEN_IPV4_MAPPED)
+ == 0
+ && str_is_ipv4(addr + PFXLEN_IPV4_MAPPED, len - PFXLEN_IPV4_MAPPED);
+}
+
+/* Returns 1 if ADDR is a valid IPv6 address */
+static int
+str_is_ipv6(const char *addr, size_t len)
+{
+ int col_count = 0; /* Number of colons */
+ int dcol = 0; /* Did we encounter a double-colon? */
+ int dig_count = 0; /* Number of digits in the last group */
+
+ for (; len; addr++, len--) {
+ if (!isascii (*addr))
+ return 0;
+ else if (isxdigit(*addr)) {
+ if (++dig_count > 4)
+ return 0;
+ } else if (*addr == ':') {
+ if (col_count && dig_count == 0 && ++dcol > 1)
+ return 0;
+ if (++col_count > 7)
+ return 0;
+ dig_count = 0;
+ }
+ else
+ return 0;
+ }
+ return (col_count == 7 || dcol);
+}
+
+static void
+uint32_to_bytes(unsigned char *bytes, uint32_t u)
+{
+ int i;
+
+ for (i = 0; i < 4; i++) {
+ bytes[i] = u & 0xff;
+ u >>= 8;
+ }
+}
+
+static int
+inaddr_to_bytes(int af, void *buf, unsigned char *bytes)
+{
+ uint32_t u;
+
+ switch (af) {
+ case AF_INET:
+ memcpy(&u, buf, sizeof u);
+ uint32_to_bytes(bytes, u);
+ return 4;
+
+ case AF_INET6:
+ memcpy(bytes, buf, 16);
+ return 16;
+ }
+
+ abort();
+}
+
+/* Fill in the BUF (LEN bytes long) with a network mask corresponding to
+ the mask length MASKLEN */
+static void
+masklen_to_netmask(unsigned char *buf, size_t len, size_t masklen)
+{
+ int i, cnt;
+
+ cnt = masklen / 8;
+ for (i = 0; i < cnt; i++)
+ buf[i] = 0xff;
+ if (i == len)
+ return;
+ cnt = 8 - masklen % 8;
+ buf[i++] = (0xff >> cnt) << cnt;
+ for (; i < len; i++)
+ buf[i] = 0;
+}
+
+#define CIDR_MAXBUFSIZE 81
+
+/* Convert string STR to CIDR. Return 0 on success and -1 on failure. */
+static int
+str_to_cidr(char const *str, struct cidr *cidr, char **endp)
+{
+ int rc;
+ char *ipbuf, *ipstart;
+ union {
+ struct in_addr in;
+ struct in6_addr in6;
+ } inaddr;
+ size_t len;
+
+ len = strspn(str, "0123456789abcdefABCDEF.:");
+ ipbuf = malloc(len + 1);
+ AN(ipbuf);
+ memcpy(ipbuf, str, len);
+ ipbuf[len] = 0;
+ str += len;
+
+ ipstart = ipbuf;
+
+ if (str_is_ipv4(ipstart, len))
+ cidr->family = AF_INET;
+ else if (str_is_ipv4mapped(ipstart, len)) {
+ cidr->family = AF_INET;
+ ipstart += PFXLEN_IPV4_MAPPED;
+ } else if (str_is_ipv6(ipbuf, len))
+ cidr->family = AF_INET6;
+ else {
+ free(ipbuf);
+ syslog(LOG_DAEMON|LOG_ERR, "invalid CIDR: %s", ipstart);
+ return -1;
+ }
+
+ rc = inet_pton(cidr->family, ipstart, &inaddr);
+ free(ipbuf);
+
+ if (rc != 1) {
+ if (rc == -1) {
+ syslog(LOG_DAEMON|LOG_ERR, "invalid address family");
+ return -1;
+ }
+ if (rc == 0) {
+ syslog(LOG_DAEMON|LOG_ERR,
+ "invalid IPv%s address: %s",
+ cidr->family == AF_INET ? "4" : "6",
+ str - len);
+ return -1;
+ }
+ }
+
+ cidr->len = inaddr_to_bytes(cidr->family, &inaddr, cidr->address);
+
+ if (*str == '/') {
+ char *end;
+ unsigned long masklen;
+
+ str++;
+
+ masklen = strtoul(str, &end, 10);
+ if (*end == 0) {
+ masklen_to_netmask(cidr->netmask, cidr->len, masklen);
+ str = end;
+ } else {
+ size_t k = strspn(str, "0123456789abcdefABCDEF.:");
+
+ if ((cidr->family == AF_INET
+ && str_is_ipv4(str, k))
+ || (cidr->family == AF_INET6
+ && str_is_ipv6(str, k))) {
+ char mbuf[CIDR_MAXBUFSIZE];
+ memcpy(mbuf, str, k);
+ mbuf[k] = 0;
+ rc = inet_pton(cidr->family, mbuf, &inaddr);
+ if (rc != 1) {
+ syslog(LOG_DAEMON|LOG_ERR,
+ "bad netmask: %s", mbuf);
+ return -1;
+ }
+ inaddr_to_bytes(cidr->family, &inaddr,
+ cidr->netmask);
+ } else {
+ syslog(LOG_DAEMON|LOG_ERR,
+ "bad CIDR (near %s)", str);
+ return -1;
+ }
+ }
+ } else
+ masklen_to_netmask(cidr->netmask, cidr->len, cidr->len * 8);
+ *endp = (char*) str;
+ return 0;
+}
+
+/* A is a valid CIDR, and B is a valid IP address represented as CIDR.
+ Return 0 if B falls within A */
+static int
+cidr_match(struct cidr *a, struct cidr *b)
+{
+ int i;
+
+ if (a->family != b->family)
+ return 1;
+ for (i = 0; i < a->len; i++) {
+ if (a->address[i] != (b->address[i] & a->netmask[i]))
+ return 1;
+ }
+ return 0;
+}
+
+static int
+is_trusted_ip(CIDRHEAD *cl, char const *ipstr)
+{
+ struct cidr cidr, *cp;
+ char *endp;
+
+ VSLIST_FOREACH(cp, cl, next) {
+ if (str_to_cidr(ipstr, &cidr, &endp) || *endp)
+ return 0;
+ if (cidr_match(cp, &cidr) == 0)
+ return 1;
+ }
+ return 0;
+}
+
+int
+VEVENT(remoteip_event)(VRT_CTX, struct vmod_priv *priv, enum vcl_event_e e)
+{
+ CIDRHEAD *p;
+
+ switch (e) {
+ case VCL_EVENT_LOAD:
+ p = calloc(1, sizeof(*p));
+ AN(p);
+ priv->priv = p;
+ break;
+ default:
+ break;
+ }
+ return 0;
+}
+
+void
+vmod_init(VRT_CTX, struct vmod_priv *priv, VCL_STRING s)
+{
+ CIDRHEAD *cl = priv->priv;
+ struct cidr *cidr;
+ char *endp;
+
+ while (*s) {
+ cidr = calloc(1, sizeof(cidr[0]));
+ if (str_to_cidr(s, cidr, &endp)) {
+ free(cidr);
+ break;
+ }
+ VSLIST_INSERT_HEAD(cl, cidr, next);
+ while (*endp && isspace(*endp))
+ ++endp;
+ if (*endp == 0)
+ break;
+ AN(*endp == ',');
+ ++endp;
+ while (*endp && isspace(*endp))
+ ++endp;
+ s = endp;
+ }
+}
+
+VCL_STRING
+vmod_get(VRT_CTX, struct vmod_priv *priv, VCL_STRING hdr)
+{
+ CIDRHEAD *cl = priv->priv;
+ unsigned u;
+ char const *end;
+ char *buf;
+ int i = 0;
+
+ u = WS_ReserveAll(ctx->ws);
+ buf = ctx->ws->f;
+
+ end = hdr + strlen(hdr);
+ while (end > hdr) {
+ char const *p;
+ size_t len, j;
+
+ for (p = end - 1; p > hdr && *p != ','; p--)
+ ;
+ len = end - p;
+ AN(len + 1 < u);
+
+ i = 0;
+ j = 0;
+ if (*p == ',')
+ j++;
+ while (j < len && isspace(p[j]))
+ j++;
+ while (j < len) {
+ if (isspace(p[j]))
+ break;
+ buf[i++] = p[j++];
+ }
+ buf[i++] = 0;
+
+ if (!is_trusted_ip(cl, buf)) {
+ break;
+ }
+ end = p;
+ }
+ WS_Release(ctx->ws, i);
+ return buf;
+}
diff --git a/src/vmod_remoteip.vcc b/src/vmod_remoteip.vcc
new file mode 100644
index 0000000..b46aef5
--- a/dev/null
+++ b/src/vmod_remoteip.vcc
@@ -0,0 +1,62 @@
+$Module remoteip 3 "Return probable IP address based on request headers"
+
+DESCRIPTION
+===========
+
+This modules is for Varnish Cache what mod_remoteip is for Apache. It
+determines the actual client IP address for the connection, using the
+useragent IP address list presented by a proxies or a load balancer
+via the request headers and a preconfigred list of trusted IP
+addresses. For example, if your Varnish server works behind a load
+balancer or yet another reverse proxy (such as pound or haproxy to
+handle the TLS connection), you can use this module to get the real
+incoming connection IP address from the **X-Forwarded-For** header.
+
+$Event remoteip_event
+
+$Function VOID init(PRIV_VCL, STRING trusted)
+
+Description
+ Initializes the module. The **trusted** argument is a string
+ containing comma-separated list of IP addresses of hosts which
+ are trusted to correctly set the value of the **X-Forwarded-For**
+ header (or other header whose value is used as argument in the
+ **remoteip.get** call, which is described below). Arbitrary
+ amount of whitespace is allowed to surround each address.
+ Each address cna be a valid IPv4 or IPv6 address, optionally
+ followed by a slash and the netmask or netmask length.
+
+$Function STRING get(PRIV_VCL, STRING header)
+
+Description
+ The **header** argument is the value of the **X-Forwarded-For**
+ or a similar header, i.e. a comma-delimited list of useragent
+ IP addresses with optional whitespace around them. The
+ function scans this list from right to left, comparing each
+ address with the trusted IP address list, configured with a
+ prior call to **init**. Processing halts when the IP address
+ is not found in that list or when the list is exhausted. In
+ the latter case, the first address from the **header** list is
+ returned.
+
+EXAMPLE
+=======
+ ::
+
+ sub vcl_init {
+ remoteip.init("192.0.2.1, 127.0.0.0/8");
+ }
+
+ sub vcl_recv {
+ set resp.http.x-real-ip = remoteip.get(resp.http.X-Forwarded-For);
+ ...
+ }
+
+COPYRIGHT
+=========
+
+| Copyright (C) Sergey Poznyakoff
+| License GPLv3+: GNU GPL version 3 or later
+| <http://gnu.org/licenses/gpl.html>
+| This is free software: you are free to change and redistribute it.
+| There is NO WARRANTY, to the extent permitted by law.
diff --git a/tests/.gitignore b/tests/.gitignore
new file mode 100644
index 0000000..93f8f46
--- a/dev/null
+++ b/tests/.gitignore
@@ -0,0 +1,6 @@
+atconfig
+atlocal
+package.m4
+testsuite
+testsuite.dir
+testsuite.log
diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 0000000..d81a17c
--- a/dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,73 @@
+# This file is part of vmod_remoteip.
+# Copyright (C) 2020 Sergey Poznyakoff
+#
+# Vmod_remoteip is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# Vmod_remoteip is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with vmod_remoteip. If not, see <http://www.gnu.org/licenses/>.
+
+EXTRA_DIST = $(TESTSUITE_AT) testsuite package.m4
+DISTCLEANFILES = atconfig $(check_SCRIPTS)
+MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
+
+## ------------ ##
+## package.m4. ##
+## ------------ ##
+
+$(srcdir)/package.m4: $(top_srcdir)/configure.ac
+ $(AM_V_GEN){ \
+ echo '# Signature of the current package.'; \
+ echo 'm4_define([AT_PACKAGE_NAME], [@PACKAGE_NAME@])'; \
+ echo 'm4_define([AT_PACKAGE_TARNAME], [@PACKAGE_TARNAME@])'; \
+ echo 'm4_define([AT_PACKAGE_VERSION], [@PACKAGE_VERSION@])'; \
+ echo 'm4_define([AT_PACKAGE_STRING], [@PACKAGE_STRING@])'; \
+ echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
+ echo 'm4_define([AT_VMOD_BASENAME], [@AC_VMOD_BASENAME@])'; \
+ } >$(srcdir)/package.m4
+
+#
+
+## ------------ ##
+## Test suite. ##
+## ------------ ##
+
+TESTSUITE_AT = \
+ testsuite.at\
+ ipv4notfound.at\
+ ipv4found.at\
+ ipv6found.at\
+ ipv6notfound.at
+
+TESTSUITE = $(srcdir)/testsuite
+M4=m4
+
+AUTOTEST = $(AUTOM4TE) --language=autotest
+$(TESTSUITE): package.m4 $(TESTSUITE_AT)
+ $(AM_V_GEN)$(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp
+ $(AM_V_at)mv $@.tmp $@
+
+atconfig: $(top_builddir)/config.status
+ @cd $(top_builddir) && ./config.status tests/$@
+
+clean-local:
+ @test ! -f $(TESTSUITE) || $(SHELL) $(TESTSUITE) --clean
+
+check-local: atconfig atlocal $(TESTSUITE)
+ @$(SHELL) $(TESTSUITE)
+
+# Run the test suite on the *installed* tree.
+#installcheck-local:
+# $(SHELL) $(TESTSUITE) AUTOTEST_PATH=$(exec_prefix)/bin
+
+
+
+
+
diff --git a/tests/atlocal.in b/tests/atlocal.in
new file mode 100644
index 0000000..b75b488
--- a/dev/null
+++ b/tests/atlocal.in
@@ -0,0 +1,3 @@
+PATH=@abs_builddir@:@abs_top_builddir@/src:@abs_top_srcdir@/build-aux:$top_srcdir:$srcdir:@VARNISH_SBINDIR@:$PATH
+VARNISHTEST=@VARNISHTEST@
+VARNISHD=@VARNISHD@
diff --git a/tests/ipv4found.at b/tests/ipv4found.at
new file mode 100644
index 0000000..23666da
--- a/dev/null
+++ b/tests/ipv4found.at
@@ -0,0 +1,33 @@
+# This file is part of vmod_remoteip. -*- autotest -*-
+# Copyright (C) 2020 Sergey Poznyakoff
+#
+# Vmod_remoteip is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# Vmod_remoteip is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with vmod_remoteip. If not, see <http://www.gnu.org/licenses/>.
+
+AT_SETUP([IPv4 found])
+AT_VARNISHTEST([
+ sub vcl_init {
+ remoteip.init("198.51.100.1, 192.0.2.1, 127.0.0.0/8");
+ }
+ sub vcl_deliver {
+ set resp.http.result = remoteip.get("203.0.113.10, 203.0.113.2, 192.0.2.1, 127.0.0.1");
+ }
+],
+[ txreq
+ rxresp
+ expect resp.http.result == 203.0.113.2
+],
+[ rxreq
+ txresp
+])
+AT_CLEANUP
diff --git a/tests/ipv4notfound.at b/tests/ipv4notfound.at
new file mode 100644
index 0000000..0184d96
--- a/dev/null
+++ b/tests/ipv4notfound.at
@@ -0,0 +1,33 @@
+# This file is part of vmod_remoteip. -*- autotest -*-
+# Copyright (C) 2020 Sergey Poznyakoff
+#
+# Vmod_remoteip is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# Vmod_remoteip is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with vmod_remoteip. If not, see <http://www.gnu.org/licenses/>.
+
+AT_SETUP([IPv4 not found])
+AT_VARNISHTEST([
+ sub vcl_init {
+ remoteip.init("198.51.100.1, 192.0.2.1, 127.0.0.0/8");
+ }
+ sub vcl_deliver {
+ set resp.http.result = remoteip.get("198.51.100.1, 192.0.2.1, 127.0.0.1");
+ }
+],
+[ txreq
+ rxresp
+ expect resp.http.result == "198.51.100.1"
+],
+[ rxreq
+ txresp
+])
+AT_CLEANUP
diff --git a/tests/ipv6found.at b/tests/ipv6found.at
new file mode 100644
index 0000000..8935b71
--- a/dev/null
+++ b/tests/ipv6found.at
@@ -0,0 +1,33 @@
+# This file is part of vmod_remoteip. -*- autotest -*-
+# Copyright (C) 2020 Sergey Poznyakoff
+#
+# Vmod_remoteip is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# Vmod_remoteip is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with vmod_remoteip. If not, see <http://www.gnu.org/licenses/>.
+
+AT_SETUP([IPv6 found])
+AT_VARNISHTEST([
+ sub vcl_init {
+ remoteip.init("2001:DB8:AC12::1, 2001:DB8:ACB2::1, 2001:DB8:AC12::10");
+ }
+ sub vcl_deliver {
+ set resp.http.result = remoteip.get("2001:DB8:BE01::10, 2001:DB8:BFEE::1, 2001:DB8:AC12::1, 2001:DB8:ACB2::1");
+ }
+],
+[ txreq
+ rxresp
+ expect resp.http.result == "2001:DB8:BFEE::1"
+],
+[ rxreq
+ txresp
+])
+AT_CLEANUP
diff --git a/tests/ipv6notfound.at b/tests/ipv6notfound.at
new file mode 100644
index 0000000..f93c96b
--- a/dev/null
+++ b/tests/ipv6notfound.at
@@ -0,0 +1,33 @@
+# This file is part of vmod_remoteip. -*- autotest -*-
+# Copyright (C) 2020 Sergey Poznyakoff
+#
+# Vmod_remoteip is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# Vmod_remoteip is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with vmod_remoteip. If not, see <http://www.gnu.org/licenses/>.
+
+AT_SETUP([IPv6 not found])
+AT_VARNISHTEST([
+ sub vcl_init {
+ remoteip.init("2001:DB8:AC12::1, 2001:DB8:ACB2::1, 2001:DB8:AC12::10");
+ }
+ sub vcl_deliver {
+ set resp.http.result = remoteip.get("2001:DB8:ACB2::1, 2001:DB8:AC12::1, 2001:DB8:AC12::10");
+ }
+],
+[ txreq
+ rxresp
+ expect resp.http.result == "2001:DB8:ACB2::1"
+],
+[ rxreq
+ txresp
+])
+AT_CLEANUP
diff --git a/tests/testsuite.at b/tests/testsuite.at
new file mode 100644
index 0000000..c7d8e27
--- a/dev/null
+++ b/tests/testsuite.at
@@ -0,0 +1,7 @@
+m4_include([../acvmod/testsuite.inc])
+AT_INIT
+m4_include([ipv4found.at])
+m4_include([ipv4notfound.at])
+m4_include([ipv6found.at])
+m4_include([ipv6notfound.at])
+

Return to:

Send suggestions and report system problems to the System administrator.