First commit
This commit is contained in:
commit
7e9d7364a2
26 changed files with 4484 additions and 0 deletions
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. <https://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The GNU 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 <https://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
|
||||||
|
<https://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
|
||||||
|
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
43
README.md
Normal file
43
README.md
Normal file
|
@ -0,0 +1,43 @@
|
||||||
|
### How to add an article?
|
||||||
|
|
||||||
|
The Git repository contains 2 branches:
|
||||||
|
- the main branch which has the blog engine
|
||||||
|
- the `gh-pages` (as GitHub) which contains the generated website
|
||||||
|
|
||||||
|
The user can have an overview of the website via:
|
||||||
|
```shell-session
|
||||||
|
$ git clone git@git.robur.coop:robur/blog.robur.coop
|
||||||
|
$ cd blog.robur.coop/
|
||||||
|
$ opam pin add -yn .
|
||||||
|
$ opam install --deps-only blogger
|
||||||
|
$ dune exec src/blogger.exe -- watch
|
||||||
|
```
|
||||||
|
|
||||||
|
A little server run on `http://localhost:8080`.
|
||||||
|
|
||||||
|
The user can add an article into the `articles/` directory. The format is easy.
|
||||||
|
A simple header which starts with `---` and finish with `---`. Inside, you have
|
||||||
|
a YAML description of the article where some fields are required:
|
||||||
|
- `date`
|
||||||
|
- `article.title`
|
||||||
|
- `article.description`
|
||||||
|
- `tags`
|
||||||
|
|
||||||
|
You can specify an `author` (with its `name`, `email` and `link`) or not. By
|
||||||
|
default, we use `team@robur.coop`. If everything looks good, you can generate
|
||||||
|
via the `blogger.exe` tool the generated website via:
|
||||||
|
```shell-session
|
||||||
|
$ dune exec src/blogger.exe -- push \
|
||||||
|
-r git@git.robur.coop:robur/blog.robur.coop.git#gh-pages
|
||||||
|
--hook https://blog.robur.coop/hook \
|
||||||
|
[--name "The Robur team"] \
|
||||||
|
[--email team@robur.coop]
|
||||||
|
```
|
||||||
|
|
||||||
|
An SSH communication will starts. If you already registered your private key
|
||||||
|
with `ssh-agent` and your `.ssh/config` is configured to take this one if you
|
||||||
|
communicate with with `git@git.robur.coop`, everything will be smooth! Et voilà!
|
||||||
|
At the end, an HTTP request will be send to `https://blog.robur.coop` to update
|
||||||
|
the unikernel with the last version of the blog.
|
||||||
|
|
||||||
|
**NOTE**: don't forget `#gh-pages`! Also, you probably should do a `git pull`.
|
126
articles/miragevpn.md
Normal file
126
articles/miragevpn.md
Normal file
|
@ -0,0 +1,126 @@
|
||||||
|
---
|
||||||
|
date: 2023-11-13
|
||||||
|
article.title: MirageVPN & tls-crypt-v2
|
||||||
|
article.description:
|
||||||
|
How we implementated tls-crypt-v2 for miragevpn
|
||||||
|
tags:
|
||||||
|
- OCaml
|
||||||
|
- MirageOS
|
||||||
|
- VPN
|
||||||
|
- security
|
||||||
|
author:
|
||||||
|
name: Reynir Björnsson
|
||||||
|
email: reynir@reynir.dk
|
||||||
|
link: https://reyn.ir/
|
||||||
|
---
|
||||||
|
|
||||||
|
# Miragevpn & tls-crypt-v2
|
||||||
|
|
||||||
|
hannes is undecided - should it be "MirageVPN"?
|
||||||
|
|
||||||
|
In 2019 [Robur][robur.coop] started working on a [OpenVPN™-compatible implementation in OCaml][miragevpn].
|
||||||
|
The project was funded for 6 months in 2019 by [prototypefund](https://prototypefund.de).
|
||||||
|
In late 2022 we applied again for funding this time to the [NGI Assure][ngi-assure] open call, and our application was eventually accepted.
|
||||||
|
In this blog post I will explain why reimplementing the OpenVPN™ protocol in OCaml is a worthwhile effort, and describe the Miragevpn implementation and in particular the `tls-crypt-v2` mechanism.
|
||||||
|
|
||||||
|
## What even is OpenVPN™?
|
||||||
|
|
||||||
|
[OpenVPN™][openvpn] is a protocol and software implementation to provide [virtual private networks][vpn-wiki]: computer networks that do not exist in hardware and are encrypted and tunnelled through existing networks.
|
||||||
|
Common use cases for this is to provide access to internal networks for remote workers, and for routing internet traffic through another machine for various reasons e.g. when using untrusted wifi, privacy from a snooping ISP, circumventing geoblock etc.
|
||||||
|
|
||||||
|
It is a protocol that has been worked on and evolved over the decades.
|
||||||
|
OpenVPN™ has a number of modes of operations as well as a number of options in the order of hundreds.
|
||||||
|
The modes can be categorized into two main categories: static mode and TLS mode.
|
||||||
|
The former mode uses static symmetric keys, and will be removed in the upcoming OpenVPN™ 2.7 (community edition).
|
||||||
|
I will not focus on static mode in this post.
|
||||||
|
The latter uses separate data & control channels where the control channel uses TLS - more on that later.
|
||||||
|
|
||||||
|
### Why reimplement it? And why in OCaml?
|
||||||
|
|
||||||
|
Before diving into TLS mode and eventually tls-crypt-v2 it's worth to briefly discuss why we spend time reimplementing the OpenVPN™ protocol.
|
||||||
|
You may ask yourself: why not just use the existing tried and tested implementation?
|
||||||
|
|
||||||
|
OpenVPN™ community edition is implemented in the C programming language.
|
||||||
|
It heavily uses the OpenSSL library[^mbedtls] which is as well written in C and has in the past had some notable security vulnerabilities.
|
||||||
|
Many vulnerabilities and bugs in C can be easily avoided in other languages due to bounds checking and stricter and more expressive type systems.
|
||||||
|
The state machine of the protocol can be more easily be expressed in OCaml, and some properties of the protocol can be encoded in the type system.
|
||||||
|
|
||||||
|
[^mbedtls]: It is possible to compile OpenVPN™ community edition with Mbed TLS instead of OpenSSL which is written in C as well.
|
||||||
|
|
||||||
|
Another reason is [Mirage OS][mirage], a library operating system implemented in OCaml.
|
||||||
|
We work on the Mirage project and write applications (unikernels) using Mirage.
|
||||||
|
In many cases it would be desirable to be able to connect to an existing VPN network[^vpn-network],
|
||||||
|
or be able to offer a VPN network to clients using OpenVPN™.
|
||||||
|
<!-- hannes: consider the current setup: as a VPN provider you offer lots of machines that run an operating system just for the user-space OpenVPN service. there are no users on the system, a lot of legacy layers are just around that are not needed.
|
||||||
|
|
||||||
|
With a MirageOS unikernel (and reproducible builds), which basically is a statically linked binary which is a complete operating system, such a setup and deployment (including updates) will be straightforward. With OCaml 5 and multicore in mind, this will even scale much better than OpenVPN (which is limited to a single core (hannes is not sure whether this is still true)).
|
||||||
|
-->
|
||||||
|
One very interesting example is a unikernel for [Qubes OS][qubes] that we have planned.
|
||||||
|
Qubes OS is an operating system with a high focus on security.
|
||||||
|
It offers an almost seamless experience of running applications in different virtual machines on the same machine.
|
||||||
|
The networking provided to a application (virtual machine) can be restricted to only go through the VPN.
|
||||||
|
It is possible to use OpenVPN™ for such a setup, but that requires running OpenVPN™ in a full Linux virtual machine.
|
||||||
|
With Mirage OS the resource footprint is typically much smaller than an equivalent application running in a Linux virtual machine; often the memory footprint is smaller by an order.
|
||||||
|
|
||||||
|
[^vpn-network]: I use the term "VPN network" to mean the virtual private network itself. It is a bit odd because the 'N' in 'VPN' is 'Network', but without disambiguation 'VPN' could refer to the network itself, the software or the service.
|
||||||
|
|
||||||
|
Finally, while it's not an explicit goal of ours, reimplementing a protocol without an explicit specification can help uncover bugs and things that need better documentation in the original implementation.
|
||||||
|
|
||||||
|
### TLS mode
|
||||||
|
|
||||||
|
There are different variants of TLS mode, but what they share is separate "control" channel and "data" channel.
|
||||||
|
The control channel is used to do a TLS handshake, and with the established TLS session data channel encryption keys, username/password authentication, etc. is negotiated.
|
||||||
|
Once this dance has been performed and data channel encryption keys have been negotiated the peers can exchange IP packets over the data channel.
|
||||||
|
|
||||||
|
Over the years a number of mechanisms has been implemented to protect the TLS stack from being exposed to third parties, protect against denial of service attacks and to hide information exchanged during a TLS handshake such as certificates (which was an isue before TLS 1.3).
|
||||||
|
These are known as `tls-auth`, `tls-crypt` and `tls-crypt-v2`.
|
||||||
|
The `tls-auth` mechanism adds a pre-shared key for hmac authentication on the control channel.
|
||||||
|
This makes it possible for an OpenVPN™ server to reject early clients that don't know the shared key before any TLS handshakes are performed.
|
||||||
|
In `tls-crypt` the control channel is encrypted as well as hmac authenticated using a pre-shared key.
|
||||||
|
Common to both is that the pre-shared key is shared between the server and all clients.
|
||||||
|
For large deployments this significantly reduces the usefulness - the key is more likely to be leaked the greate the number of clients who share this key.
|
||||||
|
|
||||||
|
### tls-crypt-v2
|
||||||
|
|
||||||
|
To improve on `tls-crypt`, `tls-crypt-v2` uses one pre-shared key per client.
|
||||||
|
This could be a lot of keys for the server to keep track of, so instead of storing all the client keys on the server the server has a special tls-crypt-v2 server key that is used to *[wrap][wiki-wrap]* the client keys.
|
||||||
|
That is, each client has their own client key as well as the client key wrapped using the server key.
|
||||||
|
The protocol is then extended so the client in the first message appends the wrapped key *unencrypted*.
|
||||||
|
The server can then decrypt and verify the client key and decrypt the rest of the packet.
|
||||||
|
Then the client and server use the client key just as in `tls-crypt`.
|
||||||
|
|
||||||
|
This is great!
|
||||||
|
Each client can have their own key, and the server doesn't need to keep a potentially large database of client keys.
|
||||||
|
What if the client's key is leaked?
|
||||||
|
A detail I didn't mention is that the wrapped key contains metadata.
|
||||||
|
By default this is the current timestamp, but it is possible on creation to put any (relative short) binary data in there as the metadata.
|
||||||
|
The server can then be configured to check the metadata by calling a script.
|
||||||
|
|
||||||
|
An issue exists that an initial packet takes up resources on the server because the server needs to
|
||||||
|
|
||||||
|
1) decrypt the wrapped key, and
|
||||||
|
2) keep the unwrapped key and other data in memory while waiting for the handshake to complete.
|
||||||
|
|
||||||
|
This can be abused in an attack very similar to a TCP [SYN flood][syn-flood].
|
||||||
|
Without `tls-crypt-v2` OpenVPN uses a specially crafted session ID (a 64 bit identifier) to avoid this issue similar to [SYN cookies][syn-cookie].
|
||||||
|
To address this in OpenVPN 2.6 the protocol for `tls-crypt-v2` was extended yet further with a 'HMAC cookie' mechanism.
|
||||||
|
The client sends the same packet as before, but uses a sequence number `0x0f000001` instead of `1` to signal support of this mechanism.
|
||||||
|
The server responds in a similar manner with a sequence number of `0x0f000001` and the packet is appended with a tag-length-value encoded list of flags.
|
||||||
|
At the moment only one tag and one value is defined which signifies the server supports HMAC cookies - this seems unnecessarily complex, but is done to allow future extensibility.
|
||||||
|
Finally, if the server supports HMAC cookies, the client sends a packet where the wrapped key is appended in cleartext.
|
||||||
|
The server is now able to decrypt the third packet without having to keep the key from the first packet around and can verify the session id.
|
||||||
|
|
||||||
|
<!-- hannes
|
||||||
|
something along the lines: if you're keen on setting this up yourself, go to <here> and download the latest binary, and execute it (well, just a brief howto get it up and running). Don't hesitate to reach out if you're stuck.
|
||||||
|
-->
|
||||||
|
|
||||||
|
[robur.coop]: https://robur.coop/
|
||||||
|
[miragevpn]: https://github.com/robur-coop/miragevpn/
|
||||||
|
[ngi-assure]: https://www.assure.ngi.eu/
|
||||||
|
[openvpn]: https://openvpn.net/
|
||||||
|
[vpn-wiki]: https://en.wikipedia.org/wiki/Virtual_private_network
|
||||||
|
[mirage]: https://mirage.io/
|
||||||
|
[qubes]: https://www.qubes-os.org/
|
||||||
|
[wiki-wrap]: https://en.wikipedia.org/wiki/Key_wrap
|
||||||
|
[syn-flood]: https://en.wikipedia.org/wiki/SYN_flood
|
||||||
|
[syn-cookie]: https://en.wikipedia.org/wiki/SYN_cookies
|
43
blogger.opam
Normal file
43
blogger.opam
Normal file
|
@ -0,0 +1,43 @@
|
||||||
|
opam-version: "2.0"
|
||||||
|
version: "dev"
|
||||||
|
synopsis: " The source code of the generator and the content of my blog, naively using YOCaml "
|
||||||
|
maintainer: "romain.calascibetta@gmail.com"
|
||||||
|
authors: [ "The XHTMLBoy <xhtmlboi@gmail.com>" ]
|
||||||
|
|
||||||
|
build: [
|
||||||
|
[ "dune" "subst" ]
|
||||||
|
[ "dune" "build" "-p" name "-j" jobs ]
|
||||||
|
[ "dune" "runtest" "-p" name ] {with-test}
|
||||||
|
[ "dune" "build" "@doc" "-p" name ] {with-doc}
|
||||||
|
]
|
||||||
|
|
||||||
|
license: "GPL-3.0-or-later"
|
||||||
|
tags: [ "angry" "cuisine" "nerd" "ocaml" "preface" ]
|
||||||
|
homepage: "https://github.com/dinosaure/blogger"
|
||||||
|
dev-repo: "git://github.com/dinosaure/blogger.git"
|
||||||
|
bug-reports: "https://github.com/dinosaure/blogger/issues"
|
||||||
|
|
||||||
|
depends: [
|
||||||
|
"ocaml" { >= "4.11.1" }
|
||||||
|
"dune" { >= "2.8" }
|
||||||
|
"preface" { >= "0.1.0" }
|
||||||
|
"logs" {>= "0.7.0" }
|
||||||
|
"cmdliner" { >= "1.0.0"}
|
||||||
|
"http-lwt-client"
|
||||||
|
"yocaml"
|
||||||
|
"yocaml_unix"
|
||||||
|
"yocaml_yaml"
|
||||||
|
"yocaml_cmark"
|
||||||
|
"yocaml_git"
|
||||||
|
"yocaml_jingoo"
|
||||||
|
]
|
||||||
|
|
||||||
|
pin-depends: [
|
||||||
|
["yocaml.dev" "git+https://github.com/xhtmlboi/yocaml.git"]
|
||||||
|
["yocaml_unix.dev" "git+https://github.com/xhtmlboi/yocaml.git"]
|
||||||
|
["yocaml_yaml.dev" "git+https://github.com/xhtmlboi/yocaml.git"]
|
||||||
|
["yocaml_markdown.dev" "git+https://github.com/xhtmlboi/yocaml.git"]
|
||||||
|
["yocaml_jingoo.dev" "git+https://github.com/xhtmlboi/yocaml.git"]
|
||||||
|
["yocaml_git.dev" "git+https://github.com/xhtmlboi/yocaml.git"]
|
||||||
|
["yocaml_cmark.dev" "git+https://github.com/xhtmlboi/yocaml.git"]
|
||||||
|
]
|
97
css/hl.css
Normal file
97
css/hl.css
Normal file
|
@ -0,0 +1,97 @@
|
||||||
|
/*!
|
||||||
|
Theme: devibeans (dark)
|
||||||
|
Author: @terminaldweller
|
||||||
|
Maintainer: @terminaldweller
|
||||||
|
|
||||||
|
Inspired by vim's jellybeans theme (https://github.com/nanotech/jellybeans.vim)
|
||||||
|
*/
|
||||||
|
|
||||||
|
.hljs {
|
||||||
|
background: #000000;
|
||||||
|
color: #a39e9b;
|
||||||
|
}
|
||||||
|
|
||||||
|
.hljs-attr,
|
||||||
|
.hljs-template-tag {
|
||||||
|
color: #8787d7;
|
||||||
|
}
|
||||||
|
|
||||||
|
.hljs-comment,
|
||||||
|
.hljs-doctag,
|
||||||
|
.hljs-quote {
|
||||||
|
color: #339966;
|
||||||
|
}
|
||||||
|
|
||||||
|
.hljs-params {
|
||||||
|
color: #a39e9b;
|
||||||
|
}
|
||||||
|
|
||||||
|
.hljs-regexp {
|
||||||
|
color: #d700ff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.hljs-tag,
|
||||||
|
.hljs-selector-id,
|
||||||
|
.hljs-number,
|
||||||
|
.hljs-literal {
|
||||||
|
color: #ef5350;
|
||||||
|
}
|
||||||
|
|
||||||
|
.hljs-meta,
|
||||||
|
.hljs-meta .hljs-keyword {
|
||||||
|
|
||||||
|
color: #0087ff;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* opt-out */
|
||||||
|
.hljs-operator,
|
||||||
|
.hljs-punctuation{
|
||||||
|
}
|
||||||
|
|
||||||
|
.hljs-selector-class,
|
||||||
|
.hljs-code,
|
||||||
|
.hljs-formula,
|
||||||
|
.hljs-variable,
|
||||||
|
.hljs-template-variable,
|
||||||
|
.hljs-selector-attr,
|
||||||
|
.hljs-selector-pseudo,
|
||||||
|
.hljs-link,
|
||||||
|
.hljs-keyword {
|
||||||
|
color: #64b5f6;
|
||||||
|
}
|
||||||
|
|
||||||
|
.hljs-built_in,
|
||||||
|
.hljs-title,
|
||||||
|
.hljs-deletion {
|
||||||
|
color: #ff8700;
|
||||||
|
}
|
||||||
|
|
||||||
|
.hljs-type,
|
||||||
|
.hljs-section,
|
||||||
|
.hljs-function,
|
||||||
|
.hljs-name,
|
||||||
|
.hljs-property,
|
||||||
|
.hljs-attribute {
|
||||||
|
color: #ffd75f;
|
||||||
|
}
|
||||||
|
|
||||||
|
.hljs-meta .hljs-string,
|
||||||
|
.hljs-string,
|
||||||
|
.hljs-subst,
|
||||||
|
.hljs-symbol,
|
||||||
|
.hljs-bullet,
|
||||||
|
.hljs-addition {
|
||||||
|
color: #558b2f;
|
||||||
|
}
|
||||||
|
|
||||||
|
.hljs-selector-tag {
|
||||||
|
color: #9966ff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.hljs-emphasis {
|
||||||
|
font-style: italic;
|
||||||
|
}
|
||||||
|
|
||||||
|
.hljs-strong {
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
312
css/style.css
Normal file
312
css/style.css
Normal file
|
@ -0,0 +1,312 @@
|
||||||
|
/* Stolen from xvw.github.io */
|
||||||
|
*,
|
||||||
|
*::before,
|
||||||
|
*::after {
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
|
/* It is so obvious that it is surprising that it is not the default
|
||||||
|
behaviour! */
|
||||||
|
|
||||||
|
body {
|
||||||
|
margin: 32px auto;
|
||||||
|
padding: 16px;
|
||||||
|
max-width: 840px;
|
||||||
|
background-color: #fff;
|
||||||
|
color: #444444;
|
||||||
|
font-family: monospace;
|
||||||
|
}
|
||||||
|
|
||||||
|
h1,
|
||||||
|
h2,
|
||||||
|
h3 {
|
||||||
|
line-height: 1.2;
|
||||||
|
}
|
||||||
|
|
||||||
|
header {
|
||||||
|
margin-bottom: 32px;
|
||||||
|
}
|
||||||
|
|
||||||
|
header h1 {
|
||||||
|
margin: 0;
|
||||||
|
font-weight: 900;
|
||||||
|
}
|
||||||
|
|
||||||
|
header h1::before,
|
||||||
|
header h1::after {
|
||||||
|
color: #a3a1a8;
|
||||||
|
font-weight: 100;
|
||||||
|
}
|
||||||
|
|
||||||
|
header h1::before {
|
||||||
|
content: "<h1>";
|
||||||
|
}
|
||||||
|
header h1::after {
|
||||||
|
content: "</h1>";
|
||||||
|
}
|
||||||
|
|
||||||
|
header blockquote {
|
||||||
|
padding: 0;
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
hr {
|
||||||
|
width: 0%;
|
||||||
|
min-width: 20%;
|
||||||
|
max-width: 100%;
|
||||||
|
margin: 0 auto;
|
||||||
|
border: none;
|
||||||
|
border-bottom: 1px solid #666;
|
||||||
|
position: relative;
|
||||||
|
transition: box-shadow 200ms ease-in-out;
|
||||||
|
box-shadow: 0px 0px 0px 0px #f9f9f9;
|
||||||
|
}
|
||||||
|
|
||||||
|
main {
|
||||||
|
margin: 42px 0px;
|
||||||
|
line-height: 1.6;
|
||||||
|
}
|
||||||
|
|
||||||
|
footer {
|
||||||
|
padding-top: 32px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.list-articles {
|
||||||
|
list-style: none;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.list-articles > li {
|
||||||
|
padding: 0;
|
||||||
|
margin: 0;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
}
|
||||||
|
|
||||||
|
.list-articles > li > div.side {
|
||||||
|
flex: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.list-articles > li > div.side img {
|
||||||
|
width: 32px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.list-articles > li > div.content {
|
||||||
|
flex: 1;
|
||||||
|
margin-left: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.list-articles > li > div.content > span.date {
|
||||||
|
color: #a3a1a8;
|
||||||
|
}
|
||||||
|
.list-articles > li > div.content > p {
|
||||||
|
padding: 0;
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.list-articles > li > div.content > div.bottom {
|
||||||
|
padding: 4px 0;
|
||||||
|
margin: 8px 0;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
article h1 {
|
||||||
|
font-size: 1.8em;
|
||||||
|
margin: 20px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
article h2 {
|
||||||
|
font-size: 1.6em;
|
||||||
|
margin-top: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
article h3 {
|
||||||
|
font-size: 1.4em;
|
||||||
|
margin-top: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
article h4 {
|
||||||
|
font-size: 1.2em;
|
||||||
|
margin-top: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
article blockquote h4 {
|
||||||
|
margin-top: 34px;
|
||||||
|
margin-bottom: -16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
article pre {
|
||||||
|
margin: 16px 8px;
|
||||||
|
padding: 8px;
|
||||||
|
font-family: 'Courier new', monospace;
|
||||||
|
font-size: 1.2em;
|
||||||
|
line-height: 100%;
|
||||||
|
width: 100%;
|
||||||
|
overflow-x: auto;
|
||||||
|
background-color: #000;
|
||||||
|
}
|
||||||
|
|
||||||
|
article img {
|
||||||
|
display: block;
|
||||||
|
margin: 32px auto;
|
||||||
|
max-width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.hljs-built_in {
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.hljs-doctag,
|
||||||
|
.hljs-formula,
|
||||||
|
.hljs-symbol,
|
||||||
|
.hljs-string {
|
||||||
|
background: none;
|
||||||
|
color: #666;
|
||||||
|
}
|
||||||
|
|
||||||
|
article pre code {
|
||||||
|
font-size: 0.8em;
|
||||||
|
}
|
||||||
|
|
||||||
|
article code {
|
||||||
|
font-family: 'Courier new', monospace;
|
||||||
|
font-size: 0.8em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tag-box {
|
||||||
|
margin: 0;
|
||||||
|
margin-bottom: 32px;
|
||||||
|
padding-bottom: 12px;
|
||||||
|
color: #111;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tag-box > h3 {
|
||||||
|
display: inline-block;
|
||||||
|
padding: 0;
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tag-box > h3 > span {
|
||||||
|
padding: 2px 8px;
|
||||||
|
background-color: #111;
|
||||||
|
color: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tag-box > h3 > span::before {
|
||||||
|
content: "#";
|
||||||
|
}
|
||||||
|
|
||||||
|
.valid {
|
||||||
|
display: inline-block;
|
||||||
|
margin: 20px 0;
|
||||||
|
border: 2px solid #444444;
|
||||||
|
color: #444444;
|
||||||
|
font-weight: 900;
|
||||||
|
font-size: 0.8em;
|
||||||
|
text-decoration: none;
|
||||||
|
text-transform: uppercase;
|
||||||
|
padding: 4px 4px 4px 1.5em;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.valid::before {
|
||||||
|
content: "";
|
||||||
|
position: absolute;
|
||||||
|
border-color: #009933;
|
||||||
|
border-style: solid;
|
||||||
|
border-width: 0 0.3em 0.25em 0;
|
||||||
|
height: 1em;
|
||||||
|
top: 1.3em;
|
||||||
|
left: 0.6em;
|
||||||
|
margin-top: -1em;
|
||||||
|
transform: rotate(58deg);
|
||||||
|
width: 0.5em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.small-button {
|
||||||
|
display: inline-block;
|
||||||
|
margin: 4px 0;
|
||||||
|
font-weight: 900;
|
||||||
|
font-size: 0.7em;
|
||||||
|
text-decoration: none;
|
||||||
|
text-transform: uppercase;
|
||||||
|
padding: 2px 4px;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.rss {
|
||||||
|
background-color: #d94c1a;
|
||||||
|
color: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.twitter {
|
||||||
|
background-color: #506ad4;
|
||||||
|
color: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.github {
|
||||||
|
background-color: #111;
|
||||||
|
color: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.aeration {
|
||||||
|
margin: 32px 0 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tags-list {
|
||||||
|
padding: 0;
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
article .tags-list {
|
||||||
|
margin-bottom: 32px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tags-list > li {
|
||||||
|
display: inline-block;
|
||||||
|
background-color: #f2f2f2;
|
||||||
|
color: #333333;
|
||||||
|
margin: 2px;
|
||||||
|
padding: 2px 8px;
|
||||||
|
font-size: 0.8em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tags-list > li::before {
|
||||||
|
content: "#";
|
||||||
|
color: #666;
|
||||||
|
margin-right: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tags-list > li > a {
|
||||||
|
color: #333333;
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media screen and (max-width: 720px) {
|
||||||
|
header h1 {
|
||||||
|
margin-left: 32px;
|
||||||
|
}
|
||||||
|
|
||||||
|
header h1::before,
|
||||||
|
header h1::after {
|
||||||
|
margin-left: -32px;
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
header .banner {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
header blockquote {
|
||||||
|
margin-top: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
main blockquote {
|
||||||
|
margin: 4px;
|
||||||
|
}
|
||||||
|
}
|
2
dune-project
Normal file
2
dune-project
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
(lang dune 2.8)
|
||||||
|
(name blogger)
|
2191
js/hl.js
Normal file
2191
js/hl.js
Normal file
File diff suppressed because one or more lines are too long
6
pages/index.md
Normal file
6
pages/index.md
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
---
|
||||||
|
title: Index
|
||||||
|
description: The famous root of the website
|
||||||
|
---
|
||||||
|
|
||||||
|
The Robur blog.
|
0
pages/tags.md
Normal file
0
pages/tags.md
Normal file
307
src/blogger.ml
Normal file
307
src/blogger.ml
Normal file
|
@ -0,0 +1,307 @@
|
||||||
|
let caller = Sys.argv.(0)
|
||||||
|
let version = "%%VERSION%%"
|
||||||
|
let default_port = 8888
|
||||||
|
let default_target = Fpath.v "_site"
|
||||||
|
|
||||||
|
let program ~target =
|
||||||
|
let open Yocaml in
|
||||||
|
let* () = Task.move_javascript target in
|
||||||
|
let* () = Task.move_css target in
|
||||||
|
let* () = Task.move_images target in
|
||||||
|
let* () = Task.process_articles target in
|
||||||
|
let* () = Task.generate_feed target in
|
||||||
|
let* () = Task.generate_tags target in
|
||||||
|
Task.generate_index target
|
||||||
|
|
||||||
|
let local_build _quiet target =
|
||||||
|
Yocaml_unix.execute (program ~target:(Fpath.to_string target))
|
||||||
|
|
||||||
|
module SSH = struct
|
||||||
|
open Lwt.Infix
|
||||||
|
|
||||||
|
type error = Unix.error * string * string
|
||||||
|
type write_error = [ `Closed | `Error of Unix.error * string * string ]
|
||||||
|
|
||||||
|
let pp_error ppf (err, f, v) =
|
||||||
|
Fmt.pf ppf "%s(%s): %s" f v (Unix.error_message err)
|
||||||
|
|
||||||
|
let pp_write_error ppf = function
|
||||||
|
| `Closed -> Fmt.pf ppf "Connection closed by peer"
|
||||||
|
| `Error (err, f, v) -> Fmt.pf ppf "%s(%s): %s" f v (Unix.error_message err)
|
||||||
|
|
||||||
|
type flow = { ic : in_channel; oc : out_channel }
|
||||||
|
|
||||||
|
type endpoint = {
|
||||||
|
user : string;
|
||||||
|
path : string;
|
||||||
|
host : Unix.inet_addr;
|
||||||
|
port : int;
|
||||||
|
capabilities : [ `Rd | `Wr ];
|
||||||
|
}
|
||||||
|
|
||||||
|
let pp_inet_addr ppf inet_addr =
|
||||||
|
Fmt.string ppf (Unix.string_of_inet_addr inet_addr)
|
||||||
|
|
||||||
|
let connect { user; path; host; port; capabilities } =
|
||||||
|
let edn = Fmt.str "%s@%a" user pp_inet_addr host in
|
||||||
|
let cmd =
|
||||||
|
match capabilities with
|
||||||
|
| `Wr -> Fmt.str {sh|git-receive-pack '%s'|sh} path
|
||||||
|
| `Rd -> Fmt.str {sh|git-upload-pack '%s'|sh} path
|
||||||
|
in
|
||||||
|
let cmd = Fmt.str "ssh -p %d %s %a" port edn Fmt.(quote string) cmd in
|
||||||
|
try
|
||||||
|
let ic, oc = Unix.open_process cmd in
|
||||||
|
Lwt.return_ok { ic; oc }
|
||||||
|
with Unix.Unix_error (err, f, v) -> Lwt.return_error (`Error (err, f, v))
|
||||||
|
|
||||||
|
let read t =
|
||||||
|
let tmp = Bytes.create 0x1000 in
|
||||||
|
try
|
||||||
|
let len = input t.ic tmp 0 0x1000 in
|
||||||
|
if len = 0 then Lwt.return_ok `Eof
|
||||||
|
else Lwt.return_ok (`Data (Cstruct.of_bytes tmp ~off:0 ~len))
|
||||||
|
with Unix.Unix_error (err, f, v) -> Lwt.return_error (err, f, v)
|
||||||
|
|
||||||
|
let write t cs =
|
||||||
|
let str = Cstruct.to_string cs in
|
||||||
|
try
|
||||||
|
output_string t.oc str;
|
||||||
|
flush t.oc;
|
||||||
|
Lwt.return_ok ()
|
||||||
|
with Unix.Unix_error (err, f, v) -> Lwt.return_error (`Error (err, f, v))
|
||||||
|
|
||||||
|
let writev t css =
|
||||||
|
let rec go t = function
|
||||||
|
| [] -> Lwt.return_ok ()
|
||||||
|
| x :: r -> (
|
||||||
|
write t x >>= function
|
||||||
|
| Ok () -> go t r
|
||||||
|
| Error _ as err -> Lwt.return err)
|
||||||
|
in
|
||||||
|
go t css
|
||||||
|
|
||||||
|
let close t =
|
||||||
|
close_in t.ic;
|
||||||
|
close_out t.oc;
|
||||||
|
Lwt.return_unit
|
||||||
|
end
|
||||||
|
|
||||||
|
let ssh_edn, ssh_protocol = Mimic.register ~name:"ssh" (module SSH)
|
||||||
|
|
||||||
|
let unix_ctx_with_ssh () =
|
||||||
|
let open Lwt.Infix in
|
||||||
|
Git_unix.ctx (Happy_eyeballs_lwt.create ()) >|= fun ctx ->
|
||||||
|
let open Mimic in
|
||||||
|
let k0 scheme user path host port capabilities =
|
||||||
|
match (scheme, Unix.gethostbyname host) with
|
||||||
|
| `SSH, { Unix.h_addr_list; _ } when Array.length h_addr_list > 0 ->
|
||||||
|
Lwt.return_some
|
||||||
|
{ SSH.user; path; host = h_addr_list.(0); port; capabilities }
|
||||||
|
| _ -> Lwt.return_none
|
||||||
|
in
|
||||||
|
ctx
|
||||||
|
|> Mimic.fold Smart_git.git_transmission
|
||||||
|
Fun.[ req Smart_git.git_scheme ]
|
||||||
|
~k:(function `SSH -> Lwt.return_some `Exec | _ -> Lwt.return_none)
|
||||||
|
|> Mimic.fold ssh_edn
|
||||||
|
Fun.
|
||||||
|
[
|
||||||
|
req Smart_git.git_scheme;
|
||||||
|
req Smart_git.git_ssh_user;
|
||||||
|
req Smart_git.git_path;
|
||||||
|
req Smart_git.git_hostname;
|
||||||
|
dft Smart_git.git_port 22;
|
||||||
|
req Smart_git.git_capabilities;
|
||||||
|
]
|
||||||
|
~k:k0
|
||||||
|
|
||||||
|
let run_git_config key = function
|
||||||
|
| Some value -> Some value
|
||||||
|
| None -> (
|
||||||
|
let open Bos in
|
||||||
|
let value = OS.Cmd.run_out Cmd.(v "git" % "config" % "--global" % key) in
|
||||||
|
match OS.Cmd.out_string value with
|
||||||
|
| Ok (value, _) -> Some value
|
||||||
|
| Error _ -> None)
|
||||||
|
|
||||||
|
let get_name_and_email name email =
|
||||||
|
let name = run_git_config "user.name" name in
|
||||||
|
let email = run_git_config "user.email" email in
|
||||||
|
(name, email)
|
||||||
|
|
||||||
|
let name_and_email =
|
||||||
|
let name_arg =
|
||||||
|
let doc = "Name of the committer." in
|
||||||
|
Cmdliner.Arg.(value & opt (some string) None & info [ "name" ] ~doc)
|
||||||
|
in
|
||||||
|
let email_arg =
|
||||||
|
let doc = "Email of the committer." in
|
||||||
|
Cmdliner.Arg.(value & opt (some string) None & info [ "email" ] ~doc)
|
||||||
|
in
|
||||||
|
Cmdliner.Term.(const get_name_and_email $ name_arg $ email_arg)
|
||||||
|
|
||||||
|
let build_and_push _quiet remote (author, email) hook =
|
||||||
|
let fiber () =
|
||||||
|
let open Lwt.Syntax in
|
||||||
|
let* ctx = unix_ctx_with_ssh () in
|
||||||
|
let* res =
|
||||||
|
Yocaml_git.execute
|
||||||
|
(module Yocaml_unix)
|
||||||
|
(module Pclock)
|
||||||
|
~ctx ?author ?email remote (program ~target:"")
|
||||||
|
in
|
||||||
|
match res with
|
||||||
|
| Error (`Msg err) -> Fmt.failwith "build-and-push: %s." err
|
||||||
|
| Ok () -> (
|
||||||
|
match hook with
|
||||||
|
| None -> Lwt.return_unit
|
||||||
|
| Some hook -> (
|
||||||
|
let open Lwt.Infix in
|
||||||
|
Http_lwt_client.request ~config:(`HTTP_1_1 Httpaf.Config.default)
|
||||||
|
~meth:`GET (Uri.to_string hook)
|
||||||
|
(fun _ () _ -> Lwt.return_unit)
|
||||||
|
()
|
||||||
|
>>= function
|
||||||
|
| Ok (_response, ()) -> Lwt.return_unit
|
||||||
|
| Error (`Msg err) -> failwith err))
|
||||||
|
in
|
||||||
|
Lwt_main.run (fiber ())
|
||||||
|
|
||||||
|
let watch quiet target potential_port =
|
||||||
|
let port = Option.value ~default:default_port potential_port in
|
||||||
|
let () = local_build quiet target in
|
||||||
|
let target = Fpath.to_string target in
|
||||||
|
let server = Yocaml_unix.serve ~filepath:target ~port (program ~target) in
|
||||||
|
Lwt_main.run server
|
||||||
|
|
||||||
|
let common_options = "COMMON OPTIONS"
|
||||||
|
|
||||||
|
let verbosity =
|
||||||
|
let open Cmdliner in
|
||||||
|
let env = Cmd.Env.info "BLOGGER_LOGS" in
|
||||||
|
Logs_cli.level ~docs:common_options ~env ()
|
||||||
|
|
||||||
|
let renderer =
|
||||||
|
let open Cmdliner in
|
||||||
|
let env = Cmd.Env.info "BLOGGER_FMT" in
|
||||||
|
Fmt_cli.style_renderer ~docs:common_options ~env ()
|
||||||
|
|
||||||
|
let utf_8 =
|
||||||
|
let open Cmdliner in
|
||||||
|
let doc = "Allow binaries to emit UTF-8 characters." in
|
||||||
|
let env = Cmd.Env.info "BLOGGER_UTF_8" in
|
||||||
|
Arg.(value & opt bool true & info [ "with-utf-8" ] ~doc ~env)
|
||||||
|
|
||||||
|
let reporter ppf =
|
||||||
|
let report src level ~over k msgf =
|
||||||
|
let k _ =
|
||||||
|
over ();
|
||||||
|
k ()
|
||||||
|
in
|
||||||
|
let with_metadata header _tags k ppf fmt =
|
||||||
|
Fmt.kpf k ppf
|
||||||
|
("%a[%a]: " ^^ fmt ^^ "\n%!")
|
||||||
|
Logs_fmt.pp_header (level, header)
|
||||||
|
Fmt.(styled `Magenta string)
|
||||||
|
(Logs.Src.name src)
|
||||||
|
in
|
||||||
|
msgf @@ fun ?header ?tags fmt -> with_metadata header tags k ppf fmt
|
||||||
|
in
|
||||||
|
{ Logs.report }
|
||||||
|
|
||||||
|
let setup_logs utf_8 style_renderer level =
|
||||||
|
Fmt_tty.setup_std_outputs ~utf_8 ?style_renderer ();
|
||||||
|
Logs.set_level level;
|
||||||
|
Logs.set_reporter (reporter Fmt.stderr);
|
||||||
|
Option.is_none level
|
||||||
|
|
||||||
|
let setup_logs = Cmdliner.Term.(const setup_logs $ utf_8 $ renderer $ verbosity)
|
||||||
|
|
||||||
|
let man =
|
||||||
|
let open Cmdliner in
|
||||||
|
[ `S Manpage.s_authors; `P "blog.robur.coop" ]
|
||||||
|
|
||||||
|
let build_cmd =
|
||||||
|
let open Cmdliner in
|
||||||
|
let doc = Format.asprintf "Build the blog into the specified directory" in
|
||||||
|
let exits = Cmd.Exit.defaults in
|
||||||
|
let info = Cmd.info "build" ~version ~doc ~exits ~man in
|
||||||
|
let path_arg =
|
||||||
|
let doc =
|
||||||
|
Format.asprintf "Specify where we build the website (default: %a)"
|
||||||
|
Fpath.pp default_target
|
||||||
|
in
|
||||||
|
let arg = Arg.info ~doc [ "destination" ] in
|
||||||
|
Arg.(value & opt (conv (Fpath.of_string, Fpath.pp)) default_target & arg)
|
||||||
|
in
|
||||||
|
Cmd.v info Term.(const local_build $ setup_logs $ path_arg)
|
||||||
|
|
||||||
|
let watch_cmd =
|
||||||
|
let open Cmdliner in
|
||||||
|
let doc =
|
||||||
|
Format.asprintf
|
||||||
|
"Serve from the specified directory as an HTTP server and rebuild \
|
||||||
|
website on demand"
|
||||||
|
in
|
||||||
|
let exits = Cmd.Exit.defaults in
|
||||||
|
let path_arg =
|
||||||
|
let doc =
|
||||||
|
Format.asprintf "Specify where we build the website (default: %a)"
|
||||||
|
Fpath.pp default_target
|
||||||
|
in
|
||||||
|
let arg = Arg.info ~doc [ "destination" ] in
|
||||||
|
Arg.(value & opt (conv (Fpath.of_string, Fpath.pp)) default_target & arg)
|
||||||
|
in
|
||||||
|
let port_arg =
|
||||||
|
let doc = Format.asprintf "The port (default: %d)" default_port in
|
||||||
|
let arg = Arg.info ~doc [ "port"; "P"; "p" ] in
|
||||||
|
Arg.(value & opt (some int) None & arg)
|
||||||
|
in
|
||||||
|
let info = Cmd.info "watch" ~version ~doc ~exits ~man in
|
||||||
|
Cmd.v info Term.(const watch $ setup_logs $ path_arg $ port_arg)
|
||||||
|
|
||||||
|
let push_cmd =
|
||||||
|
let open Cmdliner in
|
||||||
|
let doc =
|
||||||
|
Format.asprintf
|
||||||
|
"Push the blog (from the specified directory) into a Git repository"
|
||||||
|
in
|
||||||
|
let exits = Cmd.Exit.defaults in
|
||||||
|
let remote_arg =
|
||||||
|
let remote =
|
||||||
|
let parser str =
|
||||||
|
match Smart_git.Endpoint.of_string str with
|
||||||
|
| Ok _ -> Ok str
|
||||||
|
| Error _ as err -> err
|
||||||
|
in
|
||||||
|
Arg.conv (parser, Fmt.string)
|
||||||
|
in
|
||||||
|
let doc = "The remote Git repository" in
|
||||||
|
let arg = Arg.info ~doc [ "r"; "remote" ] in
|
||||||
|
Arg.(required & opt (some remote) None & arg)
|
||||||
|
in
|
||||||
|
let hook_arg =
|
||||||
|
let doc = "The URL of the hook to update the unikernel" in
|
||||||
|
let arg = Arg.info ~doc [ "h"; "hook" ] in
|
||||||
|
let of_string str =
|
||||||
|
match Uri.of_string str with
|
||||||
|
| v -> Ok v
|
||||||
|
| exception _ -> Rresult.R.error_msgf "Invalid URI: %s" str
|
||||||
|
in
|
||||||
|
Arg.(value & opt (some (conv (of_string, Uri.pp))) None & arg)
|
||||||
|
in
|
||||||
|
let info = Cmd.info "push" ~version ~doc ~exits ~man in
|
||||||
|
Cmd.v info
|
||||||
|
Term.(
|
||||||
|
const build_and_push $ setup_logs $ remote_arg $ name_and_email $ hook_arg)
|
||||||
|
|
||||||
|
let cmd =
|
||||||
|
let open Cmdliner in
|
||||||
|
let sdocs = Manpage.s_common_options in
|
||||||
|
let doc = "Build, push or serve my personal website" in
|
||||||
|
let default_info = Cmd.info caller ~version ~doc ~sdocs ~man in
|
||||||
|
let default = Term.(ret (const (`Help (`Pager, None)))) in
|
||||||
|
Cmd.group ~default default_info [ build_cmd; watch_cmd; push_cmd ]
|
||||||
|
|
||||||
|
let () = exit @@ Cmdliner.Cmd.eval cmd
|
64
src/collection.ml
Normal file
64
src/collection.ml
Normal file
|
@ -0,0 +1,64 @@
|
||||||
|
open Yocaml
|
||||||
|
|
||||||
|
let get_article (module V : Metadata.VALIDABLE) article_file =
|
||||||
|
let arr =
|
||||||
|
Build.read_file_with_metadata
|
||||||
|
(module V)
|
||||||
|
(module Model.Article)
|
||||||
|
article_file
|
||||||
|
in
|
||||||
|
let deps = Build.get_dependencies arr in
|
||||||
|
let task = Build.get_task arr in
|
||||||
|
let+ meta, _ = task () in
|
||||||
|
deps, (meta, Model.article_path article_file)
|
||||||
|
;;
|
||||||
|
|
||||||
|
let get_articles (module V : Metadata.VALIDABLE) path =
|
||||||
|
let* files = read_child_files path File.is_markdown in
|
||||||
|
let+ articles = Traverse.traverse (get_article (module V)) files in
|
||||||
|
let deps, effects = List.split articles in
|
||||||
|
Deps.Monoid.reduce deps, effects
|
||||||
|
;;
|
||||||
|
|
||||||
|
module Articles = struct
|
||||||
|
type t = (Model.Article.t * Filepath.t) list
|
||||||
|
|
||||||
|
let get_all (module V : Metadata.VALIDABLE) ?(decreasing = true) path =
|
||||||
|
let+ deps, articles = get_articles (module V) path in
|
||||||
|
let sorted_article = Model.Articles.sort ~decreasing articles in
|
||||||
|
Build.make deps (fun x -> return (x, sorted_article))
|
||||||
|
;;
|
||||||
|
end
|
||||||
|
|
||||||
|
module Tags = struct
|
||||||
|
module M = Map.Make (String)
|
||||||
|
|
||||||
|
let by_quantity ?(decreasing = true) (_, a) (_, b) =
|
||||||
|
let r = Int.compare $ List.length a $ List.length b in
|
||||||
|
if decreasing then ~-r else r
|
||||||
|
;;
|
||||||
|
|
||||||
|
let group metas =
|
||||||
|
List.fold_left
|
||||||
|
(fun accumulator (article, path) ->
|
||||||
|
List.fold_left
|
||||||
|
(fun map tag ->
|
||||||
|
match M.find_opt tag map with
|
||||||
|
| Some articles -> M.add tag ((article, path) :: articles) map
|
||||||
|
| None -> M.add tag [ article, path ] map)
|
||||||
|
accumulator
|
||||||
|
(Model.Article.tags article))
|
||||||
|
M.empty
|
||||||
|
metas
|
||||||
|
|> M.map
|
||||||
|
(List.sort (fun (a, _) (b, _) -> Model.Article.compare_by_date a b))
|
||||||
|
|> M.to_seq
|
||||||
|
|> List.of_seq
|
||||||
|
|> List.sort by_quantity
|
||||||
|
;;
|
||||||
|
|
||||||
|
let compute (module V : Metadata.VALIDABLE) path =
|
||||||
|
let+ deps, articles = get_articles (module V) path in
|
||||||
|
deps, group articles
|
||||||
|
;;
|
||||||
|
end
|
18
src/collection.mli
Normal file
18
src/collection.mli
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
open Yocaml
|
||||||
|
|
||||||
|
module Articles : sig
|
||||||
|
type t = (Model.Article.t * Filepath.t) list
|
||||||
|
|
||||||
|
val get_all
|
||||||
|
: (module Metadata.VALIDABLE)
|
||||||
|
-> ?decreasing:bool
|
||||||
|
-> Filepath.t
|
||||||
|
-> ('a, 'a * t) Build.t Effect.t
|
||||||
|
end
|
||||||
|
|
||||||
|
module Tags : sig
|
||||||
|
val compute
|
||||||
|
: (module Metadata.VALIDABLE)
|
||||||
|
-> Filepath.t
|
||||||
|
-> (Deps.t * (string * (Model.Article.t * string) list) list) Effect.t
|
||||||
|
end
|
21
src/dune
Normal file
21
src/dune
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
(executable
|
||||||
|
(name blogger)
|
||||||
|
(libraries
|
||||||
|
logs
|
||||||
|
logs.fmt
|
||||||
|
logs.cli
|
||||||
|
fmt
|
||||||
|
fmt.tty
|
||||||
|
fmt.cli
|
||||||
|
cmdliner
|
||||||
|
preface
|
||||||
|
mirage-clock-unix
|
||||||
|
http-lwt-client
|
||||||
|
git-unix
|
||||||
|
cmarkit
|
||||||
|
yocaml
|
||||||
|
yocaml_yaml
|
||||||
|
yocaml_cmark
|
||||||
|
yocaml_unix
|
||||||
|
yocaml_git
|
||||||
|
yocaml_jingoo))
|
15
src/feed.ml
Normal file
15
src/feed.ml
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
open Yocaml
|
||||||
|
|
||||||
|
let domain = "https://blog.robur.coop"
|
||||||
|
let feed_url = into domain "feed.xml"
|
||||||
|
|
||||||
|
let articles_to_items articles =
|
||||||
|
List.map
|
||||||
|
(fun (article, url) -> Model.Article.to_rss_item (into domain url) article)
|
||||||
|
articles
|
||||||
|
|
||||||
|
let make ((), articles) =
|
||||||
|
Yocaml.Rss.Channel.make ~title:"Robur's blog" ~link:domain ~feed_link:feed_url
|
||||||
|
~description:"The Robur cooperative blog" ~generator:"yocaml"
|
||||||
|
~webmaster:"team@robur.coop"
|
||||||
|
(articles_to_items articles)
|
1
src/feed.mli
Normal file
1
src/feed.mli
Normal file
|
@ -0,0 +1 @@
|
||||||
|
val make : unit * Collection.Articles.t -> Yocaml.Rss.Channel.t
|
18
src/file.ml
Normal file
18
src/file.ml
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
open Yocaml
|
||||||
|
|
||||||
|
let is_css = with_extension "css"
|
||||||
|
let is_javascript = with_extension "js"
|
||||||
|
|
||||||
|
let is_image =
|
||||||
|
let open Preface.Predicate in
|
||||||
|
with_extension "png"
|
||||||
|
|| with_extension "svg"
|
||||||
|
|| with_extension "jpg"
|
||||||
|
|| with_extension "jpeg"
|
||||||
|
|| with_extension "gif"
|
||||||
|
;;
|
||||||
|
|
||||||
|
let is_markdown =
|
||||||
|
let open Preface.Predicate in
|
||||||
|
with_extension "md" || with_extension "markdown"
|
||||||
|
;;
|
6
src/file.mli
Normal file
6
src/file.mli
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
open Yocaml
|
||||||
|
|
||||||
|
val is_css : Filepath.t -> bool
|
||||||
|
val is_javascript : Filepath.t -> bool
|
||||||
|
val is_image : Filepath.t -> bool
|
||||||
|
val is_markdown : Filepath.t -> bool
|
247
src/model.ml
Normal file
247
src/model.ml
Normal file
|
@ -0,0 +1,247 @@
|
||||||
|
open Yocaml
|
||||||
|
|
||||||
|
let article_path file =
|
||||||
|
let filename = basename $ replace_extension file "html" in
|
||||||
|
filename |> into "articles"
|
||||||
|
|
||||||
|
let tag_path tag = add_extension tag "html" |> into "tags"
|
||||||
|
|
||||||
|
module Author = struct
|
||||||
|
type t = {
|
||||||
|
name : string;
|
||||||
|
link : string;
|
||||||
|
email : string;
|
||||||
|
avatar : string option;
|
||||||
|
}
|
||||||
|
|
||||||
|
let equal a b =
|
||||||
|
String.equal a.name b.name && String.equal a.link b.link
|
||||||
|
&& String.equal a.email b.email
|
||||||
|
&& Option.equal String.equal a.avatar b.avatar
|
||||||
|
|
||||||
|
let make name link email avatar = { name; link; email; avatar }
|
||||||
|
|
||||||
|
let from (type a) (module V : Metadata.VALIDABLE with type t = a) obj =
|
||||||
|
V.object_and
|
||||||
|
(fun assoc ->
|
||||||
|
let open Validate.Applicative in
|
||||||
|
make
|
||||||
|
<$> V.(required_assoc string) "name" assoc
|
||||||
|
<*> V.(required_assoc string) "link" assoc
|
||||||
|
<*> V.(required_assoc string) "email" assoc
|
||||||
|
<*> V.(optional_assoc string) "avatar" assoc)
|
||||||
|
obj
|
||||||
|
|
||||||
|
let default_user =
|
||||||
|
make "robur" "https://blog.robur.coop/" "team@robur.coop" None
|
||||||
|
|
||||||
|
let gravatar email =
|
||||||
|
let tk = String.(lowercase_ascii $ trim email) in
|
||||||
|
let hs = Digest.(to_hex $ string tk) in
|
||||||
|
"https://www.gravatar.com/avatar/" ^ hs
|
||||||
|
|
||||||
|
let inject (type a) (module D : Key_value.DESCRIBABLE with type t = a)
|
||||||
|
{ name; link; email; avatar } =
|
||||||
|
let avatar = match avatar with Some uri -> uri | None -> gravatar email in
|
||||||
|
D.
|
||||||
|
[
|
||||||
|
("name", string name);
|
||||||
|
("link", string link);
|
||||||
|
("email", string email);
|
||||||
|
("avatar", string avatar);
|
||||||
|
]
|
||||||
|
end
|
||||||
|
|
||||||
|
module Co_author = struct
|
||||||
|
type t = { author : Author.t; contribution : string }
|
||||||
|
|
||||||
|
let make author contribution = { author; contribution }
|
||||||
|
|
||||||
|
let from (type a) (module V : Metadata.VALIDABLE with type t = a) obj =
|
||||||
|
V.object_and
|
||||||
|
(fun assoc ->
|
||||||
|
let open Validate.Applicative in
|
||||||
|
make
|
||||||
|
<$> V.(required_assoc (Author.from (module V))) "author" assoc
|
||||||
|
<*> V.(required_assoc string) "contribution" assoc)
|
||||||
|
obj
|
||||||
|
|
||||||
|
let inject (type a) (module D : Key_value.DESCRIBABLE with type t = a)
|
||||||
|
{ author; contribution } =
|
||||||
|
D.
|
||||||
|
[
|
||||||
|
("author", object_ $ Author.inject (module D) author);
|
||||||
|
("contribution", string contribution);
|
||||||
|
]
|
||||||
|
end
|
||||||
|
|
||||||
|
module Article = struct
|
||||||
|
type t = {
|
||||||
|
article_title : string;
|
||||||
|
article_description : string;
|
||||||
|
tags : string list;
|
||||||
|
date : Date.t;
|
||||||
|
title : string option;
|
||||||
|
description : string option;
|
||||||
|
author : Author.t;
|
||||||
|
co_authors : Co_author.t list;
|
||||||
|
invited_article : bool;
|
||||||
|
}
|
||||||
|
|
||||||
|
let date { date; _ } = date
|
||||||
|
let tags { tags; _ } = tags
|
||||||
|
|
||||||
|
let to_rss_item url article =
|
||||||
|
Rss.(
|
||||||
|
Item.make ~title:article.article_title ~link:url ~pub_date:article.date
|
||||||
|
~description:article.article_description ~guid:(Guid.link url) ())
|
||||||
|
|
||||||
|
let make article_title article_description tags date title description author
|
||||||
|
co_authors =
|
||||||
|
let author = Option.value ~default:Author.default_user author in
|
||||||
|
let invited_article = not (Author.equal author Author.default_user) in
|
||||||
|
{
|
||||||
|
article_title;
|
||||||
|
article_description;
|
||||||
|
tags = List.map String.lowercase_ascii tags;
|
||||||
|
date;
|
||||||
|
title;
|
||||||
|
description;
|
||||||
|
author;
|
||||||
|
co_authors;
|
||||||
|
invited_article;
|
||||||
|
}
|
||||||
|
|
||||||
|
let from_string (module V : Metadata.VALIDABLE) = function
|
||||||
|
| None -> Validate.error $ Error.Required_metadata [ "Article" ]
|
||||||
|
| Some str ->
|
||||||
|
let open Validate.Monad in
|
||||||
|
V.from_string str
|
||||||
|
>>= V.object_and (fun assoc ->
|
||||||
|
let open Validate.Applicative in
|
||||||
|
make
|
||||||
|
<$> V.(required_assoc string) "article.title" assoc
|
||||||
|
<*> V.(required_assoc string) "article.description" assoc
|
||||||
|
<*> V.(optional_assoc_or ~default:[] (list_of string))
|
||||||
|
"tags" assoc
|
||||||
|
<*> V.required_assoc
|
||||||
|
(Metadata.Date.from (module V))
|
||||||
|
"date" assoc
|
||||||
|
<*> V.(optional_assoc string) "title" assoc
|
||||||
|
<*> V.(optional_assoc string) "description" assoc
|
||||||
|
<*> V.(optional_assoc (Author.from (module V))) "author" assoc
|
||||||
|
<*> V.(
|
||||||
|
optional_assoc_or ~default:[]
|
||||||
|
(list_of (Co_author.from (module V)))
|
||||||
|
"coauthors" assoc))
|
||||||
|
|
||||||
|
let inject (type a) (module D : Key_value.DESCRIBABLE with type t = a)
|
||||||
|
{
|
||||||
|
article_title;
|
||||||
|
article_description;
|
||||||
|
tags;
|
||||||
|
date;
|
||||||
|
title;
|
||||||
|
description;
|
||||||
|
author;
|
||||||
|
co_authors;
|
||||||
|
invited_article;
|
||||||
|
} =
|
||||||
|
let co_authors =
|
||||||
|
List.map (fun c -> D.object_ $ Co_author.inject (module D) c) co_authors
|
||||||
|
in
|
||||||
|
let has_co_authors = match co_authors with [] -> false | _ -> true in
|
||||||
|
D.
|
||||||
|
[
|
||||||
|
("root", string "..");
|
||||||
|
( "metadata",
|
||||||
|
object_
|
||||||
|
[
|
||||||
|
("title", string article_title);
|
||||||
|
("description", string article_description);
|
||||||
|
] );
|
||||||
|
("tags", list (List.map string tags));
|
||||||
|
("date", object_ $ Metadata.Date.inject (module D) date);
|
||||||
|
("author", object_ $ Author.inject (module D) author);
|
||||||
|
("coauthors", list co_authors);
|
||||||
|
("invited", boolean invited_article);
|
||||||
|
("has_coauthors", boolean has_co_authors);
|
||||||
|
]
|
||||||
|
@ Metadata.Page.inject (module D) (Metadata.Page.make title description)
|
||||||
|
|
||||||
|
let compare_by_date a b = Date.compare a.date b.date
|
||||||
|
end
|
||||||
|
|
||||||
|
module Articles = struct
|
||||||
|
type t = {
|
||||||
|
articles : (Article.t * string) list;
|
||||||
|
title : string option;
|
||||||
|
description : string option;
|
||||||
|
}
|
||||||
|
|
||||||
|
let make ?title ?description articles = { articles; title; description }
|
||||||
|
let title p = p.title
|
||||||
|
let description p = p.description
|
||||||
|
let articles p = p.articles
|
||||||
|
let set_articles new_articles p = { p with articles = new_articles }
|
||||||
|
let set_title new_title p = { p with title = new_title }
|
||||||
|
let set_description new_desc p = { p with description = new_desc }
|
||||||
|
|
||||||
|
let sort ?(decreasing = true) articles =
|
||||||
|
List.sort
|
||||||
|
(fun (a, _) (b, _) ->
|
||||||
|
let a_date = Article.date a and b_date = Article.date b in
|
||||||
|
let r = Date.compare a_date b_date in
|
||||||
|
if decreasing then ~-r else r)
|
||||||
|
articles
|
||||||
|
|
||||||
|
let sort_articles_by_date ?(decreasing = true) p =
|
||||||
|
{ p with articles = sort ~decreasing p.articles }
|
||||||
|
|
||||||
|
let inject (type a) (module D : Key_value.DESCRIBABLE with type t = a)
|
||||||
|
{ articles; title; description } =
|
||||||
|
( "articles",
|
||||||
|
D.list
|
||||||
|
(List.map
|
||||||
|
(fun (article, url) ->
|
||||||
|
D.object_
|
||||||
|
(("url", D.string url) :: Article.inject (module D) article))
|
||||||
|
articles) )
|
||||||
|
:: ("root", D.string ".")
|
||||||
|
:: (Metadata.Page.inject (module D) $ Metadata.Page.make title description)
|
||||||
|
end
|
||||||
|
|
||||||
|
let article_object (type a) (module D : Key_value.DESCRIBABLE with type t = a)
|
||||||
|
(article, url) =
|
||||||
|
D.object_ (("url", D.string url) :: Article.inject (module D) article)
|
||||||
|
|
||||||
|
module Tag = struct
|
||||||
|
type t = {
|
||||||
|
tag : string;
|
||||||
|
tags : (string * int) list;
|
||||||
|
articles : (Article.t * string) list;
|
||||||
|
title : string option;
|
||||||
|
description : string option;
|
||||||
|
}
|
||||||
|
|
||||||
|
let make ?title ?description tag articles tags =
|
||||||
|
{ tag; tags; articles = Articles.sort articles; title; description }
|
||||||
|
|
||||||
|
let inject (type a) (module D : Key_value.DESCRIBABLE with type t = a)
|
||||||
|
{ tag; tags; articles; title; description } =
|
||||||
|
("tag", D.string tag)
|
||||||
|
:: ("root", D.string "..")
|
||||||
|
:: ("articles", D.list (List.map (article_object (module D)) articles))
|
||||||
|
:: ( "tags",
|
||||||
|
D.list
|
||||||
|
(List.map
|
||||||
|
(fun (tag, n) ->
|
||||||
|
D.object_
|
||||||
|
[
|
||||||
|
("name", D.string tag);
|
||||||
|
("link", D.string (tag_path tag));
|
||||||
|
("number", D.integer n);
|
||||||
|
])
|
||||||
|
tags) )
|
||||||
|
:: (Metadata.Page.inject (module D) $ Metadata.Page.make title description)
|
||||||
|
end
|
55
src/model.mli
Normal file
55
src/model.mli
Normal file
|
@ -0,0 +1,55 @@
|
||||||
|
open Yocaml
|
||||||
|
|
||||||
|
val article_path : Filepath.t -> Filepath.t
|
||||||
|
val tag_path : string -> Filepath.t
|
||||||
|
|
||||||
|
module Article : sig
|
||||||
|
type t
|
||||||
|
|
||||||
|
val date : t -> Date.t
|
||||||
|
val tags : t -> string list
|
||||||
|
val to_rss_item : string -> t -> Rss.Item.t
|
||||||
|
val compare_by_date : t -> t -> int
|
||||||
|
|
||||||
|
include Metadata.INJECTABLE with type t := t
|
||||||
|
include Metadata.READABLE with type t := t
|
||||||
|
end
|
||||||
|
|
||||||
|
module Tag : sig
|
||||||
|
type t
|
||||||
|
|
||||||
|
val make
|
||||||
|
: ?title:string
|
||||||
|
-> ?description:string
|
||||||
|
-> string
|
||||||
|
-> (Article.t * string) list
|
||||||
|
-> (string * int) list
|
||||||
|
-> t
|
||||||
|
|
||||||
|
include Metadata.INJECTABLE with type t := t
|
||||||
|
end
|
||||||
|
|
||||||
|
module Articles : sig
|
||||||
|
type t
|
||||||
|
|
||||||
|
val make
|
||||||
|
: ?title:string
|
||||||
|
-> ?description:string
|
||||||
|
-> (Article.t * string) list
|
||||||
|
-> t
|
||||||
|
|
||||||
|
val sort
|
||||||
|
: ?decreasing:bool
|
||||||
|
-> (Article.t * string) list
|
||||||
|
-> (Article.t * string) list
|
||||||
|
|
||||||
|
val sort_articles_by_date : ?decreasing:bool -> t -> t
|
||||||
|
val articles : t -> (Article.t * string) list
|
||||||
|
val title : t -> string option
|
||||||
|
val description : t -> string option
|
||||||
|
val set_title : string option -> t -> t
|
||||||
|
val set_description : string option -> t -> t
|
||||||
|
val set_articles : (Article.t * string) list -> t -> t
|
||||||
|
|
||||||
|
include Metadata.INJECTABLE with type t := t
|
||||||
|
end
|
108
src/task.ml
Normal file
108
src/task.ml
Normal file
|
@ -0,0 +1,108 @@
|
||||||
|
open Yocaml
|
||||||
|
module Metaformat = Yocaml_yaml
|
||||||
|
module Markup = Yocaml_cmark
|
||||||
|
module Template = Yocaml_jingoo
|
||||||
|
|
||||||
|
let css_target target = "css" |> into target
|
||||||
|
let javascript_target target = "js" |> into target
|
||||||
|
let images_target target = "images" |> into target
|
||||||
|
let template file = add_extension file "html" |> into "templates"
|
||||||
|
let article_template = template "article"
|
||||||
|
let layout_template = template "layout"
|
||||||
|
let list_template = template "list_articles"
|
||||||
|
let article_target file target = Model.article_path file |> into target
|
||||||
|
let binary_update = Build.watch Sys.argv.(0)
|
||||||
|
let index_html target = "index.html" |> into target
|
||||||
|
let index_md = "index.md" |> into "pages"
|
||||||
|
let rss_feed target = "feed.xml" |> into target
|
||||||
|
let tag_file tag target = Model.tag_path tag |> into target
|
||||||
|
let tag_template = template "tag"
|
||||||
|
|
||||||
|
let move_css target =
|
||||||
|
process_files
|
||||||
|
[ "css" ]
|
||||||
|
File.is_css
|
||||||
|
(Build.copy_file ~into:(css_target target))
|
||||||
|
;;
|
||||||
|
|
||||||
|
let move_javascript target =
|
||||||
|
process_files
|
||||||
|
[ "js" ]
|
||||||
|
File.is_javascript
|
||||||
|
(Build.copy_file ~into:(javascript_target target))
|
||||||
|
;;
|
||||||
|
|
||||||
|
let move_images target =
|
||||||
|
process_files
|
||||||
|
[ "images" ]
|
||||||
|
File.is_image
|
||||||
|
(Build.copy_file ~into:(images_target target))
|
||||||
|
;;
|
||||||
|
|
||||||
|
let process_articles target =
|
||||||
|
process_files [ "articles" ] File.is_markdown (fun article_file ->
|
||||||
|
let open Build in
|
||||||
|
create_file
|
||||||
|
(article_target article_file target)
|
||||||
|
(binary_update
|
||||||
|
>>> Metaformat.read_file_with_metadata
|
||||||
|
(module Model.Article)
|
||||||
|
article_file
|
||||||
|
>>> Markup.content_to_html ()
|
||||||
|
>>> Template.apply_as_template (module Model.Article) article_template
|
||||||
|
>>> Template.apply_as_template (module Model.Article) layout_template
|
||||||
|
>>^ Stdlib.snd))
|
||||||
|
;;
|
||||||
|
|
||||||
|
let merge_with_page ((meta, content), articles) =
|
||||||
|
let title = Metadata.Page.title meta in
|
||||||
|
let description = Metadata.Page.description meta in
|
||||||
|
Model.Articles.make ?title ?description articles, content
|
||||||
|
;;
|
||||||
|
|
||||||
|
let generate_feed target =
|
||||||
|
let open Build in
|
||||||
|
let* articles_arrow =
|
||||||
|
Collection.Articles.get_all (module Metaformat) "articles"
|
||||||
|
in
|
||||||
|
create_file
|
||||||
|
(rss_feed target)
|
||||||
|
(binary_update >>> articles_arrow >>^ Feed.make >>^ Rss.Channel.to_rss)
|
||||||
|
;;
|
||||||
|
|
||||||
|
let generate_tags target =
|
||||||
|
let* deps, tags = Collection.Tags.compute (module Metaformat) "articles" in
|
||||||
|
let tags_string = List.map (fun (i, s) -> i, List.length s) tags in
|
||||||
|
let mk_meta tag articles () = Model.Tag.make tag articles tags_string, "" in
|
||||||
|
List.fold_left
|
||||||
|
(fun program (tag, articles) ->
|
||||||
|
let open Build in
|
||||||
|
program
|
||||||
|
>> create_file
|
||||||
|
(tag_file tag target)
|
||||||
|
(init deps
|
||||||
|
>>> binary_update
|
||||||
|
>>^ mk_meta tag articles
|
||||||
|
>>> Template.apply_as_template (module Model.Tag) tag_template
|
||||||
|
>>> Template.apply_as_template (module Model.Tag) layout_template
|
||||||
|
>>^ Stdlib.snd))
|
||||||
|
(return ())
|
||||||
|
tags
|
||||||
|
;;
|
||||||
|
|
||||||
|
let generate_index target =
|
||||||
|
let open Build in
|
||||||
|
let* articles_arrow =
|
||||||
|
Collection.Articles.get_all (module Metaformat) "articles"
|
||||||
|
in
|
||||||
|
create_file
|
||||||
|
(index_html target)
|
||||||
|
(binary_update
|
||||||
|
>>> Metaformat.read_file_with_metadata (module Metadata.Page) index_md
|
||||||
|
>>> Markup.content_to_html ()
|
||||||
|
>>> articles_arrow
|
||||||
|
>>^ merge_with_page
|
||||||
|
>>> Template.apply_as_template (module Model.Articles) list_template
|
||||||
|
>>> Template.apply_as_template (module Model.Articles) layout_template
|
||||||
|
>>^ Stdlib.snd)
|
||||||
|
;;
|
7
src/task.mli
Normal file
7
src/task.mli
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
val move_css : string -> unit Yocaml.Effect.t
|
||||||
|
val move_images : string -> unit Yocaml.Effect.t
|
||||||
|
val move_javascript : string -> unit Yocaml.Effect.t
|
||||||
|
val process_articles : string -> unit Yocaml.Effect.t
|
||||||
|
val generate_feed : string -> unit Yocaml.Effect.t
|
||||||
|
val generate_index : string -> unit Yocaml.Effect.t
|
||||||
|
val generate_tags : string -> unit Yocaml.Effect.t
|
13
templates/article.html
Normal file
13
templates/article.html
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
<a href="/index.html">Back to index</a>
|
||||||
|
|
||||||
|
<article>
|
||||||
|
<h1>{{ metadata.title }}</h1>
|
||||||
|
<ul class="tags-list">
|
||||||
|
{%- for tag in tags -%}
|
||||||
|
<li><a href="/tags/{{ tag }}.html">{{ tag }}</a></li>
|
||||||
|
{%- endfor -%}
|
||||||
|
</ul>
|
||||||
|
{%- autoescape false -%}
|
||||||
|
{{ body }}
|
||||||
|
{% endautoescape -%}
|
||||||
|
</article>
|
51
templates/layout.html
Normal file
51
templates/layout.html
Normal file
|
@ -0,0 +1,51 @@
|
||||||
|
{%- if metadata.title -%}
|
||||||
|
{%- set dash = " - " -%}
|
||||||
|
{%- set page_title = metadata.title -%}
|
||||||
|
{%- elseif title -%}
|
||||||
|
{%- set dash = " - " -%}
|
||||||
|
{%- set page_title = title -%}
|
||||||
|
{%- else -%}
|
||||||
|
{%- set dash = "" -%}
|
||||||
|
{%- set page_title = "" -%}
|
||||||
|
{%- endif %}
|
||||||
|
{% if metadata.description -%}
|
||||||
|
{%- set page_description = metadata.description -%}
|
||||||
|
{%- elseif description -%}
|
||||||
|
{%- set page_description = description -%}
|
||||||
|
{%- else -%}
|
||||||
|
{%- set page_description = "blog.robur.coop" -%}
|
||||||
|
{%- endif -%}
|
||||||
|
<!doctype html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta http-equiv="x-ua-compatible" content="ie=edge">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>
|
||||||
|
Robur's blog{{ dash }}{{ page_title }}
|
||||||
|
</title>
|
||||||
|
<meta name="description" content="{{ page_description }}">
|
||||||
|
<link type="text/css" rel="stylesheet" href="{{ root }}/css/hl.css">
|
||||||
|
<link type="text/css" rel="stylesheet" href="{{ root }}/css/style.css">
|
||||||
|
<script src="{{ root }}/js/hl.js"></script>
|
||||||
|
<link rel="alternate" type="application/rss+xml" href="{{ root }}/feed.xml" title="blog.robur.coop">
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<header>
|
||||||
|
<h1>blog.robur.coop</h1>
|
||||||
|
<blockquote>
|
||||||
|
The <strong>Robur</strong> cooperative blog.
|
||||||
|
</blockquote>
|
||||||
|
</header>
|
||||||
|
<main>
|
||||||
|
{%- autoescape false -%}
|
||||||
|
{{ body }}
|
||||||
|
{% endautoescape -%}
|
||||||
|
</main>
|
||||||
|
<footer>
|
||||||
|
<a href="https://github.com/xhtmlboi/yocaml">Powered by <strong>YOCaml</strong></a>
|
||||||
|
<br />
|
||||||
|
</footer>
|
||||||
|
<script>hljs.highlightAll();</script>
|
||||||
|
</body>
|
||||||
|
</html>
|
38
templates/list_articles.html
Normal file
38
templates/list_articles.html
Normal file
|
@ -0,0 +1,38 @@
|
||||||
|
<a class="small-button github" href="https://github.com/dinosaure">github/dinosaure</a>
|
||||||
|
<a class="small-button twitter" href="https://twitter.com/Dinoosaure">@Dinoosaure</a>
|
||||||
|
<a class="small-button rss" href="./feed.xml">RSS</a>
|
||||||
|
|
||||||
|
{%- autoescape false -%}
|
||||||
|
{{ body }}
|
||||||
|
{% endautoescape -%}
|
||||||
|
|
||||||
|
<h3>Essays and ramblings</h3>
|
||||||
|
|
||||||
|
<ol reversed class="list-articles">
|
||||||
|
{%- for article in articles -%}
|
||||||
|
<li>
|
||||||
|
<div class="side">
|
||||||
|
<a href="{{ article.author.link }}">
|
||||||
|
<img src="{{ article.author.avatar }}">
|
||||||
|
</a>
|
||||||
|
{%- for co_author in article.co_authors -%}
|
||||||
|
<a href="{{ coauthor.author.link }}">
|
||||||
|
<img src="{{ coauthor.author.avatar }}">
|
||||||
|
</a>
|
||||||
|
{%- endfor -%}
|
||||||
|
</div>
|
||||||
|
<div class="content">
|
||||||
|
<span class="date">{{ article.date.canonical }}</span>
|
||||||
|
<a href="{{ article.url }}">{{ article.metadata.title }}</a><br />
|
||||||
|
<p>{{ article.metadata.description }}</p>
|
||||||
|
<div class="bottom">
|
||||||
|
<ul class="tags-list">
|
||||||
|
{%- for tag in article.tags -%}
|
||||||
|
<li><a href="/tags/{{ tag }}.html">{{ tag }}</a></li>
|
||||||
|
{%- endfor -%}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
{%- endfor -%}
|
||||||
|
</ol>
|
21
templates/tag.html
Normal file
21
templates/tag.html
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
<a href="/index.html">Back to index</a>
|
||||||
|
|
||||||
|
<ul class="tags-list aeration">
|
||||||
|
{%- for tag in tags -%}
|
||||||
|
<li><a href="/{{ tag.link }}">{{ tag.name }} ({{ tag.number }})</a></li>
|
||||||
|
{%- endfor -%}
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<div class="tag-box" id="tag-{{ tag }}">
|
||||||
|
{%- set nb_tags = length (articles) -%}
|
||||||
|
<h3>
|
||||||
|
<span>{{ tag }}</span>
|
||||||
|
{{ nb_tags }}
|
||||||
|
{%- if nb_tags > 1 %} entries{%- else %} entry{%- endif -%}
|
||||||
|
</h3>
|
||||||
|
<ul>
|
||||||
|
{%- for article in articles -%}
|
||||||
|
<li><a href="/{{ article.url }}">{{ article.metadata.title }}</a></li>
|
||||||
|
{%- endfor -%}
|
||||||
|
</ul>
|
||||||
|
</div>
|
Loading…
Reference in a new issue