diff --git a/.travis.yml b/.travis.yml index 3c25028..1e79c51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,9 +27,4 @@ script: - if [[ "$TRAVIS_PHP_VERSION" == "7.3" ]]; then vendor/bin/psalm; fi after_success: - # Codecov, need to edit bash uploader for incorrect TRAVIS_PYTHON_VERSION environment variable matching, at least until codecov/codecov-bash#133 is resolved - - curl -s https://codecov.io/bash > .codecov - - sed -i -e 's/TRAVIS_.*_VERSION/^TRAVIS_.*_VERSION=/' .codecov - - chmod +x .codecov - - if [[ $TRAVIS_PHP_VERSION == "5.6" ]]; then ./.codecov -X gcov; fi -# - if [[ "$TRAVIS_PHP_VERSION" == "5.6" ]]; then bash <(curl -s https://codecov.io/bash); fi + - if [[ "$TRAVIS_PHP_VERSION" == "5.6" ]]; then bash <(curl -s https://codecov.io/bash); fi diff --git a/LICENSE b/LICENSE index 0a04128..a345e48 100644 --- a/LICENSE +++ b/LICENSE @@ -1,165 +1,459 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser 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 -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +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 this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +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 +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser 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 Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "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 +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY 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 +LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + \ No newline at end of file diff --git a/.codecov.yml b/codecov.yml similarity index 100% rename from .codecov.yml rename to codecov.yml diff --git a/composer.json b/composer.json index 9d8390e..f23f550 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "The metarefresh module will download and parse metadata documents and store them locally", "type": "simplesamlphp-module", "keywords": ["simplesamlphp", "metarefresh"], - "license": "LGPL-3.0-or-later", + "license": "LGPL-2.1-or-later", "authors": [ { "name": "Andreas Åkre Solberg", @@ -31,7 +31,7 @@ "simplesamlphp/composer-module-installer": "~1.1" }, "require-dev": { - "simplesamlphp/simplesamlphp": "^1.17", + "simplesamlphp/simplesamlphp": "^1.18", "phpunit/phpunit": "~5.7" }, "support": { diff --git a/docs/simplesamlphp-automated_metadata.md b/docs/simplesamlphp-automated_metadata.md index 81568a0..fdf33ec 100644 --- a/docs/simplesamlphp-automated_metadata.md +++ b/docs/simplesamlphp-automated_metadata.md @@ -103,6 +103,38 @@ Here's an example of a possible configuration for both the Kalmar Federation and 'outputDir' => 'metadata/metarefresh-ukaccess/', 'outputFormat' => 'serialize', ], + 'edugain' => [ + 'cron' => ['daily'], + 'sources' => [ + [ + 'src' => 'https://metadata.surfconext.nl/edugain-downstream.xml', + 'certificates' => [ + 'SURFconext-metadata-signer.pem', + ], + ], + ], + 'attributewhitelist' => [ + [ + '#EntityAttributes#' => [ + '#urn:oasis:names:tc:SAML:attribute:assurance-certification#' + => ['#https://refeds.org/sirtfi#'], + '#http://macedir.org/entity-category-support#' + => ['#http://refeds.org/category/research-and-scholarship#'], + ], + ], + [ + '#RegistrationInfo#' => [ + '#registrationAuthority#' + => '#http://www.surfconext.nl/#', + ], + '#EntityAttributes#' => [ + '#urn:oasis:names:tc:SAML:attribute:assurance-certification#' + => ['#https://refeds.org/sirtfi#'], + ], + ], + ], + ], + ], ] ]; @@ -171,8 +203,8 @@ Each metadata source has the following options: generate the final metadata array. `types` -: Same as the option with the same name at the metadata set level. This option has precedence when both are specified, - allowing a more fine grained configuration for every metadata source. +: Same as the option with the same name at the metadata set level. This option has precedence when both are specified, + allowing a more fine grained configuration for every metadata source. `whitelist` : This is an array that allows for selectively refreshing a list of identity providers. Only data from identity @@ -183,6 +215,18 @@ Each metadata source has the following options: : This is an array that allows for selectively skipping a list of identity providers. Only data from identity providers that do not appear in the blacklist are processed and written to disk. +`attributewhitelist` +: This is a multilevel array for selectively refreshing a list of identity providers based on specific attributes + patterns in their metadata. Only data from identity providers that match at least one element of the top-level array + will be processed and written to disk. + Matching of such a top-level element, itself being a (multi-level) array, means that at each level (recursively) the + key and value match with the identity provider's metadata. Scalar keys and values are matched using PCRE. + A typical use-case is to accept only identity providers from eduGAIN that match a combination of specific + EntityAttributes, such as the https://refeds.org/sirtfi assurance-certification *and* + http://refeds.org/category/research-and-scholarship entity-category. + Another example is filtering identity providers from a specific federation, by filtering on specific values of the + registrationAuthority inside the RegistrationInfo. + After you have configured the metadata sources, you need to give the web-server write access to the output directories. Following the previous example: diff --git a/hooks/hook_cron.php b/hooks/hook_cron.php index b6b83f0..697086b 100644 --- a/hooks/hook_cron.php +++ b/hooks/hook_cron.php @@ -56,9 +56,10 @@ function metarefresh_hook_cron(&$croninfo) $metaloader = new \SimpleSAML\Module\metarefresh\MetaLoader($expire, $stateFile, $oldMetadataSrc); - // Get global blacklist, whitelist and caching info + // Get global blacklist, whitelist, attributewhitelist and caching info $blacklist = $mconfig->getArray('blacklist', []); $whitelist = $mconfig->getArray('whitelist', []); + $attributewhitelist = $mconfig->getArray('attributewhitelist', []); $conditionalGET = $mconfig->getBoolean('conditionalGET', false); // get global type filters @@ -93,6 +94,13 @@ function metarefresh_hook_cron(&$croninfo) $source['whitelist'] = $whitelist; } + # Merge global and src specific attributewhitelists: cannot use array_unique for multi-dim. + if (isset($source['attributewhitelist'])) { + $source['attributewhitelist'] = array_merge($source['attributewhitelist'], $attributewhitelist); + } else { + $source['attributewhitelist'] = $attributewhitelist; + } + // Let src specific conditionalGET override global one if (!isset($source['conditionalGET'])) { $source['conditionalGET'] = $conditionalGET; diff --git a/lib/MetaLoader.php b/lib/MetaLoader.php index 625fbd8..0f16301 100644 --- a/lib/MetaLoader.php +++ b/lib/MetaLoader.php @@ -2,9 +2,13 @@ namespace SimpleSAML\Module\metarefresh; +use Exception; use RobRichards\XMLSecLibs\XMLSecurityDSig; +use SAML2\DOMDocumentFactory; use SimpleSAML\Configuration; use SimpleSAML\Logger; +use SimpleSAML\Metadata; +use SimpleSAML\Utils; /** * @package SimpleSAMLphp @@ -57,6 +61,10 @@ public function __construct($expire = null, $stateFile = null, $oldMetadataSrc = if (!is_null($stateFile) && is_readable($stateFile)) { include($stateFile); } + + if (isset($state)) { + $this->state = $state; + } } @@ -101,9 +109,11 @@ public function loadSource(array $source) // GET! try { - list($data, $responseHeaders) = \SimpleSAML\Utils\HTTP::fetch($source['src'], $context, true); - } catch (\Exception $e) { - Logger::warning('metarefresh: '.$e->getMessage()); + /** @var array $response We know this because we set the third parameter to `true` */ + $response = Utils\HTTP::fetch($source['src'], $context, true); + list($data, $responseHeaders) = $response; + } catch (Exception $e) { + Logger::warning('metarefresh: ' . $e->getMessage()); } // We have response headers, so the request succeeded @@ -137,9 +147,9 @@ public function loadSource(array $source) try { $entities = $this->loadXML($data, $source); - } catch (\Exception $e) { - Logger::debug('XML parser error when parsing '.$source['src'].' - attempting to re-use cached metadata'); - Logger::debug('XML parser returned: '.$e->getMessage()); + } catch (Exception $e) { + Logger::debug('XML parser error when parsing ' . $source['src'] . ' - attempting to re-use cached metadata'); + Logger::debug('XML parser returned: ' . $e->getMessage()); $this->addCachedMetadata($source); return; } @@ -159,7 +169,31 @@ public function loadSource(array $source) } } - if (array_key_exists('certificates', $source) && $source['certificates'] !== null) { + /* Do we have an attribute whitelist? */ + if (isset($source['attributewhitelist']) && !empty($source['attributewhitelist'])) { + $idpMetadata = $entity->getMetadata20IdP(); + if (!isset($idpMetadata)) { + /* Skip non-IdPs */ + continue; + } + + /* Do a recursive comparison for each whitelist of the attributewhitelist with the idpMetadata for this + * IdP. At least one of these whitelists should match */ + $match = false; + foreach ($source['attributewhitelist'] as $whitelist) { + if ($this->containsArray($whitelist, $idpMetadata)) { + $match = true; + break; + } + } + if (!$match) { + /* No match found -> next IdP */ + continue; + } + Logger::debug('Whitelisted entityID: ' . $entity->getEntityID()); + } + + if (array_key_exists('certificates', $source) && ($source['certificates'] !== null)) { if (!$entity->validateSignature($source['certificates'])) { Logger::info( 'Skipping "'.$entity->getEntityId().'" - could not verify signature using certificate.'."\n" @@ -218,6 +252,70 @@ public function loadSource(array $source) } + /* + * Recursively checks whether array $dst contains array $src. If $src + * is not an array, a literal comparison is being performed. + */ + private function containsArray($src, $dst) + { + if (is_array($src)) { + if (!is_array($dst)) { + return false; + } + $dstKeys = array_keys($dst); + + /* Loop over all src keys */ + foreach ($src as $srcKey => $srcval) { + if (is_int($srcKey)) { + /* key is number, check that the key appears as one + * of the destination keys: if not, then src has + * more keys than dst */ + if (!array_key_exists($srcKey, $dst)) { + return false; + } + + /* loop over dest keys, to find value: we don't know + * whether they are in the same order */ + $submatch = false; + foreach ($dstKeys as $dstKey) { + if ($this->containsArray($srcval, $dst[$dstKey])) { + $submatch = true; + break; + } + } + if (!$submatch) { + return false; + } + } else { + /* key is regexp: find matching keys */ + /** @var array|false $matchingDstKeys */ + $matchingDstKeys = preg_grep($srcKey, $dstKeys); + if (!is_array($matchingDstKeys)) { + return false; + } + + $match = false; + foreach ($matchingDstKeys as $dstKey) { + if ($this->containsArray($srcval, $dst[$dstKey])) { + /* Found a match */ + $match = true; + break; + } + } + if (!$match) { + /* none of the keys has a matching value */ + return false; + } + } + } + /* each src key/value matches */ + return true; + } else { + /* src is not an array, do a regexp match against dst */ + return (preg_match($src, $dst) === 1); + } + } + /** * Create HTTP context, with any available caches taken into account * @@ -311,14 +409,11 @@ private function saveState(array $source, $responseHeaders) private function loadXML($data, array $source) { try { - $doc = \SAML2\DOMDocumentFactory::fromString($data); - } catch (\Exception $e) { - throw new \Exception('Failed to read XML from '.$source['src']); - } - if ($doc->documentElement === null) { - throw new \Exception('Opened file is not an XML document: '.$source['src']); + $doc = DOMDocumentFactory::fromString($data); + } catch (Exception $e) { + throw new Exception('Failed to read XML from ' . $source['src']); } - return \SimpleSAML\Metadata\SAMLParser::parseDescriptorsElement($doc->documentElement); + return Metadata\SAMLParser::parseDescriptorsElement($doc->documentElement); } @@ -329,9 +424,9 @@ private function loadXML($data, array $source) */ public function writeState() { - if ($this->changed) { - Logger::debug('Writing: '.$this->stateFile); - \SimpleSAML\Utils\System::writeFile( + if ($this->changed && !is_null($this->stateFile)) { + Logger::debug('Writing: ' . $this->stateFile); + Utils\System::writeFile( $this->stateFile, "getTime().".\n". " Do not update it manually as it will get overwritten. */\n". @@ -433,7 +528,7 @@ public function writeARPfile(Configuration $config) } // $metadata, $attributemap, $prefix, $suffix - $arp = new \SimpleSAML\Module\metarefresh\ARP( + $arp = new ARP( $md, $config->getValue('attributemap', ''), $config->getValue('prefix', ''), @@ -464,7 +559,7 @@ public function writeMetadataFiles($outputDir) Logger::info('Creating directory: '.$outputDir."\n"); $res = @mkdir($outputDir, 0777, true); if ($res === false) { - throw new \Exception('Error creating directory: '.$outputDir); + throw new Exception('Error creating directory: ' . $outputDir); } } @@ -486,7 +581,7 @@ public function writeMetadataFiles($outputDir) $content .= "\n".'?>'; - \SimpleSAML\Utils\System::writeFile($filename, $content, 0644); + Utils\System::writeFile($filename, $content, 0644); } elseif (is_file($filename)) { if (unlink($filename)) { Logger::debug('Deleting stale metadata file: '.$filename); @@ -508,7 +603,7 @@ public function writeMetadataSerialize($outputDir) { assert(is_string($outputDir)); - $metaHandler = new \SimpleSAML\Metadata\MetaDataStorageHandlerSerialize(['directory' => $outputDir]); + $metaHandler = new Metadata\MetaDataStorageHandlerSerialize(['directory' => $outputDir]); // First we add all the metadata entries to the metadata handler foreach ($this->metadata as $set => $elements) { @@ -527,21 +622,26 @@ public function writeMetadataSerialize($outputDir) $ct = time(); foreach ($metaHandler->getMetadataSets() as $set) { foreach ($metaHandler->getMetadataSet($set) as $entityId => $metadata) { - if (!array_key_exists('expire', $metadata)) { + if (!array_key_exists('expire', $metadata) || !is_int($metadata['expire'])) { Logger::warning( - 'metarefresh: Metadata entry without expire timestamp: '.var_export($entityId, true). - ' in set '.var_export($set, true).'.' + 'metarefresh: Metadata entry without valid expire timestamp: ' . var_export($entityId, true) . + ' in set ' . var_export($set, true) . '.' ); continue; } - if ($metadata['expire'] > $ct) { + + $expire = $metadata['expire']; + if ($expire > $ct) { continue; } - Logger::debug('metarefresh: '.$entityId.' expired '.date('l jS \of F Y h:i:s A', $metadata['expire'])); + + /** @var int $stamp */ + $stamp = date('l jS \of F Y h:i:s A', $expire); + Logger::debug('metarefresh: ' . $entityId . ' expired ' . $stamp); Logger::debug( - 'metarefresh: Delete expired metadata entry '. - var_export($entityId, true).' in set '.var_export($set, true). - '. ('.($ct - $metadata['expire']).' sec)' + 'metarefresh: Delete expired metadata entry ' . + var_export($entityId, true) . ' in set ' . var_export($set, true) . + '. (' . ($ct - $expire) . ' sec)' ); $metaHandler->deleteMetadata($entityId, $set); } diff --git a/tests/lib/MetaLoaderTest.php b/tests/lib/MetaLoaderTest.php index d70d415..886d56f 100644 --- a/tests/lib/MetaLoaderTest.php +++ b/tests/lib/MetaLoaderTest.php @@ -39,6 +39,17 @@ class MetaLoaderTest extends TestCase ], ], 'scope' => ['example.com',], + 'RegistrationInfo' => [ + 'registrationAuthority' => 'http://www.surfconext.nl/', + ], + 'EntityAttributes' => [ + 'urn:oasis:names:tc:SAML:attribute:assurance-certification' => [ + 0 => 'https://refeds.org/sirtfi', + ], + 'http://macedir.org/entity-category-support' => [ + 0 => 'http://refeds.org/category/research-and-scholarship', + ], + ], 'UIInfo' => [ 'DisplayName' => ['en' => 'DisplayName',], 'Description' => ['en' => 'Description',], @@ -142,4 +153,106 @@ public function testWriteMetadataFiles() $metadata['https://idp.example.com/idp/shibboleth'] ); } -} \ No newline at end of file + + /* + * Test two matching EntityAttributes (R&S + Sirtfi) + */ + public function testAttributewhitelist1() + { + $this->source['attributewhitelist'] = [ + [ + '#EntityAttributes#' => [ + '#urn:oasis:names:tc:SAML:attribute:assurance-certification#' + => ['#https://refeds.org/sirtfi#'], + '#http://macedir.org/entity-category-support#' + => ['#http://refeds.org/category/research-and-scholarship#'], + ], + ], + ]; + $this->metaloader->loadSource($this->source); + $this->metaloader->dumpMetadataStdOut(); + /* match a line from the cert before we attempt to parse */ + $this->expectOutputRegex('/UTEbMBkGA1UECgwSRXhhbXBsZSBVbml2ZXJzaXR5MRgwFgYDVQQDDA9pZHAuZXhh/'); + + $output = $this->getActualOutput(); + try { + eval($output); + } catch (\Exception $e) { + $this->fail('Metarefresh does not produce syntactially valid code'); + } + /* Check we matched the IdP */ + $this->assertArrayHasKey('https://idp.example.com/idp/shibboleth', $metadata); + + $this->assertTrue( + empty(array_diff_key($this->expected, $metadata['https://idp.example.com/idp/shibboleth'])) + ); + } + + /* + * Test non-matching of the whitelist: result should be empty set + */ + public function testAttributewhitelist2() + { + $this->source['attributewhitelist'] = [ + [ + '#EntityAttributes#' => [ + '#urn:oasis:names:tc:SAML:attribute:assurance-certification#' + => ['#https://refeds.org/sirtfi#'], + '#http://macedir.org/entity-category-support#' + => ['#http://clarin.eu/category/clarin-member#'], + ], + ], + ]; + $this->metaloader->loadSource($this->source); + $this->metaloader->dumpMetadataStdOut(); + + /* Expected output is empty */ + $output = $this->getActualOutput(); + $this->assertEmpty($output); + } + + /* + * Test non-matching of first entry, but matching of second, using both + * RegistrationInfo and EntityAttributes + */ + public function testAttributewhitelist3() + { + $this->source['attributewhitelist'] = [ + [ + '#EntityAttributes#' => [ + '#urn:oasis:names:tc:SAML:attribute:assurance-certification#' + => ['#https://refeds.org/sirtfi#'], + '#http://macedir.org/entity-category-support#' + => ['#http://clarin.eu/category/clarin-member#'], + ], + ], + [ + '#RegistrationInfo#' => [ + '#registrationAuthority#' + => '#http://www.surfconext.nl/#', + ], + '#EntityAttributes#' => [ + '#urn:oasis:names:tc:SAML:attribute:assurance-certification#' + => ['#https://refeds.org/sirtfi#'], + ], + ], + ]; + $this->metaloader->loadSource($this->source); + $this->metaloader->dumpMetadataStdOut(); + /* match a line from the cert before we attempt to parse */ + $this->expectOutputRegex('/UTEbMBkGA1UECgwSRXhhbXBsZSBVbml2ZXJzaXR5MRgwFgYDVQQDDA9pZHAuZXhh/'); + + $output = $this->getActualOutput(); + try { + eval($output); + } catch (\Exception $e) { + $this->fail('Metarefresh does not produce syntactially valid code'); + } + /* Check we matched the IdP */ + $this->assertArrayHasKey('https://idp.example.com/idp/shibboleth', $metadata); + + $this->assertTrue( + empty(array_diff_key($this->expected, $metadata['https://idp.example.com/idp/shibboleth'])) + ); + } +} diff --git a/tests/mdx.pem b/tests/mdx.pem index e5049b0..0837fde 100644 --- a/tests/mdx.pem +++ b/tests/mdx.pem @@ -1,12 +1,12 @@ -----BEGIN CERTIFICATE----- -MIIBrTCCARYCCQCS5gsoFmLx7DANBgkqhkiG9w0BAQsFADAbMQswCQYDVQQGEwJB -UTEMMAoGA1UEAwwDTURYMB4XDTE5MDEwNzA2NDMwMFoXDTM3MDMyNTA2NDMwMFow -GzELMAkGA1UEBhMCQVExDDAKBgNVBAMMA01EWDCBnzANBgkqhkiG9w0BAQEFAAOB -jQAwgYkCgYEAwXXyCkAJOkpece1pe36O9sURMO8RA7guGxdGVmvOfPP/9KYQ3FCA -vjcZQVvkYP006Cgfzy8eSSrXppbINI/TkxtExIfCRReGwAJQQjesOWVvKECRg+zk -s0VZomIHVzxOoZYDofan1H2q+Pbght5W/GsfRSgBI7RnpgAYATXg/W0CAwEAATAN -BgkqhkiG9w0BAQsFAAOBgQBmNI2M5QTEKpbrhGqozelCFK3pZfMOa1EjkeZY4NjI -D3yjdbWi9+9LDOuehuB1LGNvTqxpwikxS9di2h4cnzHGX9adh/DUOVWmCI3FiLF+ -po/upTEJzuRUzkn1YHLdeDuWmX/29ayZ2rPxucw8voVVDLOMetTKFMSWGxBeQ8cu -Gw== +MIIBrTCCARYCCQC8Ue6scWtEDTANBgkqhkiG9w0BAQsFADAbMQswCQYDVQQGEwJB +UTEMMAoGA1UEAxMDTURYMB4XDTIwMDYxMDEzNTY1NFoXDTM3MDYwNjEzNTY1NFow +GzELMAkGA1UEBhMCQVExDDAKBgNVBAMTA01EWDCBnzANBgkqhkiG9w0BAQEFAAOB +jQAwgYkCgYEAuvq7p0XbdVNDpb4sMhB+rPRDUR/K0htSa3yBrINsdOoBLW67foY0 +rkypFRwmDX/bpe1Ik+hmaJgtdYCnFmlhlAU3mbaByL/q3I9DVVY4OgbC0jjWoy+7 ++wP0/mf7onljzwSQO4jjcUWcx/upDVFYXci3UZjUhCTnu7RO1EAk6isCAwEAATAN +BgkqhkiG9w0BAQsFAAOBgQB3J1oskvJqXoDJzSoGJmahLoDacF01OkXOtxRPtcOc +RvBfakZGC2FtjHLTdyqz+dpcJsfYupBwavFxNunG6K2+d093j387TH7PyA5AckfL +rOTR1iS4akp0yX7wvV2WWYRIXodnVHFGC0f25ZumkbL1vAkUd7q28zNcWIds8O2p ++g== -----END CERTIFICATE----- diff --git a/tests/testmetadata.xml b/tests/testmetadata.xml index 53d390b..d5fa27d 100644 --- a/tests/testmetadata.xml +++ b/tests/testmetadata.xml @@ -1,39 +1,23 @@ - - - - - - - - - - - - eMUdeshvk+dcatUsFxyAr0qzAsY= - - - Yu+ZjVo2wMofiBo4S/owIFm88iFC4HAHMA6gLLaBHF/YlR1VO5c9NfHCDmRznWCz -T+87yw9GsBvPvZkO8ZBfgPK5ViRTQuk1TUr6gFHpG6/U+iNS7tjcS/HGJx4rPIqA -sXC5ybCj2OBP1ksgB0fs+HODQ4vaSyeBxXqk83HB1sQ= - - - - MIIBrTCCARYCCQCS5gsoFmLx7DANBgkqhkiG9w0BAQsFADAbMQswCQYDVQQGEwJB - UTEMMAoGA1UEAwwDTURYMB4XDTE5MDEwNzA2NDMwMFoXDTM3MDMyNTA2NDMwMFow - GzELMAkGA1UEBhMCQVExDDAKBgNVBAMMA01EWDCBnzANBgkqhkiG9w0BAQEFAAOB - jQAwgYkCgYEAwXXyCkAJOkpece1pe36O9sURMO8RA7guGxdGVmvOfPP/9KYQ3FCA - vjcZQVvkYP006Cgfzy8eSSrXppbINI/TkxtExIfCRReGwAJQQjesOWVvKECRg+zk - s0VZomIHVzxOoZYDofan1H2q+Pbght5W/GsfRSgBI7RnpgAYATXg/W0CAwEAATAN - BgkqhkiG9w0BAQsFAAOBgQBmNI2M5QTEKpbrhGqozelCFK3pZfMOa1EjkeZY4NjI - D3yjdbWi9+9LDOuehuB1LGNvTqxpwikxS9di2h4cnzHGX9adh/DUOVWmCI3FiLF+ - po/upTEJzuRUzkn1YHLdeDuWmX/29ayZ2rPxucw8voVVDLOMetTKFMSWGxBeQ8cu - Gw== - - - - + + + + AUPsWdEcgoYY+ykZD4Ns7dCtGPIgxH4shMd6CRNQ0r0=meQHjxJn2zLgbWCzvvUil6FTwctrr/vEpUUkTFdKspkN8IVmNW1N5WvLZdk7mRrsl161I4BMDc0q+ndlYd+VTjsEf+dVQ4m0+RWRBp/+Q95oGn0ARq/scKH9fZiDNeIZCoRU/Q3mErzGYY0WasM8byZJinJo7WDyMKwhMddX/0k= +MIIBrTCCARYCCQC8Ue6scWtEDTANBgkqhkiG9w0BAQsFADAbMQswCQYDVQQGEwJBUTEMMAoGA1UEAxMDTURYMB4XDTIwMDYxMDEzNTY1NFoXDTM3MDYwNjEzNTY1NFowGzELMAkGA1UEBhMCQVExDDAKBgNVBAMTA01EWDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuvq7p0XbdVNDpb4sMhB+rPRDUR/K0htSa3yBrINsdOoBLW67foY0rkypFRwmDX/bpe1Ik+hmaJgtdYCnFmlhlAU3mbaByL/q3I9DVVY4OgbC0jjWoy+7+wP0/mf7onljzwSQO4jjcUWcx/upDVFYXci3UZjUhCTnu7RO1EAk6isCAwEAATANBgkqhkiG9w0BAQsFAAOBgQB3J1oskvJqXoDJzSoGJmahLoDacF01OkXOtxRPtcOcRvBfakZGC2FtjHLTdyqz+dpcJsfYupBwavFxNunG6K2+d093j387TH7PyA5AckfLrOTR1iS4akp0yX7wvV2WWYRIXodnVHFGC0f25ZumkbL1vAkUd7q28zNcWIds8O2p+g== + + + https://wiki.surfnet.nl/display/eduGAIN/EduGAIN + + + + https://refeds.org/sirtfi + + + http://refeds.org/category/research-and-scholarship + + + example.com diff --git a/www/fetch.php b/www/fetch.php index a715886..3bca685 100644 --- a/www/fetch.php +++ b/www/fetch.php @@ -24,6 +24,7 @@ # Get global black/whitelists $blacklist = $mconfig->getArray('blacklist', []); $whitelist = $mconfig->getArray('whitelist', []); + $attributewhitelist = $mconfig->getArray('attributewhitelist', []); // get global type filters $available_types = [ @@ -57,7 +58,16 @@ $source['whitelist'] = $whitelist; } - \SimpleSAML\Logger::debug('[metarefresh]: In set ['.$setkey.'] loading source ['.$source['src'].']'); + # Merge global and src specific attributewhitelists, cannot use array_unique on multi-dim. + if (isset($source['attributewhitelist'])) { + $source['attributewhitelist'] = array_merge($source['attributewhitelist'], $attributewhitelist); + } else { + $source['attributewhitelist'] = $attributewhitelist; + } + + \SimpleSAML\Logger::debug( + '[metarefresh]: In set [' . $setkey . '] loading source [' . $source['src'] . ']' + ); $metaloader->loadSource($source); }