commit 368f89750b7d161a9887c6483016a811fdd5f256 Author: Trent Palmer Date: Wed Jan 20 01:36:22 2021 -0800 initial commit diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..0ad25db --- /dev/null +++ b/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 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 Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/app/__init__.py b/app/__init__.py new file mode 100644 index 0000000..e6d93ce --- /dev/null +++ b/app/__init__.py @@ -0,0 +1,60 @@ +#!/usr/bin/env python3 + +import logging +from flask import Flask +from config import Config +from flask_sqlalchemy import SQLAlchemy +from flask_login import LoginManager +from flask_mail import Mail + +db = SQLAlchemy() +login = LoginManager() +mail = Mail() + + +def init_app(): + app = Flask(__name__) + app.config.from_object(Config) + db.init_app(app) + login.init_app(app) + mail.init_app(app) + + from app.sendxmpp_handler import SENDXMPPHandler + + if app.config['LOGGING_XMPP_SERVER']: + sendxmpp_handler = SENDXMPPHandler( + logging_xmpp_server=(app.config['LOGGING_XMPP_SERVER']), + logging_xmpp_sender=(app.config['LOGGING_XMPP_SENDER']), + logging_xmpp_password=(app.config['LOGGING_XMPP_PASSWORD']), + logging_xmpp_recipient=(app.config['LOGGING_XMPP_RECIPIENT']), + logging_xmpp_command=(app.config['LOGGING_XMPP_COMMAND']), + logging_xmpp_use_tls=(app.config['LOGGING_XMPP_USE_TLS']), + ) + sendxmpp_handler.setLevel(logging.ERROR) + app.logger.addHandler(sendxmpp_handler) + + from .tasks import tasks, new_task, task_action, edit_task + from .tasks import delete_move_toggle_task, reorder_priorities + from .categories import hide_categories, delete_category + from .categories import new_category, categories + from .auth import auth, profile, reset_password, register, totp + with app.app_context(): + app.register_blueprint(categories.cats) + app.register_blueprint(new_category.new_cat) + app.register_blueprint(hide_categories.hidecats) + app.register_blueprint(delete_category.delcat) + app.register_blueprint(auth.auths) + app.register_blueprint(profile.prof) + app.register_blueprint(reset_password.pwd) + app.register_blueprint(register.reg) + app.register_blueprint(totp.totps) + app.register_blueprint(tasks.tsks) + app.register_blueprint(new_task.newtask) + app.register_blueprint(task_action.taskaction) + app.register_blueprint(edit_task.edittask) + app.register_blueprint(delete_move_toggle_task.deletetask) + app.register_blueprint(delete_move_toggle_task.toggletaskdone) + app.register_blueprint(delete_move_toggle_task.movecat) + app.register_blueprint(reorder_priorities.reorderp) + + return app diff --git a/app/auth/auth.py b/app/auth/auth.py new file mode 100644 index 0000000..f64fe85 --- /dev/null +++ b/app/auth/auth.py @@ -0,0 +1,52 @@ +#!/usr/bin/env python3 + +from flask import Blueprint, redirect, url_for, session, flash, render_template +from app.models import Contributor +from app.forms import LoginForm +from flask_login import current_user, login_user, logout_user + +auths = Blueprint( + "auths", __name__, template_folder="templates" +) + + +@auths.route("/login", methods=["GET", "POST"]) +def login(): + if current_user.is_authenticated: + return redirect(url_for('cats.index')) + navbar_links = (('cancel', url_for('cats.index')), ) + form = LoginForm() + if form.validate_on_submit(): + contributor_by_name = Contributor.query.filter_by(name=form.username.data).first() + contributor_by_email = Contributor.query.filter_by(email=form.email.data).first() + if contributor_by_name is not None and contributor_by_name.check_password(form.password.data): + if contributor_by_name.use_totp: + session['id'] = contributor_by_name.id + session['remember_me'] = form.remember_me.data + return redirect(url_for('totps.two_factor_input')) + else: + login_user(contributor_by_name, remember=form.remember_me.data) + flash("Congratulations, you are now logged in!") + return redirect(url_for('cats.index')) + elif contributor_by_email is not None and contributor_by_email.check_password(form.password.data): + if contributor_by_email.use_totp: + session['id'] = contributor_by_email.id + session['remember_me'] = form.remember_me.data + return redirect(url_for('totps.two_factor_input')) + else: + login_user(contributor_by_email, remember=form.remember_me.data) + flash("Congratulations, you are now logged in!") + return redirect(url_for('cats.index')) + else: + flash("Error Invalid Contributor (Username or Email) or Password") + return(redirect(url_for('auths.login'))) + return render_template('login.html', title='Sign In', form=form, navbar_links=navbar_links) + + +@auths.route("/logout") +def logout(): + is_authenticated = current_user.is_authenticated + logout_user() + if is_authenticated: + flash("Congratulations, you are now logged out!") + return redirect(url_for('cats.index')) diff --git a/app/auth/email.py b/app/auth/email.py new file mode 100644 index 0000000..d949d50 --- /dev/null +++ b/app/auth/email.py @@ -0,0 +1,30 @@ +#!/usr/bin/env python3 + +from flask import render_template +from flask_mail import Message +from flask import current_app as app +from .. import mail +from threading import Thread + + +def send_password_reset_email(contributor, external_url): + token = contributor.get_reset_password_token() + send_email('Todo App Reset Your Password', + sender=app.config['MAIL_ADMINS'][0], + recipients=[contributor.email], + text_body=render_template('email/reset_password_email_text.txt', + contributor=contributor, token=token, external_url=external_url), + html_body=render_template('email/reset_password_email_html.html', + contributor=contributor, token=token, external_url=external_url)) + + +def send_async_email(app, msg): + with app.app_context(): + mail.send(msg) + + +def send_email(subject, sender, recipients, text_body, html_body): + msg = Message(subject, sender=sender, recipients=recipients) + msg.body = text_body + msg.html = html_body + Thread(target=send_async_email, args=(app._get_current_object(), msg)).start() diff --git a/app/auth/profile.py b/app/auth/profile.py new file mode 100644 index 0000000..581a8b9 --- /dev/null +++ b/app/auth/profile.py @@ -0,0 +1,67 @@ +#!/usr/bin/env python3 + +from flask import Blueprint, redirect, url_for, request, flash, render_template +from flask_login import current_user +from app.models import Contributor +from app.forms import EditProfile, ChangePassword +from .. import db + +prof = Blueprint( + "prof", __name__, template_folder="templates" +) + + +@prof.route("/edit-profile", methods=["GET", "POST"]) +def edit_profile(): + + if current_user.is_anonymous: + return(redirect(url_for('cats.index'))) + + contributor = Contributor.query.get(current_user.id) + form = EditProfile() + navbar_links = (('cancel', url_for('cats.index')), ) + + if request.method == 'GET': + form.username.data = contributor.name + form.email.data = contributor.email + + if form.validate_on_submit(): + if contributor.check_password(form.password.data): + contributor.name = form.username.data + contributor.email = form.email.data + db.session.commit() + flash("Thanks for the update!") + return(redirect(url_for('cats.index'))) + else: + flash("Error Invalid Password") + return(redirect(url_for('prof.edit_profile'))) + + return render_template( + 'edit_profile.html', + title='Edit Profile', form=form, + contributor_use_totp=contributor.use_totp, + navbar_links=navbar_links + ) + + +@prof.route("/change-password", methods=["GET", "POST"]) +def change_password(): + if not current_user.is_authenticated: + return(redirect(url_for('cats.index'))) + contributor = Contributor.query.get(current_user.id) + form = ChangePassword() + nl = (('cancel', url_for('prof.edit_profile')), ) + if form.validate_on_submit(): + if contributor.check_password(form.password.data): + contributor.set_password(form.new_password.data) + db.session.commit() + flash("Thanks for the update!") + return(redirect(url_for('cats.index'))) + else: + flash("Error Invalid Password") + return(redirect(url_for('prof.change_password'))) + return render_template( + 'change_password.html', + title='Change Password', + form=form, navbar_links=nl + ) diff --git a/app/auth/register.py b/app/auth/register.py new file mode 100644 index 0000000..ec75300 --- /dev/null +++ b/app/auth/register.py @@ -0,0 +1,44 @@ +#!/usr/bin/env python3 + +import psycopg2 +from flask import Blueprint, redirect, url_for, flash, render_template +from flask_login import current_user +from app.forms import RegistrationForm +from app.models import Contributor +from flask import current_app as app +from .. import db + +reg = Blueprint( + "reg", __name__, template_folder="templates" +) + + +@reg.route("/register", methods=["GET", "POST"]) +def register(): + if current_user.is_authenticated: + return redirect(url_for('cats.index')) + form = RegistrationForm() + nl = (('cancel', url_for('auths.login')), ) + if form.validate_on_submit(): + set_contributor_id_seq() + contributor = Contributor(name=form.username.data, email=form.email.data) + contributor.set_password(form.password.data) + db.session.add(contributor) + db.session.commit() + flash("Congratulations, you are now a registered user!") + return redirect(url_for('auths.login')) + return render_template('register.html', title='Register', form=form, navbar_links=nl) + + +def set_contributor_id_seq(): + conn = psycopg2.connect( + dbname=app.config['DATABASE_NAME'], + user=app.config['DATABASE_USER'], + host=app.config['DATABASE_HOST'], + password=app.config['DATABASE_PASSWORD'] + ) + + cur = conn.cursor() + cur.execute("SELECT setval('contributor_id_seq', (SELECT MAX(id) FROM contributor))") + conn.commit() + conn.close() diff --git a/app/auth/reset_password.py b/app/auth/reset_password.py new file mode 100644 index 0000000..90650b9 --- /dev/null +++ b/app/auth/reset_password.py @@ -0,0 +1,48 @@ +#!/usr/bin/env python3 + +from flask import Blueprint, redirect, url_for, flash, render_template +from flask_login import current_user +from app.forms import ResetPasswordRequestForm, ResetPasswordForm +from app.models import Contributor +from flask import current_app as app +from .. import db +from .email import send_password_reset_email + +pwd = Blueprint( + "pwd", __name__, template_folder="templates" +) + + +@pwd.route('/reset-password-request', methods=['GET', 'POST']) +def reset_password_request(): + if current_user.is_authenticated: + return(redirect(url_for('cats.index'))) + nl = (('cancel', url_for('cats.index')), ) + form = ResetPasswordRequestForm() + if form.validate_on_submit(): + contributor = Contributor.query.filter_by(email=form.email.data).first() + if contributor: + send_password_reset_email(contributor, app.config['EXTERNAL_URL']) + flash('Check your email for the instructions to reset your password') + return redirect(url_for('auths.login')) + else: + flash('Sorry, invalid email') + return redirect(url_for('auths.login')) + return render_template('reset_password_request.html', title='Reset Password', form=form, navbar_links=nl) + + +@pwd.route('/reset-password/', methods=['GET', 'POST']) +def reset_password(token): + if current_user.is_authenticated: + return redirect(url_for('cats.index')) + nl = (('cancel', url_for('cats.index')), ) + contributor = Contributor.verify_reset_password_token(token) + if not contributor: + return redirect(url_for('cats.index')) + form = ResetPasswordForm() + if form.validate_on_submit(): + contributor.set_password(form.password.data) + db.session.commit() + flash('Your password has been reset.') + return redirect(url_for('auths.login')) + return render_template('reset_password.html', title="New Password?", form=form, navbar_links=nl) diff --git a/app/auth/templates/change_password.html b/app/auth/templates/change_password.html new file mode 100644 index 0000000..91aaaa9 --- /dev/null +++ b/app/auth/templates/change_password.html @@ -0,0 +1,35 @@ +{% extends "base.html" %} + +{% block content %} +
+

Change Password

+
+ {{ form.hidden_tag() }} +

+ {{ form.password.label }}
+ {{ form.password(size=24) }} + {% for error in form.password.errors %} + [{{error}}] + {% endfor %} +

+

+ {{ form.new_password.label }}
+ + min 15 chars and at least somewhat random +
+ {{ form.new_password(size=24) }} + {% for error in form.new_password.errors %} + [{{error}}] + {% endfor %} +

+

+ {{ form.new_password2.label }}
+ {{ form.new_password2(size=24) }} + {% for error in form.new_password2.errors %} + [{{error}}] + {% endfor %} +

+

{{ form.submit() }}

+
+
+{% endblock %} diff --git a/app/auth/templates/disable_2fa.html b/app/auth/templates/disable_2fa.html new file mode 100644 index 0000000..bff1a50 --- /dev/null +++ b/app/auth/templates/disable_2fa.html @@ -0,0 +1,23 @@ + + +{% extends "base.html" %} + +{% block content %} +
+ +
+

Disable 2FA?

+ {{ form.hidden_tag() }} +

{{ form.submit() }}

+
+
+{% endblock %} diff --git a/app/auth/templates/edit_profile.html b/app/auth/templates/edit_profile.html new file mode 100644 index 0000000..dcf0cd0 --- /dev/null +++ b/app/auth/templates/edit_profile.html @@ -0,0 +1,49 @@ +{% extends "base.html" %} + +{% block content %} +
+

Edit Profile

+
+ {{ form.hidden_tag() }} +

+ {{ form.username.label }}
+ + letters and digits only (i.e. no spaces) +
+ {{ form.username(size=24) }} + {% for error in form.username.errors %} + [{{error}}] + {% endfor %} +

+

+ {{ form.email.label }}
+ {{ form.email(size=24) }} + {% for error in form.email.errors %} + [{{error}}] + {% endfor %} +

+

+ {{ form.password.label }}
+ {{ form.password(size=24) }} + {% for error in form.password.errors %} + [{{error}}] + {% endfor %} +

+

{{ form.submit() }}

+
+ {% if current_user.is_authenticated %} +
+ +
+ {% if contributor_use_totp %} +
+ +
+ {% else %} +
+ +
+ {% endif %} + {% endif %} +
+{% endblock %} diff --git a/app/auth/templates/login.html b/app/auth/templates/login.html new file mode 100644 index 0000000..df14e31 --- /dev/null +++ b/app/auth/templates/login.html @@ -0,0 +1,38 @@ +{% extends "base.html" %} + +{% block content %} +
+

Sign In

+

(username Or email)

+
+ {{ form.hidden_tag() }} +

+ {{ form.username.label }}
+ {{ form.username(size=24) }} + {% for error in form.username.errors %} + [{{error}}] + {% endfor %} +

+

+ {{ form.email.label }}
+ {{ form.email(size=24) }} + {% for error in form.email.errors %} + [{{error}}] + {% endfor %} +

+

+ {{ form.password.label }}
+ {{ form.password(size=24) }} + {% for error in form.password.errors %} + [{{error}}] + {% endfor %} +

+

{{ form.remember_me() }} {{ form.remember_me.label }}

+

{{ form.submit() }}

+
+

New User? Click to Register!

+

+ Forgot Your Password? Click to Reset It +

+
+{% endblock %} diff --git a/app/auth/templates/qr.html b/app/auth/templates/qr.html new file mode 100644 index 0000000..e5914f4 --- /dev/null +++ b/app/auth/templates/qr.html @@ -0,0 +1,53 @@ + + +{% extends "base.html" %} + +{% block content %} +
+
+ {{ form.hidden_tag() }} +

{{ qr | safe }}

+

+ {{ form.totp_code.label }}
+ {% for error in form.totp_code.errors %} + [{{error}}] + {% endfor %} + {{ form.totp_code(size=6) }} +

+

{{ form.submit() }}

+
+
+{% endblock %} diff --git a/app/auth/templates/register.html b/app/auth/templates/register.html new file mode 100644 index 0000000..5e965d1 --- /dev/null +++ b/app/auth/templates/register.html @@ -0,0 +1,45 @@ +{% extends "base.html" %} + +{% block content %} +
+

Register

+
+ {{ form.hidden_tag() }} +

+ {{ form.username.label }}
+ + letters and digits only (i.e. no spaces) +
+ {{ form.username(size=24) }} + {% for error in form.username.errors %} + [{{error}}] + {% endfor %} +

+

+ {{ form.email.label }}
+ {{ form.email(size=24) }} + {% for error in form.email.errors %} + [{{error}}] + {% endfor %} +

+

+ {{ form.password.label }}
+ + min 15 chars and at least somewhat random +
+ {{ form.password(size=24) }} + {% for error in form.password.errors %} + [{{error}}] + {% endfor %} +

+

+ {{ form.password2.label }}
+ {{ form.password2(size=24) }} + {% for error in form.password2.errors %} + [{{error}}] + {% endfor %} +

+

{{ form.submit() }}

+
+
+{% endblock %} diff --git a/app/auth/templates/reset_password.html b/app/auth/templates/reset_password.html new file mode 100644 index 0000000..18a543a --- /dev/null +++ b/app/auth/templates/reset_password.html @@ -0,0 +1,28 @@ +{% extends "base.html" %} + +{% block content %} +
+

Reset Your Password

+
+ {{ form.hidden_tag() }} +

+ {{ form.password.label }}
+ + min 15 chars and at least somewhat random +
+ {{ form.password(size=24) }}
+ {% for error in form.password.errors %} + [{{ error }}] + {% endfor %} +

+

+ {{ form.password2.label }}
+ {{ form.password2(size=24) }}
+ {% for error in form.password2.errors %} + [{{ error }}] + {% endfor %} +

+

{{ form.submit() }}

+
+
+{% endblock %} diff --git a/app/auth/templates/reset_password_request.html b/app/auth/templates/reset_password_request.html new file mode 100644 index 0000000..b3aa081 --- /dev/null +++ b/app/auth/templates/reset_password_request.html @@ -0,0 +1,18 @@ +{% extends "base.html" %} + +{% block content %} +
+

{{ title }}

+
+ {{ form.hidden_tag() }} +

+ {{ form.email.label }}
+ {{ form.email(size=24) }}
+ {% for error in form.email.errors %} + [{{ error }}] + {% endfor %} +

+

{{ form.submit() }}

+
+
+{% endblock %} diff --git a/app/auth/templates/two_factor_input.html b/app/auth/templates/two_factor_input.html new file mode 100644 index 0000000..3bd6c63 --- /dev/null +++ b/app/auth/templates/two_factor_input.html @@ -0,0 +1,45 @@ + + +{% extends "base.html" %} + +{% block content %} +

{{ inst }}

+
+ +
+ {{ form.hidden_tag() }} +

+ {{ form.totp_code.label }}
+ {% for error in form.totp_code.errors %} + [{{error}}] + {% endfor %} + {{ form.totp_code(size=6) }} +

+

{{ form.submit() }}

+
+
+{% endblock %} diff --git a/app/auth/totp.py b/app/auth/totp.py new file mode 100644 index 0000000..5317291 --- /dev/null +++ b/app/auth/totp.py @@ -0,0 +1,82 @@ +#!/usr/bin/env python3 + +from flask import Blueprint, session, redirect, url_for, flash, render_template +from flask import current_app as app +from app.models import Contributor +from app.forms import GetTotp, DisableTotp, ConfirmTotp +from flask_login import current_user, login_user +from pyotp.totp import TOTP +from .totp_utils import disable_2fa, validate_totp, get_totp_qr + +totps = Blueprint( + "totps", __name__, template_folder="templates" +) + + +@totps.route("/two-factor-input", methods=["GET", "POST"]) +def two_factor_input(): + if current_user.is_authenticated or 'id' not in session: + return redirect(url_for('cats.index')) + nl = (('cancel', url_for('cats.index')), ) + contributor = Contributor.query.get(session['id']) + if contributor is None: + return redirect(url_for('cats.index')) + form = GetTotp() + if form.validate_on_submit(): + if TOTP(contributor.totp_key).verify(int(form.totp_code.data), valid_window=5): + login_user(contributor, remember=session['remember_me']) + flash("Congratulations, you are now logged in!") + return redirect(url_for('cats.index')) + else: + flash("Oops, the pin was wrong") + form.totp_code.data = None + return render_template('two_factor_input.html', form=form, inst="Code was wrong, try again?") + return render_template( + 'two_factor_input.html', form=form, + inst="Enter Auth Code", navbar_links=nl + ) + + +@totps.route('/disable-totp', methods=['GET', 'POST']) +def disable_totp(): + if current_user.is_anonymous or not current_user.use_totp: + return(redirect(url_for('cats.index'))) + nl = (('cancel', url_for('prof.edit_profile')), ) + contributor = Contributor.query.get(current_user.id) + form = DisableTotp() + if form.validate_on_submit(): + if disable_2fa(contributor, app.config): + flash('2FA Now Disabled') + return(redirect(url_for('prof.edit_profile'))) + else: + flash('2FA Not Disabled') + return(redirect(url_for('prof.edit_profile'))) + return render_template( + 'disable_2fa.html', form=form, + title="Disable 2FA", navbar_links=nl + ) + + +@totps.route('/enable-totp', methods=['GET', 'POST']) +def enable_totp(): + if current_user.is_anonymous or current_user.use_totp: + return(redirect(url_for('cats.index'))) + nl = (('cancel', url_for('prof.edit_profile')), ) + contributor = Contributor.query.get(current_user.id) + form = ConfirmTotp() + qr = get_totp_qr(contributor, app.config) + if form.validate_on_submit(): + if contributor.use_totp: + flash('2FA Already Enabled') + return(redirect(url_for('prof.edit_profile'))) + if validate_totp(contributor, form.totp_code.data, app.config): + flash('2FA Now Enabled') + return(redirect(url_for('prof.edit_profile'))) + else: + flash("TOTP Code didn't validate, rescan and try again") + return(redirect(url_for('prof.edit_profile'))) + return render_template( + 'qr.html', qr=qr, form=form, + title="Aunthentication Code", + navbar_links=nl + ) diff --git a/app/auth/totp_utils.py b/app/auth/totp_utils.py new file mode 100644 index 0000000..911c20f --- /dev/null +++ b/app/auth/totp_utils.py @@ -0,0 +1,59 @@ +#!/usr/bin/env python3 + +import psycopg2 +import pyotp +import qrcode +import qrcode.image.svg +from io import BytesIO + + +def get_totp_qr(contributor, app_config): + totp_key = pyotp.random_base32() if contributor.totp_key is None else contributor.totp_key + if contributor.totp_key is None: + conn = psycopg2.connect( + dbname=app_config['DATABASE_NAME'], + user=app_config['DATABASE_USER'], + host=app_config['DATABASE_HOST'], + password=app_config['DATABASE_PASSWORD'] + ) + cur = conn.cursor() + cur.execute("UPDATE contributor SET totp_key=%s WHERE id=%s", (totp_key, contributor.id)) + conn.commit() + conn.close() + + totp_uri = pyotp.totp.TOTP(totp_key).provisioning_uri(name=contributor.email, issuer_name='Todo App') + img = qrcode.make(totp_uri, image_factory=qrcode.image.svg.SvgPathImage) + f = BytesIO() + img.save(f) + return(f.getvalue().decode('utf-8')) + + +def validate_totp(contributor, totp_code, app_config): + if pyotp.TOTP(contributor.totp_key).verify(int(totp_code), valid_window=5): + conn = psycopg2.connect( + dbname=app_config['DATABASE_NAME'], + user=app_config['DATABASE_USER'], + host=app_config['DATABASE_HOST'], + password=app_config['DATABASE_PASSWORD'] + ) + cur = conn.cursor() + cur.execute("UPDATE contributor SET use_totp='1' WHERE id=%s", (contributor.id, )) + conn.commit() + conn.close() + return True + else: + return False + + +def disable_2fa(contributor, app_config): + conn = psycopg2.connect( + dbname=app_config['DATABASE_NAME'], + user=app_config['DATABASE_USER'], + host=app_config['DATABASE_HOST'], + password=app_config['DATABASE_PASSWORD'] + ) + cur = conn.cursor() + cur.execute("UPDATE contributor SET use_totp='0', totp_key=Null WHERE id=%s", (contributor.id, )) + conn.commit() + conn.close() + return True diff --git a/app/categories/categories.py b/app/categories/categories.py new file mode 100644 index 0000000..e6b8aca --- /dev/null +++ b/app/categories/categories.py @@ -0,0 +1,61 @@ +#!/usr/bin/env python3 + +from flask import Blueprint, url_for, render_template, redirect +from flask_login import current_user +from app.models import Category, Task + +cats = Blueprint( + "cats", __name__, template_folder="templates" +) + + +@cats.route("/move-categories/") +def move_categories(taskid): + task = Task.query.get(taskid) + if task is None: + return(redirect(url_for('cats.index'))) + if current_user.is_anonymous or current_user.id != task.contributor_id: + return(redirect(url_for('cats.index'))) + cu = 'tsks.{}tasks'.format('hidden_' if task.done else '') + cancel_nav_link = ('cancel', url_for(cu, category_id=task.catid)) + nl = (cancel_nav_link, ) + categories = Category.query.filter(Category.contributor_id == current_user.id, Category.id != task.catid).all() + for cat in categories: + cat.href = url_for('movecat.move_cat', taskid=taskid, catid=cat.id) + cat.open = Task.query.filter_by(catid=cat.id, contributor_id=cat.contributor_id, done=False).count() + cat.done = Task.query.filter_by(catid=cat.id, contributor_id=cat.contributor_id, done=True).count() + + return render_template( + 'categories.html', + title="Move to", + navbar_links=nl, + heading='move to?', + categories=categories + ) + + +@cats.route("/index") +@cats.route("/") +def index(): + if current_user.is_anonymous: + navbar_links = (('login', url_for('auths.login')), ) + return render_template('categories.html', title="Todo", navbar_links=navbar_links) + nl = ( + ('prof', url_for('prof.edit_profile')), + ('new', url_for('new_cat.new_category')), + ('hide', url_for('hidecats.hide_categories')), + ('logout', url_for('auths.logout')) + ) + categories = Category.query.filter_by(contributor_id=current_user.id, hidden=False).all() + for cat in categories: + cat.href = url_for('tsks.tasks', category_id=cat.id) + cat.open = Task.query.filter_by(catid=cat.id, contributor_id=cat.contributor_id, done=False).count() + cat.done = Task.query.filter_by(catid=cat.id, contributor_id=cat.contributor_id, done=True).count() + + return render_template( + 'categories.html', + title="Categories", + navbar_links=nl, + heading='categories', + categories=categories + ) diff --git a/app/categories/delete_category.py b/app/categories/delete_category.py new file mode 100644 index 0000000..b0c3c4e --- /dev/null +++ b/app/categories/delete_category.py @@ -0,0 +1,46 @@ +#!/usr/bin/env python3 + +from flask import Blueprint, url_for, redirect, render_template, flash +from flask_login import current_user +from app.models import Category, Task +from .. import db + +delcat = Blueprint( + "delcat", __name__, template_folder="templates" +) + + +@delcat.route("/delete_category/") +def delete_category(catid): + category = Category.query.get(catid) + if category is None: + return(redirect(url_for('cats.index'))) + if current_user.is_anonymous or current_user.id != category.contributor_id: + return(redirect(url_for('cats.index'))) + db.session.delete(category) + db.session.commit() + flash("category {} is deleted".format(category.name)) + return(redirect(url_for('hidecats.unhide_categories'))) + + +@delcat.route("/delete-categories") +def delete_categories(): + if current_user.is_anonymous: + return(redirect(url_for('cats.index'))) + nl = ( + ('cancel', url_for('hidecats.unhide_categories')), + ('logout', url_for('auths.logout')) + ) + categories = Category.query.filter_by(contributor_id=current_user.id, hidden=True).all() + for cat in categories: + cat.href = url_for('delcat.delete_category', catid=cat.id) + cat.open = Task.query.filter_by(catid=cat.id, contributor_id=cat.contributor_id, done=False).count() + cat.done = Task.query.filter_by(catid=cat.id, contributor_id=cat.contributor_id, done=True).count() + + return render_template( + 'categories.html', + title="Category To Delete", + navbar_links=nl, + heading='category to delete?', + categories=categories + ) diff --git a/app/categories/hide_categories.py b/app/categories/hide_categories.py new file mode 100644 index 0000000..61e262b --- /dev/null +++ b/app/categories/hide_categories.py @@ -0,0 +1,78 @@ +#!/usr/bin/env python3 + +from flask import Blueprint, redirect, url_for, render_template, flash +from flask_login import current_user +from app.models import Category, Task +from .. import db + +hidecats = Blueprint( + "hidecats", __name__, template_folder="templates" +) + + +@hidecats.route("/category-toggle-hidden/") +def category_toggle_hidden(catid): + category = Category.query.get(catid) + if category is None: + return(redirect(url_for('cats.index'))) + if current_user.is_anonymous or current_user.id != category.contributor_id: + return(redirect(url_for('cats.index'))) + category.hidden = not category.hidden + db.session.commit() + if category.hidden: + flash("category {} is now hidden".format(category.name)) + return(redirect(url_for('hidecats.hide_categories'))) + else: + flash("category {} is now unhidden".format(category.name)) + return(redirect(url_for('hidecats.unhide_categories'))) + + +@hidecats.route("/unhide-categories") +def unhide_categories(): + if current_user.is_anonymous: + return(redirect(url_for('cats.index'))) + if Category.query.filter_by(contributor_id=current_user.id, hidden=True).count() == 0: + return(redirect(url_for('hidecats.hide_categories'))) + nl = ( + ('cancel', url_for('cats.index')), + ('hide', url_for('hidecats.hide_categories')), + ('delete', url_for('delcat.delete_categories')) + ) + categories = Category.query.filter_by(contributor_id=current_user.id, hidden=True).all() + for cat in categories: + cat.href = url_for('hidecats.category_toggle_hidden', catid=cat.id) + cat.open = Task.query.filter_by(catid=cat.id, contributor_id=cat.contributor_id, done=False).count() + cat.done = Task.query.filter_by(catid=cat.id, contributor_id=cat.contributor_id, done=True).count() + + return render_template( + 'categories.html', + title="Category To unHide", + navbar_links=nl, + heading='category to unhide?', + categories=categories + ) + + +@hidecats.route("/hide-categories") +def hide_categories(): + if current_user.is_anonymous: + return(redirect(url_for('cats.index'))) + num_hidden_cats = Category.query.filter_by(contributor_id=current_user.id, hidden=True).count() + nl = [('cancel', url_for('cats.index')), ] + if num_hidden_cats > 0: + nl.append(('unhide', url_for('hidecats.unhide_categories')), ) + nl.append(('logout', url_for('auths.logout'))) + + categories = Category.query.filter_by(contributor_id=current_user.id, hidden=False).all() + for cat in categories: + cat.href = url_for('hidecats.category_toggle_hidden', catid=cat.id) + cat.open = Task.query.filter_by(catid=cat.id, contributor_id=cat.contributor_id, done=False).count() + cat.done = Task.query.filter_by(catid=cat.id, contributor_id=cat.contributor_id, done=True).count() + + return render_template( + 'categories.html', + title="Category To Hide", + navbar_links=nl, + heading='category to hide?', + categories=categories + ) diff --git a/app/categories/new_category.py b/app/categories/new_category.py new file mode 100644 index 0000000..982caac --- /dev/null +++ b/app/categories/new_category.py @@ -0,0 +1,57 @@ +#!/usr/bin/env python3 + +import psycopg2 +from flask import Blueprint, redirect, url_for, flash, render_template +from flask import current_app as app +from flask_login import current_user +from flask_wtf import FlaskForm +from wtforms import StringField, SubmitField +from wtforms.validators import DataRequired, Regexp +from app.models import Category + +new_cat = Blueprint( + "new_cat", __name__, template_folder="templates" +) + + +def insert_category(category): + conn = psycopg2.connect( + dbname=app.config['DATABASE_NAME'], + user=app.config['DATABASE_USER'], + host=app.config['DATABASE_HOST'], + password=app.config['DATABASE_PASSWORD'] + ) + cur = conn.cursor() + cur.execute("SELECT setval('category_id_seq', (SELECT MAX(id) FROM category))") + conn.commit() + cur.execute("SELECT count(id) FROM category WHERE name=%s AND contributor_id=%s", (category.name, category.contributor_id)) + if cur.fetchone()[0] == 0: + cur.execute("INSERT INTO category(name, contributor_id) VALUES(%s, %s)", (category.name, category.contributor_id)) + conn.commit() + conn.close + + +@new_cat.route("/new-category", methods=["GET", "POST"]) +def new_category(): + if current_user.is_anonymous: + return(redirect(url_for('cats.index'))) + form = NewCategory() + nl = (('cancel', url_for('cats.index')), ) + if form.validate_on_submit(): + category = Category(name=form.name.data, contributor_id=current_user.id) + insert_category(category) + flash("Thanks for the new category!") + return(redirect(url_for('cats.index'))) + return render_template('new_category.html', title='New Category', form=form, navbar_links=nl) + + +class NewCategory(FlaskForm): + name = StringField( + 'New Task Category', + validators=[ + DataRequired(), + Regexp('^[a-zA-Z0-9\\s-]+$', message='dashes, digits, and spaces are ok') + ], + render_kw={'autofocus': True} + ) + submit = SubmitField('Save') diff --git a/app/categories/templates/categories.html b/app/categories/templates/categories.html new file mode 100644 index 0000000..4261444 --- /dev/null +++ b/app/categories/templates/categories.html @@ -0,0 +1,42 @@ + +{% extends "base.html" %} + +{% block content %} +

{{ heading }}

+ {% for category in categories %} + + + + {% endfor %} +{% endblock %} diff --git a/app/categories/templates/new_category.html b/app/categories/templates/new_category.html new file mode 100644 index 0000000..01d5eab --- /dev/null +++ b/app/categories/templates/new_category.html @@ -0,0 +1,28 @@ + +{% extends "base.html" %} + +{% block content %} +
+

{{ titile }}

+
+ {{ form.hidden_tag() }} +

+ {{ form.name.label }}
+ {{ form.name(size=24) }}
+ {% for error in form.name.errors %} + [{{ error }}] + {% endfor %} +

+

{{ form.submit() }}

+
+
+{% endblock %} diff --git a/app/forms.py b/app/forms.py new file mode 100644 index 0000000..56bfe27 --- /dev/null +++ b/app/forms.py @@ -0,0 +1,101 @@ +#!/usr/bin/env python3 + +from flask_wtf import FlaskForm +from wtforms import StringField, PasswordField, BooleanField, SubmitField +from wtforms.validators import DataRequired, Email, Optional, Regexp, Length, EqualTo, ValidationError +from app.models import Contributor, EmailWhiteList +from zxcvbn import zxcvbn + + +class DisableTotp(FlaskForm): + submit = SubmitField('Disable 2FA') + + +class GetTotp(FlaskForm): + totp_code = StringField('6-Digit Code?', validators=[DataRequired(), Length(min=6, max=6, message="6 Digits")], render_kw={'autofocus': True}) + submit = SubmitField('OK') + + +class ConfirmTotp(FlaskForm): + totp_code = StringField('6-Digit Code?', validators=[DataRequired(), Length(min=6, max=6, message="Rescan And Try Again")], render_kw={'autofocus': True}) + submit = SubmitField('Enable 2FA') + + +class LoginForm(FlaskForm): + username = StringField('Username', validators=[Optional()], render_kw={'autofocus': True}) + email = StringField('Email', validators=[Optional(), Email()]) + password = PasswordField('Password', validators=[DataRequired()]) + remember_me = BooleanField('Remember Me') + submit = SubmitField('Sign In') + + +class RegistrationForm(FlaskForm): + username = StringField('Username', validators=[DataRequired(), Regexp('^[a-zA-Z0-9]+$', message='letters and digits only (no spaces)')], render_kw={'autofocus': True}) + email = StringField('Email', validators=[DataRequired(), Email()]) + password = PasswordField('Password', validators=[DataRequired(), Length(min=15, )]) + password2 = PasswordField('Repeat Password', validators=[DataRequired(), EqualTo('password')]) + submit = SubmitField('Register') + + def validate_password(self, password): + if zxcvbn(password.data)['score'] < 3: + raise ValidationError('needs to be stronger') + + def validate_username(self, username): + user = Contributor.query.filter_by(name=username.data).first() + if user is not None: + raise ValidationError('Please use a different username.') + + def validate_email(self, email): + white_listed_user = EmailWhiteList.query.filter_by(email=email.data).first() + if white_listed_user is None: + raise ValidationError('This email address is not authorized.') + user = Contributor.query.filter_by(email=email.data).first() + if user is not None: + raise ValidationError('Please use a different email address.') + + +class ChangePassword(FlaskForm): + password = PasswordField('Confirm Password', validators=[DataRequired()], render_kw={'autofocus': True}) + new_password = PasswordField('New Password', validators=[DataRequired(), Length(min=15, )]) + new_password2 = PasswordField('Repeat New Password', validators=[DataRequired(), EqualTo('new_password')]) + submit = SubmitField('Save') + + def validate_password(self, password): + if zxcvbn(password.data)['score'] < 3: + raise ValidationError('needs to be stronger') + + +class ResetPasswordForm(FlaskForm): + password = PasswordField('Password', validators=[DataRequired(), Length(min=15, )], render_kw={'autofocus': True}) + password2 = PasswordField('Repeat Password', validators=[DataRequired(), EqualTo('password')]) + submit = SubmitField('Request Password Reset') + + def validate_password(self, password): + if zxcvbn(password.data)['score'] < 3: + raise ValidationError('needs to be stronger') + + +class EditProfile(FlaskForm): + username = StringField('Username', validators=[DataRequired(), Regexp('^[a-zA-Z0-9]+$', message='letters and digits only (no spaces)')], render_kw={'autofocus': True}) + email = StringField('Email', validators=[Optional(), Email()]) + password = PasswordField('Confirm Password', validators=[DataRequired()]) + submit = SubmitField('Update Name/Email') + + def validate_username(self, username): + from flask_login import current_user + if username.data != current_user.name: + user = Contributor.query.filter_by(name=username.data).first() + if user is not None: + raise ValidationError('Please pick a different username.') + + def validate_email(self, email): + from flask_login import current_user + if email.data != current_user.email: + user = Contributor.query.filter_by(email=email.data).first() + if user is not None: + raise ValidationError('Please pick a different email address.') + + +class ResetPasswordRequestForm(FlaskForm): + email = StringField('Email', validators=[DataRequired(), Email()], render_kw={'autofocus': True}) + submit = SubmitField('Request Password Reset') diff --git a/app/models.py b/app/models.py new file mode 100644 index 0000000..4613b1f --- /dev/null +++ b/app/models.py @@ -0,0 +1,73 @@ +#!/usr/bin/env python3 + +import jwt +from flask import current_app as app +from . import db, login +from time import time +from flask_login import UserMixin +from werkzeug.security import generate_password_hash, check_password_hash + + +@login.user_loader +def load_contributor(id): + return Contributor.query.get(int(id)) + + +class Task(db.Model): + id = db.Column(db.Integer, primary_key=True) + content = db.Column(db.Text, nullable=False) + contributor_id = db.Column(db.Integer, nullable=False) + catid = db.Column(db.Integer, nullable=False) + done = db.Column(db.Boolean, default=False) + priority = db.Column(db.Integer) + timestamp = db.Column(db.DateTime) + + def __repr__(self): + return ''.format(self.id) + + +class Category(db.Model): + id = db.Column(db.Integer, primary_key=True) + name = db.Column(db.String(128), nullable=False, unique=True) + contributor_id = db.Column(db.Integer, nullable=False) + hidden = db.Column(db.Boolean, default=False) + + def __repr__(self): + return ''.format(self.name) + + +class Contributor(UserMixin, db.Model): + id = db.Column(db.Integer, primary_key=True) + name = db.Column(db.String(64), nullable=False, unique=True) + email = db.Column(db.String(120), nullable=False, unique=True) + password_hash = db.Column(db.String(128)) + totp_key = db.Column(db.String(16)) + use_totp = db.Column(db.Boolean, default=False) + + def set_password(self, password): + self.password_hash = generate_password_hash(password) + + def check_password(self, password): + return check_password_hash(self.password_hash, password) + + def __repr__(self): + return ''.format(self.name) + + def get_reset_password_token(self, expires_in=1800): + return jwt.encode({'reset_password': self.id, 'exp': time() + expires_in}, app.config['SECRET_KEY'], algorithm='HS256').decode('utf-8') + + @staticmethod + def verify_reset_password_token(token): + try: + id = jwt.decode(token, app.config['SECRET_KEY'], algorithms=['HS256'])['reset_password'] + except BaseException as error: + print('An exception occurred: {}'.format(error)) + return Contributor.query.get(id) + + +class EmailWhiteList(db.Model): + id = db.Column(db.Integer, primary_key=True) + email = db.Column(db.String(120), nullable=False, unique=True) + + def __repr__(self): + return ''.format(self.email) diff --git a/app/sendxmpp_handler.py b/app/sendxmpp_handler.py new file mode 100644 index 0000000..f717c13 --- /dev/null +++ b/app/sendxmpp_handler.py @@ -0,0 +1,51 @@ +#!/usr/bin/env python3 +# app/sendxmpp_handler.py + +from logging import Handler +from os import popen + + +class SENDXMPPHandler(Handler): + def __init__( + self, + logging_xmpp_server, + logging_xmpp_sender, + logging_xmpp_password, + logging_xmpp_recipient, + logging_xmpp_command, + logging_xmpp_use_tls + ): + Handler.__init__(self) + self.logging_xmpp_server = logging_xmpp_server + self.logging_xmpp_sender = logging_xmpp_sender + self.logging_xmpp_password = logging_xmpp_password + self.logging_xmpp_recipient = logging_xmpp_recipient + self.logging_xmpp_command = logging_xmpp_command + self.logging_xmpp_use_tls = logging_xmpp_use_tls + + ''' + This works on Debian 10 with flask running under gunicorn3 as a systemd service, hack as necessary + echo '' | /usr/bin/sendxmpp -t -u -j -p + ''' + def emit(self, record): + try: + message = self.format(record) + + shell_command = "echo '{}' | {} -u {} -j {} -p {} {}".format( + message, + self.logging_xmpp_command, + self.logging_xmpp_sender, + self.logging_xmpp_server, + self.logging_xmpp_password, + self.logging_xmpp_recipient + ) + if self.logging_xmpp_use_tls == '1': + shell_command += ' -t' + + p = popen(shell_command, "w") + status = p.close() + if status: + print("sendxmpp_handler exit status", status) + + except Exception: + self.handleError(record) diff --git a/app/static/css/todo.css b/app/static/css/todo.css new file mode 100644 index 0000000..a54c53a --- /dev/null +++ b/app/static/css/todo.css @@ -0,0 +1,118 @@ +html { + overflow: scroll; + scrollbar-width: none; +} + +:root { + font-size: 16px; + font-family: sans-serif; +} + +body { + padding: 0; + margin: 0; + display: flex; + flex-direction: column; + align-items: center; +} + +#main { + width: 800px; + min-width: 70vw; + max-width: 100vw; + display: flex; + flex-direction: column; +} + +#userGreeting { + padding-right: 20px; + line-height: 0; + height: 0; + position: absolute; + align-self: flex-end; + font-style: italic; + color: grey; + font-size: 1.2rem; +} + +#navbarContainer { + background-color: black; + display: flex; + justify-content: center; + width: 100vw; +} + +#navbar { + display: flex; + justify-content: space-between; + padding: 5px; + width: 100%; + max-width: 700px; +} + +#navbar button { + font-size: 1.5rem; + padding: 5px 15px 5px 15px; + border-radius: 5px; + border: none; + background-color: black; + color: white; +} + +input[type=submit] { + padding: 10px; + background-color: black; + color: white; + border-radius: 9px; + font-size: 1.4rem; + font-weight: bolder; +} + +.extraFormLink { + white-space: nowrap; + color: black; +} + +.formContainer { + font-size: 1.2rem; + display: flex; + flex-direction: column; + align-self: center; + width: 60%; + min-width: 280px; +} + +.formWarning { + color: red; + white-space: nowrap; + line-height: 150%; + font-size: .9rem; + font-style: italic; + font-weight: bold; +} + +.flashContainer { + margin-top: 40px; + padding: 10px; + background-color: grey; + color: black; + border-radius: 9px; + font-size: 1.1rem; + align-self: center; +} + +.inputInfo { + color: grey; + font-style: italic; + font-size: 1rem; +} + +.formButton { + padding: 10px; + margin-bottom: 20px; + border-radius: 9px; + font-size: 1.4rem; + font-weight: bolder; + color: white; + background-color: black; +} diff --git a/app/tasks/delete_move_toggle_task.py b/app/tasks/delete_move_toggle_task.py new file mode 100644 index 0000000..31b2c2e --- /dev/null +++ b/app/tasks/delete_move_toggle_task.py @@ -0,0 +1,72 @@ +#!/usr/bin/env python3 + +from flask import Blueprint, redirect, url_for, flash +from flask_login import current_user +from flask import current_app +from app.models import Task, Category +from .. import db +from .reorder_priorities import reorder_priorities + +movecat = Blueprint( + "movecat", __name__, template_folder="templates" +) + +toggletaskdone = Blueprint( + "toggletaskdone", __name__, template_folder="templates" +) + +deletetask = Blueprint( + "deletetask", __name__, template_folder="templates" +) + + +@movecat.route("/move-cat//") +def move_cat(taskid, catid): + task = Task.query.get(taskid) + if current_user.is_anonymous or current_user.id != task.contributor_id: + return(redirect(url_for('cats.index'))) + if bool(Category.query.get(catid)): + category = Category.query.get(catid) + if category.contributor_id == task.contributor_id: + previous_catid = task.catid + task.catid = catid + db.session.commit() + flash("Task {} moved!".format(taskid)) + reorder_priorities(catid, task.contributor_id, task.done, current_app.config) + reorder_priorities(previous_catid, task.contributor_id, task.done, current_app.config) + if task.done: + return(redirect(url_for('tsks.hidden_tasks', category_id=task.catid))) + else: + return(redirect(url_for('tsks.tasks', category_id=task.catid))) + + +@deletetask.route("/delete-task/") +def delete_task(taskid): + task = Task.query.get(taskid) + if current_user.is_anonymous or current_user.id != task.contributor_id: + return(redirect(url_for('cats.index'))) + db.session.delete(task) + db.session.commit() + flash("Task {} deleted!".format(taskid)) + reorder_priorities(task.catid, task.contributor_id, task.done, current_app.config) + if task.done: + return(redirect(url_for('tsks.hidden_tasks', category_id=task.catid))) + else: + return(redirect(url_for('tsks.tasks', category_id=task.catid))) + + +@toggletaskdone.route("/toggle-task-done/") +def toggle_task_done(taskid): + task = Task.query.get(taskid) + if current_user.is_anonymous or current_user.id != task.contributor_id: + return(redirect(url_for('cats.index'))) + task.done = not task.done + db.session.commit() + reorder_priorities(task.catid, task.contributor_id, True, current_app.config) + reorder_priorities(task.catid, task.contributor_id, False, current_app.config) + if task.done: + flash("Task {} unmarked done!".format(taskid)) + return(redirect(url_for('tsks.tasks', category_id=task.catid))) + else: + flash("Task {} marked done!".format(taskid)) + return(redirect(url_for('tsks.hidden_tasks', category_id=task.catid))) diff --git a/app/tasks/edit_task.py b/app/tasks/edit_task.py new file mode 100644 index 0000000..0073851 --- /dev/null +++ b/app/tasks/edit_task.py @@ -0,0 +1,46 @@ +#!/usr/bin/env python3 + +from flask import Blueprint, redirect, url_for, flash, render_template, request +from flask_login import current_user +from app.models import Task +from flask_wtf import FlaskForm +from wtforms import SubmitField, TextAreaField +from wtforms.validators import DataRequired +from .. import db + +edittask = Blueprint( + "edittask", __name__, template_folder="templates" +) + + +@edittask.route("/edit-task/", methods=["GET", "POST"]) +def edit_task(taskid): + if current_user.is_anonymous: + return(redirect(url_for('cats.index'))) + task = Task.query.get(taskid) + form = EditTask() + if task.done: + cancel_nav_link = ('cancel', url_for('tsks.hidden_tasks', category_id=task.catid)) + else: + cancel_nav_link = ('cancel', url_for('tsks.tasks', category_id=task.catid)) + nl = (cancel_nav_link, ) + if request.method == 'GET': + form.content.data = task.content + if form.validate_on_submit(): + task.content = form.content.data + db.session.commit() + flash("Thanks for the task edit!") + if task.done: + return(redirect(url_for('tsks.hidden_tasks', category_id=task.catid))) + else: + return(redirect(url_for('tsks.tasks', category_id=task.catid))) + return render_template('edit_task.html', title='Edit Task', form=form, navbar_links=nl, task=task) + + +class EditTask(FlaskForm): + content = TextAreaField( + 'Edit Task - Markdown Supported', + validators=[DataRequired(), ], + render_kw={'autofocus': True} + ) + submit = SubmitField('Save') diff --git a/app/tasks/new_task.py b/app/tasks/new_task.py new file mode 100644 index 0000000..170273f --- /dev/null +++ b/app/tasks/new_task.py @@ -0,0 +1,73 @@ +#!/usr/bin/env python3 + +import psycopg2 +from datetime import datetime +from flask import Blueprint, redirect, url_for, flash, render_template +from flask import current_app as app +from flask_login import current_user +from flask_wtf import FlaskForm +from wtforms import SubmitField, TextAreaField +from wtforms.validators import DataRequired +from app.models import Task, Category + +newtask = Blueprint( + "newtask", __name__, template_folder="templates" +) + + +def insert_task(task): + conn = psycopg2.connect( + dbname=app.config['DATABASE_NAME'], + user=app.config['DATABASE_USER'], + host=app.config['DATABASE_HOST'], + password=app.config['DATABASE_PASSWORD'] + ) + cur = conn.cursor() + cur.execute("SELECT setval('task_id_seq', (SELECT MAX(id) FROM task))") + conn.commit() + cur.execute( + "SELECT MAX(priority) FROM task WHERE catid=%s AND contributor_id=%s AND done=%s", + (task.catid, task.contributor_id, False) + ) + max_priority = cur.fetchone()[0] + task.priority = 1 if max_priority is None else max_priority + 1 + cur.execute( + "SELECT count(id) FROM task WHERE content=%s AND contributor_id=%s", + (task.content, task.contributor_id) + ) + if cur.fetchone()[0] == 0: + cur.execute( + "INSERT INTO task(content, contributor_id, catid, priority, timestamp) VALUES(%s,%s,%s,%s,%s)", + (task.content, task.contributor_id, task.catid, task.priority, task.timestamp) + ) + conn.commit() + conn.close + + +@newtask.route("/new-task/", methods=["GET", "POST"]) +def new_task(category_id): + if current_user.is_anonymous: + return(redirect(url_for('cats.index'))) + form = NewTask() + category = Category.query.get(category_id) + nl = (('cancel', url_for('tsks.tasks', category_id=category_id)), ) + if form.validate_on_submit(): + task = Task( + content=form.content.data, + contributor_id=current_user.id, + catid=category_id, + timestamp=str(datetime.utcnow()), + ) + insert_task(task) + flash("Thanks for the new task!") + return(redirect(url_for('tsks.tasks', category_id=category_id))) + return render_template('new_task.html', title='New Task', form=form, navbar_links=nl, category=category) + + +class NewTask(FlaskForm): + content = TextAreaField( + 'New Task - Markdown Supported', + validators=[DataRequired(), ], + render_kw={'autofocus': True} + ) + submit = SubmitField('Save') diff --git a/app/tasks/reorder_priorities.py b/app/tasks/reorder_priorities.py new file mode 100644 index 0000000..4388bdb --- /dev/null +++ b/app/tasks/reorder_priorities.py @@ -0,0 +1,74 @@ +#!/usr/bin/env python3 + +import psycopg2 +from flask import Blueprint, redirect, url_for, request, flash +from flask import current_app +from app.models import Task +from flask_login import current_user +from .task_action import make_move_up_down_bools +from .. import db + +reorderp = Blueprint( + "reorderp", __name__, template_folder="templates" +) + + +@reorderp.route('/move-task/') +def move_task(taskid): + task = Task.query.get(taskid) + if task is None or current_user.is_anonymous or task.contributor_id != current_user.id: + return(redirect(url_for('cats.index'))) + make_move_up_down_bools(task) + priority = task.priority + if request.args['move'] == 'up' and task.can_move_up: + other_task = Task.query.filter( + Task.catid == task.catid, + Task.contributor_id == task.contributor_id, + Task.done == task.done, Task.priority > task.priority).order_by(Task.priority).first() + other_priority = other_task.priority + other_task.priority = task.priority + task.priority = other_priority + if request.args['move'] == 'down' and task.can_move_down: + other_task = Task.query.filter( + Task.catid == task.catid, + Task.contributor_id == task.contributor_id, + Task.done == task.done, Task.priority < task.priority).order_by(Task.priority.desc()).first() + other_priority = other_task.priority + other_task.priority = task.priority + task.priority = other_priority + if request.args['move'] == 'top' and task.can_move_top: + other_task = Task.query.filter( + Task.catid == task.catid, + Task.contributor_id == task.contributor_id, + Task.done == task.done).order_by(Task.priority.desc()).first() + task.priority = other_task.priority + 1 + if request.args['move'] == 'end' and task.can_move_end: + task.priority = 0 + db.session.commit() + if request.args['move'] == 'end' or request.args['move'] == 'top': + reorder_priorities(task.catid, task.contributor_id, task.done, current_app.config) + flash("task {} is moved {}".format(priority, request.args['move'])) + ru = 'tsks.{}tasks'.format('hidden_' if task.done else '') + return(redirect(url_for(ru, category_id=task.catid))) + + +def reorder_priorities(catid, conid, done, app_config): + conn = psycopg2.connect( + dbname=app_config['DATABASE_NAME'], + user=app_config['DATABASE_USER'], + host=app_config['DATABASE_HOST'], + password=app_config['DATABASE_PASSWORD'] + ) + cur = conn.cursor() + cur.execute( + "SELECT COUNT(id) FROM task WHERE catid=%s AND contributor_id=%s AND done=%s", + (catid, conid, done)) + if cur.fetchone()[0] > 1: + cur.execute( + "SELECT id FROM task WHERE catid=%s AND contributor_id=%s AND done=%s ORDER BY priority", + (catid, conid, done)) + ids = [x[0] for x in cur.fetchall()] + for i, task in enumerate(ids, 1): + cur.execute("UPDATE task SET priority=%s WHERE id=%s", (i, task)) + conn.commit() + conn.close() diff --git a/app/tasks/task_action.py b/app/tasks/task_action.py new file mode 100644 index 0000000..ad9ce07 --- /dev/null +++ b/app/tasks/task_action.py @@ -0,0 +1,64 @@ +#!/usr/bin/env python3 + +from flask import Blueprint, redirect, url_for, render_template +from flask_login import current_user +from app.models import Task + +taskaction = Blueprint( + "taskaction", __name__, template_folder="templates" +) + + +@taskaction.route('/task-action/') +def task_action(taskid): + if current_user.is_anonymous: + return(redirect(url_for('cats.index'))) + task = Task.query.get(taskid) + if task.done: + cancel_nav_link = ('cancel', url_for('tsks.hidden_tasks', category_id=task.catid)) + else: + cancel_nav_link = ('cancel', url_for('tsks.tasks', category_id=task.catid)) + nl = ( + cancel_nav_link, + ('categories', url_for('cats.index')), + ('logout', url_for('auths.logout')) + ) + make_move_up_down_bools(task) + return(render_template( + 'task_action.html', + title="Task Actions", + navbar_links=nl, + task=task + )) + + +def make_move_up_down_bools(task): + num_higher = Task.query.filter( + Task.catid == task.catid, + Task.contributor_id == task.contributor_id, + Task.done == task.done, + Task.priority > task.priority).count() + num_lower = Task.query.filter( + Task.catid == task.catid, + Task.contributor_id == task.contributor_id, + Task.done == task.done, + Task.priority < task.priority).count() + print(num_higher, num_lower) + if num_higher > 1: + task.can_move_top = True + task.can_move_up = True + elif num_higher == 1: + task.can_move_top = False + task.can_move_up = True + else: + task.can_move_top = False + task.can_move_up = False + if num_lower > 1: + task.can_move_end = True + task.can_move_down = True + elif num_lower == 1: + task.can_move_end = False + task.can_move_down = True + else: + task.can_move_end = False + task.can_move_down = False diff --git a/app/tasks/tasks.py b/app/tasks/tasks.py new file mode 100644 index 0000000..aaeea66 --- /dev/null +++ b/app/tasks/tasks.py @@ -0,0 +1,72 @@ +#!/usr/bin/env python3 + +from flask import Blueprint, redirect, url_for, render_template +from flask_login import current_user +from app.models import Category, Task +from markdown import markdown + +tsks = Blueprint( + "tsks", __name__, template_folder="templates" +) + + +@tsks.route("/hidden-tasks/") +def hidden_tasks(category_id): + category = Category.query.get(category_id) + if current_user.is_anonymous or current_user.id != category.contributor_id: + return(redirect(url_for('cats.index'))) + + tasks = Task.query.filter_by( + catid=category_id, + contributor_id=current_user.id, + done=True + ).order_by(Task.priority.desc()).all() + + for task in tasks: + task.markup = markdown(task.content) + task.href = url_for('taskaction.task_action', taskid=task.id) + task.time = task.timestamp.strftime("%Y-%m-%d %H:%M") + + nl = ( + ('new', url_for('newtask.new_task', category_id=category_id)), + ('categories', url_for('cats.index')), + ('open', url_for('tsks.tasks', category_id=category_id)) + ) + return render_template( + 'tasks.html', + title="Completed Tasks", + navbar_links=nl, + tasks=tasks, + heading="{}:completed tasks".format(category.name) + ) + + +@tsks.route("/tasks/") +def tasks(category_id): + category = Category.query.get(category_id) + if current_user.is_anonymous or current_user.id != category.contributor_id: + return(redirect(url_for('cats.index'))) + + tasks = Task.query.filter_by( + catid=category_id, + contributor_id=current_user.id, + done=False + ).order_by(Task.priority.desc()).all() + + for task in tasks: + task.markup = markdown(task.content) + task.href = url_for('taskaction.task_action', taskid=task.id) + task.time = task.timestamp.strftime("%Y-%m-%d %H:%M") + + nl = ( + ('new', url_for('newtask.new_task', category_id=category_id)), + ('categories', url_for('cats.index')), + ('done', url_for('tsks.hidden_tasks', category_id=category_id)) + ) + return render_template( + 'tasks.html', + title="Tasks", + navbar_links=nl, + tasks=tasks, + heading="{}:tasks".format(category.name) + ) diff --git a/app/tasks/templates/edit_task.html b/app/tasks/templates/edit_task.html new file mode 100644 index 0000000..6f57519 --- /dev/null +++ b/app/tasks/templates/edit_task.html @@ -0,0 +1,37 @@ + +{% extends "base.html" %} + +{% block content %} +
+

