First pass at implementing biometric unlock using webauthn
This commit is contained in:
parent
516e2de4f7
commit
4e748dec1f
674
LICENSE
674
LICENSE
|
@ -1,674 +0,0 @@
|
|||
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:
|
||||
|
||||
{project} Copyright (C) {year} {fullname}
|
||||
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>.
|
File diff suppressed because it is too large
Load Diff
|
@ -2,7 +2,6 @@ import { css, html, LitElement } from "lit";
|
|||
import { customElement, property, state, query } from "lit/decorators.js";
|
||||
import { Plan, PlanType } from "@padloc/core/src/billing";
|
||||
import { translate as $l } from "@padloc/locale/src/translate";
|
||||
import { biometricAuth } from "@padloc/core/src/platform";
|
||||
import { VaultItem } from "@padloc/core/src/item";
|
||||
import { config, shared, mixins } from "../styles";
|
||||
import { app, router } from "../globals";
|
||||
|
@ -27,17 +26,8 @@ import "./org-view";
|
|||
import "./settings";
|
||||
import "./invite-recipient";
|
||||
import "./menu";
|
||||
import { startAttestation, startAssertion } from "@simplewebauthn/browser";
|
||||
import {
|
||||
CompleteMFARequestParams,
|
||||
CompleteRegisterMFAuthenticatorParams,
|
||||
CreateKeyStoreEntryParams,
|
||||
GetKeyStoreEntryParams,
|
||||
StartMFARequestParams,
|
||||
StartRegisterMFAuthenticatorParams,
|
||||
} from "@padloc/core/src/api";
|
||||
import { registerAuthenticator } from "../lib/mfa";
|
||||
import { MFAPurpose, MFAType } from "@padloc/core/src/mfa";
|
||||
import { bytesToString, stringToBytes } from "@padloc/core/src/encoding";
|
||||
|
||||
@customElement("pl-app")
|
||||
export class App extends ServiceWorker(StateMixin(AutoSync(ErrorHandling(AutoLock(Routing(LitElement)))))) {
|
||||
|
@ -84,51 +74,6 @@ export class App extends ServiceWorker(StateMixin(AutoSync(ErrorHandling(AutoLoc
|
|||
this.load();
|
||||
}
|
||||
|
||||
async registerWebAuthn(purpose: MFAPurpose = MFAPurpose.AccessKeyStore) {
|
||||
const { id, data } = await app.api.startRegisterMFAuthenticator(
|
||||
new StartRegisterMFAuthenticatorParams({ type: MFAType.WebAuthn, purposes: [purpose] })
|
||||
);
|
||||
|
||||
const att = await startAttestation(data);
|
||||
console.log(att);
|
||||
await app.api.completeRegisterMFAuthenticator(new CompleteRegisterMFAuthenticatorParams({ id, data: att }));
|
||||
return id;
|
||||
}
|
||||
|
||||
async requestWebAuthn(authenticatorId: string, purpose: MFAPurpose, type: MFAType) {
|
||||
const { id, data, token } = await app.api.startMFARequest(
|
||||
new StartMFARequestParams({ email: "martin@maklesoft.com", type, purpose, authenticatorId })
|
||||
);
|
||||
|
||||
console.log(data);
|
||||
|
||||
const ass = await startAssertion(data);
|
||||
|
||||
console.log(id, ass);
|
||||
|
||||
await app.api.completeMFARequest(
|
||||
new CompleteMFARequestParams({ id, data: ass, email: "martin@maklesoft.com" })
|
||||
);
|
||||
|
||||
return token;
|
||||
}
|
||||
|
||||
async setupKeyStore() {
|
||||
const authenticatorId = await this.registerWebAuthn();
|
||||
const { id } = await app.api.createKeyStoreEntry(
|
||||
new CreateKeyStoreEntryParams({
|
||||
authenticatorId,
|
||||
data: stringToBytes("Hello World!"),
|
||||
})
|
||||
);
|
||||
|
||||
const token = await this.requestWebAuthn(authenticatorId, MFAPurpose.AccessKeyStore, MFAType.WebAuthn);
|
||||
|
||||
const entry = await app.api.getKeyStoreEntry(new GetKeyStoreEntryParams({ id, mfaToken: token }));
|
||||
|
||||
console.log("success!!!", entry, bytesToString(entry.data));
|
||||
}
|
||||
|
||||
async load() {
|
||||
await app.loaded;
|
||||
// Try syncing account so user can unlock with new password in case it has changed
|
||||
|
@ -139,10 +84,6 @@ export class App extends ServiceWorker(StateMixin(AutoSync(ErrorHandling(AutoLoc
|
|||
// this.routeChanged();
|
||||
const spinner = document.querySelector(".spinner") as HTMLElement;
|
||||
spinner.style.display = "none";
|
||||
setTimeout(async () => {
|
||||
await app.unlock("asdf");
|
||||
this.go("");
|
||||
}, 500);
|
||||
}
|
||||
|
||||
async handleRoute([page, plan]: [string, string], { next }: { next?: string }, path: string) {
|
||||
|
@ -720,17 +661,10 @@ export class App extends ServiceWorker(StateMixin(AutoSync(ErrorHandling(AutoLoc
|
|||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
const authenticated = await biometricAuth();
|
||||
let authenticatorId: string | undefined = undefined;
|
||||
|
||||
if (!authenticated) {
|
||||
alert($l("Biometric authentication failed! Canceling Setup."), {
|
||||
title: $l("Setup Failed"),
|
||||
type: "warning",
|
||||
});
|
||||
app.forgetMasterKey();
|
||||
return;
|
||||
}
|
||||
try {
|
||||
authenticatorId = await registerAuthenticator([MFAPurpose.AccessKeyStore], MFAType.WebAuthn);
|
||||
} catch (e) {
|
||||
alert($l("Biometric unlock failed! Canceling Setup. (Reason: {0})", e.message), {
|
||||
title: $l("Setup Failed"),
|
||||
|
@ -764,7 +698,7 @@ export class App extends ServiceWorker(StateMixin(AutoSync(ErrorHandling(AutoLoc
|
|||
await app.unlock(password);
|
||||
}
|
||||
|
||||
await app.rememberMasterKey();
|
||||
await app.rememberMasterKey(authenticatorId);
|
||||
|
||||
await alert($l("Biometric unlock activated successfully!"), {
|
||||
title: $l("Biometric Unlock"),
|
||||
|
|
|
@ -68,7 +68,7 @@ export class Menu extends Routing(StateMixin(LitElement)) {
|
|||
private async _lock() {
|
||||
this.dispatchEvent(new CustomEvent("toggle-menu", { bubbles: true, composed: true }));
|
||||
await app.lock();
|
||||
this.go("unlock");
|
||||
this.go("unlock", { nobio: "1" });
|
||||
}
|
||||
|
||||
private _getPremium(e?: MouseEvent) {
|
||||
|
|
|
@ -18,6 +18,8 @@ import "./button";
|
|||
import "./list";
|
||||
import { customElement, query } from "lit/decorators.js";
|
||||
import { css, html } from "lit";
|
||||
import { isWebAuthnSupported } from "../lib/mfa";
|
||||
import { live } from "lit/directives/live";
|
||||
|
||||
@customElement("pl-settings")
|
||||
export class Settings extends StateMixin(View) {
|
||||
|
@ -178,12 +180,12 @@ export class Settings extends StateMixin(View) {
|
|||
>
|
||||
</pl-slider>
|
||||
|
||||
${app.supportsBiometricUnlock
|
||||
${isWebAuthnSupported()
|
||||
? html`
|
||||
<h2 class="large divider">${$l("Biometric Unlock")}</h2>
|
||||
<pl-toggle-button
|
||||
id="biometricUnlockButton"
|
||||
.active=${app.remembersMasterKey}
|
||||
.active=${live(app.remembersMasterKey)}
|
||||
.label=${$l("Enable Biometric Unlock")}
|
||||
reverse
|
||||
@change=${this._toggleBiometricUnlock}
|
||||
|
@ -407,10 +409,9 @@ Device Info: ${JSON.stringify(app.state.device.toRaw(), null, 4)}
|
|||
}
|
||||
|
||||
private async _toggleBiometricUnlock(e: Event) {
|
||||
e.stopPropagation();
|
||||
// e.stopPropagation();
|
||||
const toggle = e.target as ToggleButton;
|
||||
console.log(toggle.active);
|
||||
if (toggle.active) {
|
||||
if (!toggle.active) {
|
||||
this.dispatchEvent(new CustomEvent("enable-biometric-auth", { bubbles: true, composed: true }));
|
||||
} else {
|
||||
const confirmed = await confirm($l("Are you sure you want to disable biometric unlock?"));
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
import { translate as $l } from "@padloc/locale/src/translate";
|
||||
import { ErrorCode } from "@padloc/core/src/error";
|
||||
import { biometricAuth } from "@padloc/core/src/platform";
|
||||
import { app, router } from "../globals";
|
||||
import { isTouch } from "../lib/util";
|
||||
import { StartForm } from "./start-form";
|
||||
|
@ -10,6 +9,8 @@ import { alert, confirm, choose } from "../lib/dialog";
|
|||
import "./logo";
|
||||
import { customElement, query, state } from "lit/decorators.js";
|
||||
import { css, html } from "lit";
|
||||
import { getMFAToken, isWebAuthnSupported } from "../lib/mfa";
|
||||
import { MFAPurpose, MFAType } from "@padloc/core/src/mfa";
|
||||
|
||||
@customElement("pl-unlock")
|
||||
export class Unlock extends StartForm {
|
||||
|
@ -48,18 +49,23 @@ export class Unlock extends StartForm {
|
|||
setTimeout(() => this._passwordInput.focus(), 100);
|
||||
}
|
||||
|
||||
const { nobio, ...params } = router.params;
|
||||
|
||||
await app.loaded;
|
||||
if (
|
||||
app.account &&
|
||||
app.account.locked &&
|
||||
app.supportsBiometricUnlock &&
|
||||
isWebAuthnSupported() &&
|
||||
app.remembersMasterKey &&
|
||||
!("nobio" in router.params)
|
||||
) {
|
||||
this._bioAuth();
|
||||
}
|
||||
|
||||
router.params = params;
|
||||
|
||||
setTimeout(() => {
|
||||
this._bioauthButton.classList.toggle("show", app.supportsBiometricUnlock);
|
||||
this._bioauthButton.classList.toggle("show", isWebAuthnSupported());
|
||||
}, 1000);
|
||||
}
|
||||
|
||||
|
@ -239,29 +245,34 @@ export class Unlock extends StartForm {
|
|||
this._bioauthButton.start();
|
||||
|
||||
try {
|
||||
if (app.remembersMasterKey) {
|
||||
const authenticated = await biometricAuth();
|
||||
|
||||
if (!authenticated) {
|
||||
const rememberedMasterKey = app.state.rememberedMasterKey;
|
||||
if (rememberedMasterKey) {
|
||||
try {
|
||||
const mfaToken = await getMFAToken(
|
||||
MFAPurpose.AccessKeyStore,
|
||||
MFAType.WebAuthn,
|
||||
undefined,
|
||||
rememberedMasterKey.authenticatorId
|
||||
);
|
||||
await app.unlockWithRememberedMasterKey(mfaToken);
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
this._bioauthButton.fail();
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
await app.unlockWithRememberedMasterKey();
|
||||
} catch (e) {
|
||||
this.dispatchEvent(
|
||||
new CustomEvent("enable-biometric-auth", {
|
||||
detail: {
|
||||
message: $l("Biometric unlock expired. Complete setup to reeneable."),
|
||||
},
|
||||
bubbles: true,
|
||||
composed: true,
|
||||
})
|
||||
);
|
||||
// this.dispatchEvent(
|
||||
// new CustomEvent("enable-biometric-auth", {
|
||||
// detail: {
|
||||
// message: $l("Biometric unlock expired. Complete setup to reeneable."),
|
||||
// },
|
||||
// bubbles: true,
|
||||
// composed: true,
|
||||
// })
|
||||
// );
|
||||
}
|
||||
|
||||
this._bioauthButton.success();
|
||||
this.done();
|
||||
this.go("");
|
||||
} else {
|
||||
this.dispatchEvent(
|
||||
new CustomEvent("enable-biometric-auth", {
|
||||
|
|
|
@ -0,0 +1,59 @@
|
|||
import {
|
||||
CompleteMFARequestParams,
|
||||
CompleteRegisterMFAuthenticatorParams,
|
||||
StartMFARequestParams,
|
||||
StartRegisterMFAuthenticatorParams,
|
||||
} from "@padloc/core/src/api";
|
||||
import { MFAPurpose, MFAType } from "@padloc/core/src/mfa";
|
||||
import { startAssertion, startAttestation, supportsWebauthn } from "@simplewebauthn/browser";
|
||||
import {
|
||||
PublicKeyCredentialCreationOptionsJSON,
|
||||
PublicKeyCredentialRequestOptionsJSON,
|
||||
} from "@simplewebauthn/typescript-types";
|
||||
import { app } from "../globals";
|
||||
|
||||
export class WebAuthnClient {
|
||||
supportsType(type: MFAType) {
|
||||
return type === MFAType.WebAuthn;
|
||||
}
|
||||
|
||||
async prepareAttestation(serverData: PublicKeyCredentialCreationOptionsJSON, _clientData: undefined) {
|
||||
return startAttestation(serverData);
|
||||
}
|
||||
|
||||
async prepareAssertion(serverData: PublicKeyCredentialRequestOptionsJSON, _clientData: undefined) {
|
||||
return startAssertion(serverData);
|
||||
}
|
||||
}
|
||||
|
||||
export function isWebAuthnSupported() {
|
||||
return supportsWebauthn();
|
||||
}
|
||||
|
||||
const webAuthnClient = new WebAuthnClient();
|
||||
|
||||
export async function registerAuthenticator(purposes: MFAPurpose[], type: MFAType.WebAuthn = MFAType.WebAuthn) {
|
||||
const { id, data } = await app.api.startRegisterMFAuthenticator(
|
||||
new StartRegisterMFAuthenticatorParams({ purposes, type })
|
||||
);
|
||||
const att = await webAuthnClient.prepareAttestation(data, undefined);
|
||||
await app.api.completeRegisterMFAuthenticator(new CompleteRegisterMFAuthenticatorParams({ id, data: att }));
|
||||
return id;
|
||||
}
|
||||
|
||||
export async function getMFAToken(
|
||||
purpose: MFAPurpose,
|
||||
type: MFAType = MFAType.WebAuthn,
|
||||
email = app.account?.email,
|
||||
authenticatorId?: string
|
||||
) {
|
||||
const { id, data, token } = await app.api.startMFARequest(
|
||||
new StartMFARequestParams({ email, type, purpose, authenticatorId })
|
||||
);
|
||||
|
||||
const ass = await webAuthnClient.prepareAssertion(data, undefined);
|
||||
|
||||
await app.api.completeMFARequest(new CompleteMFARequestParams({ id, data: ass, email }));
|
||||
|
||||
return token;
|
||||
}
|
|
@ -56,7 +56,7 @@ export function AutoLock<B extends Constructor<Object>>(baseClass: B) {
|
|||
}
|
||||
|
||||
await app.lock();
|
||||
router.go("unlock");
|
||||
router.go("unlock", { nobio: "1" });
|
||||
}
|
||||
|
||||
private _startTimer() {
|
||||
|
|
|
@ -8180,7 +8180,8 @@
|
|||
"version": "1.0.3",
|
||||
"resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.3.tgz",
|
||||
"integrity": "sha512-WQs0ep98FXX2XBAfQpRbY0Ma6ADw8JR6xoIkaIiJIzClGOMqVRvPCWqndTxf28DgFopWan0EKtHtg/5W1h0Zkw==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"@webpack-cli/info": {
|
||||
"version": "1.2.4",
|
||||
|
@ -8195,7 +8196,8 @@
|
|||
"version": "1.4.0",
|
||||
"resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.4.0.tgz",
|
||||
"integrity": "sha512-xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"@xtuc/ieee754": {
|
||||
"version": "1.2.0",
|
||||
|
@ -8310,7 +8312,8 @@
|
|||
"version": "3.5.2",
|
||||
"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
|
||||
"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"android-versions": {
|
||||
"version": "1.7.0",
|
||||
|
@ -10464,7 +10467,8 @@
|
|||
"version": "5.1.0",
|
||||
"resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
|
||||
"integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"ignore": {
|
||||
"version": "5.1.8",
|
||||
|
@ -12012,7 +12016,8 @@
|
|||
"version": "3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
|
||||
"integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"postcss-modules-local-by-default": {
|
||||
"version": "4.0.0",
|
||||
|
|
|
@ -363,6 +363,15 @@ export class GetKeyStoreEntryParams extends Serializable {
|
|||
mfaToken: string = "";
|
||||
}
|
||||
|
||||
export class DeleteKeyStoreEntryParams extends Serializable {
|
||||
constructor(vals: Partial<DeleteKeyStoreEntryParams> = {}) {
|
||||
super();
|
||||
Object.assign(this, vals);
|
||||
}
|
||||
|
||||
id: string = "";
|
||||
}
|
||||
|
||||
interface HandlerDefinition {
|
||||
method: string;
|
||||
input?: SerializableConstructor;
|
||||
|
@ -684,4 +693,9 @@ export class API {
|
|||
getKeyStoreEntry(_params: GetKeyStoreEntryParams): Promise<KeyStoreEntry> {
|
||||
throw "Not implemented";
|
||||
}
|
||||
|
||||
@Handler(DeleteKeyStoreEntryParams, undefined)
|
||||
deleteKeyStoreEntry(_params: DeleteKeyStoreEntryParams): Promise<void> {
|
||||
throw "Not implemented";
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,14 +1,6 @@
|
|||
import { loadLanguage, translate as $l } from "@padloc/locale/src/translate";
|
||||
import { Storage, Storable } from "./storage";
|
||||
import {
|
||||
Serializable,
|
||||
Serialize,
|
||||
AsDate,
|
||||
AsSerializable,
|
||||
bytesToBase64,
|
||||
base64ToBytes,
|
||||
stringToBytes,
|
||||
} from "./encoding";
|
||||
import { Serializable, Serialize, AsDate, AsSerializable, bytesToBase64, stringToBytes } from "./encoding";
|
||||
import { Invite, InvitePurpose } from "./invite";
|
||||
import { Vault, VaultID } from "./vault";
|
||||
import { Org, OrgID, OrgType, OrgMember, OrgRole, Group } from "./org";
|
||||
|
@ -29,19 +21,13 @@ import {
|
|||
GetInviteParams,
|
||||
GetAttachmentParams,
|
||||
DeleteAttachmentParams,
|
||||
CreateKeyStoreEntryParams,
|
||||
DeleteKeyStoreEntryParams,
|
||||
GetKeyStoreEntryParams,
|
||||
} from "./api";
|
||||
import { Client } from "./client";
|
||||
import { Sender } from "./transport";
|
||||
import {
|
||||
DeviceInfo,
|
||||
getDeviceInfo,
|
||||
isKeyStoreAvailable,
|
||||
keyStoreSet,
|
||||
keyStoreGet,
|
||||
keyStoreDelete,
|
||||
getCryptoProvider,
|
||||
getStorage,
|
||||
} from "./platform";
|
||||
import { DeviceInfo, getDeviceInfo, getCryptoProvider, getStorage } from "./platform";
|
||||
import { uuid, throttle } from "./util";
|
||||
import { Client as SRPClient } from "./srp";
|
||||
import { Err, ErrorCode } from "./error";
|
||||
|
@ -139,6 +125,11 @@ export class Index extends Serializable {
|
|||
}
|
||||
}
|
||||
|
||||
export class StoredMasterKey extends SimpleContainer {
|
||||
authenticatorId: string = "";
|
||||
keyStoreId: string = "";
|
||||
}
|
||||
|
||||
/** Application state */
|
||||
export class AppState extends Storable {
|
||||
id = "app-state";
|
||||
|
@ -177,8 +168,8 @@ export class AppState extends Storable {
|
|||
/** Whether the app has an internet connection at the moment */
|
||||
online = true;
|
||||
|
||||
@AsSerializable(SimpleContainer)
|
||||
rememberedMasterKey: SimpleContainer | null = null;
|
||||
@AsSerializable(StoredMasterKey)
|
||||
rememberedMasterKey: StoredMasterKey | null = null;
|
||||
|
||||
@AsSerializable(BillingProviderInfo)
|
||||
billingProvider: BillingProviderInfo | null = null;
|
||||
|
@ -417,7 +408,9 @@ export class App {
|
|||
// Try to load app state from persistent storage.
|
||||
try {
|
||||
this.setState(await this.storage.get(AppState, this.state.id));
|
||||
} catch (e) {}
|
||||
} catch (e) {
|
||||
console.error("failed to load state", e);
|
||||
}
|
||||
|
||||
// Update device info
|
||||
const { id, ...rest } = await getDeviceInfo();
|
||||
|
@ -667,9 +660,7 @@ export class App {
|
|||
private async _logout() {
|
||||
this._cachedAuthInfo.clear();
|
||||
|
||||
if (await this.canRememberMasterKey()) {
|
||||
await this.forgetMasterKey();
|
||||
}
|
||||
await this.forgetMasterKey();
|
||||
|
||||
// Revoke session
|
||||
try {
|
||||
|
@ -707,9 +698,7 @@ export class App {
|
|||
await this.api.updateAuth(auth);
|
||||
});
|
||||
|
||||
if (await this.canRememberMasterKey()) {
|
||||
await this.forgetMasterKey();
|
||||
}
|
||||
await this.forgetMasterKey();
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -874,34 +863,47 @@ export class App {
|
|||
});
|
||||
}
|
||||
|
||||
canRememberMasterKey() {
|
||||
return isKeyStoreAvailable();
|
||||
}
|
||||
|
||||
async rememberMasterKey() {
|
||||
async rememberMasterKey(authenticatorId: string) {
|
||||
if (!this.account || this.account.locked) {
|
||||
throw "App needs to be unlocked first";
|
||||
}
|
||||
const key = await getCryptoProvider().generateKey(new AESKeyParams());
|
||||
await keyStoreSet("master_key_encryption_key", bytesToBase64(key));
|
||||
const container = new SimpleContainer();
|
||||
|
||||
const container = new StoredMasterKey();
|
||||
await container.unlock(key);
|
||||
await container.setData(this.account.masterKey!);
|
||||
|
||||
const keyStoreEntry = await this.api.createKeyStoreEntry(
|
||||
new CreateKeyStoreEntryParams({ authenticatorId, data: key })
|
||||
);
|
||||
|
||||
container.authenticatorId = authenticatorId;
|
||||
container.keyStoreId = keyStoreEntry.id;
|
||||
|
||||
this.setState({ rememberedMasterKey: container });
|
||||
await this.save();
|
||||
}
|
||||
|
||||
async forgetMasterKey() {
|
||||
try {
|
||||
await keyStoreDelete("master_key_encryption_key");
|
||||
} catch (e) {}
|
||||
if (!this.state.rememberedMasterKey) {
|
||||
return;
|
||||
}
|
||||
await this.api.deleteKeyStoreEntry(
|
||||
new DeleteKeyStoreEntryParams({ id: this.state.rememberedMasterKey.keyStoreId })
|
||||
);
|
||||
this.setState({ rememberedMasterKey: null });
|
||||
await this.save();
|
||||
}
|
||||
|
||||
async unlockWithRememberedMasterKey() {
|
||||
const encryptedMasterKey = this.state.rememberedMasterKey!;
|
||||
const key = base64ToBytes(await keyStoreGet("master_key_encryption_key"));
|
||||
async unlockWithRememberedMasterKey(mfaToken: string) {
|
||||
if (!this.state.rememberedMasterKey) {
|
||||
throw "No remembered master key available!";
|
||||
}
|
||||
|
||||
const encryptedMasterKey = this.state.rememberedMasterKey;
|
||||
const { data: key } = await this.api.getKeyStoreEntry(
|
||||
new GetKeyStoreEntryParams({ id: this.state.rememberedMasterKey?.keyStoreId, mfaToken })
|
||||
);
|
||||
await encryptedMasterKey.unlock(key);
|
||||
const masterKey = await encryptedMasterKey.getData();
|
||||
await this.unlockWithMasterKey(masterKey);
|
||||
|
|
|
@ -103,19 +103,25 @@ export class MFARequest<T = any> extends Serializable {
|
|||
}
|
||||
}
|
||||
|
||||
export interface MFAProvider {
|
||||
export interface MFAServer {
|
||||
supportsType(type: MFAType): boolean;
|
||||
|
||||
initMFAuthenticator(account: Account, method: MFAuthenticator, params?: any): Promise<any>;
|
||||
initMFAuthenticator(account: Account, authenticator: MFAuthenticator, params?: any): Promise<any>;
|
||||
|
||||
activateMFAuthenticator(method: MFAuthenticator, params?: any): Promise<any>;
|
||||
activateMFAuthenticator(authenticator: MFAuthenticator, params?: any): Promise<any>;
|
||||
|
||||
initMFARequest(method: MFAuthenticator, request: MFARequest, params?: any): Promise<any>;
|
||||
initMFARequest(authenticator: MFAuthenticator, request: MFARequest, params?: any): Promise<any>;
|
||||
|
||||
verifyMFARequest(method: MFAuthenticator, request: MFARequest, params?: any): Promise<boolean>;
|
||||
verifyMFARequest(authenticator: MFAuthenticator, request: MFARequest, params?: any): Promise<boolean>;
|
||||
}
|
||||
|
||||
export class EmailMFAProvider implements MFAProvider {
|
||||
export interface MFAClient {
|
||||
supportsType(type: MFAType): boolean;
|
||||
prepareAttestation(serverData: any, clientData: any): Promise<any>;
|
||||
prepareAssertion(serverData: any, clientData: any): Promise<any>;
|
||||
}
|
||||
|
||||
export class EmailMFAProvider implements MFAServer {
|
||||
constructor(public messenger: Messenger) {}
|
||||
|
||||
supportsType(type: MFAType) {
|
||||
|
@ -165,6 +171,20 @@ export class EmailMFAProvider implements MFAProvider {
|
|||
}
|
||||
}
|
||||
|
||||
export class EmailMFAClient implements MFAClient {
|
||||
supportsType(type: MFAType) {
|
||||
return type === MFAType.Email;
|
||||
}
|
||||
|
||||
async prepareAttestation(_serverData: undefined, clientData: { code: string }) {
|
||||
return clientData;
|
||||
}
|
||||
|
||||
async prepareAssertion(_serverData: undefined, clientData: { code: string }) {
|
||||
return clientData;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Class for storing email verification data. Email verificatiion is used
|
||||
* to prove ownership of the email address in question and as a authentication
|
||||
|
|
|
@ -23,6 +23,7 @@ import {
|
|||
StartMFARequestParams,
|
||||
CreateKeyStoreEntryParams,
|
||||
GetKeyStoreEntryParams,
|
||||
DeleteKeyStoreEntryParams,
|
||||
} from "./api";
|
||||
import { Storage, VoidStorage } from "./storage";
|
||||
import { Attachment, AttachmentStorage } from "./attachment";
|
||||
|
@ -33,7 +34,7 @@ import {
|
|||
MFARequest,
|
||||
MFAPurpose,
|
||||
MFAuthenticator,
|
||||
MFAProvider,
|
||||
MFAServer,
|
||||
EmailMFARequest,
|
||||
MFAType,
|
||||
MFAuthenticatorStatus,
|
||||
|
@ -282,7 +283,6 @@ export class Controller extends API {
|
|||
|
||||
await this.storage.save(auth);
|
||||
|
||||
console.log("started mfa request", auth);
|
||||
return new StartMFARequestResponse({
|
||||
id: request.id,
|
||||
data: responseData,
|
||||
|
@ -295,22 +295,16 @@ export class Controller extends API {
|
|||
async completeMFARequest({ email, id, data }: CompleteMFARequestParams) {
|
||||
const auth = await this._getAuth(email);
|
||||
|
||||
console.log("auth", auth);
|
||||
|
||||
const request = auth.mfaRequests.find((m) => m.id === id);
|
||||
if (!request) {
|
||||
throw new Err(ErrorCode.MFA_FAILED, "Failed to complete MFA request.");
|
||||
}
|
||||
|
||||
console.log("request", request);
|
||||
|
||||
const authenticator = auth.mfAuthenticators.find((m) => m.id === request.authenticatorId);
|
||||
if (!authenticator) {
|
||||
throw new Err(ErrorCode.MFA_FAILED, "Failed to start MFA request.");
|
||||
}
|
||||
|
||||
console.log("authenticator", authenticator);
|
||||
|
||||
const provider = this._getMFAProvider(request.type);
|
||||
|
||||
const verified = await provider.verifyMFARequest(authenticator, request, data);
|
||||
|
@ -333,8 +327,6 @@ export class Controller extends API {
|
|||
async initAuth({ email, verify }: InitAuthParams): Promise<InitAuthResponse> {
|
||||
const auth = await this._getAuth(email);
|
||||
|
||||
console.log("auth", auth, this.config.mfa);
|
||||
|
||||
this.logger.log("auth.init", { email, account: auth && { email, id: auth.account } });
|
||||
|
||||
const deviceTrusted =
|
||||
|
@ -1330,7 +1322,6 @@ export class Controller extends API {
|
|||
async createKeyStoreEntry({ data, authenticatorId }: CreateKeyStoreEntryParams) {
|
||||
const { account } = this._requireAuth();
|
||||
const auth = await this._getAuth(account.email);
|
||||
console.log("creating key store", auth, authenticatorId);
|
||||
if (
|
||||
!auth.mfAuthenticators.some(
|
||||
(a) => a.id === authenticatorId && a.purposes.includes(MFAPurpose.AccessKeyStore)
|
||||
|
@ -1361,6 +1352,28 @@ export class Controller extends API {
|
|||
return entry;
|
||||
}
|
||||
|
||||
async deleteKeyStoreEntry({ id }: DeleteKeyStoreEntryParams) {
|
||||
const { account } = this._requireAuth();
|
||||
|
||||
const entry = await this.storage.get(KeyStoreEntry, id);
|
||||
|
||||
if (entry.accountId !== account.id) {
|
||||
throw new Err(
|
||||
ErrorCode.INSUFFICIENT_PERMISSIONS,
|
||||
"You don't have the necessary permissions to perform this action!"
|
||||
);
|
||||
}
|
||||
|
||||
// await this._useMFAToken({
|
||||
// email: account.email,
|
||||
// token: mfaToken,
|
||||
// purpose: MFAPurpose.AccessKeyStore,
|
||||
// authenticatorId: entry.authenticatorId,
|
||||
// });
|
||||
|
||||
await this.storage.delete(entry);
|
||||
}
|
||||
|
||||
private async _updateUsedStorage(acc: Org | Account) {
|
||||
const vaults = acc instanceof Org ? acc.vaults : [acc.mainVault];
|
||||
|
||||
|
@ -1389,7 +1402,6 @@ export class Controller extends API {
|
|||
try {
|
||||
auth = await this.storage.get(Auth, email);
|
||||
} catch (e) {
|
||||
console.log("not auth found for", email, e);
|
||||
if (e.code !== ErrorCode.NOT_FOUND) {
|
||||
throw e;
|
||||
}
|
||||
|
@ -1524,7 +1536,7 @@ export class Server {
|
|||
public messenger: Messenger,
|
||||
/** Logger to use */
|
||||
public logger: Logger = new Logger(new VoidStorage()),
|
||||
public mfaProviders: MFAProvider[] = [],
|
||||
public mfaProviders: MFAServer[] = [],
|
||||
/** Attachment storage */
|
||||
public attachmentStorage: AttachmentStorage,
|
||||
public legacyServer?: LegacyServer
|
||||
|
|
|
@ -594,6 +594,8 @@
|
|||
"version": "8.5.0",
|
||||
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.5.0.tgz",
|
||||
"integrity": "sha512-Y2l399Tt1AguU3BPRP9Fn4eN+Or+StUGWCUpbnFyXSo8NZ9S4uj+AG2pjs5apK+ZMOwYOz1+a+VKvKH7CudXgQ==",
|
||||
"optional": true,
|
||||
"peer": true,
|
||||
"dependencies": {
|
||||
"fast-deep-equal": "^3.1.1",
|
||||
"json-schema-traverse": "^1.0.0",
|
||||
|
@ -608,7 +610,9 @@
|
|||
"node_modules/ajv-formats/node_modules/json-schema-traverse": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
|
||||
"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
|
||||
"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
|
||||
"optional": true,
|
||||
"peer": true
|
||||
},
|
||||
"node_modules/ajv-keywords": {
|
||||
"version": "3.5.2",
|
||||
|
@ -6266,7 +6270,8 @@
|
|||
"version": "1.0.3",
|
||||
"resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.3.tgz",
|
||||
"integrity": "sha512-WQs0ep98FXX2XBAfQpRbY0Ma6ADw8JR6xoIkaIiJIzClGOMqVRvPCWqndTxf28DgFopWan0EKtHtg/5W1h0Zkw==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"@webpack-cli/info": {
|
||||
"version": "1.2.4",
|
||||
|
@ -6281,7 +6286,8 @@
|
|||
"version": "1.4.0",
|
||||
"resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.4.0.tgz",
|
||||
"integrity": "sha512-xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"@xtuc/ieee754": {
|
||||
"version": "1.2.0",
|
||||
|
@ -6323,14 +6329,13 @@
|
|||
"version": "2.1.0",
|
||||
"resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.0.tgz",
|
||||
"integrity": "sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q==",
|
||||
"requires": {
|
||||
"ajv": "^8.0.0"
|
||||
},
|
||||
"requires": {},
|
||||
"dependencies": {
|
||||
"ajv": {
|
||||
"version": "8.5.0",
|
||||
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.5.0.tgz",
|
||||
"version": "https://registry.npmjs.org/ajv/-/ajv-8.5.0.tgz",
|
||||
"integrity": "sha512-Y2l399Tt1AguU3BPRP9Fn4eN+Or+StUGWCUpbnFyXSo8NZ9S4uj+AG2pjs5apK+ZMOwYOz1+a+VKvKH7CudXgQ==",
|
||||
"optional": true,
|
||||
"peer": true,
|
||||
"requires": {
|
||||
"fast-deep-equal": "^3.1.1",
|
||||
"json-schema-traverse": "^1.0.0",
|
||||
|
@ -6341,7 +6346,9 @@
|
|||
"json-schema-traverse": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
|
||||
"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
|
||||
"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
|
||||
"optional": true,
|
||||
"peer": true
|
||||
}
|
||||
}
|
||||
},
|
||||
|
@ -6349,7 +6356,8 @@
|
|||
"version": "3.5.2",
|
||||
"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
|
||||
"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"ansi-align": {
|
||||
"version": "3.0.0",
|
||||
|
@ -8225,7 +8233,8 @@
|
|||
"version": "5.1.0",
|
||||
"resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
|
||||
"integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"ieee754": {
|
||||
"version": "1.2.1",
|
||||
|
@ -9127,7 +9136,8 @@
|
|||
"version": "3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
|
||||
"integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"postcss-modules-local-by-default": {
|
||||
"version": "4.0.0",
|
||||
|
|
|
@ -3334,7 +3334,8 @@
|
|||
"version": "1.0.3",
|
||||
"resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.3.tgz",
|
||||
"integrity": "sha512-WQs0ep98FXX2XBAfQpRbY0Ma6ADw8JR6xoIkaIiJIzClGOMqVRvPCWqndTxf28DgFopWan0EKtHtg/5W1h0Zkw==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"@webpack-cli/info": {
|
||||
"version": "1.2.4",
|
||||
|
@ -3349,7 +3350,8 @@
|
|||
"version": "1.4.0",
|
||||
"resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.4.0.tgz",
|
||||
"integrity": "sha512-xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"@xtuc/ieee754": {
|
||||
"version": "1.2.0",
|
||||
|
@ -3385,7 +3387,8 @@
|
|||
"version": "3.5.2",
|
||||
"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
|
||||
"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"ansi-regex": {
|
||||
"version": "2.1.1",
|
||||
|
@ -4162,7 +4165,8 @@
|
|||
"version": "5.1.0",
|
||||
"resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
|
||||
"integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"import-local": {
|
||||
"version": "3.0.2",
|
||||
|
@ -4698,7 +4702,8 @@
|
|||
"version": "3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
|
||||
"integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"postcss-modules-local-by-default": {
|
||||
"version": "4.0.0",
|
||||
|
|
|
@ -8,7 +8,7 @@ import { VaultItem } from "@padloc/core/src/item";
|
|||
|
||||
const notifyStateChanged = debounce(() => {
|
||||
browser.runtime.sendMessage({
|
||||
type: "state-changed"
|
||||
type: "state-changed",
|
||||
});
|
||||
}, 500);
|
||||
|
||||
|
@ -86,7 +86,7 @@ export class ExtensionApp extends App {
|
|||
}
|
||||
browser.runtime.sendMessage({
|
||||
type: "unlocked",
|
||||
masterKey: bytesToBase64(this.state.account.masterKey)
|
||||
masterKey: bytesToBase64(this.state.account.masterKey),
|
||||
});
|
||||
|
||||
if (this.app.state.currentHost && this.app.getItemsForHost(this.app.state.currentHost).length) {
|
||||
|
@ -97,21 +97,21 @@ export class ExtensionApp extends App {
|
|||
_locked() {
|
||||
super._locked();
|
||||
browser.runtime.sendMessage({
|
||||
type: "locked"
|
||||
type: "locked",
|
||||
});
|
||||
}
|
||||
|
||||
_loggedIn() {
|
||||
super._loggedIn();
|
||||
browser.runtime.sendMessage({
|
||||
type: "loggedIn"
|
||||
type: "loggedIn",
|
||||
});
|
||||
}
|
||||
|
||||
_loggedOut() {
|
||||
super._loggedOut();
|
||||
browser.runtime.sendMessage({
|
||||
type: "loggedOut"
|
||||
type: "loggedOut",
|
||||
});
|
||||
}
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -12549,13 +12549,15 @@
|
|||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
|
||||
"integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"ajv-keywords": {
|
||||
"version": "3.5.2",
|
||||
"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
|
||||
"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"ansi-align": {
|
||||
"version": "3.0.0",
|
||||
|
@ -14837,7 +14839,8 @@
|
|||
},
|
||||
"icss-utils": {
|
||||
"version": "5.1.0",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"ieee754": {
|
||||
"version": "1.2.1",
|
||||
|
@ -16428,7 +16431,8 @@
|
|||
},
|
||||
"postcss-modules-extract-imports": {
|
||||
"version": "3.0.0",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"postcss-modules-local-by-default": {
|
||||
"version": "4.0.0",
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -10,7 +10,7 @@ import { StripeBillingProvider } from "./billing";
|
|||
import { ReplServer } from "./repl";
|
||||
import { NodeLegacyServer } from "./legacy";
|
||||
import { EmailMFAProvider } from "@padloc/core/src/mfa";
|
||||
import { WebAuthnMFAProvider } from "./mfa";
|
||||
import { WebAuthnServer } from "./mfa";
|
||||
|
||||
async function init() {
|
||||
setPlatform(new NodePlatform());
|
||||
|
@ -63,7 +63,7 @@ async function init() {
|
|||
}
|
||||
|
||||
const emailMFAProvider = new EmailMFAProvider(messenger);
|
||||
const webAuthnProvider = new WebAuthnMFAProvider({
|
||||
const webAuthnProvider = new WebAuthnServer({
|
||||
rpID: "localhost",
|
||||
rpName: "Padloc",
|
||||
attestationType: "indirect",
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import { MFAuthenticator, MFAProvider, MFARequest, MFAType } from "@padloc/core/src/mfa";
|
||||
import { MFAuthenticator, MFAServer, MFARequest, MFAType } from "@padloc/core/src/mfa";
|
||||
import { Account } from "@padloc/core/src/account";
|
||||
import {
|
||||
generateAttestationOptions,
|
||||
|
@ -37,7 +37,7 @@ interface WebAuthnRequestData {
|
|||
assertionOptions?: PublicKeyCredentialRequestOptionsJSON;
|
||||
}
|
||||
|
||||
export class WebAuthnMFAProvider implements MFAProvider {
|
||||
export class WebAuthnServer implements MFAServer {
|
||||
constructor(public settings: WebAuthnSettings) {}
|
||||
|
||||
supportsType(type: MFAType) {
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -4,22 +4,22 @@
|
|||
"description": "Tauri Wrapper for packaging native apps",
|
||||
"main": "index.js",
|
||||
"scripts": {
|
||||
"tauri": "tauri",
|
||||
"build": "webpack && tauri build"
|
||||
},
|
||||
"author": "",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"@padloc/app": "^3.1.3",
|
||||
"@padloc/core": "^3.1.3",
|
||||
"@tauri-apps/api": "*",
|
||||
"@tauri-apps/tauri-forage": "^1.0.0-beta.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@tauri-apps/cli": "*",
|
||||
"clean-webpack-plugin": "^3.0.0",
|
||||
"css-loader": "^5.2.6",
|
||||
"file-loader": "^6.2.0",
|
||||
"html-webpack-plugin": "^5.3.1",
|
||||
"style-loader": "^2.0.0",
|
||||
"tauri": "^0.14.1",
|
||||
"ts-loader": "^9.2.2",
|
||||
"ts-node": "^10.0.0",
|
||||
"typescript": "^4.3.2",
|
||||
|
|
|
@ -2,10 +2,3 @@
|
|||
# will have compiled files and executables
|
||||
/target/
|
||||
WixTools
|
||||
|
||||
# These are backup files generated by rustfmt
|
||||
**/*.rs.bk
|
||||
|
||||
tauri.js
|
||||
config.json
|
||||
bundle.json
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,29 +1,24 @@
|
|||
[package]
|
||||
name = "Padloc"
|
||||
version = "3.1.2"
|
||||
description = "A modern, open source password manager for individuals and teams."
|
||||
authors = [ "martin@maklesoft.com" ]
|
||||
name = "app"
|
||||
version = "0.1.0"
|
||||
description = "A Tauri App"
|
||||
authors = ["you"]
|
||||
license = ""
|
||||
repository = ""
|
||||
default-run = "Padloc"
|
||||
default-run = "app"
|
||||
edition = "2018"
|
||||
build = "src/build.rs"
|
||||
|
||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
[build-dependencies]
|
||||
tauri-build = { version = "1.0.0-beta.0" }
|
||||
|
||||
[dependencies]
|
||||
serde_json = "1.0"
|
||||
serde = { version = "1.0", features = [ "derive" ] }
|
||||
|
||||
[dependencies.tauri]
|
||||
version = "0.9"
|
||||
features = [ "all-api" ]
|
||||
|
||||
[target."cfg(windows)".build-dependencies]
|
||||
winres = "0.1"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
tauri = { version = "1.0.0-beta.1", features = ["api-all"] }
|
||||
|
||||
[features]
|
||||
embedded-server = [ "tauri/embedded-server" ]
|
||||
no-server = [ "tauri/no-server" ]
|
||||
|
||||
[[bin]]
|
||||
name = "Padloc"
|
||||
path = "src/main.rs"
|
||||
default = [ "custom-protocol" ]
|
||||
custom-protocol = [ "tauri/custom-protocol" ]
|
||||
|
|
|
@ -11,3 +11,4 @@ merge_derives = true
|
|||
use_try_shorthand = false
|
||||
use_field_init_shorthand = false
|
||||
force_explicit_abi = true
|
||||
imports_granularity = "Crate"
|
||||
|
|
|
@ -1,16 +1,3 @@
|
|||
#[cfg(windows)]
|
||||
extern crate winres;
|
||||
|
||||
#[cfg(windows)]
|
||||
fn main() {
|
||||
if std::path::Path::new("icons/icon.ico").exists() {
|
||||
let mut res = winres::WindowsResource::new();
|
||||
res.set_icon("icons/icon.ico");
|
||||
res.compile().expect("Unable to find visual studio tools");
|
||||
} else {
|
||||
panic!("No Icon.ico found. Please add one or check the path");
|
||||
}
|
||||
tauri_build::build()
|
||||
}
|
||||
|
||||
#[cfg(not(windows))]
|
||||
fn main() {}
|
||||
|
|
|
@ -1,10 +0,0 @@
|
|||
use serde::Deserialize;
|
||||
|
||||
#[derive(Deserialize)]
|
||||
#[serde(tag = "cmd", rename_all = "camelCase")]
|
||||
pub enum Cmd {
|
||||
// your custom commands
|
||||
// multiple arguments are allowed
|
||||
// note that rename_all = "camelCase": you need to use "myCustomCommand" on JS
|
||||
MyCustomCommand { argument: String },
|
||||
}
|
|
@ -3,28 +3,8 @@
|
|||
windows_subsystem = "windows"
|
||||
)]
|
||||
|
||||
mod cmd;
|
||||
|
||||
fn main() {
|
||||
tauri::AppBuilder::new()
|
||||
.invoke_handler(|_webview, arg| {
|
||||
use cmd::Cmd::*;
|
||||
match serde_json::from_str(arg) {
|
||||
Err(e) => {
|
||||
Err(e.to_string())
|
||||
}
|
||||
Ok(command) => {
|
||||
match command {
|
||||
// definitions for your custom commands from Cmd here
|
||||
MyCustomCommand { argument } => {
|
||||
// your command code
|
||||
println!("{}", argument);
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
})
|
||||
.build()
|
||||
.run();
|
||||
tauri::Builder::default()
|
||||
.run(tauri::generate_context!())
|
||||
.expect("error while running tauri application");
|
||||
}
|
||||
|
|
|
@ -1,16 +1,15 @@
|
|||
{
|
||||
"package": {
|
||||
"productName": "Padloc",
|
||||
"version": "0.1.0"
|
||||
},
|
||||
"build": {
|
||||
"distDir": "../dist",
|
||||
"devPath": "http://localhost:8080",
|
||||
"beforeDevCommand": "",
|
||||
"beforeBuildCommand": ""
|
||||
},
|
||||
"ctx": {},
|
||||
"tauri": {
|
||||
"embeddedServer": {
|
||||
"active": true,
|
||||
"port": 9876
|
||||
},
|
||||
"bundle": {
|
||||
"active": true,
|
||||
"targets": "all",
|
||||
|
@ -23,35 +22,44 @@
|
|||
"resources": [],
|
||||
"externalBin": [],
|
||||
"copyright": "",
|
||||
"category": "Utility",
|
||||
"shortDescription": "Padloc (Tauri Edition)",
|
||||
"longDescription": "A modern, open source password manager for individuals and teams.",
|
||||
"category": "DeveloperTool",
|
||||
"shortDescription": "",
|
||||
"longDescription": "",
|
||||
"deb": {
|
||||
"depends": [],
|
||||
"useBootstrapper": false
|
||||
},
|
||||
"osx": {
|
||||
"macOS": {
|
||||
"frameworks": [],
|
||||
"minimumSystemVersion": "",
|
||||
"useBootstrapper": false
|
||||
"useBootstrapper": false,
|
||||
"exceptionDomain": "",
|
||||
"signingIdentity": null,
|
||||
"entitlements": null
|
||||
},
|
||||
"exceptionDomain": ""
|
||||
"windows": {
|
||||
"certificateThumbprint": null,
|
||||
"digestAlgorithm": "sha256",
|
||||
"timestampUrl": ""
|
||||
}
|
||||
},
|
||||
"updater": {
|
||||
"active": false
|
||||
},
|
||||
"allowlist": {
|
||||
"all": true
|
||||
},
|
||||
"window": {
|
||||
"title": "Padloc (Tauri Edition)",
|
||||
"width": 800,
|
||||
"height": 600,
|
||||
"resizable": true,
|
||||
"fullscreen": false
|
||||
},
|
||||
"windows": [
|
||||
{
|
||||
"title": "Padloc",
|
||||
"width": 800,
|
||||
"height": 600,
|
||||
"resizable": true,
|
||||
"fullscreen": false
|
||||
}
|
||||
],
|
||||
"security": {
|
||||
"csp": "default-src blob: data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline'"
|
||||
},
|
||||
"inliner": {
|
||||
"active": false
|
||||
"csp": "default-src blob: data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline' 'self' img-src: 'self'"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue