css focus styling

Cargo.toml

@@ -9,7 +9,7 @@ edition = "2018"
 [dependencies]
 actix-web = "3.3.2"
 sqlx = { version = "0.5.1", default-features = false, features = [ "runtime-async-std-rustls", "postgres", "chrono" ] }
-env_logger = "0.8.3"
+env_logger = "0.9.0"
 log = "0.4.14"
 actix-files = "0.5.0"
 async-std = "1.9.0"
@@ -18,6 +18,7 @@ futures = "0.3.13"
 rand = "0.8.3"
 chrono = "0.4.19"
 htmlescape = "0.3.1"
-urlencoding = "1.1.1"
+urlencoding = "2.1.0"
-tree_magic_mini = "1.0.1"
+tree_magic_mini = { version = "3.0.0", features = ["with-gpl-data"] }
 mime = "0.3.16"
+url = "2.2.2"

Dockerfile

@@ -1,4 +1,4 @@
-FROM ekidd/rust-musl-builder:latest as build
+FROM ekidd/rust-musl-builder:beta as build
 
 USER rust
 WORKDIR /home/rust/src/
@@ -11,6 +11,7 @@ RUN cargo build --release
 COPY --chown=rust src ./src
 COPY --chown=rust static ./static
 COPY --chown=rust template ./template
+COPY --chown=rust snippet ./snippet
 COPY --chown=rust init-db.sql ./init-db.sql
 RUN touch src/main.rs
 RUN cargo build --release

LICENSE

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

README.md

@@ -25,17 +25,40 @@ docker-compose up -d --build
 
 ## running & config
 
-The static files directory needs to be next to the binary.
+- The static files directory needs to be next to the binary.
+- The maximum filename length is 255
 
-| environment variable | default value        |
+### General configuration
-| -------------------- | -------------------- |
-| DATABASE_URL         |                      |
-| DATABASE_USER        |                      |
-| DATABASE_PASS        |                      |
-| DATABASE_HOST        | localhost            |
-| DATABASE_NAME        | datatrash            |
-| FILES_DIR            | ./files              |
-| UPLOAD_MAX_BYTES     | 8388608 (8MiB)       |
-| BIND_ADDRESS         | 0.0.0.0:8000         |
 
-The maximum filename length is 255
+| environment variable | default value  |
+| -------------------- | -------------- |
+| FILES_DIR            | ./files        |
+| UPLOAD_MAX_BYTES     | 8388608 (8MiB) |
+| BIND_ADDRESS         | 0.0.0.0:8000   |
+
+### Database configuration
+
+| environment variable | default value |
+| -------------------- | ------------- |
+| DATABASE_URL         |               |
+| DATABASE_USER        |               |
+| DATABASE_PASS        |               |
+| DATABASE_HOST        | localhost     |
+| DATABASE_NAME        | datatrash     |
+
+### No auth limits configuration
+
+Require authentication for certain uploads
+
+- The password is provided as plain text
+- Uploads with longer validity than NO_AUTH_MAX_TIME require authentication
+- Uploads larger than NO_AUTH_LARGE_FILE_SIZE require auth when they are valid for longer than
+  NO_AUTH_LARGE_FILE_MAX_TIME
+- All times are in seconds, the size is in bytes
+
+| environment variable        | default value |
+| --------------------------- | ------------- |
+| AUTH_PASSWORD               |               |
+| NO_AUTH_MAX_TIME            |               |
+| NO_AUTH_LARGE_FILE_MAX_TIME |               |
+| NO_AUTH_LARGE_FILE_SIZE     |               |

docker-compose.yml

@@ -2,16 +2,38 @@ version: "3.3"
 services:
   datatrash:
     build: .
+    container_name: datatrash
+    volumes:
+      - /data/datatrash/files:/opt/datatrash/files
     environment:
-      DATABASE_USER: admin
+      DATABASE_HOST: db
-      DATABASE_PASSWORD: secure
+      DATABASE_USER: datatrash
-      DATABASE_HOST: postgres
+      DATABASE_PASS: jNmLZYr75as0W5TY7iSaIEVPSa2awaWAAgC5Zt8JsRAXbYrscLW4Dk7ZxHL1Bu4v
-    ports:
+      UPLOAD_MAX_BYTES: 1073741824
-      - '8000:8000'
+      AUTH_PASSWORD: auth_password
-  postgres:
+      NO_AUTH_MAX_TIME: 604800
+      NO_AUTH_LARGE_FILE_MAX_TIME: 1800
+      NO_AUTH_LARGE_FILE_SIZE: 10485760
+    networks:
+      - default
+      - nginx
+    restart: unless-stopped
+    depends_on:
+      - db
+  db:
     image: postgres
+    container_name: datatrash-db
+    volumes:
+      - /data/datatrash/db:/var/lib/postgresql/data
     environment:
-      POSTGRES_USER: admin
+      POSTGRES_DB: datatrash
-      POSTGRES_PASSWORD: secure
+      POSTGRES_USER: datatrash
-
+      POSTGRES_PASSWORD: jNmLZYr75as0W5TY7iSaIEVPSa2awaWAAgC5Zt8JsRAXbYrscLW4Dk7ZxHL1Bu4v
+    restart: unless-stopped
+    networks:
+      - default
 
+networks:
+  nginx:
+    external:
+      name: nginx_default

init-db.sql

@@ -8,3 +8,4 @@ CREATE TABLE IF NOT EXISTS files (
 );
 
 ALTER TABLE files ADD COLUMN IF NOT EXISTS delete_on_download boolean;
+ALTER TABLE files ALTER COLUMN delete_on_download set not null;

snippet/auth.html.snippet

@@ -0,0 +1,9 @@
+
+        <div id="password-input">
+          <label for="password">
+            passwort benötigt (&gt;{auth_time} oder datei &gt;{auth_large_size} und &gt;{auth_large_time})
+          </label>
+          <br />
+          <input id="password" name="password" type="password" />
+        </div>
+        <script src="/assets/auth-hide.js" lang="javascript"></script>

snippet/max_size.html.snippet

@@ -0,0 +1 @@
+ (maximal {max_size})

src/config.rs

@@ -1,11 +1,21 @@
 use std::env;
 
 use async_std::{fs, path::PathBuf};
+use chrono::Duration;
 
 #[derive(Clone)]
 pub struct Config {
     pub files_dir: PathBuf,
     pub max_file_size: Option<u64>,
+    pub no_auth_limits: Option<NoAuthLimits>,
+}
+
+#[derive(Clone)]
+pub struct NoAuthLimits {
+    pub auth_password: String,
+    pub max_time: Duration,
+    pub large_file_max_time: Duration,
+    pub large_file_size: u64,
 }
 
 pub async fn get_config() -> Config {
@@ -20,8 +30,35 @@ pub async fn get_config() -> Config {
         .await
         .expect("could not create directory for storing files");
 
+    let no_auth_limits = get_no_auth_limits();
+
     Config {
         files_dir,
         max_file_size,
+        no_auth_limits,
     }
 }
+
+fn get_no_auth_limits() -> Option<NoAuthLimits> {
+    match (
+        env::var("AUTH_PASSWORD").ok(),
+        env_number("NO_AUTH_MAX_TIME"),
+        env_number("NO_AUTH_LARGE_FILE_MAX_TIME"),
+        env_number("NO_AUTH_LARGE_FILE_SIZE"),
+    ) {
+        (Some(auth_password), Some(max_time), Some(large_file_max_time), Some(large_file_size)) => {
+            Some(NoAuthLimits {
+                auth_password,
+                max_time: Duration::seconds(max_time as i64),
+                large_file_max_time: Duration::seconds(large_file_max_time as i64),
+                large_file_size,
+            })
+        }
+        (None, None, None, None) => None,
+        _ => panic!("Incomplete NO_AUTH configuration: All environment variables must be specified")
+    }
+}
+
+fn env_number(variable: &str) -> Option<u64> {
+    env::var(variable).ok().and_then(|n| n.parse::<u64>().ok())
+}

src/deleter.rs

@@ -36,7 +36,7 @@ pub(crate) async fn delete_by_id(
     file_id: &str,
     files_dir: &Path,
 ) -> Result<(), sqlx::Error> {
-    delete_content(file_id, &files_dir).await?;
+    delete_content(file_id, files_dir).await?;
     sqlx::query("DELETE FROM files WHERE file_id = $1")
         .bind(file_id)
         .execute(db)
@@ -54,14 +54,12 @@ async fn delete_content(file_id: &str, files_dir: &Path) -> Result<(), std::io::
 }
 
 async fn wait_for_file_expiry(receiver: &Receiver<()>, db: &PgPool) {
-    let mut rows = sqlx::query("SELECT MIN(valid_till) as min from files").fetch(db);
+    let valid_till: (Option<NaiveDateTime>,) =
-    let row = rows
+        sqlx::query_as("SELECT MIN(valid_till) as min from files")
-        .try_next()
+            .fetch_one(db)
-        .await
+            .await
-        .expect("could not fetch expiring files from database")
+            .expect("could not fetch expiring files from database");
-        .expect("postgres min did not return any row");
+    let next_timeout = match valid_till.0 {
-    let valid_till: Option<NaiveDateTime> = row.get("min");
-    let next_timeout = match valid_till {
         Some(valid_till) => valid_till.signed_duration_since(Local::now().naive_local()),
         None => Duration::days(1),
     };

src/download.rs

@@ -1,3 +1,5 @@
+use std::str::FromStr;
+
 use actix_files::NamedFile;
 use actix_web::{
     error,
@@ -5,17 +7,17 @@ use actix_web::{
     web, Error, HttpRequest, HttpResponse,
 };
 use async_std::{fs, path::Path};
-use futures::TryStreamExt;
 use mime::Mime;
-use sqlx::{
+use sqlx::postgres::PgPool;
-    postgres::{PgPool, PgRow},
+use url::Url;
-    Row,
-};
 
 use crate::deleter;
 use crate::{config::Config, file_kind::FileKind};
 
-const VIEW_HTML: &str = include_str!("../template/view.html");
+const TEXT_VIEW_HTML: &str = include_str!("../template/text-view.html");
+const URL_VIEW_HTML: &str = include_str!("../template/url-view.html");
+
+const TEXT_VIEW_SIZE_LIMIT: u64 = 512 * 1024; // 512KiB
 
 pub async fn download(
     req: HttpRequest,
@@ -23,73 +25,113 @@ pub async fn download(
     config: web::Data<Config>,
 ) -> Result<HttpResponse, Error> {
     let id = req.match_info().query("id");
-    let mut rows = sqlx::query(
+    let (file_id, file_name, file_kind, delete_on_download) = load_file_info(id, &db).await?;
-        "SELECT file_id, file_name, kind, delete_on_download from files WHERE file_id = $1",
-    )
-    .bind(id)
-    .fetch(db.as_ref());
-    let row: PgRow = rows
-        .try_next()
-        .await
-        .map_err(|_| error::ErrorInternalServerError("could not run select statement"))?
-        .ok_or_else(|| error::ErrorNotFound("file does not exist or has expired"))?;
-
-    let file_id: String = row.get("file_id");
-    let file_name: String = row.get("file_name");
-    let file_kind: String = row.get("kind");
-    let delete_on_download: bool = row.get("delete_on_download");
     let mut path = config.files_dir.clone();
     path.push(&file_id);
 
     let download = delete_on_download || req.query_string().contains("dl");
-    let (content_type, mut content_disposition) = get_content_types(&path, &file_name);
+    let content_type = get_content_type(&path);
-    let is_text = file_kind == FileKind::Text.to_string() || content_type.type_() == mime::TEXT;
+    let response = if use_text_view(&file_kind, &content_type, &path, download).await {
-    let response = if is_text && !download {
+        build_text_response(&path).await
-        let content = fs::read_to_string(path).await.map_err(|_| {
-            error::ErrorInternalServerError("this file should be here but could not be found")
-        })?;
-        let encoded = htmlescape::encode_minimal(&content);
-        let view_html = VIEW_HTML.replace("{text}", &encoded);
-        let response = HttpResponse::Ok().content_type("text/html").body(view_html);
-        Ok(response)
     } else {
-        if download {
+        build_file_response(download, &file_name, path, content_type, req)
-            content_disposition.disposition = DispositionType::Attachment;
-        }
-        let file = NamedFile::open(path)
-            .map_err(|_| {
-                error::ErrorInternalServerError("this file should be here but could not be found")
-            })?
-            .set_content_type(content_type)
-            .set_content_disposition(content_disposition);
-        file.into_response(&req)
     };
     if delete_on_download {
         deleter::delete_by_id(&db, &file_id, &config.files_dir)
             .await
-            .map_err(|_| error::ErrorInternalServerError("could not delete file"))?;
+            .map_err(|db_err| {
+                log::error!("could not delete file {:?}", db_err);
+                error::ErrorInternalServerError("could not delete file")
+            })?;
     }
     response
 }
 
-fn get_content_types(path: &Path, filename: &str) -> (Mime, ContentDisposition) {
+async fn load_file_info(
+    id: &str,
+    db: &web::Data<sqlx::Pool<sqlx::Postgres>>,
+) -> Result<(String, String, String, bool), Error> {
+    sqlx::query_as(
+        "SELECT file_id, file_name, kind, delete_on_download from files WHERE file_id = $1",
+    )
+    .bind(id)
+    .fetch_optional(db.as_ref())
+    .await
+    .map_err(|db_err| {
+        log::error!("could not run select statement {:?}", db_err);
+        error::ErrorInternalServerError("could not run select statement")
+    })?
+    .ok_or_else(|| error::ErrorNotFound("file does not exist or has expired"))
+}
+
+fn get_content_type(path: &Path) -> Mime {
     let std_path = std::path::Path::new(path.as_os_str());
-    let ct = tree_magic_mini::from_filepath(std_path)
+    tree_magic_mini::from_filepath(std_path)
         .unwrap_or("application/octet-stream")
         .parse::<Mime>()
-        .expect("tree_magic_mini should not produce invalid mime");
+        .expect("tree_magic_mini should not produce invalid mime")
+}
 
-    let disposition = match ct.type_() {
+async fn use_text_view(
-        mime::IMAGE | mime::TEXT | mime::AUDIO | mime::VIDEO => DispositionType::Inline,
+    file_kind: &str,
-        _ => DispositionType::Attachment,
+    content_type: &Mime,
+    file_path: &Path,
+    download: bool,
+) -> bool {
+    let is_text =
+        FileKind::from_str(file_kind) == Ok(FileKind::Text) || content_type.type_() == mime::TEXT;
+    let is_not_large = get_file_size(file_path).await < TEXT_VIEW_SIZE_LIMIT;
+    is_text && is_not_large && !download
+}
+
+async fn get_file_size(file_path: &Path) -> u64 {
+    fs::metadata(file_path)
+        .await
+        .map(|metadata| metadata.len())
+        .unwrap_or(0)
+}
+
+async fn build_text_response(path: &Path) -> Result<HttpResponse, Error> {
+    let content = fs::read_to_string(path).await.map_err(|file_err| {
+        log::error!("file could not be read {:?}", file_err);
+        error::ErrorInternalServerError("this file should be here but could not be found")
+    })?;
+    let encoded = htmlescape::encode_minimal(&content);
+    let html = if !content.contains(&['\n', '\r'][..]) && Url::from_str(&content).is_ok() {
+        let attribute_encoded = htmlescape::encode_attribute(&content);
+        URL_VIEW_HTML
+            .replace("{link_content}", &encoded)
+            .replace("{link_attribute}", &attribute_encoded)
+    } else {
+        TEXT_VIEW_HTML.replace("{text}", &encoded)
     };
+    let response = HttpResponse::Ok().content_type("text/html").body(html);
+    Ok(response)
+}
 
-    let cd = ContentDisposition {
+fn build_file_response(
-        disposition,
+    download: bool,
-        parameters: get_disposition_params(filename),
+    file_name: &str,
+    path: async_std::path::PathBuf,
+    content_type: Mime,
+    req: HttpRequest,
+) -> Result<HttpResponse, Error> {
+    let content_disposition = ContentDisposition {
+        disposition: if download {
+            DispositionType::Attachment
+        } else {
+            DispositionType::Inline
+        },
+        parameters: get_disposition_params(file_name),
     };
-
+    let file = NamedFile::open(path)
-    (ct, cd)
+        .map_err(|file_err| {
+            log::error!("file could not be read {:?}", file_err);
+            error::ErrorInternalServerError("this file should be here but could not be found")
+        })?
+        .set_content_type(content_type)
+        .set_content_disposition(content_disposition);
+    file.into_response(&req)
 }
 
 fn get_disposition_params(filename: &str) -> Vec<DispositionParam> {

src/main.rs

@@ -7,7 +7,7 @@ mod multipart;
 mod upload;
 
 use actix_files::Files;
-use actix_web::{middleware, web, App, Error, HttpResponse, HttpServer};
+use actix_web::{middleware::Logger, web, App, Error, HttpResponse, HttpServer};
 use async_std::{channel, task};
 use env_logger::Env;
 use sqlx::postgres::PgPool;
@@ -29,20 +29,20 @@ async fn main() -> std::io::Result<()> {
 
     log::info!("omnomnom");
 
-    task::spawn(deleter::delete_old_files(
+    let db = web::Data::new(pool.clone());
-        receiver,
-        pool.clone(),
-        config.files_dir.clone(),
-    ));
-
-    let db = web::Data::new(pool);
     let expiry_watch_sender = web::Data::new(sender);
     let bind_address = env::var("BIND_ADDRESS").unwrap_or_else(|_| "0.0.0.0:8000".to_owned());
 
+    task::spawn(deleter::delete_old_files(
+        receiver,
+        pool,
+        config.files_dir.clone(),
+    ));
+
     HttpServer::new({
         move || {
             App::new()
-                .wrap(middleware::Logger::new(r#"%{r}a "%r" =%s %bbytes %Tsec"#))
+                .wrap(Logger::new(r#"%{r}a "%r" =%s %bbytes %Tsec"#))
                 .app_data(db.clone())
                 .app_data(expiry_watch_sender.clone())
                 .data(config.clone())
@@ -52,6 +52,9 @@ async fn main() -> std::io::Result<()> {
                     web::resource(["/upload/{id}", "/upload/{id}/{name}"])
                         .route(web::get().to(upload::uploaded)),
                 )
+                .service(
+                    web::resource("/assets/auth-hide.js").route(web::get().to(upload::auth_hide)),
+                )
                 .service(Files::new("/static", "static").disable_content_disposition())
                 .service(
                     web::resource([

src/multipart.rs

@@ -1,10 +1,13 @@
-use crate::file_kind::FileKind;
+use crate::{config, file_kind::FileKind};
 use actix_multipart::{Field, Multipart};
-use actix_web::{error, http::header::DispositionParam};
+use actix_web::{error, http::header::DispositionParam, Error};
-use async_std::{fs, fs::File, path::Path, prelude::*};
+use async_std::{fs::File, path::Path, prelude::*};
 use chrono::{prelude::*, Duration};
 use futures::{StreamExt, TryStreamExt};
 
+const MAX_UPLOAD_SECONDS: u64 = 31 * 24 * 60 * 60;
+const DEFAULT_UPLOAD_SECONDS: u64 = 30 * 60;
+
 pub(crate) struct UploadConfig {
     pub original_name: String,
     pub valid_till: DateTime<Local>,
@@ -15,13 +18,15 @@ pub(crate) struct UploadConfig {
 pub(crate) async fn parse_multipart(
     mut payload: Multipart,
     file_id: &str,
-    filename: &Path,
+    file_name: &Path,
-    max_size: Option<u64>,
+    config: &config::Config,
 ) -> Result<UploadConfig, error::Error> {
     let mut original_name: Option<String> = None;
     let mut keep_for: Option<String> = None;
     let mut kind: Option<FileKind> = None;
     let mut delete_on_download = false;
+    let mut password = None;
+    let mut size = 0;
 
     while let Ok(Some(field)) = payload.try_next().await {
         let name = get_field_name(&field)?;
@@ -37,10 +42,7 @@ pub(crate) async fn parse_multipart(
                 }
                 original_name = file_original_name;
                 kind = Some(FileKind::Binary);
-                let mut file = fs::File::create(&filename)
+                size = create_file(file_name, field, config.max_file_size).await?;
-                    .await
-                    .map_err(|_| error::ErrorInternalServerError("could not create file"))?;
-                write_to_file(&mut file, field, max_size).await?;
             }
             "text" => {
                 if original_name.is_some() {
@@ -48,13 +50,13 @@ pub(crate) async fn parse_multipart(
                 }
                 original_name = Some(format!("{}.txt", file_id));
                 kind = Some(FileKind::Text);
-                let mut file = fs::File::create(&filename)
+                size = create_file(file_name, field, config.max_file_size).await?;
-                    .await
-                    .map_err(|_| error::ErrorInternalServerError("could not create file"))?;
-                write_to_file(&mut file, field, max_size).await?;
             }
             "delete_on_download" => {
-                delete_on_download = dbg!(parse_string(name, field).await?) != "false";
+                delete_on_download = parse_string(name, field).await? != "false";
+            }
+            "password" => {
+                password = Some(parse_string(name, field).await?);
             }
             _ => {}
         };
@@ -66,21 +68,24 @@ pub(crate) async fn parse_multipart(
     if original_name.len() > 255 {
         return Err(error::ErrorBadRequest("filename is too long"));
     }
-    let valid_till = if let Some(keep_for) = keep_for {
+    let validated_keep_for: u64 = if let Some(keep_for) = keep_for {
-        let keep_for = keep_for.parse().map_err(|e| {
+        let seconds = keep_for.parse().map_err(|e| {
             error::ErrorBadRequest(format!("field keep_for is not a number: {}", e))
         })?;
-        let max_keep_for = Duration::days(31).num_seconds();
+        if seconds > MAX_UPLOAD_SECONDS {
-        if keep_for > max_keep_for {
             return Err(error::ErrorBadRequest(format!(
                 "maximum allowed validity is {} seconds, but you specified {} seconds",
-                max_keep_for, keep_for
+                MAX_UPLOAD_SECONDS, seconds
             )));
         }
-        Local::now() + Duration::seconds(keep_for)
+        seconds
     } else {
-        Local::now() + Duration::seconds(1800)
+        DEFAULT_UPLOAD_SECONDS
     };
+    let valid_duration = Duration::seconds(validated_keep_for as i64);
+    let valid_till = Local::now() + valid_duration;
+
+    check_auth_requirements(size, valid_duration, password, config)?;
 
     Ok(UploadConfig {
         original_name,
@@ -90,6 +95,25 @@ pub(crate) async fn parse_multipart(
     })
 }
 
+fn check_auth_requirements(
+    size: u64,
+    validated_keep_for: Duration,
+    password: Option<String>,
+    config: &config::Config,
+) -> Result<(), error::Error> {
+    if let Some(no_auth_limits) = &config.no_auth_limits {
+        let requires_auth = validated_keep_for > no_auth_limits.max_time
+            || validated_keep_for > no_auth_limits.large_file_max_time
+                && size > no_auth_limits.large_file_size;
+        if requires_auth && password.as_ref() != Some(&no_auth_limits.auth_password) {
+            return Err(error::ErrorBadRequest(
+                "upload requires authentication, but authentication was incorrect",
+            ));
+        }
+    }
+    Ok(())
+}
+
 fn get_field_name(field: &Field) -> Result<String, error::Error> {
     Ok(field
         .content_disposition()
@@ -113,16 +137,29 @@ async fn read_content(mut field: actix_multipart::Field) -> Result<Vec<u8>, erro
     Ok(data)
 }
 
+async fn create_file(
+    filename: &Path,
+    field: Field,
+    max_file_size: Option<u64>,
+) -> Result<u64, Error> {
+    let mut file = File::create(&filename).await.map_err(|file_err| {
+        log::error!("could not create file {:?}", file_err);
+        error::ErrorInternalServerError("could not create file")
+    })?;
+    let written_bytes = write_to_file(&mut file, field, max_file_size).await?;
+    Ok(written_bytes)
+}
+
 async fn write_to_file(
     file: &mut File,
-    mut field: actix_multipart::Field,
+    mut field: Field,
     max_size: Option<u64>,
-) -> Result<(), error::Error> {
+) -> Result<u64, error::Error> {
     let mut written_bytes: u64 = 0;
     while let Some(chunk) = field.next().await {
         let chunk = chunk.map_err(error::ErrorBadRequest)?;
+        written_bytes += chunk.len() as u64;
         if let Some(max_size) = max_size {
-            written_bytes += chunk.len() as u64;
             if written_bytes > max_size {
                 return Err(error::ErrorBadRequest(format!(
                     "exceeded maximum file size of {} bytes",
@@ -130,11 +167,12 @@ async fn write_to_file(
                 )));
             }
         }
-        file.write_all(chunk.as_ref())
+        file.write_all(chunk.as_ref()).await.map_err(|write_err| {
-            .await
+            log::error!("could not write file {:?}", write_err);
-            .map_err(|_| error::ErrorInternalServerError("could not write file"))?;
+            error::ErrorInternalServerError("could not write file")
+        })?;
     }
-    Ok(())
+    Ok(written_bytes)
 }
 
 fn get_original_filename(field: &actix_multipart::Field) -> Option<String> {

src/upload.rs

@@ -1,27 +1,143 @@
+use std::io::ErrorKind;
+use std::{cmp, vec};
+
 use crate::config::Config;
 use crate::file_kind::FileKind;
 use crate::multipart;
 use crate::multipart::UploadConfig;
 use actix_multipart::Multipart;
 use actix_web::{error, web, Error, HttpResponse};
-use async_std::{channel::Sender, fs};
+use async_std::{
+    channel::Sender,
+    fs::{self, OpenOptions},
+    path::PathBuf,
+};
+use chrono::Duration;
 use rand::prelude::SliceRandom;
 use sqlx::postgres::PgPool;
 
 const INDEX_HTML: &str = include_str!("../template/index.html");
+const AUTH_HIDE_JS: &str = include_str!("../template/auth-hide.js");
 const UPLOAD_HTML: &str = include_str!("../template/upload.html");
+const AUTH_SNIPPET_HTML: &str = include_str!("../snippet/auth.html.snippet");
+const MAX_SIZE_SNIPPET_HTML: &str = include_str!("../snippet/max_size.html.snippet");
 
 const ID_CHARS: &[char] = &[
     'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'j', 'k', 'm', 'n', 'p', 'q', 'r', 's', 't', 'u', 'v',
     'w', 'x', 'y', 'z', '1', '2', '3', '4', '5', '6', '7', '8', '9',
 ];
 
-pub async fn index(req: web::HttpRequest) -> Result<HttpResponse, Error> {
+pub async fn index(
-    let upload_url = format!("{}/upload", get_host_url(&req));
+    req: web::HttpRequest,
-    let index_html = INDEX_HTML.replace("{upload_url}", upload_url.as_str());
+    config: web::Data<Config>,
+) -> Result<HttpResponse, Error> {
+    let filled_index_html = fill_index_html(req, config);
     Ok(HttpResponse::Ok()
         .content_type("text/html")
-        .body(index_html))
+        .body(filled_index_html))
+}
+
+fn fill_index_html(req: web::HttpRequest, config: web::Data<Config>) -> String {
+    let upload_url = format!("{}/upload", get_host_url(&req));
+    let auth_snippet = config
+        .no_auth_limits
+        .as_ref()
+        .map_or("", |_| AUTH_SNIPPET_HTML);
+    let max_size_snippet = config
+        .max_file_size
+        .as_ref()
+        .map_or("", |_| MAX_SIZE_SNIPPET_HTML);
+    INDEX_HTML
+        .replace("{max_size_snippet}", max_size_snippet)
+        .replace(
+            "{max_size}",
+            &render_file_size(config.max_file_size.unwrap_or(0)),
+        )
+        .replace("{auth_snippet}", auth_snippet)
+        .replace(
+            "{auth_time}",
+            &config
+                .no_auth_limits
+                .as_ref()
+                .map(|limit| limit.max_time)
+                .map_or("".into(), render_duration),
+        )
+        .replace(
+            "{auth_large_time}",
+            &config
+                .no_auth_limits
+                .as_ref()
+                .map(|limit| limit.large_file_max_time)
+                .map_or("".into(), render_duration),
+        )
+        .replace(
+            "{auth_large_size}",
+            &config
+                .no_auth_limits
+                .as_ref()
+                .map(|limit| limit.large_file_size)
+                .map_or("".into(), render_file_size),
+        )
+        .replace("{upload_url}", upload_url.as_str())
+}
+
+fn render_file_size(size: u64) -> String {
+    let magnitude = cmp::min((size as f64).log(1024.0) as u32, 5);
+    let prefix = ["", "ki", "Mi", "Gi", "Ti", "Pi"][magnitude as usize];
+    let value = size / (1024_u64.pow(magnitude));
+    format!("{}{}B", value, prefix)
+}
+
+fn render_duration(duration: Duration) -> String {
+    let days = duration.num_days();
+    let hours = duration.num_hours() % 24;
+    let minutes = duration.num_minutes() % 60;
+    let seconds = duration.num_seconds() % 60;
+    let mut elements = vec![];
+    if let Some(name) = pluralize(days, "tag", "e") {
+        elements.push(name);
+    }
+    if let Some(name) = pluralize(hours, "stunde", "n") {
+        elements.push(name);
+    }
+    if let Some(name) = pluralize(minutes, "minute", "n") {
+        elements.push(name);
+    }
+    if let Some(name) = pluralize(seconds, "sekunde", "n") {
+        elements.push(name);
+    }
+    elements.join("+")
+}
+
+fn pluralize(number: i64, word: &str, suffix: &str) -> Option<String> {
+    match number {
+        0 => None,
+        1 => Some(format!("{} {}", number, word)),
+        _ => Some(format!("{} {}{}", number, word, suffix)),
+    }
+}
+
+pub async fn auth_hide(config: web::Data<Config>) -> Result<HttpResponse, Error> {
+    if let Some(no_auth_limits) = &config.no_auth_limits {
+        let auth_hide_js = AUTH_HIDE_JS
+            .replace(
+                "{no_auth_max_time}",
+                &no_auth_limits.max_time.num_seconds().to_string(),
+            )
+            .replace(
+                "{no_auth_large_file_max_time}",
+                &no_auth_limits.large_file_max_time.num_seconds().to_string(),
+            )
+            .replace(
+                "{no_auth_large_file_size}",
+                &no_auth_limits.large_file_size.to_string(),
+            );
+        Ok(HttpResponse::Ok()
+            .content_type("application/javascript")
+            .body(auth_hide_js))
+    } else {
+        Err(error::ErrorNotFound("file not found"))
+    }
 }
 
 pub async fn upload(
@@ -31,12 +147,12 @@ pub async fn upload(
     expiry_watch_sender: web::Data<Sender<()>>,
     config: web::Data<Config>,
 ) -> Result<HttpResponse, Error> {
-    let file_id = gen_file_id();
+    let (file_id, file_name) = create_unique_file(&config).await.map_err(|file_err| {
-    let mut filename = config.files_dir.clone();
+        log::error!("could not create file {:?}", file_err);
-    filename.push(&file_id);
+        error::ErrorInternalServerError("could not create file")
+    })?;
 
-    let parsed_multipart =
+    let parsed_multipart = multipart::parse_multipart(payload, &file_id, &file_name, &config).await;
-        multipart::parse_multipart(payload, &file_id, &filename, config.max_file_size).await;
     let UploadConfig {
         original_name,
         valid_till,
@@ -45,8 +161,9 @@ pub async fn upload(
     } = match parsed_multipart {
         Ok(data) => data,
         Err(err) => {
-            if filename.exists().await {
+            if file_name.exists().await {
-                fs::remove_file(filename).await.map_err(|_| {
+                fs::remove_file(file_name).await.map_err(|file_err| {
+                    log::error!("could not remove file {:?}", file_err);
                     error::ErrorInternalServerError(
                         "could not parse multipart; could not remove file",
                     )
@@ -67,8 +184,10 @@ pub async fn upload(
     .bind(delete_on_download)
     .execute(db.as_ref())
     .await;
-    if db_insert.is_err() {
+    if let Err(db_err) = db_insert {
-        fs::remove_file(filename).await.map_err(|_| {
+        log::error!("could not insert into datebase {:?}", db_err);
+        fs::remove_file(file_name).await.map_err(|file_err| {
+            log::error!("could not remove file {:?}", file_err);
             error::ErrorInternalServerError(
                 "could not insert file into database; could not remove file",
             )
@@ -102,6 +221,26 @@ pub async fn upload(
         .body(format!("{}\n", url)))
 }
 
+async fn create_unique_file(
+    config: &web::Data<Config>,
+) -> Result<(String, PathBuf), std::io::Error> {
+    loop {
+        let file_id = gen_file_id();
+        let mut file_name = config.files_dir.clone();
+        file_name.push(&file_id);
+        match OpenOptions::new()
+            .write(true)
+            .create_new(true)
+            .open(&file_name)
+            .await
+        {
+            Ok(_) => return Ok((file_id, file_name)),
+            Err(error) if error.kind() == ErrorKind::AlreadyExists => continue,
+            Err(error) => return Err(error),
+        }
+    }
+}
+
 fn gen_file_id() -> String {
     let mut rng = rand::thread_rng();
     let mut id = String::with_capacity(5);

static/index.css

@@ -1,16 +1,36 @@
 :root {
   --bg: #222222;
+  --bg-alt: #444444;
+  --accent: #007600;
+  --accent-alt: #228b22;
   --fg: #e9e9e9;
+  --fg-light: #b6b6b6;
+  --radius: 5px;
+}
+
+html {
+  box-sizing: border-box;
+}
+
+*,
+*::before,
+*::after {
+  box-sizing: inherit;
 }
 
 body {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
   background-color: var(--bg);
+  min-height: 100vh;
   margin: 0;
 }
 
 main {
   color: var(--fg);
   font-family: sans;
+  width: 100%;
   max-width: 1200px;
   margin: 0 auto;
   padding: 1rem;
@@ -44,21 +64,44 @@ textarea,
   color: var(--fg);
   padding: 0.5rem;
   border: 2px solid var(--fg);
-  border-radius: 5px;
+  border-radius: var(--radius);
   margin-bottom: 1rem;
-  max-width: calc(100vw - 3rem - 4px);
+  max-width: calc(100vw - 2rem);
 }
 
-*.hidden {
+details {
+  display: inline;
+}
+
+input:focus-within,
+select:focus-within,
+textarea:focus-within,
+.button:focus-within,
+details:focus-within,
+a:focus-within {
+  outline: solid cornflowerblue 2px;
+  border-radius: var(--radius);
+}
+
+textarea {
+  height: 30vh;
+}
+
+.hidden {
   display: none;
 }
 
-input[type="checkbox"] {
+input[type='checkbox'] {
   margin-bottom: 1.5rem;
 }
 
 .button {
   cursor: pointer;
+  font-family: sans;
+  font-weight: normal;
+  font-size: 1rem;
+  margin-right: 0.5rem;
+  user-select: none;
 }
 
 a.button {
@@ -70,18 +113,50 @@ a.button:visited {
 }
 
 .button:hover {
-  background-color: #444444;
+  background-color: var(--bg-alt);
 }
 
 .button.main {
-  background-color: #007600;
+  background-color: var(--accent);
 }
 
 .button.main:hover {
-  background-color: forestgreen;
+  background-color: var(--accent-alt);
 }
 
 .usage {
   margin-top: 2em;
   overflow: auto;
 }
+
+.large-link {
+  display: inline-block;
+  margin-bottom: 1em;
+  max-height: 60vh;
+  overflow-y: auto;
+
+  font-size: clamp(1rem, 3vw, 1.5rem);
+  overflow-wrap: anywhere;
+}
+
+footer {
+  font-family: sans;
+  flex-shrink: 0;
+  display: flex;
+  justify-content: flex-end;
+  padding: 0.5rem;
+}
+
+.repo {
+  padding: 0.5rem;
+  color: var(--fg-light);
+  text-decoration: none;
+}
+
+.repo:visited {
+  color: var(--fg-light);
+}
+
+.repo:hover {
+  color: var(--fg);
+}

template/auth-hide.js

@@ -0,0 +1,38 @@
+const fileUpload = document.getElementById("file-upload");
+const textUpload = document.getElementById("text-upload");
+const keepFor = document.getElementById("keep_for");
+const passwordInput = document.getElementById("password-input");
+
+const maxTime = Number("{no_auth_max_time}");
+const largeFileMaxTime = Number("{no_auth_large_file_max_time}");
+const largeFileSize = Number("{no_auth_large_file_size}");
+
+let keep = Number(keepFor.value);
+let size = fileUpload.files[0]
+  ? fileUpload.files[0].size
+  : textUpload.value.length;
+
+const updatePasswordInput = () => {
+  const requirePassword = keep > maxTime || (size > largeFileSize && keep > largeFileMaxTime);
+  passwordInput.className = requirePassword ? "" : "hidden";
+};
+
+updatePasswordInput();
+
+fileUpload.addEventListener("change", () => {
+  size = fileUpload.files[0]
+    ? fileUpload.files[0].size
+    : textUpload.value.length;
+  updatePasswordInput();
+});
+textUpload.addEventListener("input", () => {
+  if (!fileUpload.files[0]) {
+    size = textUpload.value.length;
+    updatePasswordInput();
+  }
+});
+keepFor.addEventListener("change", () => {
+  keep = Number(keepFor.value);
+  updatePasswordInput();
+});
+

template/index.html

@@ -11,13 +11,13 @@
     <main>
       <h1>datatrash</h1>
       <form action="/upload" method="POST" enctype="multipart/form-data">
-        <label for="file-upload">datei</label>
+        <label for="file-upload">datei{max_size_snippet}</label>
         <br />
         <input id="file-upload" type="file" name="file" />
         <br />
         <label for="text-upload">oder asciitrash</label>
         <br />
-        <textarea id="text-upload" name="text" rows="20" cols="120"></textarea>
+        <textarea id="text-upload" name="text" cols="120"></textarea>
         <br />
         <label for="keep_for">gültig für</label>
         <select id="keep_for" name="keep_for">
@@ -35,21 +35,38 @@
           name="delete_on_download"
         />
         <label for="delete_on_download">nach einem download löschen</label>
-        <br />
+        <br />{auth_snippet}
         <input class="main button" type="submit" value="hochladen" />
       </form>
-      <section class="usage">
+      <details class="usage">
+        <summary>nutzung als api</summary>
         <pre>
-file upload
+datei hochladen
   curl -F 'file=@yourfile.rs' {upload_url}
-text upload
+
+text hochladen
   curl -F 'text=your text' {upload_url}
-including time
+
+zeitbegrenzung setzen
   curl -F 'text=your text' -F 'keep_for=1800' {upload_url}
-limit to one download
+
-  curl -F 'text=your text' -F 'delete_on_download=true' {upload_url}</pre
+nach einem download löschen
+  curl -F 'text=your text' -F 'delete_on_download=true' {upload_url}
+
+authentifizieren
+  curl -F 'text=your text' -F 'password=…' {upload_url}</pre
         >
-      </section>
+      </details>
     </main>
+    <footer>
+      <a
+        class="repo"
+        href="https://repos.ctdo.de/neri/datatrash"
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        repo
+      </a>
+    </footer>
   </body>
 </html>

template/text-view.html

@@ -16,6 +16,16 @@
       <a class="main button" href="?dl">herunterladen</a>
       <button id="copy" class="button hidden">text kopieren</button>
     </main>
+    <footer>
+      <a
+        class="repo"
+        href="https://repos.ctdo.de/neri/datatrash"
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        repo
+      </a>
+    </footer>
     <script src="/static/copy.js" lang="javascript"></script>
   </body>
 </html>

template/upload.html

@@ -15,6 +15,16 @@
       </p>
       <button id="copy" class="main button hidden">link kopieren</button>
     </main>
+    <footer>
+      <a
+        class="repo"
+        href="https://repos.ctdo.de/neri/datatrash"
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        repo
+      </a>
+    </footer>
     <script src="/static/copy.js" lang="javascript"></script>
   </body>
 </html>

template/url-view.html

@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html lang="de-DE">
+  <head>
+    <title>datatrash</title>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <link href="/static/index.css" rel="stylesheet" />
+  </head>
+  <body>
+    <main>
+      <h1><a href="/">datatrash</a></h1>
+      <a
+        class="large-link copy-content"
+        href="{link_attribute}"
+        rel="noopener noreferrer"
+        >{link_content}</a
+      >
+      <br />
+      <a class="main button" href="{link_attribute}" rel="noopener noreferrer">
+        link öffnen
+      </a>
+      <button id="copy" class="button hidden">link kopieren</button>
+      <a class="button" href="?dl">als text herunterladen</a>
+    </main>
+    <footer>
+      <a
+        class="repo"
+        href="https://repos.ctdo.de/neri/datatrash"
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        repo
+      </a>
+    </footer>
+    <script src="/static/copy.js" lang="javascript"></script>
+  </body>
+</html>