Edit {{ task.content[0:10] }}

+
+ {{ form.hidden_tag() }} +

+ {{ form.content.label }}
+ {{ form.content(rows=20) }}
+ {% for error in form.content.errors %} + [{{ error }}] + {% endfor %} +

+

{{ form.submit() }}

+
+
+{% endblock %} diff --git a/app/tasks/templates/new_task.html b/app/tasks/templates/new_task.html new file mode 100644 index 0000000..c2751d3 --- /dev/null +++ b/app/tasks/templates/new_task.html @@ -0,0 +1,37 @@ + +{% extends "base.html" %} + +{% block content %} +
+

New Task For {{ category.name }}

+
+ {{ form.hidden_tag() }} +

+ {{ form.content.label }}
+ {{ form.content(rows=20) }}
+ {% for error in form.content.errors %} + [{{ error }}] + {% endfor %} +

+

{{ form.submit() }}

+
+
+{% endblock %} diff --git a/app/tasks/templates/task_action.html b/app/tasks/templates/task_action.html new file mode 100644 index 0000000..96c87a3 --- /dev/null +++ b/app/tasks/templates/task_action.html @@ -0,0 +1,70 @@ + +{% extends "base.html" %} + +{% if task.done == True %} + {% set textColor = "color: grey;" %} +{% else %} + {% set textColor = "color: white;" %} +{% endif %} + +{% block content %} +

