Compare commits
1 commit
master
...
feat_user_
| Author | SHA1 | Date | |
|---|---|---|---|
| 840fcee93d |
122 changed files with 798 additions and 3066 deletions
|
|
@ -1,7 +0,0 @@
|
||||||
target
|
|
||||||
.env
|
|
||||||
tmp
|
|
||||||
Dockerfile
|
|
||||||
.dockerignore
|
|
||||||
justfile
|
|
||||||
config.toml
|
|
||||||
1
.env
1
.env
|
|
@ -0,0 +1 @@
|
||||||
|
APP_JWT_SECRET=bc1996ea-5464-424a-9a38-5604f2bc865a
|
||||||
BIN
.swp
BIN
.swp
Binary file not shown.
585
Cargo.lock
generated
585
Cargo.lock
generated
File diff suppressed because it is too large
Load diff
51
Cargo.toml
51
Cargo.toml
|
|
@ -1,36 +1,31 @@
|
||||||
# cargo-features = ["codegen-backend"]
|
cargo-features = ["codegen-backend"]
|
||||||
|
|
||||||
# [profile.dev]
|
[profile.dev]
|
||||||
# codegen-backend = "cranelift"
|
codegen-backend = "cranelift"
|
||||||
# # END OF
|
|
||||||
|
|
||||||
[workspace]
|
[package]
|
||||||
resolver = "2"
|
name = "minauthator"
|
||||||
members = [
|
description = "Identity provider and OAuth2 server for an small-scale organization."
|
||||||
"lib/kernel",
|
version = "0.1.0"
|
||||||
"lib/utils",
|
edition = "2021"
|
||||||
"lib/http_server",
|
|
||||||
"lib/admin_cli"
|
|
||||||
]
|
|
||||||
|
|
||||||
[workspace.dependencies]
|
[dependencies]
|
||||||
# commons utils
|
# commons utils
|
||||||
anyhow = "1.0"
|
anyhow = "1.0"
|
||||||
thiserror = "2"
|
|
||||||
fully_pub = "0.1"
|
fully_pub = "0.1"
|
||||||
|
argon2 = "0.5"
|
||||||
strum = "0.26.3"
|
strum = "0.26.3"
|
||||||
strum_macros = "0.26"
|
strum_macros = "0.26"
|
||||||
uuid = { version = "1.8", features = ["serde", "v4"] }
|
uuid = { version = "1.8", features = ["serde", "v4"] }
|
||||||
dotenvy = "0.15.7"
|
dotenvy = "0.15.7"
|
||||||
|
base64 = "0.22.1"
|
||||||
|
rand = "0.8.5"
|
||||||
|
rand_core = { version = "0.6.4", features = ["std"] }
|
||||||
url = "2.5.3"
|
url = "2.5.3"
|
||||||
sha2 = "0.10"
|
argh = "0.1" # for CLI
|
||||||
hex-literal = "0.4"
|
|
||||||
|
|
||||||
# CLI
|
|
||||||
argh = "0.1"
|
|
||||||
|
|
||||||
# Async
|
# Async
|
||||||
tokio = { version = "1.40.0", features = ["rt-multi-thread", "macros"] }
|
tokio = { version = "1.40.0", features = ["rt-multi-thread"] }
|
||||||
|
|
||||||
# Logging
|
# Logging
|
||||||
log = "0.4"
|
log = "0.4"
|
||||||
|
|
@ -39,6 +34,7 @@ env_logger = "0.11"
|
||||||
# Serialization
|
# Serialization
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { version = "1.0", features = ["derive"] }
|
||||||
serde_json = "1.0"
|
serde_json = "1.0"
|
||||||
|
serde_urlencoded = "0.7.1"
|
||||||
toml = "0.8"
|
toml = "0.8"
|
||||||
|
|
||||||
chrono = { version = "0.4", features = ["serde"] }
|
chrono = { version = "0.4", features = ["serde"] }
|
||||||
|
|
@ -47,6 +43,21 @@ chrono = { version = "0.4", features = ["serde"] }
|
||||||
sqlx = { version = "0.7.4", features = ["sqlite", "runtime-tokio", "chrono", "uuid"] }
|
sqlx = { version = "0.7.4", features = ["sqlite", "runtime-tokio", "chrono", "uuid"] }
|
||||||
redis = { version = "0.27.3", default-features = false, features = ["acl"] }
|
redis = { version = "0.27.3", default-features = false, features = ["acl"] }
|
||||||
|
|
||||||
|
# Web
|
||||||
|
axum = { version = "0.7.7", features = ["json", "multipart"] }
|
||||||
|
axum-extra = { version = "0.9.4", features = ["cookie"] }
|
||||||
|
axum-template = { version = "2.4.0", features = ["minijinja"] }
|
||||||
|
axum_typed_multipart = "0.13.1"
|
||||||
|
minijinja = { version = "2.1", features = ["builtins"] }
|
||||||
|
# to make work the static assets server
|
||||||
|
tower-http = { version = "0.6.1", features = ["fs"] }
|
||||||
|
|
||||||
# Auth utils
|
# Auth utils
|
||||||
totp-rs = "5.6"
|
totp-rs = "5.6"
|
||||||
|
minijinja-embed = "2.3.1"
|
||||||
|
axum-macros = "0.4.2"
|
||||||
|
jsonwebtoken = "9.3.0"
|
||||||
|
time = "0.3.36"
|
||||||
|
|
||||||
|
[build-dependencies]
|
||||||
|
minijinja-embed = "2.3.1"
|
||||||
|
|
|
||||||
37
Dockerfile
37
Dockerfile
|
|
@ -1,37 +0,0 @@
|
||||||
FROM rust:1.83-alpine3.20 AS builder
|
|
||||||
|
|
||||||
WORKDIR /usr/src/minauthator
|
|
||||||
COPY . .
|
|
||||||
|
|
||||||
RUN apk add musl-dev
|
|
||||||
|
|
||||||
RUN cargo install --bin minauthator-admin --locked --path lib/admin_cli
|
|
||||||
RUN cargo install --bin minauthator-server --locked --path lib/http_server
|
|
||||||
|
|
||||||
FROM alpine:3.20 AS base
|
|
||||||
|
|
||||||
RUN apk add sqlite
|
|
||||||
COPY --from=builder /usr/local/cargo/bin/minauthator-server /usr/local/bin/minauthator-server
|
|
||||||
COPY --from=builder /usr/local/cargo/bin/minauthator-admin /usr/local/bin/minauthator-admin
|
|
||||||
RUN mkdir -p \
|
|
||||||
/usr/local/src/minauthator/migrations \
|
|
||||||
/usr/local/lib/minauthator/assets \
|
|
||||||
/var/lib/minauthator \
|
|
||||||
/etc/minauthator
|
|
||||||
COPY --from=builder /usr/src/minauthator/migrations/all.sql /usr/local/src/minauthator/migrations
|
|
||||||
COPY --from=builder /usr/src/minauthator/init_db.sh /usr/local/bin/minauthator_init_db.sh
|
|
||||||
COPY --from=builder /usr/src/minauthator/assets /usr/local/lib/minauthator/assets
|
|
||||||
|
|
||||||
RUN addgroup -g 1000 app && \
|
|
||||||
adduser -S -u 1000 -G app -s /bin/sh app && \
|
|
||||||
chown -R app:app /var/lib/minauthator && \
|
|
||||||
chmod -R u=rwx,g=rwx,o= /var/lib/minauthator
|
|
||||||
|
|
||||||
USER app:app
|
|
||||||
ENV RUST_LOG=info
|
|
||||||
ENV RUST_BACKTRACE=1
|
|
||||||
ENV APP_JWT_SECRET="DummyAppSecret20241029"
|
|
||||||
|
|
||||||
CMD ["minauthator-server", "--listen-host", "0.0.0.0", "--listen-port", "8080"]
|
|
||||||
|
|
||||||
|
|
||||||
662
LICENSE
662
LICENSE
|
|
@ -1,662 +0,0 @@
|
||||||
GNU AFFERO GENERAL PUBLIC LICENSE
|
|
||||||
Version 3, 19 November 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 Affero General Public License is a free, copyleft license for
|
|
||||||
software and other kinds of works, specifically designed to ensure
|
|
||||||
cooperation with the community in the case of network server software.
|
|
||||||
|
|
||||||
The licenses for most software and other practical works are designed
|
|
||||||
to take away your freedom to share and change the works. By contrast,
|
|
||||||
our General Public Licenses are intended to guarantee your freedom to
|
|
||||||
share and change all versions of a program--to make sure it remains free
|
|
||||||
software for all its users.
|
|
||||||
|
|
||||||
When we speak of free software, we are referring to freedom, not
|
|
||||||
price. Our General Public Licenses are designed to make sure that you
|
|
||||||
have the freedom to distribute copies of free software (and charge for
|
|
||||||
them if you wish), that you receive source code or can get it if you
|
|
||||||
want it, that you can change the software or use pieces of it in new
|
|
||||||
free programs, and that you know you can do these things.
|
|
||||||
|
|
||||||
Developers that use our General Public Licenses protect your rights
|
|
||||||
with two steps: (1) assert copyright on the software, and (2) offer
|
|
||||||
you this License which gives you legal permission to copy, distribute
|
|
||||||
and/or modify the software.
|
|
||||||
|
|
||||||
A secondary benefit of defending all users' freedom is that
|
|
||||||
improvements made in alternate versions of the program, if they
|
|
||||||
receive widespread use, become available for other developers to
|
|
||||||
incorporate. Many developers of free software are heartened and
|
|
||||||
encouraged by the resulting cooperation. However, in the case of
|
|
||||||
software used on network servers, this result may fail to come about.
|
|
||||||
The GNU General Public License permits making a modified version and
|
|
||||||
letting the public access it on a server without ever releasing its
|
|
||||||
source code to the public.
|
|
||||||
|
|
||||||
The GNU Affero General Public License is designed specifically to
|
|
||||||
ensure that, in such cases, the modified source code becomes available
|
|
||||||
to the community. It requires the operator of a network server to
|
|
||||||
provide the source code of the modified version running there to the
|
|
||||||
users of that server. Therefore, public use of a modified version, on
|
|
||||||
a publicly accessible server, gives the public access to the source
|
|
||||||
code of the modified version.
|
|
||||||
|
|
||||||
An older license, called the Affero General Public License and
|
|
||||||
published by Affero, was designed to accomplish similar goals. This is
|
|
||||||
a different license, not a version of the Affero GPL, but Affero has
|
|
||||||
released a new version of the Affero GPL which permits relicensing under
|
|
||||||
this license.
|
|
||||||
|
|
||||||
The precise terms and conditions for copying, distribution and
|
|
||||||
modification follow.
|
|
||||||
|
|
||||||
TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
0. Definitions.
|
|
||||||
|
|
||||||
"This License" refers to version 3 of the GNU Affero General Public License.
|
|
||||||
|
|
||||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
|
||||||
works, such as semiconductor masks.
|
|
||||||
|
|
||||||
"The Program" refers to any copyrightable work licensed under this
|
|
||||||
License. Each licensee is addressed as "you". "Licensees" and
|
|
||||||
"recipients" may be individuals or organizations.
|
|
||||||
|
|
||||||
To "modify" a work means to copy from or adapt all or part of the work
|
|
||||||
in a fashion requiring copyright permission, other than the making of an
|
|
||||||
exact copy. The resulting work is called a "modified version" of the
|
|
||||||
earlier work or a work "based on" the earlier work.
|
|
||||||
|
|
||||||
A "covered work" means either the unmodified Program or a work based
|
|
||||||
on the Program.
|
|
||||||
|
|
||||||
To "propagate" a work means to do anything with it that, without
|
|
||||||
permission, would make you directly or secondarily liable for
|
|
||||||
infringement under applicable copyright law, except executing it on a
|
|
||||||
computer or modifying a private copy. Propagation includes copying,
|
|
||||||
distribution (with or without modification), making available to the
|
|
||||||
public, and in some countries other activities as well.
|
|
||||||
|
|
||||||
To "convey" a work means any kind of propagation that enables other
|
|
||||||
parties to make or receive copies. Mere interaction with a user through
|
|
||||||
a computer network, with no transfer of a copy, is not conveying.
|
|
||||||
|
|
||||||
An interactive user interface displays "Appropriate Legal Notices"
|
|
||||||
to the extent that it includes a convenient and prominently visible
|
|
||||||
feature that (1) displays an appropriate copyright notice, and (2)
|
|
||||||
tells the user that there is no warranty for the work (except to the
|
|
||||||
extent that warranties are provided), that licensees may convey the
|
|
||||||
work under this License, and how to view a copy of this License. If
|
|
||||||
the interface presents a list of user commands or options, such as a
|
|
||||||
menu, a prominent item in the list meets this criterion.
|
|
||||||
|
|
||||||
1. Source Code.
|
|
||||||
|
|
||||||
The "source code" for a work means the preferred form of the work
|
|
||||||
for making modifications to it. "Object code" means any non-source
|
|
||||||
form of a work.
|
|
||||||
|
|
||||||
A "Standard Interface" means an interface that either is an official
|
|
||||||
standard defined by a recognized standards body, or, in the case of
|
|
||||||
interfaces specified for a particular programming language, one that
|
|
||||||
is widely used among developers working in that language.
|
|
||||||
|
|
||||||
The "System Libraries" of an executable work include anything, other
|
|
||||||
than the work as a whole, that (a) is included in the normal form of
|
|
||||||
packaging a Major Component, but which is not part of that Major
|
|
||||||
Component, and (b) serves only to enable use of the work with that
|
|
||||||
Major Component, or to implement a Standard Interface for which an
|
|
||||||
implementation is available to the public in source code form. A
|
|
||||||
"Major Component", in this context, means a major essential component
|
|
||||||
(kernel, window system, and so on) of the specific operating system
|
|
||||||
(if any) on which the executable work runs, or a compiler used to
|
|
||||||
produce the work, or an object code interpreter used to run it.
|
|
||||||
|
|
||||||
The "Corresponding Source" for a work in object code form means all
|
|
||||||
the source code needed to generate, install, and (for an executable
|
|
||||||
work) run the object code and to modify the work, including scripts to
|
|
||||||
control those activities. However, it does not include the work's
|
|
||||||
System Libraries, or general-purpose tools or generally available free
|
|
||||||
programs which are used unmodified in performing those activities but
|
|
||||||
which are not part of the work. For example, Corresponding Source
|
|
||||||
includes interface definition files associated with source files for
|
|
||||||
the work, and the source code for shared libraries and dynamically
|
|
||||||
linked subprograms that the work is specifically designed to require,
|
|
||||||
such as by intimate data communication or control flow between those
|
|
||||||
subprograms and other parts of the work.
|
|
||||||
|
|
||||||
The Corresponding Source need not include anything that users
|
|
||||||
can regenerate automatically from other parts of the Corresponding
|
|
||||||
Source.
|
|
||||||
|
|
||||||
The Corresponding Source for a work in source code form is that
|
|
||||||
same work.
|
|
||||||
|
|
||||||
2. Basic Permissions.
|
|
||||||
|
|
||||||
All rights granted under this License are granted for the term of
|
|
||||||
copyright on the Program, and are irrevocable provided the stated
|
|
||||||
conditions are met. This License explicitly affirms your unlimited
|
|
||||||
permission to run the unmodified Program. The output from running a
|
|
||||||
covered work is covered by this License only if the output, given its
|
|
||||||
content, constitutes a covered work. This License acknowledges your
|
|
||||||
rights of fair use or other equivalent, as provided by copyright law.
|
|
||||||
|
|
||||||
You may make, run and propagate covered works that you do not
|
|
||||||
convey, without conditions so long as your license otherwise remains
|
|
||||||
in force. You may convey covered works to others for the sole purpose
|
|
||||||
of having them make modifications exclusively for you, or provide you
|
|
||||||
with facilities for running those works, provided that you comply with
|
|
||||||
the terms of this License in conveying all material for which you do
|
|
||||||
not control copyright. Those thus making or running the covered works
|
|
||||||
for you must do so exclusively on your behalf, under your direction
|
|
||||||
and control, on terms that prohibit them from making any copies of
|
|
||||||
your copyrighted material outside their relationship with you.
|
|
||||||
|
|
||||||
Conveying under any other circumstances is permitted solely under
|
|
||||||
the conditions stated below. Sublicensing is not allowed; section 10
|
|
||||||
makes it unnecessary.
|
|
||||||
|
|
||||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
|
||||||
|
|
||||||
No covered work shall be deemed part of an effective technological
|
|
||||||
measure under any applicable law fulfilling obligations under article
|
|
||||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
|
||||||
similar laws prohibiting or restricting circumvention of such
|
|
||||||
measures.
|
|
||||||
|
|
||||||
When you convey a covered work, you waive any legal power to forbid
|
|
||||||
circumvention of technological measures to the extent such circumvention
|
|
||||||
is effected by exercising rights under this License with respect to
|
|
||||||
the covered work, and you disclaim any intention to limit operation or
|
|
||||||
modification of the work as a means of enforcing, against the work's
|
|
||||||
users, your or third parties' legal rights to forbid circumvention of
|
|
||||||
technological measures.
|
|
||||||
|
|
||||||
4. Conveying Verbatim Copies.
|
|
||||||
|
|
||||||
You may convey verbatim copies of the Program's source code as you
|
|
||||||
receive it, in any medium, provided that you conspicuously and
|
|
||||||
appropriately publish on each copy an appropriate copyright notice;
|
|
||||||
keep intact all notices stating that this License and any
|
|
||||||
non-permissive terms added in accord with section 7 apply to the code;
|
|
||||||
keep intact all notices of the absence of any warranty; and give all
|
|
||||||
recipients a copy of this License along with the Program.
|
|
||||||
|
|
||||||
You may charge any price or no price for each copy that you convey,
|
|
||||||
and you may offer support or warranty protection for a fee.
|
|
||||||
|
|
||||||
5. Conveying Modified Source Versions.
|
|
||||||
|
|
||||||
You may convey a work based on the Program, or the modifications to
|
|
||||||
produce it from the Program, in the form of source code under the
|
|
||||||
terms of section 4, provided that you also meet all of these conditions:
|
|
||||||
|
|
||||||
a) The work must carry prominent notices stating that you modified
|
|
||||||
it, and giving a relevant date.
|
|
||||||
|
|
||||||
b) The work must carry prominent notices stating that it is
|
|
||||||
released under this License and any conditions added under section
|
|
||||||
7. This requirement modifies the requirement in section 4 to
|
|
||||||
"keep intact all notices".
|
|
||||||
|
|
||||||
c) You must license the entire work, as a whole, under this
|
|
||||||
License to anyone who comes into possession of a copy. This
|
|
||||||
License will therefore apply, along with any applicable section 7
|
|
||||||
additional terms, to the whole of the work, and all its parts,
|
|
||||||
regardless of how they are packaged. This License gives no
|
|
||||||
permission to license the work in any other way, but it does not
|
|
||||||
invalidate such permission if you have separately received it.
|
|
||||||
|
|
||||||
d) If the work has interactive user interfaces, each must display
|
|
||||||
Appropriate Legal Notices; however, if the Program has interactive
|
|
||||||
interfaces that do not display Appropriate Legal Notices, your
|
|
||||||
work need not make them do so.
|
|
||||||
|
|
||||||
A compilation of a covered work with other separate and independent
|
|
||||||
works, which are not by their nature extensions of the covered work,
|
|
||||||
and which are not combined with it such as to form a larger program,
|
|
||||||
in or on a volume of a storage or distribution medium, is called an
|
|
||||||
"aggregate" if the compilation and its resulting copyright are not
|
|
||||||
used to limit the access or legal rights of the compilation's users
|
|
||||||
beyond what the individual works permit. Inclusion of a covered work
|
|
||||||
in an aggregate does not cause this License to apply to the other
|
|
||||||
parts of the aggregate.
|
|
||||||
|
|
||||||
6. Conveying Non-Source Forms.
|
|
||||||
|
|
||||||
You may convey a covered work in object code form under the terms
|
|
||||||
of sections 4 and 5, provided that you also convey the
|
|
||||||
machine-readable Corresponding Source under the terms of this License,
|
|
||||||
in one of these ways:
|
|
||||||
|
|
||||||
a) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by the
|
|
||||||
Corresponding Source fixed on a durable physical medium
|
|
||||||
customarily used for software interchange.
|
|
||||||
|
|
||||||
b) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by a
|
|
||||||
written offer, valid for at least three years and valid for as
|
|
||||||
long as you offer spare parts or customer support for that product
|
|
||||||
model, to give anyone who possesses the object code either (1) a
|
|
||||||
copy of the Corresponding Source for all the software in the
|
|
||||||
product that is covered by this License, on a durable physical
|
|
||||||
medium customarily used for software interchange, for a price no
|
|
||||||
more than your reasonable cost of physically performing this
|
|
||||||
conveying of source, or (2) access to copy the
|
|
||||||
Corresponding Source from a network server at no charge.
|
|
||||||
|
|
||||||
c) Convey individual copies of the object code with a copy of the
|
|
||||||
written offer to provide the Corresponding Source. This
|
|
||||||
alternative is allowed only occasionally and noncommercially, and
|
|
||||||
only if you received the object code with such an offer, in accord
|
|
||||||
with subsection 6b.
|
|
||||||
|
|
||||||
d) Convey the object code by offering access from a designated
|
|
||||||
place (gratis or for a charge), and offer equivalent access to the
|
|
||||||
Corresponding Source in the same way through the same place at no
|
|
||||||
further charge. You need not require recipients to copy the
|
|
||||||
Corresponding Source along with the object code. If the place to
|
|
||||||
copy the object code is a network server, the Corresponding Source
|
|
||||||
may be on a different server (operated by you or a third party)
|
|
||||||
that supports equivalent copying facilities, provided you maintain
|
|
||||||
clear directions next to the object code saying where to find the
|
|
||||||
Corresponding Source. Regardless of what server hosts the
|
|
||||||
Corresponding Source, you remain obligated to ensure that it is
|
|
||||||
available for as long as needed to satisfy these requirements.
|
|
||||||
|
|
||||||
e) Convey the object code using peer-to-peer transmission, provided
|
|
||||||
you inform other peers where the object code and Corresponding
|
|
||||||
Source of the work are being offered to the general public at no
|
|
||||||
charge under subsection 6d.
|
|
||||||
|
|
||||||
A separable portion of the object code, whose source code is excluded
|
|
||||||
from the Corresponding Source as a System Library, need not be
|
|
||||||
included in conveying the object code work.
|
|
||||||
|
|
||||||
A "User Product" is either (1) a "consumer product", which means any
|
|
||||||
tangible personal property which is normally used for personal, family,
|
|
||||||
or household purposes, or (2) anything designed or sold for incorporation
|
|
||||||
into a dwelling. In determining whether a product is a consumer product,
|
|
||||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
|
||||||
product received by a particular user, "normally used" refers to a
|
|
||||||
typical or common use of that class of product, regardless of the status
|
|
||||||
of the particular user or of the way in which the particular user
|
|
||||||
actually uses, or expects or is expected to use, the product. A product
|
|
||||||
is a consumer product regardless of whether the product has substantial
|
|
||||||
commercial, industrial or non-consumer uses, unless such uses represent
|
|
||||||
the only significant mode of use of the product.
|
|
||||||
|
|
||||||
"Installation Information" for a User Product means any methods,
|
|
||||||
procedures, authorization keys, or other information required to install
|
|
||||||
and execute modified versions of a covered work in that User Product from
|
|
||||||
a modified version of its Corresponding Source. The information must
|
|
||||||
suffice to ensure that the continued functioning of the modified object
|
|
||||||
code is in no case prevented or interfered with solely because
|
|
||||||
modification has been made.
|
|
||||||
|
|
||||||
If you convey an object code work under this section in, or with, or
|
|
||||||
specifically for use in, a User Product, and the conveying occurs as
|
|
||||||
part of a transaction in which the right of possession and use of the
|
|
||||||
User Product is transferred to the recipient in perpetuity or for a
|
|
||||||
fixed term (regardless of how the transaction is characterized), the
|
|
||||||
Corresponding Source conveyed under this section must be accompanied
|
|
||||||
by the Installation Information. But this requirement does not apply
|
|
||||||
if neither you nor any third party retains the ability to install
|
|
||||||
modified object code on the User Product (for example, the work has
|
|
||||||
been installed in ROM).
|
|
||||||
|
|
||||||
The requirement to provide Installation Information does not include a
|
|
||||||
requirement to continue to provide support service, warranty, or updates
|
|
||||||
for a work that has been modified or installed by the recipient, or for
|
|
||||||
the User Product in which it has been modified or installed. Access to a
|
|
||||||
network may be denied when the modification itself materially and
|
|
||||||
adversely affects the operation of the network or violates the rules and
|
|
||||||
protocols for communication across the network.
|
|
||||||
|
|
||||||
Corresponding Source conveyed, and Installation Information provided,
|
|
||||||
in accord with this section must be in a format that is publicly
|
|
||||||
documented (and with an implementation available to the public in
|
|
||||||
source code form), and must require no special password or key for
|
|
||||||
unpacking, reading or copying.
|
|
||||||
|
|
||||||
7. Additional Terms.
|
|
||||||
|
|
||||||
"Additional permissions" are terms that supplement the terms of this
|
|
||||||
License by making exceptions from one or more of its conditions.
|
|
||||||
Additional permissions that are applicable to the entire Program shall
|
|
||||||
be treated as though they were included in this License, to the extent
|
|
||||||
that they are valid under applicable law. If additional permissions
|
|
||||||
apply only to part of the Program, that part may be used separately
|
|
||||||
under those permissions, but the entire Program remains governed by
|
|
||||||
this License without regard to the additional permissions.
|
|
||||||
|
|
||||||
When you convey a copy of a covered work, you may at your option
|
|
||||||
remove any additional permissions from that copy, or from any part of
|
|
||||||
it. (Additional permissions may be written to require their own
|
|
||||||
removal in certain cases when you modify the work.) You may place
|
|
||||||
additional permissions on material, added by you to a covered work,
|
|
||||||
for which you have or can give appropriate copyright permission.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, for material you
|
|
||||||
add to a covered work, you may (if authorized by the copyright holders of
|
|
||||||
that material) supplement the terms of this License with terms:
|
|
||||||
|
|
||||||
a) Disclaiming warranty or limiting liability differently from the
|
|
||||||
terms of sections 15 and 16 of this License; or
|
|
||||||
|
|
||||||
b) Requiring preservation of specified reasonable legal notices or
|
|
||||||
author attributions in that material or in the Appropriate Legal
|
|
||||||
Notices displayed by works containing it; or
|
|
||||||
|
|
||||||
c) Prohibiting misrepresentation of the origin of that material, or
|
|
||||||
requiring that modified versions of such material be marked in
|
|
||||||
reasonable ways as different from the original version; or
|
|
||||||
|
|
||||||
d) Limiting the use for publicity purposes of names of licensors or
|
|
||||||
authors of the material; or
|
|
||||||
|
|
||||||
e) Declining to grant rights under trademark law for use of some
|
|
||||||
trade names, trademarks, or service marks; or
|
|
||||||
|
|
||||||
f) Requiring indemnification of licensors and authors of that
|
|
||||||
material by anyone who conveys the material (or modified versions of
|
|
||||||
it) with contractual assumptions of liability to the recipient, for
|
|
||||||
any liability that these contractual assumptions directly impose on
|
|
||||||
those licensors and authors.
|
|
||||||
|
|
||||||
All other non-permissive additional terms are considered "further
|
|
||||||
restrictions" within the meaning of section 10. If the Program as you
|
|
||||||
received it, or any part of it, contains a notice stating that it is
|
|
||||||
governed by this License along with a term that is a further
|
|
||||||
restriction, you may remove that term. If a license document contains
|
|
||||||
a further restriction but permits relicensing or conveying under this
|
|
||||||
License, you may add to a covered work material governed by the terms
|
|
||||||
of that license document, provided that the further restriction does
|
|
||||||
not survive such relicensing or conveying.
|
|
||||||
|
|
||||||
If you add terms to a covered work in accord with this section, you
|
|
||||||
must place, in the relevant source files, a statement of the
|
|
||||||
additional terms that apply to those files, or a notice indicating
|
|
||||||
where to find the applicable terms.
|
|
||||||
|
|
||||||
Additional terms, permissive or non-permissive, may be stated in the
|
|
||||||
form of a separately written license, or stated as exceptions;
|
|
||||||
the above requirements apply either way.
|
|
||||||
|
|
||||||
8. Termination.
|
|
||||||
|
|
||||||
You may not propagate or modify a covered work except as expressly
|
|
||||||
provided under this License. Any attempt otherwise to propagate or
|
|
||||||
modify it is void, and will automatically terminate your rights under
|
|
||||||
this License (including any patent licenses granted under the third
|
|
||||||
paragraph of section 11).
|
|
||||||
|
|
||||||
However, if you cease all violation of this License, then your
|
|
||||||
license from a particular copyright holder is reinstated (a)
|
|
||||||
provisionally, unless and until the copyright holder explicitly and
|
|
||||||
finally terminates your license, and (b) permanently, if the copyright
|
|
||||||
holder fails to notify you of the violation by some reasonable means
|
|
||||||
prior to 60 days after the cessation.
|
|
||||||
|
|
||||||
Moreover, your license from a particular copyright holder is
|
|
||||||
reinstated permanently if the copyright holder notifies you of the
|
|
||||||
violation by some reasonable means, this is the first time you have
|
|
||||||
received notice of violation of this License (for any work) from that
|
|
||||||
copyright holder, and you cure the violation prior to 30 days after
|
|
||||||
your receipt of the notice.
|
|
||||||
|
|
||||||
Termination of your rights under this section does not terminate the
|
|
||||||
licenses of parties who have received copies or rights from you under
|
|
||||||
this License. If your rights have been terminated and not permanently
|
|
||||||
reinstated, you do not qualify to receive new licenses for the same
|
|
||||||
material under section 10.
|
|
||||||
|
|
||||||
9. Acceptance Not Required for Having Copies.
|
|
||||||
|
|
||||||
You are not required to accept this License in order to receive or
|
|
||||||
run a copy of the Program. Ancillary propagation of a covered work
|
|
||||||
occurring solely as a consequence of using peer-to-peer transmission
|
|
||||||
to receive a copy likewise does not require acceptance. However,
|
|
||||||
nothing other than this License grants you permission to propagate or
|
|
||||||
modify any covered work. These actions infringe copyright if you do
|
|
||||||
not accept this License. Therefore, by modifying or propagating a
|
|
||||||
covered work, you indicate your acceptance of this License to do so.
|
|
||||||
|
|
||||||
10. Automatic Licensing of Downstream Recipients.
|
|
||||||
|
|
||||||
Each time you convey a covered work, the recipient automatically
|
|
||||||
receives a license from the original licensors, to run, modify and
|
|
||||||
propagate that work, subject to this License. You are not responsible
|
|
||||||
for enforcing compliance by third parties with this License.
|
|
||||||
|
|
||||||
An "entity transaction" is a transaction transferring control of an
|
|
||||||
organization, or substantially all assets of one, or subdividing an
|
|
||||||
organization, or merging organizations. If propagation of a covered
|
|
||||||
work results from an entity transaction, each party to that
|
|
||||||
transaction who receives a copy of the work also receives whatever
|
|
||||||
licenses to the work the party's predecessor in interest had or could
|
|
||||||
give under the previous paragraph, plus a right to possession of the
|
|
||||||
Corresponding Source of the work from the predecessor in interest, if
|
|
||||||
the predecessor has it or can get it with reasonable efforts.
|
|
||||||
|
|
||||||
You may not impose any further restrictions on the exercise of the
|
|
||||||
rights granted or affirmed under this License. For example, you may
|
|
||||||
not impose a license fee, royalty, or other charge for exercise of
|
|
||||||
rights granted under this License, and you may not initiate litigation
|
|
||||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
|
||||||
any patent claim is infringed by making, using, selling, offering for
|
|
||||||
sale, or importing the Program or any portion of it.
|
|
||||||
|
|
||||||
11. Patents.
|
|
||||||
|
|
||||||
A "contributor" is a copyright holder who authorizes use under this
|
|
||||||
License of the Program or a work on which the Program is based. The
|
|
||||||
work thus licensed is called the contributor's "contributor version".
|
|
||||||
|
|
||||||
A contributor's "essential patent claims" are all patent claims
|
|
||||||
owned or controlled by the contributor, whether already acquired or
|
|
||||||
hereafter acquired, that would be infringed by some manner, permitted
|
|
||||||
by this License, of making, using, or selling its contributor version,
|
|
||||||
but do not include claims that would be infringed only as a
|
|
||||||
consequence of further modification of the contributor version. For
|
|
||||||
purposes of this definition, "control" includes the right to grant
|
|
||||||
patent sublicenses in a manner consistent with the requirements of
|
|
||||||
this License.
|
|
||||||
|
|
||||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
|
||||||
patent license under the contributor's essential patent claims, to
|
|
||||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
|
||||||
propagate the contents of its contributor version.
|
|
||||||
|
|
||||||
In the following three paragraphs, a "patent license" is any express
|
|
||||||
agreement or commitment, however denominated, not to enforce a patent
|
|
||||||
(such as an express permission to practice a patent or covenant not to
|
|
||||||
sue for patent infringement). To "grant" such a patent license to a
|
|
||||||
party means to make such an agreement or commitment not to enforce a
|
|
||||||
patent against the party.
|
|
||||||
|
|
||||||
If you convey a covered work, knowingly relying on a patent license,
|
|
||||||
and the Corresponding Source of the work is not available for anyone
|
|
||||||
to copy, free of charge and under the terms of this License, through a
|
|
||||||
publicly available network server or other readily accessible means,
|
|
||||||
then you must either (1) cause the Corresponding Source to be so
|
|
||||||
available, or (2) arrange to deprive yourself of the benefit of the
|
|
||||||
patent license for this particular work, or (3) arrange, in a manner
|
|
||||||
consistent with the requirements of this License, to extend the patent
|
|
||||||
license to downstream recipients. "Knowingly relying" means you have
|
|
||||||
actual knowledge that, but for the patent license, your conveying the
|
|
||||||
covered work in a country, or your recipient's use of the covered work
|
|
||||||
in a country, would infringe one or more identifiable patents in that
|
|
||||||
country that you have reason to believe are valid.
|
|
||||||
|
|
||||||
If, pursuant to or in connection with a single transaction or
|
|
||||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
|
||||||
covered work, and grant a patent license to some of the parties
|
|
||||||
receiving the covered work authorizing them to use, propagate, modify
|
|
||||||
or convey a specific copy of the covered work, then the patent license
|
|
||||||
you grant is automatically extended to all recipients of the covered
|
|
||||||
work and works based on it.
|
|
||||||
|
|
||||||
A patent license is "discriminatory" if it does not include within
|
|
||||||
the scope of its coverage, prohibits the exercise of, or is
|
|
||||||
conditioned on the non-exercise of one or more of the rights that are
|
|
||||||
specifically granted under this License. You may not convey a covered
|
|
||||||
work if you are a party to an arrangement with a third party that is
|
|
||||||
in the business of distributing software, under which you make payment
|
|
||||||
to the third party based on the extent of your activity of conveying
|
|
||||||
the work, and under which the third party grants, to any of the
|
|
||||||
parties who would receive the covered work from you, a discriminatory
|
|
||||||
patent license (a) in connection with copies of the covered work
|
|
||||||
conveyed by you (or copies made from those copies), or (b) primarily
|
|
||||||
for and in connection with specific products or compilations that
|
|
||||||
contain the covered work, unless you entered into that arrangement,
|
|
||||||
or that patent license was granted, prior to 28 March 2007.
|
|
||||||
|
|
||||||
Nothing in this License shall be construed as excluding or limiting
|
|
||||||
any implied license or other defenses to infringement that may
|
|
||||||
otherwise be available to you under applicable patent law.
|
|
||||||
|
|
||||||
12. No Surrender of Others' Freedom.
|
|
||||||
|
|
||||||
If conditions are imposed on you (whether by court order, agreement or
|
|
||||||
otherwise) that contradict the conditions of this License, they do not
|
|
||||||
excuse you from the conditions of this License. If you cannot convey a
|
|
||||||
covered work so as to satisfy simultaneously your obligations under this
|
|
||||||
License and any other pertinent obligations, then as a consequence you may
|
|
||||||
not convey it at all. For example, if you agree to terms that obligate you
|
|
||||||
to collect a royalty for further conveying from those to whom you convey
|
|
||||||
the Program, the only way you could satisfy both those terms and this
|
|
||||||
License would be to refrain entirely from conveying the Program.
|
|
||||||
|
|
||||||
13. Remote Network Interaction; Use with the GNU General Public License.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, if you modify the
|
|
||||||
Program, your modified version must prominently offer all users
|
|
||||||
interacting with it remotely through a computer network (if your version
|
|
||||||
supports such interaction) an opportunity to receive the Corresponding
|
|
||||||
Source of your version by providing access to the Corresponding Source
|
|
||||||
from a network server at no charge, through some standard or customary
|
|
||||||
means of facilitating copying of software. This Corresponding Source
|
|
||||||
shall include the Corresponding Source for any work covered by version 3
|
|
||||||
of the GNU General Public License that is incorporated pursuant to the
|
|
||||||
following paragraph.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, you have
|
|
||||||
permission to link or combine any covered work with a work licensed
|
|
||||||
under version 3 of the GNU General Public License into a single
|
|
||||||
combined work, and to convey the resulting work. The terms of this
|
|
||||||
License will continue to apply to the part which is the covered work,
|
|
||||||
but the work with which it is combined will remain governed by version
|
|
||||||
3 of the GNU General Public License.
|
|
||||||
|
|
||||||
14. Revised Versions of this License.
|
|
||||||
|
|
||||||
The Free Software Foundation may publish revised and/or new versions of
|
|
||||||
the GNU Affero General Public License from time to time. Such new versions
|
|
||||||
will be similar in spirit to the present version, but may differ in detail to
|
|
||||||
address new problems or concerns.
|
|
||||||
|
|
||||||
Each version is given a distinguishing version number. If the
|
|
||||||
Program specifies that a certain numbered version of the GNU Affero General
|
|
||||||
Public License "or any later version" applies to it, you have the
|
|
||||||
option of following the terms and conditions either of that numbered
|
|
||||||
version or of any later version published by the Free Software
|
|
||||||
Foundation. If the Program does not specify a version number of the
|
|
||||||
GNU Affero General Public License, you may choose any version ever published
|
|
||||||
by the Free Software Foundation.
|
|
||||||
|
|
||||||
If the Program specifies that a proxy can decide which future
|
|
||||||
versions of the GNU Affero General Public License can be used, that proxy's
|
|
||||||
public statement of acceptance of a version permanently authorizes you
|
|
||||||
to choose that version for the Program.
|
|
||||||
|
|
||||||
Later license versions may give you additional or different
|
|
||||||
permissions. However, no additional obligations are imposed on any
|
|
||||||
author or copyright holder as a result of your choosing to follow a
|
|
||||||
later version.
|
|
||||||
|
|
||||||
15. Disclaimer of Warranty.
|
|
||||||
|
|
||||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
|
||||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
|
||||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
|
||||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
||||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
|
||||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
|
||||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
|
||||||
|
|
||||||
16. Limitation of Liability.
|
|
||||||
|
|
||||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
|
||||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
|
||||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
|
||||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
|
||||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
|
||||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
|
||||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
|
||||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
|
||||||
SUCH DAMAGES.
|
|
||||||
|
|
||||||
17. Interpretation of Sections 15 and 16.
|
|
||||||
|
|
||||||
If the disclaimer of warranty and limitation of liability provided
|
|
||||||
above cannot be given local legal effect according to their terms,
|
|
||||||
reviewing courts shall apply local law that most closely approximates
|
|
||||||
an absolute waiver of all civil liability in connection with the
|
|
||||||
Program, unless a warranty or assumption of liability accompanies a
|
|
||||||
copy of the Program in return for a fee.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
How to Apply These Terms to Your New Programs
|
|
||||||
|
|
||||||
If you develop a new program, and you want it to be of the greatest
|
|
||||||
possible use to the public, the best way to achieve this is to make it
|
|
||||||
free software which everyone can redistribute and change under these terms.
|
|
||||||
|
|
||||||
To do so, attach the following notices to the program. It is safest
|
|
||||||
to attach them to the start of each source file to most effectively
|
|
||||||
state the exclusion of warranty; and each file should have at least
|
|
||||||
the "copyright" line and a pointer to where the full notice is found.
|
|
||||||
|
|
||||||
<one line to give the program's name and a brief idea of what it does.>
|
|
||||||
Copyright (C) <year> <name of author>
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU Affero General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU Affero General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
Also add information on how to contact you by electronic and paper mail.
|
|
||||||
|
|
||||||
If your software can interact with users remotely through a computer
|
|
||||||
network, you should also make sure that it provides a way for users to
|
|
||||||
get its source. For example, if your program is a web application, its
|
|
||||||
interface could display a "Source" link that leads users to an archive
|
|
||||||
of the code. There are many ways you could offer source, and different
|
|
||||||
solutions will be better for different programs; see section 13 for the
|
|
||||||
specific requirements.
|
|
||||||
|
|
||||||
You should also get your employer (if you work as a programmer) or school,
|
|
||||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
|
||||||
For more information on this, and how to apply and follow the GNU AGPL, see
|
|
||||||
<https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
51
README.md
51
README.md
|
|
@ -1,45 +1,24 @@
|
||||||
# Minauthator
|
# Minauthator
|
||||||
|
|
||||||
Minauthator is a self-hostable FOSS identity provider server supporting [OpenID Connect (OIDC)](https://en.wikipedia.org/wiki/OpenID_Connect).
|
Minauthator is an identity provider supporting [OpenID Connect (OIDC)](https://en.wikipedia.org/wiki/OpenID_Connect).
|
||||||
|
|
||||||
This project aims to allow an organization to setup [single sign-on (SSO)](https://en.wikipedia.org/wiki/Single_sign-on) using a self-hosted free software (FOSS).
|
This project aims to allow an organization to setup [single sign-on (SSO)](https://en.wikipedia.org/wiki/Single_sign-on) using a self-hosted free software.
|
||||||
|
|
||||||
This project also aims to provide features while being frugal and minimalist.
|
|
||||||
|
|
||||||
**Project status: *early development, work-in-progress***
|
**Project status: *early development, work-in-progress***
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
- [x] Login
|
- Login
|
||||||
- [x] Register
|
- Register
|
||||||
- [x] OpenID Connect & OAuth 2.0
|
- OpenID Connect & OAuth 2.0
|
||||||
- [x] Activation token
|
- Activation token
|
||||||
- [x] Profile details
|
- Profile details
|
||||||
- [x] Static apps
|
- Static apps
|
||||||
- [x] Admin CLI to manage user.
|
- User roles
|
||||||
- [x] User invitation with human token
|
- MFA/TOTP
|
||||||
- [ ] User roles
|
- Email notifications
|
||||||
- [ ] User groups
|
- Login page customization
|
||||||
- [ ] MFA/TOTP
|
- App carousel (App presentation to users)
|
||||||
- [ ] Email notifications
|
|
||||||
- [ ] Login page customization
|
|
||||||
- [x] App listing (App presentation to users)
|
|
||||||
- [x] Implicit OAuth 2.0 flow
|
|
||||||
- [ ] Email verification
|
|
||||||
- [ ] GPG keys verification and signing
|
|
||||||
- [ ] Docker deployment
|
|
||||||
- [ ] Full user panel & user privacy control
|
|
||||||
|
|
||||||
## Architecture
|
|
||||||
|
|
||||||
- Sqlite DB
|
|
||||||
- Kernel
|
|
||||||
- Http server
|
|
||||||
- Public API
|
|
||||||
- User API
|
|
||||||
- Third-party OAuth2 app/client API
|
|
||||||
- Web GUI (no Javascript)
|
|
||||||
- Admin CLI
|
|
||||||
|
|
||||||
## Deps
|
## Deps
|
||||||
|
|
||||||
|
|
@ -49,8 +28,4 @@ This project also aims to provide features while being frugal and minimalist.
|
||||||
|
|
||||||
- [Authentik](https://goauthentik.io/)
|
- [Authentik](https://goauthentik.io/)
|
||||||
- [Keycloak](https://www.keycloak.org/)
|
- [Keycloak](https://www.keycloak.org/)
|
||||||
- [Kanidm](https://kanidm.com/)
|
|
||||||
|
|
||||||
## Licensing
|
|
||||||
|
|
||||||
This project is licensed under the [GNU Affero General Public License 3.0](https://www.gnu.org/licenses/agpl-3.0.en.html).
|
|
||||||
|
|
|
||||||
66
TODO.md
66
TODO.md
|
|
@ -1,33 +1,5 @@
|
||||||
# TODO
|
# TODO
|
||||||
|
|
||||||
- [ ] better OIDC support
|
|
||||||
- [ ] better support of `profile` `openid` `email` `roles` scopes
|
|
||||||
- [ ] support of custom id_token claims mapping/binding
|
|
||||||
- example for Vikunja: `vikunja_teams` or `vikunja_groups` attribute
|
|
||||||
- being able to say :
|
|
||||||
- For this client, I want to add this claim
|
|
||||||
- with the key X
|
|
||||||
- and the value taken from an expression
|
|
||||||
- eg "json_array(user.groups)"
|
|
||||||
|
|
||||||
- [ ] i18n strings in the HTTP website.
|
|
||||||
|
|
||||||
- [ ] Instance customization support
|
|
||||||
|
|
||||||
- [ ] Public endpoint to get user avatar by id
|
|
||||||
- [ ] Rework avatar upload to limit size and process the image?
|
|
||||||
|
|
||||||
- Authorize form
|
|
||||||
- [ ] Show details about permissions
|
|
||||||
- [ ] Show app logo
|
|
||||||
|
|
||||||
- [ ] Support error responses by https://datatracker.ietf.org/doc/html/rfc6749#section-4.1.2.1
|
|
||||||
|
|
||||||
- [ ] feat(perms): add groups and roles
|
|
||||||
|
|
||||||
- [ ] UserWebGUI: add TOTP
|
|
||||||
- [ ] send emails to users
|
|
||||||
|
|
||||||
- [x] Login form
|
- [x] Login form
|
||||||
- [x] Register form
|
- [x] Register form
|
||||||
- [x] Redirect to login form if unauthenticated
|
- [x] Redirect to login form if unauthenticated
|
||||||
|
|
@ -41,12 +13,20 @@
|
||||||
- [x] Support OpenID to use with demo client [oauth2c](https://github.com/cloudentity/oauth2c)
|
- [x] Support OpenID to use with demo client [oauth2c](https://github.com/cloudentity/oauth2c)
|
||||||
- .well-known/openid-configuration
|
- .well-known/openid-configuration
|
||||||
|
|
||||||
- [x] architecture refactor
|
|
||||||
- [x] AdminCLI: init
|
|
||||||
- [x] AdminCLI: list users
|
|
||||||
- [x] AdminCLI: create and invite user
|
|
||||||
|
|
||||||
- [x] UserWebGUI: Invitation
|
- [ ] i18n strings in the http website.
|
||||||
|
|
||||||
|
- [ ] App config
|
||||||
|
- Add app logo (URI?)
|
||||||
|
|
||||||
|
- [ ] Public endpoint to get user avatar by id
|
||||||
|
- [ ] Rework avatar upload to limit size and process the image?
|
||||||
|
|
||||||
|
- [ ] Authorize form
|
||||||
|
- Show details about permissions
|
||||||
|
- Show app logo
|
||||||
|
|
||||||
|
- [ ] Support error responses by https://datatracker.ietf.org/doc/html/rfc6749#section-4.1.2.1
|
||||||
|
|
||||||
- [x] UserWebGUI: Redirect to login when JWT expire
|
- [x] UserWebGUI: Redirect to login when JWT expire
|
||||||
- [x] UserWebGUI: Show user authorizations.
|
- [x] UserWebGUI: Show user authorizations.
|
||||||
|
|
@ -57,8 +37,20 @@
|
||||||
|
|
||||||
- [x] UserWebGUI: activate account with token
|
- [x] UserWebGUI: activate account with token
|
||||||
|
|
||||||
- [X] basic docker setup
|
- [x] feat: add groups and roles models
|
||||||
- [ ] make `docker stop` working (handle SIGTERM/SIGINT)
|
|
||||||
- [ ] implement docker secrets. https://docs.docker.com/engine/swarm/secrets/
|
|
||||||
|
|
||||||
- [ ] Find a minimal OpenID client implementation like Listmonk but a little bit more mature
|
- [ ] UserWebGUI: add TOTP
|
||||||
|
- [ ] send emails to users
|
||||||
|
|
||||||
|
- Architecture: do we have an admin API?
|
||||||
|
|
||||||
|
- [ ] AdminCLI: init
|
||||||
|
- [ ] AdminWebGUI: List users
|
||||||
|
- [ ] AdminWebGUI: Assign groups to users
|
||||||
|
- [ ] AdminWebGUI: Create invitation
|
||||||
|
|
||||||
|
# Minimal flow
|
||||||
|
|
||||||
|
- [ ] Invite user from command line bash script that will edit sqlite
|
||||||
|
- [ ] Activation UI
|
||||||
|
- [ ] Send email
|
||||||
|
|
|
||||||
3
admin.sh
3
admin.sh
|
|
@ -1,3 +0,0 @@
|
||||||
#!/usr/bin/sh
|
|
||||||
|
|
||||||
cargo run -q --bin minauthator-admin -- --config ./config.toml --database ./tmp/dbs/minauthator.db --static-assets ./assets $@
|
|
||||||
38
config.toml
38
config.toml
|
|
@ -1,23 +1,8 @@
|
||||||
signing_key = "tmp/secrets/signing.key"
|
|
||||||
|
|
||||||
[instance]
|
[instance]
|
||||||
base_uri = "https://auth.fictive.org"
|
base_uri = "http://localhost:8085"
|
||||||
name = "Fictive's auth"
|
name = "Example org"
|
||||||
logo_uri = "https://example.org/logo.png"
|
logo_uri = "https://example.org/logo.png"
|
||||||
|
|
||||||
[[applications]]
|
|
||||||
slug = "listmonk"
|
|
||||||
name = "Listmonk"
|
|
||||||
description = "Newsletter tool."
|
|
||||||
client_id = "da2120b4-635d-4eb5-8b2f-dbae89f6a6e9"
|
|
||||||
client_secret = "59da2291-8999-40e2-afe9-a54ac7cd0a94"
|
|
||||||
login_uri = "https://lists.fictive.org"
|
|
||||||
allowed_redirect_uris = [
|
|
||||||
"https://lists.fictive.org/auth/oidc",
|
|
||||||
]
|
|
||||||
visibility = "Internal"
|
|
||||||
authorize_flow = "Implicit"
|
|
||||||
|
|
||||||
[[applications]]
|
[[applications]]
|
||||||
slug = "demo_app"
|
slug = "demo_app"
|
||||||
name = "Demo app"
|
name = "Demo app"
|
||||||
|
|
@ -63,9 +48,28 @@ slug = "basic"
|
||||||
name = "Basic"
|
name = "Basic"
|
||||||
description = "Basic user"
|
description = "Basic user"
|
||||||
default = true
|
default = true
|
||||||
|
permissions = []
|
||||||
|
|
||||||
[[roles]]
|
[[roles]]
|
||||||
slug = "admin"
|
slug = "admin"
|
||||||
name = "Administrator"
|
name = "Administrator"
|
||||||
description = "Full power on organization instance"
|
description = "Full power on organization instance"
|
||||||
|
permissions = [
|
||||||
|
"InviteUser", # creation of user
|
||||||
|
"ListUsers",
|
||||||
|
"EnableUser",
|
||||||
|
"DisableUser",
|
||||||
|
"AssignUserGroups"
|
||||||
|
]
|
||||||
|
|
||||||
|
# [[groups]]
|
||||||
|
# slug = "ca_member"
|
||||||
|
# name = "G1"
|
||||||
|
# description = "Lorem ipsum"
|
||||||
|
# roles = []
|
||||||
|
|
||||||
|
# [[groups]]
|
||||||
|
# slug = "bureau"
|
||||||
|
# name = "G2"
|
||||||
|
# description = "Lorem ipseum"
|
||||||
|
# roles = ["admin"]
|
||||||
|
|
|
||||||
|
|
@ -4,50 +4,27 @@ https://datatracker.ietf.org/doc/html/rfc6749
|
||||||
|
|
||||||
https://stackoverflow.com/questions/79118231/how-to-access-the-axum-request-path-in-a-minijinja-template
|
https://stackoverflow.com/questions/79118231/how-to-access-the-axum-request-path-in-a-minijinja-template
|
||||||
|
|
||||||
## Oauth2 test
|
# Need for groups and roles
|
||||||
|
|
||||||
-> authorize
|
There is two kinds of role
|
||||||
|
|
||||||
# User flow
|
- Role that will be used interllay to the tapp
|
||||||
|
- Roles that will be used exteranlly on oauth2 clients.
|
||||||
|
|
||||||
## Invitation flow
|
- For now we only have roles and not groups
|
||||||
|
|
||||||
- Create invite
|
## Groups feature
|
||||||
- generate A random
|
|
||||||
- user.reset_password_token = A
|
|
||||||
- user.status = "Invited"
|
|
||||||
- Send email with link to https://instance/reset-password?token=A&reason=invitation
|
|
||||||
- GET /reset-password?token=A&reason=invitation
|
|
||||||
- verification of token
|
|
||||||
- show form
|
|
||||||
- POST /reset-password
|
|
||||||
- BODY: with params token
|
|
||||||
- check token validity
|
|
||||||
- set new password hash
|
|
||||||
- if user.status == "invited"
|
|
||||||
- enable new account (user.status = "active")
|
|
||||||
- send welcome email
|
|
||||||
- redirect to login page with a message
|
|
||||||
- we need to redirect to the login page, so the user remember how to login later, and can
|
|
||||||
verify the setup of his/her password manager.
|
|
||||||
|
|
||||||
We can instead send link to https://instance/invitation?token=A
|
Group will be later used to combine multiple roles.
|
||||||
|
|
||||||
## Reset password flow
|
# [[groups]]
|
||||||
|
# slug = "ca_member"
|
||||||
|
# name = "G1"
|
||||||
|
# description = "Lorem ipsum"
|
||||||
|
# roles = []
|
||||||
|
|
||||||
- Reset password request
|
# [[groups]]
|
||||||
- generate A random
|
# slug = "bureau"
|
||||||
- user.reset_password_token = A
|
# name = "G2"
|
||||||
- Send email with link to https://instance/reset-password?token=A&reason=lost_password
|
# description = "Lorem ipseum"
|
||||||
- GET /reset-password?token=A&reason=lost_password
|
# roles = ["admin"]
|
||||||
- verification of token
|
|
||||||
- show form
|
|
||||||
- POST /reset-password
|
|
||||||
- BODY: with params token
|
|
||||||
- check token validity
|
|
||||||
- set new password hash
|
|
||||||
- redirect to login page with a message
|
|
||||||
- we need to redirect to the login page, so the user remember how to login later, and can
|
|
||||||
verify the setup of his/her password manager.
|
|
||||||
|
|
||||||
We can instead send link to https://instance/reset-password?token=A
|
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ curl -v http://localhost:8085/authorize \
|
||||||
--cookie "tmp/.curl-cookies" \
|
--cookie "tmp/.curl-cookies" \
|
||||||
-d client_id="a1785786-8be1-443c-9a6f-35feed703609" \
|
-d client_id="a1785786-8be1-443c-9a6f-35feed703609" \
|
||||||
-d response_type="code" \
|
-d response_type="code" \
|
||||||
-d redirect_uri="http://localhost:9090/callback" \
|
-d redirect_uri="http://localhost:9090/authorize" \
|
||||||
-d scope="user_read_basic" \
|
-d scope="user_read_basic" \
|
||||||
-d state="qxYAfk4kf6pbZkms78jM"
|
-d state="qxYAfk4kf6pbZkms78jM"
|
||||||
|
|
||||||
10
init_db.sh
10
init_db.sh
|
|
@ -1,10 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
DEFAULT_DB_PATH="/var/lib/minauthator/minauthator.db"
|
|
||||||
DEFAULT_MIGRATION_PATH="/usr/local/src/minauthator/migrations/all.sql"
|
|
||||||
|
|
||||||
DB_PATH="${DB_PATH:-$DEFAULT_DB_PATH}"
|
|
||||||
MIGRATION_PATH="${MIGRATION_PATH:-$DEFAULT_MIGRATION_PATH}"
|
|
||||||
|
|
||||||
sqlite3 $DB_PATH < $MIGRATION_PATH
|
|
||||||
|
|
||||||
38
justfile
38
justfile
|
|
@ -1,33 +1,21 @@
|
||||||
export RUST_BACKTRACE := "1"
|
export RUST_BACKTRACE := "1"
|
||||||
export RUST_LOG := "trace"
|
export RUST_LOG := "trace"
|
||||||
export CONTEXT_ARGS := "--config config.toml --database tmp/dbs/minauthator.db --static-assets ./assets"
|
|
||||||
|
|
||||||
watch-server *args:
|
watch-run:
|
||||||
cargo-watch -x "run --bin minauthator-server -- $CONTEXT_ARGS {{args}}"
|
cargo-watch -x 'run -- --config ./config.toml --database ./tmp/dbs/minauthator.db --static-assets ./assets'
|
||||||
|
|
||||||
server *args:
|
run:
|
||||||
cargo run --bin minauthator-server -- $CONTEXT_ARGS {{args}}
|
cargo run -- --database ./tmp/dbs/minauthator.db --config ./config.toml --static-assets ./assets
|
||||||
|
|
||||||
admin *args:
|
|
||||||
cargo run --bin minauthator-admin -- $CONTEXT_ARGS {{args}}
|
|
||||||
|
|
||||||
docker-build *args:
|
|
||||||
docker build -t lefuturiste/minauthator {{args}} .
|
|
||||||
|
|
||||||
docker-init-db:
|
|
||||||
docker run \
|
|
||||||
-v ./tmp/docker/config:/etc/minauthator \
|
|
||||||
-v minauthator-db:/var/lib/minauthator \
|
|
||||||
lefuturiste/minauthator \
|
|
||||||
/usr/local/bin/minauthator_init_db.sh
|
|
||||||
|
|
||||||
docker-run:
|
docker-run:
|
||||||
docker run \
|
docker run -p 3085:8080 -v ./tmp/docker/config:/etc/minauthator -v ./tmp/docker/db:/var/lib/minauthator minauthator
|
||||||
-p 127.0.0.1:3085:8080 \
|
|
||||||
-v ./tmp/docker/config:/etc/minauthator \
|
|
||||||
-v minauthator-db:/var/lib/minauthator \
|
|
||||||
lefuturiste/minauthator
|
|
||||||
|
|
||||||
init-db *args:
|
docker-init-db:
|
||||||
sqlite3 {{args}} tmp/dbs/minauthator.db < migrations/all.sql
|
docker run -v ./tmp/docker/config:/etc/minauthator -v ./tmp/docker/db:/var/lib/minauthator minauthator /usr/local/bin/minauthator_init_db.sh
|
||||||
|
|
||||||
|
docker-build:
|
||||||
|
docker build -t minauthator .
|
||||||
|
|
||||||
|
init-db:
|
||||||
|
sqlite3 -echo tmp/dbs/minauthator.db < migrations/all.sql
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
[package]
|
|
||||||
name = "admin_cli"
|
|
||||||
edition = "2021"
|
|
||||||
|
|
||||||
[[bin]]
|
|
||||||
name = "minauthator-admin"
|
|
||||||
path = "src/main.rs"
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
anyhow = { workspace = true }
|
|
||||||
thiserror = { workspace = true }
|
|
||||||
fully_pub = { workspace = true }
|
|
||||||
argh = { workspace = true }
|
|
||||||
tokio = { workspace = true }
|
|
||||||
log = { workspace = true }
|
|
||||||
env_logger = { workspace = true }
|
|
||||||
|
|
||||||
kernel = { path = "../kernel" }
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
pub mod users;
|
|
||||||
|
|
@ -1,115 +0,0 @@
|
||||||
use anyhow::{Context, Result};
|
|
||||||
use argh::FromArgs;
|
|
||||||
use fully_pub::fully_pub;
|
|
||||||
use kernel::{context::KernelContext, models::user::User, repositories::users::get_users};
|
|
||||||
use log::info;
|
|
||||||
|
|
||||||
#[fully_pub]
|
|
||||||
#[derive(FromArgs, PartialEq, Debug)]
|
|
||||||
#[argh(
|
|
||||||
subcommand, name = "create",
|
|
||||||
description = "Create user in DB."
|
|
||||||
)]
|
|
||||||
struct CreateUserCommand {
|
|
||||||
/// aka login, username
|
|
||||||
#[argh(option)]
|
|
||||||
handle: String,
|
|
||||||
|
|
||||||
/// displayed name (eg. first name and last name)
|
|
||||||
#[argh(option)]
|
|
||||||
full_name: Option<String>,
|
|
||||||
|
|
||||||
/// use to identify and prove user identity
|
|
||||||
/// formated as specified in RFC 2821, RFC 3696
|
|
||||||
#[argh(option)]
|
|
||||||
email: String,
|
|
||||||
|
|
||||||
/// if true, create an invitation token
|
|
||||||
#[argh(switch)]
|
|
||||||
invite: bool
|
|
||||||
}
|
|
||||||
|
|
||||||
#[fully_pub]
|
|
||||||
#[derive(FromArgs, PartialEq, Debug)]
|
|
||||||
#[argh(
|
|
||||||
subcommand, name = "delete",
|
|
||||||
description = "Delete user in DB."
|
|
||||||
)]
|
|
||||||
struct DeleteUserCommand {
|
|
||||||
/// delete by user Uuid
|
|
||||||
#[argh(option)]
|
|
||||||
id: String
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#[fully_pub]
|
|
||||||
#[derive(FromArgs, PartialEq, Debug)]
|
|
||||||
#[argh(
|
|
||||||
subcommand, name = "list",
|
|
||||||
description = "List users in DB."
|
|
||||||
)]
|
|
||||||
struct ListUsersCommand {
|
|
||||||
/// how many users to return
|
|
||||||
#[argh(option)]
|
|
||||||
limit: Option<usize>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[fully_pub]
|
|
||||||
#[derive(FromArgs, PartialEq, Debug)]
|
|
||||||
#[argh(subcommand)]
|
|
||||||
enum UsersSubCommands {
|
|
||||||
Create(CreateUserCommand),
|
|
||||||
List(ListUsersCommand),
|
|
||||||
Delete(DeleteUserCommand),
|
|
||||||
}
|
|
||||||
|
|
||||||
#[fully_pub]
|
|
||||||
#[derive(FromArgs, PartialEq, Debug)]
|
|
||||||
#[argh(
|
|
||||||
subcommand, name = "users",
|
|
||||||
description = "Manage instance users."
|
|
||||||
)]
|
|
||||||
struct UsersCommand {
|
|
||||||
#[argh(subcommand)]
|
|
||||||
nested: UsersSubCommands,
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
pub async fn list_users(cmd: ListUsersCommand, ctx: KernelContext) -> Result<()> {
|
|
||||||
for user in get_users(&ctx.storage).await? {
|
|
||||||
println!(
|
|
||||||
"{0: <36} | [{1:<8}] | {2: <15} | {3: <25}",
|
|
||||||
user.id, user.status, user.handle, user.email.unwrap_or("()".to_string())
|
|
||||||
);
|
|
||||||
}
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn create_user(cmd: CreateUserCommand, ctx: KernelContext) -> Result<()> {
|
|
||||||
let mut user = User::new(cmd.handle);
|
|
||||||
user.email = Some(cmd.email);
|
|
||||||
user.full_name = cmd.full_name;
|
|
||||||
if cmd.invite {
|
|
||||||
user.invite();
|
|
||||||
println!("Generated invite code: {}", user.reset_password_token.as_ref().unwrap());
|
|
||||||
}
|
|
||||||
let _res = kernel::actions::users::create_user(ctx, user).await?;
|
|
||||||
info!("Created user.");
|
|
||||||
if cmd.invite {
|
|
||||||
// TODO: Send invitation email
|
|
||||||
info!("Not sending invitation email.");
|
|
||||||
}
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn delete_user(cmd: DeleteUserCommand, ctx: KernelContext) -> Result<()> {
|
|
||||||
todo!()
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn handle_command_tree(cmd: UsersCommand, ctx: KernelContext) -> Result<()> {
|
|
||||||
match cmd.nested {
|
|
||||||
UsersSubCommands::List(sc) => list_users(sc, ctx).await,
|
|
||||||
UsersSubCommands::Create(sc) => create_user(sc, ctx).await,
|
|
||||||
UsersSubCommands::Delete(sc) => delete_user(sc, ctx).await
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,49 +0,0 @@
|
||||||
use argh::FromArgs;
|
|
||||||
use anyhow::{Context, Result};
|
|
||||||
use commands::users;
|
|
||||||
use kernel::context::{get_kernel_context, StartKernelConfig};
|
|
||||||
use log::info;
|
|
||||||
|
|
||||||
pub mod commands;
|
|
||||||
|
|
||||||
#[derive(FromArgs, PartialEq, Debug)]
|
|
||||||
#[argh(subcommand)]
|
|
||||||
enum SubCommands {
|
|
||||||
Users(users::UsersCommand),
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(FromArgs, PartialEq, Debug)]
|
|
||||||
/// Minauthator admin top level
|
|
||||||
struct AdminCliTopLevelCommand {
|
|
||||||
#[argh(subcommand)]
|
|
||||||
nested: SubCommands,
|
|
||||||
|
|
||||||
/// path to YAML config file to use to configure this instance
|
|
||||||
#[argh(option)]
|
|
||||||
config: Option<String>,
|
|
||||||
|
|
||||||
/// path to the Sqlite3 DB file to use
|
|
||||||
#[argh(option)]
|
|
||||||
database: Option<String>,
|
|
||||||
|
|
||||||
/// path to the static assets dir
|
|
||||||
#[argh(option)]
|
|
||||||
static_assets: Option<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// handle CLI arguments to run admin CLI
|
|
||||||
#[tokio::main]
|
|
||||||
pub async fn main() -> Result<()> {
|
|
||||||
info!("Starting minauth");
|
|
||||||
let command_input: AdminCliTopLevelCommand = argh::from_env();
|
|
||||||
let ctx = get_kernel_context(StartKernelConfig {
|
|
||||||
config_path: command_input.config.clone(),
|
|
||||||
database_path: command_input.database.clone()
|
|
||||||
}).await.context("Getting kernel context")?;
|
|
||||||
|
|
||||||
match command_input.nested {
|
|
||||||
SubCommands::Users(sc) => {
|
|
||||||
users::handle_command_tree(sc, ctx).await
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,60 +0,0 @@
|
||||||
[package]
|
|
||||||
name = "http_server"
|
|
||||||
edition = "2021"
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
kernel = { path = "../kernel" }
|
|
||||||
utils = { path = "../utils" }
|
|
||||||
|
|
||||||
# common
|
|
||||||
log = { workspace = true }
|
|
||||||
env_logger = { workspace = true }
|
|
||||||
|
|
||||||
strum = { workspace = true }
|
|
||||||
strum_macros = { workspace = true }
|
|
||||||
|
|
||||||
anyhow = { workspace = true }
|
|
||||||
thiserror = { workspace = true }
|
|
||||||
fully_pub = { workspace = true }
|
|
||||||
|
|
||||||
tokio = { workspace = true }
|
|
||||||
|
|
||||||
# Web
|
|
||||||
axum = { version = "0.7.7", features = ["json", "multipart"] }
|
|
||||||
axum-extra = { version = "0.9.4", features = ["cookie"] }
|
|
||||||
axum-template = { version = "2.4.0", features = ["minijinja"] }
|
|
||||||
axum_typed_multipart = "0.13.1"
|
|
||||||
minijinja = { version = "2.1", features = ["builtins"] }
|
|
||||||
# to make work the static assets server
|
|
||||||
tower-http = { version = "0.6.1", features = ["fs"] }
|
|
||||||
|
|
||||||
minijinja-embed = "2.3.1"
|
|
||||||
axum-macros = "0.4.2"
|
|
||||||
jsonwebtoken = "9.3.0"
|
|
||||||
time = "0.3.36"
|
|
||||||
|
|
||||||
serde = { workspace = true }
|
|
||||||
serde_json = { workspace = true }
|
|
||||||
serde_urlencoded = "0.7.1"
|
|
||||||
chrono = { workspace = true }
|
|
||||||
|
|
||||||
argh = { workspace = true }
|
|
||||||
|
|
||||||
sqlx = { workspace = true }
|
|
||||||
uuid = { workspace = true }
|
|
||||||
url = { workspace = true }
|
|
||||||
|
|
||||||
# To work with key pair
|
|
||||||
pem = "3.0.4"
|
|
||||||
|
|
||||||
[dependencies.jsonwebkey-convert-repaired]
|
|
||||||
git = "https://forge.lefuturiste.fr/rust-libs/jsonwebkey-rs-repaired.git"
|
|
||||||
branch = "master"
|
|
||||||
features = ["simple_asn1", "pem"]
|
|
||||||
|
|
||||||
[build-dependencies]
|
|
||||||
minijinja-embed = "2.3.1"
|
|
||||||
|
|
||||||
[[bin]]
|
|
||||||
name = "minauthator-server"
|
|
||||||
path = "src/main.rs"
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
use axum::{extract::State, response::IntoResponse, Json};
|
|
||||||
use serde_json::json;
|
|
||||||
|
|
||||||
use crate::AppState;
|
|
||||||
|
|
||||||
pub async fn get_index(
|
|
||||||
State(app_state): State<AppState>,
|
|
||||||
) -> impl IntoResponse {
|
|
||||||
Json(json!({
|
|
||||||
"software": "Minauthator",
|
|
||||||
"name": app_state.config.instance.name,
|
|
||||||
"base_uri": app_state.config.instance.base_uri
|
|
||||||
}))
|
|
||||||
}
|
|
||||||
|
|
@ -1,46 +0,0 @@
|
||||||
use std::str::FromStr;
|
|
||||||
|
|
||||||
use jsonwebkey_convert_repaired::RSAPublicKey;
|
|
||||||
use jsonwebkey_convert_repaired::der::FromPem;
|
|
||||||
|
|
||||||
use axum::{extract::State, response::IntoResponse, Json};
|
|
||||||
use fully_pub::fully_pub;
|
|
||||||
use serde::Serialize;
|
|
||||||
|
|
||||||
use crate::AppState;
|
|
||||||
|
|
||||||
// /// JSON Web Key
|
|
||||||
// /// @See https://www.rfc-editor.org/rfc/rfc7517.html
|
|
||||||
// #[derive(Serialize)]
|
|
||||||
// #[fully_pub]
|
|
||||||
// struct RsaJWK {
|
|
||||||
// #[serde(rename = "use")]
|
|
||||||
// utilisation: String,
|
|
||||||
// alg: String,
|
|
||||||
// kid: String,
|
|
||||||
// #[serde(rename = "modulus")]
|
|
||||||
// modulus: String,
|
|
||||||
// exp: String
|
|
||||||
// }
|
|
||||||
|
|
||||||
/// JSON Web Key set
|
|
||||||
/// @See https://www.rfc-editor.org/rfc/rfc7517.html
|
|
||||||
#[derive(Serialize)]
|
|
||||||
#[fully_pub]
|
|
||||||
struct JWKs {
|
|
||||||
keys: Vec<RSAPublicKey>
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn get_signing_public_keys(
|
|
||||||
State(app_state): State<AppState>,
|
|
||||||
) -> impl IntoResponse {
|
|
||||||
let pem_data = app_state.secrets.signing_keypair.0;
|
|
||||||
|
|
||||||
// extract modulus and exp number from ASN.1 encoded PCKS 1 package
|
|
||||||
let rsa_jwk = RSAPublicKey::from_pem(pem_data)
|
|
||||||
.expect("Failed to extract RSA public key from PEM");
|
|
||||||
|
|
||||||
Json(JWKs {
|
|
||||||
keys: vec![rsa_jwk]
|
|
||||||
}).into_response()
|
|
||||||
}
|
|
||||||
|
|
@ -1,27 +0,0 @@
|
||||||
use axum::{extract::{Path, State}, http::{header, HeaderMap, HeaderValue, StatusCode}, response::{Html, IntoResponse}};
|
|
||||||
use kernel::repositories::users::get_user_asset_by_id;
|
|
||||||
|
|
||||||
use crate::AppState;
|
|
||||||
|
|
||||||
pub async fn get_user_asset(
|
|
||||||
State(app_state): State<AppState>,
|
|
||||||
Path(asset_id): Path<String>
|
|
||||||
) -> impl IntoResponse {
|
|
||||||
let user_asset = match get_user_asset_by_id(&app_state.db, &asset_id).await {
|
|
||||||
Err(_) => {
|
|
||||||
return (
|
|
||||||
StatusCode::NOT_FOUND,
|
|
||||||
Html("Could not find user asset")
|
|
||||||
).into_response();
|
|
||||||
},
|
|
||||||
Ok(ua) => ua
|
|
||||||
};
|
|
||||||
|
|
||||||
let mut hm = HeaderMap::new();
|
|
||||||
hm.insert(
|
|
||||||
header::CONTENT_TYPE,
|
|
||||||
HeaderValue::from_str(&user_asset.mime_type).expect("Constructing header value.")
|
|
||||||
);
|
|
||||||
|
|
||||||
(hm, user_asset.content).into_response()
|
|
||||||
}
|
|
||||||
|
|
@ -1,139 +0,0 @@
|
||||||
use axum::{extract::{MatchedPath, Query, State}, http::StatusCode, response::{Html, IntoResponse, Redirect}, Extension, Form};
|
|
||||||
use log::{error, info};
|
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
use minijinja::context;
|
|
||||||
use fully_pub::fully_pub;
|
|
||||||
|
|
||||||
use crate::{renderer::TemplateRenderer, AppState};
|
|
||||||
|
|
||||||
use kernel::models::user::{User, UserStatus};
|
|
||||||
use utils::get_password_hash;
|
|
||||||
|
|
||||||
#[derive(Debug, Deserialize, Serialize)]
|
|
||||||
#[fully_pub]
|
|
||||||
enum ResetPasswordReason {
|
|
||||||
LostPassword,
|
|
||||||
Invitation
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Deserialize, Serialize)]
|
|
||||||
#[fully_pub]
|
|
||||||
struct ResetPasswordQueryParams {
|
|
||||||
token: String
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn reset_password_form(
|
|
||||||
State(app_state): State<AppState>,
|
|
||||||
path: MatchedPath,
|
|
||||||
Extension(renderer): Extension<TemplateRenderer>,
|
|
||||||
Query(query_params): Query<ResetPasswordQueryParams>
|
|
||||||
) -> impl IntoResponse {
|
|
||||||
let reason: ResetPasswordReason = match path.as_str() {
|
|
||||||
"/invitation" => ResetPasswordReason::Invitation,
|
|
||||||
"/reset-password" => ResetPasswordReason::LostPassword,
|
|
||||||
_ => unreachable!()
|
|
||||||
};
|
|
||||||
// 1. Verify token
|
|
||||||
let user_res = sqlx::query_as::<_, User>("SELECT * FROM users WHERE reset_password_token = $1")
|
|
||||||
.bind(&query_params.token)
|
|
||||||
.fetch_one(&app_state.db.0)
|
|
||||||
.await;
|
|
||||||
let _user = match user_res {
|
|
||||||
Ok(u) => u,
|
|
||||||
Err(sqlx::Error::RowNotFound) => {
|
|
||||||
return (
|
|
||||||
StatusCode::BAD_REQUEST,
|
|
||||||
Html("Invalid reset password token.")
|
|
||||||
).into_response();
|
|
||||||
},
|
|
||||||
Err(err) => {
|
|
||||||
error!("Failed to retreive user from reset password token. {}", err);
|
|
||||||
return (
|
|
||||||
StatusCode::INTERNAL_SERVER_ERROR,
|
|
||||||
Html("Internal server error: Failed to retreive user.")
|
|
||||||
).into_response();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
renderer.render(
|
|
||||||
"pages/reset_password",
|
|
||||||
context!(
|
|
||||||
reason => reason,
|
|
||||||
token => query_params.token,
|
|
||||||
)
|
|
||||||
).into_response()
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#[derive(Debug, Deserialize)]
|
|
||||||
#[fully_pub]
|
|
||||||
struct ResetPasswordForm {
|
|
||||||
token: String,
|
|
||||||
password: String,
|
|
||||||
password_confirmation: String
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn perform_reset_password(
|
|
||||||
State(app_state): State<AppState>,
|
|
||||||
Form(reset_form): Form<ResetPasswordForm>
|
|
||||||
) -> impl IntoResponse {
|
|
||||||
// 1. Verify token
|
|
||||||
let user_res = sqlx::query_as::<_, User>("SELECT * FROM users WHERE reset_password_token = $1")
|
|
||||||
.bind(&reset_form.token)
|
|
||||||
.fetch_one(&app_state.db.0)
|
|
||||||
.await;
|
|
||||||
let user = match user_res {
|
|
||||||
Ok(u) => u,
|
|
||||||
Err(sqlx::Error::RowNotFound) => {
|
|
||||||
return (
|
|
||||||
StatusCode::BAD_REQUEST,
|
|
||||||
Html("Invalid reset password token.")
|
|
||||||
).into_response();
|
|
||||||
},
|
|
||||||
Err(err) => {
|
|
||||||
error!("Failed to retreive user from reset password token. {}", err);
|
|
||||||
return (
|
|
||||||
StatusCode::INTERNAL_SERVER_ERROR,
|
|
||||||
Html("Internal server error: Failed to retreive user.")
|
|
||||||
).into_response();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
if reset_form.password != reset_form.password_confirmation {
|
|
||||||
return (
|
|
||||||
StatusCode::BAD_REQUEST,
|
|
||||||
Html("Form data error: The two passwords are differents.")
|
|
||||||
).into_response();
|
|
||||||
}
|
|
||||||
|
|
||||||
let password_hash = Some(
|
|
||||||
get_password_hash(reset_form.password)
|
|
||||||
.expect("To process password").1
|
|
||||||
);
|
|
||||||
if user.status == UserStatus::Invited {
|
|
||||||
info!("The password of an Invited user was set: activation of user account");
|
|
||||||
// TODO: send welcome email
|
|
||||||
}
|
|
||||||
let res = sqlx::query("UPDATE users
|
|
||||||
SET password_hash = $2, status = $3, reset_password_token = NULL
|
|
||||||
WHERE id = $1
|
|
||||||
")
|
|
||||||
.bind(user.id)
|
|
||||||
.bind(password_hash)
|
|
||||||
.bind(UserStatus::Active)
|
|
||||||
.execute(&app_state.db.0)
|
|
||||||
.await;
|
|
||||||
match res {
|
|
||||||
Err(err) => {
|
|
||||||
error!("Cannot update user: {}", err);
|
|
||||||
return (
|
|
||||||
StatusCode::INTERNAL_SERVER_ERROR,
|
|
||||||
Html("Internal server error: Failed to update user.")
|
|
||||||
).into_response();
|
|
||||||
},
|
|
||||||
Ok(_v) => {
|
|
||||||
info!("Changed user's password successfuly.");
|
|
||||||
}
|
|
||||||
};
|
|
||||||
// TODO: add either "Successfully changed password" or "Account enabled successfully" message
|
|
||||||
Redirect::to("/login").into_response()
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
use std::str::FromStr;
|
|
||||||
use anyhow::{Result, Context};
|
|
||||||
|
|
||||||
use kernel::models::{authorization::AuthorizationScope, config::Application};
|
|
||||||
|
|
||||||
pub fn verify_redirect_uri(app: &Application, input_redirect_uri: &str) -> bool {
|
|
||||||
app.allowed_redirect_uris
|
|
||||||
.iter()
|
|
||||||
.any(|uri| *uri == input_redirect_uri)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn parse_scope(scope_str: &str) -> Result<Vec<AuthorizationScope>> {
|
|
||||||
let mut scopes: Vec<AuthorizationScope> = vec![];
|
|
||||||
for part in scope_str.split(' ') {
|
|
||||||
if part == "openid" {
|
|
||||||
scopes.push(AuthorizationScope::UserReadBasic);
|
|
||||||
scopes.push(AuthorizationScope::UserReadRoles);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if part == "profile" || part == "email" {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
scopes.push(AuthorizationScope::from_str(part).context("Cannot parse space-delimited scope.")?);
|
|
||||||
}
|
|
||||||
Ok(scopes)
|
|
||||||
}
|
|
||||||
|
|
@ -1,38 +0,0 @@
|
||||||
use anyhow::Result;
|
|
||||||
use serde::{de::DeserializeOwned, Serialize};
|
|
||||||
use jsonwebtoken::{encode, decode, Header, Algorithm, Validation, EncodingKey, DecodingKey};
|
|
||||||
use kernel::{context::AppSecrets, models::config::Config};
|
|
||||||
|
|
||||||
|
|
||||||
pub fn create_token<T: Serialize>(
|
|
||||||
_config: &Config,
|
|
||||||
secrets: &AppSecrets,
|
|
||||||
claims: T
|
|
||||||
) -> String {
|
|
||||||
let token = encode(
|
|
||||||
&Header::new(Algorithm::RS256),
|
|
||||||
&claims,
|
|
||||||
&EncodingKey::from_rsa_pem(&secrets.signing_keypair.1)
|
|
||||||
.expect("To build encoding key from signing key.")
|
|
||||||
).expect("Create token");
|
|
||||||
|
|
||||||
token
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn verify_token<T: DeserializeOwned>(
|
|
||||||
config: &Config,
|
|
||||||
secrets: &AppSecrets,
|
|
||||||
jwt: &str
|
|
||||||
) -> Result<T> {
|
|
||||||
let mut validation = Validation::new(Algorithm::RS256);
|
|
||||||
validation.set_issuer(&[config.instance.base_uri.clone()]);
|
|
||||||
validation.set_audience(&[config.instance.base_uri.clone()]);
|
|
||||||
let token_data = decode::<T>(
|
|
||||||
jwt,
|
|
||||||
&DecodingKey::from_rsa_pem(&secrets.signing_keypair.0)
|
|
||||||
.expect("To build decoding key from signing key."),
|
|
||||||
&validation
|
|
||||||
)?;
|
|
||||||
|
|
||||||
Ok(token_data.claims)
|
|
||||||
}
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
{% extends "layouts/base.html" %}
|
|
||||||
{% block body %}
|
|
||||||
<h1>Internal server error</h1>
|
|
||||||
|
|
||||||
{% if error %}
|
|
||||||
<div class="alert alert-danger">
|
|
||||||
We are sorry. We've rencountered an unrecoverable error.
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
|
|
@ -1,54 +0,0 @@
|
||||||
{% extends "layouts/base.html" %}
|
|
||||||
{% block body %}
|
|
||||||
{% if reason == "Invitation" %}
|
|
||||||
<h1>Invitation</h1>
|
|
||||||
{% endif %}
|
|
||||||
{% if reason == "LostPassword" %}
|
|
||||||
<h1>Reset your password</h1>
|
|
||||||
{% endif %}
|
|
||||||
<!-- Reset password form -->
|
|
||||||
{% if error %}
|
|
||||||
<div class="alert alert-danger">
|
|
||||||
Error: {{ error }}
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
{% if info %}
|
|
||||||
<div class="alert alert-info">
|
|
||||||
Info: {{ info }}
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
{% if reason == "Invitation" %}
|
|
||||||
<p>
|
|
||||||
Pour activer votre compte, veuillez définir votre mot de passe.
|
|
||||||
</p>
|
|
||||||
{% endif %}
|
|
||||||
{% if reason == "LostPassword" %}
|
|
||||||
<p>
|
|
||||||
Votre mot de passe est perdu, veuillez définir un nouveau mot de passe.
|
|
||||||
</p>
|
|
||||||
{% endif %}
|
|
||||||
<form id="reset-password-form" method="post" action="/reset-password">
|
|
||||||
<div class="mb-3">
|
|
||||||
<label for="password" class="form-label">New password</label>
|
|
||||||
<input
|
|
||||||
id="password" name="password" type="password"
|
|
||||||
required
|
|
||||||
class="form-control"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div class="mb-3">
|
|
||||||
<label for="password" class="form-label">New password confirmation</label>
|
|
||||||
<input
|
|
||||||
id="password_confirmation" name="password_confirmation" type="password"
|
|
||||||
required
|
|
||||||
class="form-control"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<input
|
|
||||||
id="token" name="token" type="hidden"
|
|
||||||
value="{{ token }}"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<button type="submit" class="btn btn-primary">Change password</button>
|
|
||||||
</form>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
@ -1,103 +0,0 @@
|
||||||
use fully_pub::fully_pub;
|
|
||||||
use jsonwebtoken::get_current_timestamp;
|
|
||||||
use kernel::models::{authorization::AuthorizationScope, config::Config, user::User};
|
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
use time::Duration;
|
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize, Clone)]
|
|
||||||
#[fully_pub]
|
|
||||||
struct UserTokenClaims {
|
|
||||||
/// subject: user id
|
|
||||||
sub: String,
|
|
||||||
/// token expiration
|
|
||||||
exp: u64,
|
|
||||||
/// token issuer
|
|
||||||
iss: String,
|
|
||||||
// TODO: add roles
|
|
||||||
/// token audience
|
|
||||||
aud: String
|
|
||||||
}
|
|
||||||
|
|
||||||
impl UserTokenClaims {
|
|
||||||
pub fn new(config: &Config, user_id: &str, max_age: Duration) -> Self {
|
|
||||||
UserTokenClaims {
|
|
||||||
sub: user_id.into(),
|
|
||||||
exp: get_current_timestamp() + max_age.whole_seconds() as u64,
|
|
||||||
iss: config.instance.base_uri.clone(),
|
|
||||||
aud: config.instance.base_uri.clone(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Access token for OAuth2 defined in RFC 9068
|
|
||||||
/// @See https://datatracker.ietf.org/doc/html/rfc9068
|
|
||||||
#[derive(Debug, Serialize, Deserialize, Clone)]
|
|
||||||
#[fully_pub]
|
|
||||||
struct OAuth2AccessTokenClaims {
|
|
||||||
/// Token issuer (URI to the issuer)
|
|
||||||
iss: String,
|
|
||||||
/// Audiance (In this case, the audiance is equal to the issuer)
|
|
||||||
aud: String,
|
|
||||||
/// End-user id assigned by the issuer (user_id)
|
|
||||||
sub: String,
|
|
||||||
/// Token expiration
|
|
||||||
exp: u64,
|
|
||||||
/// List of OAuth 2 scopes asked by the client
|
|
||||||
scopes: Vec<AuthorizationScope>
|
|
||||||
}
|
|
||||||
|
|
||||||
impl OAuth2AccessTokenClaims {
|
|
||||||
pub fn new(config: &Config, user: &User, scopes: Vec<AuthorizationScope>) -> Self {
|
|
||||||
OAuth2AccessTokenClaims {
|
|
||||||
iss: config.instance.base_uri.clone(),
|
|
||||||
aud: config.instance.base_uri.clone(),
|
|
||||||
sub: user.id.clone(),
|
|
||||||
exp: get_current_timestamp() + 86_000,
|
|
||||||
scopes,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/// @See https://openid.net/specs/openid-connect-core-1_0.html#IDToken
|
|
||||||
/// @See https://openid.net/specs/openid-connect-core-1_0.html#StandardClaims
|
|
||||||
#[derive(Debug, Serialize, Deserialize, Clone)]
|
|
||||||
#[fully_pub]
|
|
||||||
struct OIDCIdTokenClaims {
|
|
||||||
/// Token expiration
|
|
||||||
exp: u64,
|
|
||||||
/// Token issuer (URI to the issuer)
|
|
||||||
iss: String,
|
|
||||||
/// Audiance (client_id)
|
|
||||||
aud: String,
|
|
||||||
/// End-user id assigned by the issuer (user_id)
|
|
||||||
sub: String,
|
|
||||||
/// additional claims
|
|
||||||
name: Option<String>,
|
|
||||||
email: Option<String>,
|
|
||||||
preferred_username: Option<String>,
|
|
||||||
roles: Vec<String>,
|
|
||||||
nonce: Option<String>
|
|
||||||
}
|
|
||||||
|
|
||||||
impl OIDCIdTokenClaims {
|
|
||||||
pub fn new(
|
|
||||||
config: &Config,
|
|
||||||
client_id: &str,
|
|
||||||
user: User,
|
|
||||||
nonce: Option<String>
|
|
||||||
) -> Self {
|
|
||||||
OIDCIdTokenClaims {
|
|
||||||
iss: config.instance.base_uri.clone(),
|
|
||||||
aud: client_id.into(),
|
|
||||||
sub: user.id,
|
|
||||||
exp: get_current_timestamp() + 86_000,
|
|
||||||
email: user.email,
|
|
||||||
name: user.full_name,
|
|
||||||
preferred_username: Some(user.handle),
|
|
||||||
roles: user.roles.0,
|
|
||||||
nonce
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
||||||
[package]
|
|
||||||
name = "kernel"
|
|
||||||
edition = "2021"
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
utils = { path = "../utils" }
|
|
||||||
|
|
||||||
anyhow = { workspace = true }
|
|
||||||
thiserror = { workspace = true }
|
|
||||||
log = { workspace = true }
|
|
||||||
env_logger = { workspace = true }
|
|
||||||
fully_pub = { workspace = true }
|
|
||||||
strum = { workspace = true }
|
|
||||||
strum_macros = { workspace = true }
|
|
||||||
serde = { workspace = true }
|
|
||||||
serde_json = { workspace = true }
|
|
||||||
chrono = { workspace = true }
|
|
||||||
toml = { workspace = true }
|
|
||||||
sqlx = { workspace = true }
|
|
||||||
dotenvy = { workspace = true }
|
|
||||||
sha2 = { workspace = true }
|
|
||||||
hex-literal = { workspace = true }
|
|
||||||
|
|
||||||
uuid = { workspace = true }
|
|
||||||
url = { workspace = true }
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
pub mod users;
|
|
||||||
|
|
@ -1,43 +0,0 @@
|
||||||
use crate::{context::KernelContext, models::user::User};
|
|
||||||
|
|
||||||
use anyhow::{Context, Result};
|
|
||||||
use chrono::SecondsFormat;
|
|
||||||
use thiserror::Error;
|
|
||||||
|
|
||||||
#[derive(Error, Debug)]
|
|
||||||
pub enum CreateUserErr {
|
|
||||||
#[error("Handle or email for user is already used.")]
|
|
||||||
HandleOrEmailNotUnique,
|
|
||||||
|
|
||||||
#[error("Database error.")]
|
|
||||||
DatabaseErr(String)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn create_user(ctx: KernelContext, user: User) -> Result<(), CreateUserErr> {
|
|
||||||
let res = sqlx::query("
|
|
||||||
INSERT INTO users
|
|
||||||
(id, handle, email, status, roles, password_hash, reset_password_token, created_at)
|
|
||||||
VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
|
|
||||||
")
|
|
||||||
.bind(user.id)
|
|
||||||
.bind(user.handle)
|
|
||||||
.bind(user.email)
|
|
||||||
.bind(user.status.to_string())
|
|
||||||
.bind(user.roles)
|
|
||||||
.bind(user.password_hash)
|
|
||||||
.bind(user.reset_password_token)
|
|
||||||
.bind(user.created_at.to_rfc3339_opts(SecondsFormat::Millis, true))
|
|
||||||
.execute(&ctx.storage.0)
|
|
||||||
.await;
|
|
||||||
match res {
|
|
||||||
Err(err) => {
|
|
||||||
let db_err = &err.as_database_error().unwrap();
|
|
||||||
if db_err.code().unwrap() == "2067" {
|
|
||||||
Err(CreateUserErr::HandleOrEmailNotUnique)
|
|
||||||
} else {
|
|
||||||
Err(CreateUserErr::DatabaseErr(db_err.to_string()))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Ok(_) => Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
pub const DEFAULT_DB_PATH: &str = "/var/lib/minauthator/minauthator.db";
|
|
||||||
pub const DEFAULT_ASSETS_PATH: &str = "/usr/local/lib/minauthator/assets";
|
|
||||||
pub const DEFAULT_CONFIG_PATH: &str = "/etc/minauthator/config.toml";
|
|
||||||
pub const DEFAULT_SIGNING_KEY_PATH: &str = "/etc/minauthator/secrets/jwt.key.pem";
|
|
||||||
|
|
||||||
|
|
@ -1,91 +0,0 @@
|
||||||
use std::{env, fs, path::Path};
|
|
||||||
use anyhow::{Result, Context, anyhow};
|
|
||||||
use fully_pub::fully_pub;
|
|
||||||
|
|
||||||
use log::info;
|
|
||||||
use crate::{
|
|
||||||
consts::{DEFAULT_CONFIG_PATH, DEFAULT_DB_PATH, DEFAULT_SIGNING_KEY_PATH},
|
|
||||||
database::prepare_database,
|
|
||||||
models::config::Config,
|
|
||||||
repositories::storage::Storage
|
|
||||||
};
|
|
||||||
|
|
||||||
/// get server config
|
|
||||||
fn get_config(path: String) -> Result<Config> {
|
|
||||||
let inp_def_yaml = fs::read_to_string(path)
|
|
||||||
.expect("Should have been able to read the the config file");
|
|
||||||
|
|
||||||
toml::from_str(&inp_def_yaml)
|
|
||||||
.map_err(|e| anyhow!("Failed to parse config, {:?}", e))
|
|
||||||
}
|
|
||||||
|
|
||||||
#[fully_pub]
|
|
||||||
struct StartKernelConfig {
|
|
||||||
config_path: Option<String>,
|
|
||||||
database_path: Option<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
|
||||||
#[fully_pub]
|
|
||||||
struct AppSecrets {
|
|
||||||
/// RSA keypair (public, private) used to signed the JWT issued by minauthator in PEM conainer format
|
|
||||||
signing_keypair: (Vec<u8>, Vec<u8>)
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
|
||||||
#[fully_pub]
|
|
||||||
struct ComputedConfig {
|
|
||||||
signing_public_key: Vec<u8>,
|
|
||||||
signing_private_key: Vec<u8>
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
|
||||||
#[fully_pub]
|
|
||||||
struct KernelContext {
|
|
||||||
config: Config,
|
|
||||||
secrets: AppSecrets,
|
|
||||||
storage: Storage
|
|
||||||
}
|
|
||||||
|
|
||||||
fn get_signing_keypair(key_path: &str) -> Result<(Vec<u8>, Vec<u8>)> {
|
|
||||||
let key_path = Path::new(key_path);
|
|
||||||
let pub_key_path = key_path.with_extension("pub");
|
|
||||||
let private_key: Vec<u8> = fs::read_to_string(&key_path)
|
|
||||||
.context(format!("Failed to read private key from path {:?}.", key_path))?
|
|
||||||
.as_bytes().to_vec();
|
|
||||||
let public_key: Vec<u8> = fs::read_to_string(&pub_key_path)
|
|
||||||
.context(format!("Failed to read public key from path {:?}.", pub_key_path))?
|
|
||||||
.as_bytes().to_vec();
|
|
||||||
|
|
||||||
Ok((public_key, private_key))
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn get_kernel_context(start_config: StartKernelConfig) -> Result<KernelContext> {
|
|
||||||
env_logger::init();
|
|
||||||
let _ = dotenvy::dotenv();
|
|
||||||
|
|
||||||
let database_path = &start_config.database_path.unwrap_or(DEFAULT_DB_PATH.to_string());
|
|
||||||
info!("Using database file at {}", database_path);
|
|
||||||
let storage = prepare_database(database_path).await.context("Could not prepare db.")?;
|
|
||||||
|
|
||||||
let config_path = start_config.config_path.unwrap_or(DEFAULT_CONFIG_PATH.to_string());
|
|
||||||
info!("Using config file at {}", &config_path);
|
|
||||||
let config: Config = get_config(config_path)
|
|
||||||
.expect("Cannot get config.");
|
|
||||||
|
|
||||||
let signing_key_path = config.signing_key.clone().unwrap_or(DEFAULT_SIGNING_KEY_PATH.to_string());
|
|
||||||
|
|
||||||
// optionally load dotenv file
|
|
||||||
let _ = dotenvy::dotenv();
|
|
||||||
|
|
||||||
let secrets = AppSecrets {
|
|
||||||
signing_keypair: get_signing_keypair(&signing_key_path)?
|
|
||||||
};
|
|
||||||
|
|
||||||
Ok(KernelContext {
|
|
||||||
config,
|
|
||||||
secrets,
|
|
||||||
storage
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
pub mod models;
|
|
||||||
pub mod database;
|
|
||||||
pub mod consts;
|
|
||||||
pub mod context;
|
|
||||||
pub mod actions;
|
|
||||||
pub mod repositories;
|
|
||||||
|
|
||||||
|
|
@ -1,61 +0,0 @@
|
||||||
use fully_pub::fully_pub;
|
|
||||||
use chrono::{DateTime, Utc};
|
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
use sqlx::types::Json;
|
|
||||||
use utils::get_random_human_token;
|
|
||||||
use uuid::Uuid;
|
|
||||||
|
|
||||||
#[derive(sqlx::Type, Clone, Debug, Serialize, Deserialize, PartialEq)]
|
|
||||||
#[derive(strum_macros::Display)]
|
|
||||||
#[fully_pub]
|
|
||||||
enum UserStatus {
|
|
||||||
Disabled,
|
|
||||||
Invited,
|
|
||||||
Active
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(sqlx::FromRow, Deserialize, Serialize, Debug, Clone)]
|
|
||||||
#[fully_pub]
|
|
||||||
struct User {
|
|
||||||
/// uuid
|
|
||||||
id: String,
|
|
||||||
handle: String,
|
|
||||||
full_name: Option<String>,
|
|
||||||
email: Option<String>,
|
|
||||||
website: Option<String>,
|
|
||||||
avatar_asset_id: Option<String>,
|
|
||||||
password_hash: Option<String>, // argon2 password hash
|
|
||||||
status: UserStatus,
|
|
||||||
roles: Json<Vec<String>>,
|
|
||||||
reset_password_token: Option<String>,
|
|
||||||
|
|
||||||
last_login_at: Option<DateTime<Utc>>,
|
|
||||||
created_at: DateTime<Utc>
|
|
||||||
}
|
|
||||||
|
|
||||||
impl User {
|
|
||||||
pub fn new(
|
|
||||||
handle: String
|
|
||||||
) -> User {
|
|
||||||
User {
|
|
||||||
id: Uuid::new_v4().to_string(),
|
|
||||||
handle,
|
|
||||||
full_name: None,
|
|
||||||
email: None,
|
|
||||||
website: None,
|
|
||||||
avatar_asset_id: None,
|
|
||||||
password_hash: None,
|
|
||||||
status: UserStatus::Disabled,
|
|
||||||
roles: Json(Vec::new()),
|
|
||||||
reset_password_token: None,
|
|
||||||
last_login_at: None,
|
|
||||||
created_at: Utc::now()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn invite(self: &mut Self) {
|
|
||||||
self.reset_password_token = Some(get_random_human_token());
|
|
||||||
self.status = UserStatus::Invited;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -1,41 +0,0 @@
|
||||||
use fully_pub::fully_pub;
|
|
||||||
use chrono::{DateTime, Utc};
|
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
use uuid::Uuid;
|
|
||||||
use sha2::{Sha256, Digest};
|
|
||||||
|
|
||||||
use super::user::User;
|
|
||||||
|
|
||||||
|
|
||||||
#[derive(sqlx::FromRow, Deserialize, Serialize, Debug)]
|
|
||||||
#[fully_pub]
|
|
||||||
struct UserAsset {
|
|
||||||
/// uuid
|
|
||||||
id: String,
|
|
||||||
user_id: String,
|
|
||||||
mime_type: String,
|
|
||||||
fingerprint: String,
|
|
||||||
name: Option<String>,
|
|
||||||
content: Vec<u8>,
|
|
||||||
created_at: DateTime<Utc>
|
|
||||||
}
|
|
||||||
|
|
||||||
impl UserAsset {
|
|
||||||
pub fn new(
|
|
||||||
user: &User,
|
|
||||||
content: Vec<u8>,
|
|
||||||
mime_type: String,
|
|
||||||
name: Option<String>
|
|
||||||
) -> UserAsset {
|
|
||||||
let digest = Sha256::digest(&content);
|
|
||||||
UserAsset {
|
|
||||||
id: Uuid::new_v4().to_string(),
|
|
||||||
user_id: user.id.clone(),
|
|
||||||
fingerprint: format!("{:x}", digest),
|
|
||||||
mime_type,
|
|
||||||
content,
|
|
||||||
name,
|
|
||||||
created_at: Utc::now()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
pub mod storage;
|
|
||||||
pub mod users;
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
use fully_pub::fully_pub;
|
|
||||||
use sqlx::{Pool, Sqlite};
|
|
||||||
|
|
||||||
/// storage interface
|
|
||||||
#[fully_pub]
|
|
||||||
#[derive(Clone, Debug)]
|
|
||||||
struct Storage(Pool<Sqlite>);
|
|
||||||
|
|
@ -1,48 +0,0 @@
|
||||||
// user repositories
|
|
||||||
|
|
||||||
use crate::models::{user::User, user_asset::UserAsset};
|
|
||||||
|
|
||||||
use super::storage::Storage;
|
|
||||||
use anyhow::{Result, Context};
|
|
||||||
|
|
||||||
pub async fn get_user_by_id(storage: &Storage, user_id: &str) -> Result<User> {
|
|
||||||
sqlx::query_as::<_, User>("SELECT * FROM users WHERE id = $1")
|
|
||||||
.bind(user_id)
|
|
||||||
.fetch_one(&storage.0)
|
|
||||||
.await
|
|
||||||
.context("To get user by id.")
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn get_users(storage: &Storage) -> Result<Vec<User>> {
|
|
||||||
sqlx::query_as::<_, User>("SELECT * FROM users")
|
|
||||||
.fetch_all(&storage.0)
|
|
||||||
.await
|
|
||||||
.context("To get users.")
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn create_user_asset(storage: &Storage, asset: UserAsset) -> Result<()> {
|
|
||||||
sqlx::query("INSERT INTO user_assets
|
|
||||||
(id, user_id, mime_type, fingerprint, content, created_at)
|
|
||||||
VALUES ($1, $2, $3, $4, $5, $6)
|
|
||||||
")
|
|
||||||
.bind(&asset.id)
|
|
||||||
.bind(&asset.user_id)
|
|
||||||
.bind(&asset.mime_type)
|
|
||||||
.bind(&asset.fingerprint)
|
|
||||||
.bind(&asset.content)
|
|
||||||
.bind(&asset.created_at)
|
|
||||||
.execute(&storage.0)
|
|
||||||
.await
|
|
||||||
.context("While inserting user asset.")?;
|
|
||||||
// .bind(details_update.avatar.contents.to_vec())
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn get_user_asset_by_id(storage: &Storage, id: &str) -> Result<UserAsset> {
|
|
||||||
sqlx::query_as("SELECT * FROM user_assets WHERE id = $1")
|
|
||||||
.bind(id)
|
|
||||||
.fetch_one(&storage.0)
|
|
||||||
.await
|
|
||||||
.context("To get user asset by id.")
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
[package]
|
|
||||||
name = "utils"
|
|
||||||
edition = "2021"
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
anyhow = { workspace = true }
|
|
||||||
argon2 = "0.5"
|
|
||||||
base64 = "0.22"
|
|
||||||
rand = "0.8.5"
|
|
||||||
rand_core = { version = "0.6.4", features = ["std"] }
|
|
||||||
|
|
@ -1,29 +1,18 @@
|
||||||
DROP TABLE IF EXISTS users;
|
DROP TABLE IF EXISTS users;
|
||||||
CREATE TABLE users (
|
CREATE TABLE users (
|
||||||
id TEXT PRIMARY KEY,
|
id TEXT PRIMARY KEY,
|
||||||
handle TEXT NOT NULL UNIQUE,
|
handle TEXT NOT NULL UNIQUE,
|
||||||
full_name TEXT,
|
full_name TEXT,
|
||||||
email TEXT UNIQUE,
|
email TEXT UNIQUE,
|
||||||
website TEXT,
|
website TEXT,
|
||||||
roles TEXT NOT NULL, -- json array of user roles
|
picture BLOB,
|
||||||
avatar_asset_id TEXT,
|
roles TEXT NOT NULL, -- json array of user roles
|
||||||
|
|
||||||
status TEXT CHECK(status IN ('Invited', 'Active', 'Disabled')) NOT NULL DEFAULT 'Disabled',
|
status TEXT CHECK(status IN ('Active','Disabled')) NOT NULL DEFAULT 'Disabled',
|
||||||
password_hash TEXT,
|
password_hash TEXT,
|
||||||
reset_password_token TEXT,
|
activation_token TEXT,
|
||||||
last_login_at DATETIME,
|
last_login_at DATETIME,
|
||||||
created_at DATETIME NOT NULL
|
created_at DATETIME NOT NULL
|
||||||
);
|
|
||||||
|
|
||||||
DROP TABLE IF EXISTS user_assets;
|
|
||||||
CREATE TABLE user_assets (
|
|
||||||
id TEXT PRIMARY KEY,
|
|
||||||
user_id TEXT NOT NULL,
|
|
||||||
mime_type TEXT NOT NULL,
|
|
||||||
fingerprint TEXT NOT NULL,
|
|
||||||
name TEXT, -- file name
|
|
||||||
content BLOB NOT NULL,
|
|
||||||
created_at DATETIME NOT NULL
|
|
||||||
);
|
);
|
||||||
|
|
||||||
DROP TABLE IF EXISTS authorizations;
|
DROP TABLE IF EXISTS authorizations;
|
||||||
|
|
@ -33,7 +22,6 @@ CREATE TABLE authorizations (
|
||||||
client_id TEXT NOT NULL,
|
client_id TEXT NOT NULL,
|
||||||
scopes TEXT, -- json array of app scope (permissions)
|
scopes TEXT, -- json array of app scope (permissions)
|
||||||
code TEXT,
|
code TEXT,
|
||||||
nonce TEXT, -- code used to associate client session to id_token
|
|
||||||
|
|
||||||
last_used_at DATETIME,
|
last_used_at DATETIME,
|
||||||
created_at DATETIME NOT NULL
|
created_at DATETIME NOT NULL
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
use argh::FromArgs;
|
use argh::FromArgs;
|
||||||
use anyhow::{Context, Result};
|
use anyhow::{Context, Result};
|
||||||
use http_server::{start_http_server, ServerConfig};
|
|
||||||
use kernel::{consts::DEFAULT_ASSETS_PATH, context::{get_kernel_context, StartKernelConfig}};
|
|
||||||
use log::info;
|
use log::info;
|
||||||
|
|
||||||
|
use crate::{get_app_context, server::{start_http_server, ServerConfig}, DEFAULT_ASSETS_PATH};
|
||||||
|
|
||||||
#[derive(Debug, FromArgs)]
|
#[derive(Debug, FromArgs)]
|
||||||
/// Minauthator daemon
|
/// Minauthator daemon
|
||||||
struct ServerCliFlags {
|
struct ServerCliFlags {
|
||||||
|
|
@ -27,21 +27,22 @@ struct ServerCliFlags {
|
||||||
listen_port: u32
|
listen_port: u32
|
||||||
}
|
}
|
||||||
|
|
||||||
/// handle CLI arguments to start HTTP server daemon
|
/// handle CLI arguments to start process daemon
|
||||||
#[tokio::main]
|
pub async fn start_server_cli() -> Result<()> {
|
||||||
pub async fn main() -> Result<()> {
|
|
||||||
info!("Starting minauth");
|
info!("Starting minauth");
|
||||||
let flags: ServerCliFlags = argh::from_env();
|
let flags: ServerCliFlags = argh::from_env();
|
||||||
let kernel_context = get_kernel_context(StartKernelConfig {
|
let (config, secrets, db_pool) = get_app_context(crate::StartAppConfig {
|
||||||
config_path: flags.config,
|
config_path: flags.config,
|
||||||
database_path: flags.database
|
database_path: flags.database
|
||||||
}).await.context("Getting kernel context")?;
|
}).await.context("Getting app context")?;
|
||||||
start_http_server(
|
start_http_server(
|
||||||
ServerConfig {
|
ServerConfig {
|
||||||
assets_path: flags.static_assets.unwrap_or(DEFAULT_ASSETS_PATH.to_string()),
|
assets_path: flags.static_assets.unwrap_or(DEFAULT_ASSETS_PATH.to_string()),
|
||||||
listen_host: flags.listen_host,
|
listen_host: flags.listen_host,
|
||||||
listen_port: flags.listen_port
|
listen_port: flags.listen_port
|
||||||
},
|
},
|
||||||
kernel_context
|
config,
|
||||||
|
secrets,
|
||||||
|
db_pool
|
||||||
).await
|
).await
|
||||||
}
|
}
|
||||||
1
src/consts.rs
Normal file
1
src/consts.rs
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
pub const WEB_GUI_JWT_COOKIE_NAME: &str = "minauthator_jwt";
|
||||||
|
|
@ -1,5 +1,3 @@
|
||||||
pub mod index;
|
|
||||||
pub mod oauth2;
|
pub mod oauth2;
|
||||||
pub mod read_user;
|
pub mod read_user;
|
||||||
pub mod openid;
|
pub mod openid;
|
||||||
pub mod public_assets;
|
|
||||||
|
|
@ -4,9 +4,10 @@ use fully_pub::fully_pub;
|
||||||
use log::error;
|
use log::error;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
use kernel::{models::authorization::Authorization, repositories::users::get_user_by_id};
|
|
||||||
use crate::{
|
use crate::{
|
||||||
services::{app_session::AppClientSession, session::create_token}, token_claims::{OAuth2AccessTokenClaims, OIDCIdTokenClaims}, AppState
|
models::{authorization::Authorization, token_claims::AppUserTokenClaims},
|
||||||
|
server::AppState,
|
||||||
|
services::{app_session::AppClientSession, session::create_token}
|
||||||
};
|
};
|
||||||
|
|
||||||
const AUTHORIZATION_CODE_TTL_SECONDS: i64 = 120;
|
const AUTHORIZATION_CODE_TTL_SECONDS: i64 = 120;
|
||||||
|
|
@ -22,7 +23,6 @@ struct AccessTokenRequestParams {
|
||||||
#[derive(Serialize, Deserialize)]
|
#[derive(Serialize, Deserialize)]
|
||||||
#[fully_pub]
|
#[fully_pub]
|
||||||
struct AccessTokenResponse {
|
struct AccessTokenResponse {
|
||||||
id_token: String,
|
|
||||||
access_token: String,
|
access_token: String,
|
||||||
token_type: String,
|
token_type: String,
|
||||||
expires_in: u64
|
expires_in: u64
|
||||||
|
|
@ -43,7 +43,7 @@ pub async fn get_access_token(
|
||||||
)
|
)
|
||||||
.bind(&form.code)
|
.bind(&form.code)
|
||||||
.bind(&app_client_session.client_id)
|
.bind(&app_client_session.client_id)
|
||||||
.fetch_one(&app_state.db.0)
|
.fetch_one(&app_state.db)
|
||||||
.await;
|
.await;
|
||||||
let authorization = match authorizations_res {
|
let authorization = match authorizations_res {
|
||||||
Ok(val) => val,
|
Ok(val) => val,
|
||||||
|
|
@ -61,7 +61,6 @@ pub async fn get_access_token(
|
||||||
).into_response();
|
).into_response();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// 2.2. Validate that the authorization code is not expired
|
// 2.2. Validate that the authorization code is not expired
|
||||||
let is_code_valid = authorization.last_used_at
|
let is_code_valid = authorization.last_used_at
|
||||||
.map_or(false, |ts| {
|
.map_or(false, |ts| {
|
||||||
|
|
@ -74,38 +73,19 @@ pub async fn get_access_token(
|
||||||
).into_response();
|
).into_response();
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2.3. Fetch user resource owner
|
// 3. Generate JWT for oauth2 client user session
|
||||||
let user = get_user_by_id(&app_state.db, &authorization.user_id)
|
let jwt = create_token(
|
||||||
.await
|
|
||||||
.expect("Expected to get user from authorization.");
|
|
||||||
|
|
||||||
// 3.1. Generate JWT for OAuth2 client user session
|
|
||||||
let access_token_jwt = create_token(
|
|
||||||
&app_state.config,
|
|
||||||
&app_state.secrets,
|
&app_state.secrets,
|
||||||
OAuth2AccessTokenClaims::new(
|
AppUserTokenClaims::new(
|
||||||
&app_state.config,
|
&app_client_session.client_id,
|
||||||
&user,
|
&authorization.user_id,
|
||||||
authorization.scopes.to_vec()
|
authorization.scopes.to_vec()
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
// 3.2. Generate id_token for OIDC client
|
|
||||||
let id_token_claims = OIDCIdTokenClaims::new(
|
|
||||||
&app_state.config,
|
|
||||||
&app_client_session.client_id,
|
|
||||||
user.clone(),
|
|
||||||
authorization.nonce.clone()
|
|
||||||
);
|
|
||||||
let id_token_jwt = create_token(
|
|
||||||
&app_state.config,
|
|
||||||
&app_state.secrets,
|
|
||||||
id_token_claims
|
|
||||||
);
|
|
||||||
// 4. return JWT
|
// 4. return JWT
|
||||||
let access_token_res = AccessTokenResponse {
|
let access_token_res = AccessTokenResponse {
|
||||||
id_token: id_token_jwt,
|
access_token: jwt,
|
||||||
access_token: access_token_jwt,
|
token_type: "jwt".to_string(),
|
||||||
token_type: "Bearer".to_string(),
|
|
||||||
expires_in: 3600
|
expires_in: 3600
|
||||||
};
|
};
|
||||||
Json(access_token_res).into_response()
|
Json(access_token_res).into_response()
|
||||||
|
|
@ -1,2 +1 @@
|
||||||
pub mod well_known;
|
pub mod well_known;
|
||||||
pub mod keys;
|
|
||||||
|
|
@ -1,13 +1,10 @@
|
||||||
use axum::{extract::State, response::IntoResponse, Json};
|
use axum::{extract::State, response::IntoResponse, Json};
|
||||||
use fully_pub::fully_pub;
|
use fully_pub::fully_pub;
|
||||||
use kernel::models::authorization::AuthorizationScope;
|
|
||||||
use serde::Serialize;
|
use serde::Serialize;
|
||||||
use strum::IntoEnumIterator;
|
use strum::IntoEnumIterator;
|
||||||
|
|
||||||
use crate::AppState;
|
use crate::{models::authorization::AuthorizationScope, server::AppState};
|
||||||
|
|
||||||
/// Manifest used by OpenID Connect clients
|
|
||||||
/// @See https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderMetadata
|
|
||||||
#[derive(Serialize)]
|
#[derive(Serialize)]
|
||||||
#[fully_pub]
|
#[fully_pub]
|
||||||
struct WellKnownOpenIdConfiguration {
|
struct WellKnownOpenIdConfiguration {
|
||||||
|
|
@ -17,9 +14,7 @@ struct WellKnownOpenIdConfiguration {
|
||||||
userinfo_endpoint: String,
|
userinfo_endpoint: String,
|
||||||
scopes_supported: Vec<String>,
|
scopes_supported: Vec<String>,
|
||||||
response_types_supported: Vec<String>,
|
response_types_supported: Vec<String>,
|
||||||
token_endpoint_auth_methods_supported: Vec<String>,
|
token_endpoint_auth_methods_supported: Vec<String>
|
||||||
id_token_signing_alg_values_supported: Vec<String>,
|
|
||||||
jwks_uri: String
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn get_well_known_openid_configuration(
|
pub async fn get_well_known_openid_configuration(
|
||||||
|
|
@ -34,9 +29,5 @@ pub async fn get_well_known_openid_configuration(
|
||||||
scopes_supported: AuthorizationScope::iter().map(|v| v.to_string()).collect(),
|
scopes_supported: AuthorizationScope::iter().map(|v| v.to_string()).collect(),
|
||||||
response_types_supported: vec!["code".into()],
|
response_types_supported: vec!["code".into()],
|
||||||
token_endpoint_auth_methods_supported: vec!["client_secret_basic".into()],
|
token_endpoint_auth_methods_supported: vec!["client_secret_basic".into()],
|
||||||
id_token_signing_alg_values_supported: vec!["RS256".into()],
|
|
||||||
jwks_uri: format!("{}/.well-known/jwks", base_url)
|
|
||||||
// jwks_uri:
|
|
||||||
// subject_types_supported
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
@ -2,8 +2,7 @@ use axum::{extract::State, response::IntoResponse, Extension, Json};
|
||||||
use fully_pub::fully_pub;
|
use fully_pub::fully_pub;
|
||||||
use serde::Serialize;
|
use serde::Serialize;
|
||||||
|
|
||||||
use crate::{token_claims::OAuth2AccessTokenClaims, AppState};
|
use crate::{models::{token_claims::AppUserTokenClaims, user::User}, server::AppState};
|
||||||
use kernel::models::user::User;
|
|
||||||
|
|
||||||
#[derive(Serialize)]
|
#[derive(Serialize)]
|
||||||
#[fully_pub]
|
#[fully_pub]
|
||||||
|
|
@ -18,12 +17,12 @@ struct ReadUserBasicExtract {
|
||||||
|
|
||||||
pub async fn read_user_basic(
|
pub async fn read_user_basic(
|
||||||
State(app_state): State<AppState>,
|
State(app_state): State<AppState>,
|
||||||
Extension(token_claims): Extension<OAuth2AccessTokenClaims>,
|
Extension(token_claims): Extension<AppUserTokenClaims>,
|
||||||
) -> impl IntoResponse {
|
) -> impl IntoResponse {
|
||||||
// 1. This handler require app user authentification (JWT)
|
// 1. This handler require client user authentification (JWT)
|
||||||
let user_res = sqlx::query_as::<_, User>("SELECT * FROM users WHERE id = $1")
|
let user_res = sqlx::query_as::<_, User>("SELECT * FROM users WHERE id = $1")
|
||||||
.bind(&token_claims.sub)
|
.bind(&token_claims.user_id)
|
||||||
.fetch_one(&app_state.db.0)
|
.fetch_one(&app_state.db)
|
||||||
.await
|
.await
|
||||||
.expect("To get user from claim");
|
.expect("To get user from claim");
|
||||||
let output = ReadUserBasicExtract {
|
let output = ReadUserBasicExtract {
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
use axum::{extract::State, response::IntoResponse, Extension};
|
use axum::{extract::State, response::IntoResponse, Extension};
|
||||||
use minijinja::context;
|
use minijinja::context;
|
||||||
|
|
||||||
use kernel::models::{config::AppVisibility, config::Application};
|
|
||||||
use crate::{
|
use crate::{
|
||||||
|
models::{config::AppVisibility, config::Application},
|
||||||
renderer::TemplateRenderer,
|
renderer::TemplateRenderer,
|
||||||
AppState
|
server::AppState
|
||||||
};
|
};
|
||||||
|
|
||||||
pub async fn list_apps(
|
pub async fn list_apps(
|
||||||
|
|
@ -7,13 +7,14 @@ use serde::{Deserialize, Serialize};
|
||||||
use url::Url;
|
use url::Url;
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
|
|
||||||
use kernel::models::{authorization::Authorization, config::AppAuthorizeFlow};
|
|
||||||
use utils::get_random_alphanumerical;
|
|
||||||
use crate::{
|
use crate::{
|
||||||
renderer::TemplateRenderer, services::oauth2::{parse_scope, verify_redirect_uri}, token_claims::UserTokenClaims, AppState
|
models::{authorization::Authorization, config::AppAuthorizeFlow, token_claims::UserTokenClaims},
|
||||||
|
renderer::TemplateRenderer, server::AppState,
|
||||||
|
services::oauth2::{parse_scope, verify_redirect_uri},
|
||||||
|
utils::get_random_alphanumerical
|
||||||
};
|
};
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize)]
|
#[derive(Serialize, Deserialize)]
|
||||||
#[fully_pub]
|
#[fully_pub]
|
||||||
/// query params described in [RFC6749 section 4.1.1](https://datatracker.ietf.org/doc/html/rfc6749#section-4.1.1)
|
/// query params described in [RFC6749 section 4.1.1](https://datatracker.ietf.org/doc/html/rfc6749#section-4.1.1)
|
||||||
struct AuthorizationParams {
|
struct AuthorizationParams {
|
||||||
|
|
@ -23,7 +24,6 @@ struct AuthorizationParams {
|
||||||
redirect_uri: String,
|
redirect_uri: String,
|
||||||
/// An opaque value used by the client to maintain state between the request and callback
|
/// An opaque value used by the client to maintain state between the request and callback
|
||||||
state: String,
|
state: String,
|
||||||
nonce: Option<String>
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn redirect_to_client(
|
fn redirect_to_client(
|
||||||
|
|
@ -33,7 +33,7 @@ fn redirect_to_client(
|
||||||
let target_url = format!("{}?code={}&state={}",
|
let target_url = format!("{}?code={}&state={}",
|
||||||
authorization_params.redirect_uri,
|
authorization_params.redirect_uri,
|
||||||
authorization_code,
|
authorization_code,
|
||||||
authorization_params.state
|
authorization_params.state,
|
||||||
);
|
);
|
||||||
debug!("Redirecting to {}", target_url);
|
debug!("Redirecting to {}", target_url);
|
||||||
|
|
||||||
|
|
@ -105,7 +105,7 @@ pub async fn authorize_form(
|
||||||
.bind(&token_claims.sub)
|
.bind(&token_claims.sub)
|
||||||
.bind(&authorization_params.client_id)
|
.bind(&authorization_params.client_id)
|
||||||
.bind(sqlx::types::Json(&scopes))
|
.bind(sqlx::types::Json(&scopes))
|
||||||
.fetch_one(&app_state.db.0)
|
.fetch_one(&app_state.db)
|
||||||
.await;
|
.await;
|
||||||
|
|
||||||
match authorizations_res {
|
match authorizations_res {
|
||||||
|
|
@ -115,12 +115,11 @@ pub async fn authorize_form(
|
||||||
// Create new auth code
|
// Create new auth code
|
||||||
let authorization_code = get_random_alphanumerical(32);
|
let authorization_code = get_random_alphanumerical(32);
|
||||||
// Update last used timestamp for this authorization
|
// Update last used timestamp for this authorization
|
||||||
let _result = sqlx::query("UPDATE authorizations SET code = $2, nonce = $3, last_used_at = $4 WHERE id = $1")
|
let _result = sqlx::query("UPDATE authorizations SET code = $2, last_used_at = $3 WHERE id = $1")
|
||||||
.bind(existing_authorization.id)
|
.bind(existing_authorization.id)
|
||||||
.bind(authorization_code.clone())
|
.bind(authorization_code.clone())
|
||||||
.bind(authorization_params.nonce.clone())
|
|
||||||
.bind(Utc::now().to_rfc3339_opts(SecondsFormat::Millis, true))
|
.bind(Utc::now().to_rfc3339_opts(SecondsFormat::Millis, true))
|
||||||
.execute(&app_state.db.0)
|
.execute(&app_state.db)
|
||||||
.await.unwrap();
|
.await.unwrap();
|
||||||
|
|
||||||
// Authorization already given, just redirect to the app
|
// Authorization already given, just redirect to the app
|
||||||
|
|
@ -203,7 +202,6 @@ pub async fn perform_authorize(
|
||||||
client_id: app.client_id.clone(),
|
client_id: app.client_id.clone(),
|
||||||
scopes: sqlx::types::Json(scopes),
|
scopes: sqlx::types::Json(scopes),
|
||||||
code: authorization_code.clone(),
|
code: authorization_code.clone(),
|
||||||
nonce: authorize_form.nonce.clone(),
|
|
||||||
last_used_at: Some(Utc::now()),
|
last_used_at: Some(Utc::now()),
|
||||||
created_at: Utc::now(),
|
created_at: Utc::now(),
|
||||||
};
|
};
|
||||||
|
|
@ -211,18 +209,17 @@ pub async fn perform_authorize(
|
||||||
// 3. Save authorization in DB with state
|
// 3. Save authorization in DB with state
|
||||||
let res = sqlx::query("
|
let res = sqlx::query("
|
||||||
INSERT INTO authorizations
|
INSERT INTO authorizations
|
||||||
(id, user_id, client_id, scopes, code, nonce, last_used_at, created_at)
|
(id, user_id, client_id, scopes, code, last_used_at, created_at)
|
||||||
VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
|
VALUES ($1, $2, $3, $4, $5, $6, $7)
|
||||||
")
|
")
|
||||||
.bind(authorization.id.clone())
|
.bind(authorization.id.clone())
|
||||||
.bind(authorization.user_id)
|
.bind(authorization.user_id)
|
||||||
.bind(authorization.client_id)
|
.bind(authorization.client_id)
|
||||||
.bind(authorization.scopes)
|
.bind(authorization.scopes)
|
||||||
.bind(authorization.code)
|
.bind(authorization.code)
|
||||||
.bind(authorization.nonce)
|
|
||||||
.bind(authorization.last_used_at.map(|x| x.to_rfc3339_opts(SecondsFormat::Millis, true)))
|
.bind(authorization.last_used_at.map(|x| x.to_rfc3339_opts(SecondsFormat::Millis, true)))
|
||||||
.bind(authorization.created_at.to_rfc3339_opts(SecondsFormat::Millis, true))
|
.bind(authorization.created_at.to_rfc3339_opts(SecondsFormat::Millis, true))
|
||||||
.execute(&app_state.db.0)
|
.execute(&app_state.db)
|
||||||
.await;
|
.await;
|
||||||
if let Err(err) = res {
|
if let Err(err) = res {
|
||||||
error!("Failed to save authorization in DB. {}", err);
|
error!("Failed to save authorization in DB. {}", err);
|
||||||
|
|
@ -1,15 +1,15 @@
|
||||||
use axum_extra::extract::{cookie::{Cookie, SameSite}, CookieJar};
|
use axum_extra::extract::{cookie::{Cookie, SameSite}, CookieJar};
|
||||||
use chrono::{SecondsFormat, Utc};
|
use chrono::{SecondsFormat, Utc};
|
||||||
use kernel::models::user::{User, UserStatus};
|
|
||||||
use log::info;
|
use log::info;
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
use axum::{extract::{Query, State}, http::StatusCode, response::{IntoResponse, Redirect}, Extension, Form};
|
use axum::{extract::{Query, State}, http::{HeaderMap, HeaderValue, StatusCode}, response::{Html, IntoResponse, Redirect}, Extension, Form};
|
||||||
use fully_pub::fully_pub;
|
use fully_pub::fully_pub;
|
||||||
use minijinja::context;
|
use minijinja::context;
|
||||||
use time::Duration;
|
use time::Duration;
|
||||||
use utils::verify_password_hash;
|
|
||||||
|
|
||||||
use crate::{renderer::TemplateRenderer, services::session::create_token, token_claims::UserTokenClaims, AppState, WEB_GUI_JWT_COOKIE_NAME};
|
use crate::{
|
||||||
|
consts::WEB_GUI_JWT_COOKIE_NAME, models::{token_claims::UserTokenClaims, user::{User, UserStatus}}, renderer::TemplateRenderer, server::AppState, services::{password::verify_password_hash, session::create_token}
|
||||||
|
};
|
||||||
|
|
||||||
pub async fn login_form(
|
pub async fn login_form(
|
||||||
Extension(renderer): Extension<TemplateRenderer>
|
Extension(renderer): Extension<TemplateRenderer>
|
||||||
|
|
@ -47,7 +47,7 @@ pub async fn perform_login(
|
||||||
let user_res = sqlx::query_as::<_, User>("SELECT * FROM users WHERE handle = $1 OR email = $2")
|
let user_res = sqlx::query_as::<_, User>("SELECT * FROM users WHERE handle = $1 OR email = $2")
|
||||||
.bind(&login.login)
|
.bind(&login.login)
|
||||||
.bind(&login.login)
|
.bind(&login.login)
|
||||||
.fetch_one(&app_state.db.0)
|
.fetch_one(&app_state.db)
|
||||||
.await;
|
.await;
|
||||||
|
|
||||||
let password_hash = match &user_res {
|
let password_hash = match &user_res {
|
||||||
|
|
@ -87,12 +87,12 @@ pub async fn perform_login(
|
||||||
let _result = sqlx::query("UPDATE users SET last_login_at = $2 WHERE id = $1")
|
let _result = sqlx::query("UPDATE users SET last_login_at = $2 WHERE id = $1")
|
||||||
.bind(user.id.clone())
|
.bind(user.id.clone())
|
||||||
.bind(Utc::now().to_rfc3339_opts(SecondsFormat::Millis, true))
|
.bind(Utc::now().to_rfc3339_opts(SecondsFormat::Millis, true))
|
||||||
.execute(&app_state.db.0)
|
.execute(&app_state.db)
|
||||||
.await.unwrap();
|
.await.unwrap();
|
||||||
|
|
||||||
let jwt_max_age = Duration::days(15);
|
let jwt_max_age = Duration::days(15);
|
||||||
let claims = UserTokenClaims::new(&app_state.config, &user.id, jwt_max_age);
|
let claims = UserTokenClaims::new(&user.id, jwt_max_age);
|
||||||
let jwt = create_token(&app_state.config, &app_state.secrets, claims);
|
let jwt = create_token(&app_state.secrets, claims);
|
||||||
|
|
||||||
// TODO: handle keep_session boolean from form and specify cookie max age only if this setting
|
// TODO: handle keep_session boolean from form and specify cookie max age only if this setting
|
||||||
// is true
|
// is true
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
use axum::response::{IntoResponse, Redirect};
|
use axum::response::{IntoResponse, Redirect};
|
||||||
use axum_extra::extract::CookieJar;
|
use axum_extra::extract::CookieJar;
|
||||||
|
|
||||||
use crate::WEB_GUI_JWT_COOKIE_NAME;
|
use crate::consts::WEB_GUI_JWT_COOKIE_NAME;
|
||||||
|
|
||||||
pub async fn perform_logout(
|
pub async fn perform_logout(
|
||||||
cookies: CookieJar
|
cookies: CookieJar
|
||||||
|
|
@ -1,16 +1,14 @@
|
||||||
use anyhow::Context;
|
|
||||||
use axum::{body::Bytes, extract::State, response::IntoResponse, Extension};
|
use axum::{body::Bytes, extract::State, response::IntoResponse, Extension};
|
||||||
use axum_typed_multipart::{FieldData, TryFromMultipart, TypedMultipart};
|
use axum_typed_multipart::{FieldData, TryFromMultipart, TypedMultipart};
|
||||||
use fully_pub::fully_pub;
|
use fully_pub::fully_pub;
|
||||||
use log::{error, info};
|
use log::error;
|
||||||
use minijinja::context;
|
use minijinja::context;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
token_claims::UserTokenClaims,
|
models::{token_claims::UserTokenClaims, user::User},
|
||||||
renderer::TemplateRenderer,
|
renderer::TemplateRenderer,
|
||||||
AppState
|
server::AppState
|
||||||
};
|
};
|
||||||
use kernel::{models::{user::User, user_asset::UserAsset}, repositories::users::create_user_asset};
|
|
||||||
|
|
||||||
pub async fn me_page(
|
pub async fn me_page(
|
||||||
State(app_state): State<AppState>,
|
State(app_state): State<AppState>,
|
||||||
|
|
@ -19,7 +17,7 @@ pub async fn me_page(
|
||||||
) -> impl IntoResponse {
|
) -> impl IntoResponse {
|
||||||
let user_res = sqlx::query_as::<_, User>("SELECT * FROM users WHERE id = $1")
|
let user_res = sqlx::query_as::<_, User>("SELECT * FROM users WHERE id = $1")
|
||||||
.bind(&token_claims.sub)
|
.bind(&token_claims.sub)
|
||||||
.fetch_one(&app_state.db.0)
|
.fetch_one(&app_state.db)
|
||||||
.await
|
.await
|
||||||
.expect("To get user from claim");
|
.expect("To get user from claim");
|
||||||
|
|
||||||
|
|
@ -40,7 +38,7 @@ pub async fn me_update_details_form(
|
||||||
|
|
||||||
let user_res = sqlx::query_as::<_, User>("SELECT * FROM users WHERE id = $1")
|
let user_res = sqlx::query_as::<_, User>("SELECT * FROM users WHERE id = $1")
|
||||||
.bind(&token_claims.sub)
|
.bind(&token_claims.sub)
|
||||||
.fetch_one(&app_state.db.0)
|
.fetch_one(&app_state.db)
|
||||||
.await
|
.await
|
||||||
.expect("To get user from claim");
|
.expect("To get user from claim");
|
||||||
|
|
||||||
|
|
@ -62,7 +60,7 @@ struct UserDetailsUpdateForm {
|
||||||
website: String,
|
website: String,
|
||||||
|
|
||||||
#[form_data(limit = "5MiB")]
|
#[form_data(limit = "5MiB")]
|
||||||
avatar: FieldData<Bytes>
|
picture: FieldData<Bytes>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -74,43 +72,19 @@ pub async fn me_perform_update_details(
|
||||||
) -> impl IntoResponse {
|
) -> impl IntoResponse {
|
||||||
let template_path = "pages/me/details-form";
|
let template_path = "pages/me/details-form";
|
||||||
|
|
||||||
let user = sqlx::query_as::<_, User>("SELECT * FROM users WHERE id = $1")
|
let update_res = sqlx::query("UPDATE users SET handle = $2, email = $3, full_name = $4, website = $5, picture = $6 WHERE id = $1")
|
||||||
.bind(&token_claims.sub)
|
|
||||||
.fetch_one(&app_state.db.0)
|
|
||||||
.await
|
|
||||||
.expect("To get user from claim");
|
|
||||||
|
|
||||||
let update_res = sqlx::query("UPDATE users SET handle = $2, email = $3, full_name = $4, website = $5 WHERE id = $1")
|
|
||||||
.bind(&token_claims.sub)
|
.bind(&token_claims.sub)
|
||||||
.bind(details_update.handle)
|
.bind(details_update.handle)
|
||||||
.bind(details_update.email)
|
.bind(details_update.email)
|
||||||
.bind(details_update.full_name)
|
.bind(details_update.full_name)
|
||||||
.bind(details_update.website)
|
.bind(details_update.website)
|
||||||
.execute(&app_state.db.0)
|
.bind(details_update.picture.contents.to_vec())
|
||||||
|
.execute(&app_state.db)
|
||||||
.await;
|
.await;
|
||||||
|
|
||||||
if !details_update.avatar.contents.is_empty() {
|
let user_res = sqlx::query_as::<_, User>("SELECT * FROM users WHERE id = $1")
|
||||||
let user_asset = UserAsset::new(
|
|
||||||
&user,
|
|
||||||
details_update.avatar.contents.to_vec(),
|
|
||||||
details_update.avatar.metadata.content_type.expect("Expected mimetype on avatar content"),
|
|
||||||
details_update.avatar.metadata.name
|
|
||||||
);
|
|
||||||
let _update_res = sqlx::query("UPDATE users SET avatar_asset_id = $2 WHERE id = $1")
|
|
||||||
.bind(&token_claims.sub)
|
|
||||||
.bind(user_asset.id.clone())
|
|
||||||
.execute(&app_state.db.0)
|
|
||||||
.await;
|
|
||||||
// TODO: handle possible error
|
|
||||||
let _ = create_user_asset(&app_state.db, user_asset)
|
|
||||||
.await
|
|
||||||
.context("Creating user avatar asset.");
|
|
||||||
info!("Uploaded new avatar as user asset");
|
|
||||||
}
|
|
||||||
|
|
||||||
let user = sqlx::query_as::<_, User>("SELECT * FROM users WHERE id = $1")
|
|
||||||
.bind(&token_claims.sub)
|
.bind(&token_claims.sub)
|
||||||
.fetch_one(&app_state.db.0)
|
.fetch_one(&app_state.db)
|
||||||
.await
|
.await
|
||||||
.expect("To get user from claim");
|
.expect("To get user from claim");
|
||||||
|
|
||||||
|
|
@ -120,7 +94,7 @@ pub async fn me_perform_update_details(
|
||||||
template_path,
|
template_path,
|
||||||
context!(
|
context!(
|
||||||
success => true,
|
success => true,
|
||||||
user => user
|
user => user_res
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
|
|
@ -130,7 +104,7 @@ pub async fn me_perform_update_details(
|
||||||
template_path,
|
template_path,
|
||||||
context!(
|
context!(
|
||||||
error => Some("Cannot update user details.".to_string()),
|
error => Some("Cannot update user details.".to_string()),
|
||||||
user => user
|
user => user_res
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
@ -6,4 +6,3 @@ pub mod me;
|
||||||
pub mod logout;
|
pub mod logout;
|
||||||
pub mod user_panel;
|
pub mod user_panel;
|
||||||
pub mod apps;
|
pub mod apps;
|
||||||
pub mod reset_password;
|
|
||||||
|
|
@ -7,10 +7,7 @@ use fully_pub::fully_pub;
|
||||||
use sqlx::types::Json;
|
use sqlx::types::Json;
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
|
|
||||||
use crate::{renderer::TemplateRenderer, AppState};
|
use crate::{models::user::{User, UserStatus}, renderer::TemplateRenderer, server::AppState, services::password::get_password_hash};
|
||||||
|
|
||||||
use kernel::models::user::{User, UserStatus};
|
|
||||||
use utils::get_password_hash;
|
|
||||||
|
|
||||||
pub async fn register_form(
|
pub async fn register_form(
|
||||||
State(app_state): State<AppState>
|
State(app_state): State<AppState>
|
||||||
|
|
@ -46,12 +43,12 @@ pub async fn perform_register(
|
||||||
email: Some(register.email),
|
email: Some(register.email),
|
||||||
handle: register.handle,
|
handle: register.handle,
|
||||||
full_name: None,
|
full_name: None,
|
||||||
avatar_asset_id: None,
|
picture: None,
|
||||||
|
|
||||||
password_hash,
|
password_hash,
|
||||||
status: UserStatus::Active,
|
status: UserStatus::Active,
|
||||||
roles: Json(Vec::new()), // take the default role in the config
|
roles: Json(Vec::new()),
|
||||||
reset_password_token: None,
|
activation_token: None,
|
||||||
created_at: Utc::now(),
|
created_at: Utc::now(),
|
||||||
website: None,
|
website: None,
|
||||||
last_login_at: None
|
last_login_at: None
|
||||||
|
|
@ -69,7 +66,7 @@ pub async fn perform_register(
|
||||||
.bind(user.roles)
|
.bind(user.roles)
|
||||||
.bind(user.password_hash)
|
.bind(user.password_hash)
|
||||||
.bind(user.created_at.to_rfc3339_opts(SecondsFormat::Millis, true))
|
.bind(user.created_at.to_rfc3339_opts(SecondsFormat::Millis, true))
|
||||||
.execute(&app_state.db.0)
|
.execute(&app_state.db)
|
||||||
.await;
|
.await;
|
||||||
match res {
|
match res {
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
|
|
@ -4,8 +4,7 @@ use log::error;
|
||||||
use minijinja::context;
|
use minijinja::context;
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
|
|
||||||
use kernel::models::authorization::Authorization;
|
use crate::{models::{authorization::Authorization, token_claims::UserTokenClaims}, renderer::TemplateRenderer, server::AppState};
|
||||||
use crate::{renderer::TemplateRenderer, token_claims::UserTokenClaims, AppState};
|
|
||||||
|
|
||||||
pub async fn get_authorizations(
|
pub async fn get_authorizations(
|
||||||
State(app_state): State<AppState>,
|
State(app_state): State<AppState>,
|
||||||
|
|
@ -14,7 +13,7 @@ pub async fn get_authorizations(
|
||||||
) -> impl IntoResponse {
|
) -> impl IntoResponse {
|
||||||
let user_authorizations = sqlx::query_as::<_, Authorization>("SELECT * FROM authorizations WHERE user_id = $1")
|
let user_authorizations = sqlx::query_as::<_, Authorization>("SELECT * FROM authorizations WHERE user_id = $1")
|
||||||
.bind(&token_claims.sub)
|
.bind(&token_claims.sub)
|
||||||
.fetch_all(&app_state.db.0)
|
.fetch_all(&app_state.db)
|
||||||
.await
|
.await
|
||||||
.expect("To get user authorization with user_id from claim");
|
.expect("To get user authorization with user_id from claim");
|
||||||
renderer.render(
|
renderer.render(
|
||||||
|
|
@ -38,7 +37,7 @@ pub async fn revoke_authorization(
|
||||||
) -> impl IntoResponse {
|
) -> impl IntoResponse {
|
||||||
let delete_res = sqlx::query("DELETE FROM authorizations WHERE id = $1")
|
let delete_res = sqlx::query("DELETE FROM authorizations WHERE id = $1")
|
||||||
.bind(&form.authorization_id)
|
.bind(&form.authorization_id)
|
||||||
.execute(&app_state.db.0)
|
.execute(&app_state.db)
|
||||||
.await;
|
.await;
|
||||||
match delete_res {
|
match delete_res {
|
||||||
Ok(_) => {},
|
Ok(_) => {},
|
||||||
|
|
@ -1,10 +1,8 @@
|
||||||
use anyhow::{Context, Result};
|
use anyhow::{Context, Result};
|
||||||
use sqlx::{sqlite::{SqliteConnectOptions, SqlitePoolOptions}, ConnectOptions};
|
use sqlx::{sqlite::{SqliteConnectOptions, SqlitePoolOptions}, Pool, Sqlite, ConnectOptions};
|
||||||
use std::str::FromStr;
|
use std::str::FromStr;
|
||||||
|
|
||||||
use crate::repositories::storage::Storage;
|
pub async fn prepare_database(sqlite_db_path: &str) -> Result<Pool<Sqlite>> {
|
||||||
|
|
||||||
pub async fn prepare_database(sqlite_db_path: &str) -> Result<Storage> {
|
|
||||||
let conn_str = format!("sqlite:{}", sqlite_db_path);
|
let conn_str = format!("sqlite:{}", sqlite_db_path);
|
||||||
|
|
||||||
let pool = SqlitePoolOptions::new()
|
let pool = SqlitePoolOptions::new()
|
||||||
|
|
@ -16,6 +14,6 @@ pub async fn prepare_database(sqlite_db_path: &str) -> Result<Storage> {
|
||||||
.await
|
.await
|
||||||
.context("could not connect to database_url")?;
|
.context("could not connect to database_url")?;
|
||||||
|
|
||||||
Ok(Storage(pool))
|
Ok(pool)
|
||||||
}
|
}
|
||||||
|
|
||||||
62
src/main.rs
Normal file
62
src/main.rs
Normal file
|
|
@ -0,0 +1,62 @@
|
||||||
|
pub mod models;
|
||||||
|
pub mod controllers;
|
||||||
|
pub mod router;
|
||||||
|
pub mod server;
|
||||||
|
pub mod database;
|
||||||
|
pub mod cli;
|
||||||
|
pub mod utils;
|
||||||
|
pub mod services;
|
||||||
|
pub mod middlewares;
|
||||||
|
pub mod renderer;
|
||||||
|
pub mod consts;
|
||||||
|
|
||||||
|
use std::{env, fs};
|
||||||
|
use anyhow::{Result, Context, anyhow};
|
||||||
|
|
||||||
|
use database::prepare_database;
|
||||||
|
use log::info;
|
||||||
|
use sqlx::{Pool, Sqlite};
|
||||||
|
use models::config::{AppSecrets, Config};
|
||||||
|
|
||||||
|
pub const DEFAULT_DB_PATH: &str = "/var/lib/minauthator/minauthator.db";
|
||||||
|
pub const DEFAULT_ASSETS_PATH: &str = "/usr/local/lib/minauthator/assets";
|
||||||
|
pub const DEFAULT_CONFIG_PATH: &str = "/etc/minauthator/config.yaml";
|
||||||
|
|
||||||
|
fn get_config(path: String) -> Result<Config> {
|
||||||
|
let inp_def_yaml = fs::read_to_string(path)
|
||||||
|
.expect("Should have been able to read the the config file");
|
||||||
|
|
||||||
|
toml::from_str(&inp_def_yaml)
|
||||||
|
.map_err(|e| anyhow!("Failed to parse config, {:?}", e))
|
||||||
|
}
|
||||||
|
|
||||||
|
struct StartAppConfig {
|
||||||
|
config_path: Option<String>,
|
||||||
|
database_path: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::main]
|
||||||
|
async fn main() -> Result<()> {
|
||||||
|
cli::start_server_cli().await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn get_app_context(start_app_config: StartAppConfig) -> Result<(Config, AppSecrets, Pool<Sqlite>)> {
|
||||||
|
env_logger::init();
|
||||||
|
let _ = dotenvy::dotenv();
|
||||||
|
|
||||||
|
let database_path = &start_app_config.database_path.unwrap_or(DEFAULT_DB_PATH.to_string());
|
||||||
|
info!("Using database file at {}", database_path);
|
||||||
|
let pool = prepare_database(database_path).await.context("Could not prepare db.")?;
|
||||||
|
|
||||||
|
let config_path = start_app_config.config_path.unwrap_or(DEFAULT_CONFIG_PATH.to_string());
|
||||||
|
info!("Using config file at {}", &config_path);
|
||||||
|
let config: Config = get_config(config_path)
|
||||||
|
.expect("Cannot get config.");
|
||||||
|
|
||||||
|
dotenvy::dotenv().context("loading .env")?;
|
||||||
|
let secrets = AppSecrets {
|
||||||
|
jwt_secret: env::var("APP_JWT_SECRET").context("Expecting APP_JWT_SECRET env var.")?
|
||||||
|
};
|
||||||
|
|
||||||
|
Ok((config, secrets, pool))
|
||||||
|
}
|
||||||
|
|
@ -5,12 +5,9 @@ use axum::{
|
||||||
response::{Html, IntoResponse, Response},
|
response::{Html, IntoResponse, Response},
|
||||||
Extension
|
Extension
|
||||||
};
|
};
|
||||||
use utils::parse_basic_auth;
|
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
services::{app_session::AppClientSession, session::verify_token},
|
models::token_claims::AppUserTokenClaims, server::AppState, services::{app_session::AppClientSession, session::verify_token}, utils::parse_basic_auth
|
||||||
token_claims::OAuth2AccessTokenClaims,
|
|
||||||
AppState
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -102,15 +99,14 @@ pub async fn enforce_jwt_auth_middleware(
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
let token_claims: OAuth2AccessTokenClaims =
|
let token_claims: AppUserTokenClaims = match verify_token(&app_state.secrets, jwt) {
|
||||||
match verify_token(&app_state.config, &app_state.secrets, jwt) {
|
Ok(val) => val,
|
||||||
Ok(val) => val,
|
Err(_e) => {
|
||||||
Err(_e) => {
|
return Err(
|
||||||
return Err(
|
(StatusCode::UNAUTHORIZED, Html("Unauthorized: The provided JWT is invalid."))
|
||||||
(StatusCode::UNAUTHORIZED, Html("Unauthorized: The provided JWT is invalid."))
|
);
|
||||||
);
|
}
|
||||||
}
|
};
|
||||||
};
|
|
||||||
req.extensions_mut().insert(token_claims);
|
req.extensions_mut().insert(token_claims);
|
||||||
Ok(next.run(req).await)
|
Ok(next.run(req).await)
|
||||||
}
|
}
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
use axum::{extract::{Request, State}, http::StatusCode, middleware::Next, response::Response, Extension};
|
use axum::{extract::{Request, State}, http::StatusCode, middleware::Next, response::Response, Extension};
|
||||||
use crate::{renderer::TemplateRenderer, token_claims::UserTokenClaims, AppState};
|
|
||||||
|
use crate::{models::token_claims::UserTokenClaims, renderer::TemplateRenderer, server::AppState};
|
||||||
|
|
||||||
pub async fn renderer_middleware(
|
pub async fn renderer_middleware(
|
||||||
State(app_state): State<AppState>,
|
State(app_state): State<AppState>,
|
||||||
|
|
@ -7,9 +7,7 @@ use axum::{
|
||||||
use axum_extra::extract::CookieJar;
|
use axum_extra::extract::CookieJar;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
services::session::verify_token,
|
consts::WEB_GUI_JWT_COOKIE_NAME, models::token_claims::UserTokenClaims, server::AppState, services::session::verify_token
|
||||||
token_claims::UserTokenClaims,
|
|
||||||
AppState, WEB_GUI_JWT_COOKIE_NAME
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -28,19 +26,18 @@ pub async fn auth_middleware(
|
||||||
return Ok(next.run(req).await)
|
return Ok(next.run(req).await)
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
let token_claims: UserTokenClaims =
|
let token_claims: UserTokenClaims = match verify_token(&app_state.secrets, jwt) {
|
||||||
match verify_token(&app_state.config, &app_state.secrets, jwt) {
|
Ok(val) => val,
|
||||||
Ok(val) => val,
|
Err(_e) => {
|
||||||
Err(_e) => {
|
// UserWebGUI: delete invalid JWT cookie
|
||||||
// UserWebGUI: delete invalid JWT cookie
|
return Err(
|
||||||
return Err(
|
(
|
||||||
(
|
cookies.remove(WEB_GUI_JWT_COOKIE_NAME),
|
||||||
cookies.remove(WEB_GUI_JWT_COOKIE_NAME),
|
Redirect::to(&original_uri.to_string())
|
||||||
Redirect::to(&original_uri.to_string())
|
)
|
||||||
)
|
);
|
||||||
);
|
}
|
||||||
}
|
};
|
||||||
};
|
|
||||||
req.extensions_mut().insert(token_claims);
|
req.extensions_mut().insert(token_claims);
|
||||||
Ok(next.run(req).await)
|
Ok(next.run(req).await)
|
||||||
}
|
}
|
||||||
|
|
@ -25,8 +25,6 @@ struct Authorization {
|
||||||
client_id: String,
|
client_id: String,
|
||||||
scopes: Json<Vec<AuthorizationScope>>,
|
scopes: Json<Vec<AuthorizationScope>>,
|
||||||
|
|
||||||
nonce: Option<String>,
|
|
||||||
|
|
||||||
/// defined in https://datatracker.ietf.org/doc/html/rfc6749#section-4.1.2
|
/// defined in https://datatracker.ietf.org/doc/html/rfc6749#section-4.1.2
|
||||||
code: String,
|
code: String,
|
||||||
last_used_at: Option<DateTime<Utc>>,
|
last_used_at: Option<DateTime<Utc>>,
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
|
use std::collections::HashSet;
|
||||||
|
|
||||||
use fully_pub::fully_pub;
|
use fully_pub::fully_pub;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
|
@ -48,6 +50,20 @@ struct Application {
|
||||||
login_uri: String
|
login_uri: String
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Hash, Eq)]
|
||||||
|
#[fully_pub]
|
||||||
|
enum Permission {
|
||||||
|
ListUsers,
|
||||||
|
DisableUser,
|
||||||
|
EnableUser,
|
||||||
|
VerifyEmail,
|
||||||
|
InviteUser,
|
||||||
|
DeleteUser,
|
||||||
|
ResetUserPassword,
|
||||||
|
AssignUserGroups
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
#[fully_pub]
|
#[fully_pub]
|
||||||
struct Role {
|
struct Role {
|
||||||
|
|
@ -55,7 +71,8 @@ struct Role {
|
||||||
name: String,
|
name: String,
|
||||||
description: Option<String>,
|
description: Option<String>,
|
||||||
#[serde(default = "_default_true")]
|
#[serde(default = "_default_true")]
|
||||||
default: bool
|
default: bool,
|
||||||
|
permissions: HashSet<Permission>
|
||||||
}
|
}
|
||||||
|
|
||||||
// todo: Role hierarchy https://en.wikipedia.org/wiki/Role_hierarchy
|
// todo: Role hierarchy https://en.wikipedia.org/wiki/Role_hierarchy
|
||||||
|
|
@ -66,6 +83,12 @@ struct Role {
|
||||||
struct Config {
|
struct Config {
|
||||||
instance: InstanceConfig,
|
instance: InstanceConfig,
|
||||||
applications: Vec<Application>,
|
applications: Vec<Application>,
|
||||||
roles: Vec<Role>,
|
roles: Vec<Role>
|
||||||
signing_key: Option<String>
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#[derive(Debug, Clone)]
|
||||||
|
#[fully_pub]
|
||||||
|
struct AppSecrets {
|
||||||
|
jwt_secret: String
|
||||||
}
|
}
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
pub mod config;
|
pub mod config;
|
||||||
pub mod user;
|
pub mod user;
|
||||||
pub mod user_asset;
|
|
||||||
pub mod authorization;
|
pub mod authorization;
|
||||||
|
pub mod token_claims;
|
||||||
54
src/models/token_claims.rs
Normal file
54
src/models/token_claims.rs
Normal file
|
|
@ -0,0 +1,54 @@
|
||||||
|
use fully_pub::fully_pub;
|
||||||
|
use jsonwebtoken::get_current_timestamp;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use time::Duration;
|
||||||
|
|
||||||
|
use super::authorization::AuthorizationScope;
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize, Clone)]
|
||||||
|
#[fully_pub]
|
||||||
|
struct UserTokenClaims {
|
||||||
|
/// subject: user id
|
||||||
|
sub: String,
|
||||||
|
/// token expiration
|
||||||
|
exp: u64,
|
||||||
|
/// token issuer
|
||||||
|
iss: String
|
||||||
|
// TODO: add roles
|
||||||
|
}
|
||||||
|
|
||||||
|
impl UserTokenClaims {
|
||||||
|
pub fn new(user_id: &str, max_age: Duration) -> Self {
|
||||||
|
UserTokenClaims {
|
||||||
|
sub: user_id.into(),
|
||||||
|
exp: get_current_timestamp() + max_age.whole_seconds() as u64,
|
||||||
|
iss: "Minauthator".into()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize, Clone)]
|
||||||
|
#[fully_pub]
|
||||||
|
struct AppUserTokenClaims {
|
||||||
|
/// combined subject
|
||||||
|
client_id: String,
|
||||||
|
user_id: String,
|
||||||
|
scopes: Vec<AuthorizationScope>,
|
||||||
|
/// token expiration
|
||||||
|
exp: u64,
|
||||||
|
/// token issuer
|
||||||
|
iss: String
|
||||||
|
}
|
||||||
|
|
||||||
|
impl AppUserTokenClaims {
|
||||||
|
pub fn new(client_id: &str, user_id: &str, scopes: Vec<AuthorizationScope>) -> Self {
|
||||||
|
AppUserTokenClaims {
|
||||||
|
client_id: client_id.into(),
|
||||||
|
user_id: user_id.into(),
|
||||||
|
scopes,
|
||||||
|
exp: get_current_timestamp() + 86_000,
|
||||||
|
iss: "Minauth".into()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
31
src/models/user.rs
Normal file
31
src/models/user.rs
Normal file
|
|
@ -0,0 +1,31 @@
|
||||||
|
use fully_pub::fully_pub;
|
||||||
|
use chrono::{DateTime, Utc};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use sqlx::types::Json;
|
||||||
|
|
||||||
|
#[derive(sqlx::Type, Clone, Debug, Serialize, Deserialize, PartialEq)]
|
||||||
|
#[derive(strum_macros::Display)]
|
||||||
|
#[fully_pub]
|
||||||
|
enum UserStatus {
|
||||||
|
Active,
|
||||||
|
Disabled
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(sqlx::FromRow, Deserialize, Serialize, Debug)]
|
||||||
|
#[fully_pub]
|
||||||
|
struct User {
|
||||||
|
/// uuid
|
||||||
|
id: String,
|
||||||
|
handle: String,
|
||||||
|
full_name: Option<String>,
|
||||||
|
email: Option<String>,
|
||||||
|
website: Option<String>,
|
||||||
|
picture: Option<Vec<u8>>, // embeded blob to store profile pic
|
||||||
|
password_hash: Option<String>, // argon2 password hash
|
||||||
|
status: UserStatus,
|
||||||
|
roles: Json<Vec<String>>,
|
||||||
|
activation_token: Option<String>,
|
||||||
|
|
||||||
|
last_login_at: Option<DateTime<Utc>>,
|
||||||
|
created_at: DateTime<Utc>
|
||||||
|
}
|
||||||
|
|
@ -1,11 +1,9 @@
|
||||||
use axum::{http::StatusCode, response::{Html, IntoResponse}};
|
use axum::{http::StatusCode, response::{Html, IntoResponse}};
|
||||||
use fully_pub::fully_pub;
|
use fully_pub::fully_pub;
|
||||||
use kernel::models::config::Config;
|
|
||||||
use log::error;
|
use log::error;
|
||||||
use minijinja::{context, Environment, Value};
|
use minijinja::{context, Environment, Value};
|
||||||
use utils::encode_base64_picture;
|
|
||||||
|
|
||||||
use crate::token_claims::UserTokenClaims;
|
use crate::models::token_claims::UserTokenClaims;
|
||||||
|
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
|
|
@ -28,6 +26,7 @@ impl TemplateRenderer {
|
||||||
{
|
{
|
||||||
Ok(content) => Html(content).into_response(),
|
Ok(content) => Html(content).into_response(),
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
|
dbg!(err);
|
||||||
error!("FATAL: Failed to render template {}", name);
|
error!("FATAL: Failed to render template {}", name);
|
||||||
(StatusCode::INTERNAL_SERVER_ERROR, "Internal server error").into_response()
|
(StatusCode::INTERNAL_SERVER_ERROR, "Internal server error").into_response()
|
||||||
}
|
}
|
||||||
|
|
@ -44,14 +43,3 @@ impl TemplateRenderer {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn build_templating_env(config: &Config) -> Environment<'static> {
|
|
||||||
let mut env = Environment::new();
|
|
||||||
|
|
||||||
minijinja_embed::load_templates!(&mut env);
|
|
||||||
|
|
||||||
env.add_global("gl", context! {
|
|
||||||
instance => config.instance
|
|
||||||
});
|
|
||||||
env.add_function("inline_picture", encode_base64_picture);
|
|
||||||
env
|
|
||||||
}
|
|
||||||
|
|
@ -9,7 +9,7 @@ use crate::{
|
||||||
app_auth,
|
app_auth,
|
||||||
renderer::renderer_middleware
|
renderer::renderer_middleware
|
||||||
},
|
},
|
||||||
AppState, ServerConfig
|
server::{AppState, ServerConfig}
|
||||||
};
|
};
|
||||||
|
|
||||||
pub fn build_router(server_config: &ServerConfig, app_state: AppState) -> Router<AppState> {
|
pub fn build_router(server_config: &ServerConfig, app_state: AppState) -> Router<AppState> {
|
||||||
|
|
@ -19,9 +19,6 @@ pub fn build_router(server_config: &ServerConfig, app_state: AppState) -> Router
|
||||||
.route("/register", post(ui::register::perform_register))
|
.route("/register", post(ui::register::perform_register))
|
||||||
.route("/login", get(ui::login::login_form))
|
.route("/login", get(ui::login::login_form))
|
||||||
.route("/login", post(ui::login::perform_login))
|
.route("/login", post(ui::login::perform_login))
|
||||||
.route("/invitation", get(ui::reset_password::reset_password_form))
|
|
||||||
.route("/reset-password", get(ui::reset_password::reset_password_form))
|
|
||||||
.route("/reset-password", post(ui::reset_password::perform_reset_password))
|
|
||||||
.layer(middleware::from_fn_with_state(app_state.clone(), renderer_middleware))
|
.layer(middleware::from_fn_with_state(app_state.clone(), renderer_middleware))
|
||||||
.layer(middleware::from_fn_with_state(app_state.clone(), user_auth::auth_middleware));
|
.layer(middleware::from_fn_with_state(app_state.clone(), user_auth::auth_middleware));
|
||||||
|
|
||||||
|
|
@ -46,13 +43,10 @@ pub fn build_router(server_config: &ServerConfig, app_state: AppState) -> Router
|
||||||
|
|
||||||
let api_user_routes = Router::new()
|
let api_user_routes = Router::new()
|
||||||
.route("/api/user", get(api::read_user::read_user_basic))
|
.route("/api/user", get(api::read_user::read_user_basic))
|
||||||
.layer(middleware::from_fn_with_state(app_state.clone(), app_auth::enforce_jwt_auth_middleware))
|
.layer(middleware::from_fn_with_state(app_state.clone(), app_auth::enforce_jwt_auth_middleware));
|
||||||
.route("/api", get(api::index::get_index))
|
|
||||||
.route("/api/user-assets/:asset_id", get(api::public_assets::get_user_asset));
|
|
||||||
|
|
||||||
let well_known_routes = Router::new()
|
let well_known_routes = Router::new()
|
||||||
.route("/.well-known/openid-configuration", get(api::openid::well_known::get_well_known_openid_configuration))
|
.route("/.well-known/openid-configuration", get(api::openid::well_known::get_well_known_openid_configuration));
|
||||||
.route("/.well-known/jwks", get(api::openid::keys::get_signing_public_keys));
|
|
||||||
|
|
||||||
Router::new()
|
Router::new()
|
||||||
.merge(public_routes)
|
.merge(public_routes)
|
||||||
|
|
@ -1,22 +1,24 @@
|
||||||
pub mod controllers;
|
use base64::{prelude::BASE64_STANDARD, Engine};
|
||||||
pub mod router;
|
|
||||||
pub mod services;
|
|
||||||
pub mod middlewares;
|
|
||||||
pub mod renderer;
|
|
||||||
pub mod token_claims;
|
|
||||||
|
|
||||||
use fully_pub::fully_pub;
|
use fully_pub::fully_pub;
|
||||||
use anyhow::{Result, Context};
|
use anyhow::{Result, Context};
|
||||||
use kernel::{context::{AppSecrets, KernelContext}, models::config::Config, repositories::storage::Storage};
|
|
||||||
use log::info;
|
use log::info;
|
||||||
use minijinja::Environment;
|
use minijinja::{context, Environment};
|
||||||
|
use sqlx::{Pool, Sqlite};
|
||||||
|
use crate::{models::config::{AppSecrets, Config}, router::build_router};
|
||||||
|
|
||||||
use crate::{
|
fn build_templating_env(config: &Config) -> Environment<'static> {
|
||||||
router::build_router,
|
let mut env = Environment::new();
|
||||||
renderer::build_templating_env
|
|
||||||
};
|
|
||||||
|
|
||||||
pub const WEB_GUI_JWT_COOKIE_NAME: &str = "minauthator_jwt";
|
minijinja_embed::load_templates!(&mut env);
|
||||||
|
|
||||||
|
env.add_global("gl", context! {
|
||||||
|
instance => config.instance
|
||||||
|
});
|
||||||
|
env.add_function("encode_b64str", |bin_val: Vec<u8>| {
|
||||||
|
BASE64_STANDARD.encode(bin_val)
|
||||||
|
});
|
||||||
|
env
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
#[fully_pub]
|
#[fully_pub]
|
||||||
|
|
@ -32,20 +34,22 @@ pub struct ServerConfig {
|
||||||
pub struct AppState {
|
pub struct AppState {
|
||||||
secrets: AppSecrets,
|
secrets: AppSecrets,
|
||||||
config: Config,
|
config: Config,
|
||||||
db: Storage,
|
db: Pool<Sqlite>,
|
||||||
templating_env: Environment<'static>
|
templating_env: Environment<'static>
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn start_http_server(
|
pub async fn start_http_server(
|
||||||
server_config: ServerConfig,
|
server_config: ServerConfig,
|
||||||
ctx: KernelContext
|
config: Config,
|
||||||
|
secrets: AppSecrets,
|
||||||
|
db_pool: Pool<Sqlite>
|
||||||
) -> Result<()> {
|
) -> Result<()> {
|
||||||
// build state
|
// build state
|
||||||
let state = AppState {
|
let state = AppState {
|
||||||
templating_env: build_templating_env(&ctx.config),
|
templating_env: build_templating_env(&config),
|
||||||
config: ctx.config,
|
config,
|
||||||
secrets: ctx.secrets,
|
secrets,
|
||||||
db: ctx.storage
|
db: db_pool
|
||||||
};
|
};
|
||||||
|
|
||||||
// build routes
|
// build routes
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
pub mod password;
|
||||||
pub mod session;
|
pub mod session;
|
||||||
pub mod oauth2;
|
pub mod oauth2;
|
||||||
pub mod app_session;
|
pub mod app_session;
|
||||||
20
src/services/oauth2.rs
Normal file
20
src/services/oauth2.rs
Normal file
|
|
@ -0,0 +1,20 @@
|
||||||
|
use std::str::FromStr;
|
||||||
|
use anyhow::{Result, Context};
|
||||||
|
|
||||||
|
use crate::models::{authorization::AuthorizationScope, config::Application};
|
||||||
|
|
||||||
|
pub fn verify_redirect_uri(app: &Application, input_redirect_uri: &str) -> bool {
|
||||||
|
app.allowed_redirect_uris
|
||||||
|
.iter()
|
||||||
|
.any(|uri| *uri == input_redirect_uri)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn parse_scope(scope_str: &str) -> Result<Vec<AuthorizationScope>> {
|
||||||
|
let mut scopes: Vec<AuthorizationScope> = vec![];
|
||||||
|
for part in scope_str.split(' ') {
|
||||||
|
scopes.push(
|
||||||
|
AuthorizationScope::from_str(part).context("Cannot parse space-delimited scope.")?
|
||||||
|
)
|
||||||
|
}
|
||||||
|
Ok(scopes)
|
||||||
|
}
|
||||||
35
src/services/password.rs
Normal file
35
src/services/password.rs
Normal file
|
|
@ -0,0 +1,35 @@
|
||||||
|
use anyhow::{anyhow, Result};
|
||||||
|
use argon2::{
|
||||||
|
password_hash::{
|
||||||
|
rand_core::OsRng,
|
||||||
|
PasswordHash, PasswordHasher, PasswordVerifier, SaltString
|
||||||
|
},
|
||||||
|
Argon2
|
||||||
|
};
|
||||||
|
|
||||||
|
pub fn get_password_hash(password: String) -> Result<(String, String)> {
|
||||||
|
let salt = SaltString::generate(&mut OsRng);
|
||||||
|
|
||||||
|
// Argon2 with default params (Argon2id v19)
|
||||||
|
let argon2 = Argon2::default();
|
||||||
|
|
||||||
|
// Hash password to PHC string ($argon2id$v=19$...)
|
||||||
|
match argon2.hash_password(password.as_bytes(), &salt) {
|
||||||
|
Ok(val) => Ok((salt.to_string(), val.to_string())),
|
||||||
|
Err(_) => Err(anyhow!("Failed to process password."))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn verify_password_hash(password_hash: String, password: String) -> Result<()> {
|
||||||
|
let parsed_hash = match PasswordHash::new(&password_hash) {
|
||||||
|
Ok(val) => val,
|
||||||
|
Err(_) => {
|
||||||
|
return Err(anyhow!("Failed to parse password hash"));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
match Argon2::default().verify_password(password.as_bytes(), &parsed_hash) {
|
||||||
|
Ok(()) => Ok(()),
|
||||||
|
Err(_) => Err(anyhow!("Failed to verify password."))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
26
src/services/session.rs
Normal file
26
src/services/session.rs
Normal file
|
|
@ -0,0 +1,26 @@
|
||||||
|
use anyhow::Result;
|
||||||
|
use serde::{de::DeserializeOwned, Serialize};
|
||||||
|
use jsonwebtoken::{encode, decode, Header, Algorithm, Validation, EncodingKey, DecodingKey};
|
||||||
|
|
||||||
|
use crate::models::config::AppSecrets;
|
||||||
|
|
||||||
|
|
||||||
|
pub fn create_token<T: Serialize>(secrets: &AppSecrets, claims: T) -> String {
|
||||||
|
let token = encode(
|
||||||
|
&Header::default(),
|
||||||
|
&claims,
|
||||||
|
&EncodingKey::from_secret(secrets.jwt_secret.as_bytes())
|
||||||
|
).expect("Create token");
|
||||||
|
|
||||||
|
token
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn verify_token<T: DeserializeOwned>(secrets: &AppSecrets, jwt: &str) -> Result<T> {
|
||||||
|
let token_data = decode::<T>(
|
||||||
|
jwt,
|
||||||
|
&DecodingKey::from_secret(secrets.jwt_secret.as_bytes()),
|
||||||
|
&Validation::new(Algorithm::HS256)
|
||||||
|
)?;
|
||||||
|
|
||||||
|
Ok(token_data.claims)
|
||||||
|
}
|
||||||
|
|
@ -3,8 +3,7 @@
|
||||||
<h1>Bienvenue sur Minauthator</h1>
|
<h1>Bienvenue sur Minauthator</h1>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
Minauthator is free software under the
|
Minauthator is free software under <a href="https://www.gnu.org/licenses/gpl-3.0.txt">GPLv3</a> licence.
|
||||||
<a href="https://www.gnu.org/licenses/agpl-3.0.en.html">AGPLv3 licence</a>.
|
|
||||||
|
|
||||||
You can find source code on a <a href="https://forge.lefuturiste.fr/mbess/minauth">self-hosted forge repository</a>.
|
You can find source code on a <a href="https://forge.lefuturiste.fr/mbess/minauth">self-hosted forge repository</a>.
|
||||||
</p>
|
</p>
|
||||||
|
|
@ -55,9 +55,10 @@
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div class="mb-3">
|
<div class="mb-3">
|
||||||
<label for="avatar">Profile picture</label>
|
<label for="picture">Profile picture</label>
|
||||||
|
<!-- for now, no JPEG -->
|
||||||
<input
|
<input
|
||||||
id="avatar" name="avatar"
|
id="picture" name="picture"
|
||||||
type="file"
|
type="file"
|
||||||
accept="image/gif, image/png, image/jpeg"
|
accept="image/gif, image/png, image/jpeg"
|
||||||
class="form-control"
|
class="form-control"
|
||||||
|
|
@ -5,12 +5,9 @@
|
||||||
<a href="/me/details-form">Update details.</a>
|
<a href="/me/details-form">Update details.</a>
|
||||||
<a href="/me/authorizations">Manage authorizations.</a>
|
<a href="/me/authorizations">Manage authorizations.</a>
|
||||||
|
|
||||||
{% if user.avatar_asset_id %}
|
<p>
|
||||||
<div class="my-3">
|
{% if user.picture %}
|
||||||
<img
|
<img src="data:image/*;base64,{{ encode_b64str(user.picture) }}" style="width: 150px; height: 150px; object-fit: contain">
|
||||||
src="/api/user-assets/{{ user.avatar_asset_id }}"
|
|
||||||
style="width: 150px; height: 150px; object-fit: contain">
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<ul>
|
<ul>
|
||||||
<li>
|
<li>
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue