Add Bytes field, add docs, and reorganize
This commit is contained in:
parent
a7a06fdb92
commit
68c2c45b62
25549
ACKNOWLEDGEMENTS
Normal file
25549
ACKNOWLEDGEMENTS
Normal file
File diff suppressed because it is too large
Load diff
10
Cargo.toml
10
Cargo.toml
|
@ -1,7 +1,15 @@
|
||||||
[package]
|
[package]
|
||||||
name = "actix-multipart"
|
name = "actix-form-data"
|
||||||
|
description = "Multipart Form Data for Actix Web"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
|
license = "GPL-3.0"
|
||||||
authors = ["asonix <asonix.dev@gmail.com>"]
|
authors = ["asonix <asonix.dev@gmail.com>"]
|
||||||
|
repository = "https://github.com/asonix/actix-multipart"
|
||||||
|
readme = "README.md"
|
||||||
|
keywords = ["actix", "form-data", "multipart", "async"]
|
||||||
|
|
||||||
|
[lib]
|
||||||
|
name = "form_data"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
actix = "0.5.6"
|
actix = "0.5.6"
|
||||||
|
|
674
LICENSE
Normal file
674
LICENSE
Normal file
|
@ -0,0 +1,674 @@
|
||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||||
|
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.
|
||||||
|
|
||||||
|
<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 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 <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
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:
|
||||||
|
|
||||||
|
<program> Copyright (C) <year> <name of author>
|
||||||
|
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
|
||||||
|
<http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
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
|
||||||
|
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
|
119
README.md
Normal file
119
README.md
Normal file
|
@ -0,0 +1,119 @@
|
||||||
|
# Actix Form Data
|
||||||
|
A library for retrieving form data from Actix Web's multipart streams. It can stream uploaded files
|
||||||
|
onto the filesystem (its main purpose), but it can also parse associated form data.
|
||||||
|
|
||||||
|
### Usage
|
||||||
|
|
||||||
|
Add it to your dependencies.
|
||||||
|
```toml
|
||||||
|
# Cargo.toml
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
actix-form-data = "0.1.0"
|
||||||
|
```
|
||||||
|
|
||||||
|
Require it in your project.
|
||||||
|
```rust
|
||||||
|
// src/lib.rs or src/main.rs
|
||||||
|
|
||||||
|
extern crate form_data;
|
||||||
|
|
||||||
|
use form_data::{Field, Form, Value};
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Overview
|
||||||
|
First, you'd create a form structure you want to parse from the multipart stream.
|
||||||
|
```rust
|
||||||
|
let form = Form::new().field("field-name", Field::text());
|
||||||
|
```
|
||||||
|
This creates a form with one required field named "field-name" that will be parsed as text.
|
||||||
|
|
||||||
|
Then, pass it to `handle_multipart` in your request handler.
|
||||||
|
```rust
|
||||||
|
let stream = form_data::handle_multipart(req.multipart, form);
|
||||||
|
```
|
||||||
|
|
||||||
|
This returns a `Stream<Item = Value, Error = form_data::Error>`, which can be used to
|
||||||
|
fetch your data.
|
||||||
|
|
||||||
|
```rust
|
||||||
|
let field_value = match value {
|
||||||
|
Value::Map(mut hashmap) => {
|
||||||
|
hashmap.remove("field-name")?
|
||||||
|
}
|
||||||
|
_ => return None,
|
||||||
|
};
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Example
|
||||||
|
```rust
|
||||||
|
/// examples/simple.rs
|
||||||
|
|
||||||
|
extern crate actix_web;
|
||||||
|
extern crate form_data;
|
||||||
|
extern crate futures;
|
||||||
|
extern crate mime;
|
||||||
|
|
||||||
|
use std::path::PathBuf;
|
||||||
|
|
||||||
|
use actix_web::{http, server, App, AsyncResponder, HttpMessage, HttpRequest, HttpResponse, State};
|
||||||
|
use form_data::{handle_multipart, Error, Field, FilenameGenerator, Form};
|
||||||
|
use futures::Future;
|
||||||
|
|
||||||
|
struct Gen;
|
||||||
|
|
||||||
|
impl FilenameGenerator for Gen {
|
||||||
|
fn next_filename(&self, _: &mime::Mime) -> Option<PathBuf> {
|
||||||
|
let mut p = PathBuf::new();
|
||||||
|
p.push("examples/filename.png");
|
||||||
|
Some(p)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn upload(
|
||||||
|
req: HttpRequest<Form>,
|
||||||
|
state: State<Form>,
|
||||||
|
) -> Box<Future<Item = HttpResponse, Error = Error>> {
|
||||||
|
handle_multipart(req.multipart(), state.clone())
|
||||||
|
.map(|uploaded_content| {
|
||||||
|
println!("Uploaded Content: {:?}", uploaded_content);
|
||||||
|
HttpResponse::Created().finish()
|
||||||
|
})
|
||||||
|
.responder()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let form = Form::new()
|
||||||
|
.field("Hey", Field::text())
|
||||||
|
.field(
|
||||||
|
"Hi",
|
||||||
|
Field::map()
|
||||||
|
.field("One", Field::int())
|
||||||
|
.field("Two", Field::float())
|
||||||
|
.finalize(),
|
||||||
|
)
|
||||||
|
.field("files", Field::array(Field::file(Gen)));
|
||||||
|
|
||||||
|
println!("{:?}", form);
|
||||||
|
|
||||||
|
server::new(move || {
|
||||||
|
App::with_state(form.clone())
|
||||||
|
.resource("/upload", |r| r.method(http::Method::POST).with2(upload))
|
||||||
|
}).bind("127.0.0.1:8080")
|
||||||
|
.unwrap()
|
||||||
|
.run();
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Contributing
|
||||||
|
Feel free to open issues for anything you find an issue with. Please note that any contributed code will be licensed under the GPLv3.
|
||||||
|
|
||||||
|
### License
|
||||||
|
|
||||||
|
Copyright © 2018 Riley Trautman
|
||||||
|
|
||||||
|
Tokio ZMQ 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.
|
||||||
|
|
||||||
|
Tokio ZMQ 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. This file is part of Tokio ZMQ.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License along with Tokio ZMQ. If not, see [http://www.gnu.org/licenses/](http://www.gnu.org/licenses/).
|
54
examples/simple.rs
Normal file
54
examples/simple.rs
Normal file
|
@ -0,0 +1,54 @@
|
||||||
|
extern crate actix_web;
|
||||||
|
extern crate form_data;
|
||||||
|
extern crate futures;
|
||||||
|
extern crate mime;
|
||||||
|
|
||||||
|
use std::path::PathBuf;
|
||||||
|
|
||||||
|
use actix_web::{http, server, App, AsyncResponder, HttpMessage, HttpRequest, HttpResponse, State};
|
||||||
|
use form_data::{handle_multipart, Error, Field, FilenameGenerator, Form};
|
||||||
|
use futures::Future;
|
||||||
|
|
||||||
|
struct Gen;
|
||||||
|
|
||||||
|
impl FilenameGenerator for Gen {
|
||||||
|
fn next_filename(&self, _: &mime::Mime) -> Option<PathBuf> {
|
||||||
|
let mut p = PathBuf::new();
|
||||||
|
p.push("examples/filename.png");
|
||||||
|
Some(p)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn upload(
|
||||||
|
req: HttpRequest<Form>,
|
||||||
|
state: State<Form>,
|
||||||
|
) -> Box<Future<Item = HttpResponse, Error = Error>> {
|
||||||
|
handle_multipart(req.multipart(), state.clone())
|
||||||
|
.map(|uploaded_content| {
|
||||||
|
println!("Uploaded Content: {:?}", uploaded_content);
|
||||||
|
HttpResponse::Created().finish()
|
||||||
|
})
|
||||||
|
.responder()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let form = Form::new()
|
||||||
|
.field("Hey", Field::text())
|
||||||
|
.field(
|
||||||
|
"Hi",
|
||||||
|
Field::map()
|
||||||
|
.field("One", Field::int())
|
||||||
|
.field("Two", Field::float())
|
||||||
|
.finalize(),
|
||||||
|
)
|
||||||
|
.field("files", Field::array(Field::file(Gen)));
|
||||||
|
|
||||||
|
println!("{:?}", form);
|
||||||
|
|
||||||
|
server::new(move || {
|
||||||
|
App::with_state(form.clone())
|
||||||
|
.resource("/upload", |r| r.method(http::Method::POST).with2(upload))
|
||||||
|
}).bind("127.0.0.1:8080")
|
||||||
|
.unwrap()
|
||||||
|
.run();
|
||||||
|
}
|
|
@ -1,9 +1,9 @@
|
||||||
extern crate actix;
|
extern crate actix;
|
||||||
extern crate actix_multipart;
|
|
||||||
extern crate actix_web;
|
extern crate actix_web;
|
||||||
extern crate env_logger;
|
extern crate env_logger;
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate failure;
|
extern crate failure;
|
||||||
|
extern crate form_data;
|
||||||
extern crate futures;
|
extern crate futures;
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate log;
|
extern crate log;
|
||||||
|
@ -16,7 +16,7 @@ use std::{env, path::PathBuf, sync::atomic::{AtomicUsize, Ordering}};
|
||||||
|
|
||||||
use actix_web::{http, server, App, AsyncResponder, HttpMessage, HttpRequest, HttpResponse, State,
|
use actix_web::{http, server, App, AsyncResponder, HttpMessage, HttpRequest, HttpResponse, State,
|
||||||
error::ResponseError, middleware::Logger};
|
error::ResponseError, middleware::Logger};
|
||||||
use actix_multipart::*;
|
use form_data::*;
|
||||||
use futures::Future;
|
use futures::Future;
|
||||||
|
|
||||||
struct Gen(AtomicUsize);
|
struct Gen(AtomicUsize);
|
||||||
|
@ -86,7 +86,7 @@ fn upload(
|
||||||
req: HttpRequest<AppState>,
|
req: HttpRequest<AppState>,
|
||||||
state: State<AppState>,
|
state: State<AppState>,
|
||||||
) -> Box<Future<Item = HttpResponse, Error = Errors>> {
|
) -> Box<Future<Item = HttpResponse, Error = Errors>> {
|
||||||
handle_upload(req.multipart(), state.form.clone())
|
handle_multipart(req.multipart(), state.form.clone())
|
||||||
.map(|uploaded_content| {
|
.map(|uploaded_content| {
|
||||||
info!("Uploaded Content: {:?}", uploaded_content);
|
info!("Uploaded Content: {:?}", uploaded_content);
|
||||||
HttpResponse::Created().finish()
|
HttpResponse::Created().finish()
|
||||||
|
|
44
src/error.rs
44
src/error.rs
|
@ -1,6 +1,25 @@
|
||||||
|
/*
|
||||||
|
* This file is part of Actix Form Data.
|
||||||
|
*
|
||||||
|
* Copyright © 2018 Riley Trautman
|
||||||
|
*
|
||||||
|
* Actix Form Data 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.
|
||||||
|
*
|
||||||
|
* Actix Form Data 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 Actix Form Data. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
use std::{io, num::{ParseFloatError, ParseIntError}, string::FromUtf8Error};
|
use std::{io, num::{ParseFloatError, ParseIntError}, string::FromUtf8Error};
|
||||||
|
|
||||||
use actix_web::error::{MultipartError, PayloadError};
|
use actix_web::{HttpResponse, error::{MultipartError, PayloadError, ResponseError}};
|
||||||
|
|
||||||
#[derive(Debug, Fail)]
|
#[derive(Debug, Fail)]
|
||||||
pub enum Error {
|
pub enum Error {
|
||||||
|
@ -57,3 +76,26 @@ impl From<io::Error> for Error {
|
||||||
Error::FsPool(e)
|
Error::FsPool(e)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl ResponseError for Error {
|
||||||
|
fn error_response(&self) -> HttpResponse {
|
||||||
|
match *self {
|
||||||
|
Error::FsPool(_) => HttpResponse::InternalServerError().finish(),
|
||||||
|
Error::Payload(ref e) => ResponseError::error_response(e),
|
||||||
|
Error::Multipart(ref e) => ResponseError::error_response(e),
|
||||||
|
Error::ParseField(_) | Error::ParseInt(_) | Error::ParseFloat(_) => {
|
||||||
|
HttpResponse::BadRequest().finish()
|
||||||
|
}
|
||||||
|
Error::GenFilename | Error::MkDir => HttpResponse::InternalServerError().finish(),
|
||||||
|
Error::ContentType
|
||||||
|
| Error::ContentDisposition
|
||||||
|
| Error::Field
|
||||||
|
| Error::FieldCount
|
||||||
|
| Error::FieldSize
|
||||||
|
| Error::FieldType
|
||||||
|
| Error::Filename
|
||||||
|
| Error::FileCount
|
||||||
|
| Error::FileSize => HttpResponse::BadRequest().finish(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
89
src/lib.rs
89
src/lib.rs
|
@ -1,3 +1,85 @@
|
||||||
|
/*
|
||||||
|
* This file is part of Actix Form Data.
|
||||||
|
*
|
||||||
|
* Copyright © 2018 Riley Trautman
|
||||||
|
*
|
||||||
|
* Actix Form Data 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.
|
||||||
|
*
|
||||||
|
* Actix Form Data 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 Actix Form Data. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
//! # Actix Form Data
|
||||||
|
//! A library for retrieving form data from Actix Web's multipart streams. It can stream
|
||||||
|
//! uploaded files onto the filesystem (its main purpose), but it can also parse associated
|
||||||
|
//! form data.
|
||||||
|
//!
|
||||||
|
//! # Example
|
||||||
|
//!
|
||||||
|
//!```rust
|
||||||
|
//! extern crate actix_web;
|
||||||
|
//! extern crate form_data;
|
||||||
|
//! extern crate futures;
|
||||||
|
//! extern crate mime;
|
||||||
|
//!
|
||||||
|
//! use std::path::PathBuf;
|
||||||
|
//!
|
||||||
|
//! use actix_web::{http, server, App, AsyncResponder, HttpMessage, HttpRequest, HttpResponse, State};
|
||||||
|
//! use form_data::{handle_multipart, Error, Field, FilenameGenerator, Form};
|
||||||
|
//! use futures::Future;
|
||||||
|
//!
|
||||||
|
//! struct Gen;
|
||||||
|
//!
|
||||||
|
//! impl FilenameGenerator for Gen {
|
||||||
|
//! fn next_filename(&self, _: &mime::Mime) -> Option<PathBuf> {
|
||||||
|
//! let mut p = PathBuf::new();
|
||||||
|
//! p.push("examples/filename.png");
|
||||||
|
//! Some(p)
|
||||||
|
//! }
|
||||||
|
//! }
|
||||||
|
//!
|
||||||
|
//! fn upload(
|
||||||
|
//! req: HttpRequest<Form>,
|
||||||
|
//! state: State<Form>,
|
||||||
|
//! ) -> Box<Future<Item = HttpResponse, Error = Error>> {
|
||||||
|
//! handle_multipart(req.multipart(), state.clone())
|
||||||
|
//! .map(|uploaded_content| {
|
||||||
|
//! println!("Uploaded Content: {:?}", uploaded_content);
|
||||||
|
//! HttpResponse::Created().finish()
|
||||||
|
//! })
|
||||||
|
//! .responder()
|
||||||
|
//! }
|
||||||
|
//!
|
||||||
|
//! fn main() {
|
||||||
|
//! let form = Form::new()
|
||||||
|
//! .field("Hey", Field::text())
|
||||||
|
//! .field(
|
||||||
|
//! "Hi",
|
||||||
|
//! Field::map()
|
||||||
|
//! .field("One", Field::int())
|
||||||
|
//! .field("Two", Field::float())
|
||||||
|
//! .finalize(),
|
||||||
|
//! )
|
||||||
|
//! .field("files", Field::array(Field::file(Gen)));
|
||||||
|
//!
|
||||||
|
//! println!("{:?}", form);
|
||||||
|
//!
|
||||||
|
//! server::new(move || {
|
||||||
|
//! App::with_state(form.clone())
|
||||||
|
//! .resource("/upload", |r| r.method(http::Method::POST).with2(upload))
|
||||||
|
//! }).bind("127.0.0.1:8080")
|
||||||
|
//! .unwrap();
|
||||||
|
//! // .run()
|
||||||
|
//! }
|
||||||
|
//!```
|
||||||
extern crate actix_web;
|
extern crate actix_web;
|
||||||
extern crate bytes;
|
extern crate bytes;
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
|
@ -9,7 +91,6 @@ extern crate http;
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate log;
|
extern crate log;
|
||||||
extern crate mime;
|
extern crate mime;
|
||||||
|
|
||||||
#[cfg(feature = "with-serde")]
|
#[cfg(feature = "with-serde")]
|
||||||
extern crate serde;
|
extern crate serde;
|
||||||
#[cfg(feature = "with-serde")]
|
#[cfg(feature = "with-serde")]
|
||||||
|
@ -23,8 +104,12 @@ mod types;
|
||||||
mod upload;
|
mod upload;
|
||||||
pub use self::error::Error;
|
pub use self::error::Error;
|
||||||
pub use self::types::*;
|
pub use self::types::*;
|
||||||
pub use self::upload::handle_upload;
|
pub use self::upload::handle_multipart;
|
||||||
|
|
||||||
|
/// A trait for types that produce filenames for uploade files
|
||||||
|
///
|
||||||
|
/// Currently, the mime type provided to the `next_filename` method is guessed from the uploaded
|
||||||
|
/// file's original filename, so relying on this to be 100% accurate is probably a bad idea.
|
||||||
pub trait FilenameGenerator: Send + Sync {
|
pub trait FilenameGenerator: Send + Sync {
|
||||||
fn next_filename(&self, &mime::Mime) -> Option<PathBuf>;
|
fn next_filename(&self, &mime::Mime) -> Option<PathBuf>;
|
||||||
}
|
}
|
||||||
|
|
849
src/types.rs
849
src/types.rs
|
@ -1,295 +1,55 @@
|
||||||
|
/*
|
||||||
|
* This file is part of Actix Form Data.
|
||||||
|
*
|
||||||
|
* Copyright © 2018 Riley Trautman
|
||||||
|
*
|
||||||
|
* Actix Form Data 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.
|
||||||
|
*
|
||||||
|
* Actix Form Data 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 Actix Form Data. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
use std::{fmt, collections::{HashMap, VecDeque}, path::PathBuf, sync::Arc};
|
use std::{fmt, collections::{HashMap, VecDeque}, path::PathBuf, sync::Arc};
|
||||||
|
|
||||||
|
use bytes::Bytes;
|
||||||
use futures::{Future, future::{ExecuteError, Executor}};
|
use futures::{Future, future::{ExecuteError, Executor}};
|
||||||
use futures_cpupool::CpuPool;
|
use futures_cpupool::CpuPool;
|
||||||
|
|
||||||
use super::FilenameGenerator;
|
use super::FilenameGenerator;
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq)]
|
/// The result of a succesfull parse through a given multipart stream.
|
||||||
#[cfg_attr(feature = "with-serde", derive(Deserialize, Serialize))]
|
///
|
||||||
pub enum NamePart {
|
/// This type represents all possible variations in structure of a Multipart Form.
|
||||||
Map(String),
|
///
|
||||||
Array,
|
/// # Example usage
|
||||||
}
|
///
|
||||||
|
/// ```rust
|
||||||
impl NamePart {
|
/// # use form_data::Value;
|
||||||
pub fn is_map(&self) -> bool {
|
/// # use std::collections::HashMap;
|
||||||
match *self {
|
/// # let mut hm = HashMap::new();
|
||||||
NamePart::Map(_) => true,
|
/// # hm.insert("field-name".to_owned(), Value::Int(32));
|
||||||
_ => false,
|
/// # let value = Value::Map(hm);
|
||||||
}
|
/// match value {
|
||||||
}
|
/// Value::Map(mut hashmap) => {
|
||||||
}
|
/// match hashmap.remove("field-name") {
|
||||||
|
/// Some(value) => match value {
|
||||||
#[derive(Clone)]
|
/// Value::Int(integer) => println!("{}", integer),
|
||||||
pub enum FieldTerminator {
|
/// _ => (),
|
||||||
File(Arc<FilenameGenerator>),
|
/// }
|
||||||
Int,
|
/// None => (),
|
||||||
Float,
|
/// }
|
||||||
Text,
|
/// }
|
||||||
}
|
/// _ => (),
|
||||||
|
/// }
|
||||||
impl fmt::Debug for FieldTerminator {
|
/// ```
|
||||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
|
||||||
match *self {
|
|
||||||
FieldTerminator::File(_) => write!(f, "File(filename_generator)"),
|
|
||||||
FieldTerminator::Int => write!(f, "Int"),
|
|
||||||
FieldTerminator::Float => write!(f, "Float"),
|
|
||||||
FieldTerminator::Text => write!(f, "Text"),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Clone)]
|
|
||||||
pub enum Field {
|
|
||||||
Array(Array),
|
|
||||||
File(Arc<FilenameGenerator>),
|
|
||||||
Map(Map),
|
|
||||||
Int,
|
|
||||||
Float,
|
|
||||||
Text,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl fmt::Debug for Field {
|
|
||||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
|
||||||
match *self {
|
|
||||||
Field::Array(ref arr) => write!(f, "Array({:?})", arr),
|
|
||||||
Field::File(_) => write!(f, "File(filename_generator)"),
|
|
||||||
Field::Map(ref map) => write!(f, "Map({:?})", map),
|
|
||||||
Field::Int => write!(f, "Int"),
|
|
||||||
Field::Float => write!(f, "Float"),
|
|
||||||
Field::Text => write!(f, "Text"),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Field {
|
|
||||||
pub fn file<T>(gen: T) -> Self
|
|
||||||
where
|
|
||||||
T: FilenameGenerator + 'static,
|
|
||||||
{
|
|
||||||
Field::File(Arc::new(gen))
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn text() -> Self {
|
|
||||||
Field::Text
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn int() -> Self {
|
|
||||||
Field::Int
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn float() -> Self {
|
|
||||||
Field::Float
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn array(field: Field) -> Self {
|
|
||||||
Field::Array(Array::new(field))
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn map() -> Map {
|
|
||||||
Map::new()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn valid_field(&self, name: VecDeque<NamePart>) -> Option<FieldTerminator> {
|
|
||||||
trace!("Checking {:?} and {:?}", self, name);
|
|
||||||
match *self {
|
|
||||||
Field::Array(ref arr) => arr.valid_field(name),
|
|
||||||
Field::Map(ref map) => map.valid_field(name),
|
|
||||||
Field::File(ref gen) => if name.is_empty() {
|
|
||||||
Some(FieldTerminator::File(Arc::clone(gen)))
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
},
|
|
||||||
Field::Int => if name.is_empty() {
|
|
||||||
Some(FieldTerminator::Int)
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
},
|
|
||||||
Field::Float => if name.is_empty() {
|
|
||||||
Some(FieldTerminator::Float)
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
},
|
|
||||||
Field::Text => if name.is_empty() {
|
|
||||||
Some(FieldTerminator::Text)
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
|
||||||
pub struct Array {
|
|
||||||
inner: Box<Field>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Array {
|
|
||||||
fn new(field: Field) -> Self {
|
|
||||||
Array {
|
|
||||||
inner: Box::new(field),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn valid_field(&self, mut name: VecDeque<NamePart>) -> Option<FieldTerminator> {
|
|
||||||
trace!("Checking {:?} and {:?}", self, name);
|
|
||||||
match name.pop_front() {
|
|
||||||
Some(name_part) => match name_part {
|
|
||||||
NamePart::Array => self.inner.valid_field(name),
|
|
||||||
_ => None,
|
|
||||||
},
|
|
||||||
None => None,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
|
||||||
pub struct Map {
|
|
||||||
inner: Vec<(String, Field)>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Map {
|
|
||||||
fn new() -> Self {
|
|
||||||
Map { inner: Vec::new() }
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn field(mut self, key: &str, value: Field) -> Self {
|
|
||||||
self.inner.push((key.to_owned(), value));
|
|
||||||
|
|
||||||
self
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn finalize(self) -> Field {
|
|
||||||
Field::Map(self)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn valid_field(&self, mut name: VecDeque<NamePart>) -> Option<FieldTerminator> {
|
|
||||||
trace!("Checking {:?} and {:?}", self, name);
|
|
||||||
match name.pop_front() {
|
|
||||||
Some(name_part) => match name_part {
|
|
||||||
NamePart::Map(part_name) => self.inner
|
|
||||||
.iter()
|
|
||||||
.find(|(item, _)| *item == part_name)
|
|
||||||
.and_then(|(_, field)| field.valid_field(name)),
|
|
||||||
_ => None,
|
|
||||||
},
|
|
||||||
None => None,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Clone)]
|
|
||||||
pub struct Form {
|
|
||||||
pub max_fields: u32,
|
|
||||||
pub max_field_size: u32,
|
|
||||||
pub max_files: u32,
|
|
||||||
pub max_file_size: u32,
|
|
||||||
inner: Map,
|
|
||||||
pub pool: ArcExecutor,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Form {
|
|
||||||
pub fn new() -> Self {
|
|
||||||
Form::from_executor(CpuPool::new_num_cpus())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn max_fields(mut self, max: u32) -> Self {
|
|
||||||
self.max_fields = max;
|
|
||||||
|
|
||||||
self
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn max_field_size(mut self, max: u32) -> Self {
|
|
||||||
self.max_field_size = max;
|
|
||||||
|
|
||||||
self
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn max_files(mut self, max: u32) -> Self {
|
|
||||||
self.max_files = max;
|
|
||||||
|
|
||||||
self
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn max_file_size(mut self, max: u32) -> Self {
|
|
||||||
self.max_file_size = max;
|
|
||||||
|
|
||||||
self
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn from_executor<E>(executor: E) -> Self
|
|
||||||
where
|
|
||||||
E: Executor<Box<Future<Item = (), Error = ()> + Send>> + Send + Sync + Clone + 'static,
|
|
||||||
{
|
|
||||||
Form {
|
|
||||||
max_fields: 100,
|
|
||||||
max_field_size: 10_000,
|
|
||||||
max_files: 20,
|
|
||||||
max_file_size: 10_000_000,
|
|
||||||
inner: Map::new(),
|
|
||||||
pool: ArcExecutor::new(executor),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn field(mut self, name: &str, field: Field) -> Self {
|
|
||||||
self.inner = self.inner.field(name, field);
|
|
||||||
|
|
||||||
self
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn valid_field(&self, name: VecDeque<NamePart>) -> Option<FieldTerminator> {
|
|
||||||
self.inner.valid_field(name.clone())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl fmt::Debug for Form {
|
|
||||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
|
||||||
write!(f, "Form({:?})", self.inner)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Clone)]
|
|
||||||
pub struct ArcExecutor {
|
|
||||||
inner: Arc<Executor<Box<Future<Item = (), Error = ()> + Send>> + Send + Sync + 'static>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl ArcExecutor {
|
|
||||||
pub fn new<E>(executor: E) -> Self
|
|
||||||
where
|
|
||||||
E: Executor<Box<Future<Item = (), Error = ()> + Send>> + Send + Sync + Clone + 'static,
|
|
||||||
{
|
|
||||||
ArcExecutor {
|
|
||||||
inner: Arc::new(executor),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Executor<Box<Future<Item = (), Error = ()> + Send>> for ArcExecutor where {
|
|
||||||
fn execute(
|
|
||||||
&self,
|
|
||||||
future: Box<Future<Item = (), Error = ()> + Send>,
|
|
||||||
) -> Result<(), ExecuteError<Box<Future<Item = (), Error = ()> + Send>>> {
|
|
||||||
self.inner.execute(future)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub type MultipartHash = (Vec<NamePart>, MultipartContent);
|
|
||||||
|
|
||||||
pub type MultipartForm = Vec<MultipartHash>;
|
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq)]
|
|
||||||
#[cfg_attr(feature = "with-serde", derive(Deserialize, Serialize))]
|
|
||||||
pub enum MultipartContent {
|
|
||||||
File {
|
|
||||||
filename: String,
|
|
||||||
stored_as: PathBuf,
|
|
||||||
},
|
|
||||||
Text(String),
|
|
||||||
Int(i64),
|
|
||||||
Float(f64),
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq)]
|
#[derive(Clone, Debug, PartialEq)]
|
||||||
#[cfg_attr(feature = "with-serde", derive(Deserialize, Serialize))]
|
#[cfg_attr(feature = "with-serde", derive(Deserialize, Serialize))]
|
||||||
pub enum Value {
|
pub enum Value {
|
||||||
|
@ -299,10 +59,11 @@ pub enum Value {
|
||||||
Text(String),
|
Text(String),
|
||||||
Int(i64),
|
Int(i64),
|
||||||
Float(f64),
|
Float(f64),
|
||||||
|
Bytes(Bytes),
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Value {
|
impl Value {
|
||||||
pub fn merge(&mut self, rhs: Self) {
|
pub(crate) fn merge(&mut self, rhs: Self) {
|
||||||
match (self, rhs) {
|
match (self, rhs) {
|
||||||
(Value::Map(ref mut hm), Value::Map(ref other)) => {
|
(Value::Map(ref mut hm), Value::Map(ref other)) => {
|
||||||
other.into_iter().fold(hm, |hm, (key, value)| {
|
other.into_iter().fold(hm, |hm, (key, value)| {
|
||||||
|
@ -333,32 +94,500 @@ impl From<MultipartContent> for Value {
|
||||||
MultipartContent::Text(string) => Value::Text(string),
|
MultipartContent::Text(string) => Value::Text(string),
|
||||||
MultipartContent::Int(i) => Value::Int(i),
|
MultipartContent::Int(i) => Value::Int(i),
|
||||||
MultipartContent::Float(f) => Value::Float(f),
|
MultipartContent::Float(f) => Value::Float(f),
|
||||||
|
MultipartContent::Bytes(b) => Value::Bytes(b),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn consolidate(mf: MultipartForm) -> Value {
|
/// The field type represents a field in the form-data that is allowed to be parsed.
|
||||||
mf.into_iter().fold(
|
#[derive(Clone)]
|
||||||
Value::Map(HashMap::new()),
|
pub enum Field {
|
||||||
|mut acc, (mut nameparts, content)| {
|
Array(Array),
|
||||||
let start_value = Value::from(content);
|
File(Arc<FilenameGenerator>),
|
||||||
|
Map(Map),
|
||||||
nameparts.reverse();
|
Int,
|
||||||
let value = nameparts
|
Float,
|
||||||
.into_iter()
|
Text,
|
||||||
.fold(start_value, |acc, namepart| match namepart {
|
Bytes,
|
||||||
NamePart::Map(name) => {
|
}
|
||||||
let mut hm = HashMap::new();
|
|
||||||
|
impl fmt::Debug for Field {
|
||||||
hm.insert(name, acc);
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||||
|
match *self {
|
||||||
Value::Map(hm)
|
Field::Array(ref arr) => write!(f, "Array({:?})", arr),
|
||||||
}
|
Field::File(_) => write!(f, "File(filename_generator)"),
|
||||||
NamePart::Array => Value::Array(vec![acc]),
|
Field::Map(ref map) => write!(f, "Map({:?})", map),
|
||||||
});
|
Field::Int => write!(f, "Int"),
|
||||||
|
Field::Float => write!(f, "Float"),
|
||||||
acc.merge(value);
|
Field::Text => write!(f, "Text"),
|
||||||
acc
|
Field::Bytes => write!(f, "Bytes"),
|
||||||
},
|
}
|
||||||
)
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Field {
|
||||||
|
/// Add a File field with a name generator.
|
||||||
|
///
|
||||||
|
/// The name generator will be called for each file matching this field's key. Keep in mind
|
||||||
|
/// that each key/file pair will have it's own name-generator, so sharing a name-generator
|
||||||
|
/// between fields is up to the user.
|
||||||
|
///
|
||||||
|
/// # Example
|
||||||
|
/// ```rust
|
||||||
|
/// # extern crate mime;
|
||||||
|
/// # extern crate form_data;
|
||||||
|
/// # use std::path::{Path, PathBuf};
|
||||||
|
/// # use form_data::{Form, Field, FilenameGenerator};
|
||||||
|
///
|
||||||
|
/// struct Gen;
|
||||||
|
///
|
||||||
|
/// impl FilenameGenerator for Gen {
|
||||||
|
/// fn next_filename(&self, _: &mime::Mime) -> Option<PathBuf> {
|
||||||
|
/// Some(AsRef::<Path>::as_ref("path.png").to_owned())
|
||||||
|
/// }
|
||||||
|
/// }
|
||||||
|
///
|
||||||
|
/// fn main() {
|
||||||
|
/// let name_generator = Gen;
|
||||||
|
/// let form = Form::new()
|
||||||
|
/// .field("file-field", Field::file(name_generator));
|
||||||
|
/// }
|
||||||
|
/// ```
|
||||||
|
pub fn file<T>(gen: T) -> Self
|
||||||
|
where
|
||||||
|
T: FilenameGenerator + 'static,
|
||||||
|
{
|
||||||
|
Field::File(Arc::new(gen))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Add a Text field to a form
|
||||||
|
///
|
||||||
|
/// # Example
|
||||||
|
/// ```rust
|
||||||
|
/// # extern crate form_data;
|
||||||
|
/// # use form_data::{Form, Field};
|
||||||
|
/// # fn main() {
|
||||||
|
/// let form = Form::new().field("text-field", Field::text());
|
||||||
|
/// # }
|
||||||
|
pub fn text() -> Self {
|
||||||
|
Field::Text
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Add an Int field to a form
|
||||||
|
///
|
||||||
|
/// # Example
|
||||||
|
/// ```rust
|
||||||
|
/// # extern crate form_data;
|
||||||
|
/// # use form_data::{Form, Field};
|
||||||
|
/// # fn main() {
|
||||||
|
/// let form = Form::new().field("int-field", Field::int());
|
||||||
|
/// # }
|
||||||
|
/// ```
|
||||||
|
pub fn int() -> Self {
|
||||||
|
Field::Int
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Add a Float field to a form
|
||||||
|
///
|
||||||
|
/// # Example
|
||||||
|
/// ```rust
|
||||||
|
/// # extern crate form_data;
|
||||||
|
/// # use form_data::{Form, Field};
|
||||||
|
/// # fn main() {
|
||||||
|
/// let form = Form::new().field("float-field", Field::float());
|
||||||
|
/// # }
|
||||||
|
/// ```
|
||||||
|
pub fn float() -> Self {
|
||||||
|
Field::Float
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Add a Bytes field to a form
|
||||||
|
///
|
||||||
|
/// # Example
|
||||||
|
/// ```rust
|
||||||
|
/// # extern crate form_data;
|
||||||
|
/// # use form_data::{Form, Field};
|
||||||
|
/// # fn main() {
|
||||||
|
/// let form = Form::new().field("bytes-field", Field::bytes());
|
||||||
|
/// # }
|
||||||
|
/// ```
|
||||||
|
pub fn bytes() -> Self {
|
||||||
|
Field::Bytes
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Add an Array to a form
|
||||||
|
///
|
||||||
|
/// # Example
|
||||||
|
/// ```rust
|
||||||
|
/// # extern crate form_data;
|
||||||
|
/// # use form_data::{Form, Field};
|
||||||
|
/// # fn main() {
|
||||||
|
/// let form = Form::new()
|
||||||
|
/// .field(
|
||||||
|
/// "array-field",
|
||||||
|
/// Field::array(Field::text())
|
||||||
|
/// );
|
||||||
|
/// # }
|
||||||
|
/// ```
|
||||||
|
pub fn array(field: Field) -> Self {
|
||||||
|
Field::Array(Array::new(field))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Add a Map to a form
|
||||||
|
///
|
||||||
|
/// # Example
|
||||||
|
/// ```rust
|
||||||
|
/// # extern crate form_data;
|
||||||
|
/// # use form_data::{Form, Field};
|
||||||
|
/// # fn main() {
|
||||||
|
/// let form = Form::new()
|
||||||
|
/// .field(
|
||||||
|
/// "map-field",
|
||||||
|
/// Field::map()
|
||||||
|
/// .field("sub-field", Field::text())
|
||||||
|
/// .field("sub-field-two", Field::text())
|
||||||
|
/// .finalize()
|
||||||
|
/// );
|
||||||
|
/// # }
|
||||||
|
/// ```
|
||||||
|
pub fn map() -> Map {
|
||||||
|
Map::new()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn valid_field(&self, name: VecDeque<NamePart>) -> Option<FieldTerminator> {
|
||||||
|
trace!("Checking {:?} and {:?}", self, name);
|
||||||
|
match *self {
|
||||||
|
Field::Array(ref arr) => arr.valid_field(name),
|
||||||
|
Field::Map(ref map) => map.valid_field(name),
|
||||||
|
Field::File(ref gen) => if name.is_empty() {
|
||||||
|
Some(FieldTerminator::File(Arc::clone(gen)))
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
},
|
||||||
|
Field::Int => if name.is_empty() {
|
||||||
|
Some(FieldTerminator::Int)
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
},
|
||||||
|
Field::Float => if name.is_empty() {
|
||||||
|
Some(FieldTerminator::Float)
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
},
|
||||||
|
Field::Text => if name.is_empty() {
|
||||||
|
Some(FieldTerminator::Text)
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
},
|
||||||
|
Field::Bytes => if name.is_empty() {
|
||||||
|
Some(FieldTerminator::Bytes)
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A definition of an array of type `Field` to be parsed from form data.
|
||||||
|
///
|
||||||
|
/// The `Array` type should only be constructed in the context of a Form. See the `Form`
|
||||||
|
/// documentation for more information.
|
||||||
|
#[derive(Debug, Clone)]
|
||||||
|
pub struct Array {
|
||||||
|
inner: Box<Field>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Array {
|
||||||
|
fn new(field: Field) -> Self {
|
||||||
|
Array {
|
||||||
|
inner: Box::new(field),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn valid_field(&self, mut name: VecDeque<NamePart>) -> Option<FieldTerminator> {
|
||||||
|
trace!("Checking {:?} and {:?}", self, name);
|
||||||
|
match name.pop_front() {
|
||||||
|
Some(name_part) => match name_part {
|
||||||
|
NamePart::Array => self.inner.valid_field(name),
|
||||||
|
_ => None,
|
||||||
|
},
|
||||||
|
None => None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A definition of key-value pairs to be parsed from form data.
|
||||||
|
#[derive(Debug, Clone)]
|
||||||
|
pub struct Map {
|
||||||
|
inner: Vec<(String, Field)>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Map {
|
||||||
|
fn new() -> Self {
|
||||||
|
Map { inner: Vec::new() }
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Add a `Field` to a map
|
||||||
|
/// # Example
|
||||||
|
/// ```rust
|
||||||
|
/// # use form_data::Field;
|
||||||
|
/// #
|
||||||
|
/// Field::map()
|
||||||
|
/// .field("sub-field", Field::text())
|
||||||
|
/// .field("sub-field-two", Field::text())
|
||||||
|
/// .finalize();
|
||||||
|
/// ```
|
||||||
|
pub fn field(mut self, key: &str, value: Field) -> Self {
|
||||||
|
self.inner.push((key.to_owned(), value));
|
||||||
|
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Finalize the map into a `Field`, so it can be added to a Form
|
||||||
|
/// ```rust
|
||||||
|
/// # use form_data::Field;
|
||||||
|
/// #
|
||||||
|
/// Field::map()
|
||||||
|
/// .field("sub-field", Field::text())
|
||||||
|
/// .field("sub-field-two", Field::text())
|
||||||
|
/// .finalize();
|
||||||
|
/// ```
|
||||||
|
pub fn finalize(self) -> Field {
|
||||||
|
Field::Map(self)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn valid_field(&self, mut name: VecDeque<NamePart>) -> Option<FieldTerminator> {
|
||||||
|
trace!("Checking {:?} and {:?}", self, name);
|
||||||
|
match name.pop_front() {
|
||||||
|
Some(name_part) => match name_part {
|
||||||
|
NamePart::Map(part_name) => self.inner
|
||||||
|
.iter()
|
||||||
|
.find(|(item, _)| *item == part_name)
|
||||||
|
.and_then(|(_, field)| field.valid_field(name)),
|
||||||
|
_ => None,
|
||||||
|
},
|
||||||
|
None => None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A structure that defines the fields expected in form data
|
||||||
|
///
|
||||||
|
/// # Example
|
||||||
|
/// ```rust
|
||||||
|
/// # extern crate mime;
|
||||||
|
/// # extern crate form_data;
|
||||||
|
/// # use std::path::{Path, PathBuf};
|
||||||
|
/// # use form_data::{Form, Field, FilenameGenerator};
|
||||||
|
/// # struct Gen;
|
||||||
|
/// # impl FilenameGenerator for Gen {
|
||||||
|
/// # fn next_filename(&self, _: &mime::Mime) -> Option<PathBuf> {
|
||||||
|
/// # Some(AsRef::<Path>::as_ref("path.png").to_owned())
|
||||||
|
/// # }
|
||||||
|
/// # }
|
||||||
|
/// # fn main() {
|
||||||
|
/// # let name_generator = Gen;
|
||||||
|
/// let form = Form::new()
|
||||||
|
/// .field("field-name", Field::text())
|
||||||
|
/// .field("second-field", Field::int())
|
||||||
|
/// .field("third-field", Field::float())
|
||||||
|
/// .field("fourth-field", Field::bytes())
|
||||||
|
/// .field("fifth-field", Field::file(name_generator))
|
||||||
|
/// .field(
|
||||||
|
/// "map-field",
|
||||||
|
/// Field::map()
|
||||||
|
/// .field("sub-field", Field::text())
|
||||||
|
/// .field("sub-field-two", Field::text())
|
||||||
|
/// .finalize()
|
||||||
|
/// )
|
||||||
|
/// .field(
|
||||||
|
/// "array-field",
|
||||||
|
/// Field::array(Field::text())
|
||||||
|
/// );
|
||||||
|
/// # }
|
||||||
|
/// ```
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct Form {
|
||||||
|
pub max_fields: u32,
|
||||||
|
pub max_field_size: usize,
|
||||||
|
pub max_files: u32,
|
||||||
|
pub max_file_size: usize,
|
||||||
|
inner: Map,
|
||||||
|
pub pool: ArcExecutor,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Form {
|
||||||
|
/// Create a new form
|
||||||
|
///
|
||||||
|
/// This also creates a new `CpuPool` to be used to stream files onto the filesystem. If you
|
||||||
|
/// wish to provide your own executor, use the `from_executor` method.
|
||||||
|
pub fn new() -> Self {
|
||||||
|
Form::from_executor(CpuPool::new_num_cpus())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Set the maximum number of fields allowed in the upload
|
||||||
|
///
|
||||||
|
/// The upload will error if too many fields are provided.
|
||||||
|
pub fn max_fields(mut self, max: u32) -> Self {
|
||||||
|
self.max_fields = max;
|
||||||
|
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Set the maximum size of a field (in bytes)
|
||||||
|
///
|
||||||
|
/// The upload will error if a provided field is too large.
|
||||||
|
pub fn max_field_size(mut self, max: usize) -> Self {
|
||||||
|
self.max_field_size = max;
|
||||||
|
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Set the maximum number of files allowed in the upload
|
||||||
|
///
|
||||||
|
/// THe upload will error if too many files are provided.
|
||||||
|
pub fn max_files(mut self, max: u32) -> Self {
|
||||||
|
self.max_files = max;
|
||||||
|
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Set the maximum size for files (in bytes)
|
||||||
|
///
|
||||||
|
/// The upload will error if a provided file is too large.
|
||||||
|
pub fn max_file_size(mut self, max: usize) -> Self {
|
||||||
|
self.max_file_size = max;
|
||||||
|
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Create a new form with a given executor
|
||||||
|
///
|
||||||
|
/// This executor is used to stream files onto the filesystem.
|
||||||
|
pub fn from_executor<E>(executor: E) -> Self
|
||||||
|
where
|
||||||
|
E: Executor<Box<Future<Item = (), Error = ()> + Send>> + Send + Sync + Clone + 'static,
|
||||||
|
{
|
||||||
|
Form {
|
||||||
|
max_fields: 100,
|
||||||
|
max_field_size: 10_000,
|
||||||
|
max_files: 20,
|
||||||
|
max_file_size: 10_000_000,
|
||||||
|
inner: Map::new(),
|
||||||
|
pool: ArcExecutor::new(executor),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn field(mut self, name: &str, field: Field) -> Self {
|
||||||
|
self.inner = self.inner.field(name, field);
|
||||||
|
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn valid_field(&self, name: VecDeque<NamePart>) -> Option<FieldTerminator> {
|
||||||
|
self.inner.valid_field(name.clone())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl fmt::Debug for Form {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||||
|
write!(f, "Form({:?})", self.inner)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The executor type stored inside a `Form`
|
||||||
|
///
|
||||||
|
/// Any executor capable of being shared and executing boxed futures can be stored here.
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct ArcExecutor {
|
||||||
|
inner: Arc<Executor<Box<Future<Item = (), Error = ()> + Send>> + Send + Sync + 'static>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ArcExecutor {
|
||||||
|
/// Create a new ArcExecutor from an Executor
|
||||||
|
///
|
||||||
|
/// This essentially wraps the given executor in an Arc
|
||||||
|
pub fn new<E>(executor: E) -> Self
|
||||||
|
where
|
||||||
|
E: Executor<Box<Future<Item = (), Error = ()> + Send>> + Send + Sync + Clone + 'static,
|
||||||
|
{
|
||||||
|
ArcExecutor {
|
||||||
|
inner: Arc::new(executor),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Executor<Box<Future<Item = (), Error = ()> + Send>> for ArcExecutor where {
|
||||||
|
fn execute(
|
||||||
|
&self,
|
||||||
|
future: Box<Future<Item = (), Error = ()> + Send>,
|
||||||
|
) -> Result<(), ExecuteError<Box<Future<Item = (), Error = ()> + Send>>> {
|
||||||
|
self.inner.execute(future)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Debug, PartialEq)]
|
||||||
|
pub(crate) struct ContentDisposition {
|
||||||
|
pub name: Option<String>,
|
||||||
|
pub filename: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ContentDisposition {
|
||||||
|
pub(crate) fn empty() -> Self {
|
||||||
|
ContentDisposition {
|
||||||
|
name: None,
|
||||||
|
filename: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Debug, PartialEq)]
|
||||||
|
pub(crate) enum NamePart {
|
||||||
|
Map(String),
|
||||||
|
Array,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl NamePart {
|
||||||
|
pub fn is_map(&self) -> bool {
|
||||||
|
match *self {
|
||||||
|
NamePart::Map(_) => true,
|
||||||
|
_ => false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub(crate) enum FieldTerminator {
|
||||||
|
File(Arc<FilenameGenerator>),
|
||||||
|
Bytes,
|
||||||
|
Int,
|
||||||
|
Float,
|
||||||
|
Text,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl fmt::Debug for FieldTerminator {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||||
|
match *self {
|
||||||
|
FieldTerminator::File(_) => write!(f, "File(filename_generator)"),
|
||||||
|
FieldTerminator::Bytes => write!(f, "Bytes"),
|
||||||
|
FieldTerminator::Int => write!(f, "Int"),
|
||||||
|
FieldTerminator::Float => write!(f, "Float"),
|
||||||
|
FieldTerminator::Text => write!(f, "Text"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) type MultipartHash = (Vec<NamePart>, MultipartContent);
|
||||||
|
pub(crate) type MultipartForm = Vec<MultipartHash>;
|
||||||
|
|
||||||
|
#[derive(Clone, Debug, PartialEq)]
|
||||||
|
pub(crate) enum MultipartContent {
|
||||||
|
File {
|
||||||
|
filename: String,
|
||||||
|
stored_as: PathBuf,
|
||||||
|
},
|
||||||
|
Bytes(Bytes),
|
||||||
|
Text(String),
|
||||||
|
Int(i64),
|
||||||
|
Float(f64),
|
||||||
}
|
}
|
||||||
|
|
150
src/upload.rs
150
src/upload.rs
|
@ -1,4 +1,24 @@
|
||||||
use std::{fs::DirBuilder, os::unix::fs::DirBuilderExt, path::Path, sync::Arc};
|
/*
|
||||||
|
* This file is part of Actix Form Data.
|
||||||
|
*
|
||||||
|
* Copyright © 2018 Riley Trautman
|
||||||
|
*
|
||||||
|
* Actix Form Data 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.
|
||||||
|
*
|
||||||
|
* Actix Form Data 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 Actix Form Data. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
use std::{collections::HashMap, fs::DirBuilder, os::unix::fs::DirBuilderExt, path::Path,
|
||||||
|
sync::{Arc, atomic::{AtomicUsize, Ordering}}};
|
||||||
|
|
||||||
use actix_web::{multipart, error::PayloadError};
|
use actix_web::{multipart, error::PayloadError};
|
||||||
use bytes::{Bytes, BytesMut};
|
use bytes::{Bytes, BytesMut};
|
||||||
|
@ -8,7 +28,34 @@ use http::header::CONTENT_DISPOSITION;
|
||||||
|
|
||||||
use error::Error;
|
use error::Error;
|
||||||
use super::FilenameGenerator;
|
use super::FilenameGenerator;
|
||||||
use types::{self, MultipartContent, MultipartForm, MultipartHash, NamePart};
|
use types::{self, ContentDisposition, MultipartContent, MultipartForm, MultipartHash, NamePart,
|
||||||
|
Value};
|
||||||
|
|
||||||
|
fn consolidate(mf: MultipartForm) -> Value {
|
||||||
|
mf.into_iter().fold(
|
||||||
|
Value::Map(HashMap::new()),
|
||||||
|
|mut acc, (mut nameparts, content)| {
|
||||||
|
let start_value = Value::from(content);
|
||||||
|
|
||||||
|
nameparts.reverse();
|
||||||
|
let value = nameparts
|
||||||
|
.into_iter()
|
||||||
|
.fold(start_value, |acc, namepart| match namepart {
|
||||||
|
NamePart::Map(name) => {
|
||||||
|
let mut hm = HashMap::new();
|
||||||
|
|
||||||
|
hm.insert(name, acc);
|
||||||
|
|
||||||
|
Value::Map(hm)
|
||||||
|
}
|
||||||
|
NamePart::Array => Value::Array(vec![acc]),
|
||||||
|
});
|
||||||
|
|
||||||
|
acc.merge(value);
|
||||||
|
acc
|
||||||
|
},
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
fn parse_multipart_name(name: String) -> Result<Vec<NamePart>, Error> {
|
fn parse_multipart_name(name: String) -> Result<Vec<NamePart>, Error> {
|
||||||
name.split('[')
|
name.split('[')
|
||||||
|
@ -34,20 +81,6 @@ fn parse_multipart_name(name: String) -> Result<Vec<NamePart>, Error> {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct ContentDisposition {
|
|
||||||
name: Option<String>,
|
|
||||||
filename: Option<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl ContentDisposition {
|
|
||||||
fn empty() -> Self {
|
|
||||||
ContentDisposition {
|
|
||||||
name: None,
|
|
||||||
filename: None,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn parse_content_disposition<S>(field: &multipart::Field<S>) -> Result<ContentDisposition, Error>
|
fn parse_content_disposition<S>(field: &multipart::Field<S>) -> Result<ContentDisposition, Error>
|
||||||
where
|
where
|
||||||
S: Stream<Item = Bytes, Error = PayloadError>,
|
S: Stream<Item = Bytes, Error = PayloadError>,
|
||||||
|
@ -136,10 +169,12 @@ where
|
||||||
|
|
||||||
tx.send(res).map_err(|_| ())
|
tx.send(res).map_err(|_| ())
|
||||||
}))) {
|
}))) {
|
||||||
Ok(_) => (),
|
| Ok(_) => (),
|
||||||
Err(_) => return Either::B(result(Err(Error::MkDir))),
|
Err(_) => return Either::B(result(Err(Error::MkDir))),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let counter = Arc::new(AtomicUsize::new(0));
|
||||||
|
|
||||||
Either::A(rx.then(|res| match res {
|
Either::A(rx.then(|res| match res {
|
||||||
Ok(res) => res,
|
Ok(res) => res,
|
||||||
Err(_) => Err(Error::MkDir),
|
Err(_) => Err(Error::MkDir),
|
||||||
|
@ -148,6 +183,15 @@ where
|
||||||
FsPool::from_executor(form.pool.clone()).write(stored_as.clone(), Default::default());
|
FsPool::from_executor(form.pool.clone()).write(stored_as.clone(), Default::default());
|
||||||
field
|
field
|
||||||
.map_err(Error::Multipart)
|
.map_err(Error::Multipart)
|
||||||
|
.and_then(move |bytes| {
|
||||||
|
let size = counter.fetch_add(bytes.len(), Ordering::Relaxed) + bytes.len();
|
||||||
|
|
||||||
|
if size > form.max_file_size {
|
||||||
|
Err(Error::FileSize)
|
||||||
|
} else {
|
||||||
|
Ok(bytes)
|
||||||
|
}
|
||||||
|
})
|
||||||
.forward(write)
|
.forward(write)
|
||||||
.map(move |_| MultipartContent::File {
|
.map(move |_| MultipartContent::File {
|
||||||
filename,
|
filename,
|
||||||
|
@ -159,42 +203,53 @@ where
|
||||||
fn handle_form_data<S>(
|
fn handle_form_data<S>(
|
||||||
field: multipart::Field<S>,
|
field: multipart::Field<S>,
|
||||||
term: types::FieldTerminator,
|
term: types::FieldTerminator,
|
||||||
|
form: types::Form,
|
||||||
) -> impl Future<Item = MultipartContent, Error = Error>
|
) -> impl Future<Item = MultipartContent, Error = Error>
|
||||||
where
|
where
|
||||||
S: Stream<Item = Bytes, Error = PayloadError>,
|
S: Stream<Item = Bytes, Error = PayloadError>,
|
||||||
{
|
{
|
||||||
trace!("In handle_form_data, term: {:?}", term);
|
trace!("In handle_form_data, term: {:?}", term);
|
||||||
let max_body_size = 80000;
|
let term2 = term.clone();
|
||||||
|
|
||||||
field
|
field
|
||||||
.from_err()
|
.from_err()
|
||||||
.fold(BytesMut::new(), move |mut acc, bytes| {
|
.fold(BytesMut::new(), move |mut acc, bytes| {
|
||||||
if acc.len() + bytes.len() < max_body_size {
|
if acc.len() + bytes.len() < form.max_field_size {
|
||||||
acc.extend(bytes);
|
acc.extend(bytes);
|
||||||
Ok(acc)
|
Ok(acc)
|
||||||
} else {
|
} else {
|
||||||
Err(Error::FieldSize)
|
Err(Error::FieldSize)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.and_then(|bytes| String::from_utf8(bytes.to_vec()).map_err(Error::ParseField))
|
.and_then(move |bytes| match term {
|
||||||
.and_then(move |string| {
|
types::FieldTerminator::Bytes => Ok(MultipartContent::Bytes(bytes.freeze())),
|
||||||
trace!("Matching: {:?}", string);
|
_ => String::from_utf8(bytes.to_vec())
|
||||||
match term {
|
.map_err(Error::ParseField)
|
||||||
types::FieldTerminator::File(_) => Err(Error::FieldType),
|
.map(MultipartContent::Text),
|
||||||
types::FieldTerminator::Float => string
|
})
|
||||||
.parse::<f64>()
|
.and_then(move |content| {
|
||||||
.map(MultipartContent::Float)
|
trace!("Matching: {:?}", content);
|
||||||
.map_err(Error::ParseFloat),
|
match content {
|
||||||
types::FieldTerminator::Int => string
|
types::MultipartContent::Text(string) => match term2 {
|
||||||
.parse::<i64>()
|
types::FieldTerminator::File(_) => Err(Error::FieldType),
|
||||||
.map(MultipartContent::Int)
|
types::FieldTerminator::Bytes => Err(Error::FieldType),
|
||||||
.map_err(Error::ParseInt),
|
types::FieldTerminator::Float => string
|
||||||
types::FieldTerminator::Text => Ok(MultipartContent::Text(string)),
|
.parse::<f64>()
|
||||||
|
.map(MultipartContent::Float)
|
||||||
|
.map_err(Error::ParseFloat),
|
||||||
|
types::FieldTerminator::Int => string
|
||||||
|
.parse::<i64>()
|
||||||
|
.map(MultipartContent::Int)
|
||||||
|
.map_err(Error::ParseInt),
|
||||||
|
types::FieldTerminator::Text => Ok(MultipartContent::Text(string)),
|
||||||
|
},
|
||||||
|
b @ types::MultipartContent::Bytes(_) => Ok(b),
|
||||||
|
_ => Err(Error::FieldType),
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
fn handle_multipart_field<S>(
|
fn handle_stream_field<S>(
|
||||||
field: multipart::Field<S>,
|
field: multipart::Field<S>,
|
||||||
form: types::Form,
|
form: types::Form,
|
||||||
) -> impl Future<Item = MultipartHash, Error = Error>
|
) -> impl Future<Item = MultipartHash, Error = Error>
|
||||||
|
@ -228,13 +283,13 @@ where
|
||||||
content_disposition.filename,
|
content_disposition.filename,
|
||||||
form,
|
form,
|
||||||
)),
|
)),
|
||||||
term => Either::B(handle_form_data(field, term)),
|
term => Either::B(handle_form_data(field, term, form)),
|
||||||
};
|
};
|
||||||
|
|
||||||
Either::A(fut.map(|content| (name, content)))
|
Either::A(fut.map(|content| (name, content)))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn handle_multipart<S>(
|
fn handle_stream<S>(
|
||||||
m: multipart::Multipart<S>,
|
m: multipart::Multipart<S>,
|
||||||
form: types::Form,
|
form: types::Form,
|
||||||
) -> Box<Stream<Item = MultipartHash, Error = Error>>
|
) -> Box<Stream<Item = MultipartHash, Error = Error>>
|
||||||
|
@ -247,14 +302,14 @@ where
|
||||||
multipart::MultipartItem::Field(field) => {
|
multipart::MultipartItem::Field(field) => {
|
||||||
info!("Field: {:?}", field);
|
info!("Field: {:?}", field);
|
||||||
Box::new(
|
Box::new(
|
||||||
handle_multipart_field(field, form.clone())
|
handle_stream_field(field, form.clone())
|
||||||
.map(From::from)
|
.map(From::from)
|
||||||
.into_stream(),
|
.into_stream(),
|
||||||
) as Box<Stream<Item = MultipartHash, Error = Error>>
|
) as Box<Stream<Item = MultipartHash, Error = Error>>
|
||||||
}
|
}
|
||||||
multipart::MultipartItem::Nested(m) => {
|
multipart::MultipartItem::Nested(m) => {
|
||||||
info!("Nested");
|
info!("Nested");
|
||||||
Box::new(handle_multipart(m, form.clone()))
|
Box::new(handle_stream(m, form.clone()))
|
||||||
as Box<Stream<Item = MultipartHash, Error = Error>>
|
as Box<Stream<Item = MultipartHash, Error = Error>>
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
@ -262,17 +317,15 @@ where
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn handle_upload<S>(
|
/// Handle multipart streams from Actix Web
|
||||||
|
pub fn handle_multipart<S>(
|
||||||
m: multipart::Multipart<S>,
|
m: multipart::Multipart<S>,
|
||||||
form: types::Form,
|
form: types::Form,
|
||||||
) -> impl Future<Item = MultipartForm, Error = Error>
|
) -> impl Future<Item = Value, Error = Error>
|
||||||
where
|
where
|
||||||
S: Stream<Item = Bytes, Error = PayloadError> + 'static,
|
S: Stream<Item = Bytes, Error = PayloadError> + 'static,
|
||||||
{
|
{
|
||||||
let max_files = 10;
|
handle_stream(m, form.clone())
|
||||||
let max_fields = 100;
|
|
||||||
|
|
||||||
handle_multipart(m, form)
|
|
||||||
.fold(
|
.fold(
|
||||||
(Vec::new(), 0, 0),
|
(Vec::new(), 0, 0),
|
||||||
move |(mut acc, file_count, field_count), (name, content)| match content {
|
move |(mut acc, file_count, field_count), (name, content)| match content {
|
||||||
|
@ -282,7 +335,7 @@ where
|
||||||
} => {
|
} => {
|
||||||
let file_count = file_count + 1;
|
let file_count = file_count + 1;
|
||||||
|
|
||||||
if file_count < max_files {
|
if file_count < form.max_files {
|
||||||
acc.push((
|
acc.push((
|
||||||
name,
|
name,
|
||||||
MultipartContent::File {
|
MultipartContent::File {
|
||||||
|
@ -296,12 +349,13 @@ where
|
||||||
Err(Error::FileCount)
|
Err(Error::FileCount)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
b @ MultipartContent::Text(_)
|
b @ MultipartContent::Bytes(_)
|
||||||
|
| b @ MultipartContent::Text(_)
|
||||||
| b @ MultipartContent::Float(_)
|
| b @ MultipartContent::Float(_)
|
||||||
| b @ MultipartContent::Int(_) => {
|
| b @ MultipartContent::Int(_) => {
|
||||||
let field_count = field_count + 1;
|
let field_count = field_count + 1;
|
||||||
|
|
||||||
if field_count < max_fields {
|
if field_count < form.max_fields {
|
||||||
acc.push((name, b));
|
acc.push((name, b));
|
||||||
|
|
||||||
Ok((acc, file_count, field_count))
|
Ok((acc, file_count, field_count))
|
||||||
|
@ -311,5 +365,5 @@ where
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
.map(|(multipart_form, _, _)| multipart_form)
|
.map(|(multipart_form, _, _)| consolidate(multipart_form))
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue