commit
7025f16017
|
@ -0,0 +1,661 @@
|
||||||
|
GNU AFFERO GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 19 November 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 Affero General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works, specifically designed to ensure
|
||||||
|
cooperation with the community in the case of network server software.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
our General Public Licenses are intended to guarantee your freedom to
|
||||||
|
share and change all versions of a program--to make sure it remains free
|
||||||
|
software for all its users.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
Developers that use our General Public Licenses protect your rights
|
||||||
|
with two steps: (1) assert copyright on the software, and (2) offer
|
||||||
|
you this License which gives you legal permission to copy, distribute
|
||||||
|
and/or modify the software.
|
||||||
|
|
||||||
|
A secondary benefit of defending all users' freedom is that
|
||||||
|
improvements made in alternate versions of the program, if they
|
||||||
|
receive widespread use, become available for other developers to
|
||||||
|
incorporate. Many developers of free software are heartened and
|
||||||
|
encouraged by the resulting cooperation. However, in the case of
|
||||||
|
software used on network servers, this result may fail to come about.
|
||||||
|
The GNU General Public License permits making a modified version and
|
||||||
|
letting the public access it on a server without ever releasing its
|
||||||
|
source code to the public.
|
||||||
|
|
||||||
|
The GNU Affero General Public License is designed specifically to
|
||||||
|
ensure that, in such cases, the modified source code becomes available
|
||||||
|
to the community. It requires the operator of a network server to
|
||||||
|
provide the source code of the modified version running there to the
|
||||||
|
users of that server. Therefore, public use of a modified version, on
|
||||||
|
a publicly accessible server, gives the public access to the source
|
||||||
|
code of the modified version.
|
||||||
|
|
||||||
|
An older license, called the Affero General Public License and
|
||||||
|
published by Affero, was designed to accomplish similar goals. This is
|
||||||
|
a different license, not a version of the Affero GPL, but Affero has
|
||||||
|
released a new version of the Affero GPL which permits relicensing under
|
||||||
|
this license.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU Affero General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Remote Network Interaction; Use with the GNU General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, if you modify the
|
||||||
|
Program, your modified version must prominently offer all users
|
||||||
|
interacting with it remotely through a computer network (if your version
|
||||||
|
supports such interaction) an opportunity to receive the Corresponding
|
||||||
|
Source of your version by providing access to the Corresponding Source
|
||||||
|
from a network server at no charge, through some standard or customary
|
||||||
|
means of facilitating copying of software. This Corresponding Source
|
||||||
|
shall include the Corresponding Source for any work covered by version 3
|
||||||
|
of the GNU General Public License that is incorporated pursuant to the
|
||||||
|
following paragraph.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the work with which it is combined will remain governed by version
|
||||||
|
3 of the GNU General Public License.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU Affero General Public License from time to time. Such new versions
|
||||||
|
will be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Program specifies that a certain numbered version of the GNU Affero General
|
||||||
|
Public License "or any later version" applies to it, you have the
|
||||||
|
option of following the terms and conditions either of that numbered
|
||||||
|
version or of any later version published by the Free Software
|
||||||
|
Foundation. If the Program does not specify a version number of the
|
||||||
|
GNU Affero General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future
|
||||||
|
versions of the GNU Affero General Public License can be used, that proxy's
|
||||||
|
public statement of acceptance of a version permanently authorizes you
|
||||||
|
to choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
state the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Affero General Public License as published
|
||||||
|
by the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If your software can interact with users remotely through a computer
|
||||||
|
network, you should also make sure that it provides a way for users to
|
||||||
|
get its source. For example, if your program is a web application, its
|
||||||
|
interface could display a "Source" link that leads users to an archive
|
||||||
|
of the code. There are many ways you could offer source, and different
|
||||||
|
solutions will be better for different programs; see section 13 for the
|
||||||
|
specific requirements.
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or school,
|
||||||
|
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||||
|
For more information on this, and how to apply and follow the GNU AGPL, see
|
||||||
|
<http://www.gnu.org/licenses/>.
|
|
@ -0,0 +1,2 @@
|
||||||
|
# cloud_federation_api
|
||||||
|
The cloud federation API allows to share information like files, contacts, calendars, incoming calls, etc accross Nextcloud instances
|
|
@ -0,0 +1,22 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
$app = new \OCA\CloudFederationAPI\AppInfo\Application();
|
|
@ -0,0 +1,20 @@
|
||||||
|
<?xml version="1.0"?>
|
||||||
|
<info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
|
||||||
|
<id>cloud_federation_api</id>
|
||||||
|
<name>Cloud Federation API</name>
|
||||||
|
<summary>Enable clouds to communicate with each other and exchange data</summary>
|
||||||
|
<description>The Coud Federation API enabled various Nextcloud instances to communitcate with each other and to exchange data</description>
|
||||||
|
<version>0.0.1</version>
|
||||||
|
<licence>agpl</licence>
|
||||||
|
<author>Bjoern Schiessle</author>
|
||||||
|
<namespace>CloudFederationAPI</namespace>
|
||||||
|
<types>
|
||||||
|
<filesystem/>
|
||||||
|
</types>
|
||||||
|
<category>files</category>
|
||||||
|
<bugs>https://github.com/nextcloud/cloud_federation/issues</bugs>
|
||||||
|
<dependencies>
|
||||||
|
<nextcloud min-version="14" max-version="14"/>
|
||||||
|
</dependencies>
|
||||||
|
</info>
|
|
@ -0,0 +1,37 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
namespace OCA\CloudFederationAPI\AppInfo;
|
||||||
|
|
||||||
|
|
||||||
|
use OCA\CloudFederationAPI\Capabilities;
|
||||||
|
use OCP\AppFramework\App;
|
||||||
|
|
||||||
|
class Application extends App {
|
||||||
|
|
||||||
|
public function __construct() {
|
||||||
|
parent::__construct('cloud_federation_api');
|
||||||
|
|
||||||
|
$container = $this->getContainer();
|
||||||
|
$container->registerCapability(Capabilities::class);
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,64 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @copyright Copyright (c) 2017 Bjoern Schiessle <bjoern@schiessle.org>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
namespace OCA\CloudFederationAPI;
|
||||||
|
|
||||||
|
|
||||||
|
use OCP\Capabilities\ICapability;
|
||||||
|
use OCP\IURLGenerator;
|
||||||
|
|
||||||
|
class Capabilities implements ICapability {
|
||||||
|
|
||||||
|
/** @var IURLGenerator */
|
||||||
|
private $urlGenerator;
|
||||||
|
|
||||||
|
public function __construct(IURLGenerator $urlGenerator) {
|
||||||
|
$this->urlGenerator = $urlGenerator;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function an app uses to return the capabilities
|
||||||
|
*
|
||||||
|
* @return array Array containing the apps capabilities
|
||||||
|
* @since 8.2.0
|
||||||
|
*/
|
||||||
|
public function getCapabilities() {
|
||||||
|
$url = $this->urlGenerator->linkToRouteAbsolute('cloud_federation_api.requesthandlercontroller.addShare');
|
||||||
|
$capabilities = ['ocm' =>
|
||||||
|
[
|
||||||
|
'enabled' => true,
|
||||||
|
'apiVersion' => '1.0-proposal1',
|
||||||
|
'endPoint' => substr($url, 0, strrpos($url, '/')),
|
||||||
|
'shareTypes' => [
|
||||||
|
[
|
||||||
|
'name' => 'file',
|
||||||
|
'protocols' => [
|
||||||
|
'webdav' => '/public.php/webdav/',
|
||||||
|
]
|
||||||
|
],
|
||||||
|
]
|
||||||
|
]
|
||||||
|
];
|
||||||
|
|
||||||
|
return $capabilities;
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,57 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
namespace OCA\CloudFederationAPI;
|
||||||
|
use OCP\Federation\ICloudFederationProviderManager;
|
||||||
|
use OCP\GlobalScale\IConfig as IGsConfig;
|
||||||
|
use OCP\IConfig;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class config
|
||||||
|
*
|
||||||
|
* handles all the config parameters
|
||||||
|
*
|
||||||
|
* @package OCA\CloudFederationAPI
|
||||||
|
*/
|
||||||
|
class Config {
|
||||||
|
|
||||||
|
/** @var ICloudFederationProviderManager */
|
||||||
|
private $cloudFederationProviderManager;
|
||||||
|
|
||||||
|
public function __construct(ICloudFederationProviderManager $cloudFederationProviderManager) {
|
||||||
|
$this->cloudFederationProviderManager = $cloudFederationProviderManager;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get a list of supported share types
|
||||||
|
*
|
||||||
|
* @param string $resourceType
|
||||||
|
* @return array
|
||||||
|
* @throws \OCP\Federation\Exceptions\ProviderDoesNotExistsException
|
||||||
|
*/
|
||||||
|
public function getSupportedShareTypes($resourceType) {
|
||||||
|
$provider = $this->cloudFederationProviderManager->getCloudFederationProvider($resourceType);
|
||||||
|
return $provider->getSupportedShareTypes();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,275 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
|
||||||
|
*
|
||||||
|
* @author Bjoern Schiessle <bjoern@schiessle.org>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OCA\CloudFederationAPI\Controller;
|
||||||
|
|
||||||
|
use OCA\CloudFederationAPI\Config;
|
||||||
|
use OCP\AppFramework\Controller;
|
||||||
|
use OCP\AppFramework\Http;
|
||||||
|
use OCP\AppFramework\Http\JSONResponse;
|
||||||
|
use OCP\Federation\Exceptions\ActionNotSupportedException;
|
||||||
|
use OCP\Federation\Exceptions\AuthenticationFailedException;
|
||||||
|
use OCP\Federation\Exceptions\BadRequestException;
|
||||||
|
use OCP\Federation\Exceptions\ProviderCouldNotAddShareException;
|
||||||
|
use OCP\Federation\ICloudFederationFactory;
|
||||||
|
use OCP\Federation\ICloudFederationProviderManager;
|
||||||
|
use OCP\Federation\Exceptions\ProviderDoesNotExistsException;
|
||||||
|
use OCP\Federation\ICloudIdManager;
|
||||||
|
use OCP\ILogger;
|
||||||
|
use OCP\IRequest;
|
||||||
|
use OCP\IURLGenerator;
|
||||||
|
use OCP\IUserManager;
|
||||||
|
use OCP\Share\Exceptions\ShareNotFound;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class RequestHandlerController
|
||||||
|
*
|
||||||
|
* handle API between different Cloud instances
|
||||||
|
*
|
||||||
|
* @package OCA\CloudFederationAPI\Controller
|
||||||
|
*/
|
||||||
|
class RequestHandlerController extends Controller {
|
||||||
|
|
||||||
|
/** @var ILogger */
|
||||||
|
private $logger;
|
||||||
|
|
||||||
|
/** @var IUserManager */
|
||||||
|
private $userManager;
|
||||||
|
|
||||||
|
/** @var IURLGenerator */
|
||||||
|
private $urlGenerator;
|
||||||
|
|
||||||
|
/** @var ICloudFederationProviderManager */
|
||||||
|
private $cloudFederationProviderManager;
|
||||||
|
|
||||||
|
/** @var Config */
|
||||||
|
private $config;
|
||||||
|
|
||||||
|
/** @var ICloudFederationFactory */
|
||||||
|
private $factory;
|
||||||
|
|
||||||
|
/** @var ICloudIdManager */
|
||||||
|
private $cloudIdManager;
|
||||||
|
|
||||||
|
public function __construct($appName,
|
||||||
|
IRequest $request,
|
||||||
|
ILogger $logger,
|
||||||
|
IUserManager $userManager,
|
||||||
|
IURLGenerator $urlGenerator,
|
||||||
|
ICloudFederationProviderManager $cloudFederationProviderManager,
|
||||||
|
Config $config,
|
||||||
|
ICloudFederationFactory $factory,
|
||||||
|
ICloudIdManager $cloudIdManager
|
||||||
|
) {
|
||||||
|
parent::__construct($appName, $request);
|
||||||
|
|
||||||
|
$this->logger = $logger;
|
||||||
|
$this->userManager = $userManager;
|
||||||
|
$this->urlGenerator = $urlGenerator;
|
||||||
|
$this->cloudFederationProviderManager = $cloudFederationProviderManager;
|
||||||
|
$this->config = $config;
|
||||||
|
$this->factory = $factory;
|
||||||
|
$this->cloudIdManager = $cloudIdManager;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* add share
|
||||||
|
*
|
||||||
|
* @NoCSRFRequired
|
||||||
|
* @PublicPage
|
||||||
|
* @BruteForceProtection(action=receiveFederatedShare)
|
||||||
|
*
|
||||||
|
* @param string $shareWith
|
||||||
|
* @param string $name resource name (e.g. document.odt)
|
||||||
|
* @param string $description share description (optional)
|
||||||
|
* @param string $providerId resource UID on the provider side
|
||||||
|
* @param string $owner provider specific UID of the user who owns the resource
|
||||||
|
* @param string $ownerDisplayName display name of the user who shared the item
|
||||||
|
* @param string $sharedBy provider specific UID of the user who shared the resource
|
||||||
|
* @param string $sharedByDisplayName display name of the user who shared the resource
|
||||||
|
* @param array $protocol (e,.g. ['name' => 'webdav', 'options' => ['username' => 'john', 'permissions' => 31]])
|
||||||
|
* @param string $shareType ('group' or 'user' share)
|
||||||
|
* @param $resourceType ('file', 'calendar',...)
|
||||||
|
* @return Http\DataResponse|JSONResponse
|
||||||
|
*
|
||||||
|
* Example: curl -H "Content-Type: application/json" -X POST -d '{"shareWith":"admin1@serve1","name":"welcome server2.txt","description":"desc","providerId":"2","owner":"admin2@http://localhost/server2","ownerDisplayName":"admin2 display","shareType":"user","resourceType":"file","protocol":{"name":"webdav","options":{"sharedSecret":"secret","permissions":"webdav-property"}}}' http://localhost/server/index.php/ocm/shares
|
||||||
|
*/
|
||||||
|
public function addShare($shareWith, $name, $description, $providerId, $owner, $ownerDisplayName, $sharedBy, $sharedByDisplayName, $protocol, $shareType, $resourceType) {
|
||||||
|
|
||||||
|
// check if all required parameters are set
|
||||||
|
if ($shareWith === null ||
|
||||||
|
$name === null ||
|
||||||
|
$providerId === null ||
|
||||||
|
$owner === null ||
|
||||||
|
$resourceType === null ||
|
||||||
|
$shareType === null ||
|
||||||
|
!is_array($protocol) ||
|
||||||
|
!isset($protocol['name']) ||
|
||||||
|
!isset ($protocol['options']) ||
|
||||||
|
!is_array($protocol['options']) ||
|
||||||
|
!isset($protocol['options']['sharedSecret'])
|
||||||
|
) {
|
||||||
|
return new JSONResponse(
|
||||||
|
['message' => 'Missing arguments'],
|
||||||
|
Http::STATUS_BAD_REQUEST
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
$cloudId = $this->cloudIdManager->resolveCloudId($shareWith);
|
||||||
|
$shareWithLocalId = $cloudId->getUser();
|
||||||
|
$shareWith = $this->mapUid($shareWithLocalId);
|
||||||
|
|
||||||
|
if (!$this->userManager->userExists($shareWith)) {
|
||||||
|
return new JSONResponse(
|
||||||
|
['message' => 'User "' . $shareWith . '" does not exists at ' . $this->urlGenerator->getBaseUrl()],
|
||||||
|
Http::STATUS_BAD_REQUEST
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// if no explicit display name is given, we use the uid as display name
|
||||||
|
$ownerDisplayName = $ownerDisplayName === null ? $owner : $ownerDisplayName;
|
||||||
|
$sharedByDisplayName = $sharedByDisplayName === null ? $sharedBy : $sharedByDisplayName;
|
||||||
|
|
||||||
|
// sharedBy* parameter is optional, if nothing is set we assume that it is the same user as the owner
|
||||||
|
if ($sharedBy === null) {
|
||||||
|
$sharedBy = $owner;
|
||||||
|
$sharedByDisplayName = $ownerDisplayName;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
$provider = $this->cloudFederationProviderManager->getCloudFederationProvider($resourceType);
|
||||||
|
$share = $this->factory->getCloudFederationShare($shareWith, $name, $description, $providerId, $owner, $ownerDisplayName, $sharedBy, $sharedByDisplayName, '', $shareType, $resourceType);
|
||||||
|
$share->setProtocol($protocol);
|
||||||
|
$id = $provider->shareReceived($share);
|
||||||
|
} catch (ProviderDoesNotExistsException $e) {
|
||||||
|
return new JSONResponse(
|
||||||
|
['message' => $e->getMessage()],
|
||||||
|
Http::STATUS_NOT_IMPLEMENTED
|
||||||
|
);
|
||||||
|
} catch (ProviderCouldNotAddShareException $e) {
|
||||||
|
return new JSONResponse(
|
||||||
|
['message' => $e->getMessage()],
|
||||||
|
$e->getCode()
|
||||||
|
);
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
return new JSONResponse(
|
||||||
|
['message' => 'Internal error at ' . $this->urlGenerator->getBaseUrl()],
|
||||||
|
Http::STATUS_BAD_REQUEST
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
$user = $this->userManager->get($shareWithLocalId);
|
||||||
|
$recipientDisplayName = '';
|
||||||
|
if($user) {
|
||||||
|
$recipientDisplayName = $user->getDisplayName();
|
||||||
|
}
|
||||||
|
|
||||||
|
return new JSONResponse(
|
||||||
|
['recipientDisplayName' => $recipientDisplayName],
|
||||||
|
Http::STATUS_CREATED);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* receive notification about existing share
|
||||||
|
*
|
||||||
|
* @NoCSRFRequired
|
||||||
|
* @PublicPage
|
||||||
|
* @BruteForceProtection(action=receiveFederatedShareNotification)
|
||||||
|
*
|
||||||
|
* @param string $notificationType (notification type, e.g. SHARE_ACCEPTED)
|
||||||
|
* @param string $resourceType (calendar, file, contact,...)
|
||||||
|
* @param string $providerId id of the share
|
||||||
|
* @param array $notification the actual payload of the notification
|
||||||
|
* @return JSONResponse
|
||||||
|
*/
|
||||||
|
public function receiveNotification($notificationType, $resourceType, $providerId, array $notification) {
|
||||||
|
|
||||||
|
// check if all required parameters are set
|
||||||
|
if ($notificationType === null ||
|
||||||
|
$resourceType === null ||
|
||||||
|
$providerId === null ||
|
||||||
|
!is_array($notification)
|
||||||
|
) {
|
||||||
|
return new JSONResponse(
|
||||||
|
['message' => 'Missing arguments'],
|
||||||
|
Http::STATUS_BAD_REQUEST
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
$provider = $this->cloudFederationProviderManager->getCloudFederationProvider($resourceType);
|
||||||
|
$result = $provider->notificationReceived($notificationType, $providerId, $notification);
|
||||||
|
} catch (ProviderDoesNotExistsException $e) {
|
||||||
|
return new JSONResponse(
|
||||||
|
['message' => $e->getMessage()],
|
||||||
|
Http::STATUS_BAD_REQUEST
|
||||||
|
);
|
||||||
|
} catch (ShareNotFound $e) {
|
||||||
|
return new JSONResponse(
|
||||||
|
['message' => $e->getMessage()],
|
||||||
|
Http::STATUS_BAD_REQUEST
|
||||||
|
);
|
||||||
|
} catch (ActionNotSupportedException $e) {
|
||||||
|
return new JSONResponse(
|
||||||
|
['message' => $e->getMessage()],
|
||||||
|
Http::STATUS_NOT_IMPLEMENTED
|
||||||
|
);
|
||||||
|
} catch (BadRequestException $e) {
|
||||||
|
return new JSONResponse($e->getReturnMessage(), Http::STATUS_BAD_REQUEST);
|
||||||
|
} catch (AuthenticationFailedException $e) {
|
||||||
|
return new JSONResponse(["message" => "RESOURCE_NOT_FOUND"], Http::STATUS_FORBIDDEN);
|
||||||
|
}
|
||||||
|
catch (\Exception $e) {
|
||||||
|
return new JSONResponse(
|
||||||
|
['message' => 'Internal error at ' . $this->urlGenerator->getBaseUrl()],
|
||||||
|
Http::STATUS_BAD_REQUEST
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return new JSONResponse($result,Http::STATUS_CREATED);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* map login name to internal LDAP UID if a LDAP backend is in use
|
||||||
|
*
|
||||||
|
* @param string $uid
|
||||||
|
* @return string mixed
|
||||||
|
*/
|
||||||
|
private function mapUid($uid) {
|
||||||
|
\OC::$server->getURLGenerator()->linkToDocs('key');
|
||||||
|
// FIXME this should be a method in the user management instead
|
||||||
|
$this->logger->debug('shareWith before, ' . $uid, ['app' => $this->appName]);
|
||||||
|
\OCP\Util::emitHook(
|
||||||
|
'\OCA\Files_Sharing\API\Server2Server',
|
||||||
|
'preLoginNameUsedAsUserName',
|
||||||
|
array('uid' => &$uid)
|
||||||
|
);
|
||||||
|
$this->logger->debug('shareWith after, ' . $uid, ['app' => $this->appName]);
|
||||||
|
|
||||||
|
return $uid;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -33,6 +33,7 @@
|
||||||
namespace OCA\DAV\Connector\Sabre;
|
namespace OCA\DAV\Connector\Sabre;
|
||||||
|
|
||||||
use OC\AppFramework\Http\Request;
|
use OC\AppFramework\Http\Request;
|
||||||
|
use OCP\Constants;
|
||||||
use OCP\Files\ForbiddenException;
|
use OCP\Files\ForbiddenException;
|
||||||
use OCP\IPreview;
|
use OCP\IPreview;
|
||||||
use Sabre\DAV\Exception\Forbidden;
|
use Sabre\DAV\Exception\Forbidden;
|
||||||
|
@ -57,6 +58,7 @@ class FilesPlugin extends ServerPlugin {
|
||||||
const INTERNAL_FILEID_PROPERTYNAME = '{http://owncloud.org/ns}fileid';
|
const INTERNAL_FILEID_PROPERTYNAME = '{http://owncloud.org/ns}fileid';
|
||||||
const PERMISSIONS_PROPERTYNAME = '{http://owncloud.org/ns}permissions';
|
const PERMISSIONS_PROPERTYNAME = '{http://owncloud.org/ns}permissions';
|
||||||
const SHARE_PERMISSIONS_PROPERTYNAME = '{http://open-collaboration-services.org/ns}share-permissions';
|
const SHARE_PERMISSIONS_PROPERTYNAME = '{http://open-collaboration-services.org/ns}share-permissions';
|
||||||
|
const OCM_SHARE_PERMISSIONS_PROPERTYNAME = '{http://open-cloud-mesh.org/ns}share-permissions';
|
||||||
const DOWNLOADURL_PROPERTYNAME = '{http://owncloud.org/ns}downloadURL';
|
const DOWNLOADURL_PROPERTYNAME = '{http://owncloud.org/ns}downloadURL';
|
||||||
const SIZE_PROPERTYNAME = '{http://owncloud.org/ns}size';
|
const SIZE_PROPERTYNAME = '{http://owncloud.org/ns}size';
|
||||||
const GETETAG_PROPERTYNAME = '{DAV:}getetag';
|
const GETETAG_PROPERTYNAME = '{DAV:}getetag';
|
||||||
|
@ -149,6 +151,7 @@ class FilesPlugin extends ServerPlugin {
|
||||||
$server->protectedProperties[] = self::INTERNAL_FILEID_PROPERTYNAME;
|
$server->protectedProperties[] = self::INTERNAL_FILEID_PROPERTYNAME;
|
||||||
$server->protectedProperties[] = self::PERMISSIONS_PROPERTYNAME;
|
$server->protectedProperties[] = self::PERMISSIONS_PROPERTYNAME;
|
||||||
$server->protectedProperties[] = self::SHARE_PERMISSIONS_PROPERTYNAME;
|
$server->protectedProperties[] = self::SHARE_PERMISSIONS_PROPERTYNAME;
|
||||||
|
$server->protectedProperties[] = self::OCM_SHARE_PERMISSIONS_PROPERTYNAME;
|
||||||
$server->protectedProperties[] = self::SIZE_PROPERTYNAME;
|
$server->protectedProperties[] = self::SIZE_PROPERTYNAME;
|
||||||
$server->protectedProperties[] = self::DOWNLOADURL_PROPERTYNAME;
|
$server->protectedProperties[] = self::DOWNLOADURL_PROPERTYNAME;
|
||||||
$server->protectedProperties[] = self::OWNER_ID_PROPERTYNAME;
|
$server->protectedProperties[] = self::OWNER_ID_PROPERTYNAME;
|
||||||
|
@ -318,6 +321,14 @@ class FilesPlugin extends ServerPlugin {
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$propFind->handle(self::OCM_SHARE_PERMISSIONS_PROPERTYNAME, function() use ($node, $httpRequest) {
|
||||||
|
$ncPermissions = $node->getSharePermissions(
|
||||||
|
$httpRequest->getRawServerValue('PHP_AUTH_USER')
|
||||||
|
);
|
||||||
|
$ocmPermissions = $this->ncPermissions2ocmPermissions($ncPermissions);
|
||||||
|
return json_encode($ocmPermissions);
|
||||||
|
});
|
||||||
|
|
||||||
$propFind->handle(self::GETETAG_PROPERTYNAME, function() use ($node) {
|
$propFind->handle(self::GETETAG_PROPERTYNAME, function() use ($node) {
|
||||||
return $node->getETag();
|
return $node->getETag();
|
||||||
});
|
});
|
||||||
|
@ -394,6 +405,33 @@ class FilesPlugin extends ServerPlugin {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* translate Nextcloud permissions to OCM Permissions
|
||||||
|
*
|
||||||
|
* @param $ncPermissions
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
protected function ncPermissions2ocmPermissions($ncPermissions) {
|
||||||
|
|
||||||
|
$ocmPermissions = [];
|
||||||
|
|
||||||
|
if ($ncPermissions & Constants::PERMISSION_SHARE) {
|
||||||
|
$ocmPermissions[] = 'share';
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($ncPermissions & Constants::PERMISSION_READ) {
|
||||||
|
$ocmPermissions[] = 'read';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (($ncPermissions & Constants::PERMISSION_CREATE) ||
|
||||||
|
($ncPermissions & Constants::PERMISSION_UPDATE)) {
|
||||||
|
$ocmPermissions[] = 'write';
|
||||||
|
}
|
||||||
|
|
||||||
|
return $ocmPermissions;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Update ownCloud-specific properties
|
* Update ownCloud-specific properties
|
||||||
*
|
*
|
||||||
|
|
|
@ -14,6 +14,7 @@ return array(
|
||||||
'OCA\\FederatedFileSharing\\FederatedShareProvider' => $baseDir . '/../lib/FederatedShareProvider.php',
|
'OCA\\FederatedFileSharing\\FederatedShareProvider' => $baseDir . '/../lib/FederatedShareProvider.php',
|
||||||
'OCA\\FederatedFileSharing\\Notifications' => $baseDir . '/../lib/Notifications.php',
|
'OCA\\FederatedFileSharing\\Notifications' => $baseDir . '/../lib/Notifications.php',
|
||||||
'OCA\\FederatedFileSharing\\Notifier' => $baseDir . '/../lib/Notifier.php',
|
'OCA\\FederatedFileSharing\\Notifier' => $baseDir . '/../lib/Notifier.php',
|
||||||
|
'OCA\\FederatedFileSharing\\OCM\\CloudFederationProviderFiles' => $baseDir . '/../lib/ocm/CloudFederationProviderFiles.php',
|
||||||
'OCA\\FederatedFileSharing\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',
|
'OCA\\FederatedFileSharing\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',
|
||||||
'OCA\\FederatedFileSharing\\Settings\\Personal' => $baseDir . '/../lib/Settings/Personal.php',
|
'OCA\\FederatedFileSharing\\Settings\\Personal' => $baseDir . '/../lib/Settings/Personal.php',
|
||||||
'OCA\\FederatedFileSharing\\Settings\\PersonalSection' => $baseDir . '/../lib/Settings/PersonalSection.php',
|
'OCA\\FederatedFileSharing\\Settings\\PersonalSection' => $baseDir . '/../lib/Settings/PersonalSection.php',
|
||||||
|
|
|
@ -29,6 +29,7 @@ class ComposerStaticInitFederatedFileSharing
|
||||||
'OCA\\FederatedFileSharing\\FederatedShareProvider' => __DIR__ . '/..' . '/../lib/FederatedShareProvider.php',
|
'OCA\\FederatedFileSharing\\FederatedShareProvider' => __DIR__ . '/..' . '/../lib/FederatedShareProvider.php',
|
||||||
'OCA\\FederatedFileSharing\\Notifications' => __DIR__ . '/..' . '/../lib/Notifications.php',
|
'OCA\\FederatedFileSharing\\Notifications' => __DIR__ . '/..' . '/../lib/Notifications.php',
|
||||||
'OCA\\FederatedFileSharing\\Notifier' => __DIR__ . '/..' . '/../lib/Notifier.php',
|
'OCA\\FederatedFileSharing\\Notifier' => __DIR__ . '/..' . '/../lib/Notifier.php',
|
||||||
|
'OCA\\FederatedFileSharing\\OCM\\CloudFederationProviderFiles' => __DIR__ . '/..' . '/../lib/ocm/CloudFederationProviderFiles.php',
|
||||||
'OCA\\FederatedFileSharing\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php',
|
'OCA\\FederatedFileSharing\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php',
|
||||||
'OCA\\FederatedFileSharing\\Settings\\Personal' => __DIR__ . '/..' . '/../lib/Settings/Personal.php',
|
'OCA\\FederatedFileSharing\\Settings\\Personal' => __DIR__ . '/..' . '/../lib/Settings/Personal.php',
|
||||||
'OCA\\FederatedFileSharing\\Settings\\PersonalSection' => __DIR__ . '/..' . '/../lib/Settings/PersonalSection.php',
|
'OCA\\FederatedFileSharing\\Settings\\PersonalSection' => __DIR__ . '/..' . '/../lib/Settings/PersonalSection.php',
|
||||||
|
|
|
@ -32,6 +32,8 @@ use OCA\FederatedFileSharing\AddressHandler;
|
||||||
use OCA\FederatedFileSharing\Controller\RequestHandlerController;
|
use OCA\FederatedFileSharing\Controller\RequestHandlerController;
|
||||||
use OCA\FederatedFileSharing\FederatedShareProvider;
|
use OCA\FederatedFileSharing\FederatedShareProvider;
|
||||||
use OCA\FederatedFileSharing\Notifications;
|
use OCA\FederatedFileSharing\Notifications;
|
||||||
|
use OCA\FederatedFileSharing\OCM\CloudFederationProvider;
|
||||||
|
use OCA\FederatedFileSharing\OCM\CloudFederationProviderFiles;
|
||||||
use OCP\AppFramework\App;
|
use OCP\AppFramework\App;
|
||||||
use OCP\GlobalScale\IConfig;
|
use OCP\GlobalScale\IConfig;
|
||||||
|
|
||||||
|
@ -46,6 +48,27 @@ class Application extends App {
|
||||||
$container = $this->getContainer();
|
$container = $this->getContainer();
|
||||||
$server = $container->getServer();
|
$server = $container->getServer();
|
||||||
|
|
||||||
|
$cloudFederationManager = $server->getCloudFederationProviderManager();
|
||||||
|
$cloudFederationManager->addCloudFederationProvider('file',
|
||||||
|
'Federated Files Sharing',
|
||||||
|
function() use ($container) {
|
||||||
|
$server = $container->getServer();
|
||||||
|
return new CloudFederationProviderFiles(
|
||||||
|
$server->getAppManager(),
|
||||||
|
$server->query(FederatedShareProvider::class),
|
||||||
|
$server->query(AddressHandler::class),
|
||||||
|
$server->getLogger(),
|
||||||
|
$server->getUserManager(),
|
||||||
|
$server->getCloudIdManager(),
|
||||||
|
$server->getActivityManager(),
|
||||||
|
$server->getNotificationManager(),
|
||||||
|
$server->getURLGenerator(),
|
||||||
|
$server->getCloudFederationFactory(),
|
||||||
|
$server->getCloudFederationProviderManager(),
|
||||||
|
$server->getDatabaseConnection()
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
$container->registerService('RequestHandlerController', function(SimpleContainer $c) use ($server) {
|
$container->registerService('RequestHandlerController', function(SimpleContainer $c) use ($server) {
|
||||||
$addressHandler = new AddressHandler(
|
$addressHandler = new AddressHandler(
|
||||||
$server->getURLGenerator(),
|
$server->getURLGenerator(),
|
||||||
|
@ -56,7 +79,9 @@ class Application extends App {
|
||||||
$addressHandler,
|
$addressHandler,
|
||||||
$server->getHTTPClientService(),
|
$server->getHTTPClientService(),
|
||||||
$server->query(\OCP\OCS\IDiscoveryService::class),
|
$server->query(\OCP\OCS\IDiscoveryService::class),
|
||||||
\OC::$server->getJobList()
|
\OC::$server->getJobList(),
|
||||||
|
\OC::$server->getCloudFederationProviderManager(),
|
||||||
|
\OC::$server->getCloudFederationFactory()
|
||||||
);
|
);
|
||||||
return new RequestHandlerController(
|
return new RequestHandlerController(
|
||||||
$c->query('AppName'),
|
$c->query('AppName'),
|
||||||
|
@ -68,7 +93,9 @@ class Application extends App {
|
||||||
$addressHandler,
|
$addressHandler,
|
||||||
$server->getUserManager(),
|
$server->getUserManager(),
|
||||||
$server->getCloudIdManager(),
|
$server->getCloudIdManager(),
|
||||||
$server->getLogger()
|
$server->getLogger(),
|
||||||
|
$server->getCloudFederationFactory(),
|
||||||
|
$server->getCloudFederationProviderManager()
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -99,7 +126,9 @@ class Application extends App {
|
||||||
$addressHandler,
|
$addressHandler,
|
||||||
\OC::$server->getHTTPClientService(),
|
\OC::$server->getHTTPClientService(),
|
||||||
\OC::$server->query(\OCP\OCS\IDiscoveryService::class),
|
\OC::$server->query(\OCP\OCS\IDiscoveryService::class),
|
||||||
\OC::$server->getJobList()
|
\OC::$server->getJobList(),
|
||||||
|
\OC::$server->getCloudFederationProviderManager(),
|
||||||
|
\OC::$server->getCloudFederationFactory()
|
||||||
);
|
);
|
||||||
$tokenHandler = new \OCA\FederatedFileSharing\TokenHandler(
|
$tokenHandler = new \OCA\FederatedFileSharing\TokenHandler(
|
||||||
\OC::$server->getSecureRandom()
|
\OC::$server->getSecureRandom()
|
||||||
|
|
|
@ -75,7 +75,9 @@ class RetryJob extends Job {
|
||||||
$addressHandler,
|
$addressHandler,
|
||||||
\OC::$server->getHTTPClientService(),
|
\OC::$server->getHTTPClientService(),
|
||||||
\OC::$server->query(\OCP\OCS\IDiscoveryService::class),
|
\OC::$server->query(\OCP\OCS\IDiscoveryService::class),
|
||||||
\OC::$server->getJobList()
|
\OC::$server->getJobList(),
|
||||||
|
\OC::$server->getCloudFederationProviderManager(),
|
||||||
|
\OC::$server->getCloudFederationFactory()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,6 @@
|
||||||
|
|
||||||
namespace OCA\FederatedFileSharing\Controller;
|
namespace OCA\FederatedFileSharing\Controller;
|
||||||
|
|
||||||
use OCA\Files_Sharing\Activity\Providers\RemoteShares;
|
|
||||||
use OCA\FederatedFileSharing\AddressHandler;
|
use OCA\FederatedFileSharing\AddressHandler;
|
||||||
use OCA\FederatedFileSharing\FederatedShareProvider;
|
use OCA\FederatedFileSharing\FederatedShareProvider;
|
||||||
use OCA\FederatedFileSharing\Notifications;
|
use OCA\FederatedFileSharing\Notifications;
|
||||||
|
@ -37,17 +36,19 @@ use OCP\AppFramework\Http;
|
||||||
use OCP\AppFramework\OCS\OCSBadRequestException;
|
use OCP\AppFramework\OCS\OCSBadRequestException;
|
||||||
use OCP\AppFramework\OCS\OCSException;
|
use OCP\AppFramework\OCS\OCSException;
|
||||||
use OCP\AppFramework\OCS\OCSForbiddenException;
|
use OCP\AppFramework\OCS\OCSForbiddenException;
|
||||||
use OCP\AppFramework\OCS\OCSNotFoundException;
|
|
||||||
use OCP\AppFramework\OCSController;
|
use OCP\AppFramework\OCSController;
|
||||||
use OCP\Constants;
|
use OCP\Constants;
|
||||||
|
use OCP\Federation\Exceptions\ProviderCouldNotAddShareException;
|
||||||
|
use OCP\Federation\Exceptions\ProviderDoesNotExistsException;
|
||||||
|
use OCP\Federation\ICloudFederationFactory;
|
||||||
|
use OCP\Federation\ICloudFederationProviderManager;
|
||||||
use OCP\Federation\ICloudIdManager;
|
use OCP\Federation\ICloudIdManager;
|
||||||
use OCP\Files\NotFoundException;
|
|
||||||
use OCP\IDBConnection;
|
use OCP\IDBConnection;
|
||||||
use OCP\ILogger;
|
use OCP\ILogger;
|
||||||
use OCP\IRequest;
|
use OCP\IRequest;
|
||||||
use OCP\IUserManager;
|
use OCP\IUserManager;
|
||||||
use OCP\Share;
|
use OCP\Share;
|
||||||
use OCP\Share\IShare;
|
use OCP\Share\Exceptions\ShareNotFound;
|
||||||
|
|
||||||
class RequestHandlerController extends OCSController {
|
class RequestHandlerController extends OCSController {
|
||||||
|
|
||||||
|
@ -78,6 +79,12 @@ class RequestHandlerController extends OCSController {
|
||||||
/** @var ILogger */
|
/** @var ILogger */
|
||||||
private $logger;
|
private $logger;
|
||||||
|
|
||||||
|
/** @var ICloudFederationFactory */
|
||||||
|
private $cloudFederationFactory;
|
||||||
|
|
||||||
|
/** @var ICloudFederationProviderManager */
|
||||||
|
private $cloudFederationProviderManager;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Server2Server constructor.
|
* Server2Server constructor.
|
||||||
*
|
*
|
||||||
|
@ -90,6 +97,9 @@ class RequestHandlerController extends OCSController {
|
||||||
* @param AddressHandler $addressHandler
|
* @param AddressHandler $addressHandler
|
||||||
* @param IUserManager $userManager
|
* @param IUserManager $userManager
|
||||||
* @param ICloudIdManager $cloudIdManager
|
* @param ICloudIdManager $cloudIdManager
|
||||||
|
* @param ILogger $logger
|
||||||
|
* @param ICloudFederationFactory $cloudFederationFactory
|
||||||
|
* @param ICloudFederationProviderManager $cloudFederationProviderManager
|
||||||
*/
|
*/
|
||||||
public function __construct($appName,
|
public function __construct($appName,
|
||||||
IRequest $request,
|
IRequest $request,
|
||||||
|
@ -100,7 +110,9 @@ class RequestHandlerController extends OCSController {
|
||||||
AddressHandler $addressHandler,
|
AddressHandler $addressHandler,
|
||||||
IUserManager $userManager,
|
IUserManager $userManager,
|
||||||
ICloudIdManager $cloudIdManager,
|
ICloudIdManager $cloudIdManager,
|
||||||
ILogger $logger
|
ILogger $logger,
|
||||||
|
ICloudFederationFactory $cloudFederationFactory,
|
||||||
|
ICloudFederationProviderManager $cloudFederationProviderManager
|
||||||
) {
|
) {
|
||||||
parent::__construct($appName, $request);
|
parent::__construct($appName, $request);
|
||||||
|
|
||||||
|
@ -112,6 +124,8 @@ class RequestHandlerController extends OCSController {
|
||||||
$this->userManager = $userManager;
|
$this->userManager = $userManager;
|
||||||
$this->cloudIdManager = $cloudIdManager;
|
$this->cloudIdManager = $cloudIdManager;
|
||||||
$this->logger = $logger;
|
$this->logger = $logger;
|
||||||
|
$this->cloudFederationFactory = $cloudFederationFactory;
|
||||||
|
$this->cloudFederationProviderManager = $cloudFederationProviderManager;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -125,10 +139,6 @@ class RequestHandlerController extends OCSController {
|
||||||
*/
|
*/
|
||||||
public function createShare() {
|
public function createShare() {
|
||||||
|
|
||||||
if (!$this->isS2SEnabled(true)) {
|
|
||||||
throw new OCSException('Server does not support federated cloud sharing', 503);
|
|
||||||
}
|
|
||||||
|
|
||||||
$remote = isset($_POST['remote']) ? $_POST['remote'] : null;
|
$remote = isset($_POST['remote']) ? $_POST['remote'] : null;
|
||||||
$token = isset($_POST['token']) ? $_POST['token'] : null;
|
$token = isset($_POST['token']) ? $_POST['token'] : null;
|
||||||
$name = isset($_POST['name']) ? $_POST['name'] : null;
|
$name = isset($_POST['name']) ? $_POST['name'] : null;
|
||||||
|
@ -139,92 +149,41 @@ class RequestHandlerController extends OCSController {
|
||||||
$sharedByFederatedId = isset($_POST['sharedByFederatedId']) ? $_POST['sharedByFederatedId'] : null;
|
$sharedByFederatedId = isset($_POST['sharedByFederatedId']) ? $_POST['sharedByFederatedId'] : null;
|
||||||
$ownerFederatedId = isset($_POST['ownerFederatedId']) ? $_POST['ownerFederatedId'] : null;
|
$ownerFederatedId = isset($_POST['ownerFederatedId']) ? $_POST['ownerFederatedId'] : null;
|
||||||
|
|
||||||
if ($remote && $token && $name && $owner && $remoteId && $shareWith) {
|
if ($ownerFederatedId === null) {
|
||||||
|
$ownerFederatedId = $this->cloudIdManager->getCloudId($owner, $this->cleanupRemote($remote))->getId();
|
||||||
if (!\OCP\Util::isValidFileName($name)) {
|
}
|
||||||
throw new OCSException('The mountpoint name contains invalid characters.', 400);
|
// if the owner of the share and the initiator are the same user
|
||||||
}
|
// we also complete the federated share ID for the initiator
|
||||||
|
if ($sharedByFederatedId === null && $owner === $sharedBy) {
|
||||||
// FIXME this should be a method in the user management instead
|
$sharedByFederatedId = $ownerFederatedId;
|
||||||
$this->logger->debug('shareWith before, ' . $shareWith, ['app' => 'files_sharing']);
|
|
||||||
\OCP\Util::emitHook(
|
|
||||||
'\OCA\Files_Sharing\API\Server2Server',
|
|
||||||
'preLoginNameUsedAsUserName',
|
|
||||||
array('uid' => &$shareWith)
|
|
||||||
);
|
|
||||||
$this->logger->debug('shareWith after, ' . $shareWith, ['app' => 'files_sharing']);
|
|
||||||
|
|
||||||
if (!\OC::$server->getUserManager()->userExists($shareWith)) {
|
|
||||||
throw new OCSException('User does not exists', 400);
|
|
||||||
}
|
|
||||||
|
|
||||||
\OC_Util::setupFS($shareWith);
|
|
||||||
|
|
||||||
$externalManager = new \OCA\Files_Sharing\External\Manager(
|
|
||||||
\OC::$server->getDatabaseConnection(),
|
|
||||||
\OC\Files\Filesystem::getMountManager(),
|
|
||||||
\OC\Files\Filesystem::getLoader(),
|
|
||||||
\OC::$server->getHTTPClientService(),
|
|
||||||
\OC::$server->getNotificationManager(),
|
|
||||||
\OC::$server->query(\OCP\OCS\IDiscoveryService::class),
|
|
||||||
$shareWith
|
|
||||||
);
|
|
||||||
|
|
||||||
try {
|
|
||||||
$externalManager->addShare($remote, $token, '', $name, $owner, false, $shareWith, $remoteId);
|
|
||||||
$shareId = \OC::$server->getDatabaseConnection()->lastInsertId('*PREFIX*share_external');
|
|
||||||
|
|
||||||
if ($ownerFederatedId === null) {
|
|
||||||
$ownerFederatedId = $this->cloudIdManager->getCloudId($owner, $this->cleanupRemote($remote))->getId();
|
|
||||||
}
|
|
||||||
// if the owner of the share and the initiator are the same user
|
|
||||||
// we also complete the federated share ID for the initiator
|
|
||||||
if ($sharedByFederatedId === null && $owner === $sharedBy) {
|
|
||||||
$sharedByFederatedId = $ownerFederatedId;
|
|
||||||
}
|
|
||||||
|
|
||||||
$event = \OC::$server->getActivityManager()->generateEvent();
|
|
||||||
$event->setApp('files_sharing')
|
|
||||||
->setType('remote_share')
|
|
||||||
->setSubject(RemoteShares::SUBJECT_REMOTE_SHARE_RECEIVED, [$ownerFederatedId, trim($name, '/')])
|
|
||||||
->setAffectedUser($shareWith)
|
|
||||||
->setObject('remote_share', (int)$shareId, $name);
|
|
||||||
\OC::$server->getActivityManager()->publish($event);
|
|
||||||
|
|
||||||
$urlGenerator = \OC::$server->getURLGenerator();
|
|
||||||
|
|
||||||
$notificationManager = \OC::$server->getNotificationManager();
|
|
||||||
$notification = $notificationManager->createNotification();
|
|
||||||
$notification->setApp('files_sharing')
|
|
||||||
->setUser($shareWith)
|
|
||||||
->setDateTime(new \DateTime())
|
|
||||||
->setObject('remote_share', $shareId)
|
|
||||||
->setSubject('remote_share', [$ownerFederatedId, $sharedByFederatedId, trim($name, '/')]);
|
|
||||||
|
|
||||||
$declineAction = $notification->createAction();
|
|
||||||
$declineAction->setLabel('decline')
|
|
||||||
->setLink($urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'ocs/v2.php/apps/files_sharing/api/v1/remote_shares/pending/' . $shareId)), 'DELETE');
|
|
||||||
$notification->addAction($declineAction);
|
|
||||||
|
|
||||||
$acceptAction = $notification->createAction();
|
|
||||||
$acceptAction->setLabel('accept')
|
|
||||||
->setLink($urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'ocs/v2.php/apps/files_sharing/api/v1/remote_shares/pending/' . $shareId)), 'POST');
|
|
||||||
$notification->addAction($acceptAction);
|
|
||||||
|
|
||||||
$notificationManager->notify($notification);
|
|
||||||
|
|
||||||
return new Http\DataResponse();
|
|
||||||
} catch (\Exception $e) {
|
|
||||||
$this->logger->logException($e, [
|
|
||||||
'message' => 'Server can not add remote share.',
|
|
||||||
'level' => ILogger::ERROR,
|
|
||||||
'app' => 'files_sharing'
|
|
||||||
]);
|
|
||||||
throw new OCSException('internal server error, was not able to add share from ' . $remote, 500);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
throw new OCSException('server can not add remote share, missing parameter', 400);
|
$share = $this->cloudFederationFactory->getCloudFederationShare(
|
||||||
|
$shareWith,
|
||||||
|
$name,
|
||||||
|
'',
|
||||||
|
$remoteId,
|
||||||
|
$ownerFederatedId,
|
||||||
|
$owner,
|
||||||
|
$sharedByFederatedId,
|
||||||
|
$sharedBy,
|
||||||
|
$token,
|
||||||
|
'user',
|
||||||
|
'file'
|
||||||
|
);
|
||||||
|
|
||||||
|
try {
|
||||||
|
$provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
|
||||||
|
$provider->shareReceived($share);
|
||||||
|
} catch (ProviderDoesNotExistsException $e) {
|
||||||
|
throw new OCSException('Server does not support federated cloud sharing', 503);
|
||||||
|
} catch (ProviderCouldNotAddShareException $e) {
|
||||||
|
throw new OCSException($e->getMessage(), 400);
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
throw new OCSException('internal server error, was not able to add share from ' . $remote, 500);
|
||||||
|
}
|
||||||
|
|
||||||
|
return new Http\DataResponse();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -236,8 +195,8 @@ class RequestHandlerController extends OCSController {
|
||||||
* @param int $id
|
* @param int $id
|
||||||
* @return Http\DataResponse
|
* @return Http\DataResponse
|
||||||
* @throws OCSBadRequestException
|
* @throws OCSBadRequestException
|
||||||
|
* @throws OCSException
|
||||||
* @throws OCSForbiddenException
|
* @throws OCSForbiddenException
|
||||||
* @throws OCSNotFoundException
|
|
||||||
*/
|
*/
|
||||||
public function reShare($id) {
|
public function reShare($id) {
|
||||||
|
|
||||||
|
@ -255,45 +214,32 @@ class RequestHandlerController extends OCSController {
|
||||||
throw new OCSBadRequestException();
|
throw new OCSBadRequestException();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$notification = [
|
||||||
|
'sharedSecret' => $token,
|
||||||
|
'shareWith' => $shareWith,
|
||||||
|
'senderId' => $remoteId,
|
||||||
|
'message' => 'Recipient of a share ask the owner to reshare the file'
|
||||||
|
];
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$share = $this->federatedShareProvider->getShareById($id);
|
$provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
|
||||||
} catch (Share\Exceptions\ShareNotFound $e) {
|
list($newToken, $localId) = $provider->notificationReceived('REQUEST_RESHARE', $id, $notification);
|
||||||
throw new OCSNotFoundException();
|
return new Http\DataResponse([
|
||||||
|
'token' => $newToken,
|
||||||
|
'remoteId' => $localId
|
||||||
|
]);
|
||||||
|
} catch (ProviderDoesNotExistsException $e) {
|
||||||
|
throw new OCSException('Server does not support federated cloud sharing', 503);
|
||||||
|
} catch (ShareNotFound $e) {
|
||||||
|
$this->logger->debug('Share not found: ' . $e->getMessage());
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
$this->logger->debug('internal server error, can not process notification: ' . $e->getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
// don't allow to share a file back to the owner
|
|
||||||
list($user, $remote) = $this->addressHandler->splitUserRemote($shareWith);
|
|
||||||
$owner = $share->getShareOwner();
|
|
||||||
$currentServer = $this->addressHandler->generateRemoteURL();
|
|
||||||
if ($this->addressHandler->compareAddresses($user, $remote, $owner, $currentServer)) {
|
|
||||||
throw new OCSForbiddenException();
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($this->verifyShare($share, $token)) {
|
|
||||||
|
|
||||||
// check if re-sharing is allowed
|
|
||||||
if ($share->getPermissions() | ~Constants::PERMISSION_SHARE) {
|
|
||||||
$share->setPermissions($share->getPermissions() & $permission);
|
|
||||||
// the recipient of the initial share is now the initiator for the re-share
|
|
||||||
$share->setSharedBy($share->getSharedWith());
|
|
||||||
$share->setSharedWith($shareWith);
|
|
||||||
try {
|
|
||||||
$result = $this->federatedShareProvider->create($share);
|
|
||||||
$this->federatedShareProvider->storeRemoteId((int)$result->getId(), $remoteId);
|
|
||||||
return new Http\DataResponse([
|
|
||||||
'token' => $result->getToken(),
|
|
||||||
'remoteId' => $result->getId()
|
|
||||||
]);
|
|
||||||
} catch (\Exception $e) {
|
|
||||||
throw new OCSBadRequestException();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
throw new OCSForbiddenException();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
throw new OCSBadRequestException();
|
throw new OCSBadRequestException();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @NoCSRFRequired
|
* @NoCSRFRequired
|
||||||
* @PublicPage
|
* @PublicPage
|
||||||
|
@ -303,47 +249,32 @@ class RequestHandlerController extends OCSController {
|
||||||
* @param int $id
|
* @param int $id
|
||||||
* @return Http\DataResponse
|
* @return Http\DataResponse
|
||||||
* @throws OCSException
|
* @throws OCSException
|
||||||
|
* @throws ShareNotFound
|
||||||
|
* @throws \OC\HintException
|
||||||
*/
|
*/
|
||||||
public function acceptShare($id) {
|
public function acceptShare($id) {
|
||||||
|
|
||||||
if (!$this->isS2SEnabled()) {
|
|
||||||
throw new OCSException('Server does not support federated cloud sharing', 503);
|
|
||||||
}
|
|
||||||
|
|
||||||
$token = isset($_POST['token']) ? $_POST['token'] : null;
|
$token = isset($_POST['token']) ? $_POST['token'] : null;
|
||||||
|
|
||||||
try {
|
$notification = [
|
||||||
$share = $this->federatedShareProvider->getShareById($id);
|
'sharedSecret' => $token,
|
||||||
} catch (Share\Exceptions\ShareNotFound $e) {
|
'message' => 'Recipient accept the share'
|
||||||
return new Http\DataResponse();
|
];
|
||||||
}
|
|
||||||
|
|
||||||
if ($this->verifyShare($share, $token)) {
|
try {
|
||||||
$this->executeAcceptShare($share);
|
$provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
|
||||||
if ($share->getShareOwner() !== $share->getSharedBy()) {
|
$provider->notificationReceived('SHARE_ACCEPTED', $id, $notification);
|
||||||
list(, $remote) = $this->addressHandler->splitUserRemote($share->getSharedBy());
|
} catch (ProviderDoesNotExistsException $e) {
|
||||||
$remoteId = $this->federatedShareProvider->getRemoteId($share);
|
throw new OCSException('Server does not support federated cloud sharing', 503);
|
||||||
$this->notifications->sendAcceptShare($remote, $remoteId, $share->getToken());
|
} catch (ShareNotFound $e) {
|
||||||
}
|
$this->logger->debug('Share not found: ' . $e->getMessage());
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
$this->logger->debug('internal server error, can not process notification: ' . $e->getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
return new Http\DataResponse();
|
return new Http\DataResponse();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function executeAcceptShare(Share\IShare $share) {
|
|
||||||
$fileId = (int) $share->getNode()->getId();
|
|
||||||
list($file, $link) = $this->getFile($this->getCorrectUid($share), $fileId);
|
|
||||||
|
|
||||||
$event = \OC::$server->getActivityManager()->generateEvent();
|
|
||||||
$event->setApp('files_sharing')
|
|
||||||
->setType('remote_share')
|
|
||||||
->setAffectedUser($this->getCorrectUid($share))
|
|
||||||
->setSubject(RemoteShares::SUBJECT_REMOTE_SHARE_ACCEPTED, [$share->getSharedWith(), [$fileId => $file]])
|
|
||||||
->setObject('files', $fileId, $file)
|
|
||||||
->setLink($link);
|
|
||||||
\OC::$server->getActivityManager()->publish($event);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @NoCSRFRequired
|
* @NoCSRFRequired
|
||||||
* @PublicPage
|
* @PublicPage
|
||||||
|
@ -356,65 +287,27 @@ class RequestHandlerController extends OCSController {
|
||||||
*/
|
*/
|
||||||
public function declineShare($id) {
|
public function declineShare($id) {
|
||||||
|
|
||||||
if (!$this->isS2SEnabled()) {
|
|
||||||
throw new OCSException('Server does not support federated cloud sharing', 503);
|
|
||||||
}
|
|
||||||
|
|
||||||
$token = isset($_POST['token']) ? $_POST['token'] : null;
|
$token = isset($_POST['token']) ? $_POST['token'] : null;
|
||||||
|
|
||||||
try {
|
$notification = [
|
||||||
$share = $this->federatedShareProvider->getShareById($id);
|
'sharedSecret' => $token,
|
||||||
} catch (Share\Exceptions\ShareNotFound $e) {
|
'message' => 'Recipient declined the share'
|
||||||
return new Http\DataResponse();
|
];
|
||||||
}
|
|
||||||
|
|
||||||
if ($this->verifyShare($share, $token)) {
|
try {
|
||||||
if ($share->getShareOwner() !== $share->getSharedBy()) {
|
$provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
|
||||||
list(, $remote) = $this->addressHandler->splitUserRemote($share->getSharedBy());
|
$provider->notificationReceived('SHARE_DECLINED', $id, $notification);
|
||||||
$remoteId = $this->federatedShareProvider->getRemoteId($share);
|
} catch (ProviderDoesNotExistsException $e) {
|
||||||
$this->notifications->sendDeclineShare($remote, $remoteId, $share->getToken());
|
throw new OCSException('Server does not support federated cloud sharing', 503);
|
||||||
}
|
} catch (ShareNotFound $e) {
|
||||||
$this->executeDeclineShare($share);
|
$this->logger->debug('Share not found: ' . $e->getMessage());
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
$this->logger->debug('internal server error, can not process notification: ' . $e->getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
return new Http\DataResponse();
|
return new Http\DataResponse();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* delete declined share and create a activity
|
|
||||||
*
|
|
||||||
* @param Share\IShare $share
|
|
||||||
*/
|
|
||||||
protected function executeDeclineShare(Share\IShare $share) {
|
|
||||||
$this->federatedShareProvider->removeShareFromTable($share);
|
|
||||||
$fileId = (int) $share->getNode()->getId();
|
|
||||||
list($file, $link) = $this->getFile($this->getCorrectUid($share), $fileId);
|
|
||||||
|
|
||||||
$event = \OC::$server->getActivityManager()->generateEvent();
|
|
||||||
$event->setApp('files_sharing')
|
|
||||||
->setType('remote_share')
|
|
||||||
->setAffectedUser($this->getCorrectUid($share))
|
|
||||||
->setSubject(RemoteShares::SUBJECT_REMOTE_SHARE_DECLINED, [$share->getSharedWith(), [$fileId => $file]])
|
|
||||||
->setObject('files', $fileId, $file)
|
|
||||||
->setLink($link);
|
|
||||||
\OC::$server->getActivityManager()->publish($event);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* check if we are the initiator or the owner of a re-share and return the correct UID
|
|
||||||
*
|
|
||||||
* @param Share\IShare $share
|
|
||||||
* @return string
|
|
||||||
*/
|
|
||||||
protected function getCorrectUid(Share\IShare $share) {
|
|
||||||
if ($this->userManager->userExists($share->getShareOwner())) {
|
|
||||||
return $share->getShareOwner();
|
|
||||||
}
|
|
||||||
|
|
||||||
return $share->getSharedBy();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @NoCSRFRequired
|
* @NoCSRFRequired
|
||||||
* @PublicPage
|
* @PublicPage
|
||||||
|
@ -433,60 +326,12 @@ class RequestHandlerController extends OCSController {
|
||||||
|
|
||||||
$token = isset($_POST['token']) ? $_POST['token'] : null;
|
$token = isset($_POST['token']) ? $_POST['token'] : null;
|
||||||
|
|
||||||
$qb = $this->connection->getQueryBuilder();
|
try {
|
||||||
$qb->select('*')
|
$provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
|
||||||
->from('share_external')
|
$notification = ['sharedSecret' => $token];
|
||||||
->where(
|
$provider->notificationReceived('SHARE_UNSHARED', $id, $notification);
|
||||||
$qb->expr()->andX(
|
} catch (\Exception $e) {
|
||||||
$qb->expr()->eq('remote_id', $qb->createNamedParameter($id)),
|
$this->logger->debug('processing unshare notification failed: ' . $e->getMessage());
|
||||||
$qb->expr()->eq('share_token', $qb->createNamedParameter($token))
|
|
||||||
)
|
|
||||||
);
|
|
||||||
|
|
||||||
$result = $qb->execute();
|
|
||||||
$share = $result->fetch();
|
|
||||||
$result->closeCursor();
|
|
||||||
|
|
||||||
if ($token && $id && !empty($share)) {
|
|
||||||
|
|
||||||
$remote = $this->cleanupRemote($share['remote']);
|
|
||||||
|
|
||||||
$owner = $this->cloudIdManager->getCloudId($share['owner'], $remote);
|
|
||||||
$mountpoint = $share['mountpoint'];
|
|
||||||
$user = $share['user'];
|
|
||||||
|
|
||||||
$qb = $this->connection->getQueryBuilder();
|
|
||||||
$qb->delete('share_external')
|
|
||||||
->where(
|
|
||||||
$qb->expr()->andX(
|
|
||||||
$qb->expr()->eq('remote_id', $qb->createNamedParameter($id)),
|
|
||||||
$qb->expr()->eq('share_token', $qb->createNamedParameter($token))
|
|
||||||
)
|
|
||||||
);
|
|
||||||
|
|
||||||
$result = $qb->execute();
|
|
||||||
$result->closeCursor();
|
|
||||||
|
|
||||||
if ($share['accepted']) {
|
|
||||||
$path = trim($mountpoint, '/');
|
|
||||||
} else {
|
|
||||||
$path = trim($share['name'], '/');
|
|
||||||
}
|
|
||||||
|
|
||||||
$notificationManager = \OC::$server->getNotificationManager();
|
|
||||||
$notification = $notificationManager->createNotification();
|
|
||||||
$notification->setApp('files_sharing')
|
|
||||||
->setUser($share['user'])
|
|
||||||
->setObject('remote_share', (int)$share['id']);
|
|
||||||
$notificationManager->markProcessed($notification);
|
|
||||||
|
|
||||||
$event = \OC::$server->getActivityManager()->generateEvent();
|
|
||||||
$event->setApp('files_sharing')
|
|
||||||
->setType('remote_share')
|
|
||||||
->setSubject(RemoteShares::SUBJECT_REMOTE_SHARE_UNSHARED, [$owner->getId(), $path])
|
|
||||||
->setAffectedUser($user)
|
|
||||||
->setObject('remote_share', (int)$share['id'], $path);
|
|
||||||
\OC::$server->getActivityManager()->publish($event);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return new Http\DataResponse();
|
return new Http\DataResponse();
|
||||||
|
@ -510,60 +355,17 @@ class RequestHandlerController extends OCSController {
|
||||||
* @throws OCSBadRequestException
|
* @throws OCSBadRequestException
|
||||||
*/
|
*/
|
||||||
public function revoke($id) {
|
public function revoke($id) {
|
||||||
|
|
||||||
$token = $this->request->getParam('token');
|
$token = $this->request->getParam('token');
|
||||||
|
|
||||||
$share = $this->federatedShareProvider->getShareById($id);
|
|
||||||
|
|
||||||
if ($this->verifyShare($share, $token)) {
|
|
||||||
$this->federatedShareProvider->removeShareFromTable($share);
|
|
||||||
return new Http\DataResponse();
|
|
||||||
}
|
|
||||||
|
|
||||||
throw new OCSBadRequestException();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* get share
|
|
||||||
*
|
|
||||||
* @param int $id
|
|
||||||
* @param string $token
|
|
||||||
* @return array|bool
|
|
||||||
*/
|
|
||||||
protected function getShare($id, $token) {
|
|
||||||
$query = $this->connection->getQueryBuilder();
|
|
||||||
$query->select('*')->from($this->shareTable)
|
|
||||||
->where($query->expr()->eq('token', $query->createNamedParameter($token)))
|
|
||||||
->andWhere($query->expr()->eq('share_type', $query->createNamedParameter(FederatedShareProvider::SHARE_TYPE_REMOTE)))
|
|
||||||
->andWhere($query->expr()->eq('id', $query->createNamedParameter($id)));
|
|
||||||
|
|
||||||
$result = $query->execute()->fetchAll();
|
|
||||||
|
|
||||||
if (!empty($result) && isset($result[0])) {
|
|
||||||
return $result[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* get file
|
|
||||||
*
|
|
||||||
* @param string $user
|
|
||||||
* @param int $fileSource
|
|
||||||
* @return array with internal path of the file and a absolute link to it
|
|
||||||
*/
|
|
||||||
private function getFile($user, $fileSource) {
|
|
||||||
\OC_Util::setupFS($user);
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$file = \OC\Files\Filesystem::getPath($fileSource);
|
$provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
|
||||||
} catch (NotFoundException $e) {
|
$notification = ['sharedSecret' => $token];
|
||||||
$file = null;
|
$provider->notificationReceived('RESHARE_UNDO', $id, $notification);
|
||||||
|
return new Http\DataResponse();
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
throw new OCSBadRequestException();
|
||||||
}
|
}
|
||||||
$args = \OC\Files\Filesystem::is_dir($file) ? array('dir' => $file) : array('dir' => dirname($file), 'scrollto' => $file);
|
|
||||||
$link = \OCP\Util::linkToAbsolute('files', 'index.php', $args);
|
|
||||||
|
|
||||||
return array($file, $link);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -586,24 +388,6 @@ class RequestHandlerController extends OCSController {
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* check if we got the right share
|
|
||||||
*
|
|
||||||
* @param Share\IShare $share
|
|
||||||
* @param string $token
|
|
||||||
* @return bool
|
|
||||||
*/
|
|
||||||
protected function verifyShare(Share\IShare $share, $token) {
|
|
||||||
if (
|
|
||||||
$share->getShareType() === FederatedShareProvider::SHARE_TYPE_REMOTE &&
|
|
||||||
$share->getToken() === $token
|
|
||||||
) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @NoCSRFRequired
|
* @NoCSRFRequired
|
||||||
* @PublicPage
|
* @PublicPage
|
||||||
|
@ -616,19 +400,15 @@ class RequestHandlerController extends OCSController {
|
||||||
*/
|
*/
|
||||||
public function updatePermissions($id) {
|
public function updatePermissions($id) {
|
||||||
$token = $this->request->getParam('token', null);
|
$token = $this->request->getParam('token', null);
|
||||||
$permissions = $this->request->getParam('permissions', null);
|
$ncPermissions = $this->request->getParam('permissions', null);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$share = $this->federatedShareProvider->getShareById($id);
|
$provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
|
||||||
} catch (Share\Exceptions\ShareNotFound $e) {
|
$ocmPermissions = $this->ncPermissions2ocmPermissions((int)$ncPermissions);
|
||||||
throw new OCSBadRequestException();
|
$notification = ['sharedSecret' => $token, 'permission' => $ocmPermissions];
|
||||||
}
|
$provider->notificationReceived('RESHARE_CHANGE_PERMISSION', $id, $notification);
|
||||||
|
} catch (\Exception $e) {
|
||||||
$validPermission = ctype_digit($permissions);
|
$this->logger->debug($e->getMessage());
|
||||||
$validToken = $this->verifyShare($share, $token);
|
|
||||||
if ($validPermission && $validToken) {
|
|
||||||
$this->updatePermissionsInDatabase($share, (int)$permissions);
|
|
||||||
} else {
|
|
||||||
throw new OCSBadRequestException();
|
throw new OCSBadRequestException();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -636,17 +416,30 @@ class RequestHandlerController extends OCSController {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* update permissions in database
|
* translate Nextcloud permissions to OCM Permissions
|
||||||
*
|
*
|
||||||
* @param IShare $share
|
* @param $ncPermissions
|
||||||
* @param int $permissions
|
* @return array
|
||||||
*/
|
*/
|
||||||
protected function updatePermissionsInDatabase(IShare $share, $permissions) {
|
protected function ncPermissions2ocmPermissions($ncPermissions) {
|
||||||
$query = $this->connection->getQueryBuilder();
|
|
||||||
$query->update('share')
|
$ocmPermissions = [];
|
||||||
->where($query->expr()->eq('id', $query->createNamedParameter($share->getId())))
|
|
||||||
->set('permissions', $query->createNamedParameter($permissions))
|
if ($ncPermissions & Constants::PERMISSION_SHARE) {
|
||||||
->execute();
|
$ocmPermissions[] = 'share';
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($ncPermissions & Constants::PERMISSION_READ) {
|
||||||
|
$ocmPermissions[] = 'read';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (($ncPermissions & Constants::PERMISSION_CREATE) ||
|
||||||
|
($ncPermissions & Constants::PERMISSION_UPDATE)) {
|
||||||
|
$ocmPermissions[] = 'write';
|
||||||
|
}
|
||||||
|
|
||||||
|
return $ocmPermissions;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -303,7 +303,8 @@ class FederatedShareProvider implements IShareProvider {
|
||||||
$shareId,
|
$shareId,
|
||||||
$remote,
|
$remote,
|
||||||
$shareWith,
|
$shareWith,
|
||||||
$share->getPermissions()
|
$share->getPermissions(),
|
||||||
|
$share->getNode()->getName()
|
||||||
);
|
);
|
||||||
|
|
||||||
return [$token, $remoteId];
|
return [$token, $remoteId];
|
||||||
|
@ -505,36 +506,26 @@ class FederatedShareProvider implements IShareProvider {
|
||||||
* Delete a share (owner unShares the file)
|
* Delete a share (owner unShares the file)
|
||||||
*
|
*
|
||||||
* @param IShare $share
|
* @param IShare $share
|
||||||
|
* @throws ShareNotFound
|
||||||
|
* @throws \OC\HintException
|
||||||
*/
|
*/
|
||||||
public function delete(IShare $share) {
|
public function delete(IShare $share) {
|
||||||
|
|
||||||
list(, $remote) = $this->addressHandler->splitUserRemote($share->getSharedWith());
|
list(, $remote) = $this->addressHandler->splitUserRemote($share->getSharedWith());
|
||||||
|
|
||||||
$isOwner = false;
|
|
||||||
|
|
||||||
$this->removeShareFromTable($share);
|
|
||||||
|
|
||||||
// if the local user is the owner we can send the unShare request directly...
|
// if the local user is the owner we can send the unShare request directly...
|
||||||
if ($this->userManager->userExists($share->getShareOwner())) {
|
if ($this->userManager->userExists($share->getShareOwner())) {
|
||||||
$this->notifications->sendRemoteUnShare($remote, $share->getId(), $share->getToken());
|
$this->notifications->sendRemoteUnShare($remote, $share->getId(), $share->getToken());
|
||||||
$this->revokeShare($share, true);
|
$this->revokeShare($share, true);
|
||||||
$isOwner = true;
|
|
||||||
} else { // ... if not we need to correct ID for the unShare request
|
} else { // ... if not we need to correct ID for the unShare request
|
||||||
$remoteId = $this->getRemoteId($share);
|
$remoteId = $this->getRemoteId($share);
|
||||||
$this->notifications->sendRemoteUnShare($remote, $remoteId, $share->getToken());
|
$this->notifications->sendRemoteUnShare($remote, $remoteId, $share->getToken());
|
||||||
$this->revokeShare($share, false);
|
$this->revokeShare($share, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
// send revoke notification to the other user, if initiator and owner are not the same user
|
// only remove the share when all messages are send to not lose information
|
||||||
if ($share->getShareOwner() !== $share->getSharedBy()) {
|
// about the share to early
|
||||||
$remoteId = $this->getRemoteId($share);
|
$this->removeShareFromTable($share);
|
||||||
if ($isOwner) {
|
|
||||||
list(, $remote) = $this->addressHandler->splitUserRemote($share->getSharedBy());
|
|
||||||
} else {
|
|
||||||
list(, $remote) = $this->addressHandler->splitUserRemote($share->getShareOwner());
|
|
||||||
}
|
|
||||||
$this->notifications->sendRevokeShare($remote, $remoteId, $share->getToken());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -708,7 +699,7 @@ class FederatedShareProvider implements IShareProvider {
|
||||||
$cursor->closeCursor();
|
$cursor->closeCursor();
|
||||||
|
|
||||||
if ($data === false) {
|
if ($data === false) {
|
||||||
throw new ShareNotFound();
|
throw new ShareNotFound('Can not find share with ID: ' . $id);
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|
|
@ -27,6 +27,8 @@ namespace OCA\FederatedFileSharing;
|
||||||
|
|
||||||
use OCP\AppFramework\Http;
|
use OCP\AppFramework\Http;
|
||||||
use OCP\BackgroundJob\IJobList;
|
use OCP\BackgroundJob\IJobList;
|
||||||
|
use OCP\Federation\ICloudFederationFactory;
|
||||||
|
use OCP\Federation\ICloudFederationProviderManager;
|
||||||
use OCP\Http\Client\IClientService;
|
use OCP\Http\Client\IClientService;
|
||||||
use OCP\OCS\IDiscoveryService;
|
use OCP\OCS\IDiscoveryService;
|
||||||
|
|
||||||
|
@ -45,22 +47,34 @@ class Notifications {
|
||||||
/** @var IJobList */
|
/** @var IJobList */
|
||||||
private $jobList;
|
private $jobList;
|
||||||
|
|
||||||
|
/** @var ICloudFederationProviderManager */
|
||||||
|
private $federationProviderManager;
|
||||||
|
|
||||||
|
/** @var ICloudFederationFactory */
|
||||||
|
private $cloudFederationFactory;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param AddressHandler $addressHandler
|
* @param AddressHandler $addressHandler
|
||||||
* @param IClientService $httpClientService
|
* @param IClientService $httpClientService
|
||||||
* @param IDiscoveryService $discoveryService
|
* @param IDiscoveryService $discoveryService
|
||||||
* @param IJobList $jobList
|
* @param IJobList $jobList
|
||||||
|
* @param ICloudFederationProviderManager $federationProviderManager
|
||||||
|
* @param ICloudFederationFactory $cloudFederationFactory
|
||||||
*/
|
*/
|
||||||
public function __construct(
|
public function __construct(
|
||||||
AddressHandler $addressHandler,
|
AddressHandler $addressHandler,
|
||||||
IClientService $httpClientService,
|
IClientService $httpClientService,
|
||||||
IDiscoveryService $discoveryService,
|
IDiscoveryService $discoveryService,
|
||||||
IJobList $jobList
|
IJobList $jobList,
|
||||||
|
ICloudFederationProviderManager $federationProviderManager,
|
||||||
|
ICloudFederationFactory $cloudFederationFactory
|
||||||
) {
|
) {
|
||||||
$this->addressHandler = $addressHandler;
|
$this->addressHandler = $addressHandler;
|
||||||
$this->httpClientService = $httpClientService;
|
$this->httpClientService = $httpClientService;
|
||||||
$this->discoveryService = $discoveryService;
|
$this->discoveryService = $discoveryService;
|
||||||
$this->jobList = $jobList;
|
$this->jobList = $jobList;
|
||||||
|
$this->federationProviderManager = $federationProviderManager;
|
||||||
|
$this->cloudFederationFactory = $cloudFederationFactory;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -100,7 +114,10 @@ class Notifications {
|
||||||
$result = $this->tryHttpPostToShareEndpoint($remote, '', $fields);
|
$result = $this->tryHttpPostToShareEndpoint($remote, '', $fields);
|
||||||
$status = json_decode($result['result'], true);
|
$status = json_decode($result['result'], true);
|
||||||
|
|
||||||
if ($result['success'] && ($status['ocs']['meta']['statuscode'] === 100 || $status['ocs']['meta']['statuscode'] === 200)) {
|
$ocsStatus = isset($status['ocs']);
|
||||||
|
$ocsSuccess = $ocsStatus && ($status['ocs']['meta']['statuscode'] === 100 || $status['ocs']['meta']['statuscode'] === 200);
|
||||||
|
|
||||||
|
if ($result['success'] && (!$ocsStatus ||$ocsSuccess)) {
|
||||||
\OC_Hook::emit('OCP\Share', 'federated_share_added', ['server' => $remote]);
|
\OC_Hook::emit('OCP\Share', 'federated_share_added', ['server' => $remote]);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -119,20 +136,31 @@ class Notifications {
|
||||||
* @param string $remote remote address of the owner
|
* @param string $remote remote address of the owner
|
||||||
* @param string $shareWith
|
* @param string $shareWith
|
||||||
* @param int $permission
|
* @param int $permission
|
||||||
|
* @param string $filename
|
||||||
* @return bool
|
* @return bool
|
||||||
* @throws \OC\HintException
|
* @throws \OC\HintException
|
||||||
* @throws \OC\ServerNotAvailableException
|
* @throws \OC\ServerNotAvailableException
|
||||||
*/
|
*/
|
||||||
public function requestReShare($token, $id, $shareId, $remote, $shareWith, $permission) {
|
public function requestReShare($token, $id, $shareId, $remote, $shareWith, $permission, $filename) {
|
||||||
|
|
||||||
$fields = array(
|
$fields = array(
|
||||||
'shareWith' => $shareWith,
|
'shareWith' => $shareWith,
|
||||||
'token' => $token,
|
'token' => $token,
|
||||||
'permission' => $permission,
|
'permission' => $permission,
|
||||||
'remoteId' => $shareId
|
'remoteId' => $shareId,
|
||||||
);
|
);
|
||||||
|
|
||||||
$result = $this->tryHttpPostToShareEndpoint(rtrim($remote, '/'), '/' . $id . '/reshare', $fields);
|
$ocmFields = $fields;
|
||||||
|
$ocmFields['remoteId'] = $id;
|
||||||
|
$ocmFields['localId'] = $shareId;
|
||||||
|
$ocmFields['name'] = $filename;
|
||||||
|
|
||||||
|
$ocmResult = $this->tryOCMEndPoint($remote, $ocmFields, 'reshare');
|
||||||
|
if (is_array($ocmResult) && isset($ocmResult['token']) && isset($ocmResult['providerId'])) {
|
||||||
|
return [$ocmResult['token'], $ocmResult['providerId']];
|
||||||
|
}
|
||||||
|
|
||||||
|
$result = $this->tryLegacyEndPoint(rtrim($remote, '/'), '/' . $id . '/reshare', $fields);
|
||||||
$status = json_decode($result['result'], true);
|
$status = json_decode($result['result'], true);
|
||||||
|
|
||||||
$httpRequestSuccessful = $result['success'];
|
$httpRequestSuccessful = $result['success'];
|
||||||
|
@ -171,7 +199,7 @@ class Notifications {
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public function sendRevokeShare($remote, $id, $token) {
|
public function sendRevokeShare($remote, $id, $token) {
|
||||||
$this->sendUpdateToRemote($remote, $id, $token, 'revoke');
|
$this->sendUpdateToRemote($remote, $id, $token, 'reshare_undo');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -222,12 +250,15 @@ class Notifications {
|
||||||
*/
|
*/
|
||||||
public function sendUpdateToRemote($remote, $remoteId, $token, $action, $data = [], $try = 0) {
|
public function sendUpdateToRemote($remote, $remoteId, $token, $action, $data = [], $try = 0) {
|
||||||
|
|
||||||
$fields = array('token' => $token);
|
$fields = [
|
||||||
|
'token' => $token,
|
||||||
|
'remoteId' => $remoteId
|
||||||
|
];
|
||||||
foreach ($data as $key => $value) {
|
foreach ($data as $key => $value) {
|
||||||
$fields[$key] = $value;
|
$fields[$key] = $value;
|
||||||
}
|
}
|
||||||
|
|
||||||
$result = $this->tryHttpPostToShareEndpoint(rtrim($remote, '/'), '/' . $remoteId . '/' . $action, $fields);
|
$result = $this->tryHttpPostToShareEndpoint(rtrim($remote, '/'), '/' . $remoteId . '/' . $action, $fields, $action);
|
||||||
$status = json_decode($result['result'], true);
|
$status = json_decode($result['result'], true);
|
||||||
|
|
||||||
if ($result['success'] &&
|
if ($result['success'] &&
|
||||||
|
@ -271,11 +302,11 @@ class Notifications {
|
||||||
* @param string $remoteDomain
|
* @param string $remoteDomain
|
||||||
* @param string $urlSuffix
|
* @param string $urlSuffix
|
||||||
* @param array $fields post parameters
|
* @param array $fields post parameters
|
||||||
|
* @param string $action define the action (possible values: share, reshare, accept, decline, unshare, revoke, permissions)
|
||||||
* @return array
|
* @return array
|
||||||
* @throws \Exception
|
* @throws \Exception
|
||||||
*/
|
*/
|
||||||
protected function tryHttpPostToShareEndpoint($remoteDomain, $urlSuffix, array $fields) {
|
protected function tryHttpPostToShareEndpoint($remoteDomain, $urlSuffix, array $fields, $action="share") {
|
||||||
$client = $this->httpClientService->newClient();
|
|
||||||
|
|
||||||
if ($this->addressHandler->urlContainProtocol($remoteDomain) === false) {
|
if ($this->addressHandler->urlContainProtocol($remoteDomain) === false) {
|
||||||
$remoteDomain = 'https://' . $remoteDomain;
|
$remoteDomain = 'https://' . $remoteDomain;
|
||||||
|
@ -286,6 +317,36 @@ class Notifications {
|
||||||
'result' => '',
|
'result' => '',
|
||||||
];
|
];
|
||||||
|
|
||||||
|
// if possible we use the new OCM API
|
||||||
|
$ocmResult = $this->tryOCMEndPoint($remoteDomain, $fields, $action);
|
||||||
|
if (is_array($ocmResult)) {
|
||||||
|
$result['success'] = true;
|
||||||
|
$result['result'] = json_encode([
|
||||||
|
'ocs' => ['meta' => ['statuscode' => 200]]]);
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->tryLegacyEndPoint($remoteDomain, $urlSuffix, $fields);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* try old federated sharing API if the OCM api doesn't work
|
||||||
|
*
|
||||||
|
* @param $remoteDomain
|
||||||
|
* @param $urlSuffix
|
||||||
|
* @param array $fields
|
||||||
|
* @return mixed
|
||||||
|
* @throws \Exception
|
||||||
|
*/
|
||||||
|
protected function tryLegacyEndPoint($remoteDomain, $urlSuffix, array $fields) {
|
||||||
|
|
||||||
|
$result = [
|
||||||
|
'success' => false,
|
||||||
|
'result' => '',
|
||||||
|
];
|
||||||
|
|
||||||
|
// Fall back to old API
|
||||||
|
$client = $this->httpClientService->newClient();
|
||||||
$federationEndpoints = $this->discoveryService->discover($remoteDomain, 'FEDERATED_SHARING');
|
$federationEndpoints = $this->discoveryService->discover($remoteDomain, 'FEDERATED_SHARING');
|
||||||
$endpoint = isset($federationEndpoints['share']) ? $federationEndpoints['share'] : '/ocs/v2.php/cloud/shares';
|
$endpoint = isset($federationEndpoints['share']) ? $federationEndpoints['share'] : '/ocs/v2.php/cloud/shares';
|
||||||
try {
|
try {
|
||||||
|
@ -306,5 +367,76 @@ class Notifications {
|
||||||
}
|
}
|
||||||
|
|
||||||
return $result;
|
return $result;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* send action regarding federated sharing to the remote server using the OCM API
|
||||||
|
*
|
||||||
|
* @param $remoteDomain
|
||||||
|
* @param $fields
|
||||||
|
* @param $action
|
||||||
|
*
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
protected function tryOCMEndPoint($remoteDomain, $fields, $action) {
|
||||||
|
switch ($action) {
|
||||||
|
case 'share':
|
||||||
|
$share = $this->cloudFederationFactory->getCloudFederationShare(
|
||||||
|
$fields['shareWith'] . '@' . $remoteDomain,
|
||||||
|
$fields['name'],
|
||||||
|
'',
|
||||||
|
$fields['remoteId'],
|
||||||
|
$fields['ownerFederatedId'],
|
||||||
|
$fields['owner'],
|
||||||
|
$fields['sharedByFederatedId'],
|
||||||
|
$fields['sharedBy'],
|
||||||
|
$fields['token'],
|
||||||
|
'user',
|
||||||
|
'file'
|
||||||
|
);
|
||||||
|
return $this->federationProviderManager->sendShare($share);
|
||||||
|
case 'reshare':
|
||||||
|
// ask owner to reshare a file
|
||||||
|
$notification = $this->cloudFederationFactory->getCloudFederationNotification();
|
||||||
|
$notification->setMessage('REQUEST_RESHARE',
|
||||||
|
'file',
|
||||||
|
$fields['remoteId'],
|
||||||
|
[
|
||||||
|
'sharedSecret' => $fields['token'],
|
||||||
|
'shareWith' => $fields['shareWith'],
|
||||||
|
'senderId' => $fields['localId'],
|
||||||
|
'message' => 'Ask owner to reshare the file'
|
||||||
|
]
|
||||||
|
);
|
||||||
|
return $this->federationProviderManager->sendNotification($remoteDomain, $notification);
|
||||||
|
case 'unshare':
|
||||||
|
//owner unshares the file from the recipient again
|
||||||
|
$notification = $this->cloudFederationFactory->getCloudFederationNotification();
|
||||||
|
$notification->setMessage('SHARE_UNSHARED',
|
||||||
|
'file',
|
||||||
|
$fields['remoteId'],
|
||||||
|
[
|
||||||
|
'sharedSecret' => $fields['token'],
|
||||||
|
'messgage' => 'file is no longer shared with you'
|
||||||
|
]
|
||||||
|
);
|
||||||
|
return $this->federationProviderManager->sendNotification($remoteDomain, $notification);
|
||||||
|
case 'reshare_undo':
|
||||||
|
// if a reshare was unshared we send the information to the initiator/owner
|
||||||
|
$notification = $this->cloudFederationFactory->getCloudFederationNotification();
|
||||||
|
$notification->setMessage('RESHARE_UNDO',
|
||||||
|
'file',
|
||||||
|
$fields['remoteId'],
|
||||||
|
[
|
||||||
|
'sharedSecret' => $fields['token'],
|
||||||
|
'message' => 'reshare was revoked'
|
||||||
|
]
|
||||||
|
);
|
||||||
|
return $this->federationProviderManager->sendNotification($remoteDomain, $notification);
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,776 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OCA\FederatedFileSharing\OCM;
|
||||||
|
|
||||||
|
use OC\AppFramework\Http;
|
||||||
|
use OC\Files\Filesystem;
|
||||||
|
use OCA\Files_Sharing\Activity\Providers\RemoteShares;
|
||||||
|
use OCA\FederatedFileSharing\AddressHandler;
|
||||||
|
use OCA\FederatedFileSharing\FederatedShareProvider;
|
||||||
|
use OCP\Activity\IManager as IActivityManager;
|
||||||
|
use OCP\App\IAppManager;
|
||||||
|
use OCP\Constants;
|
||||||
|
use OCP\Federation\Exceptions\ActionNotSupportedException;
|
||||||
|
use OCP\Federation\Exceptions\AuthenticationFailedException;
|
||||||
|
use OCP\Federation\Exceptions\BadRequestException;
|
||||||
|
use OCP\Federation\Exceptions\ProviderCouldNotAddShareException;
|
||||||
|
use OCP\Federation\ICloudFederationFactory;
|
||||||
|
use OCP\Federation\ICloudFederationProvider;
|
||||||
|
use OCP\Federation\ICloudFederationProviderManager;
|
||||||
|
use OCP\Federation\ICloudFederationShare;
|
||||||
|
use OCP\Federation\ICloudIdManager;
|
||||||
|
use OCP\Files\NotFoundException;
|
||||||
|
use OCP\IDBConnection;
|
||||||
|
use OCP\ILogger;
|
||||||
|
use OCP\IURLGenerator;
|
||||||
|
use OCP\IUserManager;
|
||||||
|
use OCP\Notification\IManager as INotificationManager;
|
||||||
|
use OCP\Share\Exceptions\ShareNotFound;
|
||||||
|
use OCP\Share\IShare;
|
||||||
|
use OCP\Util;
|
||||||
|
|
||||||
|
class CloudFederationProviderFiles implements ICloudFederationProvider {
|
||||||
|
|
||||||
|
/** @var IAppManager */
|
||||||
|
private $appManager;
|
||||||
|
|
||||||
|
/** @var FederatedShareProvider */
|
||||||
|
private $federatedShareProvider;
|
||||||
|
|
||||||
|
/** @var AddressHandler */
|
||||||
|
private $addressHandler;
|
||||||
|
|
||||||
|
/** @var ILogger */
|
||||||
|
private $logger;
|
||||||
|
|
||||||
|
/** @var IUserManager */
|
||||||
|
private $userManager;
|
||||||
|
|
||||||
|
/** @var ICloudIdManager */
|
||||||
|
private $cloudIdManager;
|
||||||
|
|
||||||
|
/** @var IActivityManager */
|
||||||
|
private $activityManager;
|
||||||
|
|
||||||
|
/** @var INotificationManager */
|
||||||
|
private $notificationManager;
|
||||||
|
|
||||||
|
/** @var IURLGenerator */
|
||||||
|
private $urlGenerator;
|
||||||
|
|
||||||
|
/** @var ICloudFederationFactory */
|
||||||
|
private $cloudFederationFactory;
|
||||||
|
|
||||||
|
/** @var ICloudFederationProviderManager */
|
||||||
|
private $cloudFederationProviderManager;
|
||||||
|
|
||||||
|
/** @var IDBConnection */
|
||||||
|
private $connection;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* CloudFederationProvider constructor.
|
||||||
|
*
|
||||||
|
* @param IAppManager $appManager
|
||||||
|
* @param FederatedShareProvider $federatedShareProvider
|
||||||
|
* @param AddressHandler $addressHandler
|
||||||
|
* @param ILogger $logger
|
||||||
|
* @param IUserManager $userManager
|
||||||
|
* @param ICloudIdManager $cloudIdManager
|
||||||
|
* @param IActivityManager $activityManager
|
||||||
|
* @param INotificationManager $notificationManager
|
||||||
|
* @param IURLGenerator $urlGenerator
|
||||||
|
* @param ICloudFederationFactory $cloudFederationFactory
|
||||||
|
* @param ICloudFederationProviderManager $cloudFederationProviderManager
|
||||||
|
* @param IDBConnection $connection
|
||||||
|
*/
|
||||||
|
public function __construct(IAppManager $appManager,
|
||||||
|
FederatedShareProvider $federatedShareProvider,
|
||||||
|
AddressHandler $addressHandler,
|
||||||
|
ILogger $logger,
|
||||||
|
IUserManager $userManager,
|
||||||
|
ICloudIdManager $cloudIdManager,
|
||||||
|
IActivityManager $activityManager,
|
||||||
|
INotificationManager $notificationManager,
|
||||||
|
IURLGenerator $urlGenerator,
|
||||||
|
ICloudFederationFactory $cloudFederationFactory,
|
||||||
|
ICloudFederationProviderManager $cloudFederationProviderManager,
|
||||||
|
IDBConnection $connection
|
||||||
|
) {
|
||||||
|
$this->appManager = $appManager;
|
||||||
|
$this->federatedShareProvider = $federatedShareProvider;
|
||||||
|
$this->addressHandler = $addressHandler;
|
||||||
|
$this->logger = $logger;
|
||||||
|
$this->userManager = $userManager;
|
||||||
|
$this->cloudIdManager = $cloudIdManager;
|
||||||
|
$this->activityManager = $activityManager;
|
||||||
|
$this->notificationManager = $notificationManager;
|
||||||
|
$this->urlGenerator = $urlGenerator;
|
||||||
|
$this->cloudFederationFactory = $cloudFederationFactory;
|
||||||
|
$this->cloudFederationProviderManager = $cloudFederationProviderManager;
|
||||||
|
$this->connection = $connection;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
public function getShareType() {
|
||||||
|
return 'file';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* share received from another server
|
||||||
|
*
|
||||||
|
* @param ICloudFederationShare $share
|
||||||
|
* @return string provider specific unique ID of the share
|
||||||
|
*
|
||||||
|
* @throws ProviderCouldNotAddShareException
|
||||||
|
* @throws \OCP\AppFramework\QueryException
|
||||||
|
* @throws \OC\HintException
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function shareReceived(ICloudFederationShare $share) {
|
||||||
|
|
||||||
|
if (!$this->isS2SEnabled(true)) {
|
||||||
|
throw new ProviderCouldNotAddShareException('Server does not support federated cloud sharing', '', Http::STATUS_SERVICE_UNAVAILABLE);
|
||||||
|
}
|
||||||
|
|
||||||
|
$protocol = $share->getProtocol();
|
||||||
|
if ($protocol['name'] !== 'webdav') {
|
||||||
|
throw new ProviderCouldNotAddShareException('Unsupported protocol for data exchange.', '', Http::STATUS_NOT_IMPLEMENTED);
|
||||||
|
}
|
||||||
|
|
||||||
|
list($ownerUid, $remote) = $this->addressHandler->splitUserRemote($share->getOwner());
|
||||||
|
// for backward compatibility make sure that the remote url stored in the
|
||||||
|
// database ends with a trailing slash
|
||||||
|
if (substr($remote, -1) !== '/') {
|
||||||
|
$remote = $remote . '/';
|
||||||
|
}
|
||||||
|
|
||||||
|
$token = $share->getShareSecret();
|
||||||
|
$name = $share->getResourceName();
|
||||||
|
$owner = $share->getOwnerDisplayName();
|
||||||
|
$sharedBy = $share->getSharedByDisplayName();
|
||||||
|
$shareWith = $share->getShareWith();
|
||||||
|
$remoteId = $share->getProviderId();
|
||||||
|
$sharedByFederatedId = $share->getSharedBy();
|
||||||
|
$ownerFederatedId = $share->getOwner();
|
||||||
|
|
||||||
|
// if no explicit information about the person who created the share was send
|
||||||
|
// we assume that the share comes from the owner
|
||||||
|
if ($sharedByFederatedId === null) {
|
||||||
|
$sharedBy = $owner;
|
||||||
|
$sharedByFederatedId = $ownerFederatedId;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($remote && $token && $name && $owner && $remoteId && $shareWith) {
|
||||||
|
|
||||||
|
if (!Util::isValidFileName($name)) {
|
||||||
|
throw new ProviderCouldNotAddShareException('The mountpoint name contains invalid characters.', '', Http::STATUS_BAD_REQUEST);
|
||||||
|
}
|
||||||
|
|
||||||
|
// FIXME this should be a method in the user management instead
|
||||||
|
$this->logger->debug('shareWith before, ' . $shareWith, ['app' => 'files_sharing']);
|
||||||
|
Util::emitHook(
|
||||||
|
'\OCA\Files_Sharing\API\Server2Server',
|
||||||
|
'preLoginNameUsedAsUserName',
|
||||||
|
array('uid' => &$shareWith)
|
||||||
|
);
|
||||||
|
$this->logger->debug('shareWith after, ' . $shareWith, ['app' => 'files_sharing']);
|
||||||
|
|
||||||
|
if (!$this->userManager->userExists($shareWith)) {
|
||||||
|
throw new ProviderCouldNotAddShareException('User does not exists', '',Http::STATUS_BAD_REQUEST);
|
||||||
|
}
|
||||||
|
|
||||||
|
\OC_Util::setupFS($shareWith);
|
||||||
|
|
||||||
|
$externalManager = new \OCA\Files_Sharing\External\Manager(
|
||||||
|
\OC::$server->getDatabaseConnection(),
|
||||||
|
Filesystem::getMountManager(),
|
||||||
|
Filesystem::getLoader(),
|
||||||
|
\OC::$server->getHTTPClientService(),
|
||||||
|
\OC::$server->getNotificationManager(),
|
||||||
|
\OC::$server->query(\OCP\OCS\IDiscoveryService::class),
|
||||||
|
\OC::$server->getCloudFederationProviderManager(),
|
||||||
|
\OC::$server->getCloudFederationFactory(),
|
||||||
|
$shareWith
|
||||||
|
);
|
||||||
|
|
||||||
|
try {
|
||||||
|
$externalManager->addShare($remote, $token, '', $name, $owner, false, $shareWith, $remoteId);
|
||||||
|
$shareId = \OC::$server->getDatabaseConnection()->lastInsertId('*PREFIX*share_external');
|
||||||
|
|
||||||
|
$event = $this->activityManager->generateEvent();
|
||||||
|
$event->setApp('files_sharing')
|
||||||
|
->setType('remote_share')
|
||||||
|
->setSubject(RemoteShares::SUBJECT_REMOTE_SHARE_RECEIVED, [$ownerFederatedId, trim($name, '/')])
|
||||||
|
->setAffectedUser($shareWith)
|
||||||
|
->setObject('remote_share', (int)$shareId, $name);
|
||||||
|
\OC::$server->getActivityManager()->publish($event);
|
||||||
|
|
||||||
|
$notification = $this->notificationManager->createNotification();
|
||||||
|
$notification->setApp('files_sharing')
|
||||||
|
->setUser($shareWith)
|
||||||
|
->setDateTime(new \DateTime())
|
||||||
|
->setObject('remote_share', $shareId)
|
||||||
|
->setSubject('remote_share', [$ownerFederatedId, $sharedByFederatedId, trim($name, '/')]);
|
||||||
|
|
||||||
|
$declineAction = $notification->createAction();
|
||||||
|
$declineAction->setLabel('decline')
|
||||||
|
->setLink($this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkTo('', 'ocs/v2.php/apps/files_sharing/api/v1/remote_shares/pending/' . $shareId)), 'DELETE');
|
||||||
|
$notification->addAction($declineAction);
|
||||||
|
|
||||||
|
$acceptAction = $notification->createAction();
|
||||||
|
$acceptAction->setLabel('accept')
|
||||||
|
->setLink($this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkTo('', 'ocs/v2.php/apps/files_sharing/api/v1/remote_shares/pending/' . $shareId)), 'POST');
|
||||||
|
$notification->addAction($acceptAction);
|
||||||
|
|
||||||
|
$this->notificationManager->notify($notification);
|
||||||
|
|
||||||
|
return $shareId;
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
$this->logger->logException($e, [
|
||||||
|
'message' => 'Server can not add remote share.',
|
||||||
|
'level' => ILogger::ERROR,
|
||||||
|
'app' => 'files_sharing'
|
||||||
|
]);
|
||||||
|
throw new ProviderCouldNotAddShareException('internal server error, was not able to add share from ' . $remote, '', HTTP::STATUS_INTERNAL_SERVER_ERROR);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new ProviderCouldNotAddShareException('server can not add remote share, missing parameter', '', HTTP::STATUS_BAD_REQUEST);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* notification received from another server
|
||||||
|
*
|
||||||
|
* @param string $notificationType (e.g. SHARE_ACCEPTED)
|
||||||
|
* @param string $providerId id of the share
|
||||||
|
* @param array $notification payload of the notification
|
||||||
|
* @return array data send back to the sender
|
||||||
|
*
|
||||||
|
* @throws ActionNotSupportedException
|
||||||
|
* @throws AuthenticationFailedException
|
||||||
|
* @throws BadRequestException
|
||||||
|
* @throws \OC\HintException
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function notificationReceived($notificationType, $providerId, array $notification) {
|
||||||
|
|
||||||
|
switch ($notificationType) {
|
||||||
|
case 'SHARE_ACCEPTED':
|
||||||
|
return $this->shareAccepted($providerId, $notification);
|
||||||
|
case 'SHARE_DECLINED':
|
||||||
|
return $this->shareDeclined($providerId, $notification);
|
||||||
|
case 'SHARE_UNSHARED':
|
||||||
|
return $this->unshare($providerId, $notification);
|
||||||
|
case 'REQUEST_RESHARE':
|
||||||
|
return $this->reshareRequested($providerId, $notification);
|
||||||
|
case 'RESHARE_UNDO':
|
||||||
|
return $this->undoReshare($providerId, $notification);
|
||||||
|
case 'RESHARE_CHANGE_PERMISSION':
|
||||||
|
return $this->updateResharePermissions($providerId, $notification);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
throw new BadRequestException([$notificationType]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* process notification that the recipient accepted a share
|
||||||
|
*
|
||||||
|
* @param string $id
|
||||||
|
* @param array $notification
|
||||||
|
* @return array
|
||||||
|
* @throws ActionNotSupportedException
|
||||||
|
* @throws AuthenticationFailedException
|
||||||
|
* @throws BadRequestException
|
||||||
|
* @throws \OC\HintException
|
||||||
|
*/
|
||||||
|
private function shareAccepted($id, array $notification) {
|
||||||
|
|
||||||
|
if (!$this->isS2SEnabled()) {
|
||||||
|
throw new ActionNotSupportedException('Server does not support federated cloud sharing');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!isset($notification['sharedSecret'])) {
|
||||||
|
throw new BadRequestException(['sharedSecret']);
|
||||||
|
}
|
||||||
|
|
||||||
|
$token = $notification['sharedSecret'];
|
||||||
|
|
||||||
|
$share = $this->federatedShareProvider->getShareById($id);
|
||||||
|
|
||||||
|
$this->verifyShare($share, $token);
|
||||||
|
$this->executeAcceptShare($share);
|
||||||
|
if ($share->getShareOwner() !== $share->getSharedBy()) {
|
||||||
|
list(, $remote) = $this->addressHandler->splitUserRemote($share->getSharedBy());
|
||||||
|
$remoteId = $this->federatedShareProvider->getRemoteId($share);
|
||||||
|
$notification = $this->cloudFederationFactory->getCloudFederationNotification();
|
||||||
|
$notification->setMessage(
|
||||||
|
'SHARE_ACCEPTED',
|
||||||
|
'file',
|
||||||
|
$remoteId,
|
||||||
|
[
|
||||||
|
'sharedSecret' => $token,
|
||||||
|
'message' => 'Recipient accepted the re-share'
|
||||||
|
]
|
||||||
|
|
||||||
|
);
|
||||||
|
$this->cloudFederationProviderManager->sendNotification($remote, $notification);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param IShare $share
|
||||||
|
* @throws ShareNotFound
|
||||||
|
*/
|
||||||
|
protected function executeAcceptShare(IShare $share) {
|
||||||
|
try {
|
||||||
|
$fileId = (int)$share->getNode()->getId();
|
||||||
|
list($file, $link) = $this->getFile($this->getCorrectUid($share), $fileId);
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
throw new ShareNotFound();
|
||||||
|
}
|
||||||
|
|
||||||
|
$event = $this->activityManager->generateEvent();
|
||||||
|
$event->setApp('files_sharing')
|
||||||
|
->setType('remote_share')
|
||||||
|
->setAffectedUser($this->getCorrectUid($share))
|
||||||
|
->setSubject(RemoteShares::SUBJECT_REMOTE_SHARE_ACCEPTED, [$share->getSharedWith(), [$fileId => $file]])
|
||||||
|
->setObject('files', $fileId, $file)
|
||||||
|
->setLink($link);
|
||||||
|
$this->activityManager->publish($event);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* process notification that the recipient declined a share
|
||||||
|
*
|
||||||
|
* @param string $id
|
||||||
|
* @param array $notification
|
||||||
|
* @return array
|
||||||
|
* @throws ActionNotSupportedException
|
||||||
|
* @throws AuthenticationFailedException
|
||||||
|
* @throws BadRequestException
|
||||||
|
* @throws ShareNotFound
|
||||||
|
* @throws \OC\HintException
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
protected function shareDeclined($id, array $notification) {
|
||||||
|
|
||||||
|
if (!$this->isS2SEnabled()) {
|
||||||
|
throw new ActionNotSupportedException('Server does not support federated cloud sharing');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!isset($notification['sharedSecret'])) {
|
||||||
|
throw new BadRequestException(['sharedSecret']);
|
||||||
|
}
|
||||||
|
|
||||||
|
$token = $notification['sharedSecret'];
|
||||||
|
|
||||||
|
$share = $this->federatedShareProvider->getShareById($id);
|
||||||
|
|
||||||
|
$this->verifyShare($share, $token);
|
||||||
|
|
||||||
|
if ($share->getShareOwner() !== $share->getSharedBy()) {
|
||||||
|
list(, $remote) = $this->addressHandler->splitUserRemote($share->getSharedBy());
|
||||||
|
$remoteId = $this->federatedShareProvider->getRemoteId($share);
|
||||||
|
$notification = $this->cloudFederationFactory->getCloudFederationNotification();
|
||||||
|
$notification->setMessage(
|
||||||
|
'SHARE_DECLINED',
|
||||||
|
'file',
|
||||||
|
$remoteId,
|
||||||
|
[
|
||||||
|
'sharedSecret' => $token,
|
||||||
|
'message' => 'Recipient declined the re-share'
|
||||||
|
]
|
||||||
|
|
||||||
|
);
|
||||||
|
$this->cloudFederationProviderManager->sendNotification($remote, $notification);
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->executeDeclineShare($share);
|
||||||
|
|
||||||
|
return [];
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* delete declined share and create a activity
|
||||||
|
*
|
||||||
|
* @param IShare $share
|
||||||
|
* @throws ShareNotFound
|
||||||
|
*/
|
||||||
|
protected function executeDeclineShare(IShare $share) {
|
||||||
|
$this->federatedShareProvider->removeShareFromTable($share);
|
||||||
|
|
||||||
|
try {
|
||||||
|
$fileId = (int)$share->getNode()->getId();
|
||||||
|
list($file, $link) = $this->getFile($this->getCorrectUid($share), $fileId);
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
throw new ShareNotFound();
|
||||||
|
}
|
||||||
|
|
||||||
|
$event = $this->activityManager->generateEvent();
|
||||||
|
$event->setApp('files_sharing')
|
||||||
|
->setType('remote_share')
|
||||||
|
->setAffectedUser($this->getCorrectUid($share))
|
||||||
|
->setSubject(RemoteShares::SUBJECT_REMOTE_SHARE_DECLINED, [$share->getSharedWith(), [$fileId => $file]])
|
||||||
|
->setObject('files', $fileId, $file)
|
||||||
|
->setLink($link);
|
||||||
|
$this->activityManager->publish($event);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* received the notification that the owner unshared a file from you
|
||||||
|
*
|
||||||
|
* @param string $id
|
||||||
|
* @param array $notification
|
||||||
|
* @return array
|
||||||
|
* @throws AuthenticationFailedException
|
||||||
|
* @throws BadRequestException
|
||||||
|
*/
|
||||||
|
private function undoReshare($id, array $notification) {
|
||||||
|
if (!isset($notification['sharedSecret'])) {
|
||||||
|
throw new BadRequestException(['sharedSecret']);
|
||||||
|
}
|
||||||
|
$token = $notification['sharedSecret'];
|
||||||
|
|
||||||
|
$share = $this->federatedShareProvider->getShareById($id);
|
||||||
|
|
||||||
|
$this->verifyShare($share, $token);
|
||||||
|
$this->federatedShareProvider->removeShareFromTable($share);
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* unshare file from self
|
||||||
|
*
|
||||||
|
* @param string $id
|
||||||
|
* @param array $notification
|
||||||
|
* @return array
|
||||||
|
* @throws ActionNotSupportedException
|
||||||
|
* @throws BadRequestException
|
||||||
|
*/
|
||||||
|
private function unshare($id, array $notification) {
|
||||||
|
|
||||||
|
if (!$this->isS2SEnabled(true)) {
|
||||||
|
throw new ActionNotSupportedException("incoming shares disabled!");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!isset($notification['sharedSecret'])) {
|
||||||
|
throw new BadRequestException(['sharedSecret']);
|
||||||
|
}
|
||||||
|
$token = $notification['sharedSecret'];
|
||||||
|
|
||||||
|
$qb = $this->connection->getQueryBuilder();
|
||||||
|
$qb->select('*')
|
||||||
|
->from('share_external')
|
||||||
|
->where(
|
||||||
|
$qb->expr()->andX(
|
||||||
|
$qb->expr()->eq('remote_id', $qb->createNamedParameter($id)),
|
||||||
|
$qb->expr()->eq('share_token', $qb->createNamedParameter($token))
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
$result = $qb->execute();
|
||||||
|
$share = $result->fetch();
|
||||||
|
$result->closeCursor();
|
||||||
|
|
||||||
|
if ($token && $id && !empty($share)) {
|
||||||
|
|
||||||
|
$remote = $this->cleanupRemote($share['remote']);
|
||||||
|
|
||||||
|
$owner = $this->cloudIdManager->getCloudId($share['owner'], $remote);
|
||||||
|
$mountpoint = $share['mountpoint'];
|
||||||
|
$user = $share['user'];
|
||||||
|
|
||||||
|
$qb = $this->connection->getQueryBuilder();
|
||||||
|
$qb->delete('share_external')
|
||||||
|
->where(
|
||||||
|
$qb->expr()->andX(
|
||||||
|
$qb->expr()->eq('remote_id', $qb->createNamedParameter($id)),
|
||||||
|
$qb->expr()->eq('share_token', $qb->createNamedParameter($token))
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
$qb->execute();
|
||||||
|
|
||||||
|
if ($share['accepted']) {
|
||||||
|
$path = trim($mountpoint, '/');
|
||||||
|
} else {
|
||||||
|
$path = trim($share['name'], '/');
|
||||||
|
}
|
||||||
|
|
||||||
|
$notification = $this->notificationManager->createNotification();
|
||||||
|
$notification->setApp('files_sharing')
|
||||||
|
->setUser($share['user'])
|
||||||
|
->setObject('remote_share', (int)$share['id']);
|
||||||
|
$this->notificationManager->markProcessed($notification);
|
||||||
|
|
||||||
|
$event = $this->activityManager->generateEvent();
|
||||||
|
$event->setApp('files_sharing')
|
||||||
|
->setType('remote_share')
|
||||||
|
->setSubject(RemoteShares::SUBJECT_REMOTE_SHARE_UNSHARED, [$owner->getId(), $path])
|
||||||
|
->setAffectedUser($user)
|
||||||
|
->setObject('remote_share', (int)$share['id'], $path);
|
||||||
|
\OC::$server->getActivityManager()->publish($event);
|
||||||
|
}
|
||||||
|
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
private function cleanupRemote($remote) {
|
||||||
|
$remote = substr($remote, strpos($remote, '://') + 3);
|
||||||
|
|
||||||
|
return rtrim($remote, '/');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* recipient of a share request to re-share the file with another user
|
||||||
|
*
|
||||||
|
* @param string $id
|
||||||
|
* @param array $notification
|
||||||
|
* @return array
|
||||||
|
* @throws AuthenticationFailedException
|
||||||
|
* @throws BadRequestException
|
||||||
|
* @throws ProviderCouldNotAddShareException
|
||||||
|
* @throws ShareNotFound
|
||||||
|
*/
|
||||||
|
protected function reshareRequested($id, array $notification) {
|
||||||
|
|
||||||
|
if (!isset($notification['sharedSecret'])) {
|
||||||
|
throw new BadRequestException(['sharedSecret']);
|
||||||
|
}
|
||||||
|
$token = $notification['sharedSecret'];
|
||||||
|
|
||||||
|
if (!isset($notification['shareWith'])) {
|
||||||
|
throw new BadRequestException(['shareWith']);
|
||||||
|
}
|
||||||
|
$shareWith = $notification['shareWith'];
|
||||||
|
|
||||||
|
if (!isset($notification['senderId'])) {
|
||||||
|
throw new BadRequestException(['senderId']);
|
||||||
|
}
|
||||||
|
$senderId = $notification['senderId'];
|
||||||
|
|
||||||
|
$share = $this->federatedShareProvider->getShareById($id);
|
||||||
|
// don't allow to share a file back to the owner
|
||||||
|
try {
|
||||||
|
list($user, $remote) = $this->addressHandler->splitUserRemote($shareWith);
|
||||||
|
$owner = $share->getShareOwner();
|
||||||
|
$currentServer = $this->addressHandler->generateRemoteURL();
|
||||||
|
if ($this->addressHandler->compareAddresses($user, $remote, $owner, $currentServer)) {
|
||||||
|
throw new ProviderCouldNotAddShareException('Resharing back to the owner is not allowed: ' . $id);
|
||||||
|
}
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
throw new ProviderCouldNotAddShareException($e->getMessage());
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->verifyShare($share, $token);
|
||||||
|
|
||||||
|
// check if re-sharing is allowed
|
||||||
|
if ($share->getPermissions() & Constants::PERMISSION_SHARE) {
|
||||||
|
// the recipient of the initial share is now the initiator for the re-share
|
||||||
|
$share->setSharedBy($share->getSharedWith());
|
||||||
|
$share->setSharedWith($shareWith);
|
||||||
|
$result = $this->federatedShareProvider->create($share);
|
||||||
|
$this->federatedShareProvider->storeRemoteId((int)$result->getId(), $senderId);
|
||||||
|
return ['token' => $result->getToken(), 'providerId' => $result->getId()];
|
||||||
|
} else {
|
||||||
|
throw new ProviderCouldNotAddShareException('resharing not allowed for share: ' . $id);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* update permission of a re-share so that the share dialog shows the right
|
||||||
|
* permission if the owner or the sender changes the permission
|
||||||
|
*
|
||||||
|
* @param string $id
|
||||||
|
* @param array $notification
|
||||||
|
* @return array
|
||||||
|
* @throws AuthenticationFailedException
|
||||||
|
* @throws BadRequestException
|
||||||
|
*/
|
||||||
|
protected function updateResharePermissions($id, array $notification) {
|
||||||
|
|
||||||
|
if (!isset($notification['sharedSecret'])) {
|
||||||
|
throw new BadRequestException(['sharedSecret']);
|
||||||
|
}
|
||||||
|
$token = $notification['sharedSecret'];
|
||||||
|
|
||||||
|
if (!isset($notification['permission'])) {
|
||||||
|
throw new BadRequestException(['permission']);
|
||||||
|
}
|
||||||
|
$ocmPermissions = $notification['permission'];
|
||||||
|
|
||||||
|
$share = $this->federatedShareProvider->getShareById($id);
|
||||||
|
|
||||||
|
$ncPermission = $this->ocmPermissions2ncPermissions($ocmPermissions);
|
||||||
|
|
||||||
|
$this->verifyShare($share, $token);
|
||||||
|
$this->updatePermissionsInDatabase($share, $ncPermission);
|
||||||
|
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* translate OCM Permissions to Nextcloud permissions
|
||||||
|
*
|
||||||
|
* @param array $ocmPermissions
|
||||||
|
* @return int
|
||||||
|
* @throws BadRequestException
|
||||||
|
*/
|
||||||
|
protected function ocmPermissions2ncPermissions(array $ocmPermissions) {
|
||||||
|
$ncPermissions = 0;
|
||||||
|
foreach($ocmPermissions as $permission) {
|
||||||
|
switch (strtolower($permission)) {
|
||||||
|
case 'read':
|
||||||
|
$ncPermissions += Constants::PERMISSION_READ;
|
||||||
|
break;
|
||||||
|
case 'write':
|
||||||
|
$ncPermissions += Constants::PERMISSION_CREATE + Constants::PERMISSION_UPDATE;
|
||||||
|
break;
|
||||||
|
case 'share':
|
||||||
|
$ncPermissions += Constants::PERMISSION_SHARE;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw new BadRequestException(['permission']);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
return $ncPermissions;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* update permissions in database
|
||||||
|
*
|
||||||
|
* @param IShare $share
|
||||||
|
* @param int $permissions
|
||||||
|
*/
|
||||||
|
protected function updatePermissionsInDatabase(IShare $share, $permissions) {
|
||||||
|
$query = $this->connection->getQueryBuilder();
|
||||||
|
$query->update('share')
|
||||||
|
->where($query->expr()->eq('id', $query->createNamedParameter($share->getId())))
|
||||||
|
->set('permissions', $query->createNamedParameter($permissions))
|
||||||
|
->execute();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get file
|
||||||
|
*
|
||||||
|
* @param string $user
|
||||||
|
* @param int $fileSource
|
||||||
|
* @return array with internal path of the file and a absolute link to it
|
||||||
|
*/
|
||||||
|
private function getFile($user, $fileSource) {
|
||||||
|
\OC_Util::setupFS($user);
|
||||||
|
|
||||||
|
try {
|
||||||
|
$file = Filesystem::getPath($fileSource);
|
||||||
|
} catch (NotFoundException $e) {
|
||||||
|
$file = null;
|
||||||
|
}
|
||||||
|
$args = Filesystem::is_dir($file) ? array('dir' => $file) : array('dir' => dirname($file), 'scrollto' => $file);
|
||||||
|
$link = Util::linkToAbsolute('files', 'index.php', $args);
|
||||||
|
|
||||||
|
return [$file, $link];
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* check if we are the initiator or the owner of a re-share and return the correct UID
|
||||||
|
*
|
||||||
|
* @param IShare $share
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
protected function getCorrectUid(IShare $share) {
|
||||||
|
if ($this->userManager->userExists($share->getShareOwner())) {
|
||||||
|
return $share->getShareOwner();
|
||||||
|
}
|
||||||
|
|
||||||
|
return $share->getSharedBy();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* check if we got the right share
|
||||||
|
*
|
||||||
|
* @param IShare $share
|
||||||
|
* @param string $token
|
||||||
|
* @return bool
|
||||||
|
* @throws AuthenticationFailedException
|
||||||
|
*/
|
||||||
|
protected function verifyShare(IShare $share, $token) {
|
||||||
|
if (
|
||||||
|
$share->getShareType() === FederatedShareProvider::SHARE_TYPE_REMOTE &&
|
||||||
|
$share->getToken() === $token
|
||||||
|
) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new AuthenticationFailedException();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* check if server-to-server sharing is enabled
|
||||||
|
*
|
||||||
|
* @param bool $incoming
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
private function isS2SEnabled($incoming = false) {
|
||||||
|
|
||||||
|
$result = $this->appManager->isEnabledForUser('files_sharing');
|
||||||
|
|
||||||
|
if ($incoming) {
|
||||||
|
$result = $result && $this->federatedShareProvider->isIncomingServer2serverShareEnabled();
|
||||||
|
} else {
|
||||||
|
$result = $result && $this->federatedShareProvider->isOutgoingServer2serverShareEnabled();
|
||||||
|
}
|
||||||
|
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get the supported share types, e.g. "user", "group", etc.
|
||||||
|
*
|
||||||
|
* @return array
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getSupportedShareTypes() {
|
||||||
|
return ['user'];
|
||||||
|
}
|
||||||
|
}
|
|
@ -29,18 +29,28 @@
|
||||||
|
|
||||||
namespace OCA\FederatedFileSharing\Tests;
|
namespace OCA\FederatedFileSharing\Tests;
|
||||||
|
|
||||||
|
use OC\AppFramework\Http;
|
||||||
use OC\Federation\CloudIdManager;
|
use OC\Federation\CloudIdManager;
|
||||||
use OC\Files\Filesystem;
|
use OC\Files\Filesystem;
|
||||||
use OCA\FederatedFileSharing\FederatedShareProvider;
|
use OCA\FederatedFileSharing\FederatedShareProvider;
|
||||||
use OCA\FederatedFileSharing\Controller\RequestHandlerController;
|
use OCA\FederatedFileSharing\Controller\RequestHandlerController;
|
||||||
|
use OCP\AppFramework\Http\DataResponse;
|
||||||
|
use OCP\Federation\ICloudFederationFactory;
|
||||||
|
use OCP\Federation\ICloudFederationProvider;
|
||||||
|
use OCP\Federation\ICloudFederationProviderManager;
|
||||||
|
use OCP\Federation\ICloudFederationShare;
|
||||||
use OCP\Federation\ICloudIdManager;
|
use OCP\Federation\ICloudIdManager;
|
||||||
use OCP\Http\Client\IClient;
|
use OCP\Http\Client\IClient;
|
||||||
use OCP\Http\Client\IClientService;
|
use OCP\Http\Client\IClientService;
|
||||||
use OCP\Http\Client\IResponse;
|
use OCP\Http\Client\IResponse;
|
||||||
use OCP\IConfig;
|
use OCP\IConfig;
|
||||||
|
use OCP\IDBConnection;
|
||||||
use OCP\ILogger;
|
use OCP\ILogger;
|
||||||
|
use OCP\IRequest;
|
||||||
use OCP\IUserManager;
|
use OCP\IUserManager;
|
||||||
|
use OCP\Share;
|
||||||
use OCP\Share\IShare;
|
use OCP\Share\IShare;
|
||||||
|
use PHPUnit\Framework\MockObject\Builder\InvocationMocker;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class RequestHandlerTest
|
* Class RequestHandlerTest
|
||||||
|
@ -48,19 +58,17 @@ use OCP\Share\IShare;
|
||||||
* @package OCA\FederatedFileSharing\Tests
|
* @package OCA\FederatedFileSharing\Tests
|
||||||
* @group DB
|
* @group DB
|
||||||
*/
|
*/
|
||||||
class RequestHandlerControllerTest extends TestCase {
|
class RequestHandlerControllerTest extends \Test\TestCase {
|
||||||
|
|
||||||
const TEST_FOLDER_NAME = '/folder_share_api_test';
|
private $owner = 'owner';
|
||||||
|
private $user1 = 'user1';
|
||||||
|
private $user2 = 'user2';
|
||||||
|
private $ownerCloudId = 'owner@server0.org';
|
||||||
|
private $user1CloudId = 'user1@server1.org';
|
||||||
|
private $user2CloudId = 'user2@server2.org';
|
||||||
|
|
||||||
/**
|
/** @var RequestHandlerController */
|
||||||
* @var \OCP\IDBConnection
|
private $requestHandler;
|
||||||
*/
|
|
||||||
private $connection;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @var RequestHandlerController
|
|
||||||
*/
|
|
||||||
private $s2s;
|
|
||||||
|
|
||||||
/** @var \OCA\FederatedFileSharing\FederatedShareProvider|\PHPUnit_Framework_MockObject_MockObject */
|
/** @var \OCA\FederatedFileSharing\FederatedShareProvider|\PHPUnit_Framework_MockObject_MockObject */
|
||||||
private $federatedShareProvider;
|
private $federatedShareProvider;
|
||||||
|
@ -77,17 +85,34 @@ class RequestHandlerControllerTest extends TestCase {
|
||||||
/** @var IShare|\PHPUnit_Framework_MockObject_MockObject */
|
/** @var IShare|\PHPUnit_Framework_MockObject_MockObject */
|
||||||
private $share;
|
private $share;
|
||||||
|
|
||||||
/** @var ICloudIdManager */
|
/** @var ICloudIdManager|\PHPUnit_Framework_MockObject_MockObject */
|
||||||
private $cloudIdManager;
|
private $cloudIdManager;
|
||||||
|
|
||||||
/** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */
|
/** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */
|
||||||
private $logger;
|
private $logger;
|
||||||
|
|
||||||
protected function setUp() {
|
/** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */
|
||||||
parent::setUp();
|
private $request;
|
||||||
|
|
||||||
self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
|
/** @var IDBConnection|\PHPUnit_Framework_MockObject_MockObject */
|
||||||
\OC\Share\Share::registerBackend('test', 'Test\Share\Backend');
|
private $connection;
|
||||||
|
|
||||||
|
/** @var Share\IManager|\PHPUnit_Framework_MockObject_MockObject */
|
||||||
|
private $shareManager;
|
||||||
|
|
||||||
|
/** @var ICloudFederationFactory|\PHPUnit_Framework_MockObject_MockObject */
|
||||||
|
private $cloudFederationFactory;
|
||||||
|
|
||||||
|
/** @var ICloudFederationProviderManager|\PHPUnit_Framework_MockObject_MockObject */
|
||||||
|
private $cloudFederationProviderManager;
|
||||||
|
|
||||||
|
/** @var ICloudFederationProvider|\PHPUnit_Framework_MockObject_MockObject */
|
||||||
|
private $cloudFederationProvider;
|
||||||
|
|
||||||
|
/** @var ICloudFederationShare|\PHPUnit_Framework_MockObject_MockObject */
|
||||||
|
private $cloudFederationShare;
|
||||||
|
|
||||||
|
protected function setUp() {
|
||||||
|
|
||||||
$this->share = $this->getMockBuilder(IShare::class)->getMock();
|
$this->share = $this->getMockBuilder(IShare::class)->getMock();
|
||||||
$this->federatedShareProvider = $this->getMockBuilder('OCA\FederatedFileSharing\FederatedShareProvider')
|
$this->federatedShareProvider = $this->getMockBuilder('OCA\FederatedFileSharing\FederatedShareProvider')
|
||||||
|
@ -104,292 +129,127 @@ class RequestHandlerControllerTest extends TestCase {
|
||||||
$this->addressHandler = $this->getMockBuilder('OCA\FederatedFileSharing\AddressHandler')
|
$this->addressHandler = $this->getMockBuilder('OCA\FederatedFileSharing\AddressHandler')
|
||||||
->disableOriginalConstructor()->getMock();
|
->disableOriginalConstructor()->getMock();
|
||||||
$this->userManager = $this->getMockBuilder(IUserManager::class)->getMock();
|
$this->userManager = $this->getMockBuilder(IUserManager::class)->getMock();
|
||||||
|
$this->cloudIdManager = $this->createMock(ICloudIdManager::class);
|
||||||
|
$this->request = $this->createMock(IRequest::class);
|
||||||
|
$this->connection = $this->createMock(IDBConnection::class);
|
||||||
|
$this->shareManager = $this->createMock(Share\IManager::class);
|
||||||
|
$this->cloudFederationFactory = $this->createMock(ICloudFederationFactory::class);
|
||||||
|
$this->cloudFederationProviderManager = $this->createMock(ICloudFederationProviderManager::class);
|
||||||
|
$this->cloudFederationProvider = $this->createMock(ICloudFederationProvider::class);
|
||||||
|
$this->cloudFederationShare = $this->createMock(ICloudFederationShare::class);
|
||||||
|
|
||||||
$this->cloudIdManager = new CloudIdManager();
|
|
||||||
|
|
||||||
$this->logger = $this->createMock(ILogger::class);
|
$this->logger = $this->createMock(ILogger::class);
|
||||||
|
|
||||||
$this->s2s = new RequestHandlerController(
|
$this->requestHandler = new RequestHandlerController(
|
||||||
'federatedfilesharing',
|
'federatedfilesharing',
|
||||||
\OC::$server->getRequest(),
|
$this->request,
|
||||||
$this->federatedShareProvider,
|
$this->federatedShareProvider,
|
||||||
\OC::$server->getDatabaseConnection(),
|
$this->connection,
|
||||||
\OC::$server->getShareManager(),
|
$this->shareManager,
|
||||||
$this->notifications,
|
$this->notifications,
|
||||||
$this->addressHandler,
|
$this->addressHandler,
|
||||||
$this->userManager,
|
$this->userManager,
|
||||||
$this->cloudIdManager,
|
$this->cloudIdManager,
|
||||||
$this->logger
|
$this->logger,
|
||||||
|
$this->cloudFederationFactory,
|
||||||
|
$this->cloudFederationProviderManager
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->connection = \OC::$server->getDatabaseConnection();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function tearDown() {
|
|
||||||
$qb = $this->connection->getQueryBuilder();
|
|
||||||
$qb->delete('share_external');
|
|
||||||
$qb->execute();
|
|
||||||
|
|
||||||
$qb = $this->connection->getQueryBuilder();
|
|
||||||
$qb->delete('share');
|
|
||||||
$qb->execute();
|
|
||||||
|
|
||||||
parent::tearDown();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @medium
|
|
||||||
*/
|
|
||||||
function testCreateShare() {
|
function testCreateShare() {
|
||||||
// simulate a post request
|
// simulate a post request
|
||||||
$_POST['remote'] = 'localhost';
|
$_POST['remote'] = 'localhost';
|
||||||
$_POST['token'] = 'token';
|
$_POST['token'] = 'token';
|
||||||
$_POST['name'] = 'name';
|
$_POST['name'] = 'name';
|
||||||
$_POST['owner'] = 'owner';
|
$_POST['owner'] = $this->owner;
|
||||||
$_POST['shareWith'] = self::TEST_FILES_SHARING_API_USER2;
|
$_POST['sharedBy'] = $this->user1;
|
||||||
|
$_POST['shareWith'] = $this->user2;
|
||||||
$_POST['remoteId'] = 1;
|
$_POST['remoteId'] = 1;
|
||||||
|
$_POST['sharedByFederatedId'] = $this->user1CloudId;
|
||||||
|
$_POST['ownerFederatedId'] = $this->ownerCloudId;
|
||||||
|
|
||||||
$this->s2s->createShare(null);
|
$this->cloudFederationFactory->expects($this->once())->method('getCloudFederationShare')
|
||||||
|
->with(
|
||||||
|
$this->user2,
|
||||||
|
'name',
|
||||||
|
'',
|
||||||
|
1,
|
||||||
|
$this->ownerCloudId,
|
||||||
|
$this->owner,
|
||||||
|
$this->user1CloudId,
|
||||||
|
$this->user1,
|
||||||
|
'token',
|
||||||
|
'user',
|
||||||
|
'file'
|
||||||
|
)->willReturn($this->cloudFederationShare);
|
||||||
|
|
||||||
$qb = $this->connection->getQueryBuilder();
|
/** @var ICloudFederationProvider|\PHPUnit_Framework_MockObject_MockObject $provider */
|
||||||
$qb->select('*')
|
$this->cloudFederationProviderManager->expects($this->once())
|
||||||
->from('share_external')
|
->method('getCloudFederationProvider')
|
||||||
->where(
|
->with('file')
|
||||||
$qb->expr()->eq('remote_id', $qb->createNamedParameter(1))
|
->willReturn($this->cloudFederationProvider);
|
||||||
);
|
|
||||||
$result = $qb->execute();
|
$this->cloudFederationProvider->expects($this->once())->method('shareReceived')
|
||||||
$data = $result->fetch();
|
->with($this->cloudFederationShare);
|
||||||
$result->closeCursor();
|
|
||||||
|
$result = $this->requestHandler->createShare();
|
||||||
|
|
||||||
|
$this->assertInstanceOf(DataResponse::class, $result);
|
||||||
|
|
||||||
$this->assertSame('localhost', $data['remote']);
|
|
||||||
$this->assertSame('token', $data['share_token']);
|
|
||||||
$this->assertSame('/name', $data['name']);
|
|
||||||
$this->assertSame('owner', $data['owner']);
|
|
||||||
$this->assertSame(self::TEST_FILES_SHARING_API_USER2, $data['user']);
|
|
||||||
$this->assertSame(1, (int)$data['remote_id']);
|
|
||||||
$this->assertSame(0, (int)$data['accepted']);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function testDeclineShare() {
|
function testDeclineShare() {
|
||||||
|
|
||||||
$this->s2s = $this->getMockBuilder('\OCA\FederatedFileSharing\Controller\RequestHandlerController')
|
$id = 42;
|
||||||
->setConstructorArgs(
|
|
||||||
[
|
|
||||||
'federatedfilessharing',
|
|
||||||
\OC::$server->getRequest(),
|
|
||||||
$this->federatedShareProvider,
|
|
||||||
\OC::$server->getDatabaseConnection(),
|
|
||||||
\OC::$server->getShareManager(),
|
|
||||||
$this->notifications,
|
|
||||||
$this->addressHandler,
|
|
||||||
$this->userManager,
|
|
||||||
$this->cloudIdManager,
|
|
||||||
$this->logger,
|
|
||||||
]
|
|
||||||
)->setMethods(['executeDeclineShare', 'verifyShare'])->getMock();
|
|
||||||
|
|
||||||
$this->s2s->expects($this->once())->method('executeDeclineShare');
|
|
||||||
|
|
||||||
$this->s2s->expects($this->any())->method('verifyShare')->willReturn(true);
|
|
||||||
|
|
||||||
$_POST['token'] = 'token';
|
$_POST['token'] = 'token';
|
||||||
|
|
||||||
$this->s2s->declineShare(42);
|
$notification = [
|
||||||
|
'sharedSecret' => 'token',
|
||||||
}
|
'message' => 'Recipient declined the share'
|
||||||
|
|
||||||
function XtestDeclineShareMultiple() {
|
|
||||||
|
|
||||||
$this->share->expects($this->any())->method('verifyShare')->willReturn(true);
|
|
||||||
|
|
||||||
$dummy = \OC_DB::prepare('
|
|
||||||
INSERT INTO `*PREFIX*share`
|
|
||||||
(`share_type`, `uid_owner`, `item_type`, `item_source`, `item_target`, `file_source`, `file_target`, `permissions`, `stime`, `token`, `share_with`)
|
|
||||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
|
||||||
');
|
|
||||||
$dummy->execute(array(\OCP\Share::SHARE_TYPE_REMOTE, self::TEST_FILES_SHARING_API_USER1, 'test', '1', '/1', '1', '/test.txt', '1', time(), 'token1', 'foo@bar'));
|
|
||||||
$dummy->execute(array(\OCP\Share::SHARE_TYPE_REMOTE, self::TEST_FILES_SHARING_API_USER1, 'test', '1', '/1', '1', '/test.txt', '1', time(), 'token2', 'bar@bar'));
|
|
||||||
|
|
||||||
$verify = \OC_DB::prepare('SELECT * FROM `*PREFIX*share`');
|
|
||||||
$result = $verify->execute();
|
|
||||||
$data = $result->fetchAll();
|
|
||||||
$this->assertCount(2, $data);
|
|
||||||
|
|
||||||
$_POST['token'] = 'token1';
|
|
||||||
$this->s2s->declineShare(array('id' => $data[0]['id']));
|
|
||||||
|
|
||||||
$verify = \OC_DB::prepare('SELECT * FROM `*PREFIX*share`');
|
|
||||||
$result = $verify->execute();
|
|
||||||
$data = $result->fetchAll();
|
|
||||||
$this->assertCount(1, $data);
|
|
||||||
$this->assertEquals('bar@bar', $data[0]['share_with']);
|
|
||||||
|
|
||||||
$_POST['token'] = 'token2';
|
|
||||||
$this->s2s->declineShare(array('id' => $data[0]['id']));
|
|
||||||
|
|
||||||
$verify = \OC_DB::prepare('SELECT * FROM `*PREFIX*share`');
|
|
||||||
$result = $verify->execute();
|
|
||||||
$data = $result->fetchAll();
|
|
||||||
$this->assertEmpty($data);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dataProvider dataTestDeleteUser
|
|
||||||
*/
|
|
||||||
function testDeleteUser($toDelete, $expected, $remainingUsers) {
|
|
||||||
$this->createDummyS2SShares();
|
|
||||||
|
|
||||||
$httpClientService = $this->createMock(IClientService::class);
|
|
||||||
$client = $this->createMock(IClient::class);
|
|
||||||
$response = $this->createMock(IResponse::class);
|
|
||||||
$client
|
|
||||||
->expects($this->any())
|
|
||||||
->method('get')
|
|
||||||
->willReturn($response);
|
|
||||||
$client
|
|
||||||
->expects($this->any())
|
|
||||||
->method('post')
|
|
||||||
->willReturn($response);
|
|
||||||
$httpClientService
|
|
||||||
->expects($this->any())
|
|
||||||
->method('newClient')
|
|
||||||
->willReturn($client);
|
|
||||||
|
|
||||||
$manager = new \OCA\Files_Sharing\External\Manager(
|
|
||||||
\OC::$server->getDatabaseConnection(),
|
|
||||||
Filesystem::getMountManager(),
|
|
||||||
Filesystem::getLoader(),
|
|
||||||
$httpClientService,
|
|
||||||
\OC::$server->getNotificationManager(),
|
|
||||||
\OC::$server->query(\OCP\OCS\IDiscoveryService::class),
|
|
||||||
$toDelete
|
|
||||||
);
|
|
||||||
|
|
||||||
$manager->removeUserShares($toDelete);
|
|
||||||
|
|
||||||
$query = $this->connection->prepare('SELECT `user` FROM `*PREFIX*share_external`');
|
|
||||||
$query->execute();
|
|
||||||
$result = $query->fetchAll();
|
|
||||||
|
|
||||||
foreach ($result as $r) {
|
|
||||||
$remainingShares[$r['user']] = isset($remainingShares[$r['user']]) ? $remainingShares[$r['user']] + 1 : 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->assertSame($remainingUsers, count($remainingShares));
|
|
||||||
|
|
||||||
foreach ($expected as $key => $value) {
|
|
||||||
if ($key === $toDelete) {
|
|
||||||
$this->assertArrayNotHasKey($key, $remainingShares);
|
|
||||||
} else {
|
|
||||||
$this->assertSame($value, $remainingShares[$key]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
function dataTestDeleteUser() {
|
|
||||||
return array(
|
|
||||||
array('user1', array('user1' => 0, 'user2' => 3, 'user3' => 3), 2),
|
|
||||||
array('user2', array('user1' => 4, 'user2' => 0, 'user3' => 3), 2),
|
|
||||||
array('user3', array('user1' => 4, 'user2' => 3, 'user3' => 0), 2),
|
|
||||||
array('user4', array('user1' => 4, 'user2' => 3, 'user3' => 3), 3),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
private function createDummyS2SShares() {
|
|
||||||
$query = $this->connection->prepare('
|
|
||||||
INSERT INTO `*PREFIX*share_external`
|
|
||||||
(`remote`, `share_token`, `password`, `name`, `owner`, `user`, `mountpoint`, `mountpoint_hash`, `remote_id`, `accepted`)
|
|
||||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
|
||||||
');
|
|
||||||
|
|
||||||
$users = array('user1', 'user2', 'user3');
|
|
||||||
|
|
||||||
for ($i = 0; $i < 10; $i++) {
|
|
||||||
$user = $users[$i%3];
|
|
||||||
$query->execute(array('remote', 'token', 'password', 'name', 'owner', $user, 'mount point', $i, $i, 0));
|
|
||||||
}
|
|
||||||
|
|
||||||
$query = $this->connection->prepare('SELECT `id` FROM `*PREFIX*share_external`');
|
|
||||||
$query->execute();
|
|
||||||
$dummyEntries = $query->fetchAll();
|
|
||||||
|
|
||||||
$this->assertSame(10, count($dummyEntries));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @dataProvider dataTestGetShare
|
|
||||||
*
|
|
||||||
* @param bool $found
|
|
||||||
* @param bool $correctId
|
|
||||||
* @param bool $correctToken
|
|
||||||
*/
|
|
||||||
public function testGetShare($found, $correctId, $correctToken) {
|
|
||||||
|
|
||||||
$connection = \OC::$server->getDatabaseConnection();
|
|
||||||
$query = $connection->getQueryBuilder();
|
|
||||||
$stime = time();
|
|
||||||
$query->insert('share')
|
|
||||||
->values(
|
|
||||||
[
|
|
||||||
'share_type' => $query->createNamedParameter(FederatedShareProvider::SHARE_TYPE_REMOTE),
|
|
||||||
'uid_owner' => $query->createNamedParameter(self::TEST_FILES_SHARING_API_USER1),
|
|
||||||
'uid_initiator' => $query->createNamedParameter(self::TEST_FILES_SHARING_API_USER2),
|
|
||||||
'item_type' => $query->createNamedParameter('test'),
|
|
||||||
'item_source' => $query->createNamedParameter('1'),
|
|
||||||
'item_target' => $query->createNamedParameter('/1'),
|
|
||||||
'file_source' => $query->createNamedParameter('1'),
|
|
||||||
'file_target' => $query->createNamedParameter('/test.txt'),
|
|
||||||
'permissions' => $query->createNamedParameter('1'),
|
|
||||||
'stime' => $query->createNamedParameter($stime),
|
|
||||||
'token' => $query->createNamedParameter('token'),
|
|
||||||
'share_with' => $query->createNamedParameter('foo@bar'),
|
|
||||||
]
|
|
||||||
)->execute();
|
|
||||||
$id = $query->getLastInsertId();
|
|
||||||
|
|
||||||
$expected = [
|
|
||||||
'share_type' => (string)FederatedShareProvider::SHARE_TYPE_REMOTE,
|
|
||||||
'uid_owner' => self::TEST_FILES_SHARING_API_USER1,
|
|
||||||
'item_type' => 'test',
|
|
||||||
'item_source' => '1',
|
|
||||||
'item_target' => '/1',
|
|
||||||
'file_source' => '1',
|
|
||||||
'file_target' => '/test.txt',
|
|
||||||
'permissions' => '1',
|
|
||||||
'stime' => (string)$stime,
|
|
||||||
'token' => 'token',
|
|
||||||
'share_with' => 'foo@bar',
|
|
||||||
'id' => (string)$id,
|
|
||||||
'uid_initiator' => self::TEST_FILES_SHARING_API_USER2,
|
|
||||||
'parent' => null,
|
|
||||||
'accepted' => '0',
|
|
||||||
'expiration' => null,
|
|
||||||
'password' => null,
|
|
||||||
'mail_send' => '0',
|
|
||||||
'share_name' => null,
|
|
||||||
];
|
];
|
||||||
|
|
||||||
$searchToken = $correctToken ? 'token' : 'wrongToken';
|
$this->cloudFederationProviderManager->expects($this->once())
|
||||||
$searchId = $correctId ? $id : -1;
|
->method('getCloudFederationProvider')
|
||||||
|
->with('file')
|
||||||
|
->willReturn($this->cloudFederationProvider);
|
||||||
|
|
||||||
$result = $this->invokePrivate($this->s2s, 'getShare', [$searchId, $searchToken]);
|
$this->cloudFederationProvider->expects($this->once())
|
||||||
|
->method('notificationReceived')
|
||||||
|
->with('SHARE_DECLINED', $id, $notification);
|
||||||
|
|
||||||
|
$result = $this->requestHandler->declineShare($id);
|
||||||
|
|
||||||
|
$this->assertInstanceOf(DataResponse::class, $result);
|
||||||
|
|
||||||
if ($found) {
|
|
||||||
$this->assertEquals($expected, $result);
|
|
||||||
} else {
|
|
||||||
$this->assertSame(false, $result);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function dataTestGetShare() {
|
|
||||||
return [
|
function testAcceptShare() {
|
||||||
[true, true, true],
|
|
||||||
[false, false, true],
|
$id = 42;
|
||||||
[false, true, false],
|
$_POST['token'] = 'token';
|
||||||
[false, false, false],
|
|
||||||
|
$notification = [
|
||||||
|
'sharedSecret' => 'token',
|
||||||
|
'message' => 'Recipient accept the share'
|
||||||
];
|
];
|
||||||
|
|
||||||
|
$this->cloudFederationProviderManager->expects($this->once())
|
||||||
|
->method('getCloudFederationProvider')
|
||||||
|
->with('file')
|
||||||
|
->willReturn($this->cloudFederationProvider);
|
||||||
|
|
||||||
|
$this->cloudFederationProvider->expects($this->once())
|
||||||
|
->method('notificationReceived')
|
||||||
|
->with('SHARE_ACCEPTED', $id, $notification);
|
||||||
|
|
||||||
|
$result = $this->requestHandler->acceptShare($id);
|
||||||
|
|
||||||
|
$this->assertInstanceOf(DataResponse::class, $result);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,6 +29,8 @@ namespace OCA\FederatedFileSharing\Tests;
|
||||||
use OCA\FederatedFileSharing\AddressHandler;
|
use OCA\FederatedFileSharing\AddressHandler;
|
||||||
use OCA\FederatedFileSharing\Notifications;
|
use OCA\FederatedFileSharing\Notifications;
|
||||||
use OCP\BackgroundJob\IJobList;
|
use OCP\BackgroundJob\IJobList;
|
||||||
|
use OCP\Federation\ICloudFederationFactory;
|
||||||
|
use OCP\Federation\ICloudFederationProviderManager;
|
||||||
use OCP\Http\Client\IClientService;
|
use OCP\Http\Client\IClientService;
|
||||||
use OCP\OCS\IDiscoveryService;
|
use OCP\OCS\IDiscoveryService;
|
||||||
|
|
||||||
|
@ -46,6 +48,12 @@ class NotificationsTest extends \Test\TestCase {
|
||||||
/** @var IJobList | \PHPUnit_Framework_MockObject_MockObject */
|
/** @var IJobList | \PHPUnit_Framework_MockObject_MockObject */
|
||||||
private $jobList;
|
private $jobList;
|
||||||
|
|
||||||
|
/** @var ICloudFederationProviderManager|\PHPUnit_Framework_MockObject_MockObject */
|
||||||
|
private $cloudFederationProviderManager;
|
||||||
|
|
||||||
|
/** @var ICloudFederationFactory|\PHPUnit_Framework_MockObject_MockObject */
|
||||||
|
private $cloudFederationFactory;
|
||||||
|
|
||||||
public function setUp() {
|
public function setUp() {
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
|
||||||
|
@ -54,6 +62,8 @@ class NotificationsTest extends \Test\TestCase {
|
||||||
$this->httpClientService = $this->getMockBuilder('OCP\Http\Client\IClientService')->getMock();
|
$this->httpClientService = $this->getMockBuilder('OCP\Http\Client\IClientService')->getMock();
|
||||||
$this->addressHandler = $this->getMockBuilder('OCA\FederatedFileSharing\AddressHandler')
|
$this->addressHandler = $this->getMockBuilder('OCA\FederatedFileSharing\AddressHandler')
|
||||||
->disableOriginalConstructor()->getMock();
|
->disableOriginalConstructor()->getMock();
|
||||||
|
$this->cloudFederationProviderManager = $this->createMock(ICloudFederationProviderManager::class);
|
||||||
|
$this->cloudFederationFactory = $this->createMock(ICloudFederationFactory::class);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -69,7 +79,9 @@ class NotificationsTest extends \Test\TestCase {
|
||||||
$this->addressHandler,
|
$this->addressHandler,
|
||||||
$this->httpClientService,
|
$this->httpClientService,
|
||||||
$this->discoveryService,
|
$this->discoveryService,
|
||||||
$this->jobList
|
$this->jobList,
|
||||||
|
$this->cloudFederationProviderManager,
|
||||||
|
$this->cloudFederationFactory
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
$instance = $this->getMockBuilder('OCA\FederatedFileSharing\Notifications')
|
$instance = $this->getMockBuilder('OCA\FederatedFileSharing\Notifications')
|
||||||
|
@ -78,7 +90,9 @@ class NotificationsTest extends \Test\TestCase {
|
||||||
$this->addressHandler,
|
$this->addressHandler,
|
||||||
$this->httpClientService,
|
$this->httpClientService,
|
||||||
$this->discoveryService,
|
$this->discoveryService,
|
||||||
$this->jobList
|
$this->jobList,
|
||||||
|
$this->cloudFederationProviderManager,
|
||||||
|
$this->cloudFederationFactory
|
||||||
]
|
]
|
||||||
)->setMethods($mockedMethods)->getMock();
|
)->setMethods($mockedMethods)->getMock();
|
||||||
}
|
}
|
||||||
|
@ -99,12 +113,13 @@ class NotificationsTest extends \Test\TestCase {
|
||||||
$id = 42;
|
$id = 42;
|
||||||
$timestamp = 63576;
|
$timestamp = 63576;
|
||||||
$token = 'token';
|
$token = 'token';
|
||||||
|
$action = 'unshare';
|
||||||
$instance = $this->getInstance(['tryHttpPostToShareEndpoint', 'getTimestamp']);
|
$instance = $this->getInstance(['tryHttpPostToShareEndpoint', 'getTimestamp']);
|
||||||
|
|
||||||
$instance->expects($this->any())->method('getTimestamp')->willReturn($timestamp);
|
$instance->expects($this->any())->method('getTimestamp')->willReturn($timestamp);
|
||||||
|
|
||||||
$instance->expects($this->once())->method('tryHttpPostToShareEndpoint')
|
$instance->expects($this->once())->method('tryHttpPostToShareEndpoint')
|
||||||
->with($remote, '/'.$id.'/unshare', ['token' => $token, 'data1Key' => 'data1Value'])
|
->with($remote, '/'.$id.'/unshare', ['token' => $token, 'data1Key' => 'data1Value', 'remoteId' => $id], $action)
|
||||||
->willReturn($httpRequestResult);
|
->willReturn($httpRequestResult);
|
||||||
|
|
||||||
// only add background job on first try
|
// only add background job on first try
|
||||||
|
@ -127,7 +142,7 @@ class NotificationsTest extends \Test\TestCase {
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->assertSame($expected,
|
$this->assertSame($expected,
|
||||||
$instance->sendUpdateToRemote($remote, $id, $token, 'unshare', ['data1Key' => 'data1Value'], $try)
|
$instance->sendUpdateToRemote($remote, $id, $token, $action, ['data1Key' => 'data1Value'], $try)
|
||||||
);
|
);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -103,6 +103,8 @@ class Application extends App {
|
||||||
$server->getHTTPClientService(),
|
$server->getHTTPClientService(),
|
||||||
$server->getNotificationManager(),
|
$server->getNotificationManager(),
|
||||||
$server->query(\OCP\OCS\IDiscoveryService::class),
|
$server->query(\OCP\OCS\IDiscoveryService::class),
|
||||||
|
$server->getCloudFederationProviderManager(),
|
||||||
|
$server->getCloudFederationFactory(),
|
||||||
$uid
|
$uid
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
|
@ -33,6 +33,8 @@ namespace OCA\Files_Sharing\External;
|
||||||
|
|
||||||
use OC\Files\Filesystem;
|
use OC\Files\Filesystem;
|
||||||
use OCA\Files_Sharing\Helper;
|
use OCA\Files_Sharing\Helper;
|
||||||
|
use OCP\Federation\ICloudFederationFactory;
|
||||||
|
use OCP\Federation\ICloudFederationProviderManager;
|
||||||
use OCP\Files;
|
use OCP\Files;
|
||||||
use OCP\Files\Storage\IStorageFactory;
|
use OCP\Files\Storage\IStorageFactory;
|
||||||
use OCP\Http\Client\IClientService;
|
use OCP\Http\Client\IClientService;
|
||||||
|
@ -79,6 +81,12 @@ class Manager {
|
||||||
*/
|
*/
|
||||||
private $discoveryService;
|
private $discoveryService;
|
||||||
|
|
||||||
|
/** @var ICloudFederationProviderManager */
|
||||||
|
private $cloudFederationProviderManager;
|
||||||
|
|
||||||
|
/** @var ICloudFederationFactory */
|
||||||
|
private $cloudFederationFactory;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param IDBConnection $connection
|
* @param IDBConnection $connection
|
||||||
* @param \OC\Files\Mount\Manager $mountManager
|
* @param \OC\Files\Mount\Manager $mountManager
|
||||||
|
@ -86,6 +94,8 @@ class Manager {
|
||||||
* @param IClientService $clientService
|
* @param IClientService $clientService
|
||||||
* @param IManager $notificationManager
|
* @param IManager $notificationManager
|
||||||
* @param IDiscoveryService $discoveryService
|
* @param IDiscoveryService $discoveryService
|
||||||
|
* @param ICloudFederationProviderManager $cloudFederationProviderManager
|
||||||
|
* @param ICloudFederationFactory $cloudFederationFactory
|
||||||
* @param string $uid
|
* @param string $uid
|
||||||
*/
|
*/
|
||||||
public function __construct(IDBConnection $connection,
|
public function __construct(IDBConnection $connection,
|
||||||
|
@ -94,6 +104,8 @@ class Manager {
|
||||||
IClientService $clientService,
|
IClientService $clientService,
|
||||||
IManager $notificationManager,
|
IManager $notificationManager,
|
||||||
IDiscoveryService $discoveryService,
|
IDiscoveryService $discoveryService,
|
||||||
|
ICloudFederationProviderManager $cloudFederationProviderManager,
|
||||||
|
ICloudFederationFactory $cloudFederationFactory,
|
||||||
$uid) {
|
$uid) {
|
||||||
$this->connection = $connection;
|
$this->connection = $connection;
|
||||||
$this->mountManager = $mountManager;
|
$this->mountManager = $mountManager;
|
||||||
|
@ -102,6 +114,8 @@ class Manager {
|
||||||
$this->uid = $uid;
|
$this->uid = $uid;
|
||||||
$this->notificationManager = $notificationManager;
|
$this->notificationManager = $notificationManager;
|
||||||
$this->discoveryService = $discoveryService;
|
$this->discoveryService = $discoveryService;
|
||||||
|
$this->cloudFederationProviderManager = $cloudFederationProviderManager;
|
||||||
|
$this->cloudFederationFactory = $cloudFederationFactory;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -274,6 +288,12 @@ class Manager {
|
||||||
*/
|
*/
|
||||||
private function sendFeedbackToRemote($remote, $token, $remoteId, $feedback) {
|
private function sendFeedbackToRemote($remote, $token, $remoteId, $feedback) {
|
||||||
|
|
||||||
|
$result = $this->tryOCMEndPoint($remote, $token, $remoteId, $feedback);
|
||||||
|
|
||||||
|
if($result === true) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
$federationEndpoints = $this->discoveryService->discover($remote, 'FEDERATED_SHARING');
|
$federationEndpoints = $this->discoveryService->discover($remote, 'FEDERATED_SHARING');
|
||||||
$endpoint = isset($federationEndpoints['share']) ? $federationEndpoints['share'] : '/ocs/v2.php/cloud/shares';
|
$endpoint = isset($federationEndpoints['share']) ? $federationEndpoints['share'] : '/ocs/v2.php/cloud/shares';
|
||||||
|
|
||||||
|
@ -299,6 +319,50 @@ class Manager {
|
||||||
return ($status['ocs']['meta']['statuscode'] === 100 || $status['ocs']['meta']['statuscode'] === 200);
|
return ($status['ocs']['meta']['statuscode'] === 100 || $status['ocs']['meta']['statuscode'] === 200);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* try send accept message to ocm end-point
|
||||||
|
*
|
||||||
|
* @param string $remoteDomain
|
||||||
|
* @param string $token
|
||||||
|
* @param $remoteId id of the share
|
||||||
|
* @param string $feedback
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
protected function tryOCMEndPoint($remoteDomain, $token, $remoteId, $feedback) {
|
||||||
|
switch ($feedback) {
|
||||||
|
case 'accept':
|
||||||
|
$notification = $this->cloudFederationFactory->getCloudFederationNotification();
|
||||||
|
$notification->setMessage(
|
||||||
|
'SHARE_ACCEPTED',
|
||||||
|
'file',
|
||||||
|
$remoteId,
|
||||||
|
[
|
||||||
|
'sharedSecret' => $token,
|
||||||
|
'message' => 'Recipient accept the share'
|
||||||
|
]
|
||||||
|
|
||||||
|
);
|
||||||
|
return $this->cloudFederationProviderManager->sendNotification($remoteDomain, $notification);
|
||||||
|
case 'decline':
|
||||||
|
$notification = $this->cloudFederationFactory->getCloudFederationNotification();
|
||||||
|
$notification->setMessage(
|
||||||
|
'SHARE_DECLINED',
|
||||||
|
'file',
|
||||||
|
$remoteId,
|
||||||
|
[
|
||||||
|
'sharedSecret' => $token,
|
||||||
|
'message' => 'Recipient declined the share'
|
||||||
|
]
|
||||||
|
|
||||||
|
);
|
||||||
|
return $this->cloudFederationProviderManager->sendNotification($remoteDomain, $notification);
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* remove '/user/files' from the path and trailing slashes
|
* remove '/user/files' from the path and trailing slashes
|
||||||
*
|
*
|
||||||
|
|
|
@ -36,6 +36,7 @@ use OC\Files\Storage\DAV;
|
||||||
use OC\ForbiddenException;
|
use OC\ForbiddenException;
|
||||||
use OCA\Files_Sharing\ISharedStorage;
|
use OCA\Files_Sharing\ISharedStorage;
|
||||||
use OCP\AppFramework\Http;
|
use OCP\AppFramework\Http;
|
||||||
|
use OCP\Constants;
|
||||||
use OCP\Federation\ICloudId;
|
use OCP\Federation\ICloudId;
|
||||||
use OCP\Files\NotFoundException;
|
use OCP\Files\NotFoundException;
|
||||||
use OCP\Files\StorageInvalidException;
|
use OCP\Files\StorageInvalidException;
|
||||||
|
@ -347,20 +348,20 @@ class Storage extends DAV implements ISharedStorage {
|
||||||
if (\OCP\Util::isSharingDisabledForUser() || !\OC\Share\Share::isResharingAllowed()) {
|
if (\OCP\Util::isSharingDisabledForUser() || !\OC\Share\Share::isResharingAllowed()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return ($this->getPermissions($path) & \OCP\Constants::PERMISSION_SHARE);
|
return ($this->getPermissions($path) & Constants::PERMISSION_SHARE);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getPermissions($path) {
|
public function getPermissions($path) {
|
||||||
$response = $this->propfind($path);
|
$response = $this->propfind($path);
|
||||||
|
// old federated sharing permissions
|
||||||
if (isset($response['{http://open-collaboration-services.org/ns}share-permissions'])) {
|
if (isset($response['{http://open-collaboration-services.org/ns}share-permissions'])) {
|
||||||
$permissions = $response['{http://open-collaboration-services.org/ns}share-permissions'];
|
$permissions = $response['{http://open-collaboration-services.org/ns}share-permissions'];
|
||||||
|
} else if (isset($response['{http://open-cloud-mesh.org/ns}share-permissions'])) {
|
||||||
|
// permissions provided by the OCM API
|
||||||
|
$permissions = $this->ocmPermissions2ncPermissions($response['{http://open-collaboration-services.org/ns}share-permissions']);
|
||||||
} else {
|
} else {
|
||||||
// use default permission if remote server doesn't provide the share permissions
|
// use default permission if remote server doesn't provide the share permissions
|
||||||
if ($this->is_dir($path)) {
|
$permissions = $this->getDefaultPermissions($path);
|
||||||
$permissions = \OCP\Constants::PERMISSION_ALL;
|
|
||||||
} else {
|
|
||||||
$permissions = \OCP\Constants::PERMISSION_ALL & ~\OCP\Constants::PERMISSION_CREATE;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return $permissions;
|
return $permissions;
|
||||||
|
@ -369,4 +370,53 @@ class Storage extends DAV implements ISharedStorage {
|
||||||
public function needsPartFile() {
|
public function needsPartFile() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* translate OCM Permissions to Nextcloud permissions
|
||||||
|
*
|
||||||
|
* @param string $ocmPermissions json encoded OCM permissions
|
||||||
|
* @param string $path path to file
|
||||||
|
* @return int
|
||||||
|
*/
|
||||||
|
protected function ocmPermissions2ncPermissions($ocmPermissions, $path) {
|
||||||
|
try {
|
||||||
|
$ocmPermissions = json_decode($ocmPermissions);
|
||||||
|
$ncPermissions = 0;
|
||||||
|
foreach($ocmPermissions as $permission) {
|
||||||
|
switch (strtolower($permission)) {
|
||||||
|
case 'read':
|
||||||
|
$ncPermissions += Constants::PERMISSION_READ;
|
||||||
|
break;
|
||||||
|
case 'write':
|
||||||
|
$ncPermissions += Constants::PERMISSION_CREATE + Constants::PERMISSION_UPDATE;
|
||||||
|
break;
|
||||||
|
case 'share':
|
||||||
|
$ncPermissions += Constants::PERMISSION_SHARE;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw new \Exception();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
$ncPermissions = $this->getDefaultPermissions($path);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $ncPermissions;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* calculate default permissions in case no permissions are provided
|
||||||
|
*
|
||||||
|
* @param $path
|
||||||
|
* @return int
|
||||||
|
*/
|
||||||
|
protected function getDefaultPermissions($path) {
|
||||||
|
if ($this->is_dir($path)) {
|
||||||
|
$permissions = Constants::PERMISSION_ALL;
|
||||||
|
} else {
|
||||||
|
$permissions = Constants::PERMISSION_ALL & ~Constants::PERMISSION_CREATE;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $permissions;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,6 +40,8 @@ class Hooks {
|
||||||
\OC::$server->getHTTPClientService(),
|
\OC::$server->getHTTPClientService(),
|
||||||
\OC::$server->getNotificationManager(),
|
\OC::$server->getNotificationManager(),
|
||||||
\OC::$server->query(\OCP\OCS\IDiscoveryService::class),
|
\OC::$server->query(\OCP\OCS\IDiscoveryService::class),
|
||||||
|
\OC::$server->getCloudFederationProviderManager(),
|
||||||
|
\OC::$server->getCloudFederationFactory(),
|
||||||
$params['uid']);
|
$params['uid']);
|
||||||
|
|
||||||
$manager->removeUserShares($params['uid']);
|
$manager->removeUserShares($params['uid']);
|
||||||
|
|
|
@ -32,6 +32,8 @@ use OC\Files\Storage\StorageFactory;
|
||||||
use OCA\Files_Sharing\External\Manager;
|
use OCA\Files_Sharing\External\Manager;
|
||||||
use OCA\Files_Sharing\External\MountProvider;
|
use OCA\Files_Sharing\External\MountProvider;
|
||||||
use OCA\Files_Sharing\Tests\TestCase;
|
use OCA\Files_Sharing\Tests\TestCase;
|
||||||
|
use OCP\Federation\ICloudFederationFactory;
|
||||||
|
use OCP\Federation\ICloudFederationProviderManager;
|
||||||
use OCP\Http\Client\IClientService;
|
use OCP\Http\Client\IClientService;
|
||||||
use Test\Traits\UserTrait;
|
use Test\Traits\UserTrait;
|
||||||
|
|
||||||
|
@ -45,7 +47,7 @@ use Test\Traits\UserTrait;
|
||||||
class ManagerTest extends TestCase {
|
class ManagerTest extends TestCase {
|
||||||
use UserTrait;
|
use UserTrait;
|
||||||
|
|
||||||
/** @var Manager **/
|
/** @var Manager|\PHPUnit_Framework_MockObject_MockObject **/
|
||||||
private $manager;
|
private $manager;
|
||||||
|
|
||||||
/** @var \OC\Files\Mount\Manager */
|
/** @var \OC\Files\Mount\Manager */
|
||||||
|
@ -54,6 +56,12 @@ class ManagerTest extends TestCase {
|
||||||
/** @var IClientService|\PHPUnit_Framework_MockObject_MockObject */
|
/** @var IClientService|\PHPUnit_Framework_MockObject_MockObject */
|
||||||
private $clientService;
|
private $clientService;
|
||||||
|
|
||||||
|
/** @var ICloudFederationProviderManager|\PHPUnit_Framework_MockObject_MockObject */
|
||||||
|
private $cloudFederationProviderManager;
|
||||||
|
|
||||||
|
/** @var ICloudFederationFactory|\PHPUnit_Framework_MockObject_MockObject */
|
||||||
|
private $cloudFederationFactory;
|
||||||
|
|
||||||
private $uid;
|
private $uid;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -71,16 +79,24 @@ class ManagerTest extends TestCase {
|
||||||
$this->mountManager = new \OC\Files\Mount\Manager();
|
$this->mountManager = new \OC\Files\Mount\Manager();
|
||||||
$this->clientService = $this->getMockBuilder(IClientService::class)
|
$this->clientService = $this->getMockBuilder(IClientService::class)
|
||||||
->disableOriginalConstructor()->getMock();
|
->disableOriginalConstructor()->getMock();
|
||||||
|
$this->cloudFederationProviderManager = $this->createMock(ICloudFederationProviderManager::class);
|
||||||
|
$this->cloudFederationFactory = $this->createMock(ICloudFederationFactory::class);
|
||||||
|
|
||||||
|
$this->manager = $this->getMockBuilder(Manager::class)
|
||||||
|
->setConstructorArgs(
|
||||||
|
[
|
||||||
|
\OC::$server->getDatabaseConnection(),
|
||||||
|
$this->mountManager,
|
||||||
|
new StorageFactory(),
|
||||||
|
$this->clientService,
|
||||||
|
\OC::$server->getNotificationManager(),
|
||||||
|
\OC::$server->query(\OCP\OCS\IDiscoveryService::class),
|
||||||
|
$this->cloudFederationProviderManager,
|
||||||
|
$this->cloudFederationFactory,
|
||||||
|
$this->uid
|
||||||
|
]
|
||||||
|
)->setMethods(['tryOCMEndPoint'])->getMock();
|
||||||
|
|
||||||
$this->manager = new Manager(
|
|
||||||
\OC::$server->getDatabaseConnection(),
|
|
||||||
$this->mountManager,
|
|
||||||
new StorageFactory(),
|
|
||||||
$this->clientService,
|
|
||||||
\OC::$server->getNotificationManager(),
|
|
||||||
\OC::$server->query(\OCP\OCS\IDiscoveryService::class),
|
|
||||||
$this->uid
|
|
||||||
);
|
|
||||||
$this->testMountProvider = new MountProvider(\OC::$server->getDatabaseConnection(), function() {
|
$this->testMountProvider = new MountProvider(\OC::$server->getDatabaseConnection(), function() {
|
||||||
return $this->manager;
|
return $this->manager;
|
||||||
}, new CloudIdManager());
|
}, new CloudIdManager());
|
||||||
|
@ -109,6 +125,9 @@ class ManagerTest extends TestCase {
|
||||||
$shareData3 = $shareData1;
|
$shareData3 = $shareData1;
|
||||||
$shareData3['token'] = 'token3';
|
$shareData3['token'] = 'token3';
|
||||||
|
|
||||||
|
$this->manager->expects($this->at(0))->method('tryOCMEndPoint')->with('http://localhost', 'token1', -1, 'accept')->willReturn(false);
|
||||||
|
$this->manager->expects($this->at(1))->method('tryOCMEndPoint')->with('http://localhost', 'token3', -1, 'decline')->willReturn(false);
|
||||||
|
|
||||||
// Add a share for "user"
|
// Add a share for "user"
|
||||||
$this->assertSame(null, call_user_func_array([$this->manager, 'addShare'], $shareData1));
|
$this->assertSame(null, call_user_func_array([$this->manager, 'addShare'], $shareData1));
|
||||||
$openShares = $this->manager->getOpenShares();
|
$openShares = $this->manager->getOpenShares();
|
||||||
|
|
|
@ -66,6 +66,7 @@ $expectedFiles = [
|
||||||
'occ',
|
'occ',
|
||||||
'ocs',
|
'ocs',
|
||||||
'ocs-provider',
|
'ocs-provider',
|
||||||
|
'ocm-provider',
|
||||||
'public.php',
|
'public.php',
|
||||||
'README.md',
|
'README.md',
|
||||||
'remote.php',
|
'remote.php',
|
||||||
|
|
|
@ -107,6 +107,34 @@ $this->create('spreed.pagecontroller.showCall', '/call/{token}')->action(functio
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// OCM routes
|
||||||
|
/**
|
||||||
|
* @suppress PhanUndeclaredClassConstant
|
||||||
|
* @suppress PhanUndeclaredClassMethod
|
||||||
|
*/
|
||||||
|
$this->create('cloud_federation_api.requesthandlercontroller.addShare', '/ocm/shares')->post()->action(function($urlParams) {
|
||||||
|
if (class_exists(\OCA\CloudFederationAPI\AppInfo\Application::class, false)) {
|
||||||
|
$app = new \OCA\CloudFederationAPI\AppInfo\Application($urlParams);
|
||||||
|
$app->dispatch('RequestHandlerController', 'addShare');
|
||||||
|
} else {
|
||||||
|
throw new \OC\HintException('Cloud Federation API not enabled');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @suppress PhanUndeclaredClassConstant
|
||||||
|
* @suppress PhanUndeclaredClassMethod
|
||||||
|
*/
|
||||||
|
$this->create('cloud_federation_api.requesthandlercontroller.receiveNotification', '/ocm/notifications')->post()->action(function($urlParams) {
|
||||||
|
if (class_exists(\OCA\CloudFederationAPI\AppInfo\Application::class, false)) {
|
||||||
|
$app = new \OCA\CloudFederationAPI\AppInfo\Application($urlParams);
|
||||||
|
$app->dispatch('RequestHandlerController', 'receiveNotification');
|
||||||
|
} else {
|
||||||
|
throw new \OC\HintException('Cloud Federation API not enabled');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
// Sharing routes
|
// Sharing routes
|
||||||
$this->create('files_sharing.sharecontroller.showShare', '/s/{token}')->action(function($urlParams) {
|
$this->create('files_sharing.sharecontroller.showShare', '/s/{token}')->action(function($urlParams) {
|
||||||
if (class_exists(\OCA\Files_Sharing\AppInfo\Application::class, false)) {
|
if (class_exists(\OCA\Files_Sharing\AppInfo\Application::class, false)) {
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
"accessibility",
|
"accessibility",
|
||||||
"activity",
|
"activity",
|
||||||
"admin_audit",
|
"admin_audit",
|
||||||
|
"cloud_federation_api",
|
||||||
"comments",
|
"comments",
|
||||||
"dav",
|
"dav",
|
||||||
"encryption",
|
"encryption",
|
||||||
|
@ -38,6 +39,7 @@
|
||||||
],
|
],
|
||||||
"alwaysEnabled": [
|
"alwaysEnabled": [
|
||||||
"files",
|
"files",
|
||||||
|
"cloud_federation_api",
|
||||||
"dav",
|
"dav",
|
||||||
"federatedfilesharing",
|
"federatedfilesharing",
|
||||||
"lookup_server_connector",
|
"lookup_server_connector",
|
||||||
|
|
|
@ -132,6 +132,17 @@ return array(
|
||||||
'OCP\\Encryption\\IFile' => $baseDir . '/lib/public/Encryption/IFile.php',
|
'OCP\\Encryption\\IFile' => $baseDir . '/lib/public/Encryption/IFile.php',
|
||||||
'OCP\\Encryption\\IManager' => $baseDir . '/lib/public/Encryption/IManager.php',
|
'OCP\\Encryption\\IManager' => $baseDir . '/lib/public/Encryption/IManager.php',
|
||||||
'OCP\\Encryption\\Keys\\IStorage' => $baseDir . '/lib/public/Encryption/Keys/IStorage.php',
|
'OCP\\Encryption\\Keys\\IStorage' => $baseDir . '/lib/public/Encryption/Keys/IStorage.php',
|
||||||
|
'OCP\\Federation\\Exceptions\\ActionNotSupportedException' => $baseDir . '/lib/public/Federation/Exceptions/ActionNotSupportedException.php',
|
||||||
|
'OCP\\Federation\\Exceptions\\AuthenticationFailedException' => $baseDir . '/lib/public/Federation/Exceptions/AuthenticationFailedException.php',
|
||||||
|
'OCP\\Federation\\Exceptions\\BadRequestException' => $baseDir . '/lib/public/Federation/Exceptions/BadRequestException.php',
|
||||||
|
'OCP\\Federation\\Exceptions\\ProviderAlreadyExistsException' => $baseDir . '/lib/public/Federation/Exceptions/ProviderAlreadyExistsException.php',
|
||||||
|
'OCP\\Federation\\Exceptions\\ProviderCouldNotAddShareException' => $baseDir . '/lib/public/Federation/Exceptions/ProviderCouldNotAddShareException.php',
|
||||||
|
'OCP\\Federation\\Exceptions\\ProviderDoesNotExistsException' => $baseDir . '/lib/public/Federation/Exceptions/ProviderDoesNotExistsException.php',
|
||||||
|
'OCP\\Federation\\ICloudFederationFactory' => $baseDir . '/lib/public/Federation/ICloudFederationFactory.php',
|
||||||
|
'OCP\\Federation\\ICloudFederationNotification' => $baseDir . '/lib/public/Federation/ICloudFederationNotification.php',
|
||||||
|
'OCP\\Federation\\ICloudFederationProvider' => $baseDir . '/lib/public/Federation/ICloudFederationProvider.php',
|
||||||
|
'OCP\\Federation\\ICloudFederationProviderManager' => $baseDir . '/lib/public/Federation/ICloudFederationProviderManager.php',
|
||||||
|
'OCP\\Federation\\ICloudFederationShare' => $baseDir . '/lib/public/Federation/ICloudFederationShare.php',
|
||||||
'OCP\\Federation\\ICloudId' => $baseDir . '/lib/public/Federation/ICloudId.php',
|
'OCP\\Federation\\ICloudId' => $baseDir . '/lib/public/Federation/ICloudId.php',
|
||||||
'OCP\\Federation\\ICloudIdManager' => $baseDir . '/lib/public/Federation/ICloudIdManager.php',
|
'OCP\\Federation\\ICloudIdManager' => $baseDir . '/lib/public/Federation/ICloudIdManager.php',
|
||||||
'OCP\\Files' => $baseDir . '/lib/public/Files.php',
|
'OCP\\Files' => $baseDir . '/lib/public/Files.php',
|
||||||
|
@ -660,6 +671,10 @@ return array(
|
||||||
'OC\\Encryption\\Manager' => $baseDir . '/lib/private/Encryption/Manager.php',
|
'OC\\Encryption\\Manager' => $baseDir . '/lib/private/Encryption/Manager.php',
|
||||||
'OC\\Encryption\\Update' => $baseDir . '/lib/private/Encryption/Update.php',
|
'OC\\Encryption\\Update' => $baseDir . '/lib/private/Encryption/Update.php',
|
||||||
'OC\\Encryption\\Util' => $baseDir . '/lib/private/Encryption/Util.php',
|
'OC\\Encryption\\Util' => $baseDir . '/lib/private/Encryption/Util.php',
|
||||||
|
'OC\\Federation\\CloudFederationFactory' => $baseDir . '/lib/private/Federation/CloudFederationFactory.php',
|
||||||
|
'OC\\Federation\\CloudFederationNotification' => $baseDir . '/lib/private/Federation/CloudFederationNotification.php',
|
||||||
|
'OC\\Federation\\CloudFederationProviderManager' => $baseDir . '/lib/private/Federation/CloudFederationProviderManager.php',
|
||||||
|
'OC\\Federation\\CloudFederationShare' => $baseDir . '/lib/private/Federation/CloudFederationShare.php',
|
||||||
'OC\\Federation\\CloudId' => $baseDir . '/lib/private/Federation/CloudId.php',
|
'OC\\Federation\\CloudId' => $baseDir . '/lib/private/Federation/CloudId.php',
|
||||||
'OC\\Federation\\CloudIdManager' => $baseDir . '/lib/private/Federation/CloudIdManager.php',
|
'OC\\Federation\\CloudIdManager' => $baseDir . '/lib/private/Federation/CloudIdManager.php',
|
||||||
'OC\\Files\\AppData\\AppData' => $baseDir . '/lib/private/Files/AppData/AppData.php',
|
'OC\\Files\\AppData\\AppData' => $baseDir . '/lib/private/Files/AppData/AppData.php',
|
||||||
|
|
|
@ -162,6 +162,17 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
|
||||||
'OCP\\Encryption\\IFile' => __DIR__ . '/../../..' . '/lib/public/Encryption/IFile.php',
|
'OCP\\Encryption\\IFile' => __DIR__ . '/../../..' . '/lib/public/Encryption/IFile.php',
|
||||||
'OCP\\Encryption\\IManager' => __DIR__ . '/../../..' . '/lib/public/Encryption/IManager.php',
|
'OCP\\Encryption\\IManager' => __DIR__ . '/../../..' . '/lib/public/Encryption/IManager.php',
|
||||||
'OCP\\Encryption\\Keys\\IStorage' => __DIR__ . '/../../..' . '/lib/public/Encryption/Keys/IStorage.php',
|
'OCP\\Encryption\\Keys\\IStorage' => __DIR__ . '/../../..' . '/lib/public/Encryption/Keys/IStorage.php',
|
||||||
|
'OCP\\Federation\\Exceptions\\ActionNotSupportedException' => __DIR__ . '/../../..' . '/lib/public/Federation/Exceptions/ActionNotSupportedException.php',
|
||||||
|
'OCP\\Federation\\Exceptions\\AuthenticationFailedException' => __DIR__ . '/../../..' . '/lib/public/Federation/Exceptions/AuthenticationFailedException.php',
|
||||||
|
'OCP\\Federation\\Exceptions\\BadRequestException' => __DIR__ . '/../../..' . '/lib/public/Federation/Exceptions/BadRequestException.php',
|
||||||
|
'OCP\\Federation\\Exceptions\\ProviderAlreadyExistsException' => __DIR__ . '/../../..' . '/lib/public/Federation/Exceptions/ProviderAlreadyExistsException.php',
|
||||||
|
'OCP\\Federation\\Exceptions\\ProviderCouldNotAddShareException' => __DIR__ . '/../../..' . '/lib/public/Federation/Exceptions/ProviderCouldNotAddShareException.php',
|
||||||
|
'OCP\\Federation\\Exceptions\\ProviderDoesNotExistsException' => __DIR__ . '/../../..' . '/lib/public/Federation/Exceptions/ProviderDoesNotExistsException.php',
|
||||||
|
'OCP\\Federation\\ICloudFederationFactory' => __DIR__ . '/../../..' . '/lib/public/Federation/ICloudFederationFactory.php',
|
||||||
|
'OCP\\Federation\\ICloudFederationNotification' => __DIR__ . '/../../..' . '/lib/public/Federation/ICloudFederationNotification.php',
|
||||||
|
'OCP\\Federation\\ICloudFederationProvider' => __DIR__ . '/../../..' . '/lib/public/Federation/ICloudFederationProvider.php',
|
||||||
|
'OCP\\Federation\\ICloudFederationProviderManager' => __DIR__ . '/../../..' . '/lib/public/Federation/ICloudFederationProviderManager.php',
|
||||||
|
'OCP\\Federation\\ICloudFederationShare' => __DIR__ . '/../../..' . '/lib/public/Federation/ICloudFederationShare.php',
|
||||||
'OCP\\Federation\\ICloudId' => __DIR__ . '/../../..' . '/lib/public/Federation/ICloudId.php',
|
'OCP\\Federation\\ICloudId' => __DIR__ . '/../../..' . '/lib/public/Federation/ICloudId.php',
|
||||||
'OCP\\Federation\\ICloudIdManager' => __DIR__ . '/../../..' . '/lib/public/Federation/ICloudIdManager.php',
|
'OCP\\Federation\\ICloudIdManager' => __DIR__ . '/../../..' . '/lib/public/Federation/ICloudIdManager.php',
|
||||||
'OCP\\Files' => __DIR__ . '/../../..' . '/lib/public/Files.php',
|
'OCP\\Files' => __DIR__ . '/../../..' . '/lib/public/Files.php',
|
||||||
|
@ -690,6 +701,10 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
|
||||||
'OC\\Encryption\\Manager' => __DIR__ . '/../../..' . '/lib/private/Encryption/Manager.php',
|
'OC\\Encryption\\Manager' => __DIR__ . '/../../..' . '/lib/private/Encryption/Manager.php',
|
||||||
'OC\\Encryption\\Update' => __DIR__ . '/../../..' . '/lib/private/Encryption/Update.php',
|
'OC\\Encryption\\Update' => __DIR__ . '/../../..' . '/lib/private/Encryption/Update.php',
|
||||||
'OC\\Encryption\\Util' => __DIR__ . '/../../..' . '/lib/private/Encryption/Util.php',
|
'OC\\Encryption\\Util' => __DIR__ . '/../../..' . '/lib/private/Encryption/Util.php',
|
||||||
|
'OC\\Federation\\CloudFederationFactory' => __DIR__ . '/../../..' . '/lib/private/Federation/CloudFederationFactory.php',
|
||||||
|
'OC\\Federation\\CloudFederationNotification' => __DIR__ . '/../../..' . '/lib/private/Federation/CloudFederationNotification.php',
|
||||||
|
'OC\\Federation\\CloudFederationProviderManager' => __DIR__ . '/../../..' . '/lib/private/Federation/CloudFederationProviderManager.php',
|
||||||
|
'OC\\Federation\\CloudFederationShare' => __DIR__ . '/../../..' . '/lib/private/Federation/CloudFederationShare.php',
|
||||||
'OC\\Federation\\CloudId' => __DIR__ . '/../../..' . '/lib/private/Federation/CloudId.php',
|
'OC\\Federation\\CloudId' => __DIR__ . '/../../..' . '/lib/private/Federation/CloudId.php',
|
||||||
'OC\\Federation\\CloudIdManager' => __DIR__ . '/../../..' . '/lib/private/Federation/CloudIdManager.php',
|
'OC\\Federation\\CloudIdManager' => __DIR__ . '/../../..' . '/lib/private/Federation/CloudIdManager.php',
|
||||||
'OC\\Files\\AppData\\AppData' => __DIR__ . '/../../..' . '/lib/private/Files/AppData/AppData.php',
|
'OC\\Files\\AppData\\AppData' => __DIR__ . '/../../..' . '/lib/private/Files/AppData/AppData.php',
|
||||||
|
|
|
@ -0,0 +1,63 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OC\Federation;
|
||||||
|
|
||||||
|
use OCP\Federation\ICloudFederationFactory;
|
||||||
|
use OCP\Federation\ICloudFederationNotification;
|
||||||
|
use OCP\Federation\ICloudFederationShare;
|
||||||
|
|
||||||
|
class CloudFederationFactory implements ICloudFederationFactory {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get a CloudFederationShare Object to prepare a share you want to send
|
||||||
|
*
|
||||||
|
* @param string $shareWith
|
||||||
|
* @param string $name resource name (e.g. document.odt)
|
||||||
|
* @param string $description share description (optional)
|
||||||
|
* @param string $providerId resource UID on the provider side
|
||||||
|
* @param string $owner provider specific UID of the user who owns the resource
|
||||||
|
* @param string $ownerDisplayName display name of the user who shared the item
|
||||||
|
* @param string $sharedBy provider specific UID of the user who shared the resource
|
||||||
|
* @param string $sharedByDisplayName display name of the user who shared the resource
|
||||||
|
* @param string $sharedSecret used to authenticate requests across servers
|
||||||
|
* @param string $shareType ('group' or 'user' share)
|
||||||
|
* @param $resourceType ('file', 'calendar',...)
|
||||||
|
* @return ICloudFederationShare
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getCloudFederationShare($shareWith, $name, $description, $providerId, $owner, $ownerDisplayName, $sharedBy, $sharedByDisplayName, $sharedSecret, $shareType, $resourceType) {
|
||||||
|
return new CloudFederationShare($shareWith, $name, $description, $providerId, $owner, $ownerDisplayName, $sharedBy, $sharedByDisplayName, $shareType, $resourceType, $sharedSecret);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get a Cloud FederationNotification object to prepare a notification you
|
||||||
|
* want to send
|
||||||
|
*
|
||||||
|
* @return ICloudFederationNotification
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getCloudFederationNotification() {
|
||||||
|
return new CloudFederationNotification();
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,67 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OC\Federation;
|
||||||
|
|
||||||
|
use OCP\Federation\ICloudFederationNotification;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class CloudFederationNotification
|
||||||
|
*
|
||||||
|
* @package OC\Federation
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
class CloudFederationNotification implements ICloudFederationNotification {
|
||||||
|
|
||||||
|
private $message = [];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* add a message to the notification
|
||||||
|
*
|
||||||
|
* @param string $notificationType (e.g. SHARE_ACCEPTED)
|
||||||
|
* @param string $resourceType (e.g. file, calendar, contact,...)
|
||||||
|
* @param string $providerId id of the share
|
||||||
|
* @param array $notification payload of the notification
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function setMessage($notificationType, $resourceType, $providerId, array $notification) {
|
||||||
|
$this->message = [
|
||||||
|
'notificationType' => $notificationType,
|
||||||
|
'resourceType' => $resourceType,
|
||||||
|
'providerId' => $providerId,
|
||||||
|
'notification' => $notification,
|
||||||
|
];
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get message, ready to send out
|
||||||
|
*
|
||||||
|
* @return array
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getMessage() {
|
||||||
|
return $this->message;
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,242 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
namespace OC\Federation;
|
||||||
|
|
||||||
|
use OC\AppFramework\Http;
|
||||||
|
use OCP\App\IAppManager;
|
||||||
|
use OCP\Federation\Exceptions\ProviderDoesNotExistsException;
|
||||||
|
use OCP\Federation\ICloudFederationNotification;
|
||||||
|
use OCP\Federation\ICloudFederationProvider;
|
||||||
|
use OCP\Federation\ICloudFederationProviderManager;
|
||||||
|
use OCP\Federation\ICloudFederationShare;
|
||||||
|
use OCP\Federation\ICloudIdManager;
|
||||||
|
use OCP\Http\Client\IClientService;
|
||||||
|
use OCP\ILogger;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class Manager
|
||||||
|
*
|
||||||
|
* Manage Cloud Federation Providers
|
||||||
|
*
|
||||||
|
* @package OC\Federation
|
||||||
|
*/
|
||||||
|
class CloudFederationProviderManager implements ICloudFederationProviderManager {
|
||||||
|
|
||||||
|
/** @var array list of available cloud federation providers */
|
||||||
|
private $cloudFederationProvider;
|
||||||
|
|
||||||
|
/** @var IAppManager */
|
||||||
|
private $appManager;
|
||||||
|
|
||||||
|
/** @var IClientService */
|
||||||
|
private $httpClientService;
|
||||||
|
|
||||||
|
/** @var ICloudIdManager */
|
||||||
|
private $cloudIdManager;
|
||||||
|
|
||||||
|
/** @var ILogger */
|
||||||
|
private $logger;
|
||||||
|
|
||||||
|
/** @var array cache OCM end-points */
|
||||||
|
private $ocmEndPoints = [];
|
||||||
|
|
||||||
|
private $supportedAPIVersion = '1.0-proposal1';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* CloudFederationProviderManager constructor.
|
||||||
|
*
|
||||||
|
* @param IAppManager $appManager
|
||||||
|
* @param IClientService $httpClientService
|
||||||
|
* @param ICloudIdManager $cloudIdManager
|
||||||
|
* @param ILogger $logger
|
||||||
|
*/
|
||||||
|
public function __construct(IAppManager $appManager,
|
||||||
|
IClientService $httpClientService,
|
||||||
|
ICloudIdManager $cloudIdManager,
|
||||||
|
ILogger $logger) {
|
||||||
|
$this->cloudFederationProvider= [];
|
||||||
|
$this->appManager = $appManager;
|
||||||
|
$this->httpClientService = $httpClientService;
|
||||||
|
$this->cloudIdManager = $cloudIdManager;
|
||||||
|
$this->logger = $logger;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Registers an callback function which must return an cloud federation provider
|
||||||
|
*
|
||||||
|
* @param string $resourceType which resource type does the provider handles
|
||||||
|
* @param string $displayName user facing name of the federated share provider
|
||||||
|
* @param callable $callback
|
||||||
|
*/
|
||||||
|
public function addCloudFederationProvider($resourceType, $displayName, callable $callback) {
|
||||||
|
$this->cloudFederationProvider[$resourceType] = [
|
||||||
|
'resourceType' => $resourceType,
|
||||||
|
'displayName' => $displayName,
|
||||||
|
'callback' => $callback,
|
||||||
|
];
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* remove cloud federation provider
|
||||||
|
*
|
||||||
|
* @param string $providerId
|
||||||
|
*/
|
||||||
|
public function removeCloudFederationProvider($providerId) {
|
||||||
|
unset($this->cloudFederationProvider[$providerId]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get a list of all cloudFederationProviders
|
||||||
|
*
|
||||||
|
* @return array [resourceType => ['resourceType' => $resourceType, 'displayName' => $displayName, 'callback' => callback]]
|
||||||
|
*/
|
||||||
|
public function getAllCloudFederationProviders() {
|
||||||
|
return $this->cloudFederationProvider;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get a specific cloud federation provider
|
||||||
|
*
|
||||||
|
* @param string $resourceType
|
||||||
|
* @return ICloudFederationProvider
|
||||||
|
* @throws ProviderDoesNotExistsException
|
||||||
|
*/
|
||||||
|
public function getCloudFederationProvider($resourceType) {
|
||||||
|
if (isset($this->cloudFederationProvider[$resourceType])) {
|
||||||
|
return call_user_func($this->cloudFederationProvider[$resourceType]['callback']);
|
||||||
|
} else {
|
||||||
|
throw new ProviderDoesNotExistsException($resourceType);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function sendShare(ICloudFederationShare $share) {
|
||||||
|
$cloudID = $this->cloudIdManager->resolveCloudId($share->getShareWith());
|
||||||
|
$ocmEndPoint = $this->getOCMEndPoint($cloudID->getRemote());
|
||||||
|
|
||||||
|
if (empty($ocmEndPoint)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
$client = $this->httpClientService->newClient();
|
||||||
|
try {
|
||||||
|
$response = $client->post($ocmEndPoint . '/shares', [
|
||||||
|
'body' => $share->getShare(),
|
||||||
|
'timeout' => 10,
|
||||||
|
'connect_timeout' => 10,
|
||||||
|
]);
|
||||||
|
|
||||||
|
if ($response->getStatusCode() === Http::STATUS_CREATED) {
|
||||||
|
$result = json_decode($response->getBody(), true);
|
||||||
|
return (is_array($result)) ? $result : [];
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
// if flat re-sharing is not supported by the remote server
|
||||||
|
// we re-throw the exception and fall back to the old behaviour.
|
||||||
|
// (flat re-shares has been introduced in Nextcloud 9.1)
|
||||||
|
if ($e->getCode() === Http::STATUS_INTERNAL_SERVER_ERROR) {
|
||||||
|
throw $e;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $url
|
||||||
|
* @param ICloudFederationNotification $notification
|
||||||
|
* @return mixed
|
||||||
|
*/
|
||||||
|
public function sendNotification($url, ICloudFederationNotification $notification) {
|
||||||
|
$ocmEndPoint = $this->getOCMEndPoint($url);
|
||||||
|
|
||||||
|
if (empty($ocmEndPoint)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
$client = $this->httpClientService->newClient();
|
||||||
|
try {
|
||||||
|
$response = $client->post($ocmEndPoint . '/notifications', [
|
||||||
|
'body' => $notification->getMessage(),
|
||||||
|
'timeout' => 10,
|
||||||
|
'connect_timeout' => 10,
|
||||||
|
]);
|
||||||
|
if ($response->getStatusCode() === Http::STATUS_CREATED) {
|
||||||
|
$result = json_decode($response->getBody(), true);
|
||||||
|
return (is_array($result)) ? $result : [];
|
||||||
|
}
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
// log the error and return false
|
||||||
|
$this->logger->error('error while sending notification for federated share: ' . $e->getMessage());
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* check if the new cloud federation API is ready to be used
|
||||||
|
*
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function isReady() {
|
||||||
|
return $this->appManager->isEnabledForUser('cloud_federation_api');
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
* check if server supports the new OCM api and ask for the correct end-point
|
||||||
|
*
|
||||||
|
* @param string $url full base URL of the cloud server
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
protected function getOCMEndPoint($url) {
|
||||||
|
|
||||||
|
if (isset($this->ocmEndPoints[$url])) {
|
||||||
|
return $this->ocmEndPoints[$url];
|
||||||
|
}
|
||||||
|
|
||||||
|
$client = $this->httpClientService->newClient();
|
||||||
|
try {
|
||||||
|
$response = $client->get($url . '/ocm-provider/', ['timeout' => 10, 'connect_timeout' => 10]);
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
$this->ocmEndPoints[$url] = '';
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
$result = $response->getBody();
|
||||||
|
$result = json_decode($result, true);
|
||||||
|
|
||||||
|
$supportedVersion = isset($result['apiVersion']) && $result['apiVersion'] === $this->supportedAPIVersion;
|
||||||
|
|
||||||
|
if (isset($result['endPoint']) && $supportedVersion) {
|
||||||
|
$this->ocmEndPoints[$url] = $result['endPoint'];
|
||||||
|
return $result['endPoint'];
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->ocmEndPoints[$url] = '';
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,352 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OC\Federation;
|
||||||
|
|
||||||
|
use OCP\Federation\ICloudFederationShare;
|
||||||
|
|
||||||
|
class CloudFederationShare implements ICloudFederationShare {
|
||||||
|
|
||||||
|
private $share = [
|
||||||
|
'shareWith' => '',
|
||||||
|
'shareType' => '',
|
||||||
|
'name' => '',
|
||||||
|
'resourceType' => '',
|
||||||
|
'description' => '',
|
||||||
|
'providerId' => '',
|
||||||
|
'owner' => '',
|
||||||
|
'ownerDisplayName' => '',
|
||||||
|
'sharedBy' => '',
|
||||||
|
'sharedByDisplayName' => '',
|
||||||
|
'protocol' => []
|
||||||
|
];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get a CloudFederationShare Object to prepare a share you want to send
|
||||||
|
*
|
||||||
|
* @param string $shareWith
|
||||||
|
* @param string $name resource name (e.g. document.odt)
|
||||||
|
* @param string $description share description (optional)
|
||||||
|
* @param string $providerId resource UID on the provider side
|
||||||
|
* @param string $owner provider specific UID of the user who owns the resource
|
||||||
|
* @param string $ownerDisplayName display name of the user who shared the item
|
||||||
|
* @param string $sharedBy provider specific UID of the user who shared the resource
|
||||||
|
* @param string $sharedByDisplayName display name of the user who shared the resource
|
||||||
|
* @param string $shareType ('group' or 'user' share)
|
||||||
|
* @param string $resourceType ('file', 'calendar',...)
|
||||||
|
* @param string $sharedSecret
|
||||||
|
*/
|
||||||
|
public function __construct($shareWith = '',
|
||||||
|
$name = '',
|
||||||
|
$description = '',
|
||||||
|
$providerId = '',
|
||||||
|
$owner = '',
|
||||||
|
$ownerDisplayName = '',
|
||||||
|
$sharedBy = '',
|
||||||
|
$sharedByDisplayName = '',
|
||||||
|
$shareType = '',
|
||||||
|
$resourceType = '',
|
||||||
|
$sharedSecret = ''
|
||||||
|
) {
|
||||||
|
$this->setShareWith($shareWith);
|
||||||
|
$this->setResourceName($name);
|
||||||
|
$this->setDescription($description);
|
||||||
|
$this->setProviderId($providerId);
|
||||||
|
$this->setOwner($owner);
|
||||||
|
$this->setOwnerDisplayName($ownerDisplayName);
|
||||||
|
$this->setSharedBy($sharedBy);
|
||||||
|
$this->setSharedByDisplayName($sharedByDisplayName);
|
||||||
|
$this->setProtocol([
|
||||||
|
'name' => 'webdav',
|
||||||
|
'options' => [
|
||||||
|
'sharedSecret' => $sharedSecret,
|
||||||
|
'permissions' => '{http://open-cloud-mesh.org/ns}share-permissions'
|
||||||
|
]
|
||||||
|
]);
|
||||||
|
$this->setShareType($shareType);
|
||||||
|
$this->setResourceType($resourceType);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* set uid of the recipient
|
||||||
|
*
|
||||||
|
* @param string $user
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function setShareWith($user) {
|
||||||
|
$this->share['shareWith'] = $user;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* set resource name (e.g. document.odt)
|
||||||
|
*
|
||||||
|
* @param string $name
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function setResourceName($name) {
|
||||||
|
$this->share['name'] = $name;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* set resource type (e.g. file, calendar, contact,...)
|
||||||
|
*
|
||||||
|
* @param string $resourceType
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function setResourceType($resourceType) {
|
||||||
|
$this->share['resourceType'] = $resourceType;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* set resource description (optional)
|
||||||
|
*
|
||||||
|
* @param string $description
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function setDescription($description) {
|
||||||
|
$this->share['description'] = $description;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* set provider ID (e.g. file ID)
|
||||||
|
*
|
||||||
|
* @param string $providerId
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function setProviderId($providerId) {
|
||||||
|
$this->share['providerId'] = $providerId;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* set owner UID
|
||||||
|
*
|
||||||
|
* @param string $owner
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function setOwner($owner) {
|
||||||
|
$this->share['owner'] = $owner;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* set owner display name
|
||||||
|
*
|
||||||
|
* @param string $ownerDisplayName
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function setOwnerDisplayName($ownerDisplayName) {
|
||||||
|
$this->share['ownerDisplayName'] = $ownerDisplayName;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* set UID of the user who sends the share
|
||||||
|
*
|
||||||
|
* @param string $sharedBy
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function setSharedBy($sharedBy) {
|
||||||
|
$this->share['sharedBy'] = $sharedBy;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* set display name of the user who sends the share
|
||||||
|
*
|
||||||
|
* @param $sharedByDisplayName
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function setSharedByDisplayName($sharedByDisplayName) {
|
||||||
|
$this->share['sharedByDisplayName'] = $sharedByDisplayName;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* set protocol specification
|
||||||
|
*
|
||||||
|
* @param array $protocol
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function setProtocol(array $protocol) {
|
||||||
|
$this->share['protocol'] = $protocol;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* share type (group or user)
|
||||||
|
*
|
||||||
|
* @param string $shareType
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function setShareType($shareType) {
|
||||||
|
$this->share['shareType'] = $shareType;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get the whole share, ready to send out
|
||||||
|
*
|
||||||
|
* @return array
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getShare() {
|
||||||
|
return $this->share;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get uid of the recipient
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getShareWith() {
|
||||||
|
return $this->share['shareWith'];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get resource name (e.g. file, calendar, contact,...)
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getResourceName() {
|
||||||
|
return $this->share['name'];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get resource type (e.g. file, calendar, contact,...)
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getResourceType() {
|
||||||
|
return $this->share['resourceType'];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get resource description (optional)
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getDescription() {
|
||||||
|
return $this->share['description'];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get provider ID (e.g. file ID)
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getProviderId() {
|
||||||
|
return $this->share['providerId'];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get owner UID
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getOwner() {
|
||||||
|
return $this->share['owner'];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get owner display name
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getOwnerDisplayName() {
|
||||||
|
return $this->share['ownerDisplayName'];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get UID of the user who sends the share
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getSharedBy() {
|
||||||
|
return $this->share['sharedBy'];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get display name of the user who sends the share
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getSharedByDisplayName() {
|
||||||
|
return $this->share['sharedByDisplayName'];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get share type (group or user)
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getShareType() {
|
||||||
|
return $this->share['shareType'];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get share Secret
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getShareSecret() {
|
||||||
|
return $this->share['protocol']['options']['sharedSecret'];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get protocol specification
|
||||||
|
*
|
||||||
|
* @return array
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getProtocol() {
|
||||||
|
return $this->share['protocol'];
|
||||||
|
}
|
||||||
|
}
|
|
@ -68,6 +68,8 @@ use OC\Contacts\ContactsMenu\ActionFactory;
|
||||||
use OC\Contacts\ContactsMenu\ContactsStore;
|
use OC\Contacts\ContactsMenu\ContactsStore;
|
||||||
use OC\Diagnostics\EventLogger;
|
use OC\Diagnostics\EventLogger;
|
||||||
use OC\Diagnostics\QueryLogger;
|
use OC\Diagnostics\QueryLogger;
|
||||||
|
use OC\Federation\CloudFederationFactory;
|
||||||
|
use OC\Federation\CloudFederationProviderManager;
|
||||||
use OC\Federation\CloudIdManager;
|
use OC\Federation\CloudIdManager;
|
||||||
use OC\Files\Config\UserMountCache;
|
use OC\Files\Config\UserMountCache;
|
||||||
use OC\Files\Config\UserMountCacheListener;
|
use OC\Files\Config\UserMountCacheListener;
|
||||||
|
@ -124,9 +126,12 @@ use OCP\Collaboration\AutoComplete\IManager;
|
||||||
use OCP\Contacts\ContactsMenu\IContactsStore;
|
use OCP\Contacts\ContactsMenu\IContactsStore;
|
||||||
use OCP\Defaults;
|
use OCP\Defaults;
|
||||||
use OCA\Theming\Util;
|
use OCA\Theming\Util;
|
||||||
|
use OCP\Federation\ICloudFederationFactory;
|
||||||
|
use OCP\Federation\ICloudFederationProviderManager;
|
||||||
use OCP\Federation\ICloudIdManager;
|
use OCP\Federation\ICloudIdManager;
|
||||||
use OCP\Authentication\LoginCredentials\IStore;
|
use OCP\Authentication\LoginCredentials\IStore;
|
||||||
use OCP\Files\NotFoundException;
|
use OCP\Files\NotFoundException;
|
||||||
|
use OCP\GlobalScale\IConfig;
|
||||||
use OCP\ICacheFactory;
|
use OCP\ICacheFactory;
|
||||||
use OCP\IDBConnection;
|
use OCP\IDBConnection;
|
||||||
use OCP\IL10N;
|
use OCP\IL10N;
|
||||||
|
@ -1107,6 +1112,18 @@ class Server extends ServerContainer implements IServerContainer {
|
||||||
return new CloudIdManager();
|
return new CloudIdManager();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$this->registerService(IConfig::class, function (Server $c) {
|
||||||
|
return new GlobalScale\Config($c->getConfig());
|
||||||
|
});
|
||||||
|
|
||||||
|
$this->registerService(ICloudFederationProviderManager::class, function (Server $c) {
|
||||||
|
return new CloudFederationProviderManager($c->getAppManager(), $c->getHTTPClientService(), $c->getCloudIdManager(), $c->getLogger());
|
||||||
|
});
|
||||||
|
|
||||||
|
$this->registerService(ICloudFederationFactory::class, function (Server $c) {
|
||||||
|
return new CloudFederationFactory();
|
||||||
|
});
|
||||||
|
|
||||||
$this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
|
$this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
|
||||||
$this->registerAlias('ControllerMethodReflector', \OCP\AppFramework\Utility\IControllerMethodReflector::class);
|
$this->registerAlias('ControllerMethodReflector', \OCP\AppFramework\Utility\IControllerMethodReflector::class);
|
||||||
|
|
||||||
|
@ -1973,6 +1990,20 @@ class Server extends ServerContainer implements IServerContainer {
|
||||||
return $this->query(ICloudIdManager::class);
|
return $this->query(ICloudIdManager::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return \OCP\GlobalScale\IConfig
|
||||||
|
*/
|
||||||
|
public function getGlobalScaleConfig() {
|
||||||
|
return $this->query(IConfig::class);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return \OCP\Federation\ICloudFederationProviderManager
|
||||||
|
*/
|
||||||
|
public function getCloudFederationProviderManager() {
|
||||||
|
return $this->query(ICloudFederationProviderManager::class);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return \OCP\Remote\Api\IApiFactory
|
* @return \OCP\Remote\Api\IApiFactory
|
||||||
*/
|
*/
|
||||||
|
@ -1980,6 +2011,13 @@ class Server extends ServerContainer implements IServerContainer {
|
||||||
return $this->query(IApiFactory::class);
|
return $this->query(IApiFactory::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return \OCP\Federation\ICloudFederationFactory
|
||||||
|
*/
|
||||||
|
public function getCloudFederationFactory() {
|
||||||
|
return $this->query(ICloudFederationFactory::class);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return \OCP\Remote\IInstanceFactory
|
* @return \OCP\Remote\IInstanceFactory
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -29,10 +29,10 @@
|
||||||
namespace OC\Share20;
|
namespace OC\Share20;
|
||||||
|
|
||||||
use OC\CapabilitiesManager;
|
use OC\CapabilitiesManager;
|
||||||
use OC\GlobalScale\Config;
|
|
||||||
use OCA\FederatedFileSharing\AddressHandler;
|
use OCA\FederatedFileSharing\AddressHandler;
|
||||||
use OCA\FederatedFileSharing\FederatedShareProvider;
|
use OCA\FederatedFileSharing\FederatedShareProvider;
|
||||||
use OCA\FederatedFileSharing\Notifications;
|
use OCA\FederatedFileSharing\Notifications;
|
||||||
|
use OCA\FederatedFileSharing\OCM\CloudFederationProvider;
|
||||||
use OCA\FederatedFileSharing\TokenHandler;
|
use OCA\FederatedFileSharing\TokenHandler;
|
||||||
use OCA\ShareByMail\Settings\SettingsManager;
|
use OCA\ShareByMail\Settings\SettingsManager;
|
||||||
use OCA\ShareByMail\ShareByMailProvider;
|
use OCA\ShareByMail\ShareByMailProvider;
|
||||||
|
@ -116,7 +116,9 @@ class ProviderFactory implements IProviderFactory {
|
||||||
$addressHandler,
|
$addressHandler,
|
||||||
$this->serverContainer->getHTTPClientService(),
|
$this->serverContainer->getHTTPClientService(),
|
||||||
$this->serverContainer->query(\OCP\OCS\IDiscoveryService::class),
|
$this->serverContainer->query(\OCP\OCS\IDiscoveryService::class),
|
||||||
$this->serverContainer->getJobList()
|
$this->serverContainer->getJobList(),
|
||||||
|
\OC::$server->getCloudFederationProviderManager(),
|
||||||
|
\OC::$server->getCloudFederationFactory()
|
||||||
);
|
);
|
||||||
$tokenHandler = new TokenHandler(
|
$tokenHandler = new TokenHandler(
|
||||||
$this->serverContainer->getSecureRandom()
|
$this->serverContainer->getSecureRandom()
|
||||||
|
@ -133,7 +135,7 @@ class ProviderFactory implements IProviderFactory {
|
||||||
$this->serverContainer->getConfig(),
|
$this->serverContainer->getConfig(),
|
||||||
$this->serverContainer->getUserManager(),
|
$this->serverContainer->getUserManager(),
|
||||||
$this->serverContainer->getCloudIdManager(),
|
$this->serverContainer->getCloudIdManager(),
|
||||||
$this->serverContainer->query(Config::class)
|
$this->serverContainer->getGlobalScaleConfig()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,48 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OCP\Federation\Exceptions;
|
||||||
|
|
||||||
|
use OC\HintException;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class ActionNotSupportedException
|
||||||
|
*
|
||||||
|
* @package OCP\Federation\Exceptions
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
class ActionNotSupportedException extends HintException {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ActionNotSupportedException constructor.
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public function __construct($action) {
|
||||||
|
$l = \OC::$server->getL10N('federation');
|
||||||
|
$message = 'Action "' . $action . '" not supported or implemented.';
|
||||||
|
$hint = $l->t('Action "%s" not supported or implemented.', [$action]);
|
||||||
|
parent::__construct($message, $hint);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,48 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OCP\Federation\Exceptions;
|
||||||
|
|
||||||
|
use OC\HintException;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class AuthenticationFailedException
|
||||||
|
*
|
||||||
|
* @package OCP\Federation\Exceptions
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
class AuthenticationFailedException extends HintException {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* BadRequestException constructor.
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public function __construct() {
|
||||||
|
$l = \OC::$server->getL10N('federation');
|
||||||
|
$message = 'Authentication failed, wrong token or provider ID given';
|
||||||
|
$hint = $l->t('Authentication failed, wrong token or provider ID given');
|
||||||
|
parent::__construct($message, $hint);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,77 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OCP\Federation\Exceptions;
|
||||||
|
|
||||||
|
use OC\HintException;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class BadRequestException
|
||||||
|
*
|
||||||
|
* @package OCP\Federation\Exceptions
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
class BadRequestException extends HintException {
|
||||||
|
|
||||||
|
private $parameterList;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* BadRequestException constructor.
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*
|
||||||
|
* @param array $missingParameters
|
||||||
|
*/
|
||||||
|
public function __construct(array $missingParameters) {
|
||||||
|
$l = \OC::$server->getL10N('federation');
|
||||||
|
$this->parameterList = $missingParameters;
|
||||||
|
$parameterList = implode(',', $missingParameters);
|
||||||
|
$message = 'Parameters missing in order to complete the request. Missing Parameters: ' . $parameterList;
|
||||||
|
$hint = $l->t('Parameters missing in order to complete the request. Missing Parameters: "%s"', [$parameterList]);
|
||||||
|
parent::__construct($message, $hint);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get array with the return message as defined in the OCM API
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
public function getReturnMessage() {
|
||||||
|
$result = [
|
||||||
|
'message' => 'RESOURCE_NOT_FOUND',
|
||||||
|
'validationErrors' =>[
|
||||||
|
]
|
||||||
|
];
|
||||||
|
|
||||||
|
foreach ($this->parameterList as $missingParameter) {
|
||||||
|
$result['validationErrors'] = [
|
||||||
|
'name' => $missingParameter,
|
||||||
|
'message' => 'NOT_FOUND'
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,50 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OCP\Federation\Exceptions;
|
||||||
|
|
||||||
|
use OC\HintException;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class ProviderAlreadyExistsException
|
||||||
|
*
|
||||||
|
* @package OCP\Federation\Exceptions
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
class ProviderAlreadyExistsException extends HintException {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ProviderAlreadyExistsException constructor.
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*
|
||||||
|
* @param string $newProviderId cloud federation provider ID of the new provider
|
||||||
|
* @param string $existingProviderName name of cloud federation provider which already use the same ID
|
||||||
|
*/
|
||||||
|
public function __construct($newProviderId, $existingProviderName) {
|
||||||
|
$l = \OC::$server->getL10N('federation');
|
||||||
|
$message = 'Id "' . $newProviderId . '" already used by cloud federation provider "' . $existingProviderName . '"';
|
||||||
|
$hint = $l->t('Id "%s" already used by cloud federation provider "%s"', [$newProviderId, $existingProviderName]);
|
||||||
|
parent::__construct($message, $hint);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,51 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OCP\Federation\Exceptions;
|
||||||
|
|
||||||
|
use OC\HintException;
|
||||||
|
use OCP\AppFramework\Http;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class ProviderCouldNotAddShareException
|
||||||
|
*
|
||||||
|
* @package OCP\Federation\Exceptions
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
class ProviderCouldNotAddShareException extends HintException {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ProviderCouldNotAddShareException constructor.
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*
|
||||||
|
* @param string $message
|
||||||
|
* @param string $hint
|
||||||
|
* @param int $code
|
||||||
|
* @param \Exception|null $previous
|
||||||
|
*/
|
||||||
|
public function __construct($message, $hint = '', $code = Http::STATUS_BAD_REQUEST, \Exception $previous = null) {
|
||||||
|
parent::__construct($message, $hint, $code, $previous);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,49 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OCP\Federation\Exceptions;
|
||||||
|
|
||||||
|
use OC\HintException;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class ProviderDoesNotExistsException
|
||||||
|
*
|
||||||
|
* @package OCP\Federation\Exceptions
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
class ProviderDoesNotExistsException extends HintException {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ProviderDoesNotExistsException constructor.
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*
|
||||||
|
* @param string $providerId cloud federation provider ID
|
||||||
|
*/
|
||||||
|
public function __construct($providerId) {
|
||||||
|
$l = \OC::$server->getL10N('federation');
|
||||||
|
$message = 'Cloud Federation Provider with ID: "' . $providerId . '" does not exist.';
|
||||||
|
$hint = $l->t('Cloud Federation Provider with ID: "%s" does not exist.', [$providerId]);
|
||||||
|
parent::__construct($message, $hint);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,62 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OCP\Federation;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Interface ICloudFederationFactory
|
||||||
|
*
|
||||||
|
* @package OCP\Federation
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
interface ICloudFederationFactory {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get a CloudFederationShare Object to prepare a share you want to send
|
||||||
|
*
|
||||||
|
* @param string $shareWith
|
||||||
|
* @param string $name resource name (e.g. document.odt)
|
||||||
|
* @param string $description share description (optional)
|
||||||
|
* @param string $providerId resource UID on the provider side
|
||||||
|
* @param string $owner provider specific UID of the user who owns the resource
|
||||||
|
* @param string $ownerDisplayName display name of the user who shared the item
|
||||||
|
* @param string $sharedBy provider specific UID of the user who shared the resource
|
||||||
|
* @param string $sharedByDisplayName display name of the user who shared the resource
|
||||||
|
* @param string $sharedSecret used to authenticate requests across servers
|
||||||
|
* @param string $shareType ('group' or 'user' share)
|
||||||
|
* @param $resourceType ('file', 'calendar',...)
|
||||||
|
* @return ICloudFederationShare
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getCloudFederationShare($shareWith, $name, $description, $providerId, $owner, $ownerDisplayName, $sharedBy, $sharedByDisplayName, $sharedSecret, $shareType, $resourceType);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get a Cloud FederationNotification object to prepare a notification you
|
||||||
|
* want to send
|
||||||
|
*
|
||||||
|
* @return ICloudFederationNotification
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getCloudFederationNotification();
|
||||||
|
}
|
|
@ -0,0 +1,53 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OCP\Federation;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Interface ICloudFederationNotification
|
||||||
|
*
|
||||||
|
* @package OCP\Federation
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
interface ICloudFederationNotification {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* add a message to the notification
|
||||||
|
*
|
||||||
|
* @param string $notificationType (e.g. SHARE_ACCEPTED)
|
||||||
|
* @param string $resourceType (e.g. file, calendar, contact,...)
|
||||||
|
* @param $providerId id of the share
|
||||||
|
* @param array $notification , payload of the notification
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function setMessage($notificationType, $resourceType, $providerId, array $notification);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get message, ready to send out
|
||||||
|
*
|
||||||
|
* @return array
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getMessage();
|
||||||
|
}
|
|
@ -0,0 +1,89 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OCP\Federation;
|
||||||
|
|
||||||
|
use OCP\Federation\Exceptions\ActionNotSupportedException;
|
||||||
|
use OCP\Federation\Exceptions\AuthenticationFailedException;
|
||||||
|
use OCP\Federation\Exceptions\BadRequestException;
|
||||||
|
use OCP\Federation\Exceptions\ProviderCouldNotAddShareException;
|
||||||
|
use \OCP\Share\Exceptions\ShareNotFound;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Interface ICloudFederationProvider
|
||||||
|
*
|
||||||
|
* Enable apps to create their own cloud federation provider
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*
|
||||||
|
* @package OCP\Federation
|
||||||
|
*/
|
||||||
|
|
||||||
|
interface ICloudFederationProvider {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get the name of the share type, handled by this provider
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getShareType();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* share received from another server
|
||||||
|
*
|
||||||
|
* @param ICloudFederationShare $share
|
||||||
|
* @return string provider specific unique ID of the share
|
||||||
|
*
|
||||||
|
* @throws ProviderCouldNotAddShareException
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function shareReceived(ICloudFederationShare $share);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* notification received from another server
|
||||||
|
*
|
||||||
|
* @param string $notificationType (e.g SHARE_ACCEPTED)
|
||||||
|
* @param string $providerId share ID
|
||||||
|
* @param array $notification provider specific notification
|
||||||
|
* @return array $data send back to sender
|
||||||
|
*
|
||||||
|
* @throws ShareNotFound
|
||||||
|
* @throws ActionNotSupportedException
|
||||||
|
* @throws BadRequestException
|
||||||
|
* @throws AuthenticationFailedException
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function notificationReceived($notificationType, $providerId, array $notification);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get the supported share types, e.g. "user", "group", etc.
|
||||||
|
*
|
||||||
|
* @return array
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getSupportedShareTypes();
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,107 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OCP\Federation;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class ICloudFederationProviderManager
|
||||||
|
*
|
||||||
|
* Manage cloud federation providers
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*
|
||||||
|
* @package OCP\Federation
|
||||||
|
*/
|
||||||
|
interface ICloudFederationProviderManager {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Registers an callback function which must return an cloud federation provider
|
||||||
|
*
|
||||||
|
* @param string $resourceType which resource type does the provider handles
|
||||||
|
* @param string $displayName user facing name of the federated share provider
|
||||||
|
* @param callable $callback
|
||||||
|
* @throws Exceptions\ProviderAlreadyExistsException
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function addCloudFederationProvider($resourceType, $displayName, callable $callback);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* remove cloud federation provider
|
||||||
|
*
|
||||||
|
* @param string $resourceType
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function removeCloudFederationProvider($resourceType);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get a list of all cloudFederationProviders
|
||||||
|
*
|
||||||
|
* @return array [resourceType => ['resourceType' => $resourceType, 'displayName' => $displayName, 'callback' => callback]]
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getAllCloudFederationProviders();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get a specific cloud federation provider
|
||||||
|
*
|
||||||
|
* @param string $resourceType
|
||||||
|
* @return ICloudFederationProvider
|
||||||
|
* @throws Exceptions\ProviderDoesNotExistsException;
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getCloudFederationProvider($resourceType);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* send federated share
|
||||||
|
*
|
||||||
|
* @param ICloudFederationShare $share
|
||||||
|
* @return mixed
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function sendShare(ICloudFederationShare $share);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* send notification about existing share
|
||||||
|
*
|
||||||
|
* @param string $url
|
||||||
|
* @param ICloudFederationNotification $notification
|
||||||
|
* @return mixed
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function sendNotification($url, ICloudFederationNotification $notification);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* check if the new cloud federation API is ready to be used
|
||||||
|
*
|
||||||
|
* @return bool
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function isReady();
|
||||||
|
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,250 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OCP\Federation;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Interface ICloudFederationShare
|
||||||
|
*
|
||||||
|
* @package OCP\Federation
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
interface ICloudFederationShare {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* set uid of the recipient
|
||||||
|
*
|
||||||
|
* @param string $user
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function setShareWith($user);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* set resource name (e.g. file, calendar, contact,...)
|
||||||
|
*
|
||||||
|
* @param string $name
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function setResourceName($name);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* set resource type (e.g. file, calendar, contact,...)
|
||||||
|
*
|
||||||
|
* @param string $resourceType
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function setResourceType($resourceType);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* set resource description (optional)
|
||||||
|
*
|
||||||
|
* @param string $description
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function setDescription($description);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* set provider ID (e.g. file ID)
|
||||||
|
*
|
||||||
|
* @param string $providerId
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function setProviderId($providerId);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* set owner UID
|
||||||
|
*
|
||||||
|
* @param string $owner
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function setOwner($owner);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* set owner display name
|
||||||
|
*
|
||||||
|
* @param string $ownerDisplayName
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function setOwnerDisplayName($ownerDisplayName);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* set UID of the user who sends the share
|
||||||
|
*
|
||||||
|
* @param string $sharedBy
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function setSharedBy($sharedBy);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* set display name of the user who sends the share
|
||||||
|
*
|
||||||
|
* @param $sharedByDisplayName
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function setSharedByDisplayName($sharedByDisplayName);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* set protocol specification
|
||||||
|
*
|
||||||
|
* @param array $protocol
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function setProtocol(array $protocol);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* share type (group or user)
|
||||||
|
*
|
||||||
|
* @param string $shareType
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function setShareType($shareType);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get the whole share, ready to send out
|
||||||
|
*
|
||||||
|
* @return array
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getShare();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get uid of the recipient
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getShareWith();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get resource name (e.g. file, calendar, contact,...)
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getResourceName();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get resource type (e.g. file, calendar, contact,...)
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getResourceType();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get resource description (optional)
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getDescription();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get provider ID (e.g. file ID)
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getProviderId();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get owner UID
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getOwner();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get owner display name
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getOwnerDisplayName();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get UID of the user who sends the share
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getSharedBy();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get display name of the user who sends the share
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getSharedByDisplayName();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get share type (group or user)
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getShareType();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get share Secret
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getShareSecret();
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get protocol specification
|
||||||
|
*
|
||||||
|
* @return array
|
||||||
|
*
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getProtocol();
|
||||||
|
|
||||||
|
}
|
|
@ -45,6 +45,8 @@
|
||||||
// This means that they should be used by apps instead of the internal ownCloud classes
|
// This means that they should be used by apps instead of the internal ownCloud classes
|
||||||
namespace OCP;
|
namespace OCP;
|
||||||
use OCP\Log\ILogFactory;
|
use OCP\Log\ILogFactory;
|
||||||
|
use OCP\Federation\ICloudFederationFactory;
|
||||||
|
use OCP\Federation\ICloudFederationProviderManager;
|
||||||
use OCP\Security\IContentSecurityPolicyManager;
|
use OCP\Security\IContentSecurityPolicyManager;
|
||||||
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
|
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
|
||||||
|
|
||||||
|
@ -553,6 +555,24 @@ interface IServerContainer extends IContainer {
|
||||||
*/
|
*/
|
||||||
public function getCloudIdManager();
|
public function getCloudIdManager();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return \OCP\GlobalScale\IConfig
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getGlobalScaleConfig();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return ICloudFederationFactory
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getCloudFederationFactory();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return ICloudFederationProviderManager
|
||||||
|
* @since 14.0.0
|
||||||
|
*/
|
||||||
|
public function getCloudFederationProviderManager();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return \OCP\Remote\Api\IApiFactory
|
* @return \OCP\Remote\Api\IApiFactory
|
||||||
* @since 13.0.0
|
* @since 13.0.0
|
||||||
|
|
|
@ -25,7 +25,6 @@
|
||||||
namespace OCP\Share;
|
namespace OCP\Share;
|
||||||
|
|
||||||
use OCP\Files\Folder;
|
use OCP\Files\Folder;
|
||||||
use OCP\Share\Exceptions\ShareNotFound;
|
|
||||||
use OCP\Files\Node;
|
use OCP\Files\Node;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -0,0 +1,39 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
require_once __DIR__ . '/../lib/base.php';
|
||||||
|
|
||||||
|
header('Content-Type: application/json');
|
||||||
|
|
||||||
|
$server = \OC::$server;
|
||||||
|
|
||||||
|
$isEnabled = $server->getAppManager()->isEnabledForUser('cloud_federation_api');
|
||||||
|
|
||||||
|
if ($isEnabled) {
|
||||||
|
$capabilities = new OCA\CloudFederationAPI\Capabilities($server->getURLGenerator());
|
||||||
|
header('Content-Type: application/json');
|
||||||
|
echo json_encode($capabilities->getCapabilities()['ocm']);
|
||||||
|
} else {
|
||||||
|
header($_SERVER["SERVER_PROTOCOL"]." 501 Not Implemented", true, 501);
|
||||||
|
exit("501 Not Implemented");
|
||||||
|
}
|
||||||
|
|
|
@ -330,6 +330,7 @@ class AppManagerTest extends TestCase {
|
||||||
$this->appConfig->setValue('test2', 'enabled', 'no');
|
$this->appConfig->setValue('test2', 'enabled', 'no');
|
||||||
$this->appConfig->setValue('test3', 'enabled', '["foo"]');
|
$this->appConfig->setValue('test3', 'enabled', '["foo"]');
|
||||||
$apps = [
|
$apps = [
|
||||||
|
'cloud_federation_api',
|
||||||
'dav',
|
'dav',
|
||||||
'federatedfilesharing',
|
'federatedfilesharing',
|
||||||
'files',
|
'files',
|
||||||
|
@ -356,6 +357,7 @@ class AppManagerTest extends TestCase {
|
||||||
$this->appConfig->setValue('test3', 'enabled', '["foo"]');
|
$this->appConfig->setValue('test3', 'enabled', '["foo"]');
|
||||||
$this->appConfig->setValue('test4', 'enabled', '["asd"]');
|
$this->appConfig->setValue('test4', 'enabled', '["asd"]');
|
||||||
$enabled = [
|
$enabled = [
|
||||||
|
'cloud_federation_api',
|
||||||
'dav',
|
'dav',
|
||||||
'federatedfilesharing',
|
'federatedfilesharing',
|
||||||
'files',
|
'files',
|
||||||
|
@ -378,6 +380,7 @@ class AppManagerTest extends TestCase {
|
||||||
->getMock();
|
->getMock();
|
||||||
|
|
||||||
$appInfos = [
|
$appInfos = [
|
||||||
|
'cloud_federation_api' => ['id' => 'cloud_federation_api'],
|
||||||
'dav' => ['id' => 'dav'],
|
'dav' => ['id' => 'dav'],
|
||||||
'files' => ['id' => 'files'],
|
'files' => ['id' => 'files'],
|
||||||
'federatedfilesharing' => ['id' => 'federatedfilesharing'],
|
'federatedfilesharing' => ['id' => 'federatedfilesharing'],
|
||||||
|
@ -425,6 +428,7 @@ class AppManagerTest extends TestCase {
|
||||||
->getMock();
|
->getMock();
|
||||||
|
|
||||||
$appInfos = [
|
$appInfos = [
|
||||||
|
'cloud_federation_api' => ['id' => 'cloud_federation_api'],
|
||||||
'dav' => ['id' => 'dav'],
|
'dav' => ['id' => 'dav'],
|
||||||
'files' => ['id' => 'files'],
|
'files' => ['id' => 'files'],
|
||||||
'federatedfilesharing' => ['id' => 'federatedfilesharing'],
|
'federatedfilesharing' => ['id' => 'federatedfilesharing'],
|
||||||
|
|
|
@ -338,6 +338,7 @@ class AppTest extends \Test\TestCase {
|
||||||
'app3',
|
'app3',
|
||||||
'appforgroup1',
|
'appforgroup1',
|
||||||
'appforgroup12',
|
'appforgroup12',
|
||||||
|
'cloud_federation_api',
|
||||||
'dav',
|
'dav',
|
||||||
'federatedfilesharing',
|
'federatedfilesharing',
|
||||||
'lookup_server_connector',
|
'lookup_server_connector',
|
||||||
|
@ -357,6 +358,7 @@ class AppTest extends \Test\TestCase {
|
||||||
'app3',
|
'app3',
|
||||||
'appforgroup12',
|
'appforgroup12',
|
||||||
'appforgroup2',
|
'appforgroup2',
|
||||||
|
'cloud_federation_api',
|
||||||
'dav',
|
'dav',
|
||||||
'federatedfilesharing',
|
'federatedfilesharing',
|
||||||
'lookup_server_connector',
|
'lookup_server_connector',
|
||||||
|
@ -377,6 +379,7 @@ class AppTest extends \Test\TestCase {
|
||||||
'appforgroup1',
|
'appforgroup1',
|
||||||
'appforgroup12',
|
'appforgroup12',
|
||||||
'appforgroup2',
|
'appforgroup2',
|
||||||
|
'cloud_federation_api',
|
||||||
'dav',
|
'dav',
|
||||||
'federatedfilesharing',
|
'federatedfilesharing',
|
||||||
'lookup_server_connector',
|
'lookup_server_connector',
|
||||||
|
@ -397,6 +400,7 @@ class AppTest extends \Test\TestCase {
|
||||||
'appforgroup1',
|
'appforgroup1',
|
||||||
'appforgroup12',
|
'appforgroup12',
|
||||||
'appforgroup2',
|
'appforgroup2',
|
||||||
|
'cloud_federation_api',
|
||||||
'dav',
|
'dav',
|
||||||
'federatedfilesharing',
|
'federatedfilesharing',
|
||||||
'lookup_server_connector',
|
'lookup_server_connector',
|
||||||
|
@ -417,6 +421,7 @@ class AppTest extends \Test\TestCase {
|
||||||
'appforgroup1',
|
'appforgroup1',
|
||||||
'appforgroup12',
|
'appforgroup12',
|
||||||
'appforgroup2',
|
'appforgroup2',
|
||||||
|
'cloud_federation_api',
|
||||||
'dav',
|
'dav',
|
||||||
'federatedfilesharing',
|
'federatedfilesharing',
|
||||||
'lookup_server_connector',
|
'lookup_server_connector',
|
||||||
|
@ -501,11 +506,11 @@ class AppTest extends \Test\TestCase {
|
||||||
);
|
);
|
||||||
|
|
||||||
$apps = \OC_App::getEnabledApps();
|
$apps = \OC_App::getEnabledApps();
|
||||||
$this->assertEquals(array('files', 'app3', 'dav', 'federatedfilesharing', 'lookup_server_connector', 'oauth2', 'provisioning_api', 'twofactor_backupcodes', 'workflowengine'), $apps);
|
$this->assertEquals(array('files', 'app3', 'cloud_federation_api', 'dav', 'federatedfilesharing', 'lookup_server_connector', 'oauth2', 'provisioning_api', 'twofactor_backupcodes', 'workflowengine'), $apps);
|
||||||
|
|
||||||
// mock should not be called again here
|
// mock should not be called again here
|
||||||
$apps = \OC_App::getEnabledApps();
|
$apps = \OC_App::getEnabledApps();
|
||||||
$this->assertEquals(array('files', 'app3', 'dav', 'federatedfilesharing', 'lookup_server_connector', 'oauth2', 'provisioning_api', 'twofactor_backupcodes', 'workflowengine'), $apps);
|
$this->assertEquals(array('files', 'app3', 'cloud_federation_api', 'dav', 'federatedfilesharing', 'lookup_server_connector', 'oauth2', 'provisioning_api', 'twofactor_backupcodes', 'workflowengine'), $apps);
|
||||||
|
|
||||||
$this->restoreAppConfig();
|
$this->restoreAppConfig();
|
||||||
\OC_User::setUserId(null);
|
\OC_User::setUserId(null);
|
||||||
|
|
Loading…
Reference in New Issue