diff -Nru php-horde-lock-2.1.3/debian/changelog php-horde-lock-2.1.4/debian/changelog --- php-horde-lock-2.1.3/debian/changelog 2016-07-06 22:11:15.000000000 +0000 +++ php-horde-lock-2.1.4/debian/changelog 2016-09-09 10:56:29.000000000 +0000 @@ -1,3 +1,9 @@ +php-horde-lock (2.1.4-1) unstable; urgency=medium + + * New upstream version 2.1.4 + + -- Mathieu Parent Fri, 09 Sep 2016 12:56:29 +0200 + php-horde-lock (2.1.3-1) unstable; urgency=medium * New upstream version 2.1.3 diff -Nru php-horde-lock-2.1.3/Horde_Lock-2.1.3/doc/Horde/Lock/COPYING php-horde-lock-2.1.4/Horde_Lock-2.1.3/doc/Horde/Lock/COPYING --- php-horde-lock-2.1.3/Horde_Lock-2.1.3/doc/Horde/Lock/COPYING 2016-07-02 16:55:57.000000000 +0000 +++ php-horde-lock-2.1.4/Horde_Lock-2.1.3/doc/Horde/Lock/COPYING 1970-01-01 00:00:00.000000000 +0000 @@ -1,458 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - 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 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 diff -Nru php-horde-lock-2.1.3/Horde_Lock-2.1.3/lib/Horde/Lock/Exception.php php-horde-lock-2.1.4/Horde_Lock-2.1.3/lib/Horde/Lock/Exception.php --- php-horde-lock-2.1.3/Horde_Lock-2.1.3/lib/Horde/Lock/Exception.php 2016-07-02 16:55:57.000000000 +0000 +++ php-horde-lock-2.1.4/Horde_Lock-2.1.3/lib/Horde/Lock/Exception.php 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ - - * @category Horde - * @package Lock - */ -class Horde_Lock_Exception extends Horde_Exception_Wrapped -{ -} diff -Nru php-horde-lock-2.1.3/Horde_Lock-2.1.3/lib/Horde/Lock/Mongo.php php-horde-lock-2.1.4/Horde_Lock-2.1.3/lib/Horde/Lock/Mongo.php --- php-horde-lock-2.1.3/Horde_Lock-2.1.3/lib/Horde/Lock/Mongo.php 2016-07-02 16:55:57.000000000 +0000 +++ php-horde-lock-2.1.4/Horde_Lock-2.1.3/lib/Horde/Lock/Mongo.php 1970-01-01 00:00:00.000000000 +0000 @@ -1,311 +0,0 @@ - - * @category Horde - * @copyright 2013-2016 Horde LLC - * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 - * @package Lock - */ -class Horde_Lock_Mongo extends Horde_Lock -{ - /* Field names. */ - const EXPIRY_TS = 'expiry_ts'; - const LID = 'lid'; - const ORIGIN_TS = 'origin_ts'; - const OWNER = 'owner'; - const PRINCIPAL = 'principal'; - const SCOPE = 'scope'; - const TYPE = 'type'; - const UPDATE_TS = 'update_ts'; - - /** - * The MongoDB Collection object for the cache data. - * - * @var MongoCollection - */ - protected $_db; - - /** - * Ugly hack: lock driver written with assumption that it returns data - * as defined by SQL columns. So need to do mapping in this driver. - * - * @var array - */ - protected $_map = array( - self::EXPIRY_TS => 'lock_expiry_timestamp', - self::LID => 'lock_id', - self::ORIGIN_TS => 'lock_origin_timestamp', - self::OWNER => 'lock_owner', - self::PRINCIPAL => 'lock_principal', - self::SCOPE => 'lock_scope', - self::TYPE => 'lock_type', - self::UPDATE_TS => 'lock_update_timestamp' - ); - - /** - * Constructor. - * - * @param array $params Parameters: - * 
-     *   - collection: (string) The collection name.
-     *   - mongo_db: [REQUIRED] (Horde_Mongo_Client) A MongoDB client object.
-     *
- */ - public function __construct(array $params = array()) - { - if (!isset($params['mongo_db'])) { - throw new InvalidArgumentException('Missing mongo_db parameter.'); - } - - parent::__construct(array_merge(array( - 'collection' => 'horde_locks' - ), $params)); - - $this->_db = $this->_params['mongo_db'] - ->selectCollection(null, $this->_params['collection']); - } - - /** - * Destructor. - */ - public function __destruct() - { - if (!rand(0, 999)) { - $this->gc(); - } - } - - /** - */ - public function getLockInfo($lockid) - { - $query = array( - self::LID => $lockid, - '$or' => array( - array(self::EXPIRY_TS => array('$gte' => time()),), - array(self::EXPIRY_TS => Horde_Lock::PERMANENT) - ) - ); - - try { - return $this->_mapFields($this->_db->findOne($query)); - } catch (MongoException $e) { - throw new Horde_Lock_Exception($e); - } - } - - /** - */ - public function getLocks($scope = null, $principal = null, $type = null) - { - $query = array( - '$or' => array( - array(self::EXPIRY_TS => array('$gte' => time()),), - array(self::EXPIRY_TS => Horde_Lock::PERMANENT) - ) - ); - - // Check to see if we need to filter the results - if (!empty($principal)) { - $query[self::PRINCIPAL] = $principal; - } - if (!empty($scope)) { - $query[self::SCOPE] = $scope; - } - if (!empty($type)) { - $query[self::TYPE] = $type; - } - - try { - $result = $this->_db->find($query); - } catch (MongoException $e) { - throw new Horde_Lock_Exception($e); - } - - $locks = array(); - foreach ($result as $val) { - $locks[$val[self::LID]] = $this->_mapFields($val); - } - - return $locks; - } - - /** - */ - public function resetLock($lockid, $lifetime) - { - if (!$this->getLockInfo($lockid)) { - return false; - } - - $now = time(); - $expiration = ($lifetime == Horde_Lock::PERMANENT) - ? Horde_Lock::PERMANENT - : ($now + $lifetime); - - try { - $this->_db->update( - array( - self::EXPIRY_TS => array('$ne' => Horde_Lock::PERMANENT), - self::LID => $lockid - ), - array( - '$set' => array( - self::EXPIRY_TS => $expiration, - self::UPDATE_TS => $now - ) - ) - ); - } catch (MongoException $e) { - throw new Horde_Lock_Exception($e); - } - - return true; - } - - /** - */ - public function setLock($requestor, $scope, $principal, - $lifetime = 1, $type = Horde_Lock::TYPE_SHARED) - { - $oldlocks = $this->getLocks( - $scope, - $principal, - ($type == Horde_Lock::TYPE_SHARED) ? Horde_Lock::TYPE_EXCLUSIVE : null - ); - - if (count($oldlocks) != 0) { - // A lock exists. Deny the new request. - if ($this->_logger) { - $this->_logger->log( - sprintf( - 'Lock requested for %s denied due to existing lock.', - $principal - ), - 'NOTICE' - ); - } - return false; - } - - $lockid = strval(new Horde_Support_Uuid()); - - $now = time(); - $expiration = ($lifetime == Horde_Lock::PERMANENT) - ? Horde_Lock::PERMANENT - : ($now + $lifetime); - - try { - $doc = array( - self::EXPIRY_TS => $expiration, - self::LID => $lockid, - self::ORIGIN_TS => $now, - self::OWNER => $requestor, - self::PRINCIPAL => $principal, - self::SCOPE => $scope, - self::TYPE => $type, - self::UPDATE_TS => $now - ); - $this->_db->insert($doc); - } catch (MongoException $e) { - throw new Horde_Lock_Exception($e); - } - - if ($this->_logger) { - $this->_logger->log( - sprintf( - 'Lock %s set successfully by %s in scope %s on "%s"', - $lockid, $requestor, $scope, $principal - ), - 'DEBUG' - ); - } - - return $lockid; - } - - /** - */ - public function clearLock($lockid) - { - if (empty($lockid)) { - throw new Horde_Lock_Exception('Must supply a valid lock ID.'); - } - - try { - /* Since we're trying to clear the lock we don't care whether it is - * still valid or not. Unconditionally remove it. */ - $this->_db->remove(array(self::LID => $lockid)); - } catch (MongoException $e) { - throw new Horde_Lock_Exception($e); - } - - if ($this->_logger) { - $this->_logger->log( - sprintf('Lock %s cleared successfully.', $lockid), 'DEBUG' - ); - } - - return true; - } - - /** - * Do garbage collection needed for the driver. - */ - public function gc() - { - try { - $result = $this->_db->remove(array( - self::EXPIRY_TS => array( - '$lt' => time(), - '$ne' => Horde_Lock::PERMANENT - ) - )); - - if ($this->_logger) { - $this->_logger->log( - sprintf( - 'Lock garbage collection cleared %d locks.', - $result['n'] - ), - 'DEBUG' - ); - } - } catch (MongoException $e) {} - } - - /** - * Map return to SQL fields. - * - * @return array - */ - protected function _mapFields($res) - { - $out = array(); - - if ($res) { - foreach ($res as $key => $val) { - if (isset($this->_map[$key])) { - $out[$this->_map[$key]] = $val; - } - } - } - - return $out; - } - -} diff -Nru php-horde-lock-2.1.3/Horde_Lock-2.1.3/lib/Horde/Lock/Null.php php-horde-lock-2.1.4/Horde_Lock-2.1.3/lib/Horde/Lock/Null.php --- php-horde-lock-2.1.3/Horde_Lock-2.1.3/lib/Horde/Lock/Null.php 2016-07-02 16:55:57.000000000 +0000 +++ php-horde-lock-2.1.4/Horde_Lock-2.1.3/lib/Horde/Lock/Null.php 1970-01-01 00:00:00.000000000 +0000 @@ -1,123 +0,0 @@ - - * @category Horde - * @package Lock - */ -class Horde_Lock_Null extends Horde_Lock -{ - /** - * Return an array of information about the requested lock. - * - * @param string $lockid Lock ID to look up. - * - * @return array Lock information. - * @throws Horde_Lock_Exception - */ - public function getLockInfo($lockid) - { - return array(); - } - - /** - * Return a list of valid locks with the option to limit the results - * by principal, scope and/or type. - * - * @param string $scope The scope of the lock. Typically the name of - * the application requesting the lock or some - * other identifier used to group locks together. - * @param string $principal Principal for which to check for locks - * @param integer $type Only return locks of the given type. - * Defaults to null, or all locks - * - * @return array Array of locks with the ID as the key and the lock details - * as the value. If there are no current locks this will - * return an empty array. - * @throws Horde_Lock_Exception - */ - public function getLocks($scope = null, $principal = null, $type = null) - { - return array(); - } - - /** - * Extend the valid lifetime of a valid lock to now + $extend. - * - * @param string $lockid Lock ID to reset. Must be a valid, non-expired - * lock. - * @param integer $extend Extend lock this many seconds from now. - * - * @return boolean Returns true on success. - * @throws Horde_Lock_Exception - */ - public function resetLock($lockid, $extend) - { - return true; - } - - /** - * Sets a lock on the requested principal and returns the generated lock - * ID. NOTE: No security checks are done in the Horde_Lock API. It is - * expected that the calling application has done all necessary security - * checks before requesting a lock be granted. - * - * @param string $requestor User ID of the lock requestor. - * @param string $scope The scope of the lock. Typically the name of - * the application requesting the lock or some - * other identifier used to group locks - * together. - * @param string $principal A principal on which a lock should be - * granted. The format can be any string but is - * suggested to be in URI form. - * @param integer $lifetime Time (in seconds) for which the lock will be - * considered valid. - * @param string exclusive One of Horde_Lock::TYPE_SHARED or - * Horde_Lock::TYPE_EXCLUSIVE. - * - An exclusive lock will be enforced strictly - * and must be interpreted to mean that the - * resource can not be modified. Only one - * exclusive lock per principal is allowed. - * - A shared lock is one that notifies other - * potential lock requestors that the resource - * is in use. This lock can be overridden - * (cleared or replaced with a subsequent - * call to setLock()) by other users. Multiple - * users may request (and will be granted) a - * shared lock on a given principal. All locks - * will be considered valid until they are - * cleared or expire. - * - * @return mixed A string lock ID. - * @throws Horde_Lock_Exception - */ - public function setLock($requestor, $scope, $principal, $lifetime = 1, - $exclusive = Horde_Lock::TYPE_SHARED) - { - return strval(new Horde_Support_Uuid()); - } - - /** - * Removes a lock given the lock ID. - * NOTE: No security checks are done in the Horde_Lock API. It is - * expected that the calling application has done all necessary security - * checks before requesting a lock be cleared. - * - * @param string $lockid The lock ID as generated by a previous call - * to setLock() - * - * @return boolean Returns true on success. - * @throws Horde_Lock_Exception - */ - public function clearLock($lockid) - { - return true; - } - -} diff -Nru php-horde-lock-2.1.3/Horde_Lock-2.1.3/lib/Horde/Lock/Sql.php php-horde-lock-2.1.4/Horde_Lock-2.1.3/lib/Horde/Lock/Sql.php --- php-horde-lock-2.1.3/Horde_Lock-2.1.3/lib/Horde/Lock/Sql.php 2016-07-02 16:55:57.000000000 +0000 +++ php-horde-lock-2.1.4/Horde_Lock-2.1.3/lib/Horde/Lock/Sql.php 1970-01-01 00:00:00.000000000 +0000 @@ -1,258 +0,0 @@ - - * CREATE TABLE horde_locks ( - * lock_id VARCHAR(36) NOT NULL, - * lock_owner VARCHAR(32) NOT NULL, - * lock_scope VARCHAR(32) NOT NULL, - * lock_principal VARCHAR(255) NOT NULL, - * lock_origin_timestamp BIGINT NOT NULL, - * lock_update_timestamp BIGINT NOT NULL, - * lock_expiry_timestamp BIGINT NOT NULL, - * lock_type TINYINT NOT NULL, - * - * PRIMARY KEY (lock_id) - * ); - * - * - * Copyright 2008-2016 Horde LLC (http://www.horde.org/) - * - * See the enclosed file COPYING for license information (LGPL). If you did - * not receive this file, see http://www.horde.org/licenses/lgpl21. - * - * @author Ben Klang - * @category Horde - * @package Lock - */ -class Horde_Lock_Sql extends Horde_Lock -{ - /** - * Handle for the current database connection. - * - * @var Horde_Db_Adapter - */ - private $_db; - - /** - * Constructor. - * - * @param array $params Parameters: - * 
-     * 'db' - (Horde_Db_Adapter) [REQUIRED] The DB instance.
-     * 'table' - (string) The name of the lock table in 'database'.
-     *           DEFAULT: 'horde_locks'
-     *
- * - * @throws Horde_Lock_Exception - */ - public function __construct($params = array()) - { - if (!isset($params['db'])) { - throw new Horde_Lock_Exception('Missing db parameter.'); - } - $this->_db = $params['db']; - unset($params['db']); - - $params = array_merge(array( - 'table' => 'horde_locks' - ), $params); - - parent::__construct($params); - - /* Only do garbage collection 0.1% of the time we create an object. */ - if (substr(time(), -3) === '000') { - register_shutdown_function(array($this, 'doGC')); - } - } - - /** - * Return an array of information about the requested lock. - * - * @see Horde_Lock_Base::getLockInfo() - */ - public function getLockInfo($lockid) - { - $now = time(); - $sql = 'SELECT lock_id, lock_owner, lock_scope, lock_principal, ' - . 'lock_origin_timestamp, lock_update_timestamp, ' - . 'lock_expiry_timestamp, lock_type FROM ' - . $this->_params['table'] - . ' WHERE lock_id = ? AND ' - . '(lock_expiry_timestamp >= ? OR lock_expiry_timestamp = ?)'; - $values = array($lockid, $now, Horde_Lock::PERMANENT); - - try { - return $this->_db->selectOne($sql, $values); - } catch (Horde_Db_Exception $e) { - throw new Horde_Lock_Exception($e); - } - } - - /** - * Return a list of valid locks with the option to limit the results - * by principal, scope and/or type. - * - * @see Horde_Lock_Base::getLocks() - */ - public function getLocks($scope = null, $principal = null, $type = null) - { - $now = time(); - $sql = 'SELECT lock_id, lock_owner, lock_scope, lock_principal, ' - . 'lock_origin_timestamp, lock_update_timestamp, ' - . 'lock_expiry_timestamp, lock_type FROM ' - . $this->_params['table'] - . ' WHERE (lock_expiry_timestamp >= ? OR lock_expiry_timestamp = ?)'; - $values = array($now, Horde_Lock::PERMANENT); - - // Check to see if we need to filter the results - if (!empty($principal)) { - $sql .= ' AND lock_principal = ?'; - $values[] = $principal; - } - if (!empty($scope)) { - $sql .= ' AND lock_scope = ?'; - $values[] = $scope; - } - if (!empty($type)) { - $sql .= ' AND lock_type = ?'; - $values[] = $type; - } - - try { - $result = $this->_db->selectAll($sql, $values); - } catch (Horde_Db_Exception $e) { - throw new Horde_Lock_Exception($e); - } - - $locks = array(); - foreach ($result as $row) { - $locks[$row['lock_id']] = $row; - } - - return $locks; - } - - /** - * Extend the valid lifetime of a valid lock to now + $lifetime. - * - * @see Horde_Lock_Base::resetLock() - */ - public function resetLock($lockid, $lifetime) - { - $now = time(); - - if (!$this->getLockInfo($lockid)) { - return false; - } - - $expiration = $lifetime == Horde_Lock::PERMANENT ? Horde_Lock::PERMANENT : $now + $lifetime; - - $sql = 'UPDATE ' . $this->_params['table'] . ' SET ' . - 'lock_update_timestamp = ?, lock_expiry_timestamp = ? ' . - 'WHERE lock_id = ? AND lock_expiry_timestamp <> ?'; - $values = array($now, $expiration, $lockid, Horde_Lock::PERMANENT); - - try { - $this->_db->update($sql, $values); - } catch (Horde_Db_Exception $e) { - throw new Horde_Lock_Exception($e); - } - - return true; - } - - /** - * Sets a lock on the requested principal and returns the generated lock - * ID. - * - * @see Horde_Lock_Base::setLock() - */ - public function setLock($requestor, $scope, $principal, - $lifetime = 1, $type = Horde_Lock::TYPE_SHARED) - { - $oldlocks = $this->getLocks( - $scope, $principal, - $type == Horde_Lock::TYPE_SHARED ? Horde_Lock::TYPE_EXCLUSIVE : null); - - if (count($oldlocks) != 0) { - // A lock exists. Deny the new request. - if ($this->_logger) { - $this->_logger->log(sprintf('Lock requested for %s denied due to existing lock.', $principal), 'NOTICE'); - } - return false; - } - - $lockid = (string)new Horde_Support_Uuid(); - - $now = time(); - $expiration = $lifetime == Horde_Lock::PERMANENT ? Horde_Lock::PERMANENT : $now + $lifetime; - $sql = 'INSERT INTO ' . $this->_params['table'] . ' (lock_id, lock_owner, lock_scope, lock_principal, lock_origin_timestamp, lock_update_timestamp, lock_expiry_timestamp, lock_type) VALUES (?, ?, ?, ?, ?, ?, ?, ?)'; - $values = array($lockid, $requestor, $scope, $principal, $now, $now, - $expiration, $type); - - try { - $this->_db->insert($sql, $values); - } catch (Horde_Db_Exception $e) { - throw new Horde_Lock_Exception($e); - } - - if ($this->_logger) { - $this->_logger->log(sprintf('Lock %s set successfully by %s in scope %s on "%s"', $lockid, $requestor, $scope, $principal), 'DEBUG'); - } - - return $lockid; - } - - /** - * Removes a lock given the lock ID. - * - * @see Horde_Lock_Base::clearLock() - */ - public function clearLock($lockid) - { - if (empty($lockid)) { - throw new Horde_Lock_Exception('Must supply a valid lock ID.'); - } - - // Since we're trying to clear the lock we don't care - // whether it is still valid or not. Unconditionally - // remove it. - $sql = 'DELETE FROM ' . $this->_params['table'] . ' WHERE lock_id = ?'; - $values = array($lockid); - - try { - $this->_db->delete($sql, $values); - } catch (Horde_Db_Exception $e) { - throw new Horde_Lock_Exception($e); - } - - if ($this->_logger) { - $this->_logger->log(sprintf('Lock %s cleared successfully.', $lockid), 'DEBUG'); - } - - return true; - } - - /** - * Do garbage collection needed for the driver. - */ - public function doGC() - { - $now = time(); - $query = 'DELETE FROM ' . $this->_params['table'] . ' WHERE ' . - 'lock_expiry_timestamp < ? AND lock_expiry_timestamp != ?'; - $values = array($now, Horde_Lock::PERMANENT); - - try { - $result = $this->_db->delete($query, $values); - if ($this->_logger) { - $this->_logger->log(sprintf('Lock garbage collection cleared %d locks.', $result), 'DEBUG'); - } - } catch (Horde_Db_Exception $e) {} - } - -} diff -Nru php-horde-lock-2.1.3/Horde_Lock-2.1.3/lib/Horde/Lock.php php-horde-lock-2.1.4/Horde_Lock-2.1.3/lib/Horde/Lock.php --- php-horde-lock-2.1.3/Horde_Lock-2.1.3/lib/Horde/Lock.php 2016-07-02 16:55:57.000000000 +0000 +++ php-horde-lock-2.1.4/Horde_Lock-2.1.3/lib/Horde/Lock.php 1970-01-01 00:00:00.000000000 +0000 @@ -1,146 +0,0 @@ - - * @category Horde - * @package Lock - */ -abstract class Horde_Lock -{ - /* Class constants. */ - const TYPE_EXCLUSIVE = 1; - const TYPE_SHARED = 2; - const PERMANENT = -1; - /** - * Driver parameters. - * - * @var array - */ - protected $_params; - - /** - * Logger. - * - * @var Horde_Log_Logger - */ - protected $_logger; - - /** - * Constructor. - * - * @param array $params Configuration parameters: - * 
-     * 'logger' - (Horde_Log_Logger) A logger instance.
-     *
- */ - public function __construct($params = array()) - { - if (!empty($params['logger'])) { - $this->_logger = $params['logger']; - unset($params['logger']); - } - - $this->_params = $params; - } - - /** - * Return an array of information about the requested lock. - * - * @param string $lockid Lock ID to look up. - * - * @return array Lock information. - * @throws Horde_Lock_Exception - */ - abstract public function getLockInfo($lockid); - - /** - * Return a list of valid locks with the option to limit the results - * by principal, scope and/or type. - * - * @param string $scope The scope of the lock. Typically the name of - * the application requesting the lock or some - * other identifier used to group locks together. - * @param string $principal Principal for which to check for locks - * @param integer $type Only return locks of the given type. - * Defaults to null, or all locks - * - * @return array Array of locks with the ID as the key and the lock details - * as the value. If there are no current locks this will - * return an empty array. - * @throws Horde_Lock_Exception - */ - abstract public function getLocks($scope = null, $principal = null, - $type = null); - - /** - * Extend the valid lifetime of a valid lock to now + $extend. - * - * @param string $lockid Lock ID to reset. Must be a valid, non-expired - * lock. - * @param integer $extend Extend lock this many seconds from now. - * - * @return boolean Returns true on success. - * @throws Horde_Lock_Exception - */ - abstract public function resetLock($lockid, $extend); - - /** - * Sets a lock on the requested principal and returns the generated lock - * ID. NOTE: No security checks are done in the Horde_Lock API. It is - * expected that the calling application has done all necessary security - * checks before requesting a lock be granted. - * - * @param string $requestor User ID of the lock requestor. - * @param string $scope The scope of the lock. Typically the name of - * the application requesting the lock or some - * other identifier used to group locks - * together. - * @param string $principal A principal on which a lock should be - * granted. The format can be any string but is - * suggested to be in URI form. - * @param integer $lifetime Time (in seconds) for which the lock will be - * considered valid. - * @param string exclusive One of Horde_Lock::TYPE_SHARED or - * Horde_Lock::TYPE_EXCLUSIVE. - * - An exclusive lock will be enforced strictly - * and must be interpreted to mean that the - * resource can not be modified. Only one - * exclusive lock per principal is allowed. - * - A shared lock is one that notifies other - * potential lock requestors that the resource - * is in use. This lock can be overridden - * (cleared or replaced with a subsequent - * call to setLock()) by other users. Multiple - * users may request (and will be granted) a - * shared lock on a given principal. All locks - * will be considered valid until they are - * cleared or expire. - * - * @return mixed A string lock ID. - * @throws Horde_Lock_Exception - */ - abstract public function setLock($requestor, $scope, $principal, - $lifetime = 1, - $exclusive = Horde_Lock::TYPE_SHARED); - - /** - * Removes a lock given the lock ID. - * NOTE: No security checks are done in the Horde_Lock API. It is - * expected that the calling application has done all necessary security - * checks before requesting a lock be cleared. - * - * @param string $lockid The lock ID as generated by a previous call - * to setLock() - * - * @return boolean Returns true on success. - * @throws Horde_Lock_Exception - */ - abstract public function clearLock($lockid); -} diff -Nru php-horde-lock-2.1.3/Horde_Lock-2.1.3/migration/Horde/Lock/1_horde_lock_base_tables.php php-horde-lock-2.1.4/Horde_Lock-2.1.3/migration/Horde/Lock/1_horde_lock_base_tables.php --- php-horde-lock-2.1.3/Horde_Lock-2.1.3/migration/Horde/Lock/1_horde_lock_base_tables.php 2016-07-02 16:55:57.000000000 +0000 +++ php-horde-lock-2.1.4/Horde_Lock-2.1.3/migration/Horde/Lock/1_horde_lock_base_tables.php 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -tables())) { - $t = $this->createTable('horde_locks', array('autoincrementKey' => array('lock_id'))); - $t->column('lock_id', 'string', array('limit' => 36, 'null' => false)); - $t->column('lock_owner', 'string', array('limit' => 32, 'null' => false)); - $t->column('lock_scope', 'string', array('limit' => 32, 'null' => false)); - $t->column('lock_principal', 'string', array('limit' => 255, 'null' => false)); - $t->column('lock_origin_timestamp', 'bigint', array('null' => false)); - $t->column('lock_update_timestamp', 'bigint', array('null' => false)); - $t->column('lock_expiry_timestamp', 'bigint', array('null' => false)); - $t->column('lock_type', 'smallint', array('null' => false, 'unsigned' => true)); - $t->end(); - } - } - - public function down() - { - $this->dropTable('horde_locks'); - } -} diff -Nru php-horde-lock-2.1.3/Horde_Lock-2.1.3/migration/Horde/Lock/2_horde_lock_upgrade_column_types.php php-horde-lock-2.1.4/Horde_Lock-2.1.3/migration/Horde/Lock/2_horde_lock_upgrade_column_types.php --- php-horde-lock-2.1.3/Horde_Lock-2.1.3/migration/Horde/Lock/2_horde_lock_upgrade_column_types.php 2016-07-02 16:55:57.000000000 +0000 +++ php-horde-lock-2.1.4/Horde_Lock-2.1.3/migration/Horde/Lock/2_horde_lock_upgrade_column_types.php 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -changeColumn('horde_locks', 'lock_owner', 'string', array('limit' => 255, 'null' => false)); - } - - public function down() - { - $this->changeColumn('horde_locks', 'lock_owner', 'string', array('limit' => 32, 'null' => false)); - } -} diff -Nru php-horde-lock-2.1.3/Horde_Lock-2.1.3/test/Horde/Lock/AllTests.php php-horde-lock-2.1.4/Horde_Lock-2.1.3/test/Horde/Lock/AllTests.php --- php-horde-lock-2.1.3/Horde_Lock-2.1.3/test/Horde/Lock/AllTests.php 2016-07-02 16:55:57.000000000 +0000 +++ php-horde-lock-2.1.4/Horde_Lock-2.1.3/test/Horde/Lock/AllTests.php 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -run(); diff -Nru php-horde-lock-2.1.3/Horde_Lock-2.1.3/test/Horde/Lock/bootstrap.php php-horde-lock-2.1.4/Horde_Lock-2.1.3/test/Horde/Lock/bootstrap.php --- php-horde-lock-2.1.3/Horde_Lock-2.1.3/test/Horde/Lock/bootstrap.php 2016-07-02 16:55:57.000000000 +0000 +++ php-horde-lock-2.1.4/Horde_Lock-2.1.3/test/Horde/Lock/bootstrap.php 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ - diff -Nru php-horde-lock-2.1.3/Horde_Lock-2.1.3/test/Horde/Lock/Storage/MongoTest.php php-horde-lock-2.1.4/Horde_Lock-2.1.3/test/Horde/Lock/Storage/MongoTest.php --- php-horde-lock-2.1.3/Horde_Lock-2.1.3/test/Horde/Lock/Storage/MongoTest.php 2016-07-02 16:55:57.000000000 +0000 +++ php-horde-lock-2.1.4/Horde_Lock-2.1.3/test/Horde/Lock/Storage/MongoTest.php 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ - - * @category Horde - * @ignore - * @license http://www.horde.org/licenses/lgpl21 LGPL - * @package Lock - * @subpackage UnitTests - */ -class Horde_Lock_Storage_MongoTest extends Horde_Lock_Storage_TestBase -{ - private $_dbname = 'horde_lock_mongodbtest'; - private $_mongo; - - protected function _getBackend() - { - if (($config = self::getConfig('LOCK_MONGO_TEST_CONFIG', __DIR__ . '/..')) && - isset($config['lock']['mongo'])) { - $factory = new Horde_Test_Factory_Mongo(); - $this->_mongo = $factory->create(array( - 'config' => $config['lock']['mongo'], - 'dbname' => $this->_dbname - )); - } - - if (empty($this->_mongo)) { - $this->markTestSkipped('MongoDB not available.'); - } - - return new Horde_Lock_Mongo(array( - 'mongo_db' => $this->_mongo, - )); - } - - public function tearDown() - { - if (!empty($this->_mongo)) { - $this->_mongo->selectDB(null)->drop(); - } - - parent::tearDown(); - } - -} diff -Nru php-horde-lock-2.1.3/Horde_Lock-2.1.3/test/Horde/Lock/Storage/SqlTest.php php-horde-lock-2.1.4/Horde_Lock-2.1.3/test/Horde/Lock/Storage/SqlTest.php --- php-horde-lock-2.1.3/Horde_Lock-2.1.3/test/Horde/Lock/Storage/SqlTest.php 2016-07-02 16:55:57.000000000 +0000 +++ php-horde-lock-2.1.4/Horde_Lock-2.1.3/test/Horde/Lock/Storage/SqlTest.php 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ - - * @category Horde - * @ignore - * @license http://www.horde.org/licenses/lgpl21 LGPL - * @package Lock - * @subpackage UnitTests - */ -class Horde_Lock_Storage_SqlTest extends Horde_Lock_Storage_TestBase -{ - protected static $_migrationDir; - - public static function setUpBeforeClass() - { - self::$_migrationDir = __DIR__ . '/../../../../migration/Horde/Lock'; - - if (!is_dir(self::$_migrationDir)) { - error_reporting(E_ALL & ~E_DEPRECATED); - self::$_migrationDir = PEAR_Config::singleton() - ->get('data_dir', null, 'pear.horde.org') - . '/Horde_Lock/migration'; - error_reporting(E_ALL | E_STRICT); - } - } - - protected function _getBackend() - { - $factory_db = new Horde_Test_Factory_Db(); - - try { - $db = $factory_db->create(array( - 'migrations' => array( - 'migrationsPath' => self::$_migrationDir - ) - )); - } catch (Horde_Test_Exception $e) { - $this->markTestSkipped('Test DB not available.'); - } - - return new Horde_Lock_Sql(array( - 'db' => $db - )); - } - -} diff -Nru php-horde-lock-2.1.3/Horde_Lock-2.1.3/test/Horde/Lock/Storage/TestBase.php php-horde-lock-2.1.4/Horde_Lock-2.1.3/test/Horde/Lock/Storage/TestBase.php --- php-horde-lock-2.1.3/Horde_Lock-2.1.3/test/Horde/Lock/Storage/TestBase.php 2016-07-02 16:55:57.000000000 +0000 +++ php-horde-lock-2.1.4/Horde_Lock-2.1.3/test/Horde/Lock/Storage/TestBase.php 1970-01-01 00:00:00.000000000 +0000 @@ -1,183 +0,0 @@ - - * @author Michael Slusarz - * @category Horde - * @ignore - * @license http://www.horde.org/licenses/lgpl21 LGPL - * @package Lock - * @subpackage UnitTests - */ -abstract class Horde_Lock_Storage_TestBase extends Horde_Test_Case -{ - protected $_lock; - - protected function setUp() - { - $this->_lock = $this->_getBackend(); - } - - abstract protected function _getBackend(); - - public function tearDown() - { - unset($this->_lock); - } - - public function testGetLockInfo() - { - $lock1 = $this->_lock->setLock( - 'myuser', 'myapp', 'myprincipal', 100, Horde_Lock::TYPE_SHARED); - $info1 = $this->_lock->getLockInfo($lock1); - $this->assertEquals($info1['lock_update_timestamp'], - $info1['lock_origin_timestamp']); - $this->assertEquals($info1['lock_expiry_timestamp'], - $info1['lock_origin_timestamp'] + 100); - unset($info1['lock_update_timestamp'], - $info1['lock_origin_timestamp'], - $info1['lock_expiry_timestamp']); - $this->assertEquals(array('lock_id' => $lock1, - 'lock_owner' => 'myuser', - 'lock_scope' => 'myapp', - 'lock_principal' => 'myprincipal', - 'lock_type' => Horde_Lock::TYPE_SHARED), - $info1); - - $lock2 = $this->_lock->setLock( - 'myuser', 'myapp', 'myprincipal2', 1000, Horde_Lock::TYPE_EXCLUSIVE); - $info2 = $this->_lock->getLockInfo($lock2); - $this->assertEquals($info2['lock_update_timestamp'], - $info2['lock_origin_timestamp']); - $this->assertEquals($info2['lock_expiry_timestamp'], - $info2['lock_origin_timestamp'] + 1000); - unset($info2['lock_update_timestamp'], - $info2['lock_origin_timestamp'], - $info2['lock_expiry_timestamp']); - $this->assertEquals(array('lock_id' => $lock2, - 'lock_owner' => 'myuser', - 'lock_scope' => 'myapp', - 'lock_principal' => 'myprincipal2', - 'lock_type' => Horde_Lock::TYPE_EXCLUSIVE), - $info2); - } - - public function testGetLocks() - { - $lock1 = $this->_lock->setLock( - 'myuser', 'myapp', 'myprincipal', 100, Horde_Lock::TYPE_SHARED); - $lock2 = $this->_lock->setLock( - 'myuser', 'myapp', 'myprincipal2', 100, Horde_Lock::TYPE_EXCLUSIVE); - $this->assertEquals( - array($lock1, $lock2), - array_keys($this->_lock->getLocks('myapp'))); - $this->assertEquals( - array($lock1), - array_keys($this->_lock->getLocks('myapp', 'myprincipal'))); - $this->assertEquals( - array($lock2), - array_keys($this->_lock->getLocks(null, 'myprincipal2'))); - $this->assertEquals( - array($lock1), - array_keys($this->_lock->getLocks(null, null, Horde_Lock::TYPE_SHARED))); - $this->assertEquals( - array($lock2), - array_keys($this->_lock->getLocks('myapp', 'myprincipal2', Horde_Lock::TYPE_EXCLUSIVE))); - $this->assertEquals( - array(), - array_keys($this->_lock->getLocks('myapp', 'myprincipal', Horde_Lock::TYPE_EXCLUSIVE))); - } - - public function testResetLock() - { - $lock1 = $this->_lock->setLock( - 'myuser', 'myapp', 'myprincipal', 100, Horde_Lock::TYPE_EXCLUSIVE); - $info1 = $this->_lock->getLockInfo($lock1); - $expiry = $info1['lock_expiry_timestamp']; - - $lock2 = $this->_lock->setLock( - 'myuser', 'myapp', 'myprincipal2', Horde_Lock::PERMANENT, - Horde_Lock::TYPE_EXCLUSIVE); - $info3 = $this->_lock->getLockInfo($lock2); - - sleep(1); - - $this->_lock->resetLock($lock1, 100); - $info2 = $this->_lock->getLockInfo($lock1); - $this->assertLessThan($info2['lock_update_timestamp'], - $info2['lock_origin_timestamp']); - $this->assertLessThan($info2['lock_expiry_timestamp'], - $info2['lock_origin_timestamp']); - $this->assertEquals($info2['lock_expiry_timestamp'], - $info2['lock_update_timestamp'] + 100); - - $this->assertEquals(Horde_Lock::PERMANENT, - $info3['lock_expiry_timestamp']); - $this->_lock->resetLock($lock2, Horde_Lock::PERMANENT); - $info4 = $this->_lock->getLockInfo($lock2); - $this->assertEquals(Horde_Lock::PERMANENT, - $info3['lock_expiry_timestamp']); - - $this->_lock->resetLock($lock1, Horde_Lock::PERMANENT); - $info5 = $this->_lock->getLockInfo($lock1); - $this->assertEquals(Horde_Lock::PERMANENT, - $info5['lock_expiry_timestamp']); - $this->_lock->resetLock($lock2, 10); - $info6 = $this->_lock->getLockInfo($lock2); - $this->assertEquals(Horde_Lock::PERMANENT, - $info6['lock_expiry_timestamp']); - } - - public function testSetLock() - { - $lock1 = $this->_lock->setLock( - 'myuser', 'myapp', 'myprincipal', 100, Horde_Lock::TYPE_SHARED); - $lock2 = $this->_lock->setLock( - 'myuser', 'myapp', 'myprincipal', 100, Horde_Lock::TYPE_SHARED); - $lock3 = $this->_lock->setLock( - 'myuser', 'myapp', 'myprincipal', 100, Horde_Lock::TYPE_EXCLUSIVE); - $this->assertInternalType('string', $lock1); - $this->assertInternalType('string', $lock2); - $this->assertFalse($lock3); - $this->assertNotEquals($lock1, $lock2); - - $lock4 = $this->_lock->setLock( - 'myuser', 'myapp', 'myprincipal2', 100, Horde_Lock::TYPE_EXCLUSIVE); - $lock5 = $this->_lock->setLock( - 'myuser', 'myapp', 'myprincipal2', 100, Horde_Lock::TYPE_EXCLUSIVE); - $lock6 = $this->_lock->setLock( - 'myuser', 'myapp', 'myprincipal2', 100, Horde_Lock::TYPE_SHARED); - $this->assertInternalType('string', $lock4); - $this->assertFalse($lock5); - $this->assertFalse($lock6); - - $lock7 = $this->_lock->setLock( - 'myuser', 'myapp', 'myprincipal3', 1, Horde_Lock::TYPE_EXCLUSIVE); - $lock8 = $this->_lock->setLock( - 'myuser', 'myapp', 'myprincipal4', Horde_Lock::PERMANENT, - Horde_Lock::TYPE_EXCLUSIVE); - sleep(2); - $lock9 = $this->_lock->setLock( - 'myuser', 'myapp', 'myprincipal3', 100, Horde_Lock::TYPE_EXCLUSIVE); - $lock10 = $this->_lock->setLock( - 'myuser', 'myapp', 'myprincipal4', Horde_Lock::PERMANENT, - Horde_Lock::TYPE_EXCLUSIVE); - $this->assertInternalType('string', $lock7); - $this->assertInternalType('string', $lock8); - $this->assertInternalType('string', $lock9); - $this->assertFalse($lock10); - $this->assertNotEquals($lock7, $lock9); - } - - public function testClearLock() - { - $lock1 = $this->_lock->setLock('myuser', 'myapp', 'myprincipal', - 100, Horde_Lock::TYPE_SHARED); - $lock2 = $this->_lock->setLock('myuser', 'myapp', 'myprincipal2', - 100, Horde_Lock::TYPE_EXCLUSIVE); - $this->_lock->clearLock($lock1); - $this->assertEquals( - array($lock2), - array_keys($this->_lock->getLocks())); - $this->assertEmpty($this->_lock->getLockInfo($lock1)); - } -} diff -Nru php-horde-lock-2.1.3/Horde_Lock-2.1.4/doc/Horde/Lock/COPYING php-horde-lock-2.1.4/Horde_Lock-2.1.4/doc/Horde/Lock/COPYING --- php-horde-lock-2.1.3/Horde_Lock-2.1.4/doc/Horde/Lock/COPYING 1970-01-01 00:00:00.000000000 +0000 +++ php-horde-lock-2.1.4/Horde_Lock-2.1.4/doc/Horde/Lock/COPYING 2016-09-01 16:02:10.000000000 +0000 @@ -0,0 +1,458 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + 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 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 diff -Nru php-horde-lock-2.1.3/Horde_Lock-2.1.4/lib/Horde/Lock/Exception.php php-horde-lock-2.1.4/Horde_Lock-2.1.4/lib/Horde/Lock/Exception.php --- php-horde-lock-2.1.3/Horde_Lock-2.1.4/lib/Horde/Lock/Exception.php 1970-01-01 00:00:00.000000000 +0000 +++ php-horde-lock-2.1.4/Horde_Lock-2.1.4/lib/Horde/Lock/Exception.php 2016-09-01 16:02:10.000000000 +0000 @@ -0,0 +1,16 @@ + + * @category Horde + * @package Lock + */ +class Horde_Lock_Exception extends Horde_Exception_Wrapped +{ +} diff -Nru php-horde-lock-2.1.3/Horde_Lock-2.1.4/lib/Horde/Lock/Mongo.php php-horde-lock-2.1.4/Horde_Lock-2.1.4/lib/Horde/Lock/Mongo.php --- php-horde-lock-2.1.3/Horde_Lock-2.1.4/lib/Horde/Lock/Mongo.php 1970-01-01 00:00:00.000000000 +0000 +++ php-horde-lock-2.1.4/Horde_Lock-2.1.4/lib/Horde/Lock/Mongo.php 2016-09-01 16:02:10.000000000 +0000 @@ -0,0 +1,311 @@ + + * @category Horde + * @copyright 2013-2016 Horde LLC + * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 + * @package Lock + */ +class Horde_Lock_Mongo extends Horde_Lock +{ + /* Field names. */ + const EXPIRY_TS = 'expiry_ts'; + const LID = 'lid'; + const ORIGIN_TS = 'origin_ts'; + const OWNER = 'owner'; + const PRINCIPAL = 'principal'; + const SCOPE = 'scope'; + const TYPE = 'type'; + const UPDATE_TS = 'update_ts'; + + /** + * The MongoDB Collection object for the cache data. + * + * @var MongoCollection + */ + protected $_db; + + /** + * Ugly hack: lock driver written with assumption that it returns data + * as defined by SQL columns. So need to do mapping in this driver. + * + * @var array + */ + protected $_map = array( + self::EXPIRY_TS => 'lock_expiry_timestamp', + self::LID => 'lock_id', + self::ORIGIN_TS => 'lock_origin_timestamp', + self::OWNER => 'lock_owner', + self::PRINCIPAL => 'lock_principal', + self::SCOPE => 'lock_scope', + self::TYPE => 'lock_type', + self::UPDATE_TS => 'lock_update_timestamp' + ); + + /** + * Constructor. + * + * @param array $params Parameters: + * 
+     *   - collection: (string) The collection name.
+     *   - mongo_db: [REQUIRED] (Horde_Mongo_Client) A MongoDB client object.
+     *
+ */ + public function __construct(array $params = array()) + { + if (!isset($params['mongo_db'])) { + throw new InvalidArgumentException('Missing mongo_db parameter.'); + } + + parent::__construct(array_merge(array( + 'collection' => 'horde_locks' + ), $params)); + + $this->_db = $this->_params['mongo_db'] + ->selectCollection(null, $this->_params['collection']); + } + + /** + * Destructor. + */ + public function __destruct() + { + if (!rand(0, 999)) { + $this->gc(); + } + } + + /** + */ + public function getLockInfo($lockid) + { + $query = array( + self::LID => $lockid, + '$or' => array( + array(self::EXPIRY_TS => array('$gte' => time()),), + array(self::EXPIRY_TS => Horde_Lock::PERMANENT) + ) + ); + + try { + return $this->_mapFields($this->_db->findOne($query)); + } catch (MongoException $e) { + throw new Horde_Lock_Exception($e); + } + } + + /** + */ + public function getLocks($scope = null, $principal = null, $type = null) + { + $query = array( + '$or' => array( + array(self::EXPIRY_TS => array('$gte' => time()),), + array(self::EXPIRY_TS => Horde_Lock::PERMANENT) + ) + ); + + // Check to see if we need to filter the results + if (!empty($principal)) { + $query[self::PRINCIPAL] = $principal; + } + if (!empty($scope)) { + $query[self::SCOPE] = $scope; + } + if (!empty($type)) { + $query[self::TYPE] = $type; + } + + try { + $result = $this->_db->find($query); + } catch (MongoException $e) { + throw new Horde_Lock_Exception($e); + } + + $locks = array(); + foreach ($result as $val) { + $locks[$val[self::LID]] = $this->_mapFields($val); + } + + return $locks; + } + + /** + */ + public function resetLock($lockid, $lifetime) + { + if (!$this->getLockInfo($lockid)) { + return false; + } + + $now = time(); + $expiration = ($lifetime == Horde_Lock::PERMANENT) + ? Horde_Lock::PERMANENT + : ($now + $lifetime); + + try { + $this->_db->update( + array( + self::EXPIRY_TS => array('$ne' => Horde_Lock::PERMANENT), + self::LID => $lockid + ), + array( + '$set' => array( + self::EXPIRY_TS => $expiration, + self::UPDATE_TS => $now + ) + ) + ); + } catch (MongoException $e) { + throw new Horde_Lock_Exception($e); + } + + return true; + } + + /** + */ + public function setLock($requestor, $scope, $principal, + $lifetime = 1, $type = Horde_Lock::TYPE_SHARED) + { + $oldlocks = $this->getLocks( + $scope, + $principal, + ($type == Horde_Lock::TYPE_SHARED) ? Horde_Lock::TYPE_EXCLUSIVE : null + ); + + if (count($oldlocks) != 0) { + // A lock exists. Deny the new request. + if ($this->_logger) { + $this->_logger->log( + sprintf( + 'Lock requested for %s denied due to existing lock.', + $principal + ), + 'NOTICE' + ); + } + return false; + } + + $lockid = strval(new Horde_Support_Uuid()); + + $now = time(); + $expiration = ($lifetime == Horde_Lock::PERMANENT) + ? Horde_Lock::PERMANENT + : ($now + $lifetime); + + try { + $doc = array( + self::EXPIRY_TS => $expiration, + self::LID => $lockid, + self::ORIGIN_TS => $now, + self::OWNER => $requestor, + self::PRINCIPAL => $principal, + self::SCOPE => $scope, + self::TYPE => $type, + self::UPDATE_TS => $now + ); + $this->_db->insert($doc); + } catch (MongoException $e) { + throw new Horde_Lock_Exception($e); + } + + if ($this->_logger) { + $this->_logger->log( + sprintf( + 'Lock %s set successfully by %s in scope %s on "%s"', + $lockid, $requestor, $scope, $principal + ), + 'DEBUG' + ); + } + + return $lockid; + } + + /** + */ + public function clearLock($lockid) + { + if (empty($lockid)) { + throw new Horde_Lock_Exception('Must supply a valid lock ID.'); + } + + try { + /* Since we're trying to clear the lock we don't care whether it is + * still valid or not. Unconditionally remove it. */ + $this->_db->remove(array(self::LID => $lockid)); + } catch (MongoException $e) { + throw new Horde_Lock_Exception($e); + } + + if ($this->_logger) { + $this->_logger->log( + sprintf('Lock %s cleared successfully.', $lockid), 'DEBUG' + ); + } + + return true; + } + + /** + * Do garbage collection needed for the driver. + */ + public function gc() + { + try { + $result = $this->_db->remove(array( + self::EXPIRY_TS => array( + '$lt' => time(), + '$ne' => Horde_Lock::PERMANENT + ) + )); + + if ($this->_logger) { + $this->_logger->log( + sprintf( + 'Lock garbage collection cleared %d locks.', + $result['n'] + ), + 'DEBUG' + ); + } + } catch (MongoException $e) {} + } + + /** + * Map return to SQL fields. + * + * @return array + */ + protected function _mapFields($res) + { + $out = array(); + + if ($res) { + foreach ($res as $key => $val) { + if (isset($this->_map[$key])) { + $out[$this->_map[$key]] = $val; + } + } + } + + return $out; + } + +} diff -Nru php-horde-lock-2.1.3/Horde_Lock-2.1.4/lib/Horde/Lock/Null.php php-horde-lock-2.1.4/Horde_Lock-2.1.4/lib/Horde/Lock/Null.php --- php-horde-lock-2.1.3/Horde_Lock-2.1.4/lib/Horde/Lock/Null.php 1970-01-01 00:00:00.000000000 +0000 +++ php-horde-lock-2.1.4/Horde_Lock-2.1.4/lib/Horde/Lock/Null.php 2016-09-01 16:02:10.000000000 +0000 @@ -0,0 +1,123 @@ + + * @category Horde + * @package Lock + */ +class Horde_Lock_Null extends Horde_Lock +{ + /** + * Return an array of information about the requested lock. + * + * @param string $lockid Lock ID to look up. + * + * @return array Lock information. + * @throws Horde_Lock_Exception + */ + public function getLockInfo($lockid) + { + return array(); + } + + /** + * Return a list of valid locks with the option to limit the results + * by principal, scope and/or type. + * + * @param string $scope The scope of the lock. Typically the name of + * the application requesting the lock or some + * other identifier used to group locks together. + * @param string $principal Principal for which to check for locks + * @param integer $type Only return locks of the given type. + * Defaults to null, or all locks + * + * @return array Array of locks with the ID as the key and the lock details + * as the value. If there are no current locks this will + * return an empty array. + * @throws Horde_Lock_Exception + */ + public function getLocks($scope = null, $principal = null, $type = null) + { + return array(); + } + + /** + * Extend the valid lifetime of a valid lock to now + $extend. + * + * @param string $lockid Lock ID to reset. Must be a valid, non-expired + * lock. + * @param integer $extend Extend lock this many seconds from now. + * + * @return boolean Returns true on success. + * @throws Horde_Lock_Exception + */ + public function resetLock($lockid, $extend) + { + return true; + } + + /** + * Sets a lock on the requested principal and returns the generated lock + * ID. NOTE: No security checks are done in the Horde_Lock API. It is + * expected that the calling application has done all necessary security + * checks before requesting a lock be granted. + * + * @param string $requestor User ID of the lock requestor. + * @param string $scope The scope of the lock. Typically the name of + * the application requesting the lock or some + * other identifier used to group locks + * together. + * @param string $principal A principal on which a lock should be + * granted. The format can be any string but is + * suggested to be in URI form. + * @param integer $lifetime Time (in seconds) for which the lock will be + * considered valid. + * @param string exclusive One of Horde_Lock::TYPE_SHARED or + * Horde_Lock::TYPE_EXCLUSIVE. + * - An exclusive lock will be enforced strictly + * and must be interpreted to mean that the + * resource can not be modified. Only one + * exclusive lock per principal is allowed. + * - A shared lock is one that notifies other + * potential lock requestors that the resource + * is in use. This lock can be overridden + * (cleared or replaced with a subsequent + * call to setLock()) by other users. Multiple + * users may request (and will be granted) a + * shared lock on a given principal. All locks + * will be considered valid until they are + * cleared or expire. + * + * @return mixed A string lock ID. + * @throws Horde_Lock_Exception + */ + public function setLock($requestor, $scope, $principal, $lifetime = 1, + $exclusive = Horde_Lock::TYPE_SHARED) + { + return strval(new Horde_Support_Uuid()); + } + + /** + * Removes a lock given the lock ID. + * NOTE: No security checks are done in the Horde_Lock API. It is + * expected that the calling application has done all necessary security + * checks before requesting a lock be cleared. + * + * @param string $lockid The lock ID as generated by a previous call + * to setLock() + * + * @return boolean Returns true on success. + * @throws Horde_Lock_Exception + */ + public function clearLock($lockid) + { + return true; + } + +} diff -Nru php-horde-lock-2.1.3/Horde_Lock-2.1.4/lib/Horde/Lock/Sql.php php-horde-lock-2.1.4/Horde_Lock-2.1.4/lib/Horde/Lock/Sql.php --- php-horde-lock-2.1.3/Horde_Lock-2.1.4/lib/Horde/Lock/Sql.php 1970-01-01 00:00:00.000000000 +0000 +++ php-horde-lock-2.1.4/Horde_Lock-2.1.4/lib/Horde/Lock/Sql.php 2016-09-01 16:02:10.000000000 +0000 @@ -0,0 +1,262 @@ + + * CREATE TABLE horde_locks ( + * lock_id VARCHAR(36) NOT NULL, + * lock_owner VARCHAR(32) NOT NULL, + * lock_scope VARCHAR(32) NOT NULL, + * lock_principal VARCHAR(255) NOT NULL, + * lock_origin_timestamp BIGINT NOT NULL, + * lock_update_timestamp BIGINT NOT NULL, + * lock_expiry_timestamp BIGINT NOT NULL, + * lock_type TINYINT NOT NULL, + * + * PRIMARY KEY (lock_id) + * ); + * + * + * Copyright 2008-2016 Horde LLC (http://www.horde.org/) + * + * See the enclosed file COPYING for license information (LGPL). If you did + * not receive this file, see http://www.horde.org/licenses/lgpl21. + * + * @author Ben Klang + * @category Horde + * @package Lock + */ +class Horde_Lock_Sql extends Horde_Lock +{ + /** + * Handle for the current database connection. + * + * @var Horde_Db_Adapter + */ + private $_db; + + /** + * Constructor. + * + * @param array $params Parameters: + * 
+     * 'db' - (Horde_Db_Adapter) [REQUIRED] The DB instance.
+     * 'table' - (string) The name of the lock table in 'database'.
+     *           DEFAULT: 'horde_locks'
+     *
+ * + * @throws Horde_Lock_Exception + */ + public function __construct($params = array()) + { + if (!isset($params['db'])) { + throw new Horde_Lock_Exception('Missing db parameter.'); + } + $this->_db = $params['db']; + unset($params['db']); + + $params = array_merge(array( + 'table' => 'horde_locks' + ), $params); + + parent::__construct($params); + + /* Only do garbage collection 0.1% of the time we create an object. */ + if (substr(time(), -3) === '000') { + register_shutdown_function(array($this, 'doGC')); + } + } + + /** + * Return an array of information about the requested lock. + * + * @see Horde_Lock_Base::getLockInfo() + */ + public function getLockInfo($lockid) + { + $now = time(); + $sql = 'SELECT lock_id, lock_owner, lock_scope, lock_principal, ' + . 'lock_origin_timestamp, lock_update_timestamp, ' + . 'lock_expiry_timestamp, lock_type FROM ' + . $this->_params['table'] + . ' WHERE lock_id = ? AND ' + . '(lock_expiry_timestamp >= ? OR lock_expiry_timestamp = ?)'; + $values = array($lockid, $now, Horde_Lock::PERMANENT); + + try { + return $this->_db->selectOne($sql, $values); + } catch (Horde_Db_Exception $e) { + throw new Horde_Lock_Exception($e); + } + } + + /** + * Return a list of valid locks with the option to limit the results + * by principal, scope and/or type. + * + * @see Horde_Lock_Base::getLocks() + */ + public function getLocks($scope = null, $principal = null, $type = null) + { + $now = time(); + $sql = 'SELECT lock_id, lock_owner, lock_scope, lock_principal, ' + . 'lock_origin_timestamp, lock_update_timestamp, ' + . 'lock_expiry_timestamp, lock_type FROM ' + . $this->_params['table'] + . ' WHERE (lock_expiry_timestamp >= ? OR lock_expiry_timestamp = ?)'; + $values = array($now, Horde_Lock::PERMANENT); + + // Check to see if we need to filter the results + if (!empty($principal)) { + $sql .= ' AND lock_principal = ?'; + $values[] = $principal; + } + if (!empty($scope)) { + $sql .= ' AND lock_scope = ?'; + $values[] = $scope; + } + if (!empty($type)) { + $sql .= ' AND lock_type = ?'; + $values[] = $type; + } + + try { + $result = $this->_db->select($sql, $values); + } catch (Horde_Db_Exception $e) { + throw new Horde_Lock_Exception($e); + } + + $locks = array(); + foreach ($result as $row) { + $locks[$row['lock_id']] = $row; + } + + return $locks; + } + + /** + * Extend the valid lifetime of a valid lock to now + $lifetime. + * + * @see Horde_Lock_Base::resetLock() + */ + public function resetLock($lockid, $lifetime) + { + $now = time(); + + if (!$this->getLockInfo($lockid)) { + return false; + } + + $expiration = $lifetime == Horde_Lock::PERMANENT ? Horde_Lock::PERMANENT : $now + $lifetime; + + $sql = 'UPDATE ' . $this->_params['table'] . ' SET ' . + 'lock_update_timestamp = ?, lock_expiry_timestamp = ? ' . + 'WHERE lock_id = ? AND lock_expiry_timestamp <> ?'; + $values = array($now, $expiration, $lockid, Horde_Lock::PERMANENT); + + try { + $this->_db->update($sql, $values); + } catch (Horde_Db_Exception $e) { + throw new Horde_Lock_Exception($e); + } + + return true; + } + + /** + * Sets a lock on the requested principal and returns the generated lock + * ID. + * + * @see Horde_Lock_Base::setLock() + */ + public function setLock($requestor, $scope, $principal, + $lifetime = 1, $type = Horde_Lock::TYPE_SHARED) + { + $oldlocks = $this->getLocks( + $scope, $principal, + $type == Horde_Lock::TYPE_SHARED ? Horde_Lock::TYPE_EXCLUSIVE : null); + + if (count($oldlocks) != 0) { + // A lock exists. Deny the new request. + if ($this->_logger) { + $this->_logger->log(sprintf('Lock requested for %s denied due to existing lock.', $principal), 'NOTICE'); + } + return false; + } + + $lockid = (string)new Horde_Support_Uuid(); + + $now = time(); + $expiration = $lifetime == Horde_Lock::PERMANENT ? Horde_Lock::PERMANENT : $now + $lifetime; + $sql = 'INSERT INTO ' . $this->_params['table'] . ' (lock_id, lock_owner, lock_scope, lock_principal, lock_origin_timestamp, lock_update_timestamp, lock_expiry_timestamp, lock_type) VALUES (?, ?, ?, ?, ?, ?, ?, ?)'; + $values = array($lockid, $requestor, $scope, $principal, $now, $now, + $expiration, $type); + + try { + $this->_db->insert($sql, $values); + } catch (Horde_Db_Exception $e) { + throw new Horde_Lock_Exception($e); + } + + if ($this->_logger) { + $this->_logger->log(sprintf('Lock %s set successfully by %s in scope %s on "%s"', $lockid, $requestor, $scope, $principal), 'DEBUG'); + } + + return $lockid; + } + + /** + * Removes a lock given the lock ID. + * + * @see Horde_Lock_Base::clearLock() + */ + public function clearLock($lockid) + { + if (empty($lockid)) { + throw new Horde_Lock_Exception('Must supply a valid lock ID.'); + } + + // Since we're trying to clear the lock we don't care + // whether it is still valid or not. Unconditionally + // remove it. + $sql = 'DELETE FROM ' . $this->_params['table'] . ' WHERE lock_id = ?'; + $values = array($lockid); + + try { + $this->_db->delete($sql, $values); + } catch (Horde_Db_Exception $e) { + throw new Horde_Lock_Exception($e); + } + + if ($this->_logger) { + $this->_logger->log(sprintf('Lock %s cleared successfully.', $lockid), 'DEBUG'); + } + + return true; + } + + /** + * Do garbage collection needed for the driver. + * + * @todo Rename to gc(). + */ + public function doGC() + { + $now = time(); + $query = 'DELETE FROM ' . $this->_params['table'] . ' WHERE ' . + 'lock_expiry_timestamp < ? AND lock_expiry_timestamp != ?'; + $values = array($now, Horde_Lock::PERMANENT); + + try { + if ($this->_db) { + $result = $this->_db->delete($query, $values); + if ($this->_logger) { + $this->_logger->log(sprintf('Lock garbage collection cleared %d locks.', $result), 'DEBUG'); + } + } + } catch (Horde_Db_Exception $e) {} + } + +} diff -Nru php-horde-lock-2.1.3/Horde_Lock-2.1.4/lib/Horde/Lock.php php-horde-lock-2.1.4/Horde_Lock-2.1.4/lib/Horde/Lock.php --- php-horde-lock-2.1.3/Horde_Lock-2.1.4/lib/Horde/Lock.php 1970-01-01 00:00:00.000000000 +0000 +++ php-horde-lock-2.1.4/Horde_Lock-2.1.4/lib/Horde/Lock.php 2016-09-01 16:02:10.000000000 +0000 @@ -0,0 +1,146 @@ + + * @category Horde + * @package Lock + */ +abstract class Horde_Lock +{ + /* Class constants. */ + const TYPE_EXCLUSIVE = 1; + const TYPE_SHARED = 2; + const PERMANENT = -1; + /** + * Driver parameters. + * + * @var array + */ + protected $_params; + + /** + * Logger. + * + * @var Horde_Log_Logger + */ + protected $_logger; + + /** + * Constructor. + * + * @param array $params Configuration parameters: + * 
+     * 'logger' - (Horde_Log_Logger) A logger instance.
+     *
+ */ + public function __construct($params = array()) + { + if (!empty($params['logger'])) { + $this->_logger = $params['logger']; + unset($params['logger']); + } + + $this->_params = $params; + } + + /** + * Return an array of information about the requested lock. + * + * @param string $lockid Lock ID to look up. + * + * @return array Lock information. + * @throws Horde_Lock_Exception + */ + abstract public function getLockInfo($lockid); + + /** + * Return a list of valid locks with the option to limit the results + * by principal, scope and/or type. + * + * @param string $scope The scope of the lock. Typically the name of + * the application requesting the lock or some + * other identifier used to group locks together. + * @param string $principal Principal for which to check for locks + * @param integer $type Only return locks of the given type. + * Defaults to null, or all locks + * + * @return array Array of locks with the ID as the key and the lock details + * as the value. If there are no current locks this will + * return an empty array. + * @throws Horde_Lock_Exception + */ + abstract public function getLocks($scope = null, $principal = null, + $type = null); + + /** + * Extend the valid lifetime of a valid lock to now + $extend. + * + * @param string $lockid Lock ID to reset. Must be a valid, non-expired + * lock. + * @param integer $extend Extend lock this many seconds from now. + * + * @return boolean Returns true on success. + * @throws Horde_Lock_Exception + */ + abstract public function resetLock($lockid, $extend); + + /** + * Sets a lock on the requested principal and returns the generated lock + * ID. NOTE: No security checks are done in the Horde_Lock API. It is + * expected that the calling application has done all necessary security + * checks before requesting a lock be granted. + * + * @param string $requestor User ID of the lock requestor. + * @param string $scope The scope of the lock. Typically the name of + * the application requesting the lock or some + * other identifier used to group locks + * together. + * @param string $principal A principal on which a lock should be + * granted. The format can be any string but is + * suggested to be in URI form. + * @param integer $lifetime Time (in seconds) for which the lock will be + * considered valid. + * @param string exclusive One of Horde_Lock::TYPE_SHARED or + * Horde_Lock::TYPE_EXCLUSIVE. + * - An exclusive lock will be enforced strictly + * and must be interpreted to mean that the + * resource can not be modified. Only one + * exclusive lock per principal is allowed. + * - A shared lock is one that notifies other + * potential lock requestors that the resource + * is in use. This lock can be overridden + * (cleared or replaced with a subsequent + * call to setLock()) by other users. Multiple + * users may request (and will be granted) a + * shared lock on a given principal. All locks + * will be considered valid until they are + * cleared or expire. + * + * @return mixed A string lock ID. + * @throws Horde_Lock_Exception + */ + abstract public function setLock($requestor, $scope, $principal, + $lifetime = 1, + $exclusive = Horde_Lock::TYPE_SHARED); + + /** + * Removes a lock given the lock ID. + * NOTE: No security checks are done in the Horde_Lock API. It is + * expected that the calling application has done all necessary security + * checks before requesting a lock be cleared. + * + * @param string $lockid The lock ID as generated by a previous call + * to setLock() + * + * @return boolean Returns true on success. + * @throws Horde_Lock_Exception + */ + abstract public function clearLock($lockid); +} diff -Nru php-horde-lock-2.1.3/Horde_Lock-2.1.4/migration/Horde/Lock/1_horde_lock_base_tables.php php-horde-lock-2.1.4/Horde_Lock-2.1.4/migration/Horde/Lock/1_horde_lock_base_tables.php --- php-horde-lock-2.1.3/Horde_Lock-2.1.4/migration/Horde/Lock/1_horde_lock_base_tables.php 1970-01-01 00:00:00.000000000 +0000 +++ php-horde-lock-2.1.4/Horde_Lock-2.1.4/migration/Horde/Lock/1_horde_lock_base_tables.php 2016-09-01 16:02:10.000000000 +0000 @@ -0,0 +1,24 @@ +tables())) { + $t = $this->createTable('horde_locks', array('autoincrementKey' => array('lock_id'))); + $t->column('lock_id', 'string', array('limit' => 36, 'null' => false)); + $t->column('lock_owner', 'string', array('limit' => 32, 'null' => false)); + $t->column('lock_scope', 'string', array('limit' => 32, 'null' => false)); + $t->column('lock_principal', 'string', array('limit' => 255, 'null' => false)); + $t->column('lock_origin_timestamp', 'bigint', array('null' => false)); + $t->column('lock_update_timestamp', 'bigint', array('null' => false)); + $t->column('lock_expiry_timestamp', 'bigint', array('null' => false)); + $t->column('lock_type', 'smallint', array('null' => false, 'unsigned' => true)); + $t->end(); + } + } + + public function down() + { + $this->dropTable('horde_locks'); + } +} diff -Nru php-horde-lock-2.1.3/Horde_Lock-2.1.4/migration/Horde/Lock/2_horde_lock_upgrade_column_types.php php-horde-lock-2.1.4/Horde_Lock-2.1.4/migration/Horde/Lock/2_horde_lock_upgrade_column_types.php --- php-horde-lock-2.1.3/Horde_Lock-2.1.4/migration/Horde/Lock/2_horde_lock_upgrade_column_types.php 1970-01-01 00:00:00.000000000 +0000 +++ php-horde-lock-2.1.4/Horde_Lock-2.1.4/migration/Horde/Lock/2_horde_lock_upgrade_column_types.php 2016-09-01 16:02:10.000000000 +0000 @@ -0,0 +1,14 @@ +changeColumn('horde_locks', 'lock_owner', 'string', array('limit' => 255, 'null' => false)); + } + + public function down() + { + $this->changeColumn('horde_locks', 'lock_owner', 'string', array('limit' => 32, 'null' => false)); + } +} diff -Nru php-horde-lock-2.1.3/Horde_Lock-2.1.4/test/Horde/Lock/AllTests.php php-horde-lock-2.1.4/Horde_Lock-2.1.4/test/Horde/Lock/AllTests.php --- php-horde-lock-2.1.3/Horde_Lock-2.1.4/test/Horde/Lock/AllTests.php 1970-01-01 00:00:00.000000000 +0000 +++ php-horde-lock-2.1.4/Horde_Lock-2.1.4/test/Horde/Lock/AllTests.php 2016-09-01 16:02:10.000000000 +0000 @@ -0,0 +1,3 @@ +run(); diff -Nru php-horde-lock-2.1.3/Horde_Lock-2.1.4/test/Horde/Lock/bootstrap.php php-horde-lock-2.1.4/Horde_Lock-2.1.4/test/Horde/Lock/bootstrap.php --- php-horde-lock-2.1.3/Horde_Lock-2.1.4/test/Horde/Lock/bootstrap.php 1970-01-01 00:00:00.000000000 +0000 +++ php-horde-lock-2.1.4/Horde_Lock-2.1.4/test/Horde/Lock/bootstrap.php 2016-09-01 16:02:10.000000000 +0000 @@ -0,0 +1,3 @@ + diff -Nru php-horde-lock-2.1.3/Horde_Lock-2.1.4/test/Horde/Lock/Storage/MongoTest.php php-horde-lock-2.1.4/Horde_Lock-2.1.4/test/Horde/Lock/Storage/MongoTest.php --- php-horde-lock-2.1.3/Horde_Lock-2.1.4/test/Horde/Lock/Storage/MongoTest.php 1970-01-01 00:00:00.000000000 +0000 +++ php-horde-lock-2.1.4/Horde_Lock-2.1.4/test/Horde/Lock/Storage/MongoTest.php 2016-09-01 16:02:10.000000000 +0000 @@ -0,0 +1,44 @@ + + * @category Horde + * @ignore + * @license http://www.horde.org/licenses/lgpl21 LGPL + * @package Lock + * @subpackage UnitTests + */ +class Horde_Lock_Storage_MongoTest extends Horde_Lock_Storage_TestBase +{ + private $_dbname = 'horde_lock_mongodbtest'; + private $_mongo; + + protected function _getBackend() + { + if (($config = self::getConfig('LOCK_MONGO_TEST_CONFIG', __DIR__ . '/..')) && + isset($config['lock']['mongo'])) { + $factory = new Horde_Test_Factory_Mongo(); + $this->_mongo = $factory->create(array( + 'config' => $config['lock']['mongo'], + 'dbname' => $this->_dbname + )); + } + + if (empty($this->_mongo)) { + $this->markTestSkipped('MongoDB not available.'); + } + + return new Horde_Lock_Mongo(array( + 'mongo_db' => $this->_mongo, + )); + } + + public function tearDown() + { + if (!empty($this->_mongo)) { + $this->_mongo->selectDB(null)->drop(); + } + + parent::tearDown(); + } + +} diff -Nru php-horde-lock-2.1.3/Horde_Lock-2.1.4/test/Horde/Lock/Storage/SqlTest.php php-horde-lock-2.1.4/Horde_Lock-2.1.4/test/Horde/Lock/Storage/SqlTest.php --- php-horde-lock-2.1.3/Horde_Lock-2.1.4/test/Horde/Lock/Storage/SqlTest.php 1970-01-01 00:00:00.000000000 +0000 +++ php-horde-lock-2.1.4/Horde_Lock-2.1.4/test/Horde/Lock/Storage/SqlTest.php 2016-09-01 16:02:10.000000000 +0000 @@ -0,0 +1,46 @@ + + * @category Horde + * @ignore + * @license http://www.horde.org/licenses/lgpl21 LGPL + * @package Lock + * @subpackage UnitTests + */ +class Horde_Lock_Storage_SqlTest extends Horde_Lock_Storage_TestBase +{ + protected static $_migrationDir; + + public static function setUpBeforeClass() + { + self::$_migrationDir = __DIR__ . '/../../../../migration/Horde/Lock'; + + if (!is_dir(self::$_migrationDir)) { + error_reporting(E_ALL & ~E_DEPRECATED); + self::$_migrationDir = PEAR_Config::singleton() + ->get('data_dir', null, 'pear.horde.org') + . '/Horde_Lock/migration'; + error_reporting(E_ALL | E_STRICT); + } + } + + protected function _getBackend() + { + $factory_db = new Horde_Test_Factory_Db(); + + try { + $db = $factory_db->create(array( + 'migrations' => array( + 'migrationsPath' => self::$_migrationDir + ) + )); + } catch (Horde_Test_Exception $e) { + $this->markTestSkipped('Test DB not available.'); + } + + return new Horde_Lock_Sql(array( + 'db' => $db + )); + } + +} diff -Nru php-horde-lock-2.1.3/Horde_Lock-2.1.4/test/Horde/Lock/Storage/TestBase.php php-horde-lock-2.1.4/Horde_Lock-2.1.4/test/Horde/Lock/Storage/TestBase.php --- php-horde-lock-2.1.3/Horde_Lock-2.1.4/test/Horde/Lock/Storage/TestBase.php 1970-01-01 00:00:00.000000000 +0000 +++ php-horde-lock-2.1.4/Horde_Lock-2.1.4/test/Horde/Lock/Storage/TestBase.php 2016-09-01 16:02:10.000000000 +0000 @@ -0,0 +1,183 @@ + + * @author Michael Slusarz + * @category Horde + * @ignore + * @license http://www.horde.org/licenses/lgpl21 LGPL + * @package Lock + * @subpackage UnitTests + */ +abstract class Horde_Lock_Storage_TestBase extends Horde_Test_Case +{ + protected $_lock; + + protected function setUp() + { + $this->_lock = $this->_getBackend(); + } + + abstract protected function _getBackend(); + + public function tearDown() + { + unset($this->_lock); + } + + public function testGetLockInfo() + { + $lock1 = $this->_lock->setLock( + 'myuser', 'myapp', 'myprincipal', 100, Horde_Lock::TYPE_SHARED); + $info1 = $this->_lock->getLockInfo($lock1); + $this->assertEquals($info1['lock_update_timestamp'], + $info1['lock_origin_timestamp']); + $this->assertEquals($info1['lock_expiry_timestamp'], + $info1['lock_origin_timestamp'] + 100); + unset($info1['lock_update_timestamp'], + $info1['lock_origin_timestamp'], + $info1['lock_expiry_timestamp']); + $this->assertEquals(array('lock_id' => $lock1, + 'lock_owner' => 'myuser', + 'lock_scope' => 'myapp', + 'lock_principal' => 'myprincipal', + 'lock_type' => Horde_Lock::TYPE_SHARED), + $info1); + + $lock2 = $this->_lock->setLock( + 'myuser', 'myapp', 'myprincipal2', 1000, Horde_Lock::TYPE_EXCLUSIVE); + $info2 = $this->_lock->getLockInfo($lock2); + $this->assertEquals($info2['lock_update_timestamp'], + $info2['lock_origin_timestamp']); + $this->assertEquals($info2['lock_expiry_timestamp'], + $info2['lock_origin_timestamp'] + 1000); + unset($info2['lock_update_timestamp'], + $info2['lock_origin_timestamp'], + $info2['lock_expiry_timestamp']); + $this->assertEquals(array('lock_id' => $lock2, + 'lock_owner' => 'myuser', + 'lock_scope' => 'myapp', + 'lock_principal' => 'myprincipal2', + 'lock_type' => Horde_Lock::TYPE_EXCLUSIVE), + $info2); + } + + public function testGetLocks() + { + $lock1 = $this->_lock->setLock( + 'myuser', 'myapp', 'myprincipal', 100, Horde_Lock::TYPE_SHARED); + $lock2 = $this->_lock->setLock( + 'myuser', 'myapp', 'myprincipal2', 100, Horde_Lock::TYPE_EXCLUSIVE); + $this->assertEquals( + array($lock1, $lock2), + array_keys($this->_lock->getLocks('myapp'))); + $this->assertEquals( + array($lock1), + array_keys($this->_lock->getLocks('myapp', 'myprincipal'))); + $this->assertEquals( + array($lock2), + array_keys($this->_lock->getLocks(null, 'myprincipal2'))); + $this->assertEquals( + array($lock1), + array_keys($this->_lock->getLocks(null, null, Horde_Lock::TYPE_SHARED))); + $this->assertEquals( + array($lock2), + array_keys($this->_lock->getLocks('myapp', 'myprincipal2', Horde_Lock::TYPE_EXCLUSIVE))); + $this->assertEquals( + array(), + array_keys($this->_lock->getLocks('myapp', 'myprincipal', Horde_Lock::TYPE_EXCLUSIVE))); + } + + public function testResetLock() + { + $lock1 = $this->_lock->setLock( + 'myuser', 'myapp', 'myprincipal', 100, Horde_Lock::TYPE_EXCLUSIVE); + $info1 = $this->_lock->getLockInfo($lock1); + $expiry = $info1['lock_expiry_timestamp']; + + $lock2 = $this->_lock->setLock( + 'myuser', 'myapp', 'myprincipal2', Horde_Lock::PERMANENT, + Horde_Lock::TYPE_EXCLUSIVE); + $info3 = $this->_lock->getLockInfo($lock2); + + sleep(1); + + $this->_lock->resetLock($lock1, 100); + $info2 = $this->_lock->getLockInfo($lock1); + $this->assertLessThan($info2['lock_update_timestamp'], + $info2['lock_origin_timestamp']); + $this->assertLessThan($info2['lock_expiry_timestamp'], + $info2['lock_origin_timestamp']); + $this->assertEquals($info2['lock_expiry_timestamp'], + $info2['lock_update_timestamp'] + 100); + + $this->assertEquals(Horde_Lock::PERMANENT, + $info3['lock_expiry_timestamp']); + $this->_lock->resetLock($lock2, Horde_Lock::PERMANENT); + $info4 = $this->_lock->getLockInfo($lock2); + $this->assertEquals(Horde_Lock::PERMANENT, + $info3['lock_expiry_timestamp']); + + $this->_lock->resetLock($lock1, Horde_Lock::PERMANENT); + $info5 = $this->_lock->getLockInfo($lock1); + $this->assertEquals(Horde_Lock::PERMANENT, + $info5['lock_expiry_timestamp']); + $this->_lock->resetLock($lock2, 10); + $info6 = $this->_lock->getLockInfo($lock2); + $this->assertEquals(Horde_Lock::PERMANENT, + $info6['lock_expiry_timestamp']); + } + + public function testSetLock() + { + $lock1 = $this->_lock->setLock( + 'myuser', 'myapp', 'myprincipal', 100, Horde_Lock::TYPE_SHARED); + $lock2 = $this->_lock->setLock( + 'myuser', 'myapp', 'myprincipal', 100, Horde_Lock::TYPE_SHARED); + $lock3 = $this->_lock->setLock( + 'myuser', 'myapp', 'myprincipal', 100, Horde_Lock::TYPE_EXCLUSIVE); + $this->assertInternalType('string', $lock1); + $this->assertInternalType('string', $lock2); + $this->assertFalse($lock3); + $this->assertNotEquals($lock1, $lock2); + + $lock4 = $this->_lock->setLock( + 'myuser', 'myapp', 'myprincipal2', 100, Horde_Lock::TYPE_EXCLUSIVE); + $lock5 = $this->_lock->setLock( + 'myuser', 'myapp', 'myprincipal2', 100, Horde_Lock::TYPE_EXCLUSIVE); + $lock6 = $this->_lock->setLock( + 'myuser', 'myapp', 'myprincipal2', 100, Horde_Lock::TYPE_SHARED); + $this->assertInternalType('string', $lock4); + $this->assertFalse($lock5); + $this->assertFalse($lock6); + + $lock7 = $this->_lock->setLock( + 'myuser', 'myapp', 'myprincipal3', 1, Horde_Lock::TYPE_EXCLUSIVE); + $lock8 = $this->_lock->setLock( + 'myuser', 'myapp', 'myprincipal4', Horde_Lock::PERMANENT, + Horde_Lock::TYPE_EXCLUSIVE); + sleep(2); + $lock9 = $this->_lock->setLock( + 'myuser', 'myapp', 'myprincipal3', 100, Horde_Lock::TYPE_EXCLUSIVE); + $lock10 = $this->_lock->setLock( + 'myuser', 'myapp', 'myprincipal4', Horde_Lock::PERMANENT, + Horde_Lock::TYPE_EXCLUSIVE); + $this->assertInternalType('string', $lock7); + $this->assertInternalType('string', $lock8); + $this->assertInternalType('string', $lock9); + $this->assertFalse($lock10); + $this->assertNotEquals($lock7, $lock9); + } + + public function testClearLock() + { + $lock1 = $this->_lock->setLock('myuser', 'myapp', 'myprincipal', + 100, Horde_Lock::TYPE_SHARED); + $lock2 = $this->_lock->setLock('myuser', 'myapp', 'myprincipal2', + 100, Horde_Lock::TYPE_EXCLUSIVE); + $this->_lock->clearLock($lock1); + $this->assertEquals( + array($lock2), + array_keys($this->_lock->getLocks())); + $this->assertEmpty($this->_lock->getLockInfo($lock1)); + } +} diff -Nru php-horde-lock-2.1.3/package.xml php-horde-lock-2.1.4/package.xml --- php-horde-lock-2.1.3/package.xml 2016-07-02 16:55:57.000000000 +0000 +++ php-horde-lock-2.1.4/package.xml 2016-09-01 16:02:10.000000000 +0000 @@ -1,5 +1,5 @@ - + Horde_Lock pear.horde.org Horde Resource Locking System @@ -10,10 +10,10 @@ ben@alkaloid.net yes - 2016-07-02 - + 2016-09-01 + - 2.1.3 + 2.1.4 1.1.0 @@ -22,7 +22,7 @@ LGPL-2.1 -* [jan] Avoid notice with Horde_Mongo on PHP 7. +* [jan] Use more efficient database access in SQL backend. @@ -30,7 +30,7 @@ - + @@ -345,5 +345,20 @@ * [jan] Avoid notice with Horde_Mongo on PHP 7. + + + 2.1.4 + 1.1.0 + + + stable + stable + + 2016-09-01 + LGPL-2.1 + +* [jan] Use more efficient database access in SQL backend. + +