diff --git a/.gitignore b/.gitignore index 4f84c508..d75584e3 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ venv # other .vscode +onionshare.dist-info \ No newline at end of file diff --git a/desktop/CHANGELOG.md b/CHANGELOG.md similarity index 100% rename from desktop/CHANGELOG.md rename to CHANGELOG.md diff --git a/cli/LICENSE b/LICENSE similarity index 100% rename from cli/LICENSE rename to LICENSE diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md deleted file mode 100644 index cfb959c9..00000000 --- a/cli/CHANGELOG.md +++ /dev/null @@ -1,3 +0,0 @@ -# OnionShare CLI Changelog - -Coming soon. \ No newline at end of file diff --git a/cli/README.md b/cli/README.md index cd3cf80b..3ebfd1bf 100644 --- a/cli/README.md +++ b/cli/README.md @@ -21,14 +21,6 @@ @@@@@@@@@ ``` -# OnionShare CLI - -_This project is under development and not ready for use._ - -OnionShare is an open source tool that lets you securely and anonymously share files, host websites, and chat with friends using the Tor network. - -This is the command line version of OnionShare. [Click here](https://github.com/micahflee/onionshare) for the graphical version. - ## Installing OnionShare CLI First, make sure you have `tor` installed. In Linux, install it through your package manager. In macOS, install it with [Homebrew](https://brew.sh): `brew install tor`. @@ -74,14 +66,8 @@ Before making a release, make update the version in these places: - `pyproject.toml` - `onionshare_cli/resources/version.txt` -And edit `CHANGELOG.md` to include a list of all major changes since the last release. - -Create a PGP-signed git tag. For example for OnionShare CLI 0.1.0, the tag must be `v0.1.0`. - Build and publish to PyPi: ``` poetry publish --build -``` - -Test status: [![CircleCI](https://circleci.com/gh/micahflee/onionshare-cli.svg?style=svg)](https://circleci.com/gh/micahflee/onionshare-cli) \ No newline at end of file +``` \ No newline at end of file diff --git a/desktop/.gitignore b/desktop/.gitignore new file mode 100644 index 00000000..a08e1f35 --- /dev/null +++ b/desktop/.gitignore @@ -0,0 +1 @@ +linux diff --git a/desktop/LICENSE b/desktop/LICENSE deleted file mode 100644 index 5a3a9871..00000000 --- a/desktop/LICENSE +++ /dev/null @@ -1,679 +0,0 @@ -(Note: Third-party licenses can be found under install/licenses/.) - -OnionShare -Copyright (C) 2014-2020 Micah Lee, et al. - - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/desktop/MANIFEST.in b/desktop/MANIFEST.in deleted file mode 100644 index 7dd8a881..00000000 --- a/desktop/MANIFEST.in +++ /dev/null @@ -1,13 +0,0 @@ -include LICENSE -include README.md -include BUILD.md -include share/* -include share/images/* -include share/locale/* -include share/templates/* -include share/static/* -include install/org.onionshare.OnionShare.desktop -include install/org.onionshare.OnionShare.appdata.xml -include install/org.onionshare.OnionShare.svg -include install/scripts/onionshare-nautilus.py -include tests/*.py diff --git a/desktop/README.md b/desktop/README.md new file mode 100644 index 00000000..bba11d41 --- /dev/null +++ b/desktop/README.md @@ -0,0 +1,84 @@ +# OnionShare Desktop + +## Building OnionShare + +### Install platform-specific dependencies + +#### Linux + +If you're using Linux, install `tor` and `obfs4proxy` from either the [official Debian repository](https://support.torproject.org/apt/tor-deb-repo/), or from your package manager. + +Then download Qt 5.14.0 for Linux: + +```sh +cd ~/Downloads +wget https://download.qt.io/official_releases/qt/5.14/5.14.0/qt-opensource-linux-x64-5.14.0.run +``` + +If you'd like to check to make sure you have the exact installer I have, here is the sha256 checksum: + +```sh +sha256sum qt-opensource-linux-x64-5.14.0.run +4379f147c6793ec7e7349d2f9ee7d53b8ab6ea4e4edf8ee0574a75586a6a6e0e qt-opensource-linux-x64-5.14.0.run +``` + +Then make it executable and install Qt: + +```sh +chmod +x qt-opensource-linux-x64-5.14.0.run +./qt-opensource-linux-x64-5.14.0.run +``` + +You have to create a Qt account and login to install Qt. Choose the default installation folder in your home directory. The only component you need is `Qt 5.14.0` > `Desktop gcc 64-bit`. + +#### macOS + +#### Windows + +### Prepare the code + +Get the source code and change to the `desktop` folder: + +```sh +git clone https://github.com/micahflee/onionshare.git +cd onionshare/desktop +``` + +OnionShare uses [Briefcase](https://briefcase.readthedocs.io/en/latest/). + +Install Briefcase dependencies by following [these instructions](https://docs.beeware.org/en/latest/tutorial/tutorial-0.html#install-dependencies). + +Now create and/or activate a virtual environment. + +``` +python3 -m venv venv +. venv/bin/activate +``` + +While your virtual environment is active, install briefcase from pip. + +``` +pip install briefcase +``` + +Run OnionShare from the source tree like this: + +``` +briefcase dev +``` + +## Running tests + +Install these packages inside your virtual environment: + +```sh +pip install pytest pytest-briefcase pytest-faulthandler pytest-qt +``` + +Then run the tests: + +```sh +./tests/run.sh +``` + +## Making a release \ No newline at end of file diff --git a/desktop/apparmor/abstractions/onionshare b/desktop/apparmor/abstractions/onionshare deleted file mode 100644 index fa94e68d..00000000 --- a/desktop/apparmor/abstractions/onionshare +++ /dev/null @@ -1,29 +0,0 @@ -#include -#include -#include -#include - -# Why are these not in abstractions/python? -/usr/lib{,32,64}/python{2,3}.[0-9]/__pycache__/ rw, -/usr/lib{,32,64}/python{2,3}.[0-9]/__pycache__/* rw, -/usr/lib{,32,64}/python{2,3}.[0-9]/**/__pycache__/ rw, -/usr/lib{,32,64}/python{2,3}.[0-9]/**/__pycache__/* rw, -/usr/lib{,32,64}/python{2,3}/**/__pycache__/ rw, -/usr/lib{,32,64}/python{2,3}/**/__pycache__/* rw, - -/bin/dash rix, -/proc/*/mounts r, -/proc/*/fd/ r, -/sbin/ldconfig rix, -/sbin/ldconfig.real rix, -/bin/uname rix, -/etc/mime.types r, -/usr/share/onionshare/ r, -/usr/share/onionshare/** r, -/tmp/ rw, -/tmp/** rw, - -# Allow read on almost anything in @{HOME}. Lenient, but -# private-files-strict is in effect. -owner @{HOME}/ r, -owner @{HOME}/[^.]** r, diff --git a/desktop/apparmor/local/usr.bin.onionshare b/desktop/apparmor/local/usr.bin.onionshare deleted file mode 100644 index 6453771d..00000000 --- a/desktop/apparmor/local/usr.bin.onionshare +++ /dev/null @@ -1,2 +0,0 @@ -# Site-specific additions and overrides for usr.bin.onionshare. -# For more details, please see /etc/apparmor.d/local/README. diff --git a/desktop/apparmor/local/usr.bin.onionshare-gui b/desktop/apparmor/local/usr.bin.onionshare-gui deleted file mode 100644 index fa5ba3f0..00000000 --- a/desktop/apparmor/local/usr.bin.onionshare-gui +++ /dev/null @@ -1,2 +0,0 @@ -# Site-specific additions and overrides for usr.bin.onionshare-gui. -# For more details, please see /etc/apparmor.d/local/README. diff --git a/desktop/apparmor/usr.bin.onionshare b/desktop/apparmor/usr.bin.onionshare deleted file mode 100644 index 1c14ccc1..00000000 --- a/desktop/apparmor/usr.bin.onionshare +++ /dev/null @@ -1,10 +0,0 @@ -#include - -/usr/bin/onionshare { - #include - - /usr/bin/ r, - /usr/bin/onionshare r, - - #include -} diff --git a/desktop/apparmor/usr.bin.onionshare-gui b/desktop/apparmor/usr.bin.onionshare-gui deleted file mode 100644 index 746dadc1..00000000 --- a/desktop/apparmor/usr.bin.onionshare-gui +++ /dev/null @@ -1,28 +0,0 @@ -#include - -/usr/bin/onionshare-gui { - #include - #include - #include - - /usr/bin/ r, - /usr/bin/onionshare-gui r, - /proc/*/cmdline r, - - # The freedesktop.org abstraction doesn't allow `k` - /usr/share/icons/*/index.theme k, - - # Why do these still emit audit journal entries? - owner @{HOME}/.config/ibus/bus/ rw, - owner @{HOME}/.config/ibus/bus/* rw, - deny @{HOME}/.ICEauthority r, - - deny /etc/machine-id r, - deny /var/lib/dbus/machine-id.* rw, - - # Accessibility support - owner /{,var/}run/user/*/at-spi2-*/ rw, - owner /{,var/}run/user/*/at-spi2-*/** rw, - - #include -} diff --git a/desktop/dev_scripts/onionshare b/desktop/dev_scripts/onionshare deleted file mode 100755 index 33e59203..00000000 --- a/desktop/dev_scripts/onionshare +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -""" -OnionShare | https://onionshare.org/ - -Copyright (C) 2014-2020 Micah Lee, et al. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -""" - -# Load onionshare module and resources from the source code tree -import os, sys - -sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -sys.onionshare_dev_mode = True - -import onionshare - -onionshare.main() diff --git a/desktop/dev_scripts/onionshare-gui b/desktop/dev_scripts/onionshare-gui deleted file mode 100755 index 6585be02..00000000 --- a/desktop/dev_scripts/onionshare-gui +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -""" -OnionShare | https://onionshare.org/ - -Copyright (C) 2014-2020 Micah Lee, et al. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -""" - -# Load onionshare module and resources from the source code tree -import os, sys - -sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -sys.onionshare_dev_mode = True - -import onionshare_gui - -onionshare_gui.main() diff --git a/desktop/git-hooks/README.md b/desktop/git-hooks/README.md deleted file mode 100644 index 0d8f80c9..00000000 --- a/desktop/git-hooks/README.md +++ /dev/null @@ -1,3 +0,0 @@ -To use these hooks, cp any of them to onionshare's `.git/hooks`. - -* `pre-push` runs the test suite, and will push if the tests pass. diff --git a/desktop/git-hooks/pre-push b/desktop/git-hooks/pre-push deleted file mode 100755 index 1d8e57f8..00000000 --- a/desktop/git-hooks/pre-push +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -# Pre-push hook. If you want to test with a different version of firefox, put -# the path in the CFX_FIREFOX environment variable. diff --git a/desktop/onionshare/__init__.py b/desktop/onionshare/__init__.py deleted file mode 100644 index c1367b1e..00000000 --- a/desktop/onionshare/__init__.py +++ /dev/null @@ -1,514 +0,0 @@ -# -*- coding: utf-8 -*- -""" -OnionShare | https://onionshare.org/ - -Copyright (C) 2014-2020 Micah Lee, et al. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -""" - -import os, sys, time, argparse, threading -from datetime import datetime -from datetime import timedelta - -from .common import Common -from .web import Web -from .onion import * -from .onionshare import OnionShare -from .mode_settings import ModeSettings - - -def build_url(mode_settings, app, web): - # Build the URL - if mode_settings.get("general", "public"): - return f"http://{app.onion_host}" - else: - return f"http://onionshare:{web.password}@{app.onion_host}" - - -def main(cwd=None): - """ - The main() function implements all of the logic that the command-line version of - onionshare uses. - """ - common = Common() - - # Display OnionShare banner - print(f"OnionShare {common.version} | https://onionshare.org/") - reset = "\033[0m" - purple = "\33[95m" - print(purple) - print(" @@@@@@@@@ ") - print(" @@@@@@@@@@@@@@@@@@@ ") - print(" @@@@@@@@@@@@@@@@@@@@@@@@@ ") - print(" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@ ") - print( - " @@@@@@@@@@@@@@@@@@@@@@@@@@@@@ ___ _ " - ) - print( - " @@@@@@ @@@@@@@@@@@@@ / _ \ (_) " - ) - print( - " @@@@ @ @@@@@@@@@@@ | | | |_ __ _ ___ _ __ " - ) - print( - " @@@@@@@@ @@@@@@@@@@ | | | | '_ \| |/ _ \| '_ \ " - ) - print( - " @@@@@@@@@@@@ @@@@@@@@@@ \ \_/ / | | | | (_) | | | | " - ) - print( - " @@@@@@@@@@@@@@@@ @@@@@@@@@ \___/|_| |_|_|\___/|_| |_| " - ) - print( - " @@@@@@@@@ @@@@@@@@@@@@@@@@ _____ _ " - ) - print( - " @@@@@@@@@@ @@@@@@@@@@@@ / ___| | " - ) - print( - " @@@@@@@@@@ @@@@@@@@ \ `--.| |__ __ _ _ __ ___ " - ) - print( - " @@@@@@@@@@@ @ @@@@ `--. \ '_ \ / _` | '__/ _ \\" - ) - print( - " @@@@@@@@@@@@@ @@@@@@ /\__/ / | | | (_| | | | __/" - ) - print( - " @@@@@@@@@@@@@@@@@@@@@@@@@@@@@ \____/|_| |_|\__,_|_| \___|" - ) - print(" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@ ") - print(" @@@@@@@@@@@@@@@@@@@@@@@@@ ") - print(" @@@@@@@@@@@@@@@@@@@ ") - print(" @@@@@@@@@ ") - print(reset) - - # OnionShare CLI in OSX needs to change current working directory (#132) - if common.platform == "Darwin": - if cwd: - os.chdir(cwd) - - # Parse arguments - parser = argparse.ArgumentParser( - formatter_class=lambda prog: argparse.HelpFormatter(prog, max_help_position=28) - ) - # Select modes - parser.add_argument( - "--receive", action="store_true", dest="receive", help="Receive files" - ) - parser.add_argument( - "--website", action="store_true", dest="website", help="Publish website" - ) - parser.add_argument( - "--chat", action="store_true", dest="chat", help="Start chat server" - ) - # Tor connection-related args - parser.add_argument( - "--local-only", - action="store_true", - dest="local_only", - default=False, - help="Don't use Tor (only for development)", - ) - parser.add_argument( - "--connect-timeout", - metavar="SECONDS", - dest="connect_timeout", - default=120, - help="Give up connecting to Tor after a given amount of seconds (default: 120)", - ) - parser.add_argument( - "--config", - metavar="FILENAME", - default=None, - help="Filename of custom global settings", - ) - # Persistent file - parser.add_argument( - "--persistent", - metavar="FILENAME", - default=None, - help="Filename of persistent session", - ) - # General args - parser.add_argument( - "--public", - action="store_true", - dest="public", - default=False, - help="Don't use a password", - ) - parser.add_argument( - "--auto-start-timer", - metavar="SECONDS", - dest="autostart_timer", - default=0, - help="Start onion service at scheduled time (N seconds from now)", - ) - parser.add_argument( - "--auto-stop-timer", - metavar="SECONDS", - dest="autostop_timer", - default=0, - help="Stop onion service at schedule time (N seconds from now)", - ) - parser.add_argument( - "--legacy", - action="store_true", - dest="legacy", - default=False, - help="Use legacy address (v2 onion service, not recommended)", - ) - parser.add_argument( - "--client-auth", - action="store_true", - dest="client_auth", - default=False, - help="Use client authorization (requires --legacy)", - ) - # Share args - parser.add_argument( - "--autostop-sharing", - action="store_true", - dest="autostop_sharing", - default=True, - help="Share files: Stop sharing after files have been sent", - ) - # Receive args - parser.add_argument( - "--data-dir", - metavar="data_dir", - default=None, - help="Receive files: Save files received to this directory", - ) - # Website args - parser.add_argument( - "--disable_csp", - action="store_true", - dest="disable_csp", - default=False, - help="Publish website: Disable Content Security Policy header (allows your website to use third-party resources)", - ) - # Other - parser.add_argument( - "-v", - "--verbose", - action="store_true", - dest="verbose", - help="Log OnionShare errors to stdout, and web errors to disk", - ) - parser.add_argument( - "filename", - metavar="filename", - nargs="*", - help="List of files or folders to share", - ) - args = parser.parse_args() - - filenames = args.filename - for i in range(len(filenames)): - filenames[i] = os.path.abspath(filenames[i]) - - receive = bool(args.receive) - website = bool(args.website) - chat = bool(args.chat) - local_only = bool(args.local_only) - connect_timeout = int(args.connect_timeout) - config_filename = args.config - persistent_filename = args.persistent - public = bool(args.public) - autostart_timer = int(args.autostart_timer) - autostop_timer = int(args.autostop_timer) - legacy = bool(args.legacy) - client_auth = bool(args.client_auth) - autostop_sharing = bool(args.autostop_sharing) - data_dir = args.data_dir - disable_csp = bool(args.disable_csp) - verbose = bool(args.verbose) - - if receive: - mode = "receive" - elif website: - mode = "website" - elif chat: - mode = "chat" - else: - mode = "share" - - # Verbose mode? - common.verbose = verbose - - # client_auth can only be set if legacy is also set - if client_auth and not legacy: - print( - "Client authentication (--client-auth) is only supported with with legacy onion services (--legacy)" - ) - sys.exit() - - # Re-load settings, if a custom config was passed in - if config_filename: - common.load_settings(config_filename) - else: - common.load_settings() - - # Mode settings - if persistent_filename: - mode_settings = ModeSettings(common, persistent_filename) - mode_settings.set("persistent", "enabled", True) - else: - mode_settings = ModeSettings(common) - - if mode_settings.just_created: - # This means the mode settings were just created, not loaded from disk - mode_settings.set("general", "public", public) - mode_settings.set("general", "autostart_timer", autostart_timer) - mode_settings.set("general", "autostop_timer", autostop_timer) - mode_settings.set("general", "legacy", legacy) - mode_settings.set("general", "client_auth", client_auth) - if mode == "share": - mode_settings.set("share", "autostop_sharing", autostop_sharing) - if mode == "receive": - if data_dir: - mode_settings.set("receive", "data_dir", data_dir) - if mode == "website": - mode_settings.set("website", "disable_csp", disable_csp) - else: - # See what the persistent mode was - mode = mode_settings.get("persistent", "mode") - - # In share and website mode, you must supply a list of filenames - if mode == "share" or mode == "website": - # Unless you passed in a persistent filename, in which case get the filenames from - # the mode settings - if persistent_filename and not mode_settings.just_created: - filenames = mode_settings.get(mode, "filenames") - - else: - # Make sure filenames given if not using receiver mode - if len(filenames) == 0: - if persistent_filename: - mode_settings.delete() - - parser.print_help() - sys.exit() - - # Validate filenames - valid = True - for filename in filenames: - if not os.path.isfile(filename) and not os.path.isdir(filename): - print(f"{filename} is not a valid file.") - valid = False - if not os.access(filename, os.R_OK): - print(f"{filename} is not a readable file.") - valid = False - if not valid: - sys.exit() - - # Create the Web object - web = Web(common, False, mode_settings, mode) - - # Start the Onion object - onion = Onion(common, use_tmp_dir=True) - try: - onion.connect( - custom_settings=False, - config=config_filename, - connect_timeout=connect_timeout, - local_only=local_only, - ) - except KeyboardInterrupt: - print("") - sys.exit() - except Exception as e: - sys.exit(e.args[0]) - - # Start the onionshare app - try: - common.settings.load() - if not mode_settings.get("general", "public"): - web.generate_password(mode_settings.get("onion", "password")) - else: - web.password = None - app = OnionShare(common, onion, local_only, autostop_timer) - app.choose_port() - - # Delay the startup if a startup timer was set - if autostart_timer > 0: - # Can't set a schedule that is later than the auto-stop timer - if autostop_timer > 0 and autostop_timer < autostart_timer: - print( - "The auto-stop time can't be the same or earlier than the auto-start time. Please update it to start sharing." - ) - sys.exit() - - app.start_onion_service(mode_settings, False, True) - url = build_url(mode_settings, app, web) - schedule = datetime.now() + timedelta(seconds=autostart_timer) - if mode == "receive": - print( - f"Files sent to you appear in this folder: {mode_settings.get('receive', 'data_dir')}" - ) - print("") - print( - "Warning: Receive mode lets people upload files to your computer. Some files can potentially take control of your computer if you open them. Only open things from people you trust, or if you know what you are doing." - ) - print("") - if mode_settings.get("general", "client_auth"): - print( - f"Give this address and HidServAuth lineto your sender, and tell them it won't be accessible until: {schedule.strftime('%I:%M:%S%p, %b %d, %y')}" - ) - print(app.auth_string) - else: - print( - f"Give this address to your sender, and tell them it won't be accessible until: {schedule.strftime('%I:%M:%S%p, %b %d, %y')}" - ) - else: - if mode_settings.get("general", "client_auth"): - print( - f"Give this address and HidServAuth line to your recipient, and tell them it won't be accessible until: {schedule.strftime('%I:%M:%S%p, %b %d, %y')}" - ) - print(app.auth_string) - else: - print( - f"Give this address to your recipient, and tell them it won't be accessible until: {schedule.strftime('%I:%M:%S%p, %b %d, %y')}" - ) - print(url) - print("") - print("Waiting for the scheduled time before starting...") - app.onion.cleanup(False) - time.sleep(autostart_timer) - app.start_onion_service(mode_settings) - else: - app.start_onion_service(mode_settings) - except KeyboardInterrupt: - print("") - sys.exit() - except (TorTooOld, TorErrorProtocolError) as e: - print("") - print(e.args[0]) - sys.exit() - - if mode == "website": - # Prepare files to share - try: - web.website_mode.set_file_info(filenames) - except OSError as e: - print(e.strerror) - sys.exit(1) - - if mode == "share": - # Prepare files to share - print("Compressing files.") - try: - web.share_mode.set_file_info(filenames) - app.cleanup_filenames += web.share_mode.cleanup_filenames - except OSError as e: - print(e.strerror) - sys.exit(1) - - # Warn about sending large files over Tor - if web.share_mode.download_filesize >= 157286400: # 150mb - print("") - print("Warning: Sending a large share could take hours") - print("") - - # Start OnionShare http service in new thread - t = threading.Thread(target=web.start, args=(app.port,)) - t.daemon = True - t.start() - - try: # Trap Ctrl-C - # Wait for web.generate_password() to finish running - time.sleep(0.2) - - # start auto-stop timer thread - if app.autostop_timer > 0: - app.autostop_timer_thread.start() - - # Save the web password if we are using a persistent private key - if mode_settings.get("persistent", "enabled"): - if not mode_settings.get("onion", "password"): - mode_settings.set("onion", "password", web.password) - # mode_settings.save() - - # Build the URL - url = build_url(mode_settings, app, web) - - print("") - if autostart_timer > 0: - print("Server started") - else: - if mode == "receive": - print( - f"Files sent to you appear in this folder: {mode_settings.get('receive', 'data_dir')}" - ) - print("") - print( - "Warning: Receive mode lets people upload files to your computer. Some files can potentially take control of your computer if you open them. Only open things from people you trust, or if you know what you are doing." - ) - print("") - - if mode_settings.get("general", "client_auth"): - print("Give this address and HidServAuth to the sender:") - print(url) - print(app.auth_string) - else: - print("Give this address to the sender:") - print(url) - else: - if mode_settings.get("general", "client_auth"): - print("Give this address and HidServAuth line to the recipient:") - print(url) - print(app.auth_string) - else: - print("Give this address to the recipient:") - print(url) - print("") - print("Press Ctrl+C to stop the server") - - # Wait for app to close - while t.is_alive(): - if app.autostop_timer > 0: - # if the auto-stop timer was set and has run out, stop the server - if not app.autostop_timer_thread.is_alive(): - if mode == "share" or (mode == "website"): - # If there were no attempts to download the share, or all downloads are done, we can stop - if web.share_mode.cur_history_id == 0 or web.done: - print("Stopped because auto-stop timer ran out") - web.stop(app.port) - break - if mode == "receive": - if ( - web.receive_mode.cur_history_id == 0 - or not web.receive_mode.uploads_in_progress - ): - print("Stopped because auto-stop timer ran out") - web.stop(app.port) - break - else: - web.receive_mode.can_upload = False - # Allow KeyboardInterrupt exception to be handled with threads - # https://stackoverflow.com/questions/3788208/python-threading-ignores-keyboardinterrupt-exception - time.sleep(0.2) - except KeyboardInterrupt: - web.stop(app.port) - finally: - # Shutdown - app.cleanup() - onion.cleanup() - - -if __name__ == "__main__": - main() diff --git a/desktop/onionshare/common.py b/desktop/onionshare/common.py deleted file mode 100644 index 27104669..00000000 --- a/desktop/onionshare/common.py +++ /dev/null @@ -1,336 +0,0 @@ -# -*- coding: utf-8 -*- -""" -OnionShare | https://onionshare.org/ - -Copyright (C) 2014-2020 Micah Lee, et al. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -""" -import base64 -import hashlib -import inspect -import os -import platform -import random -import socket -import sys -import tempfile -import threading -import time -import shutil - -from .settings import Settings - - -class Common: - """ - The Common object is shared amongst all parts of OnionShare. - """ - - def __init__(self, verbose=False): - self.verbose = verbose - - # The platform OnionShare is running on - self.platform = platform.system() - if self.platform.endswith("BSD") or self.platform == "DragonFly": - self.platform = "BSD" - - # The current version of OnionShare - with open(self.get_resource_path("version.txt")) as f: - self.version = f.read().strip() - - def load_settings(self, config=None): - """ - Loading settings, optionally from a custom config json file. - """ - self.settings = Settings(self, config) - self.settings.load() - - def log(self, module, func, msg=None): - """ - If verbose mode is on, log error messages to stdout - """ - if self.verbose: - timestamp = time.strftime("%b %d %Y %X") - - final_msg = f"[{timestamp}] {module}.{func}" - if msg: - final_msg = f"{final_msg}: {msg}" - print(final_msg) - - def get_resource_path(self, filename): - """ - Returns the absolute path of a resource, regardless of whether OnionShare is installed - systemwide, and whether regardless of platform - """ - # On Windows, and in Windows dev mode, switch slashes in incoming filename to backslackes - if self.platform == "Windows": - filename = filename.replace("/", "\\") - - if getattr(sys, "onionshare_dev_mode", False): - # Look for resources directory relative to python file - prefix = os.path.join( - os.path.dirname( - os.path.dirname( - os.path.abspath(inspect.getfile(inspect.currentframe())) - ) - ), - "share", - ) - if not os.path.exists(prefix): - # While running tests during stdeb bdist_deb, look 3 directories up for the share folder - prefix = os.path.join( - os.path.dirname( - os.path.dirname(os.path.dirname(os.path.dirname(prefix))) - ), - "share", - ) - - elif self.platform == "BSD" or self.platform == "Linux": - # Look for resources relative to the binary, so if the binary is /usr/bin/onionshare-gui and - # the resource dir is /usr/share/onionshare, then the resource dir relative to the binary dir - # is ../share/onionshare - prefix = os.path.join( - os.path.dirname(os.path.dirname(sys.argv[0])), "share/onionshare" - ) - - elif getattr(sys, "frozen", False): - # Check if app is "frozen" - # https://pythonhosted.org/PyInstaller/#run-time-information - if self.platform == "Darwin": - prefix = os.path.join(sys._MEIPASS, "share") - elif self.platform == "Windows": - prefix = os.path.join(os.path.dirname(sys.executable), "share") - - return os.path.join(prefix, filename) - - def get_tor_paths(self): - if self.platform == "Linux": - tor_path = shutil.which("tor") - obfs4proxy_file_path = shutil.which("obfs4proxy") - prefix = os.path.dirname(os.path.dirname(tor_path)) - tor_geo_ip_file_path = os.path.join(prefix, "share/tor/geoip") - tor_geo_ipv6_file_path = os.path.join(prefix, "share/tor/geoip6") - elif self.platform == "Windows": - base_path = os.path.join( - os.path.dirname(os.path.dirname(self.get_resource_path(""))), "tor" - ) - tor_path = os.path.join(os.path.join(base_path, "Tor"), "tor.exe") - obfs4proxy_file_path = os.path.join( - os.path.join(base_path, "Tor"), "obfs4proxy.exe" - ) - tor_geo_ip_file_path = os.path.join( - os.path.join(os.path.join(base_path, "Data"), "Tor"), "geoip" - ) - tor_geo_ipv6_file_path = os.path.join( - os.path.join(os.path.join(base_path, "Data"), "Tor"), "geoip6" - ) - elif self.platform == "Darwin": - base_path = os.path.dirname( - os.path.dirname(os.path.dirname(self.get_resource_path(""))) - ) - tor_path = os.path.join(base_path, "Resources", "Tor", "tor") - tor_geo_ip_file_path = os.path.join(base_path, "Resources", "Tor", "geoip") - tor_geo_ipv6_file_path = os.path.join( - base_path, "Resources", "Tor", "geoip6" - ) - obfs4proxy_file_path = os.path.join( - base_path, "Resources", "Tor", "obfs4proxy" - ) - elif self.platform == "BSD": - tor_path = "/usr/local/bin/tor" - tor_geo_ip_file_path = "/usr/local/share/tor/geoip" - tor_geo_ipv6_file_path = "/usr/local/share/tor/geoip6" - obfs4proxy_file_path = "/usr/local/bin/obfs4proxy" - - return ( - tor_path, - tor_geo_ip_file_path, - tor_geo_ipv6_file_path, - obfs4proxy_file_path, - ) - - def build_data_dir(self): - """ - Returns the path of the OnionShare data directory. - """ - if self.platform == "Windows": - try: - appdata = os.environ["APPDATA"] - onionshare_data_dir = f"{appdata}\\OnionShare" - except: - # If for some reason we don't have the 'APPDATA' environment variable - # (like running tests in Linux while pretending to be in Windows) - onionshare_data_dir = os.path.expanduser("~/.config/onionshare") - elif self.platform == "Darwin": - onionshare_data_dir = os.path.expanduser( - "~/Library/Application Support/OnionShare" - ) - else: - onionshare_data_dir = os.path.expanduser("~/.config/onionshare") - - # Modify the data dir if running tests - if getattr(sys, "onionshare_test_mode", False): - onionshare_data_dir += "-testdata" - - os.makedirs(onionshare_data_dir, 0o700, True) - return onionshare_data_dir - - def build_tmp_dir(self): - """ - Returns path to a folder that can hold temporary files - """ - tmp_dir = os.path.join(self.build_data_dir(), "tmp") - os.makedirs(tmp_dir, 0o700, True) - return tmp_dir - - def build_persistent_dir(self): - """ - Returns the path to the folder that holds persistent files - """ - persistent_dir = os.path.join(self.build_data_dir(), "persistent") - os.makedirs(persistent_dir, 0o700, True) - return persistent_dir - - def build_tor_dir(self): - """ - Returns path to the tor data directory - """ - tor_dir = os.path.join(self.build_data_dir(), "tor_data") - os.makedirs(tor_dir, 0o700, True) - return tor_dir - - def build_password(self, word_count=2): - """ - Returns a random string made of words from the wordlist, such as "deter-trig". - """ - with open(self.get_resource_path("wordlist.txt")) as f: - wordlist = f.read().split() - - r = random.SystemRandom() - return "-".join(r.choice(wordlist) for _ in range(word_count)) - - def build_username(self, word_count=2): - """ - Returns a random string made of words from the wordlist, such as "deter-trig". - """ - with open(self.get_resource_path("wordlist.txt")) as f: - wordlist = f.read().split() - - r = random.SystemRandom() - return "-".join(r.choice(wordlist) for _ in range(word_count)) - - @staticmethod - def random_string(num_bytes, output_len=None): - """ - Returns a random string with a specified number of bytes. - """ - b = os.urandom(num_bytes) - h = hashlib.sha256(b).digest()[:16] - s = base64.b32encode(h).lower().replace(b"=", b"").decode("utf-8") - if not output_len: - return s - return s[:output_len] - - @staticmethod - def human_readable_filesize(b): - """ - Returns filesize in a human readable format. - """ - thresh = 1024.0 - if b < thresh: - return "{:.1f} B".format(b) - units = ("KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB") - u = 0 - b /= thresh - while b >= thresh: - b /= thresh - u += 1 - return "{:.1f} {}".format(b, units[u]) - - @staticmethod - def format_seconds(seconds): - """Return a human-readable string of the format 1d2h3m4s""" - days, seconds = divmod(seconds, 86400) - hours, seconds = divmod(seconds, 3600) - minutes, seconds = divmod(seconds, 60) - - human_readable = [] - if days: - human_readable.append("{:.0f}d".format(days)) - if hours: - human_readable.append("{:.0f}h".format(hours)) - if minutes: - human_readable.append("{:.0f}m".format(minutes)) - if seconds or not human_readable: - human_readable.append("{:.0f}s".format(seconds)) - return "".join(human_readable) - - @staticmethod - def estimated_time_remaining(bytes_downloaded, total_bytes, started): - now = time.time() - time_elapsed = now - started # in seconds - download_rate = bytes_downloaded / time_elapsed - remaining_bytes = total_bytes - bytes_downloaded - eta = remaining_bytes / download_rate - return Common.format_seconds(eta) - - @staticmethod - def get_available_port(min_port, max_port): - """ - Find a random available port within the given range. - """ - with socket.socket() as tmpsock: - while True: - try: - tmpsock.bind(("127.0.0.1", random.randint(min_port, max_port))) - break - except OSError as e: - pass - _, port = tmpsock.getsockname() - return port - - @staticmethod - def dir_size(start_path): - """ - Calculates the total size, in bytes, of all of the files in a directory. - """ - total_size = 0 - for dirpath, dirnames, filenames in os.walk(start_path): - for f in filenames: - fp = os.path.join(dirpath, f) - if not os.path.islink(fp): - total_size += os.path.getsize(fp) - return total_size - - -class AutoStopTimer(threading.Thread): - """ - Background thread sleeps t hours and returns. - """ - - def __init__(self, common, time): - threading.Thread.__init__(self) - - self.common = common - - self.setDaemon(True) - self.time = time - - def run(self): - self.common.log( - "AutoStopTimer", f"Server will shut down after {self.time} seconds" - ) - time.sleep(self.time) - return 1 diff --git a/desktop/onionshare/mode_settings.py b/desktop/onionshare/mode_settings.py deleted file mode 100644 index b353fcde..00000000 --- a/desktop/onionshare/mode_settings.py +++ /dev/null @@ -1,146 +0,0 @@ -# -*- coding: utf-8 -*- -""" -OnionShare | https://onionshare.org/ - -Copyright (C) 2014-2020 Micah Lee, et al. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -""" -import os -import json -import platform - -if platform.system() == "Darwin": - import pwd - - -class ModeSettings: - """ - This stores the settings for a single instance of an OnionShare mode. In CLI there - is only one ModeSettings, and in the GUI there is a separate ModeSettings for each tab - """ - - def __init__(self, common, filename=None, id=None): - self.common = common - - self.default_settings = { - "onion": { - "private_key": None, - "hidservauth_string": None, - "password": None, - }, - "persistent": {"mode": None, "enabled": False}, - "general": { - "public": False, - "autostart_timer": False, - "autostop_timer": False, - "legacy": False, - "client_auth": False, - "service_id": None, - }, - "share": {"autostop_sharing": True, "filenames": []}, - "receive": {"data_dir": self.build_default_receive_data_dir()}, - "website": {"disable_csp": False, "filenames": []}, - "chat": {"room": "default"}, - } - self._settings = {} - - self.just_created = False - if id: - self.id = id - else: - self.id = self.common.build_password(3) - - self.load(filename) - - def fill_in_defaults(self): - """ - If there are any missing settings from self._settings, replace them with - their default values. - """ - for key in self.default_settings: - if key in self._settings: - for inner_key in self.default_settings[key]: - if inner_key not in self._settings[key]: - self._settings[key][inner_key] = self.default_settings[key][ - inner_key - ] - else: - self._settings[key] = self.default_settings[key] - - def get(self, group, key): - return self._settings[group][key] - - def set(self, group, key, val): - self._settings[group][key] = val - self.common.log( - "ModeSettings", "set", f"updating {self.id}: {group}.{key} = {val}" - ) - self.save() - - def build_default_receive_data_dir(self): - """ - Returns the path of the default Downloads directory for receive mode. - """ - - if self.common.platform == "Darwin": - # We can't use os.path.expanduser() in macOS because in the sandbox it - # returns the path to the sandboxed homedir - real_homedir = pwd.getpwuid(os.getuid()).pw_dir - return os.path.join(real_homedir, "OnionShare") - elif self.common.platform == "Windows": - # On Windows, os.path.expanduser() needs to use backslash, or else it - # retains the forward slash, which breaks opening the folder in explorer. - return os.path.expanduser("~\OnionShare") - else: - # All other OSes - return os.path.expanduser("~/OnionShare") - - def load(self, filename=None): - # Load persistent settings from disk. If the file doesn't exist, create it - if filename: - self.filename = filename - else: - self.filename = os.path.join( - self.common.build_persistent_dir(), f"{self.id}.json" - ) - - if os.path.exists(self.filename): - try: - with open(self.filename, "r") as f: - self._settings = json.load(f) - self.fill_in_defaults() - self.common.log("ModeSettings", "load", f"loaded {self.filename}") - return - except: - pass - - # If loading settings didn't work, create the settings file - self.common.log("ModeSettings", "load", f"creating {self.filename}") - self.fill_in_defaults() - self.just_created = True - - def save(self): - # Save persistent setting to disk - if not self.get("persistent", "enabled"): - return - - if self.filename: - with open(self.filename, "w") as file: - file.write(json.dumps(self._settings, indent=2)) - - def delete(self): - # Delete the file from disk - if os.path.exists(self.filename): - os.remove(self.filename) diff --git a/desktop/onionshare/onion.py b/desktop/onionshare/onion.py deleted file mode 100644 index c66c0df4..00000000 --- a/desktop/onionshare/onion.py +++ /dev/null @@ -1,775 +0,0 @@ -# -*- coding: utf-8 -*- -""" -OnionShare | https://onionshare.org/ - -Copyright (C) 2014-2020 Micah Lee, et al. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -""" - -from stem.control import Controller -from stem import ProtocolError, SocketClosed -from stem.connection import MissingPassword, UnreadableCookieFile, AuthenticationFailure -from Crypto.PublicKey import RSA -import base64, os, sys, tempfile, shutil, urllib, platform, subprocess, time, shlex - -from distutils.version import LooseVersion as Version -from . import common, strings -from .settings import Settings - - -class TorErrorAutomatic(Exception): - """ - OnionShare is failing to connect and authenticate to the Tor controller, - using automatic settings that should work with Tor Browser. - """ - - pass - - -class TorErrorInvalidSetting(Exception): - """ - This exception is raised if the settings just don't make sense. - """ - - pass - - -class TorErrorSocketPort(Exception): - """ - OnionShare can't connect to the Tor controller using the supplied address and port. - """ - - pass - - -class TorErrorSocketFile(Exception): - """ - OnionShare can't connect to the Tor controller using the supplied socket file. - """ - - pass - - -class TorErrorMissingPassword(Exception): - """ - OnionShare connected to the Tor controller, but it requires a password. - """ - - pass - - -class TorErrorUnreadableCookieFile(Exception): - """ - OnionShare connected to the Tor controller, but your user does not have permission - to access the cookie file. - """ - - pass - - -class TorErrorAuthError(Exception): - """ - OnionShare connected to the address and port, but can't authenticate. It's possible - that a Tor controller isn't listening on this port. - """ - - pass - - -class TorErrorProtocolError(Exception): - """ - This exception is raised if onionshare connects to the Tor controller, but it - isn't acting like a Tor controller (such as in Whonix). - """ - - pass - - -class TorTooOld(Exception): - """ - This exception is raised if onionshare needs to use a feature of Tor or stem - (like stealth ephemeral onion services) but the version you have installed - is too old. - """ - - pass - - -class BundledTorNotSupported(Exception): - """ - This exception is raised if onionshare is set to use the bundled Tor binary, - but it's not supported on that platform, or in dev mode. - """ - - -class BundledTorTimeout(Exception): - """ - This exception is raised if onionshare is set to use the bundled Tor binary, - but Tor doesn't finish connecting promptly. - """ - - -class BundledTorCanceled(Exception): - """ - This exception is raised if onionshare is set to use the bundled Tor binary, - and the user cancels connecting to Tor - """ - - -class BundledTorBroken(Exception): - """ - This exception is raised if onionshare is set to use the bundled Tor binary, - but the process seems to fail to run. - """ - - -class Onion(object): - """ - Onion is an abstraction layer for connecting to the Tor control port and - creating onion services. OnionShare supports creating onion services by - connecting to the Tor controller and using ADD_ONION, DEL_ONION. - - stealth: Should the onion service be stealth? - - settings: A Settings object. If it's not passed in, load from disk. - - bundled_connection_func: If the tor connection type is bundled, optionally - call this function and pass in a status string while connecting to tor. This - is necessary for status updates to reach the GUI. - """ - - def __init__(self, common, use_tmp_dir=False): - self.common = common - self.common.log("Onion", "__init__") - - self.use_tmp_dir = use_tmp_dir - - # Is bundled tor supported? - if ( - self.common.platform == "Windows" or self.common.platform == "Darwin" - ) and getattr(sys, "onionshare_dev_mode", False): - self.bundle_tor_supported = False - else: - self.bundle_tor_supported = True - - # Set the path of the tor binary, for bundled tor - ( - self.tor_path, - self.tor_geo_ip_file_path, - self.tor_geo_ipv6_file_path, - self.obfs4proxy_file_path, - ) = self.common.get_tor_paths() - - # The tor process - self.tor_proc = None - - # The Tor controller - self.c = None - - # Start out not connected to Tor - self.connected_to_tor = False - - # Assigned later if we are using stealth mode - self.auth_string = None - - def connect( - self, - custom_settings=None, - config=None, - tor_status_update_func=None, - connect_timeout=120, - local_only=False, - ): - if local_only: - self.common.log( - "Onion", "connect", "--local-only, so skip trying to connect" - ) - return - - self.common.log("Onion", "connect") - - # Either use settings that are passed in, or use them from common - if custom_settings: - self.settings = custom_settings - elif config: - self.common.load_settings(config) - self.settings = self.common.settings - else: - self.common.load_settings() - self.settings = self.common.settings - - strings.load_strings(self.common) - - # The Tor controller - self.c = None - - if self.settings.get("connection_type") == "bundled": - if not self.bundle_tor_supported: - raise BundledTorNotSupported( - strings._("settings_error_bundled_tor_not_supported") - ) - - # Create a torrc for this session - if self.use_tmp_dir: - self.tor_data_directory = tempfile.TemporaryDirectory( - dir=self.common.build_tmp_dir() - ) - self.tor_data_directory_name = self.tor_data_directory.name - else: - self.tor_data_directory_name = self.common.build_tor_dir() - self.common.log( - "Onion", - "connect", - f"tor_data_directory_name={self.tor_data_directory_name}", - ) - - # Create the torrc - with open(self.common.get_resource_path("torrc_template")) as f: - torrc_template = f.read() - self.tor_cookie_auth_file = os.path.join( - self.tor_data_directory_name, "cookie" - ) - try: - self.tor_socks_port = self.common.get_available_port(1000, 65535) - except: - raise OSError(strings._("no_available_port")) - self.tor_torrc = os.path.join(self.tor_data_directory_name, "torrc") - - if self.common.platform == "Windows" or self.common.platform == "Darwin": - # Windows doesn't support unix sockets, so it must use a network port. - # macOS can't use unix sockets either because socket filenames are limited to - # 100 chars, and the macOS sandbox forces us to put the socket file in a place - # with a really long path. - torrc_template += "ControlPort {{control_port}}\n" - try: - self.tor_control_port = self.common.get_available_port(1000, 65535) - except: - raise OSError(strings._("no_available_port")) - self.tor_control_socket = None - else: - # Linux and BSD can use unix sockets - torrc_template += "ControlSocket {{control_socket}}\n" - self.tor_control_port = None - self.tor_control_socket = os.path.join( - self.tor_data_directory_name, "control_socket" - ) - - torrc_template = torrc_template.replace( - "{{data_directory}}", self.tor_data_directory_name - ) - torrc_template = torrc_template.replace( - "{{control_port}}", str(self.tor_control_port) - ) - torrc_template = torrc_template.replace( - "{{control_socket}}", str(self.tor_control_socket) - ) - torrc_template = torrc_template.replace( - "{{cookie_auth_file}}", self.tor_cookie_auth_file - ) - torrc_template = torrc_template.replace( - "{{geo_ip_file}}", self.tor_geo_ip_file_path - ) - torrc_template = torrc_template.replace( - "{{geo_ipv6_file}}", self.tor_geo_ipv6_file_path - ) - torrc_template = torrc_template.replace( - "{{socks_port}}", str(self.tor_socks_port) - ) - - with open(self.tor_torrc, "w") as f: - f.write(torrc_template) - - # Bridge support - if self.settings.get("tor_bridges_use_obfs4"): - f.write( - f"ClientTransportPlugin obfs4 exec {self.obfs4proxy_file_path}\n" - ) - with open( - self.common.get_resource_path("torrc_template-obfs4") - ) as o: - for line in o: - f.write(line) - elif self.settings.get("tor_bridges_use_meek_lite_azure"): - f.write( - f"ClientTransportPlugin meek_lite exec {self.obfs4proxy_file_path}\n" - ) - with open( - self.common.get_resource_path("torrc_template-meek_lite_azure") - ) as o: - for line in o: - f.write(line) - - if self.settings.get("tor_bridges_use_custom_bridges"): - if "obfs4" in self.settings.get("tor_bridges_use_custom_bridges"): - f.write( - f"ClientTransportPlugin obfs4 exec {self.obfs4proxy_file_path}\n" - ) - elif "meek_lite" in self.settings.get( - "tor_bridges_use_custom_bridges" - ): - f.write( - f"ClientTransportPlugin meek_lite exec {self.obfs4proxy_file_path}\n" - ) - f.write(self.settings.get("tor_bridges_use_custom_bridges")) - f.write("\nUseBridges 1") - - # Execute a tor subprocess - start_ts = time.time() - if self.common.platform == "Windows": - # In Windows, hide console window when opening tor.exe subprocess - startupinfo = subprocess.STARTUPINFO() - startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW - self.tor_proc = subprocess.Popen( - [self.tor_path, "-f", self.tor_torrc], - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - startupinfo=startupinfo, - ) - else: - self.tor_proc = subprocess.Popen( - [self.tor_path, "-f", self.tor_torrc], - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - ) - - # Wait for the tor controller to start - time.sleep(2) - - # Connect to the controller - try: - if ( - self.common.platform == "Windows" - or self.common.platform == "Darwin" - ): - self.c = Controller.from_port(port=self.tor_control_port) - self.c.authenticate() - else: - self.c = Controller.from_socket_file(path=self.tor_control_socket) - self.c.authenticate() - except Exception as e: - raise BundledTorBroken( - strings._("settings_error_bundled_tor_broken").format(e.args[0]) - ) - - while True: - try: - res = self.c.get_info("status/bootstrap-phase") - except SocketClosed: - raise BundledTorCanceled() - - res_parts = shlex.split(res) - progress = res_parts[2].split("=")[1] - summary = res_parts[4].split("=")[1] - - # "\033[K" clears the rest of the line - print( - f"\rConnecting to the Tor network: {progress}% - {summary}\033[K", - end="", - ) - - if callable(tor_status_update_func): - if not tor_status_update_func(progress, summary): - # If the dialog was canceled, stop connecting to Tor - self.common.log( - "Onion", - "connect", - "tor_status_update_func returned false, canceling connecting to Tor", - ) - print() - return False - - if summary == "Done": - print("") - break - time.sleep(0.2) - - # If using bridges, it might take a bit longer to connect to Tor - if ( - self.settings.get("tor_bridges_use_custom_bridges") - or self.settings.get("tor_bridges_use_obfs4") - or self.settings.get("tor_bridges_use_meek_lite_azure") - ): - # Only override timeout if a custom timeout has not been passed in - if connect_timeout == 120: - connect_timeout = 150 - if time.time() - start_ts > connect_timeout: - print("") - try: - self.tor_proc.terminate() - raise BundledTorTimeout( - strings._("settings_error_bundled_tor_timeout") - ) - except FileNotFoundError: - pass - - elif self.settings.get("connection_type") == "automatic": - # Automatically try to guess the right way to connect to Tor Browser - - # Try connecting to control port - found_tor = False - - # If the TOR_CONTROL_PORT environment variable is set, use that - env_port = os.environ.get("TOR_CONTROL_PORT") - if env_port: - try: - self.c = Controller.from_port(port=int(env_port)) - found_tor = True - except: - pass - - else: - # Otherwise, try default ports for Tor Browser, Tor Messenger, and system tor - try: - ports = [9151, 9153, 9051] - for port in ports: - self.c = Controller.from_port(port=port) - found_tor = True - except: - pass - - # If this still didn't work, try guessing the default socket file path - socket_file_path = "" - if not found_tor: - try: - if self.common.platform == "Darwin": - socket_file_path = os.path.expanduser( - "~/Library/Application Support/TorBrowser-Data/Tor/control.socket" - ) - - self.c = Controller.from_socket_file(path=socket_file_path) - found_tor = True - except: - pass - - # If connecting to default control ports failed, so let's try - # guessing the socket file name next - if not found_tor: - try: - if self.common.platform == "Linux" or self.common.platform == "BSD": - socket_file_path = ( - f"/run/user/{os.geteuid()}/Tor/control.socket" - ) - elif self.common.platform == "Darwin": - socket_file_path = ( - f"/run/user/{os.geteuid()}/Tor/control.socket" - ) - elif self.common.platform == "Windows": - # Windows doesn't support unix sockets - raise TorErrorAutomatic(strings._("settings_error_automatic")) - - self.c = Controller.from_socket_file(path=socket_file_path) - - except: - raise TorErrorAutomatic(strings._("settings_error_automatic")) - - # Try authenticating - try: - self.c.authenticate() - except: - raise TorErrorAutomatic(strings._("settings_error_automatic")) - - else: - # Use specific settings to connect to tor - - # Try connecting - try: - if self.settings.get("connection_type") == "control_port": - self.c = Controller.from_port( - address=self.settings.get("control_port_address"), - port=self.settings.get("control_port_port"), - ) - elif self.settings.get("connection_type") == "socket_file": - self.c = Controller.from_socket_file( - path=self.settings.get("socket_file_path") - ) - else: - raise TorErrorInvalidSetting(strings._("settings_error_unknown")) - - except: - if self.settings.get("connection_type") == "control_port": - raise TorErrorSocketPort( - strings._("settings_error_socket_port").format( - self.settings.get("control_port_address"), - self.settings.get("control_port_port"), - ) - ) - else: - raise TorErrorSocketFile( - strings._("settings_error_socket_file").format( - self.settings.get("socket_file_path") - ) - ) - - # Try authenticating - try: - if self.settings.get("auth_type") == "no_auth": - self.c.authenticate() - elif self.settings.get("auth_type") == "password": - self.c.authenticate(self.settings.get("auth_password")) - else: - raise TorErrorInvalidSetting(strings._("settings_error_unknown")) - - except MissingPassword: - raise TorErrorMissingPassword( - strings._("settings_error_missing_password") - ) - except UnreadableCookieFile: - raise TorErrorUnreadableCookieFile( - strings._("settings_error_unreadable_cookie_file") - ) - except AuthenticationFailure: - raise TorErrorAuthError( - strings._("settings_error_auth").format( - self.settings.get("control_port_address"), - self.settings.get("control_port_port"), - ) - ) - - # If we made it this far, we should be connected to Tor - self.connected_to_tor = True - - # Get the tor version - self.tor_version = self.c.get_version().version_str - self.common.log("Onion", "connect", f"Connected to tor {self.tor_version}") - - # Do the versions of stem and tor that I'm using support ephemeral onion services? - list_ephemeral_hidden_services = getattr( - self.c, "list_ephemeral_hidden_services", None - ) - self.supports_ephemeral = ( - callable(list_ephemeral_hidden_services) and self.tor_version >= "0.2.7.1" - ) - - # Do the versions of stem and tor that I'm using support stealth onion services? - try: - res = self.c.create_ephemeral_hidden_service( - {1: 1}, - basic_auth={"onionshare": None}, - await_publication=False, - key_type="NEW", - key_content="RSA1024", - ) - tmp_service_id = res.service_id - self.c.remove_ephemeral_hidden_service(tmp_service_id) - self.supports_stealth = True - except: - # ephemeral stealth onion services are not supported - self.supports_stealth = False - - # Does this version of Tor support next-gen ('v3') onions? - # Note, this is the version of Tor where this bug was fixed: - # https://trac.torproject.org/projects/tor/ticket/28619 - self.supports_v3_onions = self.tor_version >= Version("0.3.5.7") - - def is_authenticated(self): - """ - Returns True if the Tor connection is still working, or False otherwise. - """ - if self.c is not None: - return self.c.is_authenticated() - else: - return False - - def start_onion_service(self, mode_settings, port, await_publication): - """ - Start a onion service on port 80, pointing to the given port, and - return the onion hostname. - """ - self.common.log("Onion", "start_onion_service", f"port={port}") - - if not self.supports_ephemeral: - raise TorTooOld(strings._("error_ephemeral_not_supported")) - if mode_settings.get("general", "client_auth") and not self.supports_stealth: - raise TorTooOld(strings._("error_stealth_not_supported")) - - auth_cookie = None - if mode_settings.get("general", "client_auth"): - if mode_settings.get("onion", "hidservauth_string"): - auth_cookie = mode_settings.get("onion", "hidservauth_string").split()[ - 2 - ] - if auth_cookie: - basic_auth = {"onionshare": auth_cookie} - else: - # If we had neither a scheduled auth cookie or a persistent hidservauth string, - # set the cookie to 'None', which means Tor will create one for us - basic_auth = {"onionshare": None} - else: - # Not using client auth at all - basic_auth = None - - if mode_settings.get("onion", "private_key"): - key_content = mode_settings.get("onion", "private_key") - if self.is_v2_key(key_content): - key_type = "RSA1024" - else: - # Assume it was a v3 key. Stem will throw an error if it's something illegible - key_type = "ED25519-V3" - else: - key_type = "NEW" - # Work out if we can support v3 onion services, which are preferred - if self.supports_v3_onions and not mode_settings.get("general", "legacy"): - key_content = "ED25519-V3" - else: - # fall back to v2 onion services - key_content = "RSA1024" - - # v3 onions don't yet support basic auth. Our ticket: - # https://github.com/micahflee/onionshare/issues/697 - if ( - key_type == "NEW" - and key_content == "ED25519-V3" - and not mode_settings.get("general", "legacy") - ): - basic_auth = None - - debug_message = f"key_type={key_type}" - if key_type == "NEW": - debug_message += f", key_content={key_content}" - self.common.log("Onion", "start_onion_service", debug_message) - try: - res = self.c.create_ephemeral_hidden_service( - {80: port}, - await_publication=await_publication, - basic_auth=basic_auth, - key_type=key_type, - key_content=key_content, - ) - - except ProtocolError as e: - raise TorErrorProtocolError( - strings._("error_tor_protocol_error").format(e.args[0]) - ) - - onion_host = res.service_id + ".onion" - - # Save the service_id - mode_settings.set("general", "service_id", res.service_id) - - # Save the private key and hidservauth string - if not mode_settings.get("onion", "private_key"): - mode_settings.set("onion", "private_key", res.private_key) - if mode_settings.get("general", "client_auth") and not mode_settings.get( - "onion", "hidservauth_string" - ): - auth_cookie = list(res.client_auth.values())[0] - self.auth_string = f"HidServAuth {onion_host} {auth_cookie}" - mode_settings.set("onion", "hidservauth_string", self.auth_string) - - return onion_host - - def stop_onion_service(self, mode_settings): - """ - Stop a specific onion service - """ - onion_host = mode_settings.get("general", "service_id") - if onion_host: - self.common.log("Onion", "stop_onion_service", f"onion host: {onion_host}") - try: - self.c.remove_ephemeral_hidden_service( - mode_settings.get("general", "service_id") - ) - except: - self.common.log( - "Onion", "stop_onion_service", f"failed to remove {onion_host}" - ) - - def cleanup(self, stop_tor=True): - """ - Stop onion services that were created earlier. If there's a tor subprocess running, kill it. - """ - self.common.log("Onion", "cleanup") - - # Cleanup the ephemeral onion services, if we have any - try: - onions = self.c.list_ephemeral_hidden_services() - for service_id in onions: - onion_host = f"{service_id}.onion" - try: - self.common.log( - "Onion", "cleanup", f"trying to remove onion {onion_host}" - ) - self.c.remove_ephemeral_hidden_service(service_id) - except: - self.common.log( - "Onion", "cleanup", f"failed to remove onion {onion_host}" - ) - pass - except: - pass - - if stop_tor: - # Stop tor process - if self.tor_proc: - self.tor_proc.terminate() - time.sleep(0.2) - if self.tor_proc.poll() is None: - self.common.log( - "Onion", - "cleanup", - "Tried to terminate tor process but it's still running", - ) - try: - self.tor_proc.kill() - time.sleep(0.2) - if self.tor_proc.poll() is None: - self.common.log( - "Onion", - "cleanup", - "Tried to kill tor process but it's still running", - ) - except: - self.common.log( - "Onion", "cleanup", "Exception while killing tor process" - ) - self.tor_proc = None - - # Reset other Onion settings - self.connected_to_tor = False - - try: - # Delete the temporary tor data directory - if self.use_tmp_dir: - self.tor_data_directory.cleanup() - except: - pass - - def get_tor_socks_port(self): - """ - Returns a (address, port) tuple for the Tor SOCKS port - """ - self.common.log("Onion", "get_tor_socks_port") - - if self.settings.get("connection_type") == "bundled": - return ("127.0.0.1", self.tor_socks_port) - elif self.settings.get("connection_type") == "automatic": - return ("127.0.0.1", 9150) - else: - return (self.settings.get("socks_address"), self.settings.get("socks_port")) - - def is_v2_key(self, key): - """ - Helper function for determining if a key is RSA1024 (v2) or not. - """ - try: - # Import the key - key = RSA.importKey(base64.b64decode(key)) - # Is this a v2 Onion key? (1024 bits) If so, we should keep using it. - if key.n.bit_length() == 1024: - return True - else: - return False - except: - return False diff --git a/desktop/onionshare/onionshare.py b/desktop/onionshare/onionshare.py deleted file mode 100644 index 25c8ad90..00000000 --- a/desktop/onionshare/onionshare.py +++ /dev/null @@ -1,111 +0,0 @@ -# -*- coding: utf-8 -*- -""" -OnionShare | https://onionshare.org/ - -Copyright (C) 2014-2020 Micah Lee, et al. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -""" - -import os, shutil - -from . import common, strings -from .onion import TorTooOld, TorErrorProtocolError -from .common import AutoStopTimer - - -class OnionShare(object): - """ - OnionShare is the main application class. Pass in options and run - start_onion_service and it will do the magic. - """ - - def __init__(self, common, onion, local_only=False, autostop_timer=0): - self.common = common - - self.common.log("OnionShare", "__init__") - - # The Onion object - self.onion = onion - - self.hidserv_dir = None - self.onion_host = None - self.port = None - - # files and dirs to delete on shutdown - self.cleanup_filenames = [] - - # do not use tor -- for development - self.local_only = local_only - - # optionally shut down after N hours - self.autostop_timer = autostop_timer - # init auto-stop timer thread - self.autostop_timer_thread = None - - def choose_port(self): - """ - Choose a random port. - """ - try: - self.port = self.common.get_available_port(17600, 17650) - except: - raise OSError(strings._("no_available_port")) - - def start_onion_service(self, mode_settings, await_publication=True): - """ - Start the onionshare onion service. - """ - self.common.log("OnionShare", "start_onion_service") - - if not self.port: - self.choose_port() - - if self.autostop_timer > 0: - self.autostop_timer_thread = AutoStopTimer(self.common, self.autostop_timer) - - if self.local_only: - self.onion_host = f"127.0.0.1:{self.port}" - return - - self.onion_host = self.onion.start_onion_service( - mode_settings, self.port, await_publication - ) - - if mode_settings.get("general", "client_auth"): - self.auth_string = self.onion.auth_string - - def stop_onion_service(self, mode_settings): - """ - Stop the onion service - """ - self.onion.stop_onion_service(mode_settings) - - def cleanup(self): - """ - Shut everything down and clean up temporary files, etc. - """ - self.common.log("OnionShare", "cleanup") - - # Cleanup files - try: - for filename in self.cleanup_filenames: - if os.path.isfile(filename): - os.remove(filename) - elif os.path.isdir(filename): - shutil.rmtree(filename) - except: - # Don't crash if file is still in use - pass - self.cleanup_filenames = [] diff --git a/desktop/onionshare/settings.py b/desktop/onionshare/settings.py deleted file mode 100644 index 6b6ed6ab..00000000 --- a/desktop/onionshare/settings.py +++ /dev/null @@ -1,199 +0,0 @@ -# -*- coding: utf-8 -*- -""" -OnionShare | https://onionshare.org/ - -Copyright (C) 2014-2020 Micah Lee, et al. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -""" - -import json -import os -import platform -import locale - -try: - # We only need pwd module in macOS, and it's not available in Windows - import pwd -except: - pass - -from . import strings - - -class Settings(object): - """ - This class stores all of the settings for OnionShare, specifically for how - to connect to Tor. If it can't find the settings file, it uses the default, - which is to attempt to connect automatically using default Tor Browser - settings. - """ - - def __init__(self, common, config=False): - self.common = common - - self.common.log("Settings", "__init__") - - # If a readable config file was provided, use that instead - if config: - if os.path.isfile(config): - self.filename = config - else: - self.common.log( - "Settings", - "__init__", - "Supplied config does not exist or is unreadable. Falling back to default location", - ) - self.filename = self.build_filename() - - else: - # Default config - self.filename = self.build_filename() - - # Dictionary of available languages in this version of OnionShare, - # mapped to the language name, in that language - self.available_locales = { - "ar": "العربية", # Arabic - #'bn': 'বাংলা', # Bengali (commented out because not at 90% translation) - "ca": "Català", # Catalan - "zh_Hant": "正體中文 (繁體)", # Traditional Chinese - "zh_Hans": "中文 (简体)", # Simplified Chinese - "da": "Dansk", # Danish - "nl": "Nederlands", # Dutch - "en": "English", # English - # "fi": "Suomi", # Finnish (commented out because not at 90% translation) - "fr": "Français", # French - "de": "Deutsch", # German - "el": "Ελληνικά", # Greek - "is": "Íslenska", # Icelandic - "ga": "Gaeilge", # Irish - "it": "Italiano", # Italian - "ja": "日本語", # Japanese - "nb_NO": "Norsk Bokmål", # Norwegian Bokmål - "fa": "فارسی", # Persian - "pl": "Polski", # Polish - "pt_BR": "Português (Brasil)", # Portuguese Brazil - "pt_PT": "Português (Portugal)", # Portuguese Portugal - "ro": "Română", # Romanian - "ru": "Русский", # Russian - "sr_Latn": "Srpska (latinica)", # Serbian (latin) - "es": "Español", # Spanish - "sv": "Svenska", # Swedish - "te": "తెలుగు", # Telugu - "tr": "Türkçe", # Turkish - "uk": "Українська", # Ukrainian - } - - # These are the default settings. They will get overwritten when loading from disk - self.default_settings = { - "version": self.common.version, - "connection_type": "bundled", - "control_port_address": "127.0.0.1", - "control_port_port": 9051, - "socks_address": "127.0.0.1", - "socks_port": 9050, - "socket_file_path": "/var/run/tor/control", - "auth_type": "no_auth", - "auth_password": "", - "use_autoupdate": True, - "autoupdate_timestamp": None, - "no_bridges": True, - "tor_bridges_use_obfs4": False, - "tor_bridges_use_meek_lite_azure": False, - "tor_bridges_use_custom_bridges": "", - "persistent_tabs": [], - "locale": None, # this gets defined in fill_in_defaults() - } - self._settings = {} - self.fill_in_defaults() - - def fill_in_defaults(self): - """ - If there are any missing settings from self._settings, replace them with - their default values. - """ - for key in self.default_settings: - if key not in self._settings: - self._settings[key] = self.default_settings[key] - - # Choose the default locale based on the OS preference, and fall-back to English - if self._settings["locale"] is None: - language_code, encoding = locale.getdefaultlocale() - - # Default to English - if not language_code: - language_code = "en_US" - - if language_code == "pt_PT" and language_code == "pt_BR": - # Portuguese locales include country code - default_locale = language_code - else: - # All other locales cut off the country code - default_locale = language_code[:2] - - if default_locale not in self.available_locales: - default_locale = "en" - self._settings["locale"] = default_locale - - def build_filename(self): - """ - Returns the path of the settings file. - """ - return os.path.join(self.common.build_data_dir(), "onionshare.json") - - def load(self): - """ - Load the settings from file. - """ - self.common.log("Settings", "load") - - # If the settings file exists, load it - if os.path.exists(self.filename): - try: - self.common.log("Settings", "load", f"Trying to load {self.filename}") - with open(self.filename, "r") as f: - self._settings = json.load(f) - self.fill_in_defaults() - except: - pass - - # Make sure data_dir exists - try: - os.makedirs(self.get("data_dir"), exist_ok=True) - except: - pass - - def save(self): - """ - Save settings to file. - """ - self.common.log("Settings", "save") - open(self.filename, "w").write(json.dumps(self._settings, indent=2)) - self.common.log("Settings", "save", f"Settings saved in {self.filename}") - - def get(self, key): - return self._settings[key] - - def set(self, key, val): - # If typecasting int values fails, fallback to default values - if key == "control_port_port" or key == "socks_port": - try: - val = int(val) - except: - if key == "control_port_port": - val = self.default_settings["control_port_port"] - elif key == "socks_port": - val = self.default_settings["socks_port"] - - self._settings[key] = val diff --git a/desktop/onionshare/web/__init__.py b/desktop/onionshare/web/__init__.py deleted file mode 100644 index f036d011..00000000 --- a/desktop/onionshare/web/__init__.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -""" -OnionShare | https://onionshare.org/ - -Copyright (C) 2014-2020 Micah Lee, et al. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -""" - -from .web import Web diff --git a/desktop/onionshare/web/chat_mode.py b/desktop/onionshare/web/chat_mode.py deleted file mode 100644 index 15e236d3..00000000 --- a/desktop/onionshare/web/chat_mode.py +++ /dev/null @@ -1,159 +0,0 @@ -# -*- coding: utf-8 -*- -""" -OnionShare | https://onionshare.org/ - -Copyright (C) 2014-2020 Micah Lee, et al. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -""" - -from flask import ( - Request, - request, - render_template, - make_response, - jsonify, - redirect, - session, -) -from werkzeug.utils import secure_filename -from flask_socketio import emit, join_room, leave_room - - -class ChatModeWeb: - """ - All of the web logic for chat mode - """ - - def __init__(self, common, web): - self.common = common - self.common.log("ChatModeWeb", "__init__") - - self.web = web - - # This tracks users in the room - self.connected_users = [] - - # This tracks the history id - self.cur_history_id = 0 - - self.define_routes() - - def define_routes(self): - """ - The web app routes for chatting - """ - - @self.web.app.route("/") - def index(): - history_id = self.cur_history_id - self.cur_history_id += 1 - session["name"] = ( - session.get("name") - if session.get("name") - else self.common.build_username() - ) - session["room"] = self.web.settings.default_settings["chat"]["room"] - self.web.add_request( - request.path, {"id": history_id, "status_code": 200}, - ) - - self.web.add_request(self.web.REQUEST_LOAD, request.path) - r = make_response( - render_template( - "chat.html", - static_url_path=self.web.static_url_path, - username=session.get("name"), - ) - ) - return self.web.add_security_headers(r) - - @self.web.app.route("/update-session-username", methods=["POST"]) - def update_session_username(): - history_id = self.cur_history_id - data = request.get_json() - if data.get("username", "") not in self.connected_users: - session["name"] = data.get("username", session.get("name")) - self.web.add_request( - request.path, {"id": history_id, "status_code": 200}, - ) - - self.web.add_request(self.web.REQUEST_LOAD, request.path) - r = make_response(jsonify(username=session.get("name"), success=True,)) - return self.web.add_security_headers(r) - - @self.web.socketio.on("joined", namespace="/chat") - def joined(message): - """Sent by clients when they enter a room. - A status message is broadcast to all people in the room.""" - self.connected_users.append(session.get("name")) - join_room(session.get("room")) - emit( - "status", - { - "username": session.get("name"), - "msg": "{} has joined.".format(session.get("name")), - "connected_users": self.connected_users, - "user": session.get("name"), - }, - room=session.get("room"), - ) - - @self.web.socketio.on("text", namespace="/chat") - def text(message): - """Sent by a client when the user entered a new message. - The message is sent to all people in the room.""" - emit( - "message", - {"username": session.get("name"), "msg": message["msg"]}, - room=session.get("room"), - ) - - @self.web.socketio.on("update_username", namespace="/chat") - def update_username(message): - """Sent by a client when the user updates their username. - The message is sent to all people in the room.""" - current_name = session.get("name") - if message["username"] not in self.connected_users: - session["name"] = message["username"] - self.connected_users[ - self.connected_users.index(current_name) - ] = session.get("name") - emit( - "status", - { - "msg": "{} has updated their username to: {}".format( - current_name, session.get("name") - ), - "connected_users": self.connected_users, - "old_name": current_name, - "new_name": session.get("name"), - }, - room=session.get("room"), - ) - - @self.web.socketio.on("disconnect", namespace="/chat") - def disconnect(): - """Sent by clients when they disconnect from a room. - A status message is broadcast to all people in the room.""" - self.connected_users.remove(session.get("name")) - leave_room(session.get("room")) - emit( - "status", - { - "msg": "{} has left the room.".format(session.get("name")), - "connected_users": self.connected_users, - }, - room=session.get("room"), - ) diff --git a/desktop/onionshare/web/receive_mode.py b/desktop/onionshare/web/receive_mode.py deleted file mode 100644 index a9876c40..00000000 --- a/desktop/onionshare/web/receive_mode.py +++ /dev/null @@ -1,492 +0,0 @@ -# -*- coding: utf-8 -*- -""" -OnionShare | https://onionshare.org/ - -Copyright (C) 2014-2020 Micah Lee, et al. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -""" - -import os -import tempfile -import json -from datetime import datetime -from flask import Request, request, render_template, make_response, flash, redirect -from werkzeug.utils import secure_filename - -from .. import strings - - -class ReceiveModeWeb: - """ - All of the web logic for receive mode - """ - - def __init__(self, common, web): - self.common = common - self.common.log("ReceiveModeWeb", "__init__") - - self.web = web - - self.can_upload = True - self.uploads_in_progress = [] - - # This tracks the history id - self.cur_history_id = 0 - - self.define_routes() - - def define_routes(self): - """ - The web app routes for receiving files - """ - - @self.web.app.route("/") - def index(): - history_id = self.cur_history_id - self.cur_history_id += 1 - self.web.add_request( - self.web.REQUEST_INDIVIDUAL_FILE_STARTED, - request.path, - {"id": history_id, "status_code": 200}, - ) - - self.web.add_request(self.web.REQUEST_LOAD, request.path) - r = make_response( - render_template( - "receive.html", static_url_path=self.web.static_url_path - ) - ) - return self.web.add_security_headers(r) - - @self.web.app.route("/upload", methods=["POST"]) - def upload(ajax=False): - """ - Handle the upload files POST request, though at this point, the files have - already been uploaded and saved to their correct locations. - """ - files = request.files.getlist("file[]") - filenames = [] - for f in files: - if f.filename != "": - filename = secure_filename(f.filename) - filenames.append(filename) - local_path = os.path.join(request.receive_mode_dir, filename) - basename = os.path.basename(local_path) - - # Tell the GUI the receive mode directory for this file - self.web.add_request( - self.web.REQUEST_UPLOAD_SET_DIR, - request.path, - { - "id": request.history_id, - "filename": basename, - "dir": request.receive_mode_dir, - }, - ) - - self.common.log( - "ReceiveModeWeb", - "define_routes", - f"/upload, uploaded {f.filename}, saving to {local_path}", - ) - print(f"\nReceived: {local_path}") - - if request.upload_error: - self.common.log( - "ReceiveModeWeb", - "define_routes", - "/upload, there was an upload error", - ) - - self.web.add_request( - self.web.REQUEST_ERROR_DATA_DIR_CANNOT_CREATE, - request.path, - {"receive_mode_dir": request.receive_mode_dir}, - ) - print( - f"Could not create OnionShare data folder: {request.receive_mode_dir}" - ) - - msg = "Error uploading, please inform the OnionShare user" - if ajax: - return json.dumps({"error_flashes": [msg]}) - else: - flash(msg, "error") - return redirect("/") - - # Note that flash strings are in English, and not translated, on purpose, - # to avoid leaking the locale of the OnionShare user - if ajax: - info_flashes = [] - - if len(filenames) == 0: - msg = "No files uploaded" - if ajax: - info_flashes.append(msg) - else: - flash(msg, "info") - else: - msg = "Sent " - for filename in filenames: - msg += f"{filename}, " - msg = msg.rstrip(", ") - if ajax: - info_flashes.append(msg) - else: - flash(msg, "info") - - if self.can_upload: - if ajax: - return json.dumps({"info_flashes": info_flashes}) - else: - return redirect("/") - else: - if ajax: - return json.dumps( - { - "new_body": render_template( - "thankyou.html", - static_url_path=self.web.static_url_path, - ) - } - ) - else: - # It was the last upload and the timer ran out - r = make_response( - render_template("thankyou.html"), - static_url_path=self.web.static_url_path, - ) - return self.web.add_security_headers(r) - - @self.web.app.route("/upload-ajax", methods=["POST"]) - def upload_ajax_public(): - if not self.can_upload: - return self.web.error403() - return upload(ajax=True) - - -class ReceiveModeWSGIMiddleware(object): - """ - Custom WSGI middleware in order to attach the Web object to environ, so - ReceiveModeRequest can access it. - """ - - def __init__(self, app, web): - self.app = app - self.web = web - - def __call__(self, environ, start_response): - environ["web"] = self.web - environ["stop_q"] = self.web.stop_q - return self.app(environ, start_response) - - -class ReceiveModeFile(object): - """ - A custom file object that tells ReceiveModeRequest every time data gets - written to it, in order to track the progress of uploads. It starts out with - a .part file extension, and when it's complete it removes that extension. - """ - - def __init__(self, request, filename, write_func, close_func): - self.onionshare_request = request - self.onionshare_filename = filename - self.onionshare_write_func = write_func - self.onionshare_close_func = close_func - - self.filename = os.path.join(self.onionshare_request.receive_mode_dir, filename) - self.filename_in_progress = f"{self.filename}.part" - - # Open the file - self.upload_error = False - try: - self.f = open(self.filename_in_progress, "wb+") - except: - # This will only happen if someone is messing with the data dir while - # OnionShare is running, but if it does make sure to throw an error - self.upload_error = True - self.f = tempfile.TemporaryFile("wb+") - - # Make all the file-like methods and attributes actually access the - # TemporaryFile, except for write - attrs = [ - "closed", - "detach", - "fileno", - "flush", - "isatty", - "mode", - "name", - "peek", - "raw", - "read", - "read1", - "readable", - "readinto", - "readinto1", - "readline", - "readlines", - "seek", - "seekable", - "tell", - "truncate", - "writable", - "writelines", - ] - for attr in attrs: - setattr(self, attr, getattr(self.f, attr)) - - def write(self, b): - """ - Custom write method that calls out to onionshare_write_func - """ - if self.upload_error or (not self.onionshare_request.stop_q.empty()): - self.close() - self.onionshare_request.close() - return - - try: - bytes_written = self.f.write(b) - self.onionshare_write_func(self.onionshare_filename, bytes_written) - - except: - self.upload_error = True - - def close(self): - """ - Custom close method that calls out to onionshare_close_func - """ - try: - self.f.close() - - if not self.upload_error: - # Rename the in progress file to the final filename - os.rename(self.filename_in_progress, self.filename) - - except: - self.upload_error = True - - self.onionshare_close_func(self.onionshare_filename, self.upload_error) - - -class ReceiveModeRequest(Request): - """ - A custom flask Request object that keeps track of how much data has been - uploaded for each file, for receive mode. - """ - - def __init__(self, environ, populate_request=True, shallow=False): - super(ReceiveModeRequest, self).__init__(environ, populate_request, shallow) - self.web = environ["web"] - self.stop_q = environ["stop_q"] - - self.web.common.log("ReceiveModeRequest", "__init__") - - # Prevent running the close() method more than once - self.closed = False - - # Is this a valid upload request? - self.upload_request = False - if self.method == "POST": - if self.path == "/upload" or self.path == "/upload-ajax": - self.upload_request = True - - if self.upload_request: - # No errors yet - self.upload_error = False - - # Figure out what files should be saved - now = datetime.now() - date_dir = now.strftime("%Y-%m-%d") - time_dir = now.strftime("%H.%M.%S") - self.receive_mode_dir = os.path.join( - self.web.settings.get("receive", "data_dir"), date_dir, time_dir - ) - - # Create that directory, which shouldn't exist yet - try: - os.makedirs(self.receive_mode_dir, 0o700, exist_ok=False) - except OSError: - # If this directory already exists, maybe someone else is uploading files at - # the same second, so use a different name in that case - if os.path.exists(self.receive_mode_dir): - # Keep going until we find a directory name that's available - i = 1 - while True: - new_receive_mode_dir = f"{self.receive_mode_dir}-{i}" - try: - os.makedirs(new_receive_mode_dir, 0o700, exist_ok=False) - self.receive_mode_dir = new_receive_mode_dir - break - except OSError: - pass - i += 1 - # Failsafe - if i == 100: - self.web.common.log( - "ReceiveModeRequest", - "__init__", - "Error finding available receive mode directory", - ) - self.upload_error = True - break - except PermissionError: - self.web.add_request( - self.web.REQUEST_ERROR_DATA_DIR_CANNOT_CREATE, - request.path, - {"receive_mode_dir": self.receive_mode_dir}, - ) - print( - f"Could not create OnionShare data folder: {self.receive_mode_dir}" - ) - self.web.common.log( - "ReceiveModeRequest", - "__init__", - "Permission denied creating receive mode directory", - ) - self.upload_error = True - - # If there's an error so far, finish early - if self.upload_error: - return - - # A dictionary that maps filenames to the bytes uploaded so far - self.progress = {} - - # Prevent new uploads if we've said so (timer expired) - if self.web.receive_mode.can_upload: - - # Create an history_id, attach it to the request - self.history_id = self.web.receive_mode.cur_history_id - self.web.receive_mode.cur_history_id += 1 - - # Figure out the content length - try: - self.content_length = int(self.headers["Content-Length"]) - except: - self.content_length = 0 - - date_str = datetime.now().strftime("%b %d, %I:%M%p") - size_str = self.web.common.human_readable_filesize(self.content_length) - print(f"{date_str}: Upload of total size {size_str} is starting") - - # Don't tell the GUI that a request has started until we start receiving files - self.told_gui_about_request = False - - self.previous_file = None - - def _get_file_stream( - self, total_content_length, content_type, filename=None, content_length=None - ): - """ - This gets called for each file that gets uploaded, and returns an file-like - writable stream. - """ - if self.upload_request: - if not self.told_gui_about_request: - # Tell the GUI about the request - self.web.add_request( - self.web.REQUEST_STARTED, - self.path, - {"id": self.history_id, "content_length": self.content_length}, - ) - self.web.receive_mode.uploads_in_progress.append(self.history_id) - - self.told_gui_about_request = True - - self.filename = secure_filename(filename) - - self.progress[self.filename] = {"uploaded_bytes": 0, "complete": False} - - f = ReceiveModeFile( - self, self.filename, self.file_write_func, self.file_close_func - ) - if f.upload_error: - self.web.common.log( - "ReceiveModeRequest", "_get_file_stream", "Error creating file" - ) - self.upload_error = True - return f - - def close(self): - """ - Closing the request. - """ - super(ReceiveModeRequest, self).close() - - # Prevent calling this method more than once per request - if self.closed: - return - self.closed = True - - self.web.common.log("ReceiveModeRequest", "close") - - try: - if self.told_gui_about_request: - history_id = self.history_id - - if ( - not self.web.stop_q.empty() - or not self.progress[self.filename]["complete"] - ): - # Inform the GUI that the upload has canceled - self.web.add_request( - self.web.REQUEST_UPLOAD_CANCELED, self.path, {"id": history_id} - ) - else: - # Inform the GUI that the upload has finished - self.web.add_request( - self.web.REQUEST_UPLOAD_FINISHED, self.path, {"id": history_id} - ) - self.web.receive_mode.uploads_in_progress.remove(history_id) - - except AttributeError: - pass - - def file_write_func(self, filename, length): - """ - This function gets called when a specific file is written to. - """ - if self.closed: - return - - if self.upload_request: - self.progress[filename]["uploaded_bytes"] += length - - if self.previous_file != filename: - self.previous_file = filename - - size_str = self.web.common.human_readable_filesize( - self.progress[filename]["uploaded_bytes"] - ) - print(f"\r=> {size_str} {filename} ", end="") - - # Update the GUI on the upload progress - if self.told_gui_about_request: - self.web.add_request( - self.web.REQUEST_PROGRESS, - self.path, - {"id": self.history_id, "progress": self.progress}, - ) - - def file_close_func(self, filename, upload_error=False): - """ - This function gets called when a specific file is closed. - """ - self.progress[filename]["complete"] = True - - # If the file tells us there was an upload error, let the request know as well - if upload_error: - self.upload_error = True diff --git a/desktop/onionshare/web/send_base_mode.py b/desktop/onionshare/web/send_base_mode.py deleted file mode 100644 index 9d5f876b..00000000 --- a/desktop/onionshare/web/send_base_mode.py +++ /dev/null @@ -1,323 +0,0 @@ -# -*- coding: utf-8 -*- -""" -OnionShare | https://onionshare.org/ - -Copyright (C) 2014-2020 Micah Lee, et al. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -""" - -import os -import sys -import tempfile -import mimetypes -import gzip -from flask import Response, request, render_template, make_response - -from .. import strings - - -class SendBaseModeWeb: - """ - All of the web logic shared between share and website mode (modes where the user sends files) - """ - - def __init__(self, common, web): - super(SendBaseModeWeb, self).__init__() - self.common = common - self.web = web - - # Information about the file to be shared - self.is_zipped = False - self.download_filename = None - self.download_filesize = None - self.gzip_filename = None - self.gzip_filesize = None - self.zip_writer = None - - # If autostop_sharing, only allow one download at a time - self.download_in_progress = False - - # This tracks the history id - self.cur_history_id = 0 - - self.define_routes() - self.init() - - def set_file_info(self, filenames, processed_size_callback=None): - """ - Build a data structure that describes the list of files - """ - # If there's just one folder, replace filenames with a list of files inside that folder - if len(filenames) == 1 and os.path.isdir(filenames[0]): - filenames = [ - os.path.join(filenames[0], x) for x in os.listdir(filenames[0]) - ] - - # Re-initialize - self.files = {} # Dictionary mapping file paths to filenames on disk - self.root_files = ( - {} - ) # This is only the root files and dirs, as opposed to all of them - self.cleanup_filenames = [] - self.cur_history_id = 0 - self.file_info = {"files": [], "dirs": []} - self.gzip_individual_files = {} - self.init() - - # Build the file list - for filename in filenames: - basename = os.path.basename(filename.rstrip("/")) - - # If it's a filename, add it - if os.path.isfile(filename): - self.files[basename] = filename - self.root_files[basename] = filename - - # If it's a directory, add it recursively - elif os.path.isdir(filename): - self.root_files[basename + "/"] = filename - - for root, _, nested_filenames in os.walk(filename): - # Normalize the root path. So if the directory name is "/home/user/Documents/some_folder", - # and it has a nested folder foobar, the root is "/home/user/Documents/some_folder/foobar". - # The normalized_root should be "some_folder/foobar" - normalized_root = os.path.join( - basename, root[len(filename) :].lstrip("/") - ).rstrip("/") - - # Add the dir itself - self.files[normalized_root + "/"] = root - - # Add the files in this dir - for nested_filename in nested_filenames: - self.files[ - os.path.join(normalized_root, nested_filename) - ] = os.path.join(root, nested_filename) - - self.set_file_info_custom(filenames, processed_size_callback) - - def directory_listing(self, filenames, path="", filesystem_path=None): - # Tell the GUI about the directory listing - history_id = self.cur_history_id - self.cur_history_id += 1 - self.web.add_request( - self.web.REQUEST_INDIVIDUAL_FILE_STARTED, - f"/{path}", - {"id": history_id, "method": request.method, "status_code": 200}, - ) - - breadcrumbs = [("☗", "/")] - parts = path.split("/")[:-1] - for i in range(len(parts)): - breadcrumbs.append((parts[i], f"/{'/'.join(parts[0 : i + 1])}/")) - breadcrumbs_leaf = breadcrumbs.pop()[0] - - # If filesystem_path is None, this is the root directory listing - files, dirs = self.build_directory_listing(filenames, filesystem_path) - r = self.directory_listing_template( - path, files, dirs, breadcrumbs, breadcrumbs_leaf - ) - return self.web.add_security_headers(r) - - def build_directory_listing(self, filenames, filesystem_path): - files = [] - dirs = [] - - for filename in filenames: - if filesystem_path: - this_filesystem_path = os.path.join(filesystem_path, filename) - else: - this_filesystem_path = self.files[filename] - - is_dir = os.path.isdir(this_filesystem_path) - - if is_dir: - dirs.append({"basename": filename}) - else: - size = os.path.getsize(this_filesystem_path) - size_human = self.common.human_readable_filesize(size) - files.append({"basename": filename, "size_human": size_human}) - return files, dirs - - def stream_individual_file(self, filesystem_path): - """ - Return a flask response that's streaming the download of an individual file, and gzip - compressing it if the browser supports it. - """ - use_gzip = self.should_use_gzip() - - # gzip compress the individual file, if it hasn't already been compressed - if use_gzip: - if filesystem_path not in self.gzip_individual_files: - gzip_filename = tempfile.mkstemp("wb+")[1] - self._gzip_compress(filesystem_path, gzip_filename, 6, None) - self.gzip_individual_files[filesystem_path] = gzip_filename - - # Make sure the gzip file gets cleaned up when onionshare stops - self.cleanup_filenames.append(gzip_filename) - - file_to_download = self.gzip_individual_files[filesystem_path] - filesize = os.path.getsize(self.gzip_individual_files[filesystem_path]) - else: - file_to_download = filesystem_path - filesize = os.path.getsize(filesystem_path) - - path = request.path - - # Tell GUI the individual file started - history_id = self.cur_history_id - self.cur_history_id += 1 - - # Only GET requests are allowed, any other method should fail - if request.method != "GET": - return self.web.error405(history_id) - - self.web.add_request( - self.web.REQUEST_INDIVIDUAL_FILE_STARTED, - path, - {"id": history_id, "filesize": filesize}, - ) - - def generate(): - chunk_size = 102400 # 100kb - - fp = open(file_to_download, "rb") - done = False - while not done: - chunk = fp.read(chunk_size) - if chunk == b"": - done = True - else: - try: - yield chunk - - # Tell GUI the progress - downloaded_bytes = fp.tell() - percent = (1.0 * downloaded_bytes / filesize) * 100 - if ( - not self.web.is_gui - or self.common.platform == "Linux" - or self.common.platform == "BSD" - ): - sys.stdout.write( - "\r{0:s}, {1:.2f}% ".format( - self.common.human_readable_filesize( - downloaded_bytes - ), - percent, - ) - ) - sys.stdout.flush() - - self.web.add_request( - self.web.REQUEST_INDIVIDUAL_FILE_PROGRESS, - path, - { - "id": history_id, - "bytes": downloaded_bytes, - "filesize": filesize, - }, - ) - done = False - except: - # Looks like the download was canceled - done = True - - # Tell the GUI the individual file was canceled - self.web.add_request( - self.web.REQUEST_INDIVIDUAL_FILE_CANCELED, - path, - {"id": history_id}, - ) - - fp.close() - - if self.common.platform != "Darwin": - sys.stdout.write("\n") - - basename = os.path.basename(filesystem_path) - - r = Response(generate()) - if use_gzip: - r.headers.set("Content-Encoding", "gzip") - r.headers.set("Content-Length", filesize) - r.headers.set("Content-Disposition", "inline", filename=basename) - r = self.web.add_security_headers(r) - (content_type, _) = mimetypes.guess_type(basename, strict=False) - if content_type is not None: - r.headers.set("Content-Type", content_type) - return r - - def should_use_gzip(self): - """ - Should we use gzip for this browser? - """ - return (not self.is_zipped) and ( - "gzip" in request.headers.get("Accept-Encoding", "").lower() - ) - - def _gzip_compress( - self, input_filename, output_filename, level, processed_size_callback=None - ): - """ - Compress a file with gzip, without loading the whole thing into memory - Thanks: https://stackoverflow.com/questions/27035296/python-how-to-gzip-a-large-text-file-without-memoryerror - """ - bytes_processed = 0 - blocksize = 1 << 16 # 64kB - with open(input_filename, "rb") as input_file: - output_file = gzip.open(output_filename, "wb", level) - while True: - if processed_size_callback is not None: - processed_size_callback(bytes_processed) - - block = input_file.read(blocksize) - if len(block) == 0: - break - output_file.write(block) - bytes_processed += blocksize - - output_file.close() - - def init(self): - """ - Inherited class will implement this - """ - pass - - def define_routes(self): - """ - Inherited class will implement this - """ - pass - - def directory_listing_template(self): - """ - Inherited class will implement this. It should call render_template and return - the response. - """ - pass - - def set_file_info_custom(self, filenames, processed_size_callback): - """ - Inherited class will implement this. - """ - pass - - def render_logic(self, path=""): - """ - Inherited class will implement this. - """ - pass diff --git a/desktop/onionshare/web/share_mode.py b/desktop/onionshare/web/share_mode.py deleted file mode 100644 index ccd29e1c..00000000 --- a/desktop/onionshare/web/share_mode.py +++ /dev/null @@ -1,412 +0,0 @@ -# -*- coding: utf-8 -*- -""" -OnionShare | https://onionshare.org/ - -Copyright (C) 2014-2020 Micah Lee, et al. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -""" - -import os -import sys -import tempfile -import zipfile -import mimetypes -from flask import Response, request, render_template, make_response - -from .send_base_mode import SendBaseModeWeb -from .. import strings - - -class ShareModeWeb(SendBaseModeWeb): - """ - All of the web logic for share mode - """ - - def init(self): - self.common.log("ShareModeWeb", "init") - - # Allow downloading individual files if "Stop sharing after files have been sent" is unchecked - self.download_individual_files = not self.web.settings.get( - "share", "autostop_sharing" - ) - - def define_routes(self): - """ - The web app routes for sharing files - """ - - @self.web.app.route("/", defaults={"path": ""}) - @self.web.app.route("/") - def index(path): - """ - Render the template for the onionshare landing page. - """ - self.web.add_request(self.web.REQUEST_LOAD, request.path) - - # Deny new downloads if "Stop sharing after files have been sent" is checked and there is - # currently a download - deny_download = ( - self.web.settings.get("share", "autostop_sharing") - and self.download_in_progress - ) - if deny_download: - r = make_response( - render_template("denied.html"), - static_url_path=self.web.static_url_path, - ) - return self.web.add_security_headers(r) - - # If download is allowed to continue, serve download page - if self.should_use_gzip(): - self.filesize = self.gzip_filesize - else: - self.filesize = self.download_filesize - - return self.render_logic(path) - - @self.web.app.route("/download") - def download(): - """ - Download the zip file. - """ - # Deny new downloads if "Stop After First Download" is checked and there is - # currently a download - deny_download = ( - self.web.settings.get("share", "autostop_sharing") - and self.download_in_progress - ) - if deny_download: - r = make_response( - render_template( - "denied.html", static_url_path=self.web.static_url_path - ) - ) - return self.web.add_security_headers(r) - - # Prepare some variables to use inside generate() function below - # which is outside of the request context - shutdown_func = request.environ.get("werkzeug.server.shutdown") - path = request.path - - # If this is a zipped file, then serve as-is. If it's not zipped, then, - # if the http client supports gzip compression, gzip the file first - # and serve that - use_gzip = self.should_use_gzip() - if use_gzip: - file_to_download = self.gzip_filename - self.filesize = self.gzip_filesize - else: - file_to_download = self.download_filename - self.filesize = self.download_filesize - - # Tell GUI the download started - history_id = self.cur_history_id - self.cur_history_id += 1 - self.web.add_request( - self.web.REQUEST_STARTED, path, {"id": history_id, "use_gzip": use_gzip} - ) - - basename = os.path.basename(self.download_filename) - - def generate(): - # Starting a new download - if self.web.settings.get("share", "autostop_sharing"): - self.download_in_progress = True - - chunk_size = 102400 # 100kb - - fp = open(file_to_download, "rb") - self.web.done = False - canceled = False - while not self.web.done: - # The user has canceled the download, so stop serving the file - if not self.web.stop_q.empty(): - self.web.add_request( - self.web.REQUEST_CANCELED, path, {"id": history_id} - ) - break - - chunk = fp.read(chunk_size) - if chunk == b"": - self.web.done = True - else: - try: - yield chunk - - # tell GUI the progress - downloaded_bytes = fp.tell() - percent = (1.0 * downloaded_bytes / self.filesize) * 100 - - # only output to stdout if running onionshare in CLI mode, or if using Linux (#203, #304) - if ( - not self.web.is_gui - or self.common.platform == "Linux" - or self.common.platform == "BSD" - ): - sys.stdout.write( - "\r{0:s}, {1:.2f}% ".format( - self.common.human_readable_filesize( - downloaded_bytes - ), - percent, - ) - ) - sys.stdout.flush() - - self.web.add_request( - self.web.REQUEST_PROGRESS, - path, - {"id": history_id, "bytes": downloaded_bytes}, - ) - self.web.done = False - except: - # looks like the download was canceled - self.web.done = True - canceled = True - - # tell the GUI the download has canceled - self.web.add_request( - self.web.REQUEST_CANCELED, path, {"id": history_id} - ) - - fp.close() - - if self.common.platform != "Darwin": - sys.stdout.write("\n") - - # Download is finished - if self.web.settings.get("share", "autostop_sharing"): - self.download_in_progress = False - - # Close the server, if necessary - if self.web.settings.get("share", "autostop_sharing") and not canceled: - print("Stopped because transfer is complete") - self.web.running = False - try: - if shutdown_func is None: - raise RuntimeError("Not running with the Werkzeug Server") - shutdown_func() - except: - pass - - r = Response(generate()) - if use_gzip: - r.headers.set("Content-Encoding", "gzip") - r.headers.set("Content-Length", self.filesize) - r.headers.set("Content-Disposition", "attachment", filename=basename) - r = self.web.add_security_headers(r) - # guess content type - (content_type, _) = mimetypes.guess_type(basename, strict=False) - if content_type is not None: - r.headers.set("Content-Type", content_type) - return r - - def directory_listing_template( - self, path, files, dirs, breadcrumbs, breadcrumbs_leaf - ): - return make_response( - render_template( - "send.html", - file_info=self.file_info, - files=files, - dirs=dirs, - breadcrumbs=breadcrumbs, - breadcrumbs_leaf=breadcrumbs_leaf, - filename=os.path.basename(self.download_filename), - filesize=self.filesize, - filesize_human=self.common.human_readable_filesize( - self.download_filesize - ), - is_zipped=self.is_zipped, - static_url_path=self.web.static_url_path, - download_individual_files=self.download_individual_files, - ) - ) - - def set_file_info_custom(self, filenames, processed_size_callback): - self.common.log("ShareModeWeb", "set_file_info_custom") - self.web.cancel_compression = False - self.build_zipfile_list(filenames, processed_size_callback) - - def render_logic(self, path=""): - if path in self.files: - filesystem_path = self.files[path] - - # If it's a directory - if os.path.isdir(filesystem_path): - # Render directory listing - filenames = [] - for filename in os.listdir(filesystem_path): - if os.path.isdir(os.path.join(filesystem_path, filename)): - filenames.append(filename + "/") - else: - filenames.append(filename) - filenames.sort() - return self.directory_listing(filenames, path, filesystem_path) - - # If it's a file - elif os.path.isfile(filesystem_path): - if self.download_individual_files: - return self.stream_individual_file(filesystem_path) - else: - history_id = self.cur_history_id - self.cur_history_id += 1 - return self.web.error404(history_id) - - # If it's not a directory or file, throw a 404 - else: - history_id = self.cur_history_id - self.cur_history_id += 1 - return self.web.error404(history_id) - else: - # Special case loading / - - if path == "": - # Root directory listing - filenames = list(self.root_files) - filenames.sort() - return self.directory_listing(filenames, path) - - else: - # If the path isn't found, throw a 404 - history_id = self.cur_history_id - self.cur_history_id += 1 - return self.web.error404(history_id) - - def build_zipfile_list(self, filenames, processed_size_callback=None): - self.common.log("ShareModeWeb", "build_zipfile_list") - for filename in filenames: - info = { - "filename": filename, - "basename": os.path.basename(filename.rstrip("/")), - } - if os.path.isfile(filename): - info["size"] = os.path.getsize(filename) - info["size_human"] = self.common.human_readable_filesize(info["size"]) - self.file_info["files"].append(info) - if os.path.isdir(filename): - info["size"] = self.common.dir_size(filename) - info["size_human"] = self.common.human_readable_filesize(info["size"]) - self.file_info["dirs"].append(info) - self.file_info["files"] = sorted( - self.file_info["files"], key=lambda k: k["basename"] - ) - self.file_info["dirs"] = sorted( - self.file_info["dirs"], key=lambda k: k["basename"] - ) - - # Check if there's only 1 file and no folders - if len(self.file_info["files"]) == 1 and len(self.file_info["dirs"]) == 0: - self.download_filename = self.file_info["files"][0]["filename"] - self.download_filesize = self.file_info["files"][0]["size"] - - # Compress the file with gzip now, so we don't have to do it on each request - self.gzip_filename = tempfile.mkstemp("wb+")[1] - self._gzip_compress( - self.download_filename, self.gzip_filename, 6, processed_size_callback - ) - self.gzip_filesize = os.path.getsize(self.gzip_filename) - - # Make sure the gzip file gets cleaned up when onionshare stops - self.cleanup_filenames.append(self.gzip_filename) - - self.is_zipped = False - - else: - # Zip up the files and folders - self.zip_writer = ZipWriter( - self.common, processed_size_callback=processed_size_callback - ) - self.download_filename = self.zip_writer.zip_filename - for info in self.file_info["files"]: - self.zip_writer.add_file(info["filename"]) - # Canceling early? - if self.web.cancel_compression: - self.zip_writer.close() - return False - - for info in self.file_info["dirs"]: - if not self.zip_writer.add_dir(info["filename"]): - return False - - self.zip_writer.close() - self.download_filesize = os.path.getsize(self.download_filename) - - # Make sure the zip file gets cleaned up when onionshare stops - self.cleanup_filenames.append(self.zip_writer.zip_filename) - - self.is_zipped = True - - return True - - -class ZipWriter(object): - """ - ZipWriter accepts files and directories and compresses them into a zip file - with. If a zip_filename is not passed in, it will use the default onionshare - filename. - """ - - def __init__(self, common, zip_filename=None, processed_size_callback=None): - self.common = common - self.cancel_compression = False - - if zip_filename: - self.zip_filename = zip_filename - else: - self.zip_filename = ( - f"{tempfile.mkdtemp()}/onionshare_{self.common.random_string(4, 6)}.zip" - ) - - self.z = zipfile.ZipFile(self.zip_filename, "w", allowZip64=True) - self.processed_size_callback = processed_size_callback - if self.processed_size_callback is None: - self.processed_size_callback = lambda _: None - self._size = 0 - self.processed_size_callback(self._size) - - def add_file(self, filename): - """ - Add a file to the zip archive. - """ - self.z.write(filename, os.path.basename(filename), zipfile.ZIP_DEFLATED) - self._size += os.path.getsize(filename) - self.processed_size_callback(self._size) - - def add_dir(self, filename): - """ - Add a directory, and all of its children, to the zip archive. - """ - dir_to_strip = os.path.dirname(filename.rstrip("/")) + "/" - for dirpath, dirnames, filenames in os.walk(filename): - for f in filenames: - # Canceling early? - if self.cancel_compression: - return False - - full_filename = os.path.join(dirpath, f) - if not os.path.islink(full_filename): - arc_filename = full_filename[len(dir_to_strip) :] - self.z.write(full_filename, arc_filename, zipfile.ZIP_DEFLATED) - self._size += os.path.getsize(full_filename) - self.processed_size_callback(self._size) - - return True - - def close(self): - """ - Close the zip archive. - """ - self.z.close() diff --git a/desktop/onionshare/web/web.py b/desktop/onionshare/web/web.py deleted file mode 100644 index 117ea83a..00000000 --- a/desktop/onionshare/web/web.py +++ /dev/null @@ -1,426 +0,0 @@ -# -*- coding: utf-8 -*- -""" -OnionShare | https://onionshare.org/ - -Copyright (C) 2014-2020 Micah Lee, et al. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -""" - -import hmac -import logging -import os -import queue -import socket -import sys -import tempfile -import requests -from distutils.version import LooseVersion as Version -from urllib.request import urlopen - -import flask -from flask import ( - Flask, - request, - render_template, - abort, - make_response, - send_file, - __version__ as flask_version, -) -from flask_httpauth import HTTPBasicAuth -from flask_socketio import SocketIO - -from .. import strings - -from .share_mode import ShareModeWeb -from .receive_mode import ReceiveModeWeb, ReceiveModeWSGIMiddleware, ReceiveModeRequest -from .website_mode import WebsiteModeWeb -from .chat_mode import ChatModeWeb - -# Stub out flask's show_server_banner function, to avoiding showing warnings that -# are not applicable to OnionShare -def stubbed_show_server_banner(env, debug, app_import_path, eager_loading): - pass - - -try: - flask.cli.show_server_banner = stubbed_show_server_banner -except: - pass - - -class Web: - """ - The Web object is the OnionShare web server, powered by flask - """ - - REQUEST_LOAD = 0 - REQUEST_STARTED = 1 - REQUEST_PROGRESS = 2 - REQUEST_CANCELED = 3 - REQUEST_RATE_LIMIT = 4 - REQUEST_UPLOAD_FILE_RENAMED = 5 - REQUEST_UPLOAD_SET_DIR = 6 - REQUEST_UPLOAD_FINISHED = 7 - REQUEST_UPLOAD_CANCELED = 8 - REQUEST_INDIVIDUAL_FILE_STARTED = 9 - REQUEST_INDIVIDUAL_FILE_PROGRESS = 10 - REQUEST_INDIVIDUAL_FILE_CANCELED = 11 - REQUEST_ERROR_DATA_DIR_CANNOT_CREATE = 12 - REQUEST_OTHER = 13 - REQUEST_INVALID_PASSWORD = 14 - - def __init__(self, common, is_gui, mode_settings, mode="share"): - self.common = common - self.common.log("Web", "__init__", f"is_gui={is_gui}, mode={mode}") - - self.settings = mode_settings - - # The flask app - self.app = Flask( - __name__, - static_folder=self.common.get_resource_path("static"), - static_url_path=f"/static_{self.common.random_string(16)}", # randomize static_url_path to avoid making /static unusable - template_folder=self.common.get_resource_path("templates"), - ) - self.app.secret_key = self.common.random_string(8) - self.generate_static_url_path() - self.auth = HTTPBasicAuth() - self.auth.error_handler(self.error401) - - # Verbose mode? - if self.common.verbose: - self.verbose_mode() - - # Are we running in GUI mode? - self.is_gui = is_gui - - # If the user stops the server while a transfer is in progress, it should - # immediately stop the transfer. In order to make it thread-safe, stop_q - # is a queue. If anything is in it, then the user stopped the server - self.stop_q = queue.Queue() - - # Are we using receive mode? - self.mode = mode - if self.mode == "receive": - # Use custom WSGI middleware, to modify environ - self.app.wsgi_app = ReceiveModeWSGIMiddleware(self.app.wsgi_app, self) - # Use a custom Request class to track upload progess - self.app.request_class = ReceiveModeRequest - - # Starting in Flask 0.11, render_template_string autoescapes template variables - # by default. To prevent content injection through template variables in - # earlier versions of Flask, we force autoescaping in the Jinja2 template - # engine if we detect a Flask version with insecure default behavior. - if Version(flask_version) < Version("0.11"): - # Monkey-patch in the fix from https://github.com/pallets/flask/commit/99c99c4c16b1327288fd76c44bc8635a1de452bc - Flask.select_jinja_autoescape = self._safe_select_jinja_autoescape - - self.security_headers = [ - ("X-Frame-Options", "DENY"), - ("X-Xss-Protection", "1; mode=block"), - ("X-Content-Type-Options", "nosniff"), - ("Referrer-Policy", "no-referrer"), - ("Server", "OnionShare"), - ] - - self.q = queue.Queue() - self.password = None - - self.reset_invalid_passwords() - - self.done = False - - # shutting down the server only works within the context of flask, so the easiest way to do it is over http - self.shutdown_password = self.common.random_string(16) - - # Keep track if the server is running - self.running = False - - # Define the web app routes - self.define_common_routes() - - # Create the mode web object, which defines its own routes - self.share_mode = None - self.receive_mode = None - self.website_mode = None - self.chat_mode = None - if self.mode == "share": - self.share_mode = ShareModeWeb(self.common, self) - elif self.mode == "receive": - self.receive_mode = ReceiveModeWeb(self.common, self) - elif self.mode == "website": - self.website_mode = WebsiteModeWeb(self.common, self) - elif self.mode == "chat": - self.socketio = SocketIO() - self.socketio.init_app(self.app) - self.chat_mode = ChatModeWeb(self.common, self) - - def get_mode(self): - if self.mode == "share": - return self.share_mode - elif self.mode == "receive": - return self.receive_mode - elif self.mode == "website": - return self.website_mode - elif self.mode == "chat": - return self.chat_mode - else: - return None - - def generate_static_url_path(self): - # The static URL path has a 128-bit random number in it to avoid having name - # collisions with files that might be getting shared - self.static_url_path = f"/static_{self.common.random_string(16)}" - self.common.log( - "Web", - "generate_static_url_path", - f"new static_url_path is {self.static_url_path}", - ) - - # Update the flask route to handle the new static URL path - self.app.static_url_path = self.static_url_path - self.app.add_url_rule( - self.static_url_path + "/", - endpoint="static", - view_func=self.app.send_static_file, - ) - - def define_common_routes(self): - """ - Common web app routes between all modes. - """ - - @self.auth.get_password - def get_pw(username): - if username == "onionshare": - return self.password - else: - return None - - @self.app.before_request - def conditional_auth_check(): - # Allow static files without basic authentication - if request.path.startswith(self.static_url_path + "/"): - return None - - # If public mode is disabled, require authentication - if not self.settings.get("general", "public"): - - @self.auth.login_required - def _check_login(): - return None - - return _check_login() - - @self.app.errorhandler(404) - def not_found(e): - mode = self.get_mode() - history_id = mode.cur_history_id - mode.cur_history_id += 1 - return self.error404(history_id) - - @self.app.route("//shutdown") - def shutdown(password_candidate): - """ - Stop the flask web server, from the context of an http request. - """ - if password_candidate == self.shutdown_password: - self.force_shutdown() - return "" - abort(404) - - if self.mode != "website": - - @self.app.route("/favicon.ico") - def favicon(): - return send_file( - f"{self.common.get_resource_path('static')}/img/favicon.ico" - ) - - def error401(self): - auth = request.authorization - if auth: - if ( - auth["username"] == "onionshare" - and auth["password"] not in self.invalid_passwords - ): - print(f"Invalid password guess: {auth['password']}") - self.add_request(Web.REQUEST_INVALID_PASSWORD, data=auth["password"]) - - self.invalid_passwords.append(auth["password"]) - self.invalid_passwords_count += 1 - - if self.invalid_passwords_count == 20: - self.add_request(Web.REQUEST_RATE_LIMIT) - self.force_shutdown() - print( - "Someone has made too many wrong attempts to guess your password, so OnionShare has stopped the server. Start sharing again and send the recipient a new address to share." - ) - - r = make_response( - render_template("401.html", static_url_path=self.static_url_path), 401 - ) - return self.add_security_headers(r) - - def error403(self): - self.add_request(Web.REQUEST_OTHER, request.path) - r = make_response( - render_template("403.html", static_url_path=self.static_url_path), 403 - ) - return self.add_security_headers(r) - - def error404(self, history_id): - self.add_request( - self.REQUEST_INDIVIDUAL_FILE_STARTED, - request.path, - {"id": history_id, "status_code": 404}, - ) - - self.add_request(Web.REQUEST_OTHER, request.path) - r = make_response( - render_template("404.html", static_url_path=self.static_url_path), 404 - ) - return self.add_security_headers(r) - - def error405(self, history_id): - self.add_request( - self.REQUEST_INDIVIDUAL_FILE_STARTED, - request.path, - {"id": history_id, "status_code": 405}, - ) - - self.add_request(Web.REQUEST_OTHER, request.path) - r = make_response( - render_template("405.html", static_url_path=self.static_url_path), 405 - ) - return self.add_security_headers(r) - - def add_security_headers(self, r): - """ - Add security headers to a request - """ - for header, value in self.security_headers: - r.headers.set(header, value) - # Set a CSP header unless in website mode and the user has disabled it - if not self.settings.get("website", "disable_csp") or self.mode != "website": - r.headers.set( - "Content-Security-Policy", - "default-src 'self'; style-src 'self'; script-src 'self'; img-src 'self' data:;", - ) - return r - - def _safe_select_jinja_autoescape(self, filename): - if filename is None: - return True - return filename.endswith((".html", ".htm", ".xml", ".xhtml")) - - def add_request(self, request_type, path=None, data=None): - """ - Add a request to the queue, to communicate with the GUI. - """ - self.q.put({"type": request_type, "path": path, "data": data}) - - def generate_password(self, saved_password=None): - self.common.log("Web", "generate_password", f"saved_password={saved_password}") - if saved_password != None and saved_password != "": - self.password = saved_password - self.common.log( - "Web", - "generate_password", - f'saved_password sent, so password is: "{self.password}"', - ) - else: - self.password = self.common.build_password() - self.common.log( - "Web", "generate_password", f'built random password: "{self.password}"' - ) - - def verbose_mode(self): - """ - Turn on verbose mode, which will log flask errors to a file. - """ - flask_log_filename = os.path.join(self.common.build_data_dir(), "flask.log") - log_handler = logging.FileHandler(flask_log_filename) - log_handler.setLevel(logging.WARNING) - self.app.logger.addHandler(log_handler) - - def reset_invalid_passwords(self): - self.invalid_passwords_count = 0 - self.invalid_passwords = [] - - def force_shutdown(self): - """ - Stop the flask web server, from the context of the flask app. - """ - # Shutdown the flask service - try: - func = request.environ.get("werkzeug.server.shutdown") - if func is None: - raise RuntimeError("Not running with the Werkzeug Server") - func() - except: - pass - self.running = False - - def start(self, port): - """ - Start the flask web server. - """ - self.common.log("Web", "start", f"port={port}") - - # Make sure the stop_q is empty when starting a new server - while not self.stop_q.empty(): - try: - self.stop_q.get(block=False) - except queue.Empty: - pass - - # In Whonix, listen on 0.0.0.0 instead of 127.0.0.1 (#220) - if os.path.exists("/usr/share/anon-ws-base-files/workstation"): - host = "0.0.0.0" - else: - host = "127.0.0.1" - - self.running = True - if self.mode == "chat": - self.socketio.run(self.app, host=host, port=port) - else: - self.app.run(host=host, port=port, threaded=True) - - def stop(self, port): - """ - Stop the flask web server by loading /shutdown. - """ - self.common.log("Web", "stop", "stopping server") - - # Let the mode know that the user stopped the server - self.stop_q.put(True) - - # To stop flask, load http://shutdown:[shutdown_password]@127.0.0.1/[shutdown_password]/shutdown - # (We're putting the shutdown_password in the path as well to make routing simpler) - if self.running: - if self.password: - requests.get( - f"http://127.0.0.1:{port}/{self.shutdown_password}/shutdown", - auth=requests.auth.HTTPBasicAuth("onionshare", self.password), - ) - else: - requests.get( - f"http://127.0.0.1:{port}/{self.shutdown_password}/shutdown" - ) - - # Reset any password that was in use - self.password = None diff --git a/desktop/onionshare/web/website_mode.py b/desktop/onionshare/web/website_mode.py deleted file mode 100644 index 2838fc05..00000000 --- a/desktop/onionshare/web/website_mode.py +++ /dev/null @@ -1,124 +0,0 @@ -# -*- coding: utf-8 -*- -""" -OnionShare | https://onionshare.org/ - -Copyright (C) 2014-2020 Micah Lee, et al. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -""" - -import os -import sys -import tempfile -import mimetypes -from flask import Response, request, render_template, make_response - -from .send_base_mode import SendBaseModeWeb -from .. import strings - - -class WebsiteModeWeb(SendBaseModeWeb): - """ - All of the web logic for website mode - """ - - def init(self): - pass - - def define_routes(self): - """ - The web app routes for sharing a website - """ - - @self.web.app.route("/", defaults={"path": ""}) - @self.web.app.route("/") - def path_public(path): - return path_logic(path) - - def path_logic(path=""): - """ - Render the onionshare website. - """ - return self.render_logic(path) - - def directory_listing_template( - self, path, files, dirs, breadcrumbs, breadcrumbs_leaf - ): - return make_response( - render_template( - "listing.html", - path=path, - files=files, - dirs=dirs, - breadcrumbs=breadcrumbs, - breadcrumbs_leaf=breadcrumbs_leaf, - static_url_path=self.web.static_url_path, - ) - ) - - def set_file_info_custom(self, filenames, processed_size_callback): - self.common.log("WebsiteModeWeb", "set_file_info_custom") - self.web.cancel_compression = True - - def render_logic(self, path=""): - if path in self.files: - filesystem_path = self.files[path] - - # If it's a directory - if os.path.isdir(filesystem_path): - # Is there an index.html? - index_path = os.path.join(path, "index.html") - if index_path in self.files: - # Render it - return self.stream_individual_file(self.files[index_path]) - - else: - # Otherwise, render directory listing - filenames = [] - for filename in os.listdir(filesystem_path): - if os.path.isdir(os.path.join(filesystem_path, filename)): - filenames.append(filename + "/") - else: - filenames.append(filename) - filenames.sort() - return self.directory_listing(filenames, path, filesystem_path) - - # If it's a file - elif os.path.isfile(filesystem_path): - return self.stream_individual_file(filesystem_path) - - # If it's not a directory or file, throw a 404 - else: - history_id = self.cur_history_id - self.cur_history_id += 1 - return self.web.error404(history_id) - else: - # Special case loading / - - if path == "": - index_path = "index.html" - if index_path in self.files: - # Render it - return self.stream_individual_file(self.files[index_path]) - else: - # Root directory listing - filenames = list(self.root_files) - filenames.sort() - return self.directory_listing(filenames, path) - - else: - # If the path isn't found, throw a 404 - history_id = self.cur_history_id - self.cur_history_id += 1 - return self.web.error404(history_id) diff --git a/desktop/pyproject.toml b/desktop/pyproject.toml index 79ae4a43..0dcaa5e6 100644 --- a/desktop/pyproject.toml +++ b/desktop/pyproject.toml @@ -7,12 +7,13 @@ license = "GPLv3" author = 'Micah Lee' author_email = "micah@micahflee.com" -[tool.briefcase.app.helloworld] +[tool.briefcase.app.onionshare] formal_name = "OnionShare" description = "OnionShare lets you securely and anonymously send and receive files. It works by starting a web server, making it accessible as a Tor onion service, and generating an unguessable web address so others can download files from you, or upload files to you. It does _not_ require setting up a separate server or using a third party file-sharing service." -icon = "src/helloworld/resources/helloworld" +icon = "src/onionshare/resources/onionshare" sources = ['src/onionshare'] requires = [ + "onionshare-cli==0.1.3", "Click", "eventlet", "Flask", @@ -29,23 +30,19 @@ requires = [ "urllib3", ] -[tool.briefcase.app.helloworld.macOS] +[tool.briefcase.app.onionshare.macOS] requires = [] -[tool.briefcase.app.helloworld.linux] +[tool.briefcase.app.onionshare.linux] requires = [] -system_requires = [] +system_requires = ["tor", "obfs4proxy"] -[tool.briefcase.app.helloworld.windows] +[tool.briefcase.app.onionshare.windows] requires = ["pywin32"] # Mobile deployments -[tool.briefcase.app.helloworld.iOS] +[tool.briefcase.app.onionshare.iOS] requires = [] -[tool.briefcase.app.helloworld.android] +[tool.briefcase.app.onionshare.android] requires = [] - -# TODO: Figure out tests with briefcase -# Test dependencies: pytest, pytest-faulthandler, pytest-qt -# Also probably https://pypi.org/project/pytest-briefcase/ \ No newline at end of file diff --git a/desktop/setup.cfg b/desktop/setup.cfg deleted file mode 100644 index 0a8df87a..00000000 --- a/desktop/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[wheel] -universal = 1 \ No newline at end of file diff --git a/desktop/setup.py b/desktop/setup.py deleted file mode 100644 index ebecd40b..00000000 --- a/desktop/setup.py +++ /dev/null @@ -1,98 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -""" -OnionShare | https://onionshare.org/ - -Copyright (C) 2014-2020 Micah Lee, et al. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -""" - -import os, sys, platform, tempfile -from distutils.core import setup - - -def file_list(path): - files = [] - for filename in os.listdir(path): - if os.path.isfile(os.path.join(path, filename)): - files.append(os.path.join(path, filename)) - return files - - -version = open("share/version.txt").read().strip() -description = "OnionShare is an open source tool that lets you securely and anonymously share files, host websites, and chat with friends using the Tor network." - -author = "Micah Lee" -author_email = "micah@micahflee.com" -url = "https://onionshare.org" -license = "GPL v3" -keywords = "onion, share, onionshare, tor, anonymous, web server" -classifiers = [ - "Programming Language :: Python :: 3", - "Framework :: Flask", - "Topic :: Communications :: File Sharing", - "Topic :: Security :: Cryptography", - "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)", - "Intended Audience :: End Users/Desktop", - "Operating System :: OS Independent", - "Environment :: Web Environment", -] -data_files = [ - ("share/applications", ["install/org.onionshare.OnionShare.desktop"],), - ("share/icons/hicolor/512x512/apps", ["install/org.onionshare.OnionShare.png"],), - ("share/metainfo", ["install/org.onionshare.OnionShare.appdata.xml"],), - ("share/onionshare", file_list("share")), - ("share/onionshare/images", file_list("share/images")), - ("share/onionshare/locale", file_list("share/locale")), - ("share/onionshare/templates", file_list("share/templates"),), - ("share/onionshare/static/css", file_list("share/static/css"),), - ("share/onionshare/static/img", file_list("share/static/img"),), - ("share/onionshare/static/js", file_list("share/static/js"),), -] -if not platform.system().endswith("BSD") and platform.system() != "DragonFly": - data_files.append( - ( - "share/nautilus-python/extensions/", - ["install/scripts/onionshare-nautilus.py"], - ) - ) - -setup( - name="onionshare", - version=version, - description=description, - author=author, - author_email=author_email, - maintainer=author, - maintainer_email=author_email, - url=url, - license=license, - keywords=keywords, - classifiers=classifiers, - packages=[ - "onionshare", - "onionshare.web", - "onionshare_gui", - "onionshare_gui.tab", - "onionshare_gui.tab.mode", - "onionshare_gui.tab.mode.share_mode", - "onionshare_gui.tab.mode.receive_mode", - "onionshare_gui.tab.mode.website_mode", - "onionshare_gui.tab.mode.chat_mode", - ], - include_package_data=True, - scripts=["install/scripts/onionshare", "install/scripts/onionshare-gui"], - data_files=data_files, -) diff --git a/desktop/share/static/css/style.css b/desktop/share/static/css/style.css deleted file mode 100644 index 88d9cb79..00000000 --- a/desktop/share/static/css/style.css +++ /dev/null @@ -1,393 +0,0 @@ -.clearfix:after { - content: "."; - display: block; - clear: both; - visibility: hidden; - line-height: 0; - height: 0; -} - -body { - margin: 0; - font-family: Helvetica, sans-serif; -} - -.d-flex { - display: flex; - flex-wrap: wrap; - justify-content: space-between; - align-items: center; -} - -header { - border-bottom: 1px solid rgba(0, 0, 0, 0.1); - background: #fcfcfc; - background: -webkit-linear-gradient(top, #fcfcfc 0%, #f2f2f2 100%); - padding: 0.8rem; -} - -header .logo { - vertical-align: middle; - width: 45px; - height: 45px; -} - -header h1 { - display: inline-block; - margin: 0 0 0 0.5rem; - vertical-align: middle; - font-weight: normal; - font-size: 1.5rem; - color: #666666; -} - -header .information { - font-size: 1rem; -} - -.button { - color: #ffffff; - background-color: #4e064f; - padding: 10px; - border: 0; - border-radius: 5px; - text-decoration: none; - margin-left: 1rem; - cursor: pointer; -} - -a.button:visited { - color: #ffffff; -} - -.close-button { - color: #ffffff; - background-color: #c90c0c; - padding: 10px; - border: 0; - border-radius: 5px; - text-decoration: none; - margin-left: 1rem; - cursor: pointer; - position: absolute; - right: 10px; - bottom: 10px; -} - -ul.breadcrumbs { - display: block; - list-style: none; - margin: 10px 0; - padding: 0; -} - -ul.breadcrumbs li { - display: inline-block; - list-style: none; - margin: 0; - padding: 5px; - color: #999999; -} - -ul.breadcrumbs li span.sep { - padding-left: 5px; -} - -ul.breadcrumbs li a:link, ul.breadcrumbs li a:visited { - color: #666666; - border-bottom: 1px solid #666666; -} - -.file-list { - width: 100%; - margin: 0 auto; - border-collapse: collapse; -} - -.file-list .heading { - text-align: left; - text-transform: uppercase; - font-weight: normal; - color: #666666; - padding: 0.5rem; -} - -.file-list div.d-flex { - border-bottom: 1px solid #e0e0e0; - justify-content: flex-start; -} - -.file-list div.d-flex div { - white-space: nowrap; - padding: 0.5rem 0.8rem 0.5rem 0.8rem; -} - -.file-list div.d-flex div img { - vertical-align: middle; - margin-right: 0.5rem; -} - -.file-list div.d-flex div:last-child { - padding-right: 0.8rem; - flex-basis: 0; - flex-grow: 1; -} - -.file-list div.d-flex div:first-child { - flex-basis: 0; - flex-grow: 2; -} - -@media (max-width: 950px) { - .file-list div.d-flex div:last-child { - flex-basis: auto; - flex-grow: 0; - } -} - -@media (max-width: 655px) { - .file-list div.d-flex { - display: block; - } - .file-list div.d-flex span { - max-width: 100%; - word-break: break-all; - white-space: normal; - } - .file-list div.d-flex #size-header { - display: none; - } - .file-list div.d-flex div:last-child { - padding-left: 3.5rem; - font-size: 0.85rem; - padding-top: 0; - } - header .information { - padding: 1rem 0; - } -} - -.chat-container { - display: flex; - font-family: monospace; -} - -.chat-users { - width: 20%; - border: 1px solid rgba(0, 0, 0, 0.1); - border-radius: 2px; - overflow: auto; - background: #f2f2f2; - margin: 1rem 0 1rem 1rem; -} - -.chat-users .editable-username { - display: flex; - padding: 1rem; - flex-direction: column; -} - -.chat-users .editable-username input { - font-family: monospace; - font-size: 1em; -} - -.chat-users .editable-username #username-error { - color: #c90c0c; - margin: 0.5rem; -} - -.chat-users #user-list li { - margin-bottom: 1em; -} - -.chat-wrapper { - display: flex; - flex-direction: column; - flex: 1; - margin: 1rem 1rem 0 1rem; - height: calc(100vh - (65px + 2em)); -} - -.chat-wrapper #chat { - border: 1px solid rgba(0, 0, 0, 0.1); - border-radius: 2px; - flex: 1; - overflow: auto; - background: #f2f2f2; - padding: 0 1rem; -} - -.chat-wrapper .status { - font-style: italic; - font-size: 0.8em; - color: #666666; -} - -.chat-wrapper .username { - font-weight: bold; - display: block; -} -.chat-wrapper .message { - font-weight: normal; - display: block; - margin-bottom: 0.3em; -} - -.chat-wrapper .chat-form { - display: block; - margin: 0.2rem 1rem 1rem 0; - padding: -0.5em; -} - -.chat-wrapper input#new-message { - height: 100%; - width: 100%; - font-family: monospace; - font-size: 1em; -} - -@media (max-width: 992px) { - .chat-users .editable-username { - display: block; - } - - .chat-users input#username { - width: 90%; - } -} - -.no-js { - display: none; -} - -.upload-wrapper { - align-items: center; - justify-content: center; - min-height: 400px; - text-align: center; -} - -.upload-wrapper img.logo { - width: 120px; - height: 120px; -} - -.upload-wrapper .upload-header { - font-size: 30px; - font-weight: normal; - color: #666666; - margin: 0 0 10px 0; -} - -.upload-wrapper .upload-description { - color: #666666; - margin: 0 0 20px 0; -} - -div#uploads { - width: 800px; - max-width: 90%; - margin: 0 auto; -} - -div#uploads .upload { - border: 1px solid #DDDDDD; - margin: 20px 0; - padding: 10px; - text-align: left; -} - -div#uploads .upload .upload-filename { - font-weight: bold; - font-family: monospace; - font-size: 1.1em; - margin-bottom: 5px; -} - -div#uploads .upload .upload-status { - color: #999999; - font-size: 0.9em; - margin-bottom: 5px; -} - -div#uploads .upload input.cancel { - color: #d0011b; - border: 0; - background: none; - box-shadow: none; - border-radius: 0px; - cursor: pointer; - font-family: sans-serif; - font-size: 12px; - text-decoration: none; - display: inline-block; - float:right; -} - -div#uploads .upload progress { - width: 100%; - height: 20px; -} - -ul.flashes { - list-style: none; - margin: 0; - padding: 0; - width: 800px; - max-width: 100%; - margin: 0 auto; -} - -ul.flashes li { - margin: 0 0 5px 0; - padding: 5px; - list-style: none; - text-align: center; - word-break: break-word; -} - -li.error { - color: #d0011b; -} - -li.info { - color: #5fa416; -} - -.closed-wrapper { - display: flex; - align-items: center; - justify-content: center; - min-height: 400px; -} - -.info { - text-align: center; -} - -.info img { - width: 120px; - height: 120px; -} - -.info .info-header { - font-size: 30px; - font-weight: normal; - color: #666666; - margin: 0 0 10px 0; -} - -.info .info-description { - color: #666666; - margin: 0 0 20px 0; -} - -a { - text-decoration: none; - color: #1c1ca0; -} - -a:visited { - color: #601ca0; -} \ No newline at end of file diff --git a/desktop/share/static/img/ajax.gif b/desktop/share/static/img/ajax.gif deleted file mode 100644 index 01d955aa..00000000 Binary files a/desktop/share/static/img/ajax.gif and /dev/null differ diff --git a/desktop/share/static/img/favicon.ico b/desktop/share/static/img/favicon.ico deleted file mode 100644 index 63e65d8b..00000000 Binary files a/desktop/share/static/img/favicon.ico and /dev/null differ diff --git a/desktop/share/static/img/logo.png b/desktop/share/static/img/logo.png deleted file mode 100644 index 43884c1f..00000000 Binary files a/desktop/share/static/img/logo.png and /dev/null differ diff --git a/desktop/share/static/img/logo_large.png b/desktop/share/static/img/logo_large.png deleted file mode 100644 index ee8f26ac..00000000 Binary files a/desktop/share/static/img/logo_large.png and /dev/null differ diff --git a/desktop/share/static/img/web_file.png b/desktop/share/static/img/web_file.png deleted file mode 100644 index 1931aff0..00000000 Binary files a/desktop/share/static/img/web_file.png and /dev/null differ diff --git a/desktop/share/static/img/web_folder.png b/desktop/share/static/img/web_folder.png deleted file mode 100644 index 3ca5df21..00000000 Binary files a/desktop/share/static/img/web_folder.png and /dev/null differ diff --git a/desktop/share/static/js/chat.js b/desktop/share/static/js/chat.js deleted file mode 100644 index 39547725..00000000 --- a/desktop/share/static/js/chat.js +++ /dev/null @@ -1,165 +0,0 @@ -$(function () { - $(document).ready(function () { - $('.chat-container').removeClass('no-js'); - var socket = io.connect('http://' + document.domain + ':' + location.port + '/chat'); - - // Store current username received from app context - var current_username = $('#username').val(); - - // On browser connect, emit a socket event to be added to - // room and assigned random username - socket.on('connect', function () { - socket.emit('joined', {}); - }); - - // Triggered on any status change by any user, such as some - // user joined, or changed username, or left, etc. - socket.on('status', function (data) { - addMessageToRoom(data, current_username, 'status'); - console.log(data, current_username); - }); - - // Triggered when message is received from a user. Even when sent - // by self, it get triggered after the server sends back the emit. - socket.on('message', function (data) { - addMessageToRoom(data, current_username, 'chat'); - console.log(data, current_username); - }); - - // Triggered when disconnected either by server stop or timeout - socket.on('disconnect', function (data) { - addMessageToRoom({ 'msg': 'The chat server is disconnected.' }, current_username, 'status'); - }) - socket.on('connect_error', function (error) { - console.log("error"); - }) - - // Trigger new message on enter or click of send message button. - $('#new-message').on('keypress', function (e) { - var code = e.keyCode || e.which; - if (code == 13) { - emitMessage(socket); - } - }); - - // Keep buttons disabled unless changed or not empty - $('#username').on('keyup', function (event) { - if ($('#username').val() !== '' && $('#username').val() !== current_username) { - if (event.keyCode == 13) { - current_username = updateUsername(socket) || current_username; - } - } - }); - - // Show warning of losing data - $(window).on('beforeunload', function (e) { - e.preventDefault(); - e.returnValue = ''; - return ''; - }); - }); -}); - -var addMessageToRoom = function (data, current_username, messageType) { - var scrollDiff = getScrollDiffBefore(); - if (messageType === 'status') { - addStatusMessage(data.msg); - if (data.connected_users) { - addUserList(data.connected_users, current_username); - } - } else if (messageType === 'chat') { - addChatMessage(data.username, data.msg) - } - scrollBottomMaybe(scrollDiff); -} - -var emitMessage = function (socket) { - var text = $('#new-message').val(); - $('#new-message').val(''); - $('#chat').scrollTop($('#chat')[0].scrollHeight); - socket.emit('text', { msg: text }); -} - -var updateUsername = function (socket) { - var username = $('#username').val(); - if (!checkUsernameExists(username)) { - socket.emit('update_username', { username: username }); - $.ajax({ - method: 'POST', - url: `http://${document.domain}:${location.port}/update-session-username`, - contentType: 'application/json', - dataType: 'json', - data: JSON.stringify({ 'username': username }) - }).done(function (response) { - console.log(response); - }); - return username; - } - return false; -} - -/************************************/ -/********* Util Functions ***********/ -/************************************/ - -var createUserListHTML = function (connected_users, current_user) { - var userListHTML = ''; - connected_users.sort(); - connected_users.forEach(function (username) { - if (username !== current_user) { - userListHTML += `
  • ${sanitizeHTML(username)}
    • `; - } - }); - return userListHTML; -} - -var checkUsernameExists = function (username) { - $('#username-error').text(''); - var userMatches = $('#user-list li').filter(function () { - return $(this).text() === username; - }); - if (userMatches.length) { - $('#username-error').text('User with that username exists!'); - return true; - } - return false; -} - -var getScrollDiffBefore = function () { - return $('#chat').scrollTop() - ($('#chat')[0].scrollHeight - $('#chat')[0].offsetHeight); -} - -var scrollBottomMaybe = function (scrollDiff) { - // Scrolls to bottom if the user is scrolled at bottom - // if the user has scrolled upp, it wont scroll at bottom. - // Note: when a user themselves send a message, it will still - // scroll to the bottom even if they had scrolled up before. - if (scrollDiff > 0) { - $('#chat').scrollTop($('#chat')[0].scrollHeight); - } -} - -var addStatusMessage = function (message) { - $('#chat').append( - `

    ${sanitizeHTML(message)}

    ` - ); -} - -var addChatMessage = function (username, message) { - $('#chat').append(`

    ${sanitizeHTML(username)}${sanitizeHTML(message)}

    `); -} - -var addUserList = function (connected_users, current_username) { - $('#user-list').html( - createUserListHTML( - connected_users, - current_username - ) - ); -} - -var sanitizeHTML = function (str) { - var temp = document.createElement('span'); - temp.textContent = str; - return temp.innerHTML; -}; diff --git a/desktop/share/static/js/jquery-3.5.1.min.js b/desktop/share/static/js/jquery-3.5.1.min.js deleted file mode 100644 index b0614034..00000000 --- a/desktop/share/static/js/jquery-3.5.1.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! jQuery v3.5.1 | (c) JS Foundation and other contributors | jquery.org/license */ -!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.5.1",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function D(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||j,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,j=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="",y.option=!!ce.lastChild;var ge={thead:[1,"","
    "],col:[2,"","
    "],tr:[2,"","
    "],td:[3,"","
    "],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n",""]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d\s*$/g;function qe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function Le(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function He(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Oe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Ut,Xt=[],Vt=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Xt.pop()||S.expando+"_"+Ct.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Vt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Vt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Vt,"$1"+r):!1!==e.jsonp&&(e.url+=(Et.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Xt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Ut=E.implementation.createHTMLDocument("").body).innerHTML="
    ",2===Ut.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):("number"==typeof f.top&&(f.top+="px"),"number"==typeof f.left&&(f.left+="px"),c.css(f))}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=$e(y.pixelPosition,function(e,t){if(t)return t=Be(e,n),Me.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0').addClass(category).text(message)); - }; - - var scriptSrc = document.getElementById('receive-script').src; - var staticImgPath = scriptSrc.substr(0, scriptSrc.lastIndexOf( '/' )+1).replace('js', 'img'); - - // Intercept submitting the form - $('#send').submit(function(event){ - event.preventDefault(); - - // Create form data, and list of filenames - var files = $('#file-select').get(0).files; - var filenames = []; - var formData = new FormData(); - for(var i = 0; i < files.length; i++) { - var file = files[i]; - filenames.push(file.name); - formData.append('file[]', file, file.name); - } - - // Reset the upload form - $('#send').get(0).reset(); - - // Don't use jQuery for ajax request, because the upload progress event doesn't - // have access to the the XMLHttpRequest object - var ajax = new XMLHttpRequest(); - - ajax.upload.addEventListener('progress', function(event){ - // Update progress bar for this specific upload - if(event.lengthComputable) { - $('progress', ajax.$upload_div).attr({ - value: event.loaded, - max: event.total, - }); - } - - // If it's finished sending all data to the first Tor node, remove cancel button - // and update the status - if(event.loaded == event.total) { - $('.cancel', ajax.$upload_div).remove(); - $('.upload-status', ajax.$upload_div).html(' Waiting for data to finish traversing Tor network ...'); - } - }, false); - - ajax.addEventListener('load', function(event){ - // Remove the upload div - ajax.$upload_div.remove(); - - // Parse response - try { - var response = JSON.parse(ajax.response); - - // The 'new_body' response replaces the whole HTML document and ends - if('new_body' in response) { - $('body').html(response['new_body']); - return; - } - - // Show error flashes - if('error_flashes' in response) { - for(var i=0; i -
    - -
    educational-video.mp4, secret-plans.pdf
    -
    Sending to first Tor node ...
    -
    - - */ - var $progress = $('').attr({ value: '0', max: 100 }); - var $cancel_button = $('').addClass('cancel').attr({ type: 'button', value: 'Cancel' }); - var $upload_filename = $('
    ').addClass('upload-filename').text(filenames.join(', ')); - var $upload_status = $('
    ').addClass('upload-status').text('Sending data to initial Tor node ...'); - - var $upload_div = $('
    ') - .addClass('upload') - .append( - $('
    ').addClass('upload-meta') - .append($cancel_button) - .append($upload_filename) - .append($upload_status) - ) - .append($progress); - - $cancel_button.click(function(){ - // Abort the upload, and remove the upload div - ajax.abort(); - $upload_div.remove() - }); - - ajax.$upload_div = $upload_div; - $('#uploads').append($upload_div); - - // Send the request - ajax.open('POST', '/upload-ajax', true); - ajax.send(formData); - }); -}); diff --git a/desktop/share/static/js/send.js b/desktop/share/static/js/send.js deleted file mode 100644 index 43e9892d..00000000 --- a/desktop/share/static/js/send.js +++ /dev/null @@ -1,75 +0,0 @@ -// Function to convert human-readable sizes back to bytes, for sorting -function unhumanize(text) { - var powers = {'b': 0, 'k': 1, 'm': 2, 'g': 3, 't': 4}; - var regex = /(\d+(?:\.\d+)?)\s?(B|K|M|G|T)?/i; - var res = regex.exec(text); - if(res[2] === undefined) { - // Account for alphabetical words (file/dir names) - return text; - } else { - return res[1] * Math.pow(1024, powers[res[2].toLowerCase()]); - } -} -function sortTable(n) { - var table, rows, switching, i, x, y, shouldSwitch, dir, switchcount = 0; - table = document.getElementById("file-list"); - switching = true; - // Set the sorting direction to ascending: - dir = "asc"; - /* Make a loop that will continue until - no switching has been done: */ - while (switching) { - // Start by saying: no switching is done: - switching = false; - rows = table.getElementsByTagName("TR"); - /* Loop through all table rows (except the - first, which contains table headers): */ - for (i = 1; i < (rows.length - 1); i++) { - // Start by saying there should be no switching: - shouldSwitch = false; - /* Get the two elements you want to compare, - one from current row and one from the next: */ - x = rows[i].getElementsByTagName("TD")[n]; - y = rows[i + 1].getElementsByTagName("TD")[n]; - /* Check if the two rows should switch place, - based on the direction, asc or desc: */ - if (dir == "asc") { - if (unhumanize(x.innerHTML.toLowerCase()) > unhumanize(y.innerHTML.toLowerCase())) { - // If so, mark as a switch and break the loop: - shouldSwitch= true; - break; - } - } else if (dir == "desc") { - if (unhumanize(x.innerHTML.toLowerCase()) < unhumanize(y.innerHTML.toLowerCase())) { - // If so, mark as a switch and break the loop: - shouldSwitch= true; - break; - } - } - } - if (shouldSwitch) { - /* If a switch has been marked, make the switch - and mark that a switch has been done: */ - rows[i].parentNode.insertBefore(rows[i + 1], rows[i]); - switching = true; - // Each time a switch is done, increase this count by 1: - switchcount ++; - } else { - /* If no switching has been done AND the direction is "asc", - set the direction to "desc" and run the while loop again. */ - if (switchcount == 0 && dir == "asc") { - dir = "desc"; - switching = true; - } - } - } -} - - -// Set click handlers -document.getElementById("filename-header").addEventListener("click", function(){ - sortTable(0); -}); -document.getElementById("size-header").addEventListener("click", function(){ - sortTable(1); -}); diff --git a/desktop/share/static/js/socket.io.min.js b/desktop/share/static/js/socket.io.min.js deleted file mode 100644 index b622e1b9..00000000 --- a/desktop/share/static/js/socket.io.min.js +++ /dev/null @@ -1,3 +0,0 @@ -!function(t){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=t();else if("function"==typeof define&&define.amd)define([],t);else{var e;"undefined"!=typeof window?e=window:"undefined"!=typeof global?e=global:"undefined"!=typeof self&&(e=self),e.io=t()}}(function(){var t;return function e(t,n,r){function o(s,a){if(!n[s]){if(!t[s]){var c="function"==typeof require&&require;if(!a&&c)return c(s,!0);if(i)return i(s,!0);throw new Error("Cannot find module '"+s+"'")}var p=n[s]={exports:{}};t[s][0].call(p.exports,function(e){var n=t[s][1][e];return o(n?n:e)},p,p.exports,e,t,n,r)}return n[s].exports}for(var i="function"==typeof require&&require,s=0;s0&&!this.encoding){var t=this.packetBuffer.shift();this.packet(t)}},n.prototype.cleanup=function(){for(var t;t=this.subs.shift();)t.destroy();this.packetBuffer=[],this.encoding=!1,this.decoder.destroy()},n.prototype.close=n.prototype.disconnect=function(){this.skipReconnect=!0,this.backoff.reset(),this.readyState="closed",this.engine&&this.engine.close()},n.prototype.onclose=function(t){p("close"),this.cleanup(),this.backoff.reset(),this.readyState="closed",this.emit("close",t),this._reconnection&&!this.skipReconnect&&this.reconnect()},n.prototype.reconnect=function(){if(this.reconnecting||this.skipReconnect)return this;var t=this;if(this.backoff.attempts>=this._reconnectionAttempts)p("reconnect failed"),this.backoff.reset(),this.emitAll("reconnect_failed"),this.reconnecting=!1;else{var e=this.backoff.duration();p("will wait %dms before reconnect attempt",e),this.reconnecting=!0;var n=setTimeout(function(){t.skipReconnect||(p("attempting reconnect"),t.emitAll("reconnect_attempt",t.backoff.attempts),t.emitAll("reconnecting",t.backoff.attempts),t.skipReconnect||t.open(function(e){e?(p("reconnect attempt error"),t.reconnecting=!1,t.reconnect(),t.emitAll("reconnect_error",e.data)):(p("reconnect success"),t.onreconnect())}))},e);this.subs.push({destroy:function(){clearTimeout(n)}})}},n.prototype.onreconnect=function(){var t=this.backoff.attempts;this.reconnecting=!1,this.backoff.reset(),this.updateSocketIds(),this.emitAll("reconnect",t)}},{"./on":4,"./socket":5,"./url":6,backo2:7,"component-bind":8,"component-emitter":9,debug:10,"engine.io-client":11,indexof:42,"object-component":43,"socket.io-parser":46}],4:[function(t,e){function n(t,e,n){return t.on(e,n),{destroy:function(){t.removeListener(e,n)}}}e.exports=n},{}],5:[function(t,e,n){function r(t,e){this.io=t,this.nsp=e,this.json=this,this.ids=0,this.acks={},this.io.autoConnect&&this.open(),this.receiveBuffer=[],this.sendBuffer=[],this.connected=!1,this.disconnected=!0}var o=t("socket.io-parser"),i=t("component-emitter"),s=t("to-array"),a=t("./on"),c=t("component-bind"),p=t("debug")("socket.io-client:socket"),u=t("has-binary");e.exports=n=r;var f={connect:1,connect_error:1,connect_timeout:1,disconnect:1,error:1,reconnect:1,reconnect_attempt:1,reconnect_failed:1,reconnect_error:1,reconnecting:1},h=i.prototype.emit;i(r.prototype),r.prototype.subEvents=function(){if(!this.subs){var t=this.io;this.subs=[a(t,"open",c(this,"onopen")),a(t,"packet",c(this,"onpacket")),a(t,"close",c(this,"onclose"))]}},r.prototype.open=r.prototype.connect=function(){return this.connected?this:(this.subEvents(),this.io.open(),"open"==this.io.readyState&&this.onopen(),this)},r.prototype.send=function(){var t=s(arguments);return t.unshift("message"),this.emit.apply(this,t),this},r.prototype.emit=function(t){if(f.hasOwnProperty(t))return h.apply(this,arguments),this;var e=s(arguments),n=o.EVENT;u(e)&&(n=o.BINARY_EVENT);var r={type:n,data:e};return"function"==typeof e[e.length-1]&&(p("emitting packet with ack id %d",this.ids),this.acks[this.ids]=e.pop(),r.id=this.ids++),this.connected?this.packet(r):this.sendBuffer.push(r),this},r.prototype.packet=function(t){t.nsp=this.nsp,this.io.packet(t)},r.prototype.onopen=function(){p("transport is open - connecting"),"/"!=this.nsp&&this.packet({type:o.CONNECT})},r.prototype.onclose=function(t){p("close (%s)",t),this.connected=!1,this.disconnected=!0,delete this.id,this.emit("disconnect",t)},r.prototype.onpacket=function(t){if(t.nsp==this.nsp)switch(t.type){case o.CONNECT:this.onconnect();break;case o.EVENT:this.onevent(t);break;case o.BINARY_EVENT:this.onevent(t);break;case o.ACK:this.onack(t);break;case o.BINARY_ACK:this.onack(t);break;case o.DISCONNECT:this.ondisconnect();break;case o.ERROR:this.emit("error",t.data)}},r.prototype.onevent=function(t){var e=t.data||[];p("emitting event %j",e),null!=t.id&&(p("attaching ack callback to event"),e.push(this.ack(t.id))),this.connected?h.apply(this,e):this.receiveBuffer.push(e)},r.prototype.ack=function(t){var e=this,n=!1;return function(){if(!n){n=!0;var r=s(arguments);p("sending ack %j",r);var i=u(r)?o.BINARY_ACK:o.ACK;e.packet({type:i,id:t,data:r})}}},r.prototype.onack=function(t){p("calling ack %s with %j",t.id,t.data);var e=this.acks[t.id];e.apply(this,t.data),delete this.acks[t.id]},r.prototype.onconnect=function(){this.connected=!0,this.disconnected=!1,this.emit("connect"),this.emitBuffered()},r.prototype.emitBuffered=function(){var t;for(t=0;t0&&t.jitter<=1?t.jitter:0,this.attempts=0}e.exports=n,n.prototype.duration=function(){var t=this.ms*Math.pow(this.factor,this.attempts++);if(this.jitter){var e=Math.random(),n=Math.floor(e*this.jitter*t);t=0==(1&Math.floor(10*e))?t-n:t+n}return 0|Math.min(t,this.max)},n.prototype.reset=function(){this.attempts=0},n.prototype.setMin=function(t){this.ms=t},n.prototype.setMax=function(t){this.max=t},n.prototype.setJitter=function(t){this.jitter=t}},{}],8:[function(t,e){var n=[].slice;e.exports=function(t,e){if("string"==typeof e&&(e=t[e]),"function"!=typeof e)throw new Error("bind() requires a function");var r=n.call(arguments,2);return function(){return e.apply(t,r.concat(n.call(arguments)))}}},{}],9:[function(t,e){function n(t){return t?r(t):void 0}function r(t){for(var e in n.prototype)t[e]=n.prototype[e];return t}e.exports=n,n.prototype.on=n.prototype.addEventListener=function(t,e){return this._callbacks=this._callbacks||{},(this._callbacks[t]=this._callbacks[t]||[]).push(e),this},n.prototype.once=function(t,e){function n(){r.off(t,n),e.apply(this,arguments)}var r=this;return this._callbacks=this._callbacks||{},n.fn=e,this.on(t,n),this},n.prototype.off=n.prototype.removeListener=n.prototype.removeAllListeners=n.prototype.removeEventListener=function(t,e){if(this._callbacks=this._callbacks||{},0==arguments.length)return this._callbacks={},this;var n=this._callbacks[t];if(!n)return this;if(1==arguments.length)return delete this._callbacks[t],this;for(var r,o=0;or;++r)n[r].apply(this,e)}return this},n.prototype.listeners=function(t){return this._callbacks=this._callbacks||{},this._callbacks[t]||[]},n.prototype.hasListeners=function(t){return!!this.listeners(t).length}},{}],10:[function(t,e){function n(t){return n.enabled(t)?function(e){e=r(e);var o=new Date,i=o-(n[t]||o);n[t]=o,e=t+" "+e+" +"+n.humanize(i),window.console&&console.log&&Function.prototype.apply.call(console.log,console,arguments)}:function(){}}function r(t){return t instanceof Error?t.stack||t.message:t}e.exports=n,n.names=[],n.skips=[],n.enable=function(t){try{localStorage.debug=t}catch(e){}for(var r=(t||"").split(/[\s,]+/),o=r.length,i=0;o>i;i++)t=r[i].replace("*",".*?"),"-"===t[0]?n.skips.push(new RegExp("^"+t.substr(1)+"$")):n.names.push(new RegExp("^"+t+"$"))},n.disable=function(){n.enable("")},n.humanize=function(t){var e=1e3,n=6e4,r=60*n;return t>=r?(t/r).toFixed(1)+"h":t>=n?(t/n).toFixed(1)+"m":t>=e?(t/e|0)+"s":t+"ms"},n.enabled=function(t){for(var e=0,r=n.skips.length;r>e;e++)if(n.skips[e].test(t))return!1;for(var e=0,r=n.names.length;r>e;e++)if(n.names[e].test(t))return!0;return!1};try{window.localStorage&&n.enable(localStorage.debug)}catch(o){}},{}],11:[function(t,e){e.exports=t("./lib/")},{"./lib/":12}],12:[function(t,e){e.exports=t("./socket"),e.exports.parser=t("engine.io-parser")},{"./socket":13,"engine.io-parser":25}],13:[function(t,e){(function(n){function r(t,e){if(!(this instanceof r))return new r(t,e);if(e=e||{},t&&"object"==typeof t&&(e=t,t=null),t&&(t=u(t),e.host=t.host,e.secure="https"==t.protocol||"wss"==t.protocol,e.port=t.port,t.query&&(e.query=t.query)),this.secure=null!=e.secure?e.secure:n.location&&"https:"==location.protocol,e.host){var o=e.host.split(":");e.hostname=o.shift(),o.length?e.port=o.pop():e.port||(e.port=this.secure?"443":"80")}this.agent=e.agent||!1,this.hostname=e.hostname||(n.location?location.hostname:"localhost"),this.port=e.port||(n.location&&location.port?location.port:this.secure?443:80),this.query=e.query||{},"string"==typeof this.query&&(this.query=h.decode(this.query)),this.upgrade=!1!==e.upgrade,this.path=(e.path||"/engine.io").replace(/\/$/,"")+"/",this.forceJSONP=!!e.forceJSONP,this.jsonp=!1!==e.jsonp,this.forceBase64=!!e.forceBase64,this.enablesXDR=!!e.enablesXDR,this.timestampParam=e.timestampParam||"t",this.timestampRequests=e.timestampRequests,this.transports=e.transports||["polling","websocket"],this.readyState="",this.writeBuffer=[],this.callbackBuffer=[],this.policyPort=e.policyPort||843,this.rememberUpgrade=e.rememberUpgrade||!1,this.binaryType=null,this.onlyBinaryUpgrades=e.onlyBinaryUpgrades,this.pfx=e.pfx||null,this.key=e.key||null,this.passphrase=e.passphrase||null,this.cert=e.cert||null,this.ca=e.ca||null,this.ciphers=e.ciphers||null,this.rejectUnauthorized=e.rejectUnauthorized||null,this.open()}function o(t){var e={};for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n]);return e}var i=t("./transports"),s=t("component-emitter"),a=t("debug")("engine.io-client:socket"),c=t("indexof"),p=t("engine.io-parser"),u=t("parseuri"),f=t("parsejson"),h=t("parseqs");e.exports=r,r.priorWebsocketSuccess=!1,s(r.prototype),r.protocol=p.protocol,r.Socket=r,r.Transport=t("./transport"),r.transports=t("./transports"),r.parser=t("engine.io-parser"),r.prototype.createTransport=function(t){a('creating transport "%s"',t);var e=o(this.query);e.EIO=p.protocol,e.transport=t,this.id&&(e.sid=this.id);var n=new i[t]({agent:this.agent,hostname:this.hostname,port:this.port,secure:this.secure,path:this.path,query:e,forceJSONP:this.forceJSONP,jsonp:this.jsonp,forceBase64:this.forceBase64,enablesXDR:this.enablesXDR,timestampRequests:this.timestampRequests,timestampParam:this.timestampParam,policyPort:this.policyPort,socket:this,pfx:this.pfx,key:this.key,passphrase:this.passphrase,cert:this.cert,ca:this.ca,ciphers:this.ciphers,rejectUnauthorized:this.rejectUnauthorized});return n},r.prototype.open=function(){var t;if(this.rememberUpgrade&&r.priorWebsocketSuccess&&-1!=this.transports.indexOf("websocket"))t="websocket";else{if(0==this.transports.length){var e=this;return void setTimeout(function(){e.emit("error","No transports available")},0)}t=this.transports[0]}this.readyState="opening";var t;try{t=this.createTransport(t)}catch(n){return this.transports.shift(),void this.open()}t.open(),this.setTransport(t)},r.prototype.setTransport=function(t){a("setting transport %s",t.name);var e=this;this.transport&&(a("clearing existing transport %s",this.transport.name),this.transport.removeAllListeners()),this.transport=t,t.on("drain",function(){e.onDrain()}).on("packet",function(t){e.onPacket(t)}).on("error",function(t){e.onError(t)}).on("close",function(){e.onClose("transport close")})},r.prototype.probe=function(t){function e(){if(h.onlyBinaryUpgrades){var e=!this.supportsBinary&&h.transport.supportsBinary;f=f||e}f||(a('probe transport "%s" opened',t),u.send([{type:"ping",data:"probe"}]),u.once("packet",function(e){if(!f)if("pong"==e.type&&"probe"==e.data){if(a('probe transport "%s" pong',t),h.upgrading=!0,h.emit("upgrading",u),!u)return;r.priorWebsocketSuccess="websocket"==u.name,a('pausing current transport "%s"',h.transport.name),h.transport.pause(function(){f||"closed"!=h.readyState&&(a("changing transport and sending upgrade packet"),p(),h.setTransport(u),u.send([{type:"upgrade"}]),h.emit("upgrade",u),u=null,h.upgrading=!1,h.flush())})}else{a('probe transport "%s" failed',t);var n=new Error("probe error");n.transport=u.name,h.emit("upgradeError",n)}}))}function n(){f||(f=!0,p(),u.close(),u=null)}function o(e){var r=new Error("probe error: "+e);r.transport=u.name,n(),a('probe transport "%s" failed because of error: %s',t,e),h.emit("upgradeError",r)}function i(){o("transport closed")}function s(){o("socket closed")}function c(t){u&&t.name!=u.name&&(a('"%s" works - aborting "%s"',t.name,u.name),n())}function p(){u.removeListener("open",e),u.removeListener("error",o),u.removeListener("close",i),h.removeListener("close",s),h.removeListener("upgrading",c)}a('probing transport "%s"',t);var u=this.createTransport(t,{probe:1}),f=!1,h=this;r.priorWebsocketSuccess=!1,u.once("open",e),u.once("error",o),u.once("close",i),this.once("close",s),this.once("upgrading",c),u.open()},r.prototype.onOpen=function(){if(a("socket open"),this.readyState="open",r.priorWebsocketSuccess="websocket"==this.transport.name,this.emit("open"),this.flush(),"open"==this.readyState&&this.upgrade&&this.transport.pause){a("starting upgrade probes");for(var t=0,e=this.upgrades.length;e>t;t++)this.probe(this.upgrades[t])}},r.prototype.onPacket=function(t){if("opening"==this.readyState||"open"==this.readyState)switch(a('socket receive: type "%s", data "%s"',t.type,t.data),this.emit("packet",t),this.emit("heartbeat"),t.type){case"open":this.onHandshake(f(t.data));break;case"pong":this.setPing();break;case"error":var e=new Error("server error");e.code=t.data,this.emit("error",e);break;case"message":this.emit("data",t.data),this.emit("message",t.data)}else a('packet received with socket readyState "%s"',this.readyState)},r.prototype.onHandshake=function(t){this.emit("handshake",t),this.id=t.sid,this.transport.query.sid=t.sid,this.upgrades=this.filterUpgrades(t.upgrades),this.pingInterval=t.pingInterval,this.pingTimeout=t.pingTimeout,this.onOpen(),"closed"!=this.readyState&&(this.setPing(),this.removeListener("heartbeat",this.onHeartbeat),this.on("heartbeat",this.onHeartbeat))},r.prototype.onHeartbeat=function(t){clearTimeout(this.pingTimeoutTimer);var e=this;e.pingTimeoutTimer=setTimeout(function(){"closed"!=e.readyState&&e.onClose("ping timeout")},t||e.pingInterval+e.pingTimeout)},r.prototype.setPing=function(){var t=this;clearTimeout(t.pingIntervalTimer),t.pingIntervalTimer=setTimeout(function(){a("writing ping packet - expecting pong within %sms",t.pingTimeout),t.ping(),t.onHeartbeat(t.pingTimeout)},t.pingInterval)},r.prototype.ping=function(){this.sendPacket("ping")},r.prototype.onDrain=function(){for(var t=0;tn;n++)~c(this.transports,t[n])&&e.push(t[n]);return e}}).call(this,"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./transport":14,"./transports":15,"component-emitter":9,debug:22,"engine.io-parser":25,indexof:42,parsejson:34,parseqs:35,parseuri:36}],14:[function(t,e){function n(t){this.path=t.path,this.hostname=t.hostname,this.port=t.port,this.secure=t.secure,this.query=t.query,this.timestampParam=t.timestampParam,this.timestampRequests=t.timestampRequests,this.readyState="",this.agent=t.agent||!1,this.socket=t.socket,this.enablesXDR=t.enablesXDR,this.pfx=t.pfx,this.key=t.key,this.passphrase=t.passphrase,this.cert=t.cert,this.ca=t.ca,this.ciphers=t.ciphers,this.rejectUnauthorized=t.rejectUnauthorized}var r=t("engine.io-parser"),o=t("component-emitter");e.exports=n,o(n.prototype),n.timestamps=0,n.prototype.onError=function(t,e){var n=new Error(t);return n.type="TransportError",n.description=e,this.emit("error",n),this},n.prototype.open=function(){return("closed"==this.readyState||""==this.readyState)&&(this.readyState="opening",this.doOpen()),this},n.prototype.close=function(){return("opening"==this.readyState||"open"==this.readyState)&&(this.doClose(),this.onClose()),this},n.prototype.send=function(t){if("open"!=this.readyState)throw new Error("Transport not open");this.write(t)},n.prototype.onOpen=function(){this.readyState="open",this.writable=!0,this.emit("open")},n.prototype.onData=function(t){var e=r.decodePacket(t,this.socket.binaryType);this.onPacket(e)},n.prototype.onPacket=function(t){this.emit("packet",t)},n.prototype.onClose=function(){this.readyState="closed",this.emit("close")}},{"component-emitter":9,"engine.io-parser":25}],15:[function(t,e,n){(function(e){function r(t){var n,r=!1,a=!1,c=!1!==t.jsonp;if(e.location){var p="https:"==location.protocol,u=location.port;u||(u=p?443:80),r=t.hostname!=location.hostname||u!=t.port,a=t.secure!=p}if(t.xdomain=r,t.xscheme=a,n=new o(t),"open"in n&&!t.forceJSONP)return new i(t);if(!c)throw new Error("JSONP disabled");return new s(t)}var o=t("xmlhttprequest"),i=t("./polling-xhr"),s=t("./polling-jsonp"),a=t("./websocket");n.polling=r,n.websocket=a}).call(this,"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./polling-jsonp":16,"./polling-xhr":17,"./websocket":19,xmlhttprequest:20}],16:[function(t,e){(function(n){function r(){}function o(t){i.call(this,t),this.query=this.query||{},a||(n.___eio||(n.___eio=[]),a=n.___eio),this.index=a.length;var e=this;a.push(function(t){e.onData(t)}),this.query.j=this.index,n.document&&n.addEventListener&&n.addEventListener("beforeunload",function(){e.script&&(e.script.onerror=r)},!1)}var i=t("./polling"),s=t("component-inherit");e.exports=o;var a,c=/\n/g,p=/\\n/g;s(o,i),o.prototype.supportsBinary=!1,o.prototype.doClose=function(){this.script&&(this.script.parentNode.removeChild(this.script),this.script=null),this.form&&(this.form.parentNode.removeChild(this.form),this.form=null,this.iframe=null),i.prototype.doClose.call(this)},o.prototype.doPoll=function(){var t=this,e=document.createElement("script");this.script&&(this.script.parentNode.removeChild(this.script),this.script=null),e.async=!0,e.src=this.uri(),e.onerror=function(e){t.onError("jsonp poll error",e)};var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(e,n),this.script=e;var r="undefined"!=typeof navigator&&/gecko/i.test(navigator.userAgent);r&&setTimeout(function(){var t=document.createElement("iframe");document.body.appendChild(t),document.body.removeChild(t)},100)},o.prototype.doWrite=function(t,e){function n(){r(),e()}function r(){if(o.iframe)try{o.form.removeChild(o.iframe)}catch(t){o.onError("jsonp polling iframe removal error",t)}try{var e='