Actions For {{ task.content[0:10] }}...

+ + + + + + + + + + + + + {% if task.can_move_top == True %} + + + + {% endif %} + {% if task.can_move_up == True %} + + + + {% endif %} + {% if task.can_move_down == True %} + + + + {% endif %} + {% if task.can_move_end == True %} + + + + {% endif %} +{% endblock %} diff --git a/app/tasks/templates/tasks.html b/app/tasks/templates/tasks.html new file mode 100644 index 0000000..e99b421 --- /dev/null +++ b/app/tasks/templates/tasks.html @@ -0,0 +1,58 @@ + +{% extends "base.html" %} + +{% block content %} +

{{ heading }}

+ {% for task in tasks %} + {% if task.done == True %} + {% set textColor = "color: grey;" %} + {% else %} + {% set textColor = "color: black;" %} + {% endif %} +
+ +
+

{{ task.time }}

{{ task.markup|safe }} +
+ + + + +
+ {% endfor %} +{% endblock %} diff --git a/app/templates/base.html b/app/templates/base.html new file mode 100644 index 0000000..f91b19f --- /dev/null +++ b/app/templates/base.html @@ -0,0 +1,38 @@ + + + + + + + + {% if title %} + {{ title }} + {% else %} + Todo + {% endif %} + + + +
+ {% with messages = get_flashed_messages() %} + {% if messages %} + {% for message in messages %} +
{{message}}
+ {% endfor %} + {% endif %} + {% endwith %} + {% if current_user.is_authenticated %} +

