From bef87b1a184deae571f0d0ea3be038aa8183bf47 Mon Sep 17 00:00:00 2001 From: eitch Date: Sun, 7 Aug 2011 10:14:40 +0000 Subject: [PATCH] [Minor] code comments cleanup, added LGPL reference and copyright notice --- COPYING | 674 ++++++++++++++++++ COPYING.LESSER | 165 +++++ build.xml | 25 + config/Privilege.xml | 23 + config/PrivilegeModel.xml | 22 + .../handler/DefaultEncryptionHandler.java | 29 +- .../handler/DefaultPrivilegeHandler.java | 27 +- .../privilege/handler/EncryptionHandler.java | 25 +- .../privilege/handler/PersistenceHandler.java | 25 +- .../privilege/handler/PrivilegeHandler.java | 25 +- .../handler/XmlPersistenceHandler.java | 157 ++-- .../helper/BootstrapConfigurationHelper.java | 25 +- .../privilege/helper/ClassHelper.java | 25 +- .../eitchnet/privilege/helper/HashHelper.java | 25 +- .../helper/InitializationHelper.java | 25 +- .../privilege/helper/PasswordCreaterUI.java | 27 +- .../privilege/helper/PasswordCreator.java | 25 +- .../privilege/helper/XmlConstants.java | 25 +- .../eitchnet/privilege/helper/XmlHelper.java | 25 +- .../privilege/i18n/AccessDeniedException.java | 25 +- .../privilege/i18n/PrivilegeException.java | 25 +- .../eitchnet/privilege/model/Certificate.java | 33 +- .../privilege/model/PrivilegeRep.java | 25 +- .../privilege/model/Restrictable.java | 25 +- src/ch/eitchnet/privilege/model/RoleRep.java | 25 +- src/ch/eitchnet/privilege/model/UserRep.java | 25 +- .../eitchnet/privilege/model/UserState.java | 25 +- .../privilege/model/internal/Privilege.java | 25 +- .../privilege/model/internal/Role.java | 25 +- .../privilege/model/internal/Session.java | 25 +- .../privilege/model/internal/User.java | 25 +- .../privilege/policy/DefaultPrivilege.java | 25 +- .../privilege/policy/PrivilegePolicy.java | 25 +- .../privilege/test/PrivilegeTest.java | 25 +- .../privilege/test/TestRestrictable.java | 25 +- 35 files changed, 1588 insertions(+), 219 deletions(-) create mode 100644 COPYING create mode 100644 COPYING.LESSER diff --git a/COPYING b/COPYING new file mode 100644 index 000000000..94a9ed024 --- /dev/null +++ b/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/COPYING.LESSER b/COPYING.LESSER new file mode 100644 index 000000000..65c5ca88a --- /dev/null +++ b/COPYING.LESSER @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/build.xml b/build.xml index 8063f0c42..64bb5f254 100644 --- a/build.xml +++ b/build.xml @@ -1,4 +1,28 @@ + + + @@ -34,6 +58,7 @@ + diff --git a/config/Privilege.xml b/config/Privilege.xml index 0913623cb..2cfaf41e1 100644 --- a/config/Privilege.xml +++ b/config/Privilege.xml @@ -1,4 +1,27 @@ + + diff --git a/config/PrivilegeModel.xml b/config/PrivilegeModel.xml index c5d531266..a9c40c5fa 100644 --- a/config/PrivilegeModel.xml +++ b/config/PrivilegeModel.xml @@ -1,4 +1,26 @@ + diff --git a/src/ch/eitchnet/privilege/handler/DefaultEncryptionHandler.java b/src/ch/eitchnet/privilege/handler/DefaultEncryptionHandler.java index 976f62463..10d02c49e 100644 --- a/src/ch/eitchnet/privilege/handler/DefaultEncryptionHandler.java +++ b/src/ch/eitchnet/privilege/handler/DefaultEncryptionHandler.java @@ -1,10 +1,25 @@ /* - * Copyright (c) 2010 + * Copyright (c) 2010, 2011 * - * Robert von Burg - * eitch@eitchnet.ch + * Robert von Burg * - * All rights reserved. + */ + +/* + * This file is part of Privilege. + * + * Privilege is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privilege is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Privilege. If not, see . * */ @@ -24,8 +39,8 @@ import ch.eitchnet.privilege.i18n.PrivilegeException; /** *

- * This default {@link EncryptionHandler} creates tokens using a {@link SecureRandom} object. Hashing is done by - * using {@link MessageDigest} and the configured algorithm which is passed in the parameters + * This default {@link EncryptionHandler} creates tokens using a {@link SecureRandom} object. Hashing is done by using + * {@link MessageDigest} and the configured algorithm which is passed in the parameters *

* * Required parameters: @@ -33,7 +48,7 @@ import ch.eitchnet.privilege.i18n.PrivilegeException; *
  • {@link XmlConstants#XML_PARAM_HASH_ALGORITHM}
    • * * - * @author rvonburg + * @author Robert von Burg * */ public class DefaultEncryptionHandler implements EncryptionHandler { diff --git a/src/ch/eitchnet/privilege/handler/DefaultPrivilegeHandler.java b/src/ch/eitchnet/privilege/handler/DefaultPrivilegeHandler.java index 800131392..07b38e558 100644 --- a/src/ch/eitchnet/privilege/handler/DefaultPrivilegeHandler.java +++ b/src/ch/eitchnet/privilege/handler/DefaultPrivilegeHandler.java @@ -1,10 +1,25 @@ /* - * Copyright (c) 2010 + * Copyright (c) 2010, 2011 * - * Robert von Burg - * eitch@eitchnet.ch + * Robert von Burg * - * All rights reserved. + */ + +/* + * This file is part of Privilege. + * + * Privilege is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privilege is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Privilege. If not, see . * */ @@ -50,7 +65,7 @@ import ch.eitchnet.privilege.policy.PrivilegePolicy; *
  • Password requirements are simple: Non null and non empty/length 0
    • * * - * @author rvonburg + * @author Robert von Burg * */ public class DefaultPrivilegeHandler implements PrivilegeHandler { @@ -855,7 +870,7 @@ public class DefaultPrivilegeHandler implements PrivilegeHandler { /** * An internal class used to keep a record of sessions with the certificate * - * @author rvonburg + * @author Robert von Burg */ protected class CertificateSessionPair { /** diff --git a/src/ch/eitchnet/privilege/handler/EncryptionHandler.java b/src/ch/eitchnet/privilege/handler/EncryptionHandler.java index c4f6b34b9..50d758173 100644 --- a/src/ch/eitchnet/privilege/handler/EncryptionHandler.java +++ b/src/ch/eitchnet/privilege/handler/EncryptionHandler.java @@ -1,10 +1,25 @@ /* - * Copyright (c) 2010 + * Copyright (c) 2010, 2011 * - * Robert von Burg - * eitch@eitchnet.ch + * Robert von Burg * - * All rights reserved. + */ + +/* + * This file is part of Privilege. + * + * Privilege is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privilege is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Privilege. If not, see . * */ @@ -16,7 +31,7 @@ import java.util.Map; * The {@link EncryptionHandler} exposes API which is used to handle encrypting of strings, or returning secure tokens * for certificates and so forth * - * @author rvonburg + * @author Robert von Burg * */ public interface EncryptionHandler { diff --git a/src/ch/eitchnet/privilege/handler/PersistenceHandler.java b/src/ch/eitchnet/privilege/handler/PersistenceHandler.java index 65026f2f0..29ad14fac 100644 --- a/src/ch/eitchnet/privilege/handler/PersistenceHandler.java +++ b/src/ch/eitchnet/privilege/handler/PersistenceHandler.java @@ -1,10 +1,25 @@ /* - * Copyright (c) 2010 + * Copyright (c) 2010, 2011 * - * Robert von Burg - * eitch@eitchnet.ch + * Robert von Burg * - * All rights reserved. + */ + +/* + * This file is part of Privilege. + * + * Privilege is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privilege is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Privilege. If not, see . * */ @@ -31,7 +46,7 @@ import ch.eitchnet.privilege.policy.PrivilegePolicy; * and {@link Privilege} *

    * - * @author rvonburg + * @author Robert von Burg * */ public interface PersistenceHandler { diff --git a/src/ch/eitchnet/privilege/handler/PrivilegeHandler.java b/src/ch/eitchnet/privilege/handler/PrivilegeHandler.java index 997d35ec6..2af410f25 100644 --- a/src/ch/eitchnet/privilege/handler/PrivilegeHandler.java +++ b/src/ch/eitchnet/privilege/handler/PrivilegeHandler.java @@ -1,10 +1,25 @@ /* - * Copyright (c) 2010 + * Copyright (c) 2010, 2011 * - * Robert von Burg - * eitch@eitchnet.ch + * Robert von Burg * - * All rights reserved. + */ + +/* + * This file is part of Privilege. + * + * Privilege is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privilege is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Privilege. If not, see . * */ @@ -30,7 +45,7 @@ import ch.eitchnet.privilege.model.internal.User; * methods to access Privilege data model objects, modify them and validate if users or roles have privileges to perform * an action * - * @author rvonburg + * @author Robert von Burg * */ public interface PrivilegeHandler { diff --git a/src/ch/eitchnet/privilege/handler/XmlPersistenceHandler.java b/src/ch/eitchnet/privilege/handler/XmlPersistenceHandler.java index 8d681976f..7fb74dd70 100644 --- a/src/ch/eitchnet/privilege/handler/XmlPersistenceHandler.java +++ b/src/ch/eitchnet/privilege/handler/XmlPersistenceHandler.java @@ -1,10 +1,25 @@ /* - * Copyright (c) 2010 + * Copyright (c) 2010, 2011 * - * Robert von Burg - * eitch@eitchnet.ch + * Robert von Burg * - * All rights reserved. + */ + +/* + * This file is part of Privilege. + * + * Privilege is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privilege is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Privilege. If not, see . * */ @@ -37,7 +52,7 @@ import ch.eitchnet.privilege.model.internal.User; * {@link PersistenceHandler} implementation which reads the configuration from XML files. These configuration is passed * in {@link #initialize(Map)} * - * @author rvonburg + * @author Robert von Burg */ public class XmlPersistenceHandler implements PersistenceHandler { @@ -155,7 +170,7 @@ public class XmlPersistenceHandler implements PersistenceHandler { // USERS // build XML DOM of users - List users = toDomUsers(); + List users = toDomUsers(this.userMap); Element usersElement = docFactory.createElement(XmlConstants.XML_USERS); for (Element userElement : users) { usersElement.add(userElement); @@ -164,7 +179,7 @@ public class XmlPersistenceHandler implements PersistenceHandler { // ROLES // build XML DOM of roles - List roles = toDomRoles(); + List roles = toDomRoles(this.roleMap); Element rolesElement = docFactory.createElement(XmlConstants.XML_ROLES); for (Element roleElement : roles) { rolesElement.add(roleElement); @@ -211,13 +226,15 @@ public class XmlPersistenceHandler implements PersistenceHandler { // get roles element Element rolesElement = modelsRootElement.element(XmlConstants.XML_ROLES); // read roles - readRoles(rolesElement); + Map roles = readRoles(rolesElement); + this.roleMap = roles; // USERS // get users element Element usersElement = modelsRootElement.element(XmlConstants.XML_USERS); // read users - readUsers(usersElement); + Map users = readUsers(usersElement); + this.userMap = users; this.userMapDirty = false; this.roleMapDirty = false; @@ -274,7 +291,9 @@ public class XmlPersistenceHandler implements PersistenceHandler { /** * @param usersRootElement */ - private void readUsers(Element usersRootElement) { + private static Map readUsers(Element usersRootElement) { + + Map userMap = new HashMap(); @SuppressWarnings("unchecked") List userElements = usersRootElement.elements(XmlConstants.XML_USER); @@ -313,14 +332,18 @@ public class XmlPersistenceHandler implements PersistenceHandler { logger.info("Added user " + user); // put user in map - this.userMap.put(username, user); + userMap.put(username, user); } + + return userMap; } /** * @param rolesRootElement */ - private void readRoles(Element rolesRootElement) { + private static Map readRoles(Element rolesRootElement) { + + Map roleMap = new HashMap(); @SuppressWarnings("unchecked") List roleElements = rolesRootElement.elements(XmlConstants.XML_ROLE); @@ -331,64 +354,23 @@ public class XmlPersistenceHandler implements PersistenceHandler { Map privilegeMap = readPrivileges(roleElement); Role role = new Role(roleName, privilegeMap); - this.roleMap.put(roleName, role); - } - } - - /** - * @param roleParentElement - * @return - */ - private Map readPrivileges(Element roleParentElement) { - - Map privilegeMap = new HashMap(); - - @SuppressWarnings("unchecked") - List privilegeElements = roleParentElement.elements(XmlConstants.XML_PRIVILEGE); - for (Element privilegeElement : privilegeElements) { - - String privilegeName = privilegeElement.attributeValue(XmlConstants.XML_ATTR_NAME); - String privilegePolicy = privilegeElement.attributeValue(XmlConstants.XML_ATTR_POLICY); - - String allAllowedS = privilegeElement.element(XmlConstants.XML_ALL_ALLOWED).getTextTrim(); - boolean allAllowed = Boolean.valueOf(allAllowedS).booleanValue(); - - @SuppressWarnings("unchecked") - List denyElements = privilegeElement.elements(XmlConstants.XML_DENY); - Set denyList = new HashSet(denyElements.size()); - for (Element denyElement : denyElements) { - String denyValue = denyElement.getTextTrim(); - if (!denyValue.isEmpty()) - denyList.add(denyValue); - } - - @SuppressWarnings("unchecked") - List allowElements = privilegeElement.elements(XmlConstants.XML_ALLOW); - Set allowList = new HashSet(allowElements.size()); - for (Element allowElement : allowElements) { - String allowValue = allowElement.getTextTrim(); - if (!allowValue.isEmpty()) - allowList.add(allowValue); - } - - Privilege privilege = new Privilege(privilegeName, privilegePolicy, allAllowed, denyList, allowList); - privilegeMap.put(privilegeName, privilege); + roleMap.put(roleName, role); } - return privilegeMap; + return roleMap; } - private List toDomUsers() { + private static List toDomUsers(Map userMap) { - List usersAsElements = new ArrayList(this.userMap.size()); + List usersAsElements = new ArrayList(userMap.size()); DocumentFactory documentFactory = DocumentFactory.getInstance(); - synchronized (this.userMap) { - for (String userName : this.userMap.keySet()) { + synchronized (userMap) { + for (String userName : userMap.keySet()) { // get the user object - User user = this.userMap.get(userName); + User user = userMap.get(userName); // create the user element Element userElement = documentFactory.createElement(XmlConstants.XML_USER); @@ -433,17 +415,17 @@ public class XmlPersistenceHandler implements PersistenceHandler { return usersAsElements; } - private List toDomRoles() { + private static List toDomRoles(Map roleMap) { - List rolesAsElements = new ArrayList(this.roleMap.size()); + List rolesAsElements = new ArrayList(roleMap.size()); DocumentFactory documentFactory = DocumentFactory.getInstance(); - synchronized (this.roleMap) { - for (String roleName : this.roleMap.keySet()) { + synchronized (roleMap) { + for (String roleName : roleMap.keySet()) { // get the role object - Role role = this.roleMap.get(roleName); + Role role = roleMap.get(roleName); // create the role element Element roleElement = documentFactory.createElement(XmlConstants.XML_ROLE); @@ -460,7 +442,50 @@ public class XmlPersistenceHandler implements PersistenceHandler { return rolesAsElements; } - private void toDomPrivileges(Element roleParentElement, Map privilegeMap) { + /** + * @param roleParentElement + * @return + */ + private static Map readPrivileges(Element roleParentElement) { + + Map privilegeMap = new HashMap(); + + @SuppressWarnings("unchecked") + List privilegeElements = roleParentElement.elements(XmlConstants.XML_PRIVILEGE); + for (Element privilegeElement : privilegeElements) { + + String privilegeName = privilegeElement.attributeValue(XmlConstants.XML_ATTR_NAME); + String privilegePolicy = privilegeElement.attributeValue(XmlConstants.XML_ATTR_POLICY); + + String allAllowedS = privilegeElement.element(XmlConstants.XML_ALL_ALLOWED).getTextTrim(); + boolean allAllowed = Boolean.valueOf(allAllowedS).booleanValue(); + + @SuppressWarnings("unchecked") + List denyElements = privilegeElement.elements(XmlConstants.XML_DENY); + Set denyList = new HashSet(denyElements.size()); + for (Element denyElement : denyElements) { + String denyValue = denyElement.getTextTrim(); + if (!denyValue.isEmpty()) + denyList.add(denyValue); + } + + @SuppressWarnings("unchecked") + List allowElements = privilegeElement.elements(XmlConstants.XML_ALLOW); + Set allowList = new HashSet(allowElements.size()); + for (Element allowElement : allowElements) { + String allowValue = allowElement.getTextTrim(); + if (!allowValue.isEmpty()) + allowList.add(allowValue); + } + + Privilege privilege = new Privilege(privilegeName, privilegePolicy, allAllowed, denyList, allowList); + privilegeMap.put(privilegeName, privilege); + } + + return privilegeMap; + } + + private static void toDomPrivileges(Element roleParentElement, Map privilegeMap) { DocumentFactory documentFactory = DocumentFactory.getInstance(); diff --git a/src/ch/eitchnet/privilege/helper/BootstrapConfigurationHelper.java b/src/ch/eitchnet/privilege/helper/BootstrapConfigurationHelper.java index b25485d79..386ce8476 100644 --- a/src/ch/eitchnet/privilege/helper/BootstrapConfigurationHelper.java +++ b/src/ch/eitchnet/privilege/helper/BootstrapConfigurationHelper.java @@ -1,10 +1,25 @@ /* - * Copyright (c) 2010 + * Copyright (c) 2010, 2011 * - * Robert von Burg - * eitch@eitchnet.ch + * Robert von Burg * - * All rights reserved. + */ + +/* + * This file is part of Privilege. + * + * Privilege is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privilege is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Privilege. If not, see . * */ @@ -38,7 +53,7 @@ import ch.eitchnet.privilege.handler.PrivilegeHandler; * Note:This class is not yet implemented! *

    * - * @author rvonburg + * @author Robert von Burg */ public class BootstrapConfigurationHelper { diff --git a/src/ch/eitchnet/privilege/helper/ClassHelper.java b/src/ch/eitchnet/privilege/helper/ClassHelper.java index eda6f8eea..7a741681f 100644 --- a/src/ch/eitchnet/privilege/helper/ClassHelper.java +++ b/src/ch/eitchnet/privilege/helper/ClassHelper.java @@ -1,10 +1,25 @@ /* - * Copyright (c) 2010 + * Copyright (c) 2010, 2011 * - * Robert von Burg - * eitch@eitchnet.ch + * Robert von Burg * - * All rights reserved. + */ + +/* + * This file is part of Privilege. + * + * Privilege is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privilege is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Privilege. If not, see . * */ @@ -15,7 +30,7 @@ import ch.eitchnet.privilege.i18n.PrivilegeException; /** * The {@link ClassHelper} class is a helper to instantiate classes using reflection * - * @author rvonburg + * @author Robert von Burg */ public class ClassHelper { diff --git a/src/ch/eitchnet/privilege/helper/HashHelper.java b/src/ch/eitchnet/privilege/helper/HashHelper.java index 47ed49dc1..628ac518a 100644 --- a/src/ch/eitchnet/privilege/helper/HashHelper.java +++ b/src/ch/eitchnet/privilege/helper/HashHelper.java @@ -1,10 +1,25 @@ /* - * Copyright (c) 2010 + * Copyright (c) 2010, 2011 * - * Robert von Burg - * eitch@eitchnet.ch + * Robert von Burg * - * All rights reserved. + */ + +/* + * This file is part of Privilege. + * + * Privilege is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privilege is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Privilege. If not, see . * */ @@ -17,7 +32,7 @@ import java.security.NoSuchAlgorithmException; /** * Helper class to hash a String for a certain hash algorithm, using the Java {@link MessageDigest} classes * - * @author rvonburg + * @author Robert von Burg */ public class HashHelper { diff --git a/src/ch/eitchnet/privilege/helper/InitializationHelper.java b/src/ch/eitchnet/privilege/helper/InitializationHelper.java index 03c4a60dd..f1b1c57e6 100644 --- a/src/ch/eitchnet/privilege/helper/InitializationHelper.java +++ b/src/ch/eitchnet/privilege/helper/InitializationHelper.java @@ -1,10 +1,25 @@ /* - * Copyright (c) 2010 + * Copyright (c) 2010, 2011 * - * Robert von Burg - * eitch@eitchnet.ch + * Robert von Burg * - * All rights reserved. + */ + +/* + * This file is part of Privilege. + * + * Privilege is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privilege is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Privilege. If not, see . * */ @@ -29,7 +44,7 @@ import ch.eitchnet.privilege.policy.PrivilegePolicy; * This class implements the initializing of the {@link PrivilegeHandler} by loading an XML file containing the * configuration * - * @author rvonburg + * @author Robert von Burg */ public class InitializationHelper { diff --git a/src/ch/eitchnet/privilege/helper/PasswordCreaterUI.java b/src/ch/eitchnet/privilege/helper/PasswordCreaterUI.java index 81690984a..ad6aa9546 100644 --- a/src/ch/eitchnet/privilege/helper/PasswordCreaterUI.java +++ b/src/ch/eitchnet/privilege/helper/PasswordCreaterUI.java @@ -1,17 +1,28 @@ /* - * Copyright (c) 2010 + * Copyright (c) 2010, 2011 * - * Apixxo AG - * Hauptgasse 25 - * 4600 Olten - * - * All rights reserved. + * Robert von Burg * */ -/** +/* + * This file is part of Privilege. + * + * Privilege is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privilege is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Privilege. If not, see . * */ + package ch.eitchnet.privilege.helper; import java.awt.Dimension; @@ -33,7 +44,7 @@ import javax.swing.SwingConstants; /** * Simple Swing UI to create passwords * - * @author rvonburg + * @author Robert von Burg */ public class PasswordCreaterUI { diff --git a/src/ch/eitchnet/privilege/helper/PasswordCreator.java b/src/ch/eitchnet/privilege/helper/PasswordCreator.java index a70dda885..f57a5615e 100644 --- a/src/ch/eitchnet/privilege/helper/PasswordCreator.java +++ b/src/ch/eitchnet/privilege/helper/PasswordCreator.java @@ -1,10 +1,25 @@ /* - * Copyright (c) 2010 + * Copyright (c) 2010, 2011 * - * Robert von Burg - * eitch@eitchnet.ch + * Robert von Burg * - * All rights reserved. + */ + +/* + * This file is part of Privilege. + * + * Privilege is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privilege is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Privilege. If not, see . * */ @@ -23,7 +38,7 @@ import java.security.MessageDigest; * TODO: Note: currently the password input is echoed which is a security risk. This is a TODO *

    * - * @author rvonburg + * @author Robert von Burg */ public class PasswordCreator { diff --git a/src/ch/eitchnet/privilege/helper/XmlConstants.java b/src/ch/eitchnet/privilege/helper/XmlConstants.java index 26bfb757b..54e3f4042 100644 --- a/src/ch/eitchnet/privilege/helper/XmlConstants.java +++ b/src/ch/eitchnet/privilege/helper/XmlConstants.java @@ -1,10 +1,25 @@ /* - * Copyright (c) 2010 + * Copyright (c) 2010, 2011 * - * Robert von Burg - * eitch@eitchnet.ch + * Robert von Burg * - * All rights reserved. + */ + +/* + * This file is part of Privilege. + * + * Privilege is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privilege is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Privilege. If not, see . * */ @@ -13,7 +28,7 @@ package ch.eitchnet.privilege.helper; /** * The constants used in parsing XML documents which contain the configuration for Privilege * - * @author rvonburg + * @author Robert von Burg */ public class XmlConstants { diff --git a/src/ch/eitchnet/privilege/helper/XmlHelper.java b/src/ch/eitchnet/privilege/helper/XmlHelper.java index c77dcec08..50433c212 100644 --- a/src/ch/eitchnet/privilege/helper/XmlHelper.java +++ b/src/ch/eitchnet/privilege/helper/XmlHelper.java @@ -1,10 +1,25 @@ /* - * Copyright (c) 2010 + * Copyright (c) 2010, 2011 * - * Robert von Burg - * eitch@eitchnet.ch + * Robert von Burg * - * All rights reserved. + */ + +/* + * This file is part of Privilege. + * + * Privilege is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privilege is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Privilege. If not, see . * */ @@ -32,7 +47,7 @@ import ch.eitchnet.privilege.i18n.PrivilegeException; /** * Helper class for performing XML based tasks using Dom4J * - * @author rvonburg + * @author Robert von Burg */ public class XmlHelper { diff --git a/src/ch/eitchnet/privilege/i18n/AccessDeniedException.java b/src/ch/eitchnet/privilege/i18n/AccessDeniedException.java index 339bd6fed..5e9029717 100644 --- a/src/ch/eitchnet/privilege/i18n/AccessDeniedException.java +++ b/src/ch/eitchnet/privilege/i18n/AccessDeniedException.java @@ -1,10 +1,25 @@ /* - * Copyright (c) 2010 + * Copyright (c) 2010, 2011 * - * Robert von Burg - * eitch@eitchnet.ch + * Robert von Burg * - * All rights reserved. + */ + +/* + * This file is part of Privilege. + * + * Privilege is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privilege is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Privilege. If not, see . * */ @@ -13,7 +28,7 @@ package ch.eitchnet.privilege.i18n; /** * Exception thrown if access is denied during login, or if a certain privilege is not granted * - * @author rvonburg + * @author Robert von Burg */ public class AccessDeniedException extends PrivilegeException { diff --git a/src/ch/eitchnet/privilege/i18n/PrivilegeException.java b/src/ch/eitchnet/privilege/i18n/PrivilegeException.java index decd696a9..db281372a 100644 --- a/src/ch/eitchnet/privilege/i18n/PrivilegeException.java +++ b/src/ch/eitchnet/privilege/i18n/PrivilegeException.java @@ -1,10 +1,25 @@ /* - * Copyright (c) 2010 + * Copyright (c) 2010, 2011 * - * Robert von Burg - * eitch@eitchnet.ch + * Robert von Burg * - * All rights reserved. + */ + +/* + * This file is part of Privilege. + * + * Privilege is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privilege is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Privilege. If not, see . * */ @@ -13,7 +28,7 @@ package ch.eitchnet.privilege.i18n; /** * Main {@link RuntimeException} thrown if something goes wrong in Privilege * - * @author rvonburg + * @author Robert von Burg */ public class PrivilegeException extends RuntimeException { diff --git a/src/ch/eitchnet/privilege/model/Certificate.java b/src/ch/eitchnet/privilege/model/Certificate.java index 7dfe3b6a9..7ae4f5f56 100644 --- a/src/ch/eitchnet/privilege/model/Certificate.java +++ b/src/ch/eitchnet/privilege/model/Certificate.java @@ -1,10 +1,25 @@ /* - * Copyright (c) 2010 + * Copyright (c) 2010, 2011 * - * Robert von Burg - * eitch@eitchnet.ch + * Robert von Burg * - * All rights reserved. + */ + +/* + * This file is part of Privilege. + * + * Privilege is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privilege is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Privilege. If not, see . * */ @@ -22,7 +37,7 @@ import ch.eitchnet.privilege.model.internal.Session; * instance which is always used when performing an access and is returned when a user performs a login through * {@link PrivilegeHandler#authenticate(String, String)} * - * @author rvonburg + * @author Robert von Burg */ public final class Certificate implements Serializable { @@ -38,7 +53,10 @@ public final class Certificate implements Serializable { /** * Default constructor initializing with all information needed for this certificate * - *

    Note, both the authentication token and password are private fields which are generated on login and only known by the {@link PrivilegeHandler}

    + *

    + * Note, both the authentication token and password are private fields which are generated on login and only known + * by the {@link PrivilegeHandler} + *

    * * @param sessionId * the users session id @@ -49,7 +67,8 @@ public final class Certificate implements Serializable { * It corresponds with the authentication token on the {@link Session} * @param authPassword * the password to access the authentication token, this is not known to the client but set by the - * {@link PrivilegeHandler} on authentication. It corresponds with the authentication password on the {@link Session} + * {@link PrivilegeHandler} on authentication. It corresponds with the authentication password on the + * {@link Session} * @param locale * the users {@link Locale} */ diff --git a/src/ch/eitchnet/privilege/model/PrivilegeRep.java b/src/ch/eitchnet/privilege/model/PrivilegeRep.java index 73c8727e4..6d39f685e 100644 --- a/src/ch/eitchnet/privilege/model/PrivilegeRep.java +++ b/src/ch/eitchnet/privilege/model/PrivilegeRep.java @@ -1,10 +1,25 @@ /* - * Copyright (c) 2010 + * Copyright (c) 2010, 2011 * - * Robert von Burg - * eitch@eitchnet.ch + * Robert von Burg * - * All rights reserved. + */ + +/* + * This file is part of Privilege. + * + * Privilege is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privilege is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Privilege. If not, see . * */ @@ -24,7 +39,7 @@ import ch.eitchnet.privilege.policy.PrivilegePolicy; * edited by users with the correct privilege, this representational version is allowed to be viewed by remote clients * and simply wraps all public data from the {@link Privilege} * - * @author rvonburg + * @author Robert von Burg */ public class PrivilegeRep implements Serializable { diff --git a/src/ch/eitchnet/privilege/model/Restrictable.java b/src/ch/eitchnet/privilege/model/Restrictable.java index 9122d52c5..d3d401a61 100644 --- a/src/ch/eitchnet/privilege/model/Restrictable.java +++ b/src/ch/eitchnet/privilege/model/Restrictable.java @@ -1,10 +1,25 @@ /* - * Copyright (c) 2010 + * Copyright (c) 2010, 2011 * - * Robert von Burg - * eitch@eitchnet.ch + * Robert von Burg * - * All rights reserved. + */ + +/* + * This file is part of Privilege. + * + * Privilege is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privilege is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Privilege. If not, see . * */ @@ -21,7 +36,7 @@ import ch.eitchnet.privilege.policy.PrivilegePolicy; * for evaluating access *

    * - * @author rvonburg + * @author Robert von Burg * */ public interface Restrictable { diff --git a/src/ch/eitchnet/privilege/model/RoleRep.java b/src/ch/eitchnet/privilege/model/RoleRep.java index fde568af3..4af09ca17 100644 --- a/src/ch/eitchnet/privilege/model/RoleRep.java +++ b/src/ch/eitchnet/privilege/model/RoleRep.java @@ -1,10 +1,25 @@ /* - * Copyright (c) 2010 + * Copyright (c) 2010, 2011 * - * Robert von Burg - * eitch@eitchnet.ch + * Robert von Burg * - * All rights reserved. + */ + +/* + * This file is part of Privilege. + * + * Privilege is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privilege is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Privilege. If not, see . * */ @@ -20,7 +35,7 @@ import ch.eitchnet.privilege.model.internal.Role; * by users with the correct privilege, this representational version is allowed to be viewed by remote clients and * simply wraps all public data from the {@link Role} * - * @author rvonburg + * @author Robert von Burg */ public class RoleRep implements Serializable { diff --git a/src/ch/eitchnet/privilege/model/UserRep.java b/src/ch/eitchnet/privilege/model/UserRep.java index 7efbb8ab9..491d42fda 100644 --- a/src/ch/eitchnet/privilege/model/UserRep.java +++ b/src/ch/eitchnet/privilege/model/UserRep.java @@ -1,10 +1,25 @@ /* - * Copyright (c) 2010 + * Copyright (c) 2010, 2011 * - * Robert von Burg - * eitch@eitchnet.ch + * Robert von Burg * - * All rights reserved. + */ + +/* + * This file is part of Privilege. + * + * Privilege is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privilege is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Privilege. If not, see . * */ @@ -22,7 +37,7 @@ import ch.eitchnet.privilege.model.internal.User; * by users with the correct privilege, this representational version is allowed to be viewed by remote clients and * simply wraps all public data from the {@link User} * - * @author rvonburg + * @author Robert von Burg */ public class UserRep implements Serializable { diff --git a/src/ch/eitchnet/privilege/model/UserState.java b/src/ch/eitchnet/privilege/model/UserState.java index ab1fbde5e..d98b9df14 100644 --- a/src/ch/eitchnet/privilege/model/UserState.java +++ b/src/ch/eitchnet/privilege/model/UserState.java @@ -1,10 +1,25 @@ /* - * Copyright (c) 2010 + * Copyright (c) 2010, 2011 * - * Robert von Burg - * eitch@eitchnet.ch + * Robert von Burg * - * All rights reserved. + */ + +/* + * This file is part of Privilege. + * + * Privilege is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privilege is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Privilege. If not, see . * */ @@ -22,7 +37,7 @@ import ch.eitchnet.privilege.model.internal.User; *
  • EXPIRED - the user has automatically expired through a predefined time
    • * * - * @author rvonburg + * @author Robert von Burg * */ public enum UserState { diff --git a/src/ch/eitchnet/privilege/model/internal/Privilege.java b/src/ch/eitchnet/privilege/model/internal/Privilege.java index 254df64dd..96fa4b418 100644 --- a/src/ch/eitchnet/privilege/model/internal/Privilege.java +++ b/src/ch/eitchnet/privilege/model/internal/Privilege.java @@ -1,10 +1,25 @@ /* - * Copyright (c) 2010 + * Copyright (c) 2010, 2011 * - * Robert von Burg - * eitch@eitchnet.ch + * Robert von Burg * - * All rights reserved. + */ + +/* + * This file is part of Privilege. + * + * Privilege is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privilege is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Privilege. If not, see . * */ @@ -37,7 +52,7 @@ import ch.eitchnet.privilege.policy.PrivilegePolicy; * for that *

    * - * @author rvonburg + * @author Robert von Burg */ public final class Privilege { diff --git a/src/ch/eitchnet/privilege/model/internal/Role.java b/src/ch/eitchnet/privilege/model/internal/Role.java index 2d6a9e632..aa76e6bd6 100644 --- a/src/ch/eitchnet/privilege/model/internal/Role.java +++ b/src/ch/eitchnet/privilege/model/internal/Role.java @@ -1,10 +1,25 @@ /* - * Copyright (c) 2010 + * Copyright (c) 2010, 2011 * - * Robert von Burg - * eitch@eitchnet.ch + * Robert von Burg * - * All rights reserved. + */ + +/* + * This file is part of Privilege. + * + * Privilege is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privilege is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Privilege. If not, see . * */ @@ -29,7 +44,7 @@ import ch.eitchnet.privilege.model.RoleRep; * that *

    * - * @author rvonburg + * @author Robert von Burg */ public final class Role { diff --git a/src/ch/eitchnet/privilege/model/internal/Session.java b/src/ch/eitchnet/privilege/model/internal/Session.java index 7e0df5272..2210c8fc3 100644 --- a/src/ch/eitchnet/privilege/model/internal/Session.java +++ b/src/ch/eitchnet/privilege/model/internal/Session.java @@ -1,10 +1,25 @@ /* - * Copyright (c) 2010 + * Copyright (c) 2010, 2011 * - * Robert von Burg - * eitch@eitchnet.ch + * Robert von Burg * - * All rights reserved. + */ + +/* + * This file is part of Privilege. + * + * Privilege is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privilege is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Privilege. If not, see . * */ @@ -26,7 +41,7 @@ import ch.eitchnet.privilege.model.Certificate; * {@link Certificate} which is used for accessing privileges *

    * - * @author rvonburg + * @author Robert von Burg */ public final class Session { diff --git a/src/ch/eitchnet/privilege/model/internal/User.java b/src/ch/eitchnet/privilege/model/internal/User.java index 84ee1e2eb..e72908652 100644 --- a/src/ch/eitchnet/privilege/model/internal/User.java +++ b/src/ch/eitchnet/privilege/model/internal/User.java @@ -1,10 +1,25 @@ /* - * Copyright (c) 2010 + * Copyright (c) 2010, 2011 * - * Robert von Burg - * eitch@eitchnet.ch + * Robert von Burg * - * All rights reserved. + */ + +/* + * This file is part of Privilege. + * + * Privilege is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privilege is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Privilege. If not, see . * */ @@ -28,7 +43,7 @@ import ch.eitchnet.privilege.model.UserState; * that *

    * - * @author rvonburg + * @author Robert von Burg * */ public final class User { diff --git a/src/ch/eitchnet/privilege/policy/DefaultPrivilege.java b/src/ch/eitchnet/privilege/policy/DefaultPrivilege.java index b455ef14b..bd67adf0e 100644 --- a/src/ch/eitchnet/privilege/policy/DefaultPrivilege.java +++ b/src/ch/eitchnet/privilege/policy/DefaultPrivilege.java @@ -1,10 +1,25 @@ /* - * Copyright (c) 2010 + * Copyright (c) 2010, 2011 * - * Robert von Burg - * eitch@eitchnet.ch + * Robert von Burg * - * All rights reserved. + */ + +/* + * This file is part of Privilege. + * + * Privilege is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privilege is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Privilege. If not, see . * */ @@ -19,7 +34,7 @@ import ch.eitchnet.privilege.model.internal.Role; /** * XXX re-think this implementation... * - * @author rvonburg + * @author Robert von Burg */ public class DefaultPrivilege implements PrivilegePolicy { diff --git a/src/ch/eitchnet/privilege/policy/PrivilegePolicy.java b/src/ch/eitchnet/privilege/policy/PrivilegePolicy.java index 63807fe1c..9c0d14bb0 100644 --- a/src/ch/eitchnet/privilege/policy/PrivilegePolicy.java +++ b/src/ch/eitchnet/privilege/policy/PrivilegePolicy.java @@ -1,10 +1,25 @@ /* - * Copyright (c) 2010 + * Copyright (c) 2010, 2011 * - * Robert von Burg - * eitch@eitchnet.ch + * Robert von Burg * - * All rights reserved. + */ + +/* + * This file is part of Privilege. + * + * Privilege is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privilege is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Privilege. If not, see . * */ @@ -27,7 +42,7 @@ import ch.eitchnet.privilege.model.internal.User; * need one with out the {@link Privilege} in its signature? *

    * - * @author rvonburg + * @author Robert von Burg */ public interface PrivilegePolicy { diff --git a/test/ch/eitchnet/privilege/test/PrivilegeTest.java b/test/ch/eitchnet/privilege/test/PrivilegeTest.java index 1a375e233..72370488f 100644 --- a/test/ch/eitchnet/privilege/test/PrivilegeTest.java +++ b/test/ch/eitchnet/privilege/test/PrivilegeTest.java @@ -1,10 +1,25 @@ /* - * Copyright (c) 2010 + * Copyright (c) 2010, 2011 * - * Robert von Burg - * eitch@eitchnet.ch + * Robert von Burg * - * All rights reserved. + */ + +/* + * This file is part of Privilege. + * + * Privilege is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privilege is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Privilege. If not, see . * */ @@ -38,7 +53,7 @@ import ch.eitchnet.privilege.model.UserState; * JUnit for performing Privilege tests. This JUnit is by no means complete, but checks the bare minimum. TODO add more * tests, especially with deny and allow lists * - * @author rvonburg + * @author Robert von Burg */ public class PrivilegeTest { diff --git a/test/ch/eitchnet/privilege/test/TestRestrictable.java b/test/ch/eitchnet/privilege/test/TestRestrictable.java index ee8921722..e384e89df 100644 --- a/test/ch/eitchnet/privilege/test/TestRestrictable.java +++ b/test/ch/eitchnet/privilege/test/TestRestrictable.java @@ -1,10 +1,25 @@ /* - * Copyright (c) 2010 + * Copyright (c) 2010, 2011 * - * Robert von Burg - * eitch@eitchnet.ch + * Robert von Burg * - * All rights reserved. + */ + +/* + * This file is part of Privilege. + * + * Privilege is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privilege is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Privilege. If not, see . * */ @@ -13,7 +28,7 @@ package ch.eitchnet.privilege.test; import ch.eitchnet.privilege.model.Restrictable; /** - * @author rvonburg + * @author Robert von Burg * */ public class TestRestrictable implements Restrictable {