Compare commits
26 Commits
f0254a6370
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 73559fde88 | |||
| d303ec9154 | |||
| de5d5a2344 | |||
| 2ebe95e9f8 | |||
| 741256c1e4 | |||
| db3a257ecd | |||
| c83094266b | |||
| 80a99aa9c2 | |||
| 7e27745bf7 | |||
| 3de0aaeec8 | |||
| 339dbe617f | |||
| 2f5cd563ad | |||
| 2be2cc0626 | |||
| 22946b9dfd | |||
| 816d63ea49 | |||
| fc19fd867c | |||
| 12ee768f11 | |||
| 63bbd4610f | |||
| 9eb68a1d7e | |||
| f799415ada | |||
| 51acf0702e | |||
| a69105cd18 | |||
| 9c47d907a7 | |||
| 0a74ecf651 | |||
| 361123baca | |||
| 05e438eb23 |
1
.dockerignore
Symbolic link
1
.dockerignore
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
.gitignore
|
||||||
19
.drone.yml
Normal file
19
.drone.yml
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
kind: pipeline
|
||||||
|
type: docker
|
||||||
|
name: default
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: test
|
||||||
|
image: golang:latest
|
||||||
|
commands:
|
||||||
|
- make test
|
||||||
|
- name: docker
|
||||||
|
image: plugins/docker
|
||||||
|
settings:
|
||||||
|
repo: djeeberjr/s3share
|
||||||
|
username: djeeberjr
|
||||||
|
password:
|
||||||
|
from_secret: DOCKER_HUB_TOKEN
|
||||||
|
trigger:
|
||||||
|
branch:
|
||||||
|
- master
|
||||||
25
Dockerfile
Normal file
25
Dockerfile
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
FROM node as jsbuild
|
||||||
|
|
||||||
|
ADD . /app
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
RUN make deps && make js
|
||||||
|
|
||||||
|
FROM golang as gobuild
|
||||||
|
|
||||||
|
ADD . /app
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
RUN make go
|
||||||
|
|
||||||
|
|
||||||
|
FROM gcr.io/distroless/base-debian10
|
||||||
|
|
||||||
|
COPY --from=gobuild /app/build/s3share /app/s3share
|
||||||
|
COPY --from=jsbuild /app/build/public /app/public
|
||||||
|
|
||||||
|
EXPOSE 3000
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
ENTRYPOINT [ "/app/s3share" ]
|
||||||
674
LICENSE
Normal file
674
LICENSE
Normal file
@@ -0,0 +1,674 @@
|
|||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The GNU General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
the GNU General Public License is intended to guarantee your freedom to
|
||||||
|
share and change all versions of a program--to make sure it remains free
|
||||||
|
software for all its users. We, the Free Software Foundation, use the
|
||||||
|
GNU General Public License for most of our software; it applies also to
|
||||||
|
any other work released this way by its authors. You can apply it to
|
||||||
|
your programs, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to prevent others from denying you
|
||||||
|
these rights or asking you to surrender the rights. Therefore, you have
|
||||||
|
certain responsibilities if you distribute copies of the software, or if
|
||||||
|
you modify it: responsibilities to respect the freedom of others.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must pass on to the recipients the same
|
||||||
|
freedoms that you received. You must make sure that they, too, receive
|
||||||
|
or can get the source code. And you must show them these terms so they
|
||||||
|
know their rights.
|
||||||
|
|
||||||
|
Developers that use the GNU GPL protect your rights with two steps:
|
||||||
|
(1) assert copyright on the software, and (2) offer you this License
|
||||||
|
giving you legal permission to copy, distribute and/or modify it.
|
||||||
|
|
||||||
|
For the developers' and authors' protection, the GPL clearly explains
|
||||||
|
that there is no warranty for this free software. For both users' and
|
||||||
|
authors' sake, the GPL requires that modified versions be marked as
|
||||||
|
changed, so that their problems will not be attributed erroneously to
|
||||||
|
authors of previous versions.
|
||||||
|
|
||||||
|
Some devices are designed to deny users access to install or run
|
||||||
|
modified versions of the software inside them, although the manufacturer
|
||||||
|
can do so. This is fundamentally incompatible with the aim of
|
||||||
|
protecting users' freedom to change the software. The systematic
|
||||||
|
pattern of such abuse occurs in the area of products for individuals to
|
||||||
|
use, which is precisely where it is most unacceptable. Therefore, we
|
||||||
|
have designed this version of the GPL to prohibit the practice for those
|
||||||
|
products. If such problems arise substantially in other domains, we
|
||||||
|
stand ready to extend this provision to those domains in future versions
|
||||||
|
of the GPL, as needed to protect the freedom of users.
|
||||||
|
|
||||||
|
Finally, every program is threatened constantly by software patents.
|
||||||
|
States should not allow patents to restrict development and use of
|
||||||
|
software on general-purpose computers, but in those that do, we wish to
|
||||||
|
avoid the special danger that patents applied to a free program could
|
||||||
|
make it effectively proprietary. To prevent this, the GPL assures that
|
||||||
|
patents cannot be used to render the program non-free.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Use with the GNU Affero General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU Affero General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the special requirements of the GNU Affero General Public License,
|
||||||
|
section 13, concerning interaction through a network will apply to the
|
||||||
|
combination as such.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU General Public License from time to time. Such new versions will
|
||||||
|
be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Program specifies that a certain numbered version of the GNU General
|
||||||
|
Public License "or any later version" applies to it, you have the
|
||||||
|
option of following the terms and conditions either of that numbered
|
||||||
|
version or of any later version published by the Free Software
|
||||||
|
Foundation. If the Program does not specify a version number of the
|
||||||
|
GNU General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future
|
||||||
|
versions of the GNU General Public License can be used, that proxy's
|
||||||
|
public statement of acceptance of a version permanently authorizes you
|
||||||
|
to choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
state the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If the program does terminal interaction, make it output a short
|
||||||
|
notice like this when it starts in an interactive mode:
|
||||||
|
|
||||||
|
<program> Copyright (C) <year> <name of author>
|
||||||
|
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
|
This is free software, and you are welcome to redistribute it
|
||||||
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
|
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||||
|
parts of the General Public License. Of course, your program's commands
|
||||||
|
might be different; for a GUI interface, you would use an "about box".
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or school,
|
||||||
|
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||||
|
For more information on this, and how to apply and follow the GNU GPL, see
|
||||||
|
<http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
The GNU General Public License does not permit incorporating your program
|
||||||
|
into proprietary programs. If your program is a subroutine library, you
|
||||||
|
may consider it more useful to permit linking proprietary applications with
|
||||||
|
the library. If this is what you want to do, use the GNU Lesser General
|
||||||
|
Public License instead of this License. But first, please read
|
||||||
|
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
|
||||||
22
Makefile
22
Makefile
@@ -2,16 +2,32 @@ BINARY = s3share
|
|||||||
BUILD_DIR = build
|
BUILD_DIR = build
|
||||||
|
|
||||||
.PHONY: all
|
.PHONY: all
|
||||||
all: clean build
|
all: clean deps build
|
||||||
|
|
||||||
.PHONY:build
|
.PHONY:build
|
||||||
build: $(BUILD_DIR)/$(BINARY) $(BUILD_DIR)/public
|
build: go js
|
||||||
|
|
||||||
|
.PHONY: js
|
||||||
|
js: $(BUILD_DIR)/public
|
||||||
|
|
||||||
|
.PHONY: go
|
||||||
|
go: $(BUILD_DIR)/$(BINARY)
|
||||||
|
|
||||||
$(BUILD_DIR)/$(BINARY):
|
$(BUILD_DIR)/$(BINARY):
|
||||||
go build -o $(BUILD_DIR)/$(BINARY) cmd/s3share.go
|
go build -o $(BUILD_DIR)/$(BINARY) cmd/s3share.go
|
||||||
|
|
||||||
$(BUILD_DIR)/public:
|
$(BUILD_DIR)/public:
|
||||||
npm run build && cp -r public/ $(BUILD_DIR)/public
|
npm run build && mkdir -p $(BUILD_DIR) &&cp -r public/ $(BUILD_DIR)/public
|
||||||
|
|
||||||
|
.PHONY: deps
|
||||||
|
deps: node_modules
|
||||||
|
|
||||||
|
node_modules:
|
||||||
|
npm install
|
||||||
|
|
||||||
|
.PHONY: test
|
||||||
|
test:
|
||||||
|
go test -v ./...
|
||||||
|
|
||||||
.PHONY:clean
|
.PHONY:clean
|
||||||
clean:
|
clean:
|
||||||
|
|||||||
87
README.md
Normal file
87
README.md
Normal file
@@ -0,0 +1,87 @@
|
|||||||
|
A simple server to share objects on an s3 bucket and display them in a nice way.
|
||||||
|
|
||||||
|
# Features
|
||||||
|
|
||||||
|
- Share any object on an s3 bucket
|
||||||
|
- Generate short urls for the share
|
||||||
|
- Simple API to create shares
|
||||||
|
|
||||||
|
# Building
|
||||||
|
|
||||||
|
Run `make` and the binary together with the web frontend will be in the `build` directory.
|
||||||
|
|
||||||
|
# Usage
|
||||||
|
|
||||||
|
Run the `s3browser` binary with the `--help` flag to see the available options.
|
||||||
|
The `public` directory needs to be in the same directory as the binary.
|
||||||
|
|
||||||
|
S3Share requires two things:
|
||||||
|
|
||||||
|
- a s3 bucket with read access
|
||||||
|
- a sql database
|
||||||
|
|
||||||
|
## Docker
|
||||||
|
|
||||||
|
The docker image is available at [Dockerhub](https://hub.docker.com/r/djeeberjr/s3share). There is also a [docker-compose](docker-compose.yml) file that can be used as an example.
|
||||||
|
|
||||||
|
# Synopsis
|
||||||
|
|
||||||
|
```
|
||||||
|
s3share 0.1
|
||||||
|
Usage: s3share --s3-endpoint ENDPOINT --s3-bucket BUCKET --s3-access-key ACCESS_KEY --s3-secret-key SECRET_KEY [--s3-disable-ssl] [--address ADDRESS] --api-username USERNAME --api-password PASSWORD --db DB
|
||||||
|
|
||||||
|
Options:
|
||||||
|
--s3-endpoint ENDPOINT
|
||||||
|
host[:port] [env: S3_ENDPOINT]
|
||||||
|
--s3-bucket BUCKET bucket to use [env: S3_BUCKET]
|
||||||
|
--s3-access-key ACCESS_KEY [env: S3_ACCESS_KEY]
|
||||||
|
--s3-secret-key SECRET_KEY [env: S3_SECRET_KEY]
|
||||||
|
--s3-disable-ssl [default: false, env: S3_DISABLE_SSL]
|
||||||
|
--address ADDRESS what address to listen on [default: :3000, env: ADDRESS]
|
||||||
|
--api-username USERNAME
|
||||||
|
username for API [env: API_USERNAME]
|
||||||
|
--api-password PASSWORD
|
||||||
|
password for API [env: API_PASSWORD]
|
||||||
|
--db DB DSN in format: https://github.com/go-sql-driver/mysql#dsn-data-source-name [env: DB_CONNECTION]
|
||||||
|
--help, -h display this help and exit
|
||||||
|
--version display version and exit
|
||||||
|
```
|
||||||
|
|
||||||
|
# API
|
||||||
|
|
||||||
|
Use the provided username and password with basic auth.
|
||||||
|
|
||||||
|
Shares ids consist of six alphanumeric characters e.g. `jW8ADy`.
|
||||||
|
|
||||||
|
- `GET /api/share`: Get a list of all shares
|
||||||
|
- `GET /api/share/:id`: Get a share by id. Result:
|
||||||
|
```json
|
||||||
|
{"slug":"jW8ADy","key":"/myObj.txt"}
|
||||||
|
```
|
||||||
|
- `POST /api/share`: Create a new share. Data to send:
|
||||||
|
```json
|
||||||
|
{"key":"/myObj.txt"}
|
||||||
|
```
|
||||||
|
- `DELETE /api/share/:id`: Delete a share
|
||||||
|
|
||||||
|
Other urls are:
|
||||||
|
|
||||||
|
- `/:id` to get the default site to display the share.
|
||||||
|
- `/s/:id` to get the shared file directly.
|
||||||
|
|
||||||
|
When you request a shared file directly, you can add anything after a dot behind the id e.g. `/s/jW8ADy.png`.
|
||||||
|
This is done to make the browser display the file correctly. On the server side, this will be stripped away.
|
||||||
|
|
||||||
|
# Tech stack
|
||||||
|
|
||||||
|
## Backend
|
||||||
|
|
||||||
|
- Go
|
||||||
|
- Minio s3 client
|
||||||
|
- Mux
|
||||||
|
|
||||||
|
## Frontend
|
||||||
|
|
||||||
|
- Svelte
|
||||||
|
- Highlight.js
|
||||||
|
- Typescript
|
||||||
@@ -19,8 +19,7 @@ type args struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (args) Version() string {
|
func (args) Version() string {
|
||||||
// TODO
|
return "s3share 1.0"
|
||||||
return "s3share 0.1"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|||||||
18
docker-compose.yml
Normal file
18
docker-compose.yml
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
version: "3"
|
||||||
|
|
||||||
|
services:
|
||||||
|
s3share:
|
||||||
|
build: .
|
||||||
|
image: djeeberjr/s3share
|
||||||
|
ports:
|
||||||
|
- "80:3000"
|
||||||
|
environment:
|
||||||
|
- S3_ENDPOINT=localhost:9000
|
||||||
|
- S3_BUCKET=dev
|
||||||
|
- S3_ACCESS_KEY=dev
|
||||||
|
- S3_SECRET_KEY=hunter22
|
||||||
|
- S3_DISABLE_SSL=true
|
||||||
|
- ADDRESS=:3000
|
||||||
|
- API_USERNAME=admin
|
||||||
|
- API_PASSWORD=hunter2
|
||||||
|
- DB_CONNECTION=dev:hunter22@localhost/dev
|
||||||
4
go.mod
4
go.mod
@@ -12,6 +12,7 @@ require (
|
|||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/alexflint/go-scalar v1.1.0 // indirect
|
github.com/alexflint/go-scalar v1.1.0 // indirect
|
||||||
|
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||||
github.com/dustin/go-humanize v1.0.0 // indirect
|
github.com/dustin/go-humanize v1.0.0 // indirect
|
||||||
github.com/google/uuid v1.1.1 // indirect
|
github.com/google/uuid v1.1.1 // indirect
|
||||||
github.com/gopherjs/gopherjs v1.17.2 // indirect
|
github.com/gopherjs/gopherjs v1.17.2 // indirect
|
||||||
@@ -24,11 +25,14 @@ require (
|
|||||||
github.com/mitchellh/go-homedir v1.1.0 // indirect
|
github.com/mitchellh/go-homedir v1.1.0 // indirect
|
||||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
|
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
|
||||||
github.com/modern-go/reflect2 v1.0.2 // indirect
|
github.com/modern-go/reflect2 v1.0.2 // indirect
|
||||||
|
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||||
github.com/rs/xid v1.2.1 // indirect
|
github.com/rs/xid v1.2.1 // indirect
|
||||||
github.com/smartystreets/assertions v1.13.0 // indirect
|
github.com/smartystreets/assertions v1.13.0 // indirect
|
||||||
|
github.com/stretchr/testify v1.7.1 // indirect
|
||||||
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect
|
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect
|
||||||
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect
|
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect
|
||||||
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
|
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
|
||||||
golang.org/x/text v0.3.3 // indirect
|
golang.org/x/text v0.3.3 // indirect
|
||||||
gopkg.in/ini.v1 v1.57.0 // indirect
|
gopkg.in/ini.v1 v1.57.0 // indirect
|
||||||
|
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
|
||||||
)
|
)
|
||||||
|
|||||||
2
go.sum
2
go.sum
@@ -52,6 +52,8 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
|
|||||||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
||||||
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
|
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
|
||||||
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
|
github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
|
||||||
|
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 h1:/UOmuWzQfxxo9UtlXMwuQU8CMgg1eZXqTRwkSQJWKOI=
|
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 h1:/UOmuWzQfxxo9UtlXMwuQU8CMgg1eZXqTRwkSQJWKOI=
|
||||||
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
||||||
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
|
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ func NewClient(db db.DB, s3 s3.S3) *Client {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// createRandomString creates a random string of length 6 to be used as a slug
|
||||||
func createRandomString() string {
|
func createRandomString() string {
|
||||||
s := make([]rune, 6)
|
s := make([]rune, 6)
|
||||||
for i := range s {
|
for i := range s {
|
||||||
@@ -35,7 +36,8 @@ func createRandomString() string {
|
|||||||
return string(s)
|
return string(s)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *Client) CreateValidSlug(ctx context.Context) (string, error) {
|
// createValidSlug creates a valid slug that is not yet in use
|
||||||
|
func (c *Client) createValidSlug(ctx context.Context) (string, error) {
|
||||||
for i := 0; i < 10; i++ {
|
for i := 0; i < 10; i++ {
|
||||||
slug := createRandomString()
|
slug := createRandomString()
|
||||||
|
|
||||||
@@ -52,12 +54,14 @@ func (c *Client) CreateValidSlug(ctx context.Context) (string, error) {
|
|||||||
return "", errors.New("could not create valid slug after 10 tries")
|
return "", errors.New("could not create valid slug after 10 tries")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetShare returns the share with the given slug, nil if not found
|
||||||
func (c *Client) GetShare(ctx context.Context, slug string) (*types.Share, error) {
|
func (c *Client) GetShare(ctx context.Context, slug string) (*types.Share, error) {
|
||||||
return c.db.GetShare(ctx, slug)
|
return c.db.GetShare(ctx, slug)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// CreateShare creates a new share with the given key and returns the share with the slug
|
||||||
func (c *Client) CreateShare(ctx context.Context, key string) (*types.Share, error) {
|
func (c *Client) CreateShare(ctx context.Context, key string) (*types.Share, error) {
|
||||||
slug, err := c.CreateValidSlug(ctx)
|
slug, err := c.createValidSlug(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -73,7 +77,7 @@ func (c *Client) CreateShare(ctx context.Context, key string) (*types.Share, err
|
|||||||
}
|
}
|
||||||
|
|
||||||
if !exists {
|
if !exists {
|
||||||
return nil, errors.New("key does not exist")
|
return nil, types.ErrKeyNotFound
|
||||||
}
|
}
|
||||||
|
|
||||||
err = c.db.CreateShare(ctx, share)
|
err = c.db.CreateShare(ctx, share)
|
||||||
@@ -84,20 +88,27 @@ func (c *Client) CreateShare(ctx context.Context, key string) (*types.Share, err
|
|||||||
return share, nil
|
return share, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetObjectFromShare returns the s3 object to the given share
|
||||||
func (c *Client) GetObjectFromShare(ctx context.Context, share *types.Share) (s3.ObjectReader, error) {
|
func (c *Client) GetObjectFromShare(ctx context.Context, share *types.Share) (s3.ObjectReader, error) {
|
||||||
return c.s3.GetObject(ctx, share.Key)
|
return c.s3.GetObject(ctx, share.Key)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DeleteShare deletes the share with the given slug
|
||||||
func (c *Client) DeleteShare(ctx context.Context, slug string) error {
|
func (c *Client) DeleteShare(ctx context.Context, slug string) error {
|
||||||
return c.db.DeleteShare(ctx, slug)
|
return c.db.DeleteShare(ctx, slug)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetObjectMetadata returns the metadata of the object with the given key
|
||||||
func (c *Client) GetObjectMetadata(ctx context.Context, key string) (*types.Metadata, error) {
|
func (c *Client) GetObjectMetadata(ctx context.Context, key string) (*types.Metadata, error) {
|
||||||
metadata, err := c.s3.GetObjectMetadata(ctx, key)
|
metadata, err := c.s3.GetObjectMetadata(ctx, key)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if metadata == nil {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
if metadata.Filename == "" {
|
if metadata.Filename == "" {
|
||||||
metadata.Filename = filepath.Base(key)
|
metadata.Filename = filepath.Base(key)
|
||||||
}
|
}
|
||||||
@@ -105,6 +116,7 @@ func (c *Client) GetObjectMetadata(ctx context.Context, key string) (*types.Meta
|
|||||||
return metadata, nil
|
return metadata, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetAllShares returns all shares
|
||||||
func (c *Client) GetAllShares(ctx context.Context) ([]*types.Share, error) {
|
func (c *Client) GetAllShares(ctx context.Context) ([]*types.Share, error) {
|
||||||
return c.db.GetAllShares(ctx)
|
return c.db.GetAllShares(ctx)
|
||||||
}
|
}
|
||||||
|
|||||||
143
internal/client/client_test.go
Normal file
143
internal/client/client_test.go
Normal file
@@ -0,0 +1,143 @@
|
|||||||
|
package client_test
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"io/ioutil"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"git.kapelle.org/niklas/s3share/internal/client"
|
||||||
|
"git.kapelle.org/niklas/s3share/internal/db"
|
||||||
|
"git.kapelle.org/niklas/s3share/internal/s3"
|
||||||
|
"git.kapelle.org/niklas/s3share/internal/types"
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
)
|
||||||
|
|
||||||
|
func setup(t *testing.T) (*client.Client, context.Context, *assert.Assertions) {
|
||||||
|
|
||||||
|
mockDb := db.NewMock()
|
||||||
|
mockS3 := s3.NewMockS3()
|
||||||
|
|
||||||
|
service := client.NewClient(mockDb, mockS3)
|
||||||
|
ctx := context.Background()
|
||||||
|
assert := assert.New(t)
|
||||||
|
|
||||||
|
return service, ctx, assert
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCreateShare(t *testing.T) {
|
||||||
|
service, ctx, assert := setup(t)
|
||||||
|
|
||||||
|
share, err := service.CreateShare(ctx, "test.txt")
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.NotNil(share)
|
||||||
|
assert.NotEmpty(share.Slug)
|
||||||
|
assert.Equal("test.txt", share.Key)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCreateShareInvalidKey(t *testing.T) {
|
||||||
|
service, ctx, assert := setup(t)
|
||||||
|
|
||||||
|
_, err := service.CreateShare(ctx, "not_existing.txt")
|
||||||
|
assert.Error(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetShare(t *testing.T) {
|
||||||
|
service, ctx, assert := setup(t)
|
||||||
|
|
||||||
|
createdShare, err := service.CreateShare(ctx, "test.txt")
|
||||||
|
|
||||||
|
share, err := service.GetShare(ctx, createdShare.Slug)
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.NotNil(share)
|
||||||
|
assert.Equal(createdShare.Slug, share.Slug)
|
||||||
|
assert.Equal("test.txt", share.Key)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetShareNotFound(t *testing.T) {
|
||||||
|
service, ctx, assert := setup(t)
|
||||||
|
|
||||||
|
share, err := service.GetShare(ctx, "123456")
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.Nil(share)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetObjFromShare(t *testing.T) {
|
||||||
|
service, ctx, assert := setup(t)
|
||||||
|
|
||||||
|
createdShare, _ := service.CreateShare(ctx, "test.txt")
|
||||||
|
|
||||||
|
reader, err := service.GetObjectFromShare(ctx, createdShare)
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.NotNil(reader)
|
||||||
|
|
||||||
|
content, err := ioutil.ReadAll(reader)
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.Equal("test.txt", string(content))
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetObjFromShareNotFound(t *testing.T) {
|
||||||
|
service, ctx, assert := setup(t)
|
||||||
|
|
||||||
|
_, err := service.GetObjectFromShare(ctx, &types.Share{Slug: "123456"})
|
||||||
|
assert.Error(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDeleteShare(t *testing.T) {
|
||||||
|
service, ctx, assert := setup(t)
|
||||||
|
|
||||||
|
createdShare, _ := service.CreateShare(ctx, "test.txt")
|
||||||
|
|
||||||
|
err := service.DeleteShare(ctx, createdShare.Slug)
|
||||||
|
assert.NoError(err)
|
||||||
|
|
||||||
|
share, err := service.GetShare(ctx, createdShare.Slug)
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.Nil(share)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDeleteShareNotFound(t *testing.T) {
|
||||||
|
service, ctx, assert := setup(t)
|
||||||
|
|
||||||
|
err := service.DeleteShare(ctx, "123456")
|
||||||
|
assert.Error(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetMetadata(t *testing.T) {
|
||||||
|
service, ctx, assert := setup(t)
|
||||||
|
|
||||||
|
metadata, err := service.GetObjectMetadata(ctx, "test.txt")
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.NotNil(metadata)
|
||||||
|
assert.Equal("test.txt", metadata.Filename)
|
||||||
|
assert.Equal("text/plain", metadata.ContentType)
|
||||||
|
assert.Equal(int64(8), metadata.Size)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetMetadataNotFound(t *testing.T) {
|
||||||
|
service, ctx, assert := setup(t)
|
||||||
|
|
||||||
|
metadata, err := service.GetObjectMetadata(ctx, "not_existing.txt")
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.Nil(metadata)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetAllShares(t *testing.T) {
|
||||||
|
service, ctx, assert := setup(t)
|
||||||
|
|
||||||
|
share, err := service.CreateShare(ctx, "test.txt")
|
||||||
|
assert.NoError(err)
|
||||||
|
|
||||||
|
shares, err := service.GetAllShares(ctx)
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.Len(shares, 1)
|
||||||
|
|
||||||
|
assert.Equal(share.Slug, shares[0].Slug)
|
||||||
|
assert.Equal(share.Key, shares[0].Key)
|
||||||
|
|
||||||
|
_, err = service.CreateShare(ctx, "dir/test")
|
||||||
|
assert.NoError(err)
|
||||||
|
|
||||||
|
shares, err = service.GetAllShares(ctx)
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.Len(shares, 2)
|
||||||
|
}
|
||||||
@@ -7,9 +7,18 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type DB interface {
|
type DB interface {
|
||||||
|
// Return nil if share does not exist
|
||||||
GetShare(ctx context.Context, slug string) (*types.Share, error)
|
GetShare(ctx context.Context, slug string) (*types.Share, error)
|
||||||
|
|
||||||
|
// Returns error if share already exists
|
||||||
CreateShare(ctx context.Context, share *types.Share) error
|
CreateShare(ctx context.Context, share *types.Share) error
|
||||||
|
|
||||||
|
// Returns error if share does not exist
|
||||||
DeleteShare(ctx context.Context, slug string) error
|
DeleteShare(ctx context.Context, slug string) error
|
||||||
|
|
||||||
|
// Returns all shares
|
||||||
GetAllShares(ctx context.Context) ([]*types.Share, error)
|
GetAllShares(ctx context.Context) ([]*types.Share, error)
|
||||||
|
|
||||||
|
// Close the database
|
||||||
Close() error
|
Close() error
|
||||||
}
|
}
|
||||||
|
|||||||
54
internal/db/mock.go
Normal file
54
internal/db/mock.go
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
package db
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
|
||||||
|
"git.kapelle.org/niklas/s3share/internal/types"
|
||||||
|
)
|
||||||
|
|
||||||
|
type mockDB struct {
|
||||||
|
shares map[string]*types.Share
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewMock() DB {
|
||||||
|
return &mockDB{
|
||||||
|
shares: make(map[string]*types.Share),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *mockDB) Close() error {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *mockDB) CreateShare(ctx context.Context, share *types.Share) error {
|
||||||
|
if d.shares[share.Slug] != nil {
|
||||||
|
return errors.New("share already exists")
|
||||||
|
}
|
||||||
|
d.shares[share.Slug] = share
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *mockDB) DeleteShare(ctx context.Context, slug string) error {
|
||||||
|
if d.shares[slug] == nil {
|
||||||
|
return types.ErrShareNotFound
|
||||||
|
}
|
||||||
|
delete(d.shares, slug)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *mockDB) GetAllShares(ctx context.Context) ([]*types.Share, error) {
|
||||||
|
// convert map to slice
|
||||||
|
shares := make([]*types.Share, 0, len(d.shares))
|
||||||
|
for _, share := range d.shares {
|
||||||
|
shares = append(shares, share)
|
||||||
|
}
|
||||||
|
return shares, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *mockDB) GetShare(ctx context.Context, slug string) (*types.Share, error) {
|
||||||
|
if d.shares[slug] == nil {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
return d.shares[slug], nil
|
||||||
|
}
|
||||||
111
internal/db/mock_test.go
Normal file
111
internal/db/mock_test.go
Normal file
@@ -0,0 +1,111 @@
|
|||||||
|
package db_test
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"git.kapelle.org/niklas/s3share/internal/db"
|
||||||
|
"git.kapelle.org/niklas/s3share/internal/types"
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
)
|
||||||
|
|
||||||
|
func setup(t *testing.T) (db.DB, context.Context, *assert.Assertions) {
|
||||||
|
service := db.NewMock()
|
||||||
|
ctx := context.Background()
|
||||||
|
assert := assert.New(t)
|
||||||
|
|
||||||
|
return service, ctx, assert
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCreateShare(t *testing.T) {
|
||||||
|
service, ctx, assert := setup(t)
|
||||||
|
defer service.Close()
|
||||||
|
|
||||||
|
share := &types.Share{
|
||||||
|
Slug: "123456",
|
||||||
|
Key: "test.txt",
|
||||||
|
}
|
||||||
|
|
||||||
|
err := service.CreateShare(ctx, share)
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.NotNil(service.GetShare(ctx, share.Slug))
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCreateShareDup(t *testing.T) {
|
||||||
|
service, ctx, assert := setup(t)
|
||||||
|
defer service.Close()
|
||||||
|
|
||||||
|
share := &types.Share{
|
||||||
|
Slug: "123456",
|
||||||
|
Key: "test.txt",
|
||||||
|
}
|
||||||
|
|
||||||
|
err := service.CreateShare(ctx, share)
|
||||||
|
assert.NoError(err)
|
||||||
|
|
||||||
|
err = service.CreateShare(ctx, share)
|
||||||
|
assert.Error(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDeleteShare(t *testing.T) {
|
||||||
|
service, ctx, assert := setup(t)
|
||||||
|
defer service.Close()
|
||||||
|
|
||||||
|
share := &types.Share{
|
||||||
|
Slug: "123456",
|
||||||
|
Key: "test.txt",
|
||||||
|
}
|
||||||
|
|
||||||
|
err := service.CreateShare(ctx, share)
|
||||||
|
assert.NoError(err)
|
||||||
|
|
||||||
|
err = service.DeleteShare(ctx, share.Slug)
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.Nil(service.GetShare(ctx, share.Slug))
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDeleteShareNotFound(t *testing.T) {
|
||||||
|
service, ctx, assert := setup(t)
|
||||||
|
defer service.Close()
|
||||||
|
|
||||||
|
share := &types.Share{
|
||||||
|
Slug: "123456",
|
||||||
|
Key: "test.txt",
|
||||||
|
}
|
||||||
|
|
||||||
|
err := service.DeleteShare(ctx, share.Slug)
|
||||||
|
assert.Error(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetAllShares(t *testing.T) {
|
||||||
|
service, ctx, assert := setup(t)
|
||||||
|
defer service.Close()
|
||||||
|
|
||||||
|
share := &types.Share{
|
||||||
|
Slug: "123456",
|
||||||
|
Key: "test.txt",
|
||||||
|
}
|
||||||
|
|
||||||
|
err := service.CreateShare(ctx, share)
|
||||||
|
assert.NoError(err)
|
||||||
|
|
||||||
|
shares, err := service.GetAllShares(ctx)
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.Len(shares, 1)
|
||||||
|
|
||||||
|
assert.Equal(share.Slug, shares[0].Slug)
|
||||||
|
assert.Equal(share.Key, shares[0].Key)
|
||||||
|
|
||||||
|
// Create 2nd share
|
||||||
|
share2 := &types.Share{
|
||||||
|
Slug: "abcdef",
|
||||||
|
Key: "test2",
|
||||||
|
}
|
||||||
|
|
||||||
|
err = service.CreateShare(ctx, share2)
|
||||||
|
assert.NoError(err)
|
||||||
|
|
||||||
|
shares, err = service.GetAllShares(ctx)
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.Len(shares, 2)
|
||||||
|
}
|
||||||
@@ -79,10 +79,20 @@ func (db *sqlDB) CreateShare(ctx context.Context, share *types.Share) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (db *sqlDB) DeleteShare(ctx context.Context, slug string) error {
|
func (db *sqlDB) DeleteShare(ctx context.Context, slug string) error {
|
||||||
_, err := db.db.ExecContext(ctx, "DELETE FROM shares WHERE slug = ?", slug)
|
result, err := db.db.ExecContext(ctx, "DELETE FROM shares WHERE slug = ?", slug)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
rowsAffected, err := result.RowsAffected()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if rowsAffected == 0 {
|
||||||
|
return types.ErrShareNotFound
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
80
internal/s3/mock.go
Normal file
80
internal/s3/mock.go
Normal file
@@ -0,0 +1,80 @@
|
|||||||
|
package s3
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"context"
|
||||||
|
"crypto/md5"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"git.kapelle.org/niklas/s3share/internal/types"
|
||||||
|
)
|
||||||
|
|
||||||
|
type mockS3 struct {
|
||||||
|
objects map[string]mockObject
|
||||||
|
}
|
||||||
|
|
||||||
|
type mockObject struct {
|
||||||
|
content []byte
|
||||||
|
contentType string
|
||||||
|
}
|
||||||
|
|
||||||
|
type mockObjectReader struct {
|
||||||
|
*bytes.Reader
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r mockObjectReader) Close() error {
|
||||||
|
// NOOP
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewMockS3() S3 {
|
||||||
|
return &mockS3{
|
||||||
|
objects: map[string]mockObject{
|
||||||
|
"test.txt": {
|
||||||
|
content: []byte("test.txt"),
|
||||||
|
contentType: "text/plain",
|
||||||
|
},
|
||||||
|
"test.png": {
|
||||||
|
content: []byte("test.png"),
|
||||||
|
contentType: "image/png",
|
||||||
|
},
|
||||||
|
"dir/test": {
|
||||||
|
content: []byte("test"),
|
||||||
|
contentType: "application/octet-stream",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *mockS3) GetObject(ctx context.Context, key string) (ObjectReader, error) {
|
||||||
|
mockObj, exist := m.objects[key]
|
||||||
|
|
||||||
|
if !exist {
|
||||||
|
return nil, fmt.Errorf("Object not found")
|
||||||
|
}
|
||||||
|
|
||||||
|
reader := bytes.NewReader(mockObj.content)
|
||||||
|
|
||||||
|
return mockObjectReader{reader}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *mockS3) GetObjectMetadata(ctx context.Context, key string) (*types.Metadata, error) {
|
||||||
|
mockObj, exist := m.objects[key]
|
||||||
|
|
||||||
|
if !exist {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return &types.Metadata{
|
||||||
|
Size: int64(len(mockObj.content)),
|
||||||
|
ETag: fmt.Sprintf("%x", md5.Sum(mockObj.content)),
|
||||||
|
ContentType: mockObj.contentType,
|
||||||
|
}, nil
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *mockS3) KeyExists(ctx context.Context, key string) (bool, error) {
|
||||||
|
_, exist := m.objects[key]
|
||||||
|
|
||||||
|
return exist, nil
|
||||||
|
}
|
||||||
72
internal/s3/mock_test.go
Normal file
72
internal/s3/mock_test.go
Normal file
@@ -0,0 +1,72 @@
|
|||||||
|
package s3_test
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"io/ioutil"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"git.kapelle.org/niklas/s3share/internal/s3"
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
)
|
||||||
|
|
||||||
|
func setup(t *testing.T) (s3.S3, context.Context, *assert.Assertions) {
|
||||||
|
service := s3.NewMockS3()
|
||||||
|
ctx := context.Background()
|
||||||
|
assert := assert.New(t)
|
||||||
|
|
||||||
|
return service, ctx, assert
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetObject(t *testing.T) {
|
||||||
|
service, ctx, assert := setup(t)
|
||||||
|
|
||||||
|
reader, err := service.GetObject(ctx, "test.txt")
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.NotNil(reader)
|
||||||
|
|
||||||
|
content, err := ioutil.ReadAll(reader)
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.Equal("test.txt", string(content))
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetObjectNotFound(t *testing.T) {
|
||||||
|
service, ctx, assert := setup(t)
|
||||||
|
|
||||||
|
reader, err := service.GetObject(ctx, "not_existing.txt")
|
||||||
|
assert.Error(err)
|
||||||
|
assert.Nil(reader)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetMetadata(t *testing.T) {
|
||||||
|
service, ctx, assert := setup(t)
|
||||||
|
|
||||||
|
metadata, err := service.GetObjectMetadata(ctx, "test.txt")
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.NotNil(metadata)
|
||||||
|
assert.Equal("text/plain", metadata.ContentType)
|
||||||
|
assert.Equal(int64(8), metadata.Size)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetMetadataNotFound(t *testing.T) {
|
||||||
|
service, ctx, assert := setup(t)
|
||||||
|
|
||||||
|
metadata, err := service.GetObjectMetadata(ctx, "not_existing.txt")
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.Nil(metadata)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestKeyExists(t *testing.T) {
|
||||||
|
service, ctx, assert := setup(t)
|
||||||
|
|
||||||
|
exists, err := service.KeyExists(ctx, "test.txt")
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.True(exists)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestKeyNotExist(t *testing.T) {
|
||||||
|
service, ctx, assert := setup(t)
|
||||||
|
|
||||||
|
exists, err := service.KeyExists(ctx, "not_existing.txt")
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.False(exists)
|
||||||
|
}
|
||||||
@@ -15,7 +15,12 @@ type ObjectReader interface {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type S3 interface {
|
type S3 interface {
|
||||||
|
// Get the object from the S3 bucket. Returns an error if the object does not exist.
|
||||||
GetObject(ctx context.Context, key string) (ObjectReader, error)
|
GetObject(ctx context.Context, key string) (ObjectReader, error)
|
||||||
|
|
||||||
|
// Check if the given key exists
|
||||||
KeyExists(ctx context.Context, key string) (bool, error)
|
KeyExists(ctx context.Context, key string) (bool, error)
|
||||||
|
|
||||||
|
// Get object metadata. The `Filename` field is optional. Returns nil if the object does not exist.
|
||||||
GetObjectMetadata(ctx context.Context, key string) (*types.Metadata, error)
|
GetObjectMetadata(ctx context.Context, key string) (*types.Metadata, error)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ func Start(config *types.AppConfig) {
|
|||||||
|
|
||||||
client := client.NewClient(db, s3Client)
|
client := client.NewClient(db, s3Client)
|
||||||
|
|
||||||
err = web.StartWebserver(config.Address, *client, config.APIUsername, config.APIPassword)
|
err = web.StartWebserver(config.Address, client, config.APIUsername, config.APIPassword)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err.Error())
|
logrus.Fatal(err.Error())
|
||||||
}
|
}
|
||||||
|
|||||||
6
internal/types/errors.go
Normal file
6
internal/types/errors.go
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
package types
|
||||||
|
|
||||||
|
import "errors"
|
||||||
|
|
||||||
|
var ErrKeyNotFound = errors.New("Key not found")
|
||||||
|
var ErrShareNotFound = errors.New("Share not found")
|
||||||
@@ -17,15 +17,17 @@ type createShare struct {
|
|||||||
Key string `json:"key"`
|
Key string `json:"key"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type deleteShare struct {
|
func StartWebserver(addr string, client *client.Client, username, password string) error {
|
||||||
Slug string `json:"slug"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func StartWebserver(addr string, client client.Client, username, password string) error {
|
|
||||||
if username == "" || password == "" {
|
if username == "" || password == "" {
|
||||||
return errors.New("API username and password must be set")
|
return errors.New("API username and password must be set")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
r := CreateRouter(client, username, password)
|
||||||
|
|
||||||
|
return http.ListenAndServe(addr, r)
|
||||||
|
}
|
||||||
|
|
||||||
|
func CreateRouter(client *client.Client, username, password string) *mux.Router {
|
||||||
r := mux.NewRouter()
|
r := mux.NewRouter()
|
||||||
|
|
||||||
r.HandleFunc("/{slug:[a-zA-Z0-9]{6}}", func(w http.ResponseWriter, r *http.Request) {
|
r.HandleFunc("/{slug:[a-zA-Z0-9]{6}}", func(w http.ResponseWriter, r *http.Request) {
|
||||||
@@ -74,6 +76,31 @@ func StartWebserver(addr string, client client.Client, username, password string
|
|||||||
json.NewEncoder(w).Encode(shares)
|
json.NewEncoder(w).Encode(shares)
|
||||||
}).Methods("GET")
|
}).Methods("GET")
|
||||||
|
|
||||||
|
r.HandleFunc("/api/share/{slug:[a-zA-Z0-9]{6}}", func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if !checkAuth(w, r, username, password) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
vars := mux.Vars(r)
|
||||||
|
slug := vars["slug"]
|
||||||
|
|
||||||
|
share, err := client.GetShare(r.Context(), slug)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
logrus.Error(err.Error())
|
||||||
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if share == nil {
|
||||||
|
http.NotFound(w, r)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
json.NewEncoder(w).Encode(share)
|
||||||
|
}).Methods("GET")
|
||||||
|
|
||||||
r.HandleFunc("/api/share", func(w http.ResponseWriter, r *http.Request) {
|
r.HandleFunc("/api/share", func(w http.ResponseWriter, r *http.Request) {
|
||||||
if !checkAuth(w, r, username, password) {
|
if !checkAuth(w, r, username, password) {
|
||||||
return
|
return
|
||||||
@@ -90,44 +117,47 @@ func StartWebserver(addr string, client client.Client, username, password string
|
|||||||
share, err := client.CreateShare(r.Context(), shareParams.Key)
|
share, err := client.CreateShare(r.Context(), shareParams.Key)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
if err == types.ErrKeyNotFound {
|
||||||
|
http.Error(w, "The specified key does not exist", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
logrus.Error(err.Error())
|
logrus.Error(err.Error())
|
||||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
w.Header().Set("Content-Type", "application/json")
|
w.Header().Set("Content-Type", "application/json")
|
||||||
w.WriteHeader(http.StatusOK)
|
w.WriteHeader(http.StatusCreated)
|
||||||
json.NewEncoder(w).Encode(share)
|
json.NewEncoder(w).Encode(share)
|
||||||
}).Methods("POST")
|
}).Methods("POST", "PUT")
|
||||||
|
|
||||||
r.HandleFunc("/api/share", func(w http.ResponseWriter, r *http.Request) {
|
r.HandleFunc("/api/share/{slug:[a-zA-Z0-9]{6}}", func(w http.ResponseWriter, r *http.Request) {
|
||||||
if !checkAuth(w, r, username, password) {
|
if !checkAuth(w, r, username, password) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
var shareParams deleteShare
|
vars := mux.Vars(r)
|
||||||
err := json.NewDecoder(r.Body).Decode(&shareParams)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Error(err.Error())
|
|
||||||
http.Error(w, err.Error(), http.StatusBadRequest)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
err = client.DeleteShare(r.Context(), shareParams.Slug)
|
err := client.DeleteShare(r.Context(), vars["slug"])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
if err == types.ErrShareNotFound {
|
||||||
|
http.NotFound(w, r)
|
||||||
|
return
|
||||||
|
}
|
||||||
logrus.Error(err.Error())
|
logrus.Error(err.Error())
|
||||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
w.WriteHeader(http.StatusNoContent)
|
||||||
}).Methods("DELETE")
|
}).Methods("DELETE")
|
||||||
|
|
||||||
r.PathPrefix("/").Handler(http.FileServer(http.Dir("./public/")))
|
r.PathPrefix("/").Handler(http.FileServer(http.Dir("./public/")))
|
||||||
|
|
||||||
logrus.Info("Starting webserver")
|
return r
|
||||||
return http.ListenAndServe(addr, r)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func getShareHead(client client.Client, w http.ResponseWriter, r *http.Request) *types.Share {
|
func getShareHead(client *client.Client, w http.ResponseWriter, r *http.Request) *types.Share {
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
slug := vars["path"][0:6]
|
slug := vars["path"][0:6]
|
||||||
share, err := client.GetShare(r.Context(), slug)
|
share, err := client.GetShare(r.Context(), slug)
|
||||||
@@ -163,13 +193,13 @@ func getShareHead(client client.Client, w http.ResponseWriter, r *http.Request)
|
|||||||
}
|
}
|
||||||
|
|
||||||
func checkAuth(w http.ResponseWriter, r *http.Request, username, password string) bool {
|
func checkAuth(w http.ResponseWriter, r *http.Request, username, password string) bool {
|
||||||
username, password, ok := r.BasicAuth()
|
authUsername, authPassword, ok := r.BasicAuth()
|
||||||
if !ok {
|
if !ok {
|
||||||
w.WriteHeader(http.StatusUnauthorized)
|
w.WriteHeader(http.StatusUnauthorized)
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
if username != username || password != password {
|
if username != authUsername || password != authPassword {
|
||||||
w.WriteHeader(http.StatusUnauthorized)
|
w.WriteHeader(http.StatusUnauthorized)
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|||||||
226
internal/web/web_test.go
Normal file
226
internal/web/web_test.go
Normal file
@@ -0,0 +1,226 @@
|
|||||||
|
package web_test
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/json"
|
||||||
|
"io/ioutil"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"git.kapelle.org/niklas/s3share/internal/client"
|
||||||
|
"git.kapelle.org/niklas/s3share/internal/db"
|
||||||
|
"git.kapelle.org/niklas/s3share/internal/s3"
|
||||||
|
"git.kapelle.org/niklas/s3share/internal/web"
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
)
|
||||||
|
|
||||||
|
func setup(t *testing.T) (*httptest.Server, *assert.Assertions) {
|
||||||
|
client := client.NewClient(db.NewMock(), s3.NewMockS3())
|
||||||
|
router := web.CreateRouter(client, "admin", "hunter2")
|
||||||
|
|
||||||
|
ts := httptest.NewServer(router)
|
||||||
|
|
||||||
|
assert := assert.New(t)
|
||||||
|
|
||||||
|
return ts, assert
|
||||||
|
}
|
||||||
|
|
||||||
|
func genCreateShareRequest(ts *httptest.Server, key string) *http.Request {
|
||||||
|
body := "{\"key\": \"" + key + "\"}"
|
||||||
|
req, _ := http.NewRequest("POST", ts.URL+"/api/share", bytes.NewReader([]byte(body)))
|
||||||
|
req.Header.Add("Authorization", "Basic YWRtaW46aHVudGVyMg==")
|
||||||
|
req.Header.Add("Content-Type", "application/json")
|
||||||
|
|
||||||
|
return req
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCreateShare(t *testing.T) {
|
||||||
|
ts, assert := setup(t)
|
||||||
|
defer ts.Close()
|
||||||
|
|
||||||
|
req := genCreateShareRequest(ts, "test.txt")
|
||||||
|
|
||||||
|
res, err := http.DefaultClient.Do(req)
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.Equal(http.StatusCreated, res.StatusCode)
|
||||||
|
|
||||||
|
// check json response
|
||||||
|
var jsonResponse map[string]interface{}
|
||||||
|
err = json.NewDecoder(res.Body).Decode(&jsonResponse)
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.Equal("test.txt", jsonResponse["key"])
|
||||||
|
assert.NotNil(jsonResponse["slug"])
|
||||||
|
assert.NotEmpty(jsonResponse["slug"])
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCreateShareInvalidKey(t *testing.T) {
|
||||||
|
ts, assert := setup(t)
|
||||||
|
defer ts.Close()
|
||||||
|
|
||||||
|
req := genCreateShareRequest(ts, "not_existing.txt")
|
||||||
|
|
||||||
|
res, err := http.DefaultClient.Do(req)
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.Equal(http.StatusBadRequest, res.StatusCode)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetShare(t *testing.T) {
|
||||||
|
ts, assert := setup(t)
|
||||||
|
defer ts.Close()
|
||||||
|
|
||||||
|
req := genCreateShareRequest(ts, "test.txt")
|
||||||
|
|
||||||
|
res, err := http.DefaultClient.Do(req)
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.Equal(http.StatusCreated, res.StatusCode)
|
||||||
|
|
||||||
|
var jsonResponse map[string]string
|
||||||
|
err = json.NewDecoder(res.Body).Decode(&jsonResponse)
|
||||||
|
assert.NoError(err)
|
||||||
|
|
||||||
|
req, err = http.NewRequest("GET", ts.URL+"/s/"+jsonResponse["slug"], nil)
|
||||||
|
assert.NoError(err)
|
||||||
|
|
||||||
|
res, err = http.DefaultClient.Do(req)
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.Equal(http.StatusOK, res.StatusCode)
|
||||||
|
|
||||||
|
// check response
|
||||||
|
|
||||||
|
assert.Equal("inline; filename=\"test.txt\"", res.Header.Get("Content-Disposition"))
|
||||||
|
assert.Equal("text/plain", res.Header.Get("Content-Type"))
|
||||||
|
|
||||||
|
body, err := ioutil.ReadAll(res.Body)
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.Equal("test.txt", string(body))
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetShareInvalidSlug(t *testing.T) {
|
||||||
|
ts, assert := setup(t)
|
||||||
|
defer ts.Close()
|
||||||
|
|
||||||
|
req, err := http.NewRequest("GET", ts.URL+"/s/123456", nil)
|
||||||
|
assert.NoError(err)
|
||||||
|
|
||||||
|
res, err := http.DefaultClient.Do(req)
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.Equal(http.StatusNotFound, res.StatusCode)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetShareFileExt(t *testing.T) {
|
||||||
|
// Basically the same as TestGetShare, but with a file extension in the slug
|
||||||
|
ts, assert := setup(t)
|
||||||
|
defer ts.Close()
|
||||||
|
|
||||||
|
req := genCreateShareRequest(ts, "test.txt")
|
||||||
|
|
||||||
|
res, err := http.DefaultClient.Do(req)
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.Equal(http.StatusCreated, res.StatusCode)
|
||||||
|
|
||||||
|
var jsonResponse map[string]string
|
||||||
|
err = json.NewDecoder(res.Body).Decode(&jsonResponse)
|
||||||
|
assert.NoError(err)
|
||||||
|
|
||||||
|
req, err = http.NewRequest("GET", ts.URL+"/s/"+jsonResponse["slug"]+".txt", nil)
|
||||||
|
assert.NoError(err)
|
||||||
|
|
||||||
|
res, err = http.DefaultClient.Do(req)
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.Equal(http.StatusOK, res.StatusCode)
|
||||||
|
|
||||||
|
// check response
|
||||||
|
assert.Equal("inline; filename=\"test.txt\"", res.Header.Get("Content-Disposition"))
|
||||||
|
assert.Equal("text/plain", res.Header.Get("Content-Type"))
|
||||||
|
|
||||||
|
body, err := ioutil.ReadAll(res.Body)
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.Equal("test.txt", string(body))
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDeleteShare(t *testing.T) {
|
||||||
|
ts, assert := setup(t)
|
||||||
|
defer ts.Close()
|
||||||
|
|
||||||
|
req := genCreateShareRequest(ts, "test.txt")
|
||||||
|
|
||||||
|
res, err := http.DefaultClient.Do(req)
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.Equal(http.StatusCreated, res.StatusCode)
|
||||||
|
|
||||||
|
var jsonResponse map[string]string
|
||||||
|
err = json.NewDecoder(res.Body).Decode(&jsonResponse)
|
||||||
|
assert.NoError(err)
|
||||||
|
|
||||||
|
req, err = http.NewRequest("DELETE", ts.URL+"/api/share/"+jsonResponse["slug"], nil)
|
||||||
|
req.Header.Add("Authorization", "Basic YWRtaW46aHVudGVyMg==")
|
||||||
|
assert.NoError(err)
|
||||||
|
|
||||||
|
res, err = http.DefaultClient.Do(req)
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.Equal(http.StatusNoContent, res.StatusCode)
|
||||||
|
|
||||||
|
req, err = http.NewRequest("GET", ts.URL+"/s/"+jsonResponse["slug"], nil)
|
||||||
|
assert.NoError(err)
|
||||||
|
|
||||||
|
res, err = http.DefaultClient.Do(req)
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.Equal(http.StatusNotFound, res.StatusCode)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDeleteShareInvalidSlug(t *testing.T) {
|
||||||
|
ts, assert := setup(t)
|
||||||
|
defer ts.Close()
|
||||||
|
|
||||||
|
req, err := http.NewRequest("DELETE", ts.URL+"/api/share/123456", nil)
|
||||||
|
req.Header.Add("Authorization", "Basic YWRtaW46aHVudGVyMg==")
|
||||||
|
assert.NoError(err)
|
||||||
|
|
||||||
|
res, err := http.DefaultClient.Do(req)
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.Equal(http.StatusNotFound, res.StatusCode)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetAll(t *testing.T) {
|
||||||
|
ts, assert := setup(t)
|
||||||
|
defer ts.Close()
|
||||||
|
|
||||||
|
req := genCreateShareRequest(ts, "test.txt")
|
||||||
|
|
||||||
|
res, err := http.DefaultClient.Do(req)
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.Equal(http.StatusCreated, res.StatusCode)
|
||||||
|
|
||||||
|
var jsonResponse map[string]string
|
||||||
|
err = json.NewDecoder(res.Body).Decode(&jsonResponse)
|
||||||
|
assert.NoError(err)
|
||||||
|
|
||||||
|
req, err = http.NewRequest("GET", ts.URL+"/api/share", nil)
|
||||||
|
req.Header.Add("Authorization", "Basic YWRtaW46aHVudGVyMg==")
|
||||||
|
assert.NoError(err)
|
||||||
|
|
||||||
|
res, err = http.DefaultClient.Do(req)
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.Equal(http.StatusOK, res.StatusCode)
|
||||||
|
|
||||||
|
// check response
|
||||||
|
var jsonResponse2 []map[string]string
|
||||||
|
err = json.NewDecoder(res.Body).Decode(&jsonResponse2)
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.Equal(1, len(jsonResponse2))
|
||||||
|
assert.Equal(jsonResponse["slug"], jsonResponse2[0]["slug"])
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestInvalidAuth(t *testing.T) {
|
||||||
|
ts, assert := setup(t)
|
||||||
|
defer ts.Close()
|
||||||
|
|
||||||
|
req, err := http.NewRequest("GET", ts.URL+"/api/share", nil)
|
||||||
|
req.Header.Add("Authorization", "Basic YWRtaW46aHVudGVyMw==")
|
||||||
|
assert.NoError(err)
|
||||||
|
|
||||||
|
res, err := http.DefaultClient.Do(req)
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.Equal(http.StatusUnauthorized, res.StatusCode)
|
||||||
|
}
|
||||||
39
share.sh
Executable file
39
share.sh
Executable file
@@ -0,0 +1,39 @@
|
|||||||
|
#!/usr/bin/env sh
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
# This is an example on how i use this to upload and share files.
|
||||||
|
# This is tested with minio.
|
||||||
|
# You may need to change some things in here to fit your needs.
|
||||||
|
|
||||||
|
# Change these variables
|
||||||
|
S3_BUCKET="bucketname"
|
||||||
|
S3_ACCESS_KEY="accesskey"
|
||||||
|
S3_SECRET_KEY="secretkey"
|
||||||
|
S3_ENDPOINT="s3.example.com"
|
||||||
|
ENDPOINT="https://share.example.com"
|
||||||
|
API_USERNAME="admin"
|
||||||
|
API_PASSWORD="hunter2"
|
||||||
|
# Dont touch the things below
|
||||||
|
|
||||||
|
UPLOAD_FILE="$1"
|
||||||
|
|
||||||
|
if test -n "$1"; then
|
||||||
|
UPLOAD_FILE=$1
|
||||||
|
elif test ! -t 0; then
|
||||||
|
read -r UPLOAD_FILE
|
||||||
|
else
|
||||||
|
>&2 echo "Provide a file"
|
||||||
|
echo "Usage: $0 <file>"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
UPLOAD_FILENAME=$(basename "$UPLOAD_FILE")
|
||||||
|
|
||||||
|
s3cmd -q -s --host "$S3_ENDPOINT" --host-bucket "$S3_ENDPOINT" --access_key "$S3_ACCESS_KEY" --secret_key "$S3_SECRET_KEY" put "$UPLOAD_FILE" s3://$S3_BUCKET/
|
||||||
|
|
||||||
|
SLUG=$(curl -s -u "$API_USERNAME:$API_PASSWORD" -X POST --header "Content-Type: application/json" \
|
||||||
|
--data "{\"key\":\"$UPLOAD_FILENAME\"}" \
|
||||||
|
"$ENDPOINT/api/share" | jq -r ".slug")
|
||||||
|
|
||||||
|
printf "%s/%s\n" "$ENDPOINT" "$SLUG"
|
||||||
@@ -13,7 +13,7 @@ export default function getComponentForShare(contentType: string, filename: stri
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (contentType.startsWith("application/pdf")) {
|
if (contentType.startsWith("application/pdf")) {
|
||||||
return import("./opener/Default.svelte");
|
return import("./opener/PDF.svelte");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (contentType.startsWith("text/")) {
|
if (contentType.startsWith("text/")) {
|
||||||
@@ -25,7 +25,7 @@ export default function getComponentForShare(contentType: string, filename: stri
|
|||||||
case "application/ld+json":
|
case "application/ld+json":
|
||||||
case "application/xhtml+xml":
|
case "application/xhtml+xml":
|
||||||
case "application/xml":
|
case "application/xml":
|
||||||
return import("./opener/Default.svelte");
|
return import("./opener/Text.svelte");
|
||||||
case "application/ogg":
|
case "application/ogg":
|
||||||
return import("./opener/Default.svelte");
|
return import("./opener/Default.svelte");
|
||||||
}
|
}
|
||||||
@@ -56,13 +56,13 @@ export default function getComponentForShare(contentType: string, filename: stri
|
|||||||
case "flac":
|
case "flac":
|
||||||
return import("./opener/Default.svelte");
|
return import("./opener/Default.svelte");
|
||||||
case "pdf":
|
case "pdf":
|
||||||
return import("./opener/Default.svelte");
|
return import("./opener/PDF.svelte");
|
||||||
case "txt":
|
case "txt":
|
||||||
case "md":
|
case "md":
|
||||||
case "markdown":
|
case "markdown":
|
||||||
return import("./opener/Default.svelte");
|
return import("./opener/Default.svelte");
|
||||||
}
|
}
|
||||||
|
|
||||||
return import("./opener/Text.svelte");
|
return import("./opener/Default.svelte");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
14
web/opener/PDF.svelte
Normal file
14
web/opener/PDF.svelte
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
export let contentType: string;
|
||||||
|
export let filename: string;
|
||||||
|
export let slug: string;
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<iframe src="/s/{slug}.pdf" title="{filename}" frameborder="0"></iframe>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
iframe{
|
||||||
|
min-width: 100%;
|
||||||
|
height: 90vh;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
Reference in New Issue
Block a user