--- /dev/null
+ GNU AFFERO GENERAL PUBLIC LICENSE
+ Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+our General Public Licenses are 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.
+
+ 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.
+
+ Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+ A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate. Many developers of free software are heartened and
+encouraged by the resulting cooperation. However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+ The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community. It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server. Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+ An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals. This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+ 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 Affero 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. Remote Network Interaction; Use with the GNU General Public License.
+
+ Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software. This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+ 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 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 work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero 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 Affero 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 Affero 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 Affero 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 Affero 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 Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source. For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code. There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+ 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 AGPL, see
+<https://www.gnu.org/licenses/>.
PKG_LICENSE:=AGPL-3.0-or-later
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
PKG_VERSION:=2025.12.29
-PKG_RELEASE:=3
+PKG_RELEASE:=4
LUCI_TITLE:=DNS Over HTTPS Proxy Web UI
-LUCI_URL:=https://github.com/stangri/luci-app-https-dns-proxy/
+LUCI_URL:=https://github.com/mossdef-org/luci-app-https-dns-proxy/
LUCI_DESCRIPTION:=Provides Web UI for DNS Over HTTPS Proxy
LUCI_DEPENDS:=+luci-base +https-dns-proxy
Version: $(PKG_VERSION)-$(PKG_RELEASE)
endef
+# Consolidate individual provider JSON files into providers.json in the build tree.
+# luci.mk's Build/Prepare calls Build/Prepare/$(LUCI_NAME) as a per-package hook.
+# The merged file lands in root/ so luci.mk's install step copies it automatically.
+define Build/Prepare/luci-app-https-dns-proxy
+ @if [ -d $(PKG_BUILD_DIR)/root/usr/share/https-dns-proxy/providers ] \
+ && ls $(PKG_BUILD_DIR)/root/usr/share/https-dns-proxy/providers/*.json >/dev/null 2>&1; then \
+ sep=''; printf '[' > $(PKG_BUILD_DIR)/root/usr/share/https-dns-proxy/providers.json; \
+ for f in $(PKG_BUILD_DIR)/root/usr/share/https-dns-proxy/providers/*.json; do \
+ printf '%s' "$$$$sep" >> $(PKG_BUILD_DIR)/root/usr/share/https-dns-proxy/providers.json; \
+ cat "$$$$f" >> $(PKG_BUILD_DIR)/root/usr/share/https-dns-proxy/providers.json; \
+ sep=','; \
+ done; \
+ printf ']' >> $(PKG_BUILD_DIR)/root/usr/share/https-dns-proxy/providers.json; \
+ fi
+ @if grep -q '"title"' $(PKG_BUILD_DIR)/root/usr/share/https-dns-proxy/providers.json 2>/dev/null; then \
+ rm -rf $(PKG_BUILD_DIR)/root/usr/share/https-dns-proxy/providers; \
+ else \
+ rm -f $(PKG_BUILD_DIR)/root/usr/share/https-dns-proxy/providers.json; \
+ fi
+endef
+
include ../../luci.mk
# call BuildPackage - OpenWrt buildroot signature
"require rpc";
"require view";
"require https-dns-proxy.status as hdp";
+/* globals hdp */
var pkg = hdp.pkg;
"require form";
"require baseclass";
"require https-dns-proxy.status as hdp";
+/* globals hdp */
var pkg = hdp.pkg;
},
render: function (data) {
- var reply = {
- status: (data[0] && data[0][pkg.Name]) || {
- enabled: null,
- running: null,
- force_dns_active: null,
- version: null,
- },
- providers: (data[1] && data[1][pkg.Name]) || [{ title: "empty" }],
- runtime: (data[2] && data[2][pkg.Name]) || { instances: null, triggers: [] },
- };
- reply.providers.sort(function (a, b) {
- return _(a.title).localeCompare(_(b.title));
- });
- reply.providers.push({
- title: "Custom",
- template: "{option}",
- params: { option: { type: "text" } },
- });
-
- var forceDnsText = "";
- if (reply.status.force_dns_active) {
- reply.status.force_dns_ports.forEach((element) => {
- forceDnsText += element + " ";
+ try {
+ var reply = {
+ status: (data[0] && data[0][pkg.Name]) || {},
+ providers: (data[1] && data[1][pkg.Name]) || [],
+ runtime: (data[2] && data[2][pkg.Name]) || {},
+ };
+ if (Array.isArray(reply.providers)) {
+ reply.providers.sort(function (a, b) {
+ return _(a.title).localeCompare(_(b.title));
+ });
+ } else {
+ reply.providers = [];
+ }
+ reply.providers.push({
+ title: "Custom",
+ template: "{option}",
+ params: { option: { type: "text" } },
});
- } else {
- forceDnsText = "-";
- }
- var table = E(
- "table",
- { class: "table", id: "https-dns-proxy_status_table" },
- [
- E("tr", { class: "tr table-titles" }, [
- E("th", { class: "th" }, _("Name / Type")),
- E("th", { class: "th" }, _("Listen Address")),
- E("th", { class: "th" }, _("Listen Port")),
- E("th", { class: "th" }, _("Force DNS Ports")),
- ]),
- ]
- );
+ var forceDnsText = "-";
+ if (reply.status.force_dns_active && Array.isArray(reply.status.force_dns_ports)) {
+ var ports = reply.status.force_dns_ports.join(" ");
+ if (ports) forceDnsText = ports;
+ }
+
+ var table = E(
+ "table",
+ { class: "table", id: "https-dns-proxy_status_table" },
+ [
+ E("tr", { class: "tr table-titles" }, [
+ E("th", { class: "th" }, _("Name / Type")),
+ E("th", { class: "th" }, _("Listen Address")),
+ E("th", { class: "th" }, _("Listen Port")),
+ E("th", { class: "th" }, _("Force DNS Ports")),
+ ]),
+ ]
+ );
- var rows = [];
- if (reply.runtime.instances) {
- Object.values(reply.runtime.instances).forEach((element) => {
+ var rows = [];
+ var instances = (reply.runtime && reply.runtime.instances) || {};
+ Object.values(instances).forEach((element) => {
var resolver;
var address;
var port;
var name;
var option;
var found;
- element.command.forEach((param, index, arr) => {
- if (param === "-r") resolver = arr[index + 1];
- if (param === "-a") address = arr[index + 1];
- if (param === "-p") port = arr[index + 1];
- });
+ if (Array.isArray(element.command)) {
+ element.command.forEach((param, index, arr) => {
+ if (param === "-r") resolver = arr[index + 1];
+ if (param === "-a") address = arr[index + 1];
+ if (param === "-p") port = arr[index + 1];
+ });
+ }
resolver = resolver || "Unknown";
address = address || "127.0.0.1";
port = port || "Unknown";
found = true;
name = _(prov.title);
let match = resolver.match(regexp);
- if (match[1] != null) {
+ if (match && match[1] != null) {
if (
prov.params &&
prov.params.option &&
- prov.params.option.options
+ Array.isArray(prov.params.option.options)
) {
prov.params.option.options.forEach((opt) => {
if (opt.value === match[1]) option = _(opt.description);
});
- name += " (" + option + ")";
+ if (option) name += " (" + option + ")";
} else {
if (match[1] !== "") name += " (" + match[1] + ")";
}
}
}
});
- rows.push([name, address, port, forceDnsText]);
+ rows.push([name || _("Unknown"), address, port, forceDnsText]);
});
- }
- cbi_update_table(table, rows, E("em", _("There are no active instances.")));
+ cbi_update_table(table, rows, E("em", _("There are no active instances.")));
- return table;
+ return table;
+ } catch (e) {
+ return E("div", { class: "alert-message warning" },
+ _("Unable to retrieve %s status").format("HTTPS DNS Proxy"));
+ }
},
});
msgid "%s%s%s proxy on port %s.%s"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:564
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:565
msgid "*"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:251
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:585
-msgid "0: Fatal"
-msgstr ""
-
#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:252
#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:586
-msgid "1: Error"
+msgid "0: Fatal"
msgstr ""
#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:253
#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:587
-msgid "2: Warning"
+msgid "1: Error"
msgstr ""
#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:254
#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:588
-msgid "3: Info"
+msgid "2: Warning"
msgstr ""
#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:255
#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:589
+msgid "3: Info"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:256
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:590
msgid "4: Debug"
msgstr ""
msgid "AdGuard"
msgstr ""
+#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/recipes.v.json:22
+msgid "Adblock"
+msgstr ""
+
#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/com.controld.freedns.json:30
msgid "Ads + Malware + Social Filter"
msgstr ""
msgid "BlahDNS"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:161
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:162
msgid ""
"Blocks access to Mozilla Encrypted resolvers, forcing local devices to use "
"router for DNS resolution (%smore information%s)."
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:144
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:145
msgid ""
"Blocks access to iCloud Private Relay resolvers, forcing local devices to "
"use router for DNS resolution (%smore information%s)."
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:514
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:515
msgid "Bootstrap DNS"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:289
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:606
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:290
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:607
msgid "CA Certs File"
msgstr ""
msgid "CIRA Canadian Shield"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:159
+#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/recipes.v.json:30
+msgid "CN Optimized"
+msgstr ""
+
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:160
msgid "Canary Domains Mozilla"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:142
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:143
msgid "Canary Domains iCloud"
msgstr ""
msgid "Comss DNS (RU)"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:293
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:611
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:294
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:612
msgid "Connection Loss Time"
msgstr ""
msgid "DNSlify DNS"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:577
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:578
msgid "DSCP Codepoint"
msgstr ""
msgid "Disabling %s service"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:76
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:77
msgid "Do not update configs"
msgstr ""
msgid "DoH DNS (SB)"
msgstr ""
+#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/recipes.v.json:26
+msgid "ECS Optimized"
+msgstr ""
+
#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/https-dns-proxy/status.js:388
msgid "Enable"
msgstr ""
msgid "Finland"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/status/include/71_https-dns-proxy.js:58
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/status/include/71_https-dns-proxy.js:56
msgid "Force DNS Ports"
msgstr ""
msgid "Force DNS ports:"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:126
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:127
msgid "Force Router DNS"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:135
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:151
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:171
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:136
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:152
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:172
msgid "Force Router DNS server to all local devices"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:221
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:646
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:222
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:647
msgid "Force use of HTTP/1"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:233
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:654
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:234
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:655
msgid "Force use of HTTP/3 (QUIC)"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:246
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:663
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:247
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:664
msgid "Force use of IPv6 DNS resolvers"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:128
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:129
msgid ""
"Forces Router DNS use on local devices, also known as DNS Hijacking. Only "
"works on `lan` interface by default (%smore information%s)."
msgid "Germany"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:52
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:53
msgid "Global Instance Options"
msgstr ""
msgid "HTTPS DNS Proxy"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:48
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:49
msgid "HTTPS DNS Proxy - Configuration"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:341
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:342
msgid "HTTPS DNS Proxy - Instances"
msgstr ""
msgid "HTTPS DNS Proxy - Status"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/status/include/71_https-dns-proxy.js:11
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/status/include/71_https-dns-proxy.js:12
msgid "HTTPS DNS Proxy Instances"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:179
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:180
msgid "Heartbeat Domain"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:194
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:195
msgid "Heartbeat Sleep Timeout"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:205
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:206
msgid "Heartbeat Wait Timeout"
msgstr ""
msgid "IIJ Public DNS (JP)"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:66
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:67
msgid ""
"If update option is selected, the %s'DNS Forwards' section of DHCP and DNS%s "
"will be automatically updated to use selected DoH providers (%smore "
msgid "Lelux DNS (FI)"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:170
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:171
msgid "Let local devices use Mozilla Private Relay"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:150
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:151
msgid "Let local devices use iCloud Private Relay"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:134
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:135
msgid "Let local devices use their own DNS servers if set"
msgstr ""
msgid "LibreDNS (GR)"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:258
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:539
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/status/include/71_https-dns-proxy.js:56
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:259
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:540
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/status/include/71_https-dns-proxy.js:54
msgid "Listen Address"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:550
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/status/include/71_https-dns-proxy.js:57
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:551
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/status/include/71_https-dns-proxy.js:55
msgid "Listen Port"
msgstr ""
msgid "Location"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:298
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:617
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:299
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:618
msgid "Log Limit"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:276
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:592
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:277
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:593
msgid "Logging File Path"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:249
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:582
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:250
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:583
msgid "Logging Verbosity Level"
msgstr ""
msgid "Malware Filter"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:303
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:623
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:304
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:624
msgid "Max Idle Time"
msgstr ""
msgid "Mullvad"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/status/include/71_https-dns-proxy.js:55
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/status/include/71_https-dns-proxy.js:53
msgid "Name / Type"
msgstr ""
msgid "OpenNameServer"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:469
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:485
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:470
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:486
msgid "Parameter"
msgstr ""
msgid "Please %sdonate%s to support development of this project."
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:322
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:331
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:323
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:332
msgid ""
"Please note that %s is not supported on this system (%smore information%s)."
msgstr ""
msgid "Poland"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:281
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:596
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:282
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:597
msgid "Polling Interval"
msgstr ""
msgid "Protective with child protection & ad-blocking"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:383
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:384
msgid "Provider"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:286
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:602
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:287
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:603
msgid "Proxy Server"
msgstr ""
msgid "RubyFish (CN)"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:267
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:572
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:268
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:573
msgid "Run As Group"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:263
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:567
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:264
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:568
msgid "Run As User"
msgstr ""
msgid "Secured with ECS Support"
msgstr ""
+#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/recipes.v.json:18
+msgid "Security"
+msgstr ""
+
#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/com.cloudflare-dns.json:22
#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/org.cleanbrowsing.doh.json:22
msgid "Security Filter"
msgid "See the %sREADME%s for details."
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:103
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:104
msgid "Select the DNSMASQ Configs to update"
msgstr ""
msgid "Service Instances"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:51
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:52
msgid "Service Options"
msgstr ""
msgid "Snopyta DNS (FI)"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:559
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:560
msgid "Source (Bind To) Address"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:271
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:272
msgid "Source Address"
msgstr ""
msgid "Starting %s service"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:308
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:629
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:309
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:630
msgid "Statistic Interval"
msgstr ""
msgid "Switzerland"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:313
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:635
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:314
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:636
msgid "TCP Client Limit"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:181
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:182
msgid "The domain used for connectivity checks (%smore information%s)."
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/status/include/71_https-dns-proxy.js:105
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/status/include/71_https-dns-proxy.js:104
msgid "There are no active instances."
msgstr ""
msgid "Tiarap Public DNS (JP)"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:195
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:196
msgid "Time to wait before checking connectivity (seconds)."
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:206
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:207
msgid "Time to wait for connectivity check response (seconds)."
msgstr ""
msgid "US/New York"
msgstr ""
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/status/include/71_https-dns-proxy.js:109
+msgid "Unable to retrieve %s status"
+msgstr ""
+
#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/com.adguard.dns.json:18
#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/eu.joindns4.json:14
+#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/recipes.v.json:14
msgid "Unfiltered"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:379
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:380
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/status/include/71_https-dns-proxy.js:102
msgid "Unknown"
msgstr ""
msgid "Unsecured"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:64
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:65
msgid "Update DNSMASQ Config on Start/Stop"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:74
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:75
msgid "Update all configs"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:75
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:76
msgid "Update select configs"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:216
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:641
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:217
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:642
msgid "Use HTTP/1"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:228
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:649
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:229
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:650
msgid "Use HTTP/3 (QUIC)"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:241
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:658
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:242
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:659
msgid "Use IPv6 resolvers"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:245
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:662
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:246
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:663
msgid "Use any family DNS resolvers"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:220
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:232
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:645
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:653
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:221
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:233
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:646
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:654
msgid "Use negotiated HTTP version"
msgstr ""
#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/gr.libredns.doh.json:8
#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/net.mullvad.dns.json:9
#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/net.quad9.json:8
+#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/recipes.v.json:8
msgid "Variant"
msgstr ""
msgid "Wikimedia"
msgstr ""
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:547
-#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:556
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:548
+#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:557
msgid "auto"
msgstr ""
msgstr ""
#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/org.opennameserver.json:18
-msgid "ns2: Germany - D�seldorf"
+msgid "ns2: Germany - Düsseldorf"
msgstr ""
#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/org.opennameserver.json:22
#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/org.opennameserver.json:26
msgid "ns4: Norway - Sandefjord"
msgstr ""
+
+#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/recipes.v.json:2
+msgid "v.recipes"
+msgstr ""
readonly packageName="https-dns-proxy"
readonly providersDir="/usr/share/${packageName}/providers"
+readonly providersJson="/usr/share/${packageName}/providers.json"
. "${IPKG_INSTROOT}/lib/functions.sh"
. "${IPKG_INSTROOT}/usr/share/libubox/jshn.sh"
local i ports
local version
name="$(basename "$1")"
- name="${name:-$packageName}"
+ name="${name:-${packageName}}"
ports="$(ubus_get_ports)"
[ -z "$version" ] && version="$(get_version "$name")"
json_init
get_platform_support() {
local name
name="$(basename "$1")"
- name="${name:-$packageName}"
+ name="${name:-${packageName}}"
json_init
json_add_object "$name"
if check_http2; then
get_providers() {
local f
- echo '{"https-dns-proxy":['
- for f in "$providersDir"/*; do
- cat "$f"
- echo ','
- done
-# echo '{ "title": "Custom", "template": "{option}", "params": { "option": { "type": "text", }, }, },'
- echo ']}'
+ echo '{"https-dns-proxy":'
+ if [ -s "$providersJson" ]; then
+ cat "$providersJson"
+ else
+ echo '['
+ for f in "$providersDir"/*; do
+ cat "$f"
+ echo ','
+ done
+ echo ']'
+ fi
+ echo '}'
}
set_init_action() {
},
{
"value": "ns2",
- "description": "ns2: Germany - Düsseldorf"
+ "description": "ns2: Germany - Düsseldorf"
},
{
"value": "ns3",
--- /dev/null
+{
+ "title": "v.recipes",
+ "template": "https://v.recipes/dns-{option}",
+ "bootstrap_dns": "1.1.1.1,1.0.0.1,8.8.8.8,8.8.4.4",
+ "help_link": "https://v.recipes/dns/",
+ "params": {
+ "option": {
+ "description": "Variant",
+ "type": "select",
+ "regex": "(query|security|adblock|ecs|cn)",
+ "options": [
+ {
+ "value": "query",
+ "description": "Unfiltered"
+ },
+ {
+ "value": "security",
+ "description": "Security"
+ },
+ {
+ "value": "adblock",
+ "description": "Adblock"
+ },
+ {
+ "value": "ecs",
+ "description": "ECS Optimized"
+ },
+ {
+ "value": "cn",
+ "description": "CN Optimized"
+ }
+ ],
+ "default": "query"
+ }
+ }
+}
--- /dev/null
+#!/usr/bin/env bash
+# Functional test runner for luci-app-https-dns-proxy.
+#
+# Tests:
+# 01: Provider JSON validation (structure, fields, bootstrap DNS)
+# 02: JavaScript template functions (templateToRegexp, templateToResolver)
+# 03: RPC backend script validation
+#
+# Usage: cd source.openwrt.melmac.ca/luci-app-https-dns-proxy && bash tests/run_tests.sh
+
+set -o pipefail
+
+n_tests=0
+n_fails=0
+
+pass() {
+ printf " PASS: %s\n" "$1"
+}
+fail() {
+ printf " FAIL: %s\n" "$1"
+ [ -n "$2" ] && printf " %s\n" "$2"
+ n_fails=$((n_fails + 1))
+}
+assert_rc() {
+ local desc="$1" expect="$2" actual="$3"
+ n_tests=$((n_tests + 1))
+ if [ "$expect" -eq "$actual" ]; then
+ pass "$desc"
+ else
+ fail "$desc" "expected rc=$expect, got rc=$actual"
+ fi
+}
+assert_eq() {
+ local desc="$1" expect="$2" actual="$3"
+ n_tests=$((n_tests + 1))
+ if [ "$expect" = "$actual" ]; then
+ pass "$desc"
+ else
+ fail "$desc" "expected: '$expect', got: '$actual'"
+ fi
+}
+
+PROVIDERS_DIR="./root/usr/share/https-dns-proxy/providers"
+STATUS_JS="./htdocs/luci-static/resources/https-dns-proxy/status.js"
+RPC_SCRIPT="./root/usr/libexec/rpcd/luci.https-dns-proxy"
+
+if [ ! -d "$PROVIDERS_DIR" ]; then
+ echo "ERROR: Cannot find $PROVIDERS_DIR. Run from the luci-app-https-dns-proxy package root."
+ exit 1
+fi
+
+###############################################################################
+# 01: Provider JSON validation #
+###############################################################################
+
+printf "\n##\n## 01: Provider JSON validation\n##\n\n"
+
+provider_count=0
+for f in "$PROVIDERS_DIR"/*.json; do
+ [ -f "$f" ] || continue
+ provider_count=$((provider_count + 1))
+ base="$(basename "$f")"
+
+ # ── Valid JSON ──
+ n_tests=$((n_tests + 1))
+ if python3 -m json.tool "$f" >/dev/null 2>&1; then
+ pass "$base: valid JSON"
+ else
+ fail "$base: invalid JSON"
+ continue
+ fi
+
+ content="$(python3 -m json.tool "$f")"
+
+ # ── Required field: title ──
+ n_tests=$((n_tests + 1))
+ title="$(python3 -c "import json,sys; d=json.load(open('$f')); print(d.get('title',''))")"
+ if [ -n "$title" ]; then
+ pass "$base: has title '$title'"
+ else
+ fail "$base: missing 'title' field"
+ fi
+
+ # ── Required field: template ──
+ n_tests=$((n_tests + 1))
+ template="$(python3 -c "import json,sys; d=json.load(open('$f')); print(d.get('template',''))")"
+ if [ -n "$template" ]; then
+ pass "$base: has template"
+ else
+ fail "$base: missing 'template' field"
+ continue
+ fi
+
+ # ── Template is HTTPS URL ──
+ n_tests=$((n_tests + 1))
+ case "$template" in
+ https://*)
+ pass "$base: template is HTTPS URL"
+ ;;
+ *)
+ fail "$base: template not HTTPS: $template"
+ ;;
+ esac
+
+ # ── Required field: bootstrap_dns ──
+ n_tests=$((n_tests + 1))
+ bootstrap="$(python3 -c "import json,sys; d=json.load(open('$f')); print(d.get('bootstrap_dns',''))")"
+ if [ -n "$bootstrap" ]; then
+ pass "$base: has bootstrap_dns"
+ else
+ fail "$base: missing 'bootstrap_dns' field"
+ continue
+ fi
+
+ # ── Bootstrap DNS contains valid IPs ──
+ n_tests=$((n_tests + 1))
+ bad_ip=""
+ IFS=',' read -ra ips <<< "$bootstrap"
+ for ip in "${ips[@]}"; do
+ ip="$(echo "$ip" | xargs)" # trim whitespace
+ # Accept IPv4 or IPv6
+ if echo "$ip" | grep -qE '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'; then
+ continue
+ elif echo "$ip" | grep -q ':'; then
+ continue
+ else
+ bad_ip="$ip"
+ break
+ fi
+ done
+ if [ -z "$bad_ip" ]; then
+ pass "$base: bootstrap_dns IPs valid"
+ else
+ fail "$base: invalid bootstrap IP: '$bad_ip'"
+ fi
+
+ # ── Template params consistency ──
+ # If template has {placeholders}, params must define them
+ placeholders="$(echo "$template" | grep -oP '\{(\w+)\}' | sed 's/[{}]//g' | sort -u)"
+ if [ -n "$placeholders" ]; then
+ n_tests=$((n_tests + 1))
+ missing_param=""
+ for ph in $placeholders; do
+ has_param="$(python3 -c "
+import json,sys
+d=json.load(open('$f'))
+p=d.get('params',{})
+print('yes' if '$ph' in p else 'no')
+")"
+ if [ "$has_param" != "yes" ]; then
+ missing_param="$ph"
+ break
+ fi
+ done
+ if [ -z "$missing_param" ]; then
+ pass "$base: template params match placeholders"
+ else
+ fail "$base: template placeholder '{$missing_param}' has no params entry"
+ fi
+
+ # ── Select params have options ──
+ for ph in $placeholders; do
+ param_type="$(python3 -c "
+import json,sys
+d=json.load(open('$f'))
+p=d.get('params',{}).get('$ph',{})
+print(p.get('type',''))
+")"
+ if [ "$param_type" = "select" ]; then
+ n_tests=$((n_tests + 1))
+ opt_count="$(python3 -c "
+import json,sys
+d=json.load(open('$f'))
+p=d.get('params',{}).get('$ph',{})
+opts=p.get('options',[])
+print(len(opts))
+")"
+ if [ "$opt_count" -gt 0 ]; then
+ pass "$base: param '$ph' (select) has $opt_count options"
+ else
+ fail "$base: param '$ph' (select) has no options"
+ fi
+
+ # ── Default matches one of the options ──
+ n_tests=$((n_tests + 1))
+ default_valid="$(python3 -c "
+import json,sys
+d=json.load(open('$f'))
+p=d.get('params',{}).get('$ph',{})
+opts=p.get('options',[])
+dflt=p.get('default','')
+values=[o.get('value','') for o in opts]
+print('yes' if dflt in values else 'no')
+")"
+ if [ "$default_valid" = "yes" ]; then
+ pass "$base: param '$ph' default is a valid option"
+ else
+ fail "$base: param '$ph' default not in options list"
+ fi
+ fi
+ done
+ fi
+done
+
+# ── No duplicate titles ──
+n_tests=$((n_tests + 1))
+titles="$(python3 -c "
+import json, os, sys
+titles = []
+for f in sorted(os.listdir('$PROVIDERS_DIR')):
+ if f.endswith('.json'):
+ with open(os.path.join('$PROVIDERS_DIR', f)) as fh:
+ d = json.load(fh)
+ titles.append(d.get('title',''))
+dupes = [t for t in titles if titles.count(t) > 1]
+if dupes:
+ print('DUPES: ' + ', '.join(set(dupes)))
+else:
+ print('OK')
+")"
+if [ "$titles" = "OK" ]; then
+ pass "no duplicate provider titles ($provider_count providers)"
+else
+ fail "duplicate provider titles: $titles"
+fi
+
+###############################################################################
+# 02: JavaScript template functions #
+###############################################################################
+
+printf "\n##\n## 02: JavaScript template functions\n##\n\n"
+
+if command -v node >/dev/null 2>&1; then
+
+ # Run tests via Node.js
+ js_result="$(node --eval "
+// Extract the two pure functions from status.js
+const pkg = {
+ templateToRegexp: function (template) {
+ if (template)
+ return new RegExp(
+ '^' +
+ template
+ .split(/(\{\w+\})/g)
+ .map((part) => {
+ let placeholder = part.match(/^\{(\w+)\}$/);
+ if (placeholder) return '(?<' + placeholder[1] + '>.*?)';
+ else return part.replace(/[.*+?\${}()|[\]\\\\]/g, '\\\\' + '\$&');
+ })
+ .join('') +
+ '\$'
+ );
+ return new RegExp('');
+ },
+ templateToResolver: function (template, args) {
+ if (template) return template.replace(/{(\w+)}/g, (_, v) => args[v]);
+ return null;
+ },
+};
+
+let pass = 0, fail = 0, total = 0;
+function assert(desc, cond) {
+ total++;
+ if (cond) { console.log(' PASS: ' + desc); pass++; }
+ else { console.log(' FAIL: ' + desc); fail++; }
+}
+
+// ── templateToRegexp ──
+
+// Fixed URL (no placeholders)
+let re1 = pkg.templateToRegexp('https://dns.google/dns-query');
+assert('templateToRegexp: fixed URL matches itself',
+ re1.test('https://dns.google/dns-query'));
+assert('templateToRegexp: fixed URL rejects different URL',
+ !re1.test('https://dns.other/dns-query'));
+
+// URL with placeholder
+let re2 = pkg.templateToRegexp('https://{option}cloudflare-dns.com/dns-query');
+assert('templateToRegexp: Cloudflare template matches standard',
+ re2.test('https://cloudflare-dns.com/dns-query'));
+assert('templateToRegexp: Cloudflare template matches family',
+ re2.test('https://family.cloudflare-dns.com/dns-query'));
+assert('templateToRegexp: Cloudflare template matches security',
+ re2.test('https://security.cloudflare-dns.com/dns-query'));
+assert('templateToRegexp: Cloudflare extracts option group',
+ re2.exec('https://family.cloudflare-dns.com/dns-query').groups.option === 'family.');
+
+// NextDNS text param
+let re3 = pkg.templateToRegexp('https://dns.nextdns.io/{option}');
+assert('templateToRegexp: NextDNS matches with username',
+ re3.test('https://dns.nextdns.io/abc123'));
+assert('templateToRegexp: NextDNS extracts username',
+ re3.exec('https://dns.nextdns.io/myuser').groups.option === 'myuser');
+assert('templateToRegexp: NextDNS matches empty option',
+ re3.test('https://dns.nextdns.io/'));
+
+// Mullvad with multiple options
+let re4 = pkg.templateToRegexp('https://{option}dns.mullvad.net/dns-query');
+assert('templateToRegexp: Mullvad matches standard',
+ re4.test('https://dns.mullvad.net/dns-query'));
+assert('templateToRegexp: Mullvad matches adblock variant',
+ re4.test('https://adblock.dns.mullvad.net/dns-query'));
+
+// Empty/null template
+let re5 = pkg.templateToRegexp('');
+assert('templateToRegexp: empty template returns fallback regex',
+ re5 instanceof RegExp);
+let re6 = pkg.templateToRegexp(null);
+assert('templateToRegexp: null template returns fallback regex',
+ re6 instanceof RegExp);
+
+// ── templateToResolver ──
+
+assert('templateToResolver: fills Cloudflare standard',
+ pkg.templateToResolver('https://{option}cloudflare-dns.com/dns-query', {option: ''})
+ === 'https://cloudflare-dns.com/dns-query');
+assert('templateToResolver: fills Cloudflare family',
+ pkg.templateToResolver('https://{option}cloudflare-dns.com/dns-query', {option: 'family.'})
+ === 'https://family.cloudflare-dns.com/dns-query');
+assert('templateToResolver: fills NextDNS username',
+ pkg.templateToResolver('https://dns.nextdns.io/{option}', {option: 'myuser'})
+ === 'https://dns.nextdns.io/myuser');
+assert('templateToResolver: fixed URL unchanged',
+ pkg.templateToResolver('https://dns.google/dns-query', {})
+ === 'https://dns.google/dns-query');
+assert('templateToResolver: null template returns null',
+ pkg.templateToResolver(null, {}) === null);
+
+// ── Round-trip: templateToResolver → templateToRegexp match ──
+
+let providers = [
+ {template: 'https://{option}cloudflare-dns.com/dns-query', args: {option: 'family.'}},
+ {template: 'https://{option}cloudflare-dns.com/dns-query', args: {option: ''}},
+ {template: 'https://dns.nextdns.io/{option}', args: {option: 'abc123'}},
+ {template: 'https://dns.google/dns-query', args: {}},
+ {template: 'https://{option}dns.mullvad.net/dns-query', args: {option: 'adblock.'}},
+];
+for (let p of providers) {
+ let url = pkg.templateToResolver(p.template, p.args);
+ let re = pkg.templateToRegexp(p.template);
+ assert('round-trip: ' + url + ' matches its template',
+ re.test(url));
+}
+
+// Summary line for the shell runner to parse
+console.log('JS_SUMMARY:' + total + ':' + pass + ':' + fail);
+" 2>&1)"
+
+ echo "$js_result" | grep -v '^JS_SUMMARY:'
+
+ # Parse the summary
+ js_total="$(echo "$js_result" | grep '^JS_SUMMARY:' | cut -d: -f2)"
+ js_pass="$(echo "$js_result" | grep '^JS_SUMMARY:' | cut -d: -f3)"
+ js_fail="$(echo "$js_result" | grep '^JS_SUMMARY:' | cut -d: -f4)"
+ n_tests=$((n_tests + js_total))
+ n_fails=$((n_fails + js_fail))
+
+else
+ echo " SKIP: node.js not available, skipping JS template tests"
+fi
+
+###############################################################################
+# 03: RPC backend validation #
+###############################################################################
+
+printf "\n##\n## 03: RPC backend validation\n##\n\n"
+
+if [ -f "$RPC_SCRIPT" ]; then
+ # ── Shell syntax check ──
+ n_tests=$((n_tests + 1))
+ if bash -n "$RPC_SCRIPT" 2>/dev/null; then
+ pass "RPC script passes syntax check"
+ else
+ fail "RPC script has syntax errors"
+ fi
+
+ # ── list method returns valid JSON structure ──
+ n_tests=$((n_tests + 1))
+ # The 'list' command doesn't need stdin or OpenWrt deps
+ # We need to provide stubs for the sourced files
+ list_output="$(
+ # Provide stubs for OpenWrt libraries
+ IPKG_INSTROOT="$PWD/tests/stubs"
+ mkdir -p "$IPKG_INSTROOT/lib" "$IPKG_INSTROOT/usr/share/libubox"
+
+ cat > "$IPKG_INSTROOT/lib/functions.sh" << 'STUB'
+#!/bin/sh
+STUB
+
+ cat > "$IPKG_INSTROOT/usr/share/libubox/jshn.sh" << 'STUB'
+#!/bin/sh
+# Minimal jshn stub for list command
+__json_items=""
+__json_cur=""
+__json_depth=0
+json_init() { __json_items=""; __json_cur=""; __json_depth=0; }
+json_add_object() {
+ if [ $__json_depth -eq 0 ]; then
+ __json_cur="\"$1\":{"
+ else
+ __json_cur="${__json_cur}\"$1\":{"
+ fi
+ __json_depth=$((__json_depth+1))
+}
+json_add_string() { __json_cur="${__json_cur}\"$1\":\"$2\","; }
+json_close_object() {
+ __json_cur="${__json_cur%,}}"
+ __json_depth=$((__json_depth-1))
+ if [ $__json_depth -eq 0 ]; then
+ __json_items="${__json_items:+${__json_items},}${__json_cur}"
+ __json_cur=""
+ else
+ __json_cur="${__json_cur},"
+ fi
+}
+json_dump() { echo "{${__json_items}}"; }
+json_cleanup() { __json_items=""; __json_cur=""; }
+STUB
+
+ bash -c "
+ IPKG_INSTROOT='$IPKG_INSTROOT'
+ . '$RPC_SCRIPT' list
+ " 2>/dev/null
+ )"
+
+ if echo "$list_output" | python3 -m json.tool >/dev/null 2>&1; then
+ pass "RPC 'list' returns valid JSON"
+ else
+ fail "RPC 'list' does not return valid JSON" "$list_output"
+ fi
+
+ # ── list method declares all expected methods ──
+ for method in getInitList getInitStatus getPlatformSupport getProviders setInitAction; do
+ n_tests=$((n_tests + 1))
+ if echo "$list_output" | grep -q "\"$method\""; then
+ pass "RPC 'list' declares method '$method'"
+ else
+ fail "RPC 'list' missing method '$method'"
+ fi
+ done
+
+ # ── setInitAction validates service name ──
+ n_tests=$((n_tests + 1))
+ if grep -q '\[ "$(basename "$1")" = "$packageName" \]' "$RPC_SCRIPT"; then
+ pass "setInitAction validates service name"
+ else
+ fail "setInitAction missing service name validation"
+ fi
+
+ # ── setInitAction only allows safe actions ──
+ n_tests=$((n_tests + 1))
+ if grep -q 'enable|disable|start|stop|restart)' "$RPC_SCRIPT"; then
+ pass "setInitAction whitelist: enable|disable|start|stop|restart"
+ else
+ fail "setInitAction missing action whitelist"
+ fi
+else
+ echo " SKIP: RPC script not found at $RPC_SCRIPT"
+fi
+
+###############################################################################
+# SHELL SCRIPT SYNTAX #
+###############################################################################
+
+printf "\n--- Shell script syntax ---\n"
+for shellscript in \
+ root/etc/uci-defaults/*; do
+ [ -f "$shellscript" ] || continue
+ head -1 "$shellscript" | grep -q '^#!/bin/sh' || continue
+ name="${shellscript#root/}"
+ n_tests=$((n_tests + 1))
+ if sh -n "$shellscript" 2>/dev/null; then
+ pass "sh -n $name"
+ else
+ fail "sh -n $name" "$(sh -n "$shellscript" 2>&1)"
+ fi
+done
+
+###############################################################################
+# SUMMARY #
+###############################################################################
+
+printf "\nRan %d tests, %d passed, %d failed\n" $n_tests $((n_tests - n_fails)) $n_fails
+exit $n_fails
--- /dev/null
+#!/bin/sh
+# Minimal jshn stub for list command
+__json_items=""
+__json_cur=""
+__json_depth=0
+json_init() { __json_items=""; __json_cur=""; __json_depth=0; }
+json_add_object() {
+ if [ $__json_depth -eq 0 ]; then
+ __json_cur="\"$1\":{"
+ else
+ __json_cur="${__json_cur}\"$1\":{"
+ fi
+ __json_depth=$((__json_depth+1))
+}
+json_add_string() { __json_cur="${__json_cur}\"$1\":\"$2\","; }
+json_close_object() {
+ __json_cur="${__json_cur%,}}"
+ __json_depth=$((__json_depth-1))
+ if [ $__json_depth -eq 0 ]; then
+ __json_items="${__json_items:+${__json_items},}${__json_cur}"
+ __json_cur=""
+ else
+ __json_cur="${__json_cur},"
+ fi
+}
+json_dump() { echo "{${__json_items}}"; }
+json_cleanup() { __json_items=""; __json_cur=""; }
git.99rst.org / openwrt-luci.git / commitdiff