Logged in as: {{ current_user.name }}

+ {% else %} +

viewing as guest

+ {% endif %} + {% block content %}{% endblock %} +
+ + diff --git a/app/templates/email/reset_password_email_html.html b/app/templates/email/reset_password_email_html.html new file mode 100644 index 0000000..6c4c9b5 --- /dev/null +++ b/app/templates/email/reset_password_email_html.html @@ -0,0 +1,11 @@ +

Dear {{ contributor.name }},

+

To reset your password + +click here. + +

+

Alternatively, you can paste the following link in your browser's address bar:

+

{{ external_url + '/reset-password/' + token }}

+

If you have not requested a password reset simply ignore this message.

+

Sincerely,

+

todo app

diff --git a/app/templates/email/reset_password_email_text.txt b/app/templates/email/reset_password_email_text.txt new file mode 100644 index 0000000..58969b9 --- /dev/null +++ b/app/templates/email/reset_password_email_text.txt @@ -0,0 +1,13 @@ +Dear {{ contributor.name }}, + +To reset your password click on the following link: + + +{{ external_url + '/reset-password/' + token }} + + +If you have not requested a password reset simply ignore this message. + +Sincerely, + +todo app diff --git a/config.py b/config.py new file mode 100644 index 0000000..5d63d9d --- /dev/null +++ b/config.py @@ -0,0 +1,34 @@ +#!/usr/bin/env python3 + +import os +from dotenv import load_dotenv + +basedir = os.path.abspath(os.path.dirname(__file__)) +load_dotenv(os.path.join(basedir, '.env')) + + +class Config(object): + SECRET_KEY = os.environ.get('SECRET_KEY') or 'you-will-never-guess' + + SQLALCHEMY_DATABASE_URI = os.environ.get('DATABASE_URL') + SQLALCHEMY_TRACK_MODIFICATIONS = False + DATABASE_NAME = os.environ.get('DATABASE_NAME') + DATABASE_USER = os.environ.get('DATABASE_USER') + DATABASE_HOST = os.environ.get('DATABASE_HOST') + DATABASE_PASSWORD = os.environ.get('DATABASE_PASSWORD') + + LOGGING_XMPP_SERVER = os.environ.get('LOGGING_XMPP_SERVER') + LOGGING_XMPP_SENDER = os.environ.get('LOGGING_XMPP_SENDER') + LOGGING_XMPP_PASSWORD = os.environ.get('LOGGING_XMPP_PASSWORD') + LOGGING_XMPP_RECIPIENT = os.environ.get('LOGGING_XMPP_RECIPIENT') + LOGGING_XMPP_COMMAND = os.environ.get('LOGGING_XMPP_COMMAND') + LOGGING_XMPP_USE_TLS = os.environ.get('LOGGING_XMPP_USE_TLS') + + MAIL_SERVER = os.environ.get('MAIL_SERVER') + MAIL_PORT = os.environ.get('MAIL_PORT') + MAIL_USE_TLS = os.environ.get('MAIL_USE_TLS') + MAIL_ADMINS = [x for x in os.environ.get('MAIL_ADMINS').split(' ')] + MAIL_USERNAME = os.environ.get('MAIL_USERNAME') + MAIL_PASSWORD = os.environ.get('MAIL_PASSWORD') + + EXTERNAL_URL = os.environ.get('EXTERNAL_URL') diff --git a/todo.example.com.conf b/todo.example.com.conf new file mode 100644 index 0000000..5cd79a4 --- /dev/null +++ b/todo.example.com.conf @@ -0,0 +1,11 @@ + + + ServerName todo.example.com.conf + ProxyPass "/.well-known" ! + ProxyPass "/favicon.ico" ! + ProxyPass "/" "http://127.0.0.1:8300/" + ProxyPassReverse "/" "http://127.0.0.1:8300/" + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + + diff --git a/todo.py b/todo.py new file mode 100644 index 0000000..8001f72 --- /dev/null +++ b/todo.py @@ -0,0 +1,5 @@ +#!/usr/bin/env python3 + +from app import init_app + +app = init_app() diff --git a/todo.service b/todo.service new file mode 100644 index 0000000..99790a0 --- /dev/null +++ b/todo.service @@ -0,0 +1,14 @@ +[Unit] +Description=Todo Application +After=network.target + +[Service] +User=todo +Group=todo +WorkingDirectory=/var/lib/todo +Environment=FLASK_DEBUG=0 +ExecStart=/usr/bin/gunicorn3 --access-logfile '-' -b 127.0.0.1:8300 -w 1 todo:app +Restart=always + +[Install] +WantedBy=multi-user.target