mirror of
https://github.com/h44z/wg-portal.git
synced 2026-02-23 19:06:34 +00:00
Compare commits
1 Commits
multi_auth
...
bulk_actio
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d4968dcd6c |
6
.github/workflows/docker-publish.yml
vendored
6
.github/workflows/docker-publish.yml
vendored
@@ -24,7 +24,7 @@ jobs:
|
|||||||
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
|
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
|
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
|
||||||
|
|
||||||
- name: Get Version
|
- name: Get Version
|
||||||
shell: bash
|
shell: bash
|
||||||
@@ -96,7 +96,7 @@ jobs:
|
|||||||
done
|
done
|
||||||
|
|
||||||
- name: Upload binaries
|
- name: Upload binaries
|
||||||
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
|
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
|
||||||
with:
|
with:
|
||||||
name: binaries
|
name: binaries
|
||||||
path: binaries/wg-portal_linux*
|
path: binaries/wg-portal_linux*
|
||||||
@@ -110,7 +110,7 @@ jobs:
|
|||||||
contents: write
|
contents: write
|
||||||
steps:
|
steps:
|
||||||
- name: Download binaries
|
- name: Download binaries
|
||||||
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
|
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
|
||||||
with:
|
with:
|
||||||
name: binaries
|
name: binaries
|
||||||
|
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ func main() {
|
|||||||
rawDb, err := adapters.NewDatabase(cfg.Database)
|
rawDb, err := adapters.NewDatabase(cfg.Database)
|
||||||
internal.AssertNoError(err)
|
internal.AssertNoError(err)
|
||||||
|
|
||||||
database, err := adapters.NewSqlRepository(rawDb, cfg)
|
database, err := adapters.NewSqlRepository(rawDb)
|
||||||
internal.AssertNoError(err)
|
internal.AssertNoError(err)
|
||||||
|
|
||||||
wireGuard, err := wireguard.NewControllerManager(cfg)
|
wireGuard, err := wireguard.NewControllerManager(cfg)
|
||||||
|
|||||||
@@ -157,14 +157,12 @@ More advanced options are found in the subsequent `Advanced` section.
|
|||||||
### `create_default_peer`
|
### `create_default_peer`
|
||||||
- **Default:** `false`
|
- **Default:** `false`
|
||||||
- **Environment Variable:** `WG_PORTAL_CORE_CREATE_DEFAULT_PEER`
|
- **Environment Variable:** `WG_PORTAL_CORE_CREATE_DEFAULT_PEER`
|
||||||
- **Description:** If a user logs in for the first time with no existing peers, automatically create a new WireGuard peer for all server interfaces where the "Create default peer" flag is set.
|
- **Description:** If a user logs in for the first time with no existing peers, automatically create a new WireGuard peer for **all** server interfaces.
|
||||||
- **Important:** This option is only effective for interfaces where the "Create default peer" flag is set (via the UI).
|
|
||||||
|
|
||||||
### `create_default_peer_on_creation`
|
### `create_default_peer_on_creation`
|
||||||
- **Default:** `false`
|
- **Default:** `false`
|
||||||
- **Environment Variable:** `WG_PORTAL_CORE_CREATE_DEFAULT_PEER_ON_CREATION`
|
- **Environment Variable:** `WG_PORTAL_CORE_CREATE_DEFAULT_PEER_ON_CREATION`
|
||||||
- **Description:** If an LDAP user is created (e.g., through LDAP sync) and has no peers, automatically create a new WireGuard peer for all server interfaces where the "Create default peer" flag is set.
|
- **Description:** If an LDAP user is created (e.g., through LDAP sync) and has no peers, automatically create a new WireGuard peer for **all** server interfaces.
|
||||||
- **Important:** This option requires [create_default_peer](#create_default_peer) to be enabled.
|
|
||||||
|
|
||||||
### `re_enable_peer_after_user_enable`
|
### `re_enable_peer_after_user_enable`
|
||||||
- **Default:** `true`
|
- **Default:** `true`
|
||||||
|
|||||||
@@ -9,11 +9,6 @@ Make sure that you download the correct binary for your architecture. The availa
|
|||||||
- `wg-portal_linux_arm64` - Linux ARM 64-bit
|
- `wg-portal_linux_arm64` - Linux ARM 64-bit
|
||||||
- `wg-portal_linux_arm_v7` - Linux ARM 32-bit
|
- `wg-portal_linux_arm_v7` - Linux ARM 32-bit
|
||||||
|
|
||||||
### Released versions
|
|
||||||
|
|
||||||
To download a specific version, replace `${WG_PORTAL_VERSION}` with the desired version (or set an environment variable).
|
|
||||||
All official release versions can be found on the [GitHub Releases Page](https://github.com/h44z/wg-portal/releases).
|
|
||||||
|
|
||||||
With `curl`:
|
With `curl`:
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
@@ -32,74 +27,16 @@ with `gh cli`:
|
|||||||
gh release download ${WG_PORTAL_VERSION} --repo h44z/wg-portal --output wg-portal --pattern '*amd64'
|
gh release download ${WG_PORTAL_VERSION} --repo h44z/wg-portal --output wg-portal --pattern '*amd64'
|
||||||
```
|
```
|
||||||
|
|
||||||
The downloaded file will be named `wg-portal` and can be moved to a directory of your choice, see [Install](#install) for more information.
|
|
||||||
|
|
||||||
### Unreleased versions (master branch builds)
|
|
||||||
|
|
||||||
Unreleased versions can be fetched directly from the artifacts section of the [GitHub Workflow](https://github.com/h44z/wg-portal/actions/workflows/docker-publish.yml?query=branch%3Amaster).
|
|
||||||
|
|
||||||
|
|
||||||
## Install
|
## Install
|
||||||
|
|
||||||
The following command can be used to install the downloaded binary (`wg-portal`) to `/opt/wg-portal/wg-portal`. It ensures that the binary is executable.
|
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
sudo mkdir -p /opt/wg-portal
|
sudo mkdir -p /opt/wg-portal
|
||||||
sudo install wg-portal /opt/wg-portal/
|
sudo install wg-portal /opt/wg-portal/
|
||||||
```
|
```
|
||||||
|
|
||||||
To handle tasks such as restarting the service or configuring automatic startup, it is recommended to use a process manager like [systemd](https://systemd.io/).
|
## Unreleased versions (master branch builds)
|
||||||
Refer to [Systemd Service Setup](#systemd-service-setup) for instructions.
|
|
||||||
|
|
||||||
## Systemd Service Setup
|
Unreleased versions can be fetched directly from the artifacts section of the [GitHub Workflow](https://github.com/h44z/wg-portal/actions/workflows/docker-publish.yml?query=branch%3Amaster).
|
||||||
|
|
||||||
> **Note:** To run WireGuard Portal as systemd service, you need to download the binary for your architecture beforehand.
|
|
||||||
>
|
|
||||||
> The following examples assume that you downloaded the binary to `/opt/wg-portal/wg-portal`.
|
|
||||||
> The configuration file is expected to be located at `/opt/wg-portal/config.yml`.
|
|
||||||
|
|
||||||
To run WireGuard Portal as a systemd service, you can create a service unit file. The easiest way to do this is by using `systemctl edit`:
|
|
||||||
|
|
||||||
```shell
|
|
||||||
sudo systemctl edit --force --full wg-portal.service
|
|
||||||
```
|
|
||||||
|
|
||||||
Paste the following content into the editor and adjust the variables to your needs:
|
|
||||||
|
|
||||||
```ini
|
|
||||||
[Unit]
|
|
||||||
Description=WireGuard Portal
|
|
||||||
ConditionPathExists=/opt/wg-portal/wg-portal
|
|
||||||
After=network.target
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
Type=simple
|
|
||||||
User=root
|
|
||||||
Group=root
|
|
||||||
AmbientCapabilities=CAP_NET_ADMIN CAP_NET_RAW
|
|
||||||
|
|
||||||
Restart=on-failure
|
|
||||||
RestartSec=10
|
|
||||||
|
|
||||||
WorkingDirectory=/opt/wg-portal
|
|
||||||
Environment=WG_PORTAL_CONFIG=/opt/wg-portal/config.yml
|
|
||||||
ExecStart=/opt/wg-portal/wg-portal
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=multi-user.target
|
|
||||||
```
|
|
||||||
|
|
||||||
Alternatively, you can create or modify the file manually in `/etc/systemd/system/wg-portal.service`.
|
|
||||||
For systemd to pick up the changes, you need to reload the daemon:
|
|
||||||
|
|
||||||
```shell
|
|
||||||
sudo systemctl daemon-reload
|
|
||||||
```
|
|
||||||
|
|
||||||
After creating the service file, you can enable and start the service:
|
|
||||||
|
|
||||||
```shell
|
|
||||||
sudo systemctl enable --now wg-portal.service
|
|
||||||
```
|
|
||||||
|
|
||||||
To check status and log output, use: `sudo systemctl status wg-portal.service` or `sudo journalctl -u wg-portal.service`.
|
|
||||||
|
|||||||
@@ -443,18 +443,6 @@ definitions:
|
|||||||
maxLength: 64
|
maxLength: 64
|
||||||
minLength: 32
|
minLength: 32
|
||||||
type: string
|
type: string
|
||||||
AuthSources:
|
|
||||||
description: The source of the user. This field is optional.
|
|
||||||
example:
|
|
||||||
- db
|
|
||||||
items:
|
|
||||||
enum:
|
|
||||||
- db
|
|
||||||
- ldap
|
|
||||||
- oauth
|
|
||||||
type: string
|
|
||||||
readOnly: true
|
|
||||||
type: array
|
|
||||||
Department:
|
Department:
|
||||||
description: The department of the user. This field is optional.
|
description: The department of the user. This field is optional.
|
||||||
example: Software Development
|
example: Software Development
|
||||||
@@ -515,6 +503,19 @@ definitions:
|
|||||||
description: The phone number of the user. This field is optional.
|
description: The phone number of the user. This field is optional.
|
||||||
example: "+1234546789"
|
example: "+1234546789"
|
||||||
type: string
|
type: string
|
||||||
|
ProviderName:
|
||||||
|
description: The name of the authentication provider. This field is read-only.
|
||||||
|
example: ""
|
||||||
|
readOnly: true
|
||||||
|
type: string
|
||||||
|
Source:
|
||||||
|
description: The source of the user. This field is optional.
|
||||||
|
enum:
|
||||||
|
- db
|
||||||
|
- ldap
|
||||||
|
- oauth
|
||||||
|
example: db
|
||||||
|
type: string
|
||||||
required:
|
required:
|
||||||
- Identifier
|
- Identifier
|
||||||
type: object
|
type: object
|
||||||
|
|||||||
@@ -1,152 +0,0 @@
|
|||||||
WireGuard Portal supports multiple authentication mechanisms to manage user access. This includes
|
|
||||||
|
|
||||||
- Local user accounts
|
|
||||||
- LDAP authentication
|
|
||||||
- OAuth2 and OIDC authentication
|
|
||||||
- Passkey authentication (WebAuthn)
|
|
||||||
|
|
||||||
Users can have two roles which limit their permissions in WireGuard Portal:
|
|
||||||
|
|
||||||
- **User**: Can manage their own account and peers.
|
|
||||||
- **Admin**: Can manage all users and peers, including the ability to manage WireGuard interfaces.
|
|
||||||
|
|
||||||
In general, each user is identified by a _unique identifier_. If the same user identifier exists across multiple authentication sources, WireGuard Portal automatically merges those accounts into a single user record.
|
|
||||||
When a user is associated with multiple authentication sources, their information in WireGuard Portal is updated based on the most recently logged-in source. For more details, see [User Synchronization](./user-sync.md) documentation.
|
|
||||||
|
|
||||||
## Password Authentication
|
|
||||||
|
|
||||||
WireGuard Portal supports username and password authentication for both local and LDAP-backed accounts.
|
|
||||||
Local users are stored in the database, while LDAP users are authenticated against an external LDAP server.
|
|
||||||
|
|
||||||
On initial startup, WireGuard Portal automatically creates a local admin account with the password `wgportal-default`.
|
|
||||||
> :warning: This password must be changed immediately after the first login.
|
|
||||||
|
|
||||||
The minimum password length for all local users can be configured in the [`auth`](../configuration/overview.md#auth)
|
|
||||||
section of the configuration file. The default value is **16** characters, see [`min_password_length`](../configuration/overview.md#min_password_length).
|
|
||||||
The minimum password length is also enforced for the default admin user.
|
|
||||||
|
|
||||||
|
|
||||||
## Passkey (WebAuthn) Authentication
|
|
||||||
|
|
||||||
Besides the standard authentication mechanisms, WireGuard Portal supports Passkey authentication.
|
|
||||||
This feature is enabled by default and can be configured in the [`webauthn`](../configuration/overview.md#webauthn-passkeys) section of the configuration file.
|
|
||||||
|
|
||||||
Users can register multiple Passkeys to their account. These Passkeys can be used to log in to the web UI as long as the user is not locked.
|
|
||||||
> :warning: Passkey authentication does not disable password authentication. The password can still be used to log in (e.g., as a fallback).
|
|
||||||
|
|
||||||
To register a Passkey, open the settings page *(1)* in the web UI and click on the "Register Passkey" *(2)* button.
|
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
|
|
||||||
## OAuth2 and OIDC Authentication
|
|
||||||
|
|
||||||
WireGuard Portal supports OAuth2 and OIDC authentication. You can use any OAuth2 or OIDC provider that supports the authorization code flow,
|
|
||||||
such as Google, GitHub, or Keycloak.
|
|
||||||
|
|
||||||
For OAuth2 or OIDC to work, you need to configure the [`external_url`](../configuration/overview.md#external_url) property in the [`web`](../configuration/overview.md#web) section of the configuration file.
|
|
||||||
If you are planning to expose the portal to the internet, make sure that the `external_url` is configured to use HTTPS.
|
|
||||||
|
|
||||||
To add OIDC or OAuth2 authentication to WireGuard Portal, create a Client-ID and Client-Secret in your OAuth2 provider and
|
|
||||||
configure a new authentication provider in the [`auth`](../configuration/overview.md#auth) section of the configuration file.
|
|
||||||
Make sure that each configured provider has a unique `provider_name` property set. Samples can be seen [here](../configuration/examples.md).
|
|
||||||
|
|
||||||
#### Limiting Login to Specific Domains
|
|
||||||
|
|
||||||
You can limit the login to specific domains by setting the `allowed_domains` property for OAuth2 or OIDC providers.
|
|
||||||
This property is a comma-separated list of domains that are allowed to log in. The user's email address is checked against this list.
|
|
||||||
For example, if you want to allow only users with an email address ending in `outlook.com` to log in, set the property as follows:
|
|
||||||
|
|
||||||
```yaml
|
|
||||||
auth:
|
|
||||||
oidc:
|
|
||||||
- provider_name: "oidc1"
|
|
||||||
# ... other settings
|
|
||||||
allowed_domains:
|
|
||||||
- "outlook.com"
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Limit Login to Existing Users
|
|
||||||
|
|
||||||
You can limit the login to existing users only by setting the `registration_enabled` property to `false` for OAuth2 or OIDC providers.
|
|
||||||
If registration is enabled, new users will be created in the database when they log in for the first time.
|
|
||||||
|
|
||||||
#### Admin Mapping
|
|
||||||
|
|
||||||
You can map users to admin roles based on their attributes in the OAuth2 or OIDC provider. To do this, set the `admin_mapping` property for the provider.
|
|
||||||
Administrative access can either be mapped by a specific attribute or by group membership.
|
|
||||||
|
|
||||||
**Attribute specific mapping** can be achieved by setting the `admin_value_regex` and the `is_admin` property.
|
|
||||||
The `admin_value_regex` property is a regular expression that is matched against the value of the `is_admin` attribute.
|
|
||||||
The user is granted admin access if the regex matches the attribute value.
|
|
||||||
|
|
||||||
Example:
|
|
||||||
```yaml
|
|
||||||
auth:
|
|
||||||
oidc:
|
|
||||||
- provider_name: "oidc1"
|
|
||||||
# ... other settings
|
|
||||||
field_map:
|
|
||||||
is_admin: "wg_admin_prop"
|
|
||||||
admin_mapping:
|
|
||||||
admin_value_regex: "^true$"
|
|
||||||
```
|
|
||||||
The example above will grant admin access to users with the `wg_admin_prop` attribute set to `true`.
|
|
||||||
|
|
||||||
**Group membership mapping** can be achieved by setting the `admin_group_regex` and `user_groups` property.
|
|
||||||
The `admin_group_regex` property is a regular expression that is matched against the group names of the user.
|
|
||||||
The user is granted admin access if the regex matches any of the group names.
|
|
||||||
|
|
||||||
Example:
|
|
||||||
```yaml
|
|
||||||
auth:
|
|
||||||
oidc:
|
|
||||||
- provider_name: "oidc1"
|
|
||||||
# ... other settings
|
|
||||||
field_map:
|
|
||||||
user_groups: "groups"
|
|
||||||
admin_mapping:
|
|
||||||
admin_group_regex: "^the-admin-group$"
|
|
||||||
```
|
|
||||||
The example above will grant admin access to users who are members of the `the-admin-group` group.
|
|
||||||
|
|
||||||
|
|
||||||
## LDAP Authentication
|
|
||||||
|
|
||||||
WireGuard Portal supports LDAP authentication. You can use any LDAP server that supports the LDAP protocol, such as Active Directory or OpenLDAP.
|
|
||||||
Multiple LDAP servers can be configured in the [`auth`](../configuration/overview.md#auth) section of the configuration file.
|
|
||||||
WireGuard Portal remembers the authentication provider of the user and therefore avoids conflicts between multiple LDAP providers.
|
|
||||||
|
|
||||||
To configure LDAP authentication, create a new [`ldap`](../configuration/overview.md#ldap) authentication provider in the [`auth`](../configuration/overview.md#auth) section of the configuration file.
|
|
||||||
|
|
||||||
### Limiting Login to Specific Users
|
|
||||||
|
|
||||||
You can limit the login to specific users by setting the `login_filter` property for LDAP provider. This filter uses the LDAP search filter syntax.
|
|
||||||
The username can be inserted into the query by placing the `{{login_identifier}}` placeholder in the filter. This placeholder will then be replaced with the username entered by the user during login.
|
|
||||||
|
|
||||||
For example, if you want to allow only users with the `objectClass` attribute set to `organizationalPerson` to log in, set the property as follows:
|
|
||||||
|
|
||||||
```yaml
|
|
||||||
auth:
|
|
||||||
ldap:
|
|
||||||
- provider_name: "ldap1"
|
|
||||||
# ... other settings
|
|
||||||
login_filter: "(&(objectClass=organizationalPerson)(uid={{login_identifier}}))"
|
|
||||||
```
|
|
||||||
|
|
||||||
The `login_filter` should always be designed to return at most one user.
|
|
||||||
|
|
||||||
### Limit Login to Existing Users
|
|
||||||
|
|
||||||
You can limit the login to existing users only by setting the `registration_enabled` property to `false` for LDAP providers.
|
|
||||||
If registration is enabled, new users will be created in the database when they log in for the first time.
|
|
||||||
|
|
||||||
### Admin Mapping
|
|
||||||
|
|
||||||
You can map users to admin roles based on their group membership in the LDAP server. To do this, set the `admin_group` and `memberof` property for the provider.
|
|
||||||
The `admin_group` property defines the distinguished name of the group that is allowed to log in as admin.
|
|
||||||
All groups that are listed in the `memberof` attribute of the user will be checked against this group. If one of the groups matches, the user is granted admin access.
|
|
||||||
|
|
||||||
|
|
||||||
## User Synchronization
|
|
||||||
|
|
||||||
@@ -14,7 +14,7 @@ WireGuard Interfaces can be categorized into three types:
|
|||||||
## Accessing the Web UI
|
## Accessing the Web UI
|
||||||
|
|
||||||
The web UI should be accessed via the URL specified in the `external_url` property of the configuration file.
|
The web UI should be accessed via the URL specified in the `external_url` property of the configuration file.
|
||||||
By default, WireGuard Portal listens on port `8888` for HTTP connections. Check the [Security](security.md) or [Authentication](authentication.md) sections for more information on securing the web UI.
|
By default, WireGuard Portal listens on port `8888` for HTTP connections. Check the [Security](security.md) section for more information on securing the web UI.
|
||||||
|
|
||||||
So the default URL to access the web UI is:
|
So the default URL to access the web UI is:
|
||||||
|
|
||||||
|
|||||||
37
docs/documentation/usage/ldap.md
Normal file
37
docs/documentation/usage/ldap.md
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
WireGuard Portal lets you hook up any LDAP server such as Active Directory or OpenLDAP for both authentication and user sync.
|
||||||
|
You can even register multiple LDAP servers side-by-side. When someone logs in via LDAP, their specific provider is remembered,
|
||||||
|
so there's no risk of cross-provider conflicts. Details on the log-in process can be found in the [Security](security.md#ldap-authentication) documentation.
|
||||||
|
|
||||||
|
If you enable LDAP synchronization, all users within the LDAP directory will be created automatically in the WireGuard Portal database if they do not exist.
|
||||||
|
If a user is disabled or deleted in LDAP, the user will be disabled in WireGuard Portal as well.
|
||||||
|
The synchronization process can be fine-tuned by multiple parameters, which are described below.
|
||||||
|
|
||||||
|
## LDAP Synchronization
|
||||||
|
|
||||||
|
WireGuard Portal can automatically synchronize users from LDAP to the database.
|
||||||
|
To enable this feature, set the `sync_interval` property in the LDAP provider configuration to a value greater than "0".
|
||||||
|
The value is a string representing a duration, such as "15m" for 15 minutes or "1h" for 1 hour (check the [exact format definition](https://pkg.go.dev/time#ParseDuration) for details).
|
||||||
|
The synchronization process will run in the background and synchronize users from LDAP to the database at the specified interval.
|
||||||
|
Also make sure that the `sync_filter` property is a well-formed LDAP filter, or synchronization will fail.
|
||||||
|
|
||||||
|
### Limiting Synchronization to Specific Users
|
||||||
|
|
||||||
|
Use the `sync_filter` property in your LDAP provider block to restrict which users get synchronized.
|
||||||
|
It accepts any valid LDAP search filter, only entries matching that filter will be pulled into the portal's database.
|
||||||
|
|
||||||
|
For example, to import only users with a `mail` attribute:
|
||||||
|
```yaml
|
||||||
|
auth:
|
||||||
|
ldap:
|
||||||
|
- id: ldap
|
||||||
|
# ... other settings
|
||||||
|
sync_filter: (mail=*)
|
||||||
|
```
|
||||||
|
|
||||||
|
### Disable Missing Users
|
||||||
|
|
||||||
|
If you set the `disable_missing` property to `true`, any user that is not found in LDAP during synchronization will be disabled in WireGuard Portal.
|
||||||
|
All peers associated with that user will also be disabled.
|
||||||
|
|
||||||
|
If you want a user and its peers to be automatically re-enabled once they are found in LDAP again, set the `auto_re_enable` property to `true`.
|
||||||
|
This will only re-enable the user if they where disabled by the synchronization process. Manually disabled users will not be re-enabled.
|
||||||
@@ -1,12 +1,153 @@
|
|||||||
This section describes the security features available to administrators for hardening WireGuard Portal and protecting its data.
|
This section describes the security features available to administrators for hardening WireGuard Portal and protecting its data.
|
||||||
|
|
||||||
## Database Encryption
|
## Authentication
|
||||||
|
|
||||||
WireGuard Portal supports multiple database backends. To reduce the risk of data exposure, sensitive information stored in the database can be encrypted.
|
WireGuard Portal supports multiple authentication methods, including:
|
||||||
To enable encryption, set the [`encryption_passphrase`](../configuration/overview.md#database) in the database configuration section.
|
|
||||||
|
- Local user accounts
|
||||||
|
- LDAP authentication
|
||||||
|
- OAuth and OIDC authentication
|
||||||
|
- Passkey authentication (WebAuthn)
|
||||||
|
|
||||||
|
Users can have two roles which limit their permissions in WireGuard Portal:
|
||||||
|
|
||||||
|
- **User**: Can manage their own account and peers.
|
||||||
|
- **Admin**: Can manage all users and peers, including the ability to manage WireGuard interfaces.
|
||||||
|
|
||||||
|
### Password Security
|
||||||
|
|
||||||
|
WireGuard Portal supports username and password authentication for both local and LDAP-backed accounts.
|
||||||
|
Local users are stored in the database, while LDAP users are authenticated against an external LDAP server.
|
||||||
|
|
||||||
|
On initial startup, WireGuard Portal automatically creates a local admin account with the password `wgportal-default`.
|
||||||
|
> :warning: This password must be changed immediately after the first login.
|
||||||
|
|
||||||
|
The minimum password length for all local users can be configured in the [`auth`](../configuration/overview.md#auth)
|
||||||
|
section of the configuration file. The default value is **16** characters, see [`min_password_length`](../configuration/overview.md#min_password_length).
|
||||||
|
The minimum password length is also enforced for the default admin user.
|
||||||
|
|
||||||
|
|
||||||
|
### Passkey (WebAuthn) Authentication
|
||||||
|
|
||||||
|
Besides the standard authentication mechanisms, WireGuard Portal supports Passkey authentication.
|
||||||
|
This feature is enabled by default and can be configured in the [`webauthn`](../configuration/overview.md#webauthn-passkeys) section of the configuration file.
|
||||||
|
|
||||||
|
Users can register multiple Passkeys to their account. These Passkeys can be used to log in to the web UI as long as the user is not locked.
|
||||||
|
> :warning: Passkey authentication does not disable password authentication. The password can still be used to log in (e.g., as a fallback).
|
||||||
|
|
||||||
|
To register a Passkey, open the settings page *(1)* in the web UI and click on the "Register Passkey" *(2)* button.
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
|
||||||
|
### OAuth and OIDC Authentication
|
||||||
|
|
||||||
|
WireGuard Portal supports OAuth and OIDC authentication. You can use any OAuth or OIDC provider that supports the authorization code flow,
|
||||||
|
such as Google, GitHub, or Keycloak.
|
||||||
|
|
||||||
|
For OAuth or OIDC to work, you need to configure the [`external_url`](../configuration/overview.md#external_url) property in the [`web`](../configuration/overview.md#web) section of the configuration file.
|
||||||
|
If you are planning to expose the portal to the internet, make sure that the `external_url` is configured to use HTTPS.
|
||||||
|
|
||||||
|
To add OIDC or OAuth authentication to WireGuard Portal, create a Client-ID and Client-Secret in your OAuth provider and
|
||||||
|
configure a new authentication provider in the [`auth`](../configuration/overview.md#auth) section of the configuration file.
|
||||||
|
Make sure that each configured provider has a unique `provider_name` property set. Samples can be seen [here](../configuration/examples.md).
|
||||||
|
|
||||||
|
#### Limiting Login to Specific Domains
|
||||||
|
|
||||||
|
You can limit the login to specific domains by setting the `allowed_domains` property for OAuth or OIDC providers.
|
||||||
|
This property is a comma-separated list of domains that are allowed to log in. The user's email address is checked against this list.
|
||||||
|
For example, if you want to allow only users with an email address ending in `outlook.com` to log in, set the property as follows:
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
auth:
|
||||||
|
oidc:
|
||||||
|
- provider_name: "oidc1"
|
||||||
|
# ... other settings
|
||||||
|
allowed_domains:
|
||||||
|
- "outlook.com"
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Limit Login to Existing Users
|
||||||
|
|
||||||
|
You can limit the login to existing users only by setting the `registration_enabled` property to `false` for OAuth or OIDC providers.
|
||||||
|
If registration is enabled, new users will be created in the database when they log in for the first time.
|
||||||
|
|
||||||
|
#### Admin Mapping
|
||||||
|
|
||||||
|
You can map users to admin roles based on their attributes in the OAuth or OIDC provider. To do this, set the `admin_mapping` property for the provider.
|
||||||
|
Administrative access can either be mapped by a specific attribute or by group membership.
|
||||||
|
|
||||||
|
**Attribute specific mapping** can be achieved by setting the `admin_value_regex` and the `is_admin` property.
|
||||||
|
The `admin_value_regex` property is a regular expression that is matched against the value of the `is_admin` attribute.
|
||||||
|
The user is granted admin access if the regex matches the attribute value.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
```yaml
|
||||||
|
auth:
|
||||||
|
oidc:
|
||||||
|
- provider_name: "oidc1"
|
||||||
|
# ... other settings
|
||||||
|
field_map:
|
||||||
|
is_admin: "wg_admin_prop"
|
||||||
|
admin_mapping:
|
||||||
|
admin_value_regex: "^true$"
|
||||||
|
```
|
||||||
|
The example above will grant admin access to users with the `wg_admin_prop` attribute set to `true`.
|
||||||
|
|
||||||
|
**Group membership mapping** can be achieved by setting the `admin_group_regex` and `user_groups` property.
|
||||||
|
The `admin_group_regex` property is a regular expression that is matched against the group names of the user.
|
||||||
|
The user is granted admin access if the regex matches any of the group names.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
```yaml
|
||||||
|
auth:
|
||||||
|
oidc:
|
||||||
|
- provider_name: "oidc1"
|
||||||
|
# ... other settings
|
||||||
|
field_map:
|
||||||
|
user_groups: "groups"
|
||||||
|
admin_mapping:
|
||||||
|
admin_group_regex: "^the-admin-group$"
|
||||||
|
```
|
||||||
|
The example above will grant admin access to users who are members of the `the-admin-group` group.
|
||||||
|
|
||||||
|
|
||||||
|
### LDAP Authentication
|
||||||
|
|
||||||
|
WireGuard Portal supports LDAP authentication. You can use any LDAP server that supports the LDAP protocol, such as Active Directory or OpenLDAP.
|
||||||
|
Multiple LDAP servers can be configured in the [`auth`](../configuration/overview.md#auth) section of the configuration file.
|
||||||
|
WireGuard Portal remembers the authentication provider of the user and therefore avoids conflicts between multiple LDAP providers.
|
||||||
|
|
||||||
|
To configure LDAP authentication, create a new [`ldap`](../configuration/overview.md#ldap) authentication provider in the [`auth`](../configuration/overview.md#auth) section of the configuration file.
|
||||||
|
|
||||||
|
#### Limiting Login to Specific Users
|
||||||
|
|
||||||
|
You can limit the login to specific users by setting the `login_filter` property for LDAP provider. This filter uses the LDAP search filter syntax.
|
||||||
|
The username can be inserted into the query by placing the `{{login_identifier}}` placeholder in the filter. This placeholder will then be replaced with the username entered by the user during login.
|
||||||
|
|
||||||
|
For example, if you want to allow only users with the `objectClass` attribute set to `organizationalPerson` to log in, set the property as follows:
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
auth:
|
||||||
|
ldap:
|
||||||
|
- provider_name: "ldap1"
|
||||||
|
# ... other settings
|
||||||
|
login_filter: "(&(objectClass=organizationalPerson)(uid={{login_identifier}}))"
|
||||||
|
```
|
||||||
|
|
||||||
|
The `login_filter` should always be designed to return at most one user.
|
||||||
|
|
||||||
|
#### Limit Login to Existing Users
|
||||||
|
|
||||||
|
You can limit the login to existing users only by setting the `registration_enabled` property to `false` for LDAP providers.
|
||||||
|
If registration is enabled, new users will be created in the database when they log in for the first time.
|
||||||
|
|
||||||
|
#### Admin Mapping
|
||||||
|
|
||||||
|
You can map users to admin roles based on their group membership in the LDAP server. To do this, set the `admin_group` and `memberof` property for the provider.
|
||||||
|
The `admin_group` property defines the distinguished name of the group that is allowed to log in as admin.
|
||||||
|
All groups that are listed in the `memberof` attribute of the user will be checked against this group. If one of the groups matches, the user is granted admin access.
|
||||||
|
|
||||||
> :warning: Important: Once encryption is enabled, it cannot be disabled, and the passphrase cannot be changed!
|
|
||||||
> Only new or updated records will be encrypted; existing data remains in plaintext until it’s next modified.
|
|
||||||
|
|
||||||
## UI and API Access
|
## UI and API Access
|
||||||
|
|
||||||
@@ -16,9 +157,4 @@ WireGuard Portal provides a web UI and a REST API for user interaction. It is im
|
|||||||
It is recommended to use HTTPS for all communication with the portal to prevent eavesdropping.
|
It is recommended to use HTTPS for all communication with the portal to prevent eavesdropping.
|
||||||
|
|
||||||
Event though, WireGuard Portal supports HTTPS out of the box, it is recommended to use a reverse proxy like Nginx or Traefik to handle SSL termination and other security features.
|
Event though, WireGuard Portal supports HTTPS out of the box, it is recommended to use a reverse proxy like Nginx or Traefik to handle SSL termination and other security features.
|
||||||
A detailed explanation is available in the [Reverse Proxy](../getting-started/reverse-proxy.md) section.
|
A detailed explanation is available in the [Reverse Proxy](../getting-started/reverse-proxy.md) section.
|
||||||
|
|
||||||
### Secure Authentication
|
|
||||||
To prevent unauthorized access, WireGuard Portal supports integrating with secure authentication providers such as LDAP, OAuth2, or Passkeys, see [Authentication](./authentication.md) for more details.
|
|
||||||
When possible, use centralized authentication and enforce multi-factor authentication (MFA) at the provider level for enhanced account security.
|
|
||||||
For local accounts, administrators should enforce strong password requirements.
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
For all external authentication providers (LDAP, OIDC, OAuth2), WireGuard Portal can automatically create a local user record upon the user's first successful login.
|
|
||||||
This behavior is controlled by the `registration_enabled` setting in each authentication provider's configuration.
|
|
||||||
|
|
||||||
User information from external authentication sources is merged into the corresponding local WireGuard Portal user record whenever the user logs in.
|
|
||||||
Additionally, WireGuard Portal supports periodic synchronization of user data from an LDAP directory.
|
|
||||||
|
|
||||||
To prevent overwriting local changes, WireGuard Portal allows you to set a per-user flag that disables synchronization of external attributes.
|
|
||||||
When this flag is set, the user in WireGuard Portal will not be updated automatically during log-ins or LDAP synchronization.
|
|
||||||
|
|
||||||
### LDAP Synchronization
|
|
||||||
|
|
||||||
WireGuard Portal lets you hook up any LDAP server such as Active Directory or OpenLDAP for both authentication and user sync.
|
|
||||||
You can even register multiple LDAP servers side-by-side. Details on the log-in process can be found in the [LDAP Authentication](./authentication.md#ldap-authentication) section.
|
|
||||||
|
|
||||||
If you enable LDAP synchronization, all users within the LDAP directory will be created automatically in the WireGuard Portal database if they do not exist.
|
|
||||||
If a user is disabled or deleted in LDAP, the user will be disabled in WireGuard Portal as well.
|
|
||||||
The synchronization process can be fine-tuned by multiple parameters, which are described below.
|
|
||||||
|
|
||||||
#### Synchronization Parameters
|
|
||||||
|
|
||||||
To enable the LDAP sycnhronization this feature, set the `sync_interval` property in the LDAP provider configuration to a value greater than "0".
|
|
||||||
The value is a string representing a duration, such as "15m" for 15 minutes or "1h" for 1 hour (check the [exact format definition](https://pkg.go.dev/time#ParseDuration) for details).
|
|
||||||
The synchronization process will run in the background and synchronize users from LDAP to the database at the specified interval.
|
|
||||||
Also make sure that the `sync_filter` property is a well-formed LDAP filter, or synchronization will fail.
|
|
||||||
|
|
||||||
##### Limiting Synchronization to Specific Users
|
|
||||||
|
|
||||||
Use the `sync_filter` property in your LDAP provider block to restrict which users get synchronized.
|
|
||||||
It accepts any valid LDAP search filter, only entries matching that filter will be pulled into the portal's database.
|
|
||||||
|
|
||||||
For example, to import only users with a `mail` attribute:
|
|
||||||
```yaml
|
|
||||||
auth:
|
|
||||||
ldap:
|
|
||||||
- id: ldap
|
|
||||||
# ... other settings
|
|
||||||
sync_filter: (mail=*)
|
|
||||||
```
|
|
||||||
|
|
||||||
##### Disable Missing Users
|
|
||||||
|
|
||||||
If you set the `disable_missing` property to `true`, any user that is not found in LDAP during synchronization will be disabled in WireGuard Portal.
|
|
||||||
All peers associated with that user will also be disabled.
|
|
||||||
|
|
||||||
If you want a user and its peers to be automatically re-enabled once they are found in LDAP again, set the `auto_re_enable` property to `true`.
|
|
||||||
This will only re-enable the user if they were disabled by the synchronization process. Manually disabled users will not be re-enabled.
|
|
||||||
@@ -68,32 +68,26 @@ All payload models are encoded as JSON objects. Fields with empty values might b
|
|||||||
|
|
||||||
#### User Payload (entity: `user`)
|
#### User Payload (entity: `user`)
|
||||||
|
|
||||||
| JSON Field | Type | Description |
|
| JSON Field | Type | Description |
|
||||||
|----------------|---------------|-----------------------------------|
|
|----------------|-------------|-----------------------------------|
|
||||||
| CreatedBy | string | Creator identifier |
|
| CreatedBy | string | Creator identifier |
|
||||||
| UpdatedBy | string | Last updater identifier |
|
| UpdatedBy | string | Last updater identifier |
|
||||||
| CreatedAt | time.Time | Time of creation |
|
| CreatedAt | time.Time | Time of creation |
|
||||||
| UpdatedAt | time.Time | Time of last update |
|
| UpdatedAt | time.Time | Time of last update |
|
||||||
| Identifier | string | Unique user identifier |
|
| Identifier | string | Unique user identifier |
|
||||||
| Email | string | User email |
|
| Email | string | User email |
|
||||||
| AuthSources | []AuthSource | Authentication sources |
|
| Source | string | Authentication source |
|
||||||
| IsAdmin | bool | Whether user has admin privileges |
|
| ProviderName | string | Name of auth provider |
|
||||||
| Firstname | string | User's first name (optional) |
|
| IsAdmin | bool | Whether user has admin privileges |
|
||||||
| Lastname | string | User's last name (optional) |
|
| Firstname | string | User's first name (optional) |
|
||||||
| Phone | string | Contact phone number (optional) |
|
| Lastname | string | User's last name (optional) |
|
||||||
| Department | string | User's department (optional) |
|
| Phone | string | Contact phone number (optional) |
|
||||||
| Notes | string | Additional notes (optional) |
|
| Department | string | User's department (optional) |
|
||||||
| Disabled | *time.Time | When user was disabled |
|
| Notes | string | Additional notes (optional) |
|
||||||
| DisabledReason | string | Reason for deactivation |
|
| Disabled | *time.Time | When user was disabled |
|
||||||
| Locked | *time.Time | When user account was locked |
|
| DisabledReason | string | Reason for deactivation |
|
||||||
| LockedReason | string | Reason for being locked |
|
| Locked | *time.Time | When user account was locked |
|
||||||
|
| LockedReason | string | Reason for being locked |
|
||||||
`AuthSource`:
|
|
||||||
|
|
||||||
| JSON Field | Type | Description |
|
|
||||||
|--------------|---------------|-----------------------------------------------------|
|
|
||||||
| Source | string | The authentication source (e.g. LDAP, OAuth, or DB) |
|
|
||||||
| ProviderName | string | The identifier of the authentication provider |
|
|
||||||
|
|
||||||
|
|
||||||
#### Peer Payload (entity: `peer`)
|
#### Peer Payload (entity: `peer`)
|
||||||
|
|||||||
@@ -83,7 +83,6 @@ watch(() => props.visible, async (newValue, oldValue) => {
|
|||||||
formData.value.Identifier = interfaces.Prepared.Identifier
|
formData.value.Identifier = interfaces.Prepared.Identifier
|
||||||
formData.value.DisplayName = interfaces.Prepared.DisplayName
|
formData.value.DisplayName = interfaces.Prepared.DisplayName
|
||||||
formData.value.Mode = interfaces.Prepared.Mode
|
formData.value.Mode = interfaces.Prepared.Mode
|
||||||
formData.value.CreateDefaultPeer = interfaces.Prepared.CreateDefaultPeer
|
|
||||||
formData.value.Backend = interfaces.Prepared.Backend
|
formData.value.Backend = interfaces.Prepared.Backend
|
||||||
|
|
||||||
formData.value.PublicKey = interfaces.Prepared.PublicKey
|
formData.value.PublicKey = interfaces.Prepared.PublicKey
|
||||||
@@ -123,7 +122,6 @@ watch(() => props.visible, async (newValue, oldValue) => {
|
|||||||
formData.value.Identifier = selectedInterface.value.Identifier
|
formData.value.Identifier = selectedInterface.value.Identifier
|
||||||
formData.value.DisplayName = selectedInterface.value.DisplayName
|
formData.value.DisplayName = selectedInterface.value.DisplayName
|
||||||
formData.value.Mode = selectedInterface.value.Mode
|
formData.value.Mode = selectedInterface.value.Mode
|
||||||
formData.value.CreateDefaultPeer = selectedInterface.value.CreateDefaultPeer
|
|
||||||
formData.value.Backend = selectedInterface.value.Backend
|
formData.value.Backend = selectedInterface.value.Backend
|
||||||
|
|
||||||
formData.value.PublicKey = selectedInterface.value.PublicKey
|
formData.value.PublicKey = selectedInterface.value.PublicKey
|
||||||
@@ -489,10 +487,6 @@ async function del() {
|
|||||||
<input v-model="formData.Disabled" class="form-check-input" type="checkbox">
|
<input v-model="formData.Disabled" class="form-check-input" type="checkbox">
|
||||||
<label class="form-check-label">{{ $t('modals.interface-edit.disabled.label') }}</label>
|
<label class="form-check-label">{{ $t('modals.interface-edit.disabled.label') }}</label>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-check form-switch" v-if="formData.Mode==='server' && settings.Setting('CreateDefaultPeer')">
|
|
||||||
<input v-model="formData.CreateDefaultPeer" class="form-check-input" type="checkbox">
|
|
||||||
<label class="form-check-label">{{ $t('modals.interface-edit.create-default-peer.label') }}</label>
|
|
||||||
</div>
|
|
||||||
<div class="form-check form-switch" v-if="formData.Backend==='local'">
|
<div class="form-check form-switch" v-if="formData.Backend==='local'">
|
||||||
<input v-model="formData.SaveConfig" checked="" class="form-check-input" type="checkbox">
|
<input v-model="formData.SaveConfig" checked="" class="form-check-input" type="checkbox">
|
||||||
<label class="form-check-label">{{ $t('modals.interface-edit.save-config.label') }}</label>
|
<label class="form-check-label">{{ $t('modals.interface-edit.save-config.label') }}</label>
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ const passwordWeak = computed(() => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
const formValid = computed(() => {
|
const formValid = computed(() => {
|
||||||
if (!formData.value.AuthSources.some(s => s === 'db')) {
|
if (formData.value.Source !== 'db') {
|
||||||
return true // nothing to validate
|
return true // nothing to validate
|
||||||
}
|
}
|
||||||
if (props.userId !== '#NEW#' && passwordWeak.value) {
|
if (props.userId !== '#NEW#' && passwordWeak.value) {
|
||||||
@@ -70,7 +70,7 @@ watch(() => props.visible, async (newValue, oldValue) => {
|
|||||||
} else { // fill existing userdata
|
} else { // fill existing userdata
|
||||||
formData.value.Identifier = selectedUser.value.Identifier
|
formData.value.Identifier = selectedUser.value.Identifier
|
||||||
formData.value.Email = selectedUser.value.Email
|
formData.value.Email = selectedUser.value.Email
|
||||||
formData.value.AuthSources = selectedUser.value.AuthSources
|
formData.value.Source = selectedUser.value.Source
|
||||||
formData.value.IsAdmin = selectedUser.value.IsAdmin
|
formData.value.IsAdmin = selectedUser.value.IsAdmin
|
||||||
formData.value.Firstname = selectedUser.value.Firstname
|
formData.value.Firstname = selectedUser.value.Firstname
|
||||||
formData.value.Lastname = selectedUser.value.Lastname
|
formData.value.Lastname = selectedUser.value.Lastname
|
||||||
@@ -80,7 +80,6 @@ watch(() => props.visible, async (newValue, oldValue) => {
|
|||||||
formData.value.Password = ""
|
formData.value.Password = ""
|
||||||
formData.value.Disabled = selectedUser.value.Disabled
|
formData.value.Disabled = selectedUser.value.Disabled
|
||||||
formData.value.Locked = selectedUser.value.Locked
|
formData.value.Locked = selectedUser.value.Locked
|
||||||
formData.value.PersistLocalChanges = selectedUser.value.PersistLocalChanges
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -134,7 +133,7 @@ async function del() {
|
|||||||
<template>
|
<template>
|
||||||
<Modal :title="title" :visible="visible" @close="close">
|
<Modal :title="title" :visible="visible" @close="close">
|
||||||
<template #default>
|
<template #default>
|
||||||
<fieldset>
|
<fieldset v-if="formData.Source==='db'">
|
||||||
<legend class="mt-4">{{ $t('modals.user-edit.header-general') }}</legend>
|
<legend class="mt-4">{{ $t('modals.user-edit.header-general') }}</legend>
|
||||||
<div v-if="props.userId==='#NEW#'" class="form-group">
|
<div v-if="props.userId==='#NEW#'" class="form-group">
|
||||||
<label class="form-label mt-4">{{ $t('modals.user-edit.identifier.label') }}</label>
|
<label class="form-label mt-4">{{ $t('modals.user-edit.identifier.label') }}</label>
|
||||||
@@ -142,22 +141,16 @@ async function del() {
|
|||||||
</div>
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="form-label mt-4">{{ $t('modals.user-edit.source.label') }}</label>
|
<label class="form-label mt-4">{{ $t('modals.user-edit.source.label') }}</label>
|
||||||
<input v-model="formData.AuthSources" class="form-control" disabled="disabled" :placeholder="$t('modals.user-edit.source.placeholder')" type="text">
|
<input v-model="formData.Source" class="form-control" disabled="disabled" :placeholder="$t('modals.user-edit.source.placeholder')" type="text">
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group" v-if="formData.AuthSources.some(s => s ==='db')">
|
<div v-if="formData.Source==='db'" class="form-group">
|
||||||
<label class="form-label mt-4">{{ $t('modals.user-edit.password.label') }}</label>
|
<label class="form-label mt-4">{{ $t('modals.user-edit.password.label') }}</label>
|
||||||
<input v-model="formData.Password" aria-describedby="passwordHelp" class="form-control" :class="{ 'is-invalid': passwordWeak, 'is-valid': formData.Password !== '' && !passwordWeak }" :placeholder="$t('modals.user-edit.password.placeholder')" type="password">
|
<input v-model="formData.Password" aria-describedby="passwordHelp" class="form-control" :class="{ 'is-invalid': passwordWeak, 'is-valid': formData.Password !== '' && !passwordWeak }" :placeholder="$t('modals.user-edit.password.placeholder')" type="password">
|
||||||
<div class="invalid-feedback">{{ $t('modals.user-edit.password.too-weak') }}</div>
|
<div class="invalid-feedback">{{ $t('modals.user-edit.password.too-weak') }}</div>
|
||||||
<small v-if="props.userId!=='#NEW#'" id="passwordHelp" class="form-text text-muted">{{ $t('modals.user-edit.password.description') }}</small>
|
<small v-if="props.userId!=='#NEW#'" id="passwordHelp" class="form-text text-muted">{{ $t('modals.user-edit.password.description') }}</small>
|
||||||
</div>
|
</div>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
<fieldset v-if="formData.AuthSources.some(s => s !=='db') && !formData.PersistLocalChanges">
|
<fieldset v-if="formData.Source==='db'">
|
||||||
<legend class="mt-4">{{ $t('modals.user-edit.header-personal') }}</legend>
|
|
||||||
<div class="alert alert-warning mt-3">
|
|
||||||
{{ $t('modals.user-edit.sync-warning') }}
|
|
||||||
</div>
|
|
||||||
</fieldset>
|
|
||||||
<fieldset v-if="!formData.AuthSources.some(s => s !=='db') || formData.PersistLocalChanges">
|
|
||||||
<legend class="mt-4">{{ $t('modals.user-edit.header-personal') }}</legend>
|
<legend class="mt-4">{{ $t('modals.user-edit.header-personal') }}</legend>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="form-label mt-4">{{ $t('modals.user-edit.email.label') }}</label>
|
<label class="form-label mt-4">{{ $t('modals.user-edit.email.label') }}</label>
|
||||||
@@ -201,14 +194,10 @@ async function del() {
|
|||||||
<input v-model="formData.Locked" class="form-check-input" type="checkbox">
|
<input v-model="formData.Locked" class="form-check-input" type="checkbox">
|
||||||
<label class="form-check-label" >{{ $t('modals.user-edit.locked.label') }}</label>
|
<label class="form-check-label" >{{ $t('modals.user-edit.locked.label') }}</label>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-check form-switch" v-if="!formData.AuthSources.some(s => s !=='db') || formData.PersistLocalChanges">
|
<div class="form-check form-switch" v-if="formData.Source==='db'">
|
||||||
<input v-model="formData.IsAdmin" checked="" class="form-check-input" type="checkbox">
|
<input v-model="formData.IsAdmin" checked="" class="form-check-input" type="checkbox">
|
||||||
<label class="form-check-label">{{ $t('modals.user-edit.admin.label') }}</label>
|
<label class="form-check-label">{{ $t('modals.user-edit.admin.label') }}</label>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-check form-switch" v-if="formData.AuthSources.some(s => s !=='db')">
|
|
||||||
<input v-model="formData.PersistLocalChanges" class="form-check-input" type="checkbox">
|
|
||||||
<label class="form-check-label" >{{ $t('modals.user-edit.persist-local-changes.label') }}</label>
|
|
||||||
</div>
|
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
export function base64_url_encode(input) {
|
export function base64_url_encode(input) {
|
||||||
let output = btoa(input)
|
let output = btoa(input)
|
||||||
output = output.replaceAll('+', '.')
|
output = output.replace('+', '.')
|
||||||
output = output.replaceAll('/', '_')
|
output = output.replace('/', '_')
|
||||||
output = output.replaceAll('=', '-')
|
output = output.replace('=', '-')
|
||||||
return output
|
return output
|
||||||
}
|
}
|
||||||
@@ -4,7 +4,6 @@ export function freshInterface() {
|
|||||||
Disabled: false,
|
Disabled: false,
|
||||||
DisplayName: "",
|
DisplayName: "",
|
||||||
Identifier: "",
|
Identifier: "",
|
||||||
CreateDefaultPeer: false,
|
|
||||||
Mode: "server",
|
Mode: "server",
|
||||||
Backend: "local",
|
Backend: "local",
|
||||||
|
|
||||||
@@ -137,7 +136,7 @@ export function freshUser() {
|
|||||||
Identifier: "",
|
Identifier: "",
|
||||||
|
|
||||||
Email: "",
|
Email: "",
|
||||||
AuthSources: ["db"],
|
Source: "db",
|
||||||
IsAdmin: false,
|
IsAdmin: false,
|
||||||
|
|
||||||
Firstname: "",
|
Firstname: "",
|
||||||
@@ -155,8 +154,6 @@ export function freshUser() {
|
|||||||
|
|
||||||
ApiEnabled: false,
|
ApiEnabled: false,
|
||||||
|
|
||||||
PersistLocalChanges: false,
|
|
||||||
|
|
||||||
PeerCount: 0,
|
PeerCount: 0,
|
||||||
|
|
||||||
// Internal values
|
// Internal values
|
||||||
|
|||||||
@@ -147,7 +147,7 @@
|
|||||||
"email": "E-Mail",
|
"email": "E-Mail",
|
||||||
"firstname": "Vorname",
|
"firstname": "Vorname",
|
||||||
"lastname": "Nachname",
|
"lastname": "Nachname",
|
||||||
"sources": "Quellen",
|
"source": "Quelle",
|
||||||
"peers": "Peers",
|
"peers": "Peers",
|
||||||
"admin": "Admin"
|
"admin": "Admin"
|
||||||
},
|
},
|
||||||
@@ -378,11 +378,7 @@
|
|||||||
},
|
},
|
||||||
"admin": {
|
"admin": {
|
||||||
"label": "Ist Administrator"
|
"label": "Ist Administrator"
|
||||||
},
|
}
|
||||||
"persist-local-changes": {
|
|
||||||
"label": "Lokale Änderungen speichern"
|
|
||||||
},
|
|
||||||
"sync-warning": "Um diesen synchronisierten Benutzer zu bearbeiten, aktivieren Sie die lokale Änderungsspeicherung. Andernfalls werden Ihre Änderungen bei der nächsten Synchronisierung überschrieben."
|
|
||||||
},
|
},
|
||||||
"interface-view": {
|
"interface-view": {
|
||||||
"headline": "Konfiguration für Schnittstelle:"
|
"headline": "Konfiguration für Schnittstelle:"
|
||||||
@@ -473,9 +469,6 @@
|
|||||||
"disabled": {
|
"disabled": {
|
||||||
"label": "Schnittstelle deaktiviert"
|
"label": "Schnittstelle deaktiviert"
|
||||||
},
|
},
|
||||||
"create-default-peer": {
|
|
||||||
"label": "Peer für neue Benutzer automatisch erstellen"
|
|
||||||
},
|
|
||||||
"save-config": {
|
"save-config": {
|
||||||
"label": "wg-quick Konfiguration automatisch speichern"
|
"label": "wg-quick Konfiguration automatisch speichern"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -147,7 +147,7 @@
|
|||||||
"email": "E-Mail",
|
"email": "E-Mail",
|
||||||
"firstname": "Firstname",
|
"firstname": "Firstname",
|
||||||
"lastname": "Lastname",
|
"lastname": "Lastname",
|
||||||
"sources": "Sources",
|
"source": "Source",
|
||||||
"peers": "Peers",
|
"peers": "Peers",
|
||||||
"admin": "Admin"
|
"admin": "Admin"
|
||||||
},
|
},
|
||||||
@@ -378,11 +378,7 @@
|
|||||||
},
|
},
|
||||||
"admin": {
|
"admin": {
|
||||||
"label": "Is Admin"
|
"label": "Is Admin"
|
||||||
},
|
}
|
||||||
"persist-local-changes": {
|
|
||||||
"label": "Persist local changes"
|
|
||||||
},
|
|
||||||
"sync-warning": "To modify this synchronized user, enable local change persistence. Otherwise, your changes will be overwritten during the next synchronization."
|
|
||||||
},
|
},
|
||||||
"interface-view": {
|
"interface-view": {
|
||||||
"headline": "Config for Interface:"
|
"headline": "Config for Interface:"
|
||||||
@@ -473,9 +469,6 @@
|
|||||||
"disabled": {
|
"disabled": {
|
||||||
"label": "Interface Disabled"
|
"label": "Interface Disabled"
|
||||||
},
|
},
|
||||||
"create-default-peer": {
|
|
||||||
"label": "Create default peer for new users"
|
|
||||||
},
|
|
||||||
"save-config": {
|
"save-config": {
|
||||||
"label": "Automatically save wg-quick config"
|
"label": "Automatically save wg-quick config"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -162,7 +162,7 @@
|
|||||||
"email": "Correo electrónico",
|
"email": "Correo electrónico",
|
||||||
"firstname": "Nombre",
|
"firstname": "Nombre",
|
||||||
"lastname": "Apellido",
|
"lastname": "Apellido",
|
||||||
"sources": "Origen",
|
"source": "Origen",
|
||||||
"peers": "Peers",
|
"peers": "Peers",
|
||||||
"admin": "Administrador"
|
"admin": "Administrador"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -137,7 +137,7 @@
|
|||||||
"email": "E-mail",
|
"email": "E-mail",
|
||||||
"firstname": "Prénom",
|
"firstname": "Prénom",
|
||||||
"lastname": "Nom",
|
"lastname": "Nom",
|
||||||
"sources": "Sources",
|
"source": "Source",
|
||||||
"peers": "Pairs",
|
"peers": "Pairs",
|
||||||
"admin": "Admin"
|
"admin": "Admin"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -136,7 +136,7 @@
|
|||||||
"email": "이메일",
|
"email": "이메일",
|
||||||
"firstname": "이름",
|
"firstname": "이름",
|
||||||
"lastname": "성",
|
"lastname": "성",
|
||||||
"sources": "소스",
|
"source": "소스",
|
||||||
"peers": "피어",
|
"peers": "피어",
|
||||||
"admin": "관리자"
|
"admin": "관리자"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -137,7 +137,7 @@
|
|||||||
"email": "E-Mail",
|
"email": "E-Mail",
|
||||||
"firstname": "Primeiro Nome",
|
"firstname": "Primeiro Nome",
|
||||||
"lastname": "Último Nome",
|
"lastname": "Último Nome",
|
||||||
"sources": "Fonte",
|
"source": "Fonte",
|
||||||
"peers": "Peers",
|
"peers": "Peers",
|
||||||
"admin": "Administrador"
|
"admin": "Administrador"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -143,7 +143,7 @@
|
|||||||
"email": "Электронная почта",
|
"email": "Электронная почта",
|
||||||
"firstname": "Имя",
|
"firstname": "Имя",
|
||||||
"lastname": "Фамилия",
|
"lastname": "Фамилия",
|
||||||
"sources": "Источник",
|
"source": "Источник",
|
||||||
"peers": "Пиры",
|
"peers": "Пиры",
|
||||||
"admin": "Админ"
|
"admin": "Админ"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -135,7 +135,7 @@
|
|||||||
"email": "E-Mail",
|
"email": "E-Mail",
|
||||||
"firstname": "Ім'я",
|
"firstname": "Ім'я",
|
||||||
"lastname": "Прізвище",
|
"lastname": "Прізвище",
|
||||||
"sources": "Джерело",
|
"source": "Джерело",
|
||||||
"peers": "Піри",
|
"peers": "Піри",
|
||||||
"admin": "Адміністратор"
|
"admin": "Адміністратор"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -134,7 +134,7 @@
|
|||||||
"email": "E-Mail",
|
"email": "E-Mail",
|
||||||
"firstname": "Tên",
|
"firstname": "Tên",
|
||||||
"lastname": "Họ",
|
"lastname": "Họ",
|
||||||
"sources": "Nguồn",
|
"source": "Nguồn",
|
||||||
"peers": "Peers",
|
"peers": "Peers",
|
||||||
"admin": "Quản trị viên"
|
"admin": "Quản trị viên"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -134,7 +134,7 @@
|
|||||||
"email": "电子邮件",
|
"email": "电子邮件",
|
||||||
"firstname": "名",
|
"firstname": "名",
|
||||||
"lastname": "姓",
|
"lastname": "姓",
|
||||||
"sources": "来源",
|
"source": "来源",
|
||||||
"peers": "节点",
|
"peers": "节点",
|
||||||
"admin": "管理员"
|
"admin": "管理员"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -131,7 +131,7 @@ onMounted(() => {
|
|||||||
<th scope="col">{{ $t('users.table-heading.email') }}</th>
|
<th scope="col">{{ $t('users.table-heading.email') }}</th>
|
||||||
<th scope="col">{{ $t('users.table-heading.firstname') }}</th>
|
<th scope="col">{{ $t('users.table-heading.firstname') }}</th>
|
||||||
<th scope="col">{{ $t('users.table-heading.lastname') }}</th>
|
<th scope="col">{{ $t('users.table-heading.lastname') }}</th>
|
||||||
<th class="text-center" scope="col">{{ $t('users.table-heading.sources') }}</th>
|
<th class="text-center" scope="col">{{ $t('users.table-heading.source') }}</th>
|
||||||
<th class="text-center" scope="col">{{ $t('users.table-heading.peers') }}</th>
|
<th class="text-center" scope="col">{{ $t('users.table-heading.peers') }}</th>
|
||||||
<th class="text-center" scope="col">{{ $t('users.table-heading.admin') }}</th>
|
<th class="text-center" scope="col">{{ $t('users.table-heading.admin') }}</th>
|
||||||
<th scope="col"></th><!-- Actions -->
|
<th scope="col"></th><!-- Actions -->
|
||||||
@@ -150,7 +150,7 @@ onMounted(() => {
|
|||||||
<td>{{user.Email}}</td>
|
<td>{{user.Email}}</td>
|
||||||
<td>{{user.Firstname}}</td>
|
<td>{{user.Firstname}}</td>
|
||||||
<td>{{user.Lastname}}</td>
|
<td>{{user.Lastname}}</td>
|
||||||
<td><span class="badge bg-light me-1" v-for="src in user.AuthSources" :key="src">{{src}}</span></td>
|
<td class="text-center"><span class="badge rounded-pill bg-light">{{user.Source}}</span></td>
|
||||||
<td class="text-center">{{user.PeerCount}}</td>
|
<td class="text-center">{{user.PeerCount}}</td>
|
||||||
<td class="text-center">
|
<td class="text-center">
|
||||||
<span v-if="user.IsAdmin" class="text-danger" :title="$t('users.admin')"><i class="fa fa-check-circle"></i></span>
|
<span v-if="user.IsAdmin" class="text-danger" :title="$t('users.admin')"><i class="fa fa-check-circle"></i></span>
|
||||||
|
|||||||
4
go.mod
4
go.mod
@@ -9,7 +9,7 @@ require (
|
|||||||
github.com/glebarez/sqlite v1.11.0
|
github.com/glebarez/sqlite v1.11.0
|
||||||
github.com/go-ldap/ldap/v3 v3.4.12
|
github.com/go-ldap/ldap/v3 v3.4.12
|
||||||
github.com/go-pkgz/routegroup v1.6.0
|
github.com/go-pkgz/routegroup v1.6.0
|
||||||
github.com/go-playground/validator/v10 v10.30.1
|
github.com/go-playground/validator/v10 v10.28.0
|
||||||
github.com/go-webauthn/webauthn v0.15.0
|
github.com/go-webauthn/webauthn v0.15.0
|
||||||
github.com/google/uuid v1.6.0
|
github.com/google/uuid v1.6.0
|
||||||
github.com/prometheus-community/pro-bing v0.7.0
|
github.com/prometheus-community/pro-bing v0.7.0
|
||||||
@@ -41,7 +41,7 @@ require (
|
|||||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||||
github.com/dustin/go-humanize v1.0.1 // indirect
|
github.com/dustin/go-humanize v1.0.1 // indirect
|
||||||
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
|
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
|
||||||
github.com/gabriel-vasile/mimetype v1.4.12 // indirect
|
github.com/gabriel-vasile/mimetype v1.4.11 // indirect
|
||||||
github.com/glebarez/go-sqlite v1.22.0 // indirect
|
github.com/glebarez/go-sqlite v1.22.0 // indirect
|
||||||
github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667 // indirect
|
github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667 // indirect
|
||||||
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
|
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
|
||||||
|
|||||||
8
go.sum
8
go.sum
@@ -50,8 +50,8 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp
|
|||||||
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
|
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
|
||||||
github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
|
github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
|
||||||
github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
|
github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
|
||||||
github.com/gabriel-vasile/mimetype v1.4.12 h1:e9hWvmLYvtp846tLHam2o++qitpguFiYCKbn0w9jyqw=
|
github.com/gabriel-vasile/mimetype v1.4.11 h1:AQvxbp830wPhHTqc1u7nzoLT+ZFxGY7emj5DR5DYFik=
|
||||||
github.com/gabriel-vasile/mimetype v1.4.12/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
|
github.com/gabriel-vasile/mimetype v1.4.11/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
|
||||||
github.com/glebarez/go-sqlite v1.22.0 h1:uAcMJhaA6r3LHMTFgP0SifzgXg46yJkgxqyuyec+ruQ=
|
github.com/glebarez/go-sqlite v1.22.0 h1:uAcMJhaA6r3LHMTFgP0SifzgXg46yJkgxqyuyec+ruQ=
|
||||||
github.com/glebarez/go-sqlite v1.22.0/go.mod h1:PlBIdHe0+aUEFn+r2/uthrWq4FxbzugL0L8Li6yQJbc=
|
github.com/glebarez/go-sqlite v1.22.0/go.mod h1:PlBIdHe0+aUEFn+r2/uthrWq4FxbzugL0L8Li6yQJbc=
|
||||||
github.com/glebarez/sqlite v1.11.0 h1:wSG0irqzP6VurnMEpFGer5Li19RpIRi2qvQz++w0GMw=
|
github.com/glebarez/sqlite v1.11.0 h1:wSG0irqzP6VurnMEpFGer5Li19RpIRi2qvQz++w0GMw=
|
||||||
@@ -97,8 +97,8 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o
|
|||||||
github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
|
github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
|
||||||
github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
|
github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
|
||||||
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
|
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
|
||||||
github.com/go-playground/validator/v10 v10.30.1 h1:f3zDSN/zOma+w6+1Wswgd9fLkdwy06ntQJp0BBvFG0w=
|
github.com/go-playground/validator/v10 v10.28.0 h1:Q7ibns33JjyW48gHkuFT91qX48KG0ktULL6FgHdG688=
|
||||||
github.com/go-playground/validator/v10 v10.30.1/go.mod h1:oSuBIQzuJxL//3MelwSLD5hc2Tu889bF0Idm9Dg26cM=
|
github.com/go-playground/validator/v10 v10.28.0/go.mod h1:GoI6I1SjPBh9p7ykNE/yj3fFYbyDOpwMn5KXd+m2hUU=
|
||||||
github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1aweo=
|
github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1aweo=
|
||||||
github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
|
github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
|
||||||
github.com/go-test/deep v1.1.1 h1:0r/53hagsehfO4bzD2Pgr/+RgHqhmf+k1Bpse2cTu1U=
|
github.com/go-test/deep v1.1.1 h1:0r/53hagsehfO4bzD2Pgr/+RgHqhmf+k1Bpse2cTu1U=
|
||||||
|
|||||||
@@ -23,6 +23,9 @@ import (
|
|||||||
"github.com/h44z/wg-portal/internal/domain"
|
"github.com/h44z/wg-portal/internal/domain"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// SchemaVersion describes the current database schema version. It must be incremented if a manual migration is needed.
|
||||||
|
var SchemaVersion uint64 = 1
|
||||||
|
|
||||||
// SysStat stores the current database schema version and the timestamp when it was applied.
|
// SysStat stores the current database schema version and the timestamp when it was applied.
|
||||||
type SysStat struct {
|
type SysStat struct {
|
||||||
MigratedAt time.Time `gorm:"column:migrated_at"`
|
MigratedAt time.Time `gorm:"column:migrated_at"`
|
||||||
@@ -176,15 +179,13 @@ func NewDatabase(cfg config.DatabaseConfig) (*gorm.DB, error) {
|
|||||||
// SqlRepo is a SQL database repository implementation.
|
// SqlRepo is a SQL database repository implementation.
|
||||||
// Currently, it supports MySQL, SQLite, Microsoft SQL and Postgresql database systems.
|
// Currently, it supports MySQL, SQLite, Microsoft SQL and Postgresql database systems.
|
||||||
type SqlRepo struct {
|
type SqlRepo struct {
|
||||||
db *gorm.DB
|
db *gorm.DB
|
||||||
cfg *config.Config
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewSqlRepository creates a new SqlRepo instance.
|
// NewSqlRepository creates a new SqlRepo instance.
|
||||||
func NewSqlRepository(db *gorm.DB, cfg *config.Config) (*SqlRepo, error) {
|
func NewSqlRepository(db *gorm.DB) (*SqlRepo, error) {
|
||||||
repo := &SqlRepo{
|
repo := &SqlRepo{
|
||||||
db: db,
|
db: db,
|
||||||
cfg: cfg,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := repo.preCheck(); err != nil {
|
if err := repo.preCheck(); err != nil {
|
||||||
@@ -222,8 +223,6 @@ func (r *SqlRepo) preCheck() error {
|
|||||||
func (r *SqlRepo) migrate() error {
|
func (r *SqlRepo) migrate() error {
|
||||||
slog.Debug("running migration: sys-stat", "result", r.db.AutoMigrate(&SysStat{}))
|
slog.Debug("running migration: sys-stat", "result", r.db.AutoMigrate(&SysStat{}))
|
||||||
slog.Debug("running migration: user", "result", r.db.AutoMigrate(&domain.User{}))
|
slog.Debug("running migration: user", "result", r.db.AutoMigrate(&domain.User{}))
|
||||||
slog.Debug("running migration: user authentications", "result",
|
|
||||||
r.db.AutoMigrate(&domain.UserAuthentication{}))
|
|
||||||
slog.Debug("running migration: user webauthn credentials", "result",
|
slog.Debug("running migration: user webauthn credentials", "result",
|
||||||
r.db.AutoMigrate(&domain.UserWebauthnCredential{}))
|
r.db.AutoMigrate(&domain.UserWebauthnCredential{}))
|
||||||
slog.Debug("running migration: interface", "result", r.db.AutoMigrate(&domain.Interface{}))
|
slog.Debug("running migration: interface", "result", r.db.AutoMigrate(&domain.Interface{}))
|
||||||
@@ -233,88 +232,16 @@ func (r *SqlRepo) migrate() error {
|
|||||||
slog.Debug("running migration: audit data", "result", r.db.AutoMigrate(&domain.AuditEntry{}))
|
slog.Debug("running migration: audit data", "result", r.db.AutoMigrate(&domain.AuditEntry{}))
|
||||||
|
|
||||||
existingSysStat := SysStat{}
|
existingSysStat := SysStat{}
|
||||||
r.db.Order("schema_version desc").First(&existingSysStat) // get latest version
|
r.db.Where("schema_version = ?", SchemaVersion).First(&existingSysStat)
|
||||||
|
|
||||||
// Migration: 0 --> 1
|
|
||||||
if existingSysStat.SchemaVersion == 0 {
|
if existingSysStat.SchemaVersion == 0 {
|
||||||
const schemaVersion = 1
|
|
||||||
sysStat := SysStat{
|
sysStat := SysStat{
|
||||||
MigratedAt: time.Now(),
|
MigratedAt: time.Now(),
|
||||||
SchemaVersion: schemaVersion,
|
SchemaVersion: SchemaVersion,
|
||||||
}
|
}
|
||||||
if err := r.db.Create(&sysStat).Error; err != nil {
|
if err := r.db.Create(&sysStat).Error; err != nil {
|
||||||
return fmt.Errorf("failed to write sysstat entry for schema version %d: %w", schemaVersion, err)
|
return fmt.Errorf("failed to write sysstat entry for schema version %d: %w", SchemaVersion, err)
|
||||||
}
|
}
|
||||||
slog.Debug("sys-stat entry written", "schema_version", schemaVersion)
|
slog.Debug("sys-stat entry written", "schema_version", SchemaVersion)
|
||||||
existingSysStat = sysStat // ensure that follow-up checks test against the latest version
|
|
||||||
}
|
|
||||||
|
|
||||||
// Migration: 1 --> 2
|
|
||||||
if existingSysStat.SchemaVersion == 1 {
|
|
||||||
const schemaVersion = 2
|
|
||||||
// Preserve existing behavior for installations that had default-peer-creation enabled.
|
|
||||||
if r.cfg.Core.CreateDefaultPeer {
|
|
||||||
err := r.db.Model(&domain.Interface{}).
|
|
||||||
Where("type = ?", domain.InterfaceTypeServer).
|
|
||||||
Update("create_default_peer", true).Error
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to migrate interface flags for schema version %d: %w", schemaVersion, err)
|
|
||||||
}
|
|
||||||
slog.Debug("migrated interface create_default_peer flags", "schema_version", schemaVersion)
|
|
||||||
}
|
|
||||||
sysStat := SysStat{
|
|
||||||
MigratedAt: time.Now(),
|
|
||||||
SchemaVersion: schemaVersion,
|
|
||||||
}
|
|
||||||
if err := r.db.Create(&sysStat).Error; err != nil {
|
|
||||||
return fmt.Errorf("failed to write sysstat entry for schema version %d: %w", schemaVersion, err)
|
|
||||||
}
|
|
||||||
existingSysStat = sysStat // ensure that follow-up checks test against the latest version
|
|
||||||
}
|
|
||||||
|
|
||||||
// Migration: 2 --> 3
|
|
||||||
if existingSysStat.SchemaVersion == 2 {
|
|
||||||
const schemaVersion = 3
|
|
||||||
// Migration to multi-auth
|
|
||||||
err := r.db.Transaction(func(tx *gorm.DB) error {
|
|
||||||
var users []domain.User
|
|
||||||
if err := tx.Find(&users).Error; err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
now := time.Now()
|
|
||||||
for _, user := range users {
|
|
||||||
auth := domain.UserAuthentication{
|
|
||||||
BaseModel: domain.BaseModel{
|
|
||||||
CreatedBy: domain.CtxSystemDBMigrator,
|
|
||||||
UpdatedBy: domain.CtxSystemDBMigrator,
|
|
||||||
CreatedAt: now,
|
|
||||||
UpdatedAt: now,
|
|
||||||
},
|
|
||||||
UserIdentifier: user.Identifier,
|
|
||||||
Source: user.Source,
|
|
||||||
ProviderName: user.ProviderName,
|
|
||||||
}
|
|
||||||
if err := tx.Create(&auth).Error; err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
slog.Debug("migrated users to multi-auth model", "schema_version", schemaVersion)
|
|
||||||
|
|
||||||
return nil
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to migrate to multi-auth: %w", err)
|
|
||||||
}
|
|
||||||
sysStat := SysStat{
|
|
||||||
MigratedAt: time.Now(),
|
|
||||||
SchemaVersion: schemaVersion,
|
|
||||||
}
|
|
||||||
if err := r.db.Create(&sysStat).Error; err != nil {
|
|
||||||
return fmt.Errorf("failed to write sysstat entry for schema version %d: %w", schemaVersion, err)
|
|
||||||
}
|
|
||||||
existingSysStat = sysStat // ensure that follow-up checks test against the latest version
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
@@ -824,7 +751,7 @@ func (r *SqlRepo) GetUsedIpsPerSubnet(ctx context.Context, subnets []domain.Cidr
|
|||||||
func (r *SqlRepo) GetUser(ctx context.Context, id domain.UserIdentifier) (*domain.User, error) {
|
func (r *SqlRepo) GetUser(ctx context.Context, id domain.UserIdentifier) (*domain.User, error) {
|
||||||
var user domain.User
|
var user domain.User
|
||||||
|
|
||||||
err := r.db.WithContext(ctx).Preload("WebAuthnCredentialList").Preload("Authentications").First(&user, id).Error
|
err := r.db.WithContext(ctx).Preload("WebAuthnCredentialList").First(&user, id).Error
|
||||||
|
|
||||||
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
|
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
return nil, domain.ErrNotFound
|
return nil, domain.ErrNotFound
|
||||||
@@ -842,8 +769,7 @@ func (r *SqlRepo) GetUser(ctx context.Context, id domain.UserIdentifier) (*domai
|
|||||||
func (r *SqlRepo) GetUserByEmail(ctx context.Context, email string) (*domain.User, error) {
|
func (r *SqlRepo) GetUserByEmail(ctx context.Context, email string) (*domain.User, error) {
|
||||||
var users []domain.User
|
var users []domain.User
|
||||||
|
|
||||||
err := r.db.WithContext(ctx).Where("email = ?",
|
err := r.db.WithContext(ctx).Where("email = ?", email).Preload("WebAuthnCredentialList").Find(&users).Error
|
||||||
email).Preload("WebAuthnCredentialList").Preload("Authentications").Find(&users).Error
|
|
||||||
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
|
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
return nil, domain.ErrNotFound
|
return nil, domain.ErrNotFound
|
||||||
}
|
}
|
||||||
@@ -883,7 +809,7 @@ func (r *SqlRepo) GetUserByWebAuthnCredential(ctx context.Context, credentialIdB
|
|||||||
func (r *SqlRepo) GetAllUsers(ctx context.Context) ([]domain.User, error) {
|
func (r *SqlRepo) GetAllUsers(ctx context.Context) ([]domain.User, error) {
|
||||||
var users []domain.User
|
var users []domain.User
|
||||||
|
|
||||||
err := r.db.WithContext(ctx).Preload("WebAuthnCredentialList").Preload("Authentications").Find(&users).Error
|
err := r.db.WithContext(ctx).Preload("WebAuthnCredentialList").Find(&users).Error
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -903,7 +829,6 @@ func (r *SqlRepo) FindUsers(ctx context.Context, search string) ([]domain.User,
|
|||||||
Or("lastname LIKE ?", searchValue).
|
Or("lastname LIKE ?", searchValue).
|
||||||
Or("email LIKE ?", searchValue).
|
Or("email LIKE ?", searchValue).
|
||||||
Preload("WebAuthnCredentialList").
|
Preload("WebAuthnCredentialList").
|
||||||
Preload("Authentications").
|
|
||||||
Find(&users).Error
|
Find(&users).Error
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@@ -963,17 +888,7 @@ func (r *SqlRepo) getOrCreateUser(ui *domain.ContextUserInfo, tx *gorm.DB, id do
|
|||||||
) {
|
) {
|
||||||
var user domain.User
|
var user domain.User
|
||||||
|
|
||||||
result := tx.Model(&user).Preload("WebAuthnCredentialList").Preload("Authentications").Find(&user, id)
|
// userDefaults will be applied to newly created user records
|
||||||
if result.Error != nil {
|
|
||||||
if !errors.Is(result.Error, gorm.ErrRecordNotFound) {
|
|
||||||
return nil, result.Error
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if result.Error == nil && result.RowsAffected > 0 {
|
|
||||||
return &user, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// create a new user record if no user record exists yet
|
|
||||||
userDefaults := domain.User{
|
userDefaults := domain.User{
|
||||||
BaseModel: domain.BaseModel{
|
BaseModel: domain.BaseModel{
|
||||||
CreatedBy: ui.UserId(),
|
CreatedBy: ui.UserId(),
|
||||||
@@ -982,15 +897,16 @@ func (r *SqlRepo) getOrCreateUser(ui *domain.ContextUserInfo, tx *gorm.DB, id do
|
|||||||
UpdatedAt: time.Now(),
|
UpdatedAt: time.Now(),
|
||||||
},
|
},
|
||||||
Identifier: id,
|
Identifier: id,
|
||||||
|
Source: domain.UserSourceDatabase,
|
||||||
IsAdmin: false,
|
IsAdmin: false,
|
||||||
}
|
}
|
||||||
|
|
||||||
err := tx.Create(&userDefaults).Error
|
err := tx.Attrs(userDefaults).FirstOrCreate(&user, id).Error
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return &userDefaults, nil
|
return &user, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *SqlRepo) upsertUser(ui *domain.ContextUserInfo, tx *gorm.DB, user *domain.User) error {
|
func (r *SqlRepo) upsertUser(ui *domain.ContextUserInfo, tx *gorm.DB, user *domain.User) error {
|
||||||
@@ -1007,11 +923,6 @@ func (r *SqlRepo) upsertUser(ui *domain.ContextUserInfo, tx *gorm.DB, user *doma
|
|||||||
return fmt.Errorf("failed to update users webauthn credentials: %w", err)
|
return fmt.Errorf("failed to update users webauthn credentials: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
err = tx.Session(&gorm.Session{FullSaveAssociations: true}).Unscoped().Model(user).Association("Authentications").Unscoped().Replace(user.Authentications)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to update users authentications: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2676,12 +2676,6 @@
|
|||||||
"ApiTokenCreated": {
|
"ApiTokenCreated": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
"AuthSources": {
|
|
||||||
"type": "array",
|
|
||||||
"items": {
|
|
||||||
"type": "string"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Department": {
|
"Department": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
@@ -2725,11 +2719,14 @@
|
|||||||
"PeerCount": {
|
"PeerCount": {
|
||||||
"type": "integer"
|
"type": "integer"
|
||||||
},
|
},
|
||||||
"PersistLocalChanges": {
|
|
||||||
"type": "boolean"
|
|
||||||
},
|
|
||||||
"Phone": {
|
"Phone": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
|
},
|
||||||
|
"ProviderName": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"Source": {
|
||||||
|
"type": "string"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -431,10 +431,6 @@ definitions:
|
|||||||
type: string
|
type: string
|
||||||
ApiTokenCreated:
|
ApiTokenCreated:
|
||||||
type: string
|
type: string
|
||||||
AuthSources:
|
|
||||||
items:
|
|
||||||
type: string
|
|
||||||
type: array
|
|
||||||
Department:
|
Department:
|
||||||
type: string
|
type: string
|
||||||
Disabled:
|
Disabled:
|
||||||
@@ -465,10 +461,12 @@ definitions:
|
|||||||
type: string
|
type: string
|
||||||
PeerCount:
|
PeerCount:
|
||||||
type: integer
|
type: integer
|
||||||
PersistLocalChanges:
|
|
||||||
type: boolean
|
|
||||||
Phone:
|
Phone:
|
||||||
type: string
|
type: string
|
||||||
|
ProviderName:
|
||||||
|
type: string
|
||||||
|
Source:
|
||||||
|
type: string
|
||||||
type: object
|
type: object
|
||||||
model.WebAuthnCredentialRequest:
|
model.WebAuthnCredentialRequest:
|
||||||
properties:
|
properties:
|
||||||
|
|||||||
@@ -2132,22 +2132,6 @@
|
|||||||
"minLength": 32,
|
"minLength": 32,
|
||||||
"example": ""
|
"example": ""
|
||||||
},
|
},
|
||||||
"AuthSources": {
|
|
||||||
"description": "The source of the user. This field is optional.",
|
|
||||||
"type": "array",
|
|
||||||
"items": {
|
|
||||||
"type": "string",
|
|
||||||
"enum": [
|
|
||||||
"db",
|
|
||||||
"ldap",
|
|
||||||
"oauth"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"readOnly": true,
|
|
||||||
"example": [
|
|
||||||
"db"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"Department": {
|
"Department": {
|
||||||
"description": "The department of the user. This field is optional.",
|
"description": "The department of the user. This field is optional.",
|
||||||
"type": "string",
|
"type": "string",
|
||||||
@@ -2221,6 +2205,22 @@
|
|||||||
"description": "The phone number of the user. This field is optional.",
|
"description": "The phone number of the user. This field is optional.",
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "+1234546789"
|
"example": "+1234546789"
|
||||||
|
},
|
||||||
|
"ProviderName": {
|
||||||
|
"description": "The name of the authentication provider. This field is read-only.",
|
||||||
|
"type": "string",
|
||||||
|
"readOnly": true,
|
||||||
|
"example": ""
|
||||||
|
},
|
||||||
|
"Source": {
|
||||||
|
"description": "The source of the user. This field is optional.",
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"db",
|
||||||
|
"ldap",
|
||||||
|
"oauth"
|
||||||
|
],
|
||||||
|
"example": "db"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -490,18 +490,6 @@ definitions:
|
|||||||
maxLength: 64
|
maxLength: 64
|
||||||
minLength: 32
|
minLength: 32
|
||||||
type: string
|
type: string
|
||||||
AuthSources:
|
|
||||||
description: The source of the user. This field is optional.
|
|
||||||
example:
|
|
||||||
- db
|
|
||||||
items:
|
|
||||||
enum:
|
|
||||||
- db
|
|
||||||
- ldap
|
|
||||||
- oauth
|
|
||||||
type: string
|
|
||||||
readOnly: true
|
|
||||||
type: array
|
|
||||||
Department:
|
Department:
|
||||||
description: The department of the user. This field is optional.
|
description: The department of the user. This field is optional.
|
||||||
example: Software Development
|
example: Software Development
|
||||||
@@ -564,6 +552,19 @@ definitions:
|
|||||||
description: The phone number of the user. This field is optional.
|
description: The phone number of the user. This field is optional.
|
||||||
example: "+1234546789"
|
example: "+1234546789"
|
||||||
type: string
|
type: string
|
||||||
|
ProviderName:
|
||||||
|
description: The name of the authentication provider. This field is read-only.
|
||||||
|
example: ""
|
||||||
|
readOnly: true
|
||||||
|
type: string
|
||||||
|
Source:
|
||||||
|
description: The source of the user. This field is optional.
|
||||||
|
enum:
|
||||||
|
- db
|
||||||
|
- ldap
|
||||||
|
- oauth
|
||||||
|
example: db
|
||||||
|
type: string
|
||||||
required:
|
required:
|
||||||
- Identifier
|
- Identifier
|
||||||
type: object
|
type: object
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package backend
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"slices"
|
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/h44z/wg-portal/internal/config"
|
"github.com/h44z/wg-portal/internal/config"
|
||||||
@@ -96,10 +95,8 @@ func (u UserService) ChangePassword(
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ensure that the user uses the database backend; otherwise we can't change the password
|
// ensure that the user uses the database backend; otherwise we can't change the password
|
||||||
if !slices.ContainsFunc(user.Authentications, func(authentication domain.UserAuthentication) bool {
|
if user.Source != domain.UserSourceDatabase {
|
||||||
return authentication.Source == domain.UserSourceDatabase
|
return nil, fmt.Errorf("user source %s does not support password changes", user.Source)
|
||||||
}) {
|
|
||||||
return nil, fmt.Errorf("user has no linked authentication source that does support password changes")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// validate old password
|
// validate old password
|
||||||
|
|||||||
@@ -145,7 +145,6 @@ func (e ConfigEndpoint) handleSettingsGet() http.HandlerFunc {
|
|||||||
MinPasswordLength: e.cfg.Auth.MinPasswordLength,
|
MinPasswordLength: e.cfg.Auth.MinPasswordLength,
|
||||||
AvailableBackends: controllerFn(),
|
AvailableBackends: controllerFn(),
|
||||||
LoginFormVisible: !e.cfg.Auth.HideLoginForm || !hasSocialLogin,
|
LoginFormVisible: !e.cfg.Auth.HideLoginForm || !hasSocialLogin,
|
||||||
CreateDefaultPeer: e.cfg.Core.CreateDefaultPeer,
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ type Settings struct {
|
|||||||
MinPasswordLength int `json:"MinPasswordLength"`
|
MinPasswordLength int `json:"MinPasswordLength"`
|
||||||
AvailableBackends []SettingsBackendNames `json:"AvailableBackends"`
|
AvailableBackends []SettingsBackendNames `json:"AvailableBackends"`
|
||||||
LoginFormVisible bool `json:"LoginFormVisible"`
|
LoginFormVisible bool `json:"LoginFormVisible"`
|
||||||
CreateDefaultPeer bool `json:"CreateDefaultPeer"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type SettingsBackendNames struct {
|
type SettingsBackendNames struct {
|
||||||
|
|||||||
@@ -9,16 +9,15 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type Interface struct {
|
type Interface struct {
|
||||||
Identifier string `json:"Identifier" example:"wg0"` // device name, for example: wg0
|
Identifier string `json:"Identifier" example:"wg0"` // device name, for example: wg0
|
||||||
DisplayName string `json:"DisplayName"` // a nice display name/ description for the interface
|
DisplayName string `json:"DisplayName"` // a nice display name/ description for the interface
|
||||||
Mode string `json:"Mode" example:"server"` // the interface type, either 'server', 'client' or 'any'
|
Mode string `json:"Mode" example:"server"` // the interface type, either 'server', 'client' or 'any'
|
||||||
Backend string `json:"Backend" example:"local"` // the backend used for this interface e.g., local, mikrotik, ...
|
Backend string `json:"Backend" example:"local"` // the backend used for this interface e.g., local, mikrotik, ...
|
||||||
PrivateKey string `json:"PrivateKey" example:"abcdef=="` // private Key of the server interface
|
PrivateKey string `json:"PrivateKey" example:"abcdef=="` // private Key of the server interface
|
||||||
PublicKey string `json:"PublicKey" example:"abcdef=="` // public Key of the server interface
|
PublicKey string `json:"PublicKey" example:"abcdef=="` // public Key of the server interface
|
||||||
Disabled bool `json:"Disabled"` // flag that specifies if the interface is enabled (up) or not (down)
|
Disabled bool `json:"Disabled"` // flag that specifies if the interface is enabled (up) or not (down)
|
||||||
DisabledReason string `json:"DisabledReason"` // the reason why the interface has been disabled
|
DisabledReason string `json:"DisabledReason"` // the reason why the interface has been disabled
|
||||||
SaveConfig bool `json:"SaveConfig"` // automatically persist config changes to the wgX.conf file
|
SaveConfig bool `json:"SaveConfig"` // automatically persist config changes to the wgX.conf file
|
||||||
CreateDefaultPeer bool `json:"CreateDefaultPeer"` // if true, default peers will be created for this interface
|
|
||||||
|
|
||||||
ListenPort int `json:"ListenPort"` // the listening port, for example: 51820
|
ListenPort int `json:"ListenPort"` // the listening port, for example: 51820
|
||||||
Addresses []string `json:"Addresses"` // the interface ip addresses
|
Addresses []string `json:"Addresses"` // the interface ip addresses
|
||||||
@@ -66,7 +65,6 @@ func NewInterface(src *domain.Interface, peers []domain.Peer) *Interface {
|
|||||||
Disabled: src.IsDisabled(),
|
Disabled: src.IsDisabled(),
|
||||||
DisabledReason: src.DisabledReason,
|
DisabledReason: src.DisabledReason,
|
||||||
SaveConfig: src.SaveConfig,
|
SaveConfig: src.SaveConfig,
|
||||||
CreateDefaultPeer: src.CreateDefaultPeer,
|
|
||||||
ListenPort: src.ListenPort,
|
ListenPort: src.ListenPort,
|
||||||
Addresses: domain.CidrsToStringSlice(src.Addresses),
|
Addresses: domain.CidrsToStringSlice(src.Addresses),
|
||||||
Dns: internal.SliceString(src.DnsStr),
|
Dns: internal.SliceString(src.DnsStr),
|
||||||
@@ -153,7 +151,6 @@ func NewDomainInterface(src *Interface) *domain.Interface {
|
|||||||
PreDown: src.PreDown,
|
PreDown: src.PreDown,
|
||||||
PostDown: src.PostDown,
|
PostDown: src.PostDown,
|
||||||
SaveConfig: src.SaveConfig,
|
SaveConfig: src.SaveConfig,
|
||||||
CreateDefaultPeer: src.CreateDefaultPeer,
|
|
||||||
DisplayName: src.DisplayName,
|
DisplayName: src.DisplayName,
|
||||||
Type: domain.InterfaceType(src.Mode),
|
Type: domain.InterfaceType(src.Mode),
|
||||||
Backend: domain.InterfaceBackend(src.Backend),
|
Backend: domain.InterfaceBackend(src.Backend),
|
||||||
|
|||||||
@@ -3,15 +3,15 @@ package model
|
|||||||
import (
|
import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/h44z/wg-portal/internal"
|
|
||||||
"github.com/h44z/wg-portal/internal/domain"
|
"github.com/h44z/wg-portal/internal/domain"
|
||||||
)
|
)
|
||||||
|
|
||||||
type User struct {
|
type User struct {
|
||||||
Identifier string `json:"Identifier"`
|
Identifier string `json:"Identifier"`
|
||||||
Email string `json:"Email"`
|
Email string `json:"Email"`
|
||||||
AuthSources []string `json:"AuthSources"`
|
Source string `json:"Source"`
|
||||||
IsAdmin bool `json:"IsAdmin"`
|
ProviderName string `json:"ProviderName"`
|
||||||
|
IsAdmin bool `json:"IsAdmin"`
|
||||||
|
|
||||||
Firstname string `json:"Firstname"`
|
Firstname string `json:"Firstname"`
|
||||||
Lastname string `json:"Lastname"`
|
Lastname string `json:"Lastname"`
|
||||||
@@ -29,8 +29,6 @@ type User struct {
|
|||||||
ApiTokenCreated *time.Time `json:"ApiTokenCreated,omitempty"`
|
ApiTokenCreated *time.Time `json:"ApiTokenCreated,omitempty"`
|
||||||
ApiEnabled bool `json:"ApiEnabled"`
|
ApiEnabled bool `json:"ApiEnabled"`
|
||||||
|
|
||||||
PersistLocalChanges bool `json:"PersistLocalChanges"`
|
|
||||||
|
|
||||||
// Calculated
|
// Calculated
|
||||||
|
|
||||||
PeerCount int `json:"PeerCount"`
|
PeerCount int `json:"PeerCount"`
|
||||||
@@ -38,26 +36,24 @@ type User struct {
|
|||||||
|
|
||||||
func NewUser(src *domain.User, exposeCreds bool) *User {
|
func NewUser(src *domain.User, exposeCreds bool) *User {
|
||||||
u := &User{
|
u := &User{
|
||||||
Identifier: string(src.Identifier),
|
Identifier: string(src.Identifier),
|
||||||
Email: src.Email,
|
Email: src.Email,
|
||||||
AuthSources: internal.Map(src.Authentications, func(authentication domain.UserAuthentication) string {
|
Source: string(src.Source),
|
||||||
return string(authentication.Source)
|
ProviderName: src.ProviderName,
|
||||||
}),
|
IsAdmin: src.IsAdmin,
|
||||||
IsAdmin: src.IsAdmin,
|
Firstname: src.Firstname,
|
||||||
Firstname: src.Firstname,
|
Lastname: src.Lastname,
|
||||||
Lastname: src.Lastname,
|
Phone: src.Phone,
|
||||||
Phone: src.Phone,
|
Department: src.Department,
|
||||||
Department: src.Department,
|
Notes: src.Notes,
|
||||||
Notes: src.Notes,
|
Password: "", // never fill password
|
||||||
Password: "", // never fill password
|
Disabled: src.IsDisabled(),
|
||||||
Disabled: src.IsDisabled(),
|
DisabledReason: src.DisabledReason,
|
||||||
DisabledReason: src.DisabledReason,
|
Locked: src.IsLocked(),
|
||||||
Locked: src.IsLocked(),
|
LockedReason: src.LockedReason,
|
||||||
LockedReason: src.LockedReason,
|
ApiToken: "", // by default, do not expose API token
|
||||||
ApiToken: "", // by default, do not expose API token
|
ApiTokenCreated: src.ApiTokenCreated,
|
||||||
ApiTokenCreated: src.ApiTokenCreated,
|
ApiEnabled: src.IsApiEnabled(),
|
||||||
ApiEnabled: src.IsApiEnabled(),
|
|
||||||
PersistLocalChanges: src.PersistLocalChanges,
|
|
||||||
|
|
||||||
PeerCount: src.LinkedPeerCount,
|
PeerCount: src.LinkedPeerCount,
|
||||||
}
|
}
|
||||||
@@ -81,21 +77,22 @@ func NewUsers(src []domain.User) []User {
|
|||||||
func NewDomainUser(src *User) *domain.User {
|
func NewDomainUser(src *User) *domain.User {
|
||||||
now := time.Now()
|
now := time.Now()
|
||||||
res := &domain.User{
|
res := &domain.User{
|
||||||
Identifier: domain.UserIdentifier(src.Identifier),
|
Identifier: domain.UserIdentifier(src.Identifier),
|
||||||
Email: src.Email,
|
Email: src.Email,
|
||||||
IsAdmin: src.IsAdmin,
|
Source: domain.UserSource(src.Source),
|
||||||
Firstname: src.Firstname,
|
ProviderName: src.ProviderName,
|
||||||
Lastname: src.Lastname,
|
IsAdmin: src.IsAdmin,
|
||||||
Phone: src.Phone,
|
Firstname: src.Firstname,
|
||||||
Department: src.Department,
|
Lastname: src.Lastname,
|
||||||
Notes: src.Notes,
|
Phone: src.Phone,
|
||||||
Password: domain.PrivateString(src.Password),
|
Department: src.Department,
|
||||||
Disabled: nil, // set below
|
Notes: src.Notes,
|
||||||
DisabledReason: src.DisabledReason,
|
Password: domain.PrivateString(src.Password),
|
||||||
Locked: nil, // set below
|
Disabled: nil, // set below
|
||||||
LockedReason: src.LockedReason,
|
DisabledReason: src.DisabledReason,
|
||||||
LinkedPeerCount: src.PeerCount,
|
Locked: nil, // set below
|
||||||
PersistLocalChanges: src.PersistLocalChanges,
|
LockedReason: src.LockedReason,
|
||||||
|
LinkedPeerCount: src.PeerCount,
|
||||||
}
|
}
|
||||||
|
|
||||||
if src.Disabled {
|
if src.Disabled {
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package models
|
|||||||
import (
|
import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/h44z/wg-portal/internal"
|
|
||||||
"github.com/h44z/wg-portal/internal/domain"
|
"github.com/h44z/wg-portal/internal/domain"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -14,7 +13,9 @@ type User struct {
|
|||||||
// The email address of the user. This field is optional.
|
// The email address of the user. This field is optional.
|
||||||
Email string `json:"Email" binding:"omitempty,email" example:"test@test.com"`
|
Email string `json:"Email" binding:"omitempty,email" example:"test@test.com"`
|
||||||
// The source of the user. This field is optional.
|
// The source of the user. This field is optional.
|
||||||
AuthSources []string `json:"AuthSources" readonly:"true" binding:"oneof=db ldap oauth" example:"db"`
|
Source string `json:"Source" binding:"oneof=db ldap oauth" example:"db"`
|
||||||
|
// The name of the authentication provider. This field is read-only.
|
||||||
|
ProviderName string `json:"ProviderName,omitempty" readonly:"true" example:""`
|
||||||
// If this field is set, the user is an admin.
|
// If this field is set, the user is an admin.
|
||||||
IsAdmin bool `json:"IsAdmin" example:"false"`
|
IsAdmin bool `json:"IsAdmin" example:"false"`
|
||||||
|
|
||||||
@@ -51,11 +52,10 @@ type User struct {
|
|||||||
|
|
||||||
func NewUser(src *domain.User, exposeCredentials bool) *User {
|
func NewUser(src *domain.User, exposeCredentials bool) *User {
|
||||||
u := &User{
|
u := &User{
|
||||||
Identifier: string(src.Identifier),
|
Identifier: string(src.Identifier),
|
||||||
Email: src.Email,
|
Email: src.Email,
|
||||||
AuthSources: internal.Map(src.Authentications, func(authentication domain.UserAuthentication) string {
|
Source: string(src.Source),
|
||||||
return string(authentication.Source)
|
ProviderName: src.ProviderName,
|
||||||
}),
|
|
||||||
IsAdmin: src.IsAdmin,
|
IsAdmin: src.IsAdmin,
|
||||||
Firstname: src.Firstname,
|
Firstname: src.Firstname,
|
||||||
Lastname: src.Lastname,
|
Lastname: src.Lastname,
|
||||||
@@ -93,6 +93,8 @@ func NewDomainUser(src *User) *domain.User {
|
|||||||
res := &domain.User{
|
res := &domain.User{
|
||||||
Identifier: domain.UserIdentifier(src.Identifier),
|
Identifier: domain.UserIdentifier(src.Identifier),
|
||||||
Email: src.Email,
|
Email: src.Email,
|
||||||
|
Source: domain.UserSource(src.Source),
|
||||||
|
ProviderName: src.ProviderName,
|
||||||
IsAdmin: src.IsAdmin,
|
IsAdmin: src.IsAdmin,
|
||||||
Firstname: src.Firstname,
|
Firstname: src.Firstname,
|
||||||
Lastname: src.Lastname,
|
Lastname: src.Lastname,
|
||||||
|
|||||||
@@ -129,6 +129,8 @@ func (a *App) createDefaultUser(ctx context.Context) error {
|
|||||||
},
|
},
|
||||||
Identifier: adminUserId,
|
Identifier: adminUserId,
|
||||||
Email: "admin@wgportal.local",
|
Email: "admin@wgportal.local",
|
||||||
|
Source: domain.UserSourceDatabase,
|
||||||
|
ProviderName: "",
|
||||||
IsAdmin: true,
|
IsAdmin: true,
|
||||||
Firstname: "WireGuard Portal",
|
Firstname: "WireGuard Portal",
|
||||||
Lastname: "Admin",
|
Lastname: "Admin",
|
||||||
|
|||||||
@@ -29,8 +29,8 @@ type UserManager interface {
|
|||||||
GetUser(context.Context, domain.UserIdentifier) (*domain.User, error)
|
GetUser(context.Context, domain.UserIdentifier) (*domain.User, error)
|
||||||
// RegisterUser creates a new user in the database.
|
// RegisterUser creates a new user in the database.
|
||||||
RegisterUser(ctx context.Context, user *domain.User) error
|
RegisterUser(ctx context.Context, user *domain.User) error
|
||||||
// UpdateUserInternal updates an existing user in the database.
|
// UpdateUser updates an existing user in the database.
|
||||||
UpdateUserInternal(ctx context.Context, user *domain.User) (*domain.User, error)
|
UpdateUser(ctx context.Context, user *domain.User) (*domain.User, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
type EventBus interface {
|
type EventBus interface {
|
||||||
@@ -232,7 +232,7 @@ func (a *Authenticator) setupExternalAuthProviders(
|
|||||||
}
|
}
|
||||||
for i := range ldap { // LDAP
|
for i := range ldap { // LDAP
|
||||||
providerCfg := &ldap[i]
|
providerCfg := &ldap[i]
|
||||||
providerId := strings.ToLower(providerCfg.ProviderName)
|
providerId := strings.ToLower(providerCfg.URL)
|
||||||
|
|
||||||
if _, exists := a.ldapAuthenticators[providerId]; exists {
|
if _, exists := a.ldapAuthenticators[providerId]; exists {
|
||||||
// this is an unrecoverable error, we cannot register the same provider twice
|
// this is an unrecoverable error, we cannot register the same provider twice
|
||||||
@@ -354,45 +354,21 @@ func (a *Authenticator) passwordAuthentication(
|
|||||||
var ldapProvider AuthenticatorLdap
|
var ldapProvider AuthenticatorLdap
|
||||||
|
|
||||||
var userInDatabase = false
|
var userInDatabase = false
|
||||||
|
var userSource domain.UserSource
|
||||||
existingUser, err := a.users.GetUser(ctx, identifier)
|
existingUser, err := a.users.GetUser(ctx, identifier)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
userInDatabase = true
|
userInDatabase = true
|
||||||
|
userSource = existingUser.Source
|
||||||
}
|
}
|
||||||
if userInDatabase && (existingUser.IsLocked() || existingUser.IsDisabled()) {
|
if userInDatabase && (existingUser.IsLocked() || existingUser.IsDisabled()) {
|
||||||
return nil, errors.New("user is locked")
|
return nil, errors.New("user is locked")
|
||||||
}
|
}
|
||||||
|
|
||||||
authOK := false
|
if !userInDatabase || userSource == domain.UserSourceLdap {
|
||||||
if userInDatabase {
|
// search user in ldap if registration is enabled
|
||||||
// User is already in db, search for authentication sources which support password authentication and
|
|
||||||
// validate the password.
|
|
||||||
for _, authentication := range existingUser.Authentications {
|
|
||||||
if authentication.Source == domain.UserSourceDatabase {
|
|
||||||
err := existingUser.CheckPassword(password)
|
|
||||||
if err == nil {
|
|
||||||
authOK = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if authentication.Source == domain.UserSourceLdap {
|
|
||||||
ldapProvider, ok := a.ldapAuthenticators[strings.ToLower(authentication.ProviderName)]
|
|
||||||
if !ok {
|
|
||||||
continue // ldap provider not found, skip further checks
|
|
||||||
}
|
|
||||||
err := ldapProvider.PlaintextAuthentication(identifier, password)
|
|
||||||
if err == nil {
|
|
||||||
authOK = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// User is not yet in the db, check ldap providers which have registration enabled.
|
|
||||||
// If the user is found, check the password - on success, sync it to the db.
|
|
||||||
for _, ldapAuth := range a.ldapAuthenticators {
|
for _, ldapAuth := range a.ldapAuthenticators {
|
||||||
if !ldapAuth.RegistrationEnabled() {
|
if !userInDatabase && !ldapAuth.RegistrationEnabled() {
|
||||||
continue // ldap provider does not support registration, skip further checks
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
rawUserInfo, err := ldapAuth.GetUserInfo(context.Background(), identifier)
|
rawUserInfo, err := ldapAuth.GetUserInfo(context.Background(), identifier)
|
||||||
@@ -403,39 +379,55 @@ func (a *Authenticator) passwordAuthentication(
|
|||||||
}
|
}
|
||||||
continue // user not found / other ldap error
|
continue // user not found / other ldap error
|
||||||
}
|
}
|
||||||
|
|
||||||
// user found, check if the password is correct
|
|
||||||
err = ldapAuth.PlaintextAuthentication(identifier, password)
|
|
||||||
if err != nil {
|
|
||||||
continue // password is incorrect, skip further checks
|
|
||||||
}
|
|
||||||
|
|
||||||
// create a new user in the db
|
|
||||||
ldapUserInfo, err = ldapAuth.ParseUserInfo(rawUserInfo)
|
ldapUserInfo, err = ldapAuth.ParseUserInfo(rawUserInfo)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("failed to parse ldap user info",
|
slog.Error("failed to parse ldap user info",
|
||||||
"source", ldapAuth.GetName(), "identifier", identifier, "error", err)
|
"source", ldapAuth.GetName(), "identifier", identifier, "error", err)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
user, err := a.processUserInfo(ctx, ldapUserInfo, domain.UserSourceLdap, ldapProvider.GetName(), true)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("unable to process user information: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
existingUser = user
|
// ldap user found
|
||||||
slog.Debug("created new LDAP user in db",
|
userSource = domain.UserSourceLdap
|
||||||
"identifier", user.Identifier, "provider", ldapProvider.GetName())
|
ldapProvider = ldapAuth
|
||||||
|
|
||||||
authOK = true
|
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if !authOK {
|
if userSource == "" {
|
||||||
return nil, errors.New("failed to authenticate user")
|
slog.Warn("no user source found for user",
|
||||||
|
"identifier", identifier, "ldapProviderCount", len(a.ldapAuthenticators), "inDb", userInDatabase)
|
||||||
|
return nil, errors.New("user not found")
|
||||||
}
|
}
|
||||||
|
|
||||||
return existingUser, nil
|
if userSource == domain.UserSourceLdap && ldapProvider == nil {
|
||||||
|
slog.Warn("no ldap provider found for user",
|
||||||
|
"identifier", identifier, "ldapProviderCount", len(a.ldapAuthenticators), "inDb", userInDatabase)
|
||||||
|
return nil, errors.New("ldap provider not found")
|
||||||
|
}
|
||||||
|
|
||||||
|
switch userSource {
|
||||||
|
case domain.UserSourceDatabase:
|
||||||
|
err = existingUser.CheckPassword(password)
|
||||||
|
case domain.UserSourceLdap:
|
||||||
|
err = ldapProvider.PlaintextAuthentication(identifier, password)
|
||||||
|
default:
|
||||||
|
err = errors.New("no authentication backend available")
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to authenticate: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !userInDatabase {
|
||||||
|
user, err := a.processUserInfo(ctx, ldapUserInfo, domain.UserSourceLdap, ldapProvider.GetName(),
|
||||||
|
ldapProvider.RegistrationEnabled())
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("unable to process user information: %w", err)
|
||||||
|
}
|
||||||
|
return user, nil
|
||||||
|
} else {
|
||||||
|
return existingUser, nil
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// endregion password authentication
|
// endregion password authentication
|
||||||
@@ -598,34 +590,17 @@ func (a *Authenticator) registerNewUser(
|
|||||||
source domain.UserSource,
|
source domain.UserSource,
|
||||||
provider string,
|
provider string,
|
||||||
) (*domain.User, error) {
|
) (*domain.User, error) {
|
||||||
ctxUserInfo := domain.GetUserInfo(ctx)
|
|
||||||
now := time.Now()
|
|
||||||
|
|
||||||
// convert user info to domain.User
|
// convert user info to domain.User
|
||||||
user := &domain.User{
|
user := &domain.User{
|
||||||
Identifier: userInfo.Identifier,
|
Identifier: userInfo.Identifier,
|
||||||
Email: userInfo.Email,
|
Email: userInfo.Email,
|
||||||
IsAdmin: false,
|
Source: source,
|
||||||
Firstname: userInfo.Firstname,
|
ProviderName: provider,
|
||||||
Lastname: userInfo.Lastname,
|
IsAdmin: userInfo.IsAdmin,
|
||||||
Phone: userInfo.Phone,
|
Firstname: userInfo.Firstname,
|
||||||
Department: userInfo.Department,
|
Lastname: userInfo.Lastname,
|
||||||
Authentications: []domain.UserAuthentication{
|
Phone: userInfo.Phone,
|
||||||
{
|
Department: userInfo.Department,
|
||||||
BaseModel: domain.BaseModel{
|
|
||||||
CreatedBy: ctxUserInfo.UserId(),
|
|
||||||
UpdatedBy: ctxUserInfo.UserId(),
|
|
||||||
CreatedAt: now,
|
|
||||||
UpdatedAt: now,
|
|
||||||
},
|
|
||||||
UserIdentifier: userInfo.Identifier,
|
|
||||||
Source: source,
|
|
||||||
ProviderName: provider,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
if userInfo.AdminInfoAvailable && userInfo.IsAdmin {
|
|
||||||
user.IsAdmin = true
|
|
||||||
}
|
}
|
||||||
|
|
||||||
err := a.users.RegisterUser(ctx, user)
|
err := a.users.RegisterUser(ctx, user)
|
||||||
@@ -635,7 +610,6 @@ func (a *Authenticator) registerNewUser(
|
|||||||
|
|
||||||
slog.Debug("registered user from external authentication provider",
|
slog.Debug("registered user from external authentication provider",
|
||||||
"user", user.Identifier,
|
"user", user.Identifier,
|
||||||
"adminInfoAvailable", userInfo.AdminInfoAvailable,
|
|
||||||
"isAdmin", user.IsAdmin,
|
"isAdmin", user.IsAdmin,
|
||||||
"provider", source)
|
"provider", source)
|
||||||
|
|
||||||
@@ -669,39 +643,6 @@ func (a *Authenticator) updateExternalUser(
|
|||||||
return nil // user is locked or disabled, do not update
|
return nil // user is locked or disabled, do not update
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update authentication sources
|
|
||||||
foundAuthSource := false
|
|
||||||
for _, auth := range existingUser.Authentications {
|
|
||||||
if auth.Source == source && auth.ProviderName == provider {
|
|
||||||
foundAuthSource = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if !foundAuthSource {
|
|
||||||
ctxUserInfo := domain.GetUserInfo(ctx)
|
|
||||||
now := time.Now()
|
|
||||||
existingUser.Authentications = append(existingUser.Authentications, domain.UserAuthentication{
|
|
||||||
BaseModel: domain.BaseModel{
|
|
||||||
CreatedBy: ctxUserInfo.UserId(),
|
|
||||||
UpdatedBy: ctxUserInfo.UserId(),
|
|
||||||
CreatedAt: now,
|
|
||||||
UpdatedAt: now,
|
|
||||||
},
|
|
||||||
UserIdentifier: existingUser.Identifier,
|
|
||||||
Source: source,
|
|
||||||
ProviderName: provider,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
if existingUser.PersistLocalChanges {
|
|
||||||
if !foundAuthSource {
|
|
||||||
// Even if local changes are persisted, we need to save the new authentication source
|
|
||||||
_, err := a.users.UpdateUserInternal(ctx, existingUser)
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
isChanged := false
|
isChanged := false
|
||||||
if existingUser.Email != userInfo.Email {
|
if existingUser.Email != userInfo.Email {
|
||||||
existingUser.Email = userInfo.Email
|
existingUser.Email = userInfo.Email
|
||||||
@@ -723,23 +664,32 @@ func (a *Authenticator) updateExternalUser(
|
|||||||
existingUser.Department = userInfo.Department
|
existingUser.Department = userInfo.Department
|
||||||
isChanged = true
|
isChanged = true
|
||||||
}
|
}
|
||||||
if userInfo.AdminInfoAvailable && existingUser.IsAdmin != userInfo.IsAdmin {
|
if existingUser.IsAdmin != userInfo.IsAdmin {
|
||||||
existingUser.IsAdmin = userInfo.IsAdmin
|
existingUser.IsAdmin = userInfo.IsAdmin
|
||||||
isChanged = true
|
isChanged = true
|
||||||
}
|
}
|
||||||
|
if existingUser.Source != source {
|
||||||
if isChanged || !foundAuthSource {
|
existingUser.Source = source
|
||||||
_, err := a.users.UpdateUserInternal(ctx, existingUser)
|
isChanged = true
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to update user: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
slog.Debug("updated user with data from external authentication provider",
|
|
||||||
"user", existingUser.Identifier,
|
|
||||||
"adminInfoAvailable", userInfo.AdminInfoAvailable,
|
|
||||||
"isAdmin", existingUser.IsAdmin,
|
|
||||||
"provider", source)
|
|
||||||
}
|
}
|
||||||
|
if existingUser.ProviderName != provider {
|
||||||
|
existingUser.ProviderName = provider
|
||||||
|
isChanged = true
|
||||||
|
}
|
||||||
|
|
||||||
|
if !isChanged {
|
||||||
|
return nil // nothing to update
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err := a.users.UpdateUser(ctx, existingUser)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to update user: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
slog.Debug("updated user with data from external authentication provider",
|
||||||
|
"user", existingUser.Identifier,
|
||||||
|
"isAdmin", existingUser.IsAdmin,
|
||||||
|
"provider", source)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -127,26 +127,18 @@ func (l LdapAuthenticator) GetUserInfo(_ context.Context, userId domain.UserIden
|
|||||||
|
|
||||||
// ParseUserInfo parses the user information from the LDAP server into a domain.AuthenticatorUserInfo struct.
|
// ParseUserInfo parses the user information from the LDAP server into a domain.AuthenticatorUserInfo struct.
|
||||||
func (l LdapAuthenticator) ParseUserInfo(raw map[string]any) (*domain.AuthenticatorUserInfo, error) {
|
func (l LdapAuthenticator) ParseUserInfo(raw map[string]any) (*domain.AuthenticatorUserInfo, error) {
|
||||||
isAdmin := false
|
isAdmin, err := internal.LdapIsMemberOf(raw[l.cfg.FieldMap.GroupMembership].([][]byte), l.cfg.ParsedAdminGroupDN)
|
||||||
adminInfoAvailable := false
|
if err != nil {
|
||||||
if l.cfg.FieldMap.GroupMembership != "" {
|
return nil, fmt.Errorf("failed to check admin group: %w", err)
|
||||||
adminInfoAvailable = true
|
|
||||||
var err error
|
|
||||||
isAdmin, err = internal.LdapIsMemberOf(raw[l.cfg.FieldMap.GroupMembership].([][]byte), l.cfg.ParsedAdminGroupDN)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("failed to check admin group: %w", err)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
userInfo := &domain.AuthenticatorUserInfo{
|
userInfo := &domain.AuthenticatorUserInfo{
|
||||||
Identifier: domain.UserIdentifier(internal.MapDefaultString(raw, l.cfg.FieldMap.UserIdentifier, "")),
|
Identifier: domain.UserIdentifier(internal.MapDefaultString(raw, l.cfg.FieldMap.UserIdentifier, "")),
|
||||||
Email: internal.MapDefaultString(raw, l.cfg.FieldMap.Email, ""),
|
Email: internal.MapDefaultString(raw, l.cfg.FieldMap.Email, ""),
|
||||||
Firstname: internal.MapDefaultString(raw, l.cfg.FieldMap.Firstname, ""),
|
Firstname: internal.MapDefaultString(raw, l.cfg.FieldMap.Firstname, ""),
|
||||||
Lastname: internal.MapDefaultString(raw, l.cfg.FieldMap.Lastname, ""),
|
Lastname: internal.MapDefaultString(raw, l.cfg.FieldMap.Lastname, ""),
|
||||||
Phone: internal.MapDefaultString(raw, l.cfg.FieldMap.Phone, ""),
|
Phone: internal.MapDefaultString(raw, l.cfg.FieldMap.Phone, ""),
|
||||||
Department: internal.MapDefaultString(raw, l.cfg.FieldMap.Department, ""),
|
Department: internal.MapDefaultString(raw, l.cfg.FieldMap.Department, ""),
|
||||||
IsAdmin: isAdmin,
|
IsAdmin: isAdmin,
|
||||||
AdminInfoAvailable: adminInfoAvailable,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return userInfo, nil
|
return userInfo, nil
|
||||||
|
|||||||
@@ -15,11 +15,9 @@ func parseOauthUserInfo(
|
|||||||
raw map[string]any,
|
raw map[string]any,
|
||||||
) (*domain.AuthenticatorUserInfo, error) {
|
) (*domain.AuthenticatorUserInfo, error) {
|
||||||
var isAdmin bool
|
var isAdmin bool
|
||||||
var adminInfoAvailable bool
|
|
||||||
|
|
||||||
// first try to match the is_admin field against the given regex
|
// first try to match the is_admin field against the given regex
|
||||||
if mapping.IsAdmin != "" {
|
if mapping.IsAdmin != "" {
|
||||||
adminInfoAvailable = true
|
|
||||||
re := adminMapping.GetAdminValueRegex()
|
re := adminMapping.GetAdminValueRegex()
|
||||||
if re.MatchString(strings.TrimSpace(internal.MapDefaultString(raw, mapping.IsAdmin, ""))) {
|
if re.MatchString(strings.TrimSpace(internal.MapDefaultString(raw, mapping.IsAdmin, ""))) {
|
||||||
isAdmin = true
|
isAdmin = true
|
||||||
@@ -28,7 +26,6 @@ func parseOauthUserInfo(
|
|||||||
|
|
||||||
// next try to parse the user's groups
|
// next try to parse the user's groups
|
||||||
if !isAdmin && mapping.UserGroups != "" && adminMapping.AdminGroupRegex != "" {
|
if !isAdmin && mapping.UserGroups != "" && adminMapping.AdminGroupRegex != "" {
|
||||||
adminInfoAvailable = true
|
|
||||||
userGroups := internal.MapDefaultStringSlice(raw, mapping.UserGroups, nil)
|
userGroups := internal.MapDefaultStringSlice(raw, mapping.UserGroups, nil)
|
||||||
re := adminMapping.GetAdminGroupRegex()
|
re := adminMapping.GetAdminGroupRegex()
|
||||||
for _, group := range userGroups {
|
for _, group := range userGroups {
|
||||||
@@ -40,14 +37,13 @@ func parseOauthUserInfo(
|
|||||||
}
|
}
|
||||||
|
|
||||||
userInfo := &domain.AuthenticatorUserInfo{
|
userInfo := &domain.AuthenticatorUserInfo{
|
||||||
Identifier: domain.UserIdentifier(internal.MapDefaultString(raw, mapping.UserIdentifier, "")),
|
Identifier: domain.UserIdentifier(internal.MapDefaultString(raw, mapping.UserIdentifier, "")),
|
||||||
Email: internal.MapDefaultString(raw, mapping.Email, ""),
|
Email: internal.MapDefaultString(raw, mapping.Email, ""),
|
||||||
Firstname: internal.MapDefaultString(raw, mapping.Firstname, ""),
|
Firstname: internal.MapDefaultString(raw, mapping.Firstname, ""),
|
||||||
Lastname: internal.MapDefaultString(raw, mapping.Lastname, ""),
|
Lastname: internal.MapDefaultString(raw, mapping.Lastname, ""),
|
||||||
Phone: internal.MapDefaultString(raw, mapping.Phone, ""),
|
Phone: internal.MapDefaultString(raw, mapping.Phone, ""),
|
||||||
Department: internal.MapDefaultString(raw, mapping.Department, ""),
|
Department: internal.MapDefaultString(raw, mapping.Department, ""),
|
||||||
IsAdmin: isAdmin,
|
IsAdmin: isAdmin,
|
||||||
AdminInfoAvailable: adminInfoAvailable,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return userInfo, nil
|
return userInfo, nil
|
||||||
|
|||||||
@@ -23,8 +23,8 @@ type WebAuthnUserManager interface {
|
|||||||
GetUser(context.Context, domain.UserIdentifier) (*domain.User, error)
|
GetUser(context.Context, domain.UserIdentifier) (*domain.User, error)
|
||||||
// GetUserByWebAuthnCredential returns a user by its WebAuthn ID.
|
// GetUserByWebAuthnCredential returns a user by its WebAuthn ID.
|
||||||
GetUserByWebAuthnCredential(ctx context.Context, credentialIdBase64 string) (*domain.User, error)
|
GetUserByWebAuthnCredential(ctx context.Context, credentialIdBase64 string) (*domain.User, error)
|
||||||
// UpdateUserInternal updates an existing user in the database.
|
// UpdateUser updates an existing user in the database.
|
||||||
UpdateUserInternal(ctx context.Context, user *domain.User) (*domain.User, error)
|
UpdateUser(ctx context.Context, user *domain.User) (*domain.User, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
type WebAuthnAuthenticator struct {
|
type WebAuthnAuthenticator struct {
|
||||||
@@ -89,7 +89,7 @@ func (a *WebAuthnAuthenticator) StartWebAuthnRegistration(ctx context.Context, u
|
|||||||
|
|
||||||
if user.WebAuthnId == "" {
|
if user.WebAuthnId == "" {
|
||||||
user.GenerateWebAuthnId()
|
user.GenerateWebAuthnId()
|
||||||
user, err = a.users.UpdateUserInternal(ctx, user)
|
user, err = a.users.UpdateUser(ctx, user)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, fmt.Errorf("failed to store webauthn id to user: %w", err)
|
return nil, nil, fmt.Errorf("failed to store webauthn id to user: %w", err)
|
||||||
}
|
}
|
||||||
@@ -150,7 +150,7 @@ func (a *WebAuthnAuthenticator) FinishWebAuthnRegistration(
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
user, err = a.users.UpdateUserInternal(ctx, user)
|
user, err = a.users.UpdateUser(ctx, user)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -181,7 +181,7 @@ func (a *WebAuthnAuthenticator) RemoveCredential(
|
|||||||
}
|
}
|
||||||
|
|
||||||
user.RemoveCredential(credentialIdBase64)
|
user.RemoveCredential(credentialIdBase64)
|
||||||
user, err = a.users.UpdateUserInternal(ctx, user)
|
user, err = a.users.UpdateUser(ctx, user)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -205,7 +205,7 @@ func (a *WebAuthnAuthenticator) UpdateCredential(
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
user, err = a.users.UpdateUserInternal(ctx, user)
|
user, err = a.users.UpdateUser(ctx, user)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -144,6 +144,8 @@ func migrateV1Users(oldDb, newDb *gorm.DB) error {
|
|||||||
},
|
},
|
||||||
Identifier: domain.UserIdentifier(oldUser.Email),
|
Identifier: domain.UserIdentifier(oldUser.Email),
|
||||||
Email: oldUser.Email,
|
Email: oldUser.Email,
|
||||||
|
Source: domain.UserSource(oldUser.Source),
|
||||||
|
ProviderName: "",
|
||||||
IsAdmin: oldUser.IsAdmin,
|
IsAdmin: oldUser.IsAdmin,
|
||||||
Firstname: oldUser.Firstname,
|
Firstname: oldUser.Firstname,
|
||||||
Lastname: oldUser.Lastname,
|
Lastname: oldUser.Lastname,
|
||||||
@@ -157,25 +159,11 @@ func migrateV1Users(oldDb, newDb *gorm.DB) error {
|
|||||||
LockedReason: "",
|
LockedReason: "",
|
||||||
LinkedPeerCount: 0,
|
LinkedPeerCount: 0,
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := newDb.Create(&newUser).Error; err != nil {
|
if err := newDb.Create(&newUser).Error; err != nil {
|
||||||
return fmt.Errorf("failed to migrate user %s: %w", oldUser.Email, err)
|
return fmt.Errorf("failed to migrate user %s: %w", oldUser.Email, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
authentication := domain.UserAuthentication{
|
|
||||||
BaseModel: domain.BaseModel{
|
|
||||||
CreatedBy: domain.CtxSystemV1Migrator,
|
|
||||||
UpdatedBy: domain.CtxSystemV1Migrator,
|
|
||||||
CreatedAt: oldUser.CreatedAt,
|
|
||||||
UpdatedAt: oldUser.UpdatedAt,
|
|
||||||
},
|
|
||||||
UserIdentifier: domain.UserIdentifier(oldUser.Email),
|
|
||||||
Source: domain.UserSource(oldUser.Source),
|
|
||||||
ProviderName: "", // unknown
|
|
||||||
}
|
|
||||||
if err := newDb.Create(&authentication).Error; err != nil {
|
|
||||||
return fmt.Errorf("failed to migrate user-authentication %s: %w", oldUser.Email, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
slog.Debug("user migrated successfully", "identifier", newUser.Identifier)
|
slog.Debug("user migrated successfully", "identifier", newUser.Identifier)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -358,6 +346,8 @@ func migrateV1Peers(oldDb, newDb *gorm.DB) error {
|
|||||||
},
|
},
|
||||||
Identifier: domain.UserIdentifier(oldPeer.Email),
|
Identifier: domain.UserIdentifier(oldPeer.Email),
|
||||||
Email: oldPeer.Email,
|
Email: oldPeer.Email,
|
||||||
|
Source: domain.UserSourceDatabase,
|
||||||
|
ProviderName: "",
|
||||||
IsAdmin: false,
|
IsAdmin: false,
|
||||||
Locked: &now,
|
Locked: &now,
|
||||||
LockedReason: domain.DisabledReasonMigrationDummy,
|
LockedReason: domain.DisabledReasonMigrationDummy,
|
||||||
@@ -368,21 +358,6 @@ func migrateV1Peers(oldDb, newDb *gorm.DB) error {
|
|||||||
return fmt.Errorf("failed to migrate dummy user %s: %w", oldPeer.Email, err)
|
return fmt.Errorf("failed to migrate dummy user %s: %w", oldPeer.Email, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
authentication := domain.UserAuthentication{
|
|
||||||
BaseModel: domain.BaseModel{
|
|
||||||
CreatedBy: domain.CtxSystemV1Migrator,
|
|
||||||
UpdatedBy: domain.CtxSystemV1Migrator,
|
|
||||||
CreatedAt: now,
|
|
||||||
UpdatedAt: now,
|
|
||||||
},
|
|
||||||
UserIdentifier: domain.UserIdentifier(oldPeer.Email),
|
|
||||||
Source: domain.UserSourceDatabase,
|
|
||||||
ProviderName: "", // unknown
|
|
||||||
}
|
|
||||||
if err := newDb.Create(&authentication).Error; err != nil {
|
|
||||||
return fmt.Errorf("failed to migrate dummy user-authentication %s: %w", oldPeer.Email, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
slog.Debug("dummy user migrated successfully", "identifier", user.Identifier)
|
slog.Debug("dummy user migrated successfully", "identifier", user.Identifier)
|
||||||
}
|
}
|
||||||
newPeer := domain.Peer{
|
newPeer := domain.Peer{
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ package users
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"slices"
|
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@@ -26,8 +25,6 @@ func convertRawLdapUser(
|
|||||||
return nil, fmt.Errorf("failed to check admin group: %w", err)
|
return nil, fmt.Errorf("failed to check admin group: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
uid := domain.UserIdentifier(internal.MapDefaultString(rawUser, fields.UserIdentifier, ""))
|
|
||||||
|
|
||||||
return &domain.User{
|
return &domain.User{
|
||||||
BaseModel: domain.BaseModel{
|
BaseModel: domain.BaseModel{
|
||||||
CreatedBy: domain.CtxSystemLdapSyncer,
|
CreatedBy: domain.CtxSystemLdapSyncer,
|
||||||
@@ -35,23 +32,18 @@ func convertRawLdapUser(
|
|||||||
CreatedAt: now,
|
CreatedAt: now,
|
||||||
UpdatedAt: now,
|
UpdatedAt: now,
|
||||||
},
|
},
|
||||||
Identifier: uid,
|
Identifier: domain.UserIdentifier(internal.MapDefaultString(rawUser, fields.UserIdentifier, "")),
|
||||||
Email: strings.ToLower(internal.MapDefaultString(rawUser, fields.Email, "")),
|
Email: strings.ToLower(internal.MapDefaultString(rawUser, fields.Email, "")),
|
||||||
IsAdmin: isAdmin,
|
Source: domain.UserSourceLdap,
|
||||||
Authentications: []domain.UserAuthentication{
|
ProviderName: providerName,
|
||||||
{
|
IsAdmin: isAdmin,
|
||||||
UserIdentifier: uid,
|
Firstname: internal.MapDefaultString(rawUser, fields.Firstname, ""),
|
||||||
Source: domain.UserSourceLdap,
|
Lastname: internal.MapDefaultString(rawUser, fields.Lastname, ""),
|
||||||
ProviderName: providerName,
|
Phone: internal.MapDefaultString(rawUser, fields.Phone, ""),
|
||||||
},
|
Department: internal.MapDefaultString(rawUser, fields.Department, ""),
|
||||||
},
|
Notes: "",
|
||||||
Firstname: internal.MapDefaultString(rawUser, fields.Firstname, ""),
|
Password: "",
|
||||||
Lastname: internal.MapDefaultString(rawUser, fields.Lastname, ""),
|
Disabled: nil,
|
||||||
Phone: internal.MapDefaultString(rawUser, fields.Phone, ""),
|
|
||||||
Department: internal.MapDefaultString(rawUser, fields.Department, ""),
|
|
||||||
Notes: "",
|
|
||||||
Password: "",
|
|
||||||
Disabled: nil,
|
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -80,9 +72,7 @@ func userChangedInLdap(dbUser, ldapUser *domain.User) bool {
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
if !slices.ContainsFunc(dbUser.Authentications, func(authentication domain.UserAuthentication) bool {
|
if dbUser.ProviderName != ldapUser.ProviderName {
|
||||||
return authentication.Source == ldapUser.Authentications[0].Source
|
|
||||||
}) {
|
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,239 +0,0 @@
|
|||||||
package users
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"log/slog"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/go-ldap/ldap/v3"
|
|
||||||
|
|
||||||
"github.com/h44z/wg-portal/internal"
|
|
||||||
"github.com/h44z/wg-portal/internal/app"
|
|
||||||
"github.com/h44z/wg-portal/internal/config"
|
|
||||||
"github.com/h44z/wg-portal/internal/domain"
|
|
||||||
)
|
|
||||||
|
|
||||||
func (m Manager) runLdapSynchronizationService(ctx context.Context) {
|
|
||||||
ctx = domain.SetUserInfo(ctx, domain.LdapSyncContextUserInfo()) // switch to service context for LDAP sync
|
|
||||||
|
|
||||||
for _, ldapCfg := range m.cfg.Auth.Ldap { // LDAP Auth providers
|
|
||||||
go func(cfg config.LdapProvider) {
|
|
||||||
syncInterval := cfg.SyncInterval
|
|
||||||
if syncInterval == 0 {
|
|
||||||
slog.Debug("sync disabled for LDAP server", "provider", cfg.ProviderName)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// perform initial sync
|
|
||||||
err := m.synchronizeLdapUsers(ctx, &cfg)
|
|
||||||
if err != nil {
|
|
||||||
slog.Error("failed to synchronize LDAP users", "provider", cfg.ProviderName, "error", err)
|
|
||||||
} else {
|
|
||||||
slog.Debug("initial LDAP user sync completed", "provider", cfg.ProviderName)
|
|
||||||
}
|
|
||||||
|
|
||||||
// start periodic sync
|
|
||||||
running := true
|
|
||||||
for running {
|
|
||||||
select {
|
|
||||||
case <-ctx.Done():
|
|
||||||
running = false
|
|
||||||
continue
|
|
||||||
case <-time.After(syncInterval):
|
|
||||||
// select blocks until one of the cases evaluate to true
|
|
||||||
}
|
|
||||||
|
|
||||||
err := m.synchronizeLdapUsers(ctx, &cfg)
|
|
||||||
if err != nil {
|
|
||||||
slog.Error("failed to synchronize LDAP users", "provider", cfg.ProviderName, "error", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}(ldapCfg)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m Manager) synchronizeLdapUsers(ctx context.Context, provider *config.LdapProvider) error {
|
|
||||||
slog.Debug("starting to synchronize users", "provider", provider.ProviderName)
|
|
||||||
|
|
||||||
dn, err := ldap.ParseDN(provider.AdminGroupDN)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to parse admin group DN: %w", err)
|
|
||||||
}
|
|
||||||
provider.ParsedAdminGroupDN = dn
|
|
||||||
|
|
||||||
conn, err := internal.LdapConnect(provider)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to setup LDAP connection: %w", err)
|
|
||||||
}
|
|
||||||
defer internal.LdapDisconnect(conn)
|
|
||||||
|
|
||||||
rawUsers, err := internal.LdapFindAllUsers(conn, provider.BaseDN, provider.SyncFilter, &provider.FieldMap)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
slog.Debug("fetched raw ldap users", "count", len(rawUsers), "provider", provider.ProviderName)
|
|
||||||
|
|
||||||
// Update existing LDAP users
|
|
||||||
err = m.updateLdapUsers(ctx, provider, rawUsers, &provider.FieldMap, provider.ParsedAdminGroupDN)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
// Disable missing LDAP users
|
|
||||||
if provider.DisableMissing {
|
|
||||||
err = m.disableMissingLdapUsers(ctx, provider.ProviderName, rawUsers, &provider.FieldMap)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m Manager) updateLdapUsers(
|
|
||||||
ctx context.Context,
|
|
||||||
provider *config.LdapProvider,
|
|
||||||
rawUsers []internal.RawLdapUser,
|
|
||||||
fields *config.LdapFields,
|
|
||||||
adminGroupDN *ldap.DN,
|
|
||||||
) error {
|
|
||||||
for _, rawUser := range rawUsers {
|
|
||||||
user, err := convertRawLdapUser(provider.ProviderName, rawUser, fields, adminGroupDN)
|
|
||||||
if err != nil && !errors.Is(err, domain.ErrNotFound) {
|
|
||||||
return fmt.Errorf("failed to convert LDAP data for %v: %w", rawUser["dn"], err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if provider.SyncLogUserInfo {
|
|
||||||
slog.Debug("ldap user data",
|
|
||||||
"raw-user", rawUser, "user", user.Identifier,
|
|
||||||
"is-admin", user.IsAdmin, "provider", provider.ProviderName)
|
|
||||||
}
|
|
||||||
|
|
||||||
existingUser, err := m.users.GetUser(ctx, user.Identifier)
|
|
||||||
if err != nil && !errors.Is(err, domain.ErrNotFound) {
|
|
||||||
return fmt.Errorf("find error for user id %s: %w", user.Identifier, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
tctx, cancel := context.WithTimeout(ctx, 30*time.Second)
|
|
||||||
tctx = domain.SetUserInfo(tctx, domain.SystemAdminContextUserInfo())
|
|
||||||
|
|
||||||
if existingUser == nil {
|
|
||||||
// create new user
|
|
||||||
slog.Debug("creating new user from provider", "user", user.Identifier, "provider", provider.ProviderName)
|
|
||||||
|
|
||||||
_, err := m.create(tctx, user)
|
|
||||||
if err != nil {
|
|
||||||
cancel()
|
|
||||||
return fmt.Errorf("create error for user id %s: %w", user.Identifier, err)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// update existing user
|
|
||||||
if provider.AutoReEnable && existingUser.DisabledReason == domain.DisabledReasonLdapMissing {
|
|
||||||
user.Disabled = nil
|
|
||||||
user.DisabledReason = ""
|
|
||||||
} else {
|
|
||||||
user.Disabled = existingUser.Disabled
|
|
||||||
user.DisabledReason = existingUser.DisabledReason
|
|
||||||
}
|
|
||||||
|
|
||||||
if existingUser.PersistLocalChanges {
|
|
||||||
cancel()
|
|
||||||
continue // skip synchronization for this user
|
|
||||||
}
|
|
||||||
|
|
||||||
if userChangedInLdap(existingUser, user) {
|
|
||||||
syncedUser, err := m.users.GetUser(ctx, user.Identifier)
|
|
||||||
if err != nil && !errors.Is(err, domain.ErrNotFound) {
|
|
||||||
cancel()
|
|
||||||
return fmt.Errorf("find error for user id %s: %w", user.Identifier, err)
|
|
||||||
}
|
|
||||||
syncedUser.UpdatedAt = time.Now()
|
|
||||||
syncedUser.UpdatedBy = domain.CtxSystemLdapSyncer
|
|
||||||
syncedUser.MergeAuthSources(user.Authentications...)
|
|
||||||
syncedUser.Email = user.Email
|
|
||||||
syncedUser.Firstname = user.Firstname
|
|
||||||
syncedUser.Lastname = user.Lastname
|
|
||||||
syncedUser.Phone = user.Phone
|
|
||||||
syncedUser.Department = user.Department
|
|
||||||
syncedUser.IsAdmin = user.IsAdmin
|
|
||||||
syncedUser.Disabled = user.Disabled
|
|
||||||
syncedUser.DisabledReason = user.DisabledReason
|
|
||||||
|
|
||||||
_, err = m.update(tctx, existingUser, syncedUser, false)
|
|
||||||
if err != nil {
|
|
||||||
cancel()
|
|
||||||
return fmt.Errorf("update error for user id %s: %w", user.Identifier, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
cancel()
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m Manager) disableMissingLdapUsers(
|
|
||||||
ctx context.Context,
|
|
||||||
providerName string,
|
|
||||||
rawUsers []internal.RawLdapUser,
|
|
||||||
fields *config.LdapFields,
|
|
||||||
) error {
|
|
||||||
allUsers, err := m.users.GetAllUsers(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
for _, user := range allUsers {
|
|
||||||
userHasAuthSource := false
|
|
||||||
for _, auth := range user.Authentications {
|
|
||||||
if auth.Source == domain.UserSourceLdap && auth.ProviderName == providerName {
|
|
||||||
userHasAuthSource = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if !userHasAuthSource {
|
|
||||||
continue // ignore non ldap users
|
|
||||||
}
|
|
||||||
if user.IsDisabled() {
|
|
||||||
continue // ignore deactivated
|
|
||||||
}
|
|
||||||
if user.PersistLocalChanges {
|
|
||||||
continue // skip sync for this user
|
|
||||||
}
|
|
||||||
|
|
||||||
existsInLDAP := false
|
|
||||||
for _, rawUser := range rawUsers {
|
|
||||||
userId := domain.UserIdentifier(internal.MapDefaultString(rawUser, fields.UserIdentifier, ""))
|
|
||||||
if user.Identifier == userId {
|
|
||||||
existsInLDAP = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if existsInLDAP {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
slog.Debug("user is missing in ldap provider, disabling", "user", user.Identifier, "provider", providerName)
|
|
||||||
|
|
||||||
now := time.Now()
|
|
||||||
user.Disabled = &now
|
|
||||||
user.DisabledReason = domain.DisabledReasonLdapMissing
|
|
||||||
|
|
||||||
err := m.users.SaveUser(ctx, user.Identifier, func(u *domain.User) (*domain.User, error) {
|
|
||||||
u.Disabled = user.Disabled
|
|
||||||
u.DisabledReason = user.DisabledReason
|
|
||||||
return u, nil
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("disable error for user id %s: %w", user.Identifier, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
m.bus.Publish(app.TopicUserDisabled, user)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
@@ -4,12 +4,15 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"log/slog"
|
||||||
"math"
|
"math"
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/go-ldap/ldap/v3"
|
||||||
"github.com/google/uuid"
|
"github.com/google/uuid"
|
||||||
|
|
||||||
|
"github.com/h44z/wg-portal/internal"
|
||||||
"github.com/h44z/wg-portal/internal/app"
|
"github.com/h44z/wg-portal/internal/app"
|
||||||
"github.com/h44z/wg-portal/internal/config"
|
"github.com/h44z/wg-portal/internal/config"
|
||||||
"github.com/h44z/wg-portal/internal/domain"
|
"github.com/h44z/wg-portal/internal/domain"
|
||||||
@@ -76,7 +79,7 @@ func (m Manager) RegisterUser(ctx context.Context, user *domain.User) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
createdUser, err := m.create(ctx, user)
|
createdUser, err := m.CreateUser(ctx, user)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -98,11 +101,20 @@ func (m Manager) GetUser(ctx context.Context, id domain.UserIdentifier) (*domain
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return m.getUser(ctx, id)
|
user, err := m.users.GetUser(ctx, id)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("unable to load user %s: %w", id, err)
|
||||||
|
}
|
||||||
|
peers, _ := m.peers.GetUserPeers(ctx, id) // ignore error, list will be empty in error case
|
||||||
|
|
||||||
|
user.LinkedPeerCount = len(peers)
|
||||||
|
|
||||||
|
return user, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetUserByEmail returns the user with the given email address.
|
// GetUserByEmail returns the user with the given email address.
|
||||||
func (m Manager) GetUserByEmail(ctx context.Context, email string) (*domain.User, error) {
|
func (m Manager) GetUserByEmail(ctx context.Context, email string) (*domain.User, error) {
|
||||||
|
|
||||||
user, err := m.users.GetUserByEmail(ctx, email)
|
user, err := m.users.GetUserByEmail(ctx, email)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("unable to load user for email %s: %w", email, err)
|
return nil, fmt.Errorf("unable to load user for email %s: %w", email, err)
|
||||||
@@ -112,11 +124,16 @@ func (m Manager) GetUserByEmail(ctx context.Context, email string) (*domain.User
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return m.enrichUser(ctx, user), nil
|
peers, _ := m.peers.GetUserPeers(ctx, user.Identifier) // ignore error, list will be empty in error case
|
||||||
|
|
||||||
|
user.LinkedPeerCount = len(peers)
|
||||||
|
|
||||||
|
return user, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetUserByWebAuthnCredential returns the user for the given WebAuthn credential.
|
// GetUserByWebAuthnCredential returns the user for the given WebAuthn credential.
|
||||||
func (m Manager) GetUserByWebAuthnCredential(ctx context.Context, credentialIdBase64 string) (*domain.User, error) {
|
func (m Manager) GetUserByWebAuthnCredential(ctx context.Context, credentialIdBase64 string) (*domain.User, error) {
|
||||||
|
|
||||||
user, err := m.users.GetUserByWebAuthnCredential(ctx, credentialIdBase64)
|
user, err := m.users.GetUserByWebAuthnCredential(ctx, credentialIdBase64)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("unable to load user for webauthn credential %s: %w", credentialIdBase64, err)
|
return nil, fmt.Errorf("unable to load user for webauthn credential %s: %w", credentialIdBase64, err)
|
||||||
@@ -126,7 +143,11 @@ func (m Manager) GetUserByWebAuthnCredential(ctx context.Context, credentialIdBa
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return m.enrichUser(ctx, user), nil
|
peers, _ := m.peers.GetUserPeers(ctx, user.Identifier) // ignore error, list will be empty in error case
|
||||||
|
|
||||||
|
user.LinkedPeerCount = len(peers)
|
||||||
|
|
||||||
|
return user, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetAllUsers returns all users.
|
// GetAllUsers returns all users.
|
||||||
@@ -148,7 +169,8 @@ func (m Manager) GetAllUsers(ctx context.Context) ([]domain.User, error) {
|
|||||||
go func() {
|
go func() {
|
||||||
defer wg.Done()
|
defer wg.Done()
|
||||||
for user := range ch {
|
for user := range ch {
|
||||||
m.enrichUser(ctx, user)
|
peers, _ := m.peers.GetUserPeers(ctx, user.Identifier) // ignore error, list will be empty in error case
|
||||||
|
user.LinkedPeerCount = len(peers)
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
}
|
}
|
||||||
@@ -172,29 +194,77 @@ func (m Manager) UpdateUser(ctx context.Context, user *domain.User) (*domain.Use
|
|||||||
return nil, fmt.Errorf("unable to load existing user %s: %w", user.Identifier, err)
|
return nil, fmt.Errorf("unable to load existing user %s: %w", user.Identifier, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
user.CopyCalculatedAttributes(existingUser, true) // ensure that crucial attributes stay the same
|
if err := m.validateModifications(ctx, existingUser, user); err != nil {
|
||||||
|
return nil, fmt.Errorf("update not allowed: %w", err)
|
||||||
return m.update(ctx, existingUser, user, true)
|
|
||||||
}
|
|
||||||
|
|
||||||
// UpdateUserInternal updates the user with the given identifier. This function must never be called from external.
|
|
||||||
// This function allows to override authentications and webauthn credentials.
|
|
||||||
func (m Manager) UpdateUserInternal(ctx context.Context, user *domain.User) (*domain.User, error) {
|
|
||||||
existingUser, err := m.users.GetUser(ctx, user.Identifier)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("unable to load existing user %s: %w", user.Identifier, err)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return m.update(ctx, existingUser, user, false)
|
user.CopyCalculatedAttributes(existingUser)
|
||||||
|
err = user.HashPassword()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if user.Password == "" { // keep old password
|
||||||
|
user.Password = existingUser.Password
|
||||||
|
}
|
||||||
|
|
||||||
|
err = m.users.SaveUser(ctx, existingUser.Identifier, func(u *domain.User) (*domain.User, error) {
|
||||||
|
user.CopyCalculatedAttributes(u)
|
||||||
|
return user, nil
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("update failure: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
m.bus.Publish(app.TopicUserUpdated, *user)
|
||||||
|
|
||||||
|
switch {
|
||||||
|
case !existingUser.IsDisabled() && user.IsDisabled():
|
||||||
|
m.bus.Publish(app.TopicUserDisabled, *user)
|
||||||
|
case existingUser.IsDisabled() && !user.IsDisabled():
|
||||||
|
m.bus.Publish(app.TopicUserEnabled, *user)
|
||||||
|
}
|
||||||
|
|
||||||
|
return user, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// CreateUser creates a new user.
|
// CreateUser creates a new user.
|
||||||
func (m Manager) CreateUser(ctx context.Context, user *domain.User) (*domain.User, error) {
|
func (m Manager) CreateUser(ctx context.Context, user *domain.User) (*domain.User, error) {
|
||||||
|
if user.Identifier == "" {
|
||||||
|
return nil, errors.New("missing user identifier")
|
||||||
|
}
|
||||||
|
|
||||||
if err := domain.ValidateAdminAccessRights(ctx); err != nil {
|
if err := domain.ValidateAdminAccessRights(ctx); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return m.create(ctx, user)
|
existingUser, err := m.users.GetUser(ctx, user.Identifier)
|
||||||
|
if err != nil && !errors.Is(err, domain.ErrNotFound) {
|
||||||
|
return nil, fmt.Errorf("unable to load existing user %s: %w", user.Identifier, err)
|
||||||
|
}
|
||||||
|
if existingUser != nil {
|
||||||
|
return nil, errors.Join(fmt.Errorf("user %s already exists", user.Identifier), domain.ErrDuplicateEntry)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := m.validateCreation(ctx, user); err != nil {
|
||||||
|
return nil, fmt.Errorf("creation not allowed: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
err = user.HashPassword()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
err = m.users.SaveUser(ctx, user.Identifier, func(u *domain.User) (*domain.User, error) {
|
||||||
|
user.CopyCalculatedAttributes(u)
|
||||||
|
return user, nil
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("creation failure: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
m.bus.Publish(app.TopicUserCreated, *user)
|
||||||
|
|
||||||
|
return user, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// DeleteUser deletes the user with the given identifier.
|
// DeleteUser deletes the user with the given identifier.
|
||||||
@@ -237,10 +307,15 @@ func (m Manager) ActivateApi(ctx context.Context, id domain.UserIdentifier) (*do
|
|||||||
user.ApiToken = uuid.New().String()
|
user.ApiToken = uuid.New().String()
|
||||||
user.ApiTokenCreated = &now
|
user.ApiTokenCreated = &now
|
||||||
|
|
||||||
user, err = m.update(ctx, user, user, true) // self-update
|
err = m.users.SaveUser(ctx, user.Identifier, func(u *domain.User) (*domain.User, error) {
|
||||||
|
user.CopyCalculatedAttributes(u)
|
||||||
|
return user, nil
|
||||||
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, fmt.Errorf("update failure: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
m.bus.Publish(app.TopicUserUpdated, *user)
|
||||||
m.bus.Publish(app.TopicUserApiEnabled, *user)
|
m.bus.Publish(app.TopicUserApiEnabled, *user)
|
||||||
|
|
||||||
return user, nil
|
return user, nil
|
||||||
@@ -260,10 +335,15 @@ func (m Manager) DeactivateApi(ctx context.Context, id domain.UserIdentifier) (*
|
|||||||
user.ApiToken = ""
|
user.ApiToken = ""
|
||||||
user.ApiTokenCreated = nil
|
user.ApiTokenCreated = nil
|
||||||
|
|
||||||
user, err = m.update(ctx, user, user, true) // self-update
|
err = m.users.SaveUser(ctx, user.Identifier, func(u *domain.User) (*domain.User, error) {
|
||||||
|
user.CopyCalculatedAttributes(u)
|
||||||
|
return user, nil
|
||||||
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, fmt.Errorf("update failure: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
m.bus.Publish(app.TopicUserUpdated, *user)
|
||||||
m.bus.Publish(app.TopicUserApiDisabled, *user)
|
m.bus.Publish(app.TopicUserApiDisabled, *user)
|
||||||
|
|
||||||
return user, nil
|
return user, nil
|
||||||
@@ -300,6 +380,10 @@ func (m Manager) validateModifications(ctx context.Context, old, new *domain.Use
|
|||||||
return fmt.Errorf("cannot lock own user: %w", domain.ErrInvalidData)
|
return fmt.Errorf("cannot lock own user: %w", domain.ErrInvalidData)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if old.Source != new.Source {
|
||||||
|
return fmt.Errorf("cannot change user source: %w", domain.ErrInvalidData)
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -330,19 +414,14 @@ func (m Manager) validateCreation(ctx context.Context, new *domain.User) error {
|
|||||||
return fmt.Errorf("reserved user identifier: %w", domain.ErrInvalidData)
|
return fmt.Errorf("reserved user identifier: %w", domain.ErrInvalidData)
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(new.Authentications) != 1 {
|
|
||||||
return fmt.Errorf("invalid number of authentications: %d, expected 1: %w",
|
|
||||||
len(new.Authentications), domain.ErrInvalidData)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Admins are allowed to create users for arbitrary sources.
|
// Admins are allowed to create users for arbitrary sources.
|
||||||
if new.Authentications[0].Source != domain.UserSourceDatabase && !currentUser.IsAdmin {
|
if new.Source != domain.UserSourceDatabase && !currentUser.IsAdmin {
|
||||||
return fmt.Errorf("invalid user source: %s, only %s is allowed: %w",
|
return fmt.Errorf("invalid user source: %s, only %s is allowed: %w",
|
||||||
new.Authentications[0].Source, domain.UserSourceDatabase, domain.ErrInvalidData)
|
new.Source, domain.UserSourceDatabase, domain.ErrInvalidData)
|
||||||
}
|
}
|
||||||
|
|
||||||
// database users must have a password
|
// database users must have a password
|
||||||
if new.Authentications[0].Source == domain.UserSourceDatabase && string(new.Password) == "" {
|
if new.Source == domain.UserSourceDatabase && string(new.Password) == "" {
|
||||||
return fmt.Errorf("missing password: %w", domain.ErrInvalidData)
|
return fmt.Errorf("missing password: %w", domain.ErrInvalidData)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -381,112 +460,214 @@ func (m Manager) validateApiChange(ctx context.Context, user *domain.User) error
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// region internal-modifiers
|
func (m Manager) runLdapSynchronizationService(ctx context.Context) {
|
||||||
|
ctx = domain.SetUserInfo(ctx, domain.LdapSyncContextUserInfo()) // switch to service context for LDAP sync
|
||||||
|
|
||||||
func (m Manager) enrichUser(ctx context.Context, user *domain.User) *domain.User {
|
for _, ldapCfg := range m.cfg.Auth.Ldap { // LDAP Auth providers
|
||||||
if user == nil {
|
go func(cfg config.LdapProvider) {
|
||||||
return nil
|
syncInterval := cfg.SyncInterval
|
||||||
|
if syncInterval == 0 {
|
||||||
|
slog.Debug("sync disabled for LDAP server", "provider", cfg.ProviderName)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// perform initial sync
|
||||||
|
err := m.synchronizeLdapUsers(ctx, &cfg)
|
||||||
|
if err != nil {
|
||||||
|
slog.Error("failed to synchronize LDAP users", "provider", cfg.ProviderName, "error", err)
|
||||||
|
} else {
|
||||||
|
slog.Debug("initial LDAP user sync completed", "provider", cfg.ProviderName)
|
||||||
|
}
|
||||||
|
|
||||||
|
// start periodic sync
|
||||||
|
running := true
|
||||||
|
for running {
|
||||||
|
select {
|
||||||
|
case <-ctx.Done():
|
||||||
|
running = false
|
||||||
|
continue
|
||||||
|
case <-time.After(syncInterval):
|
||||||
|
// select blocks until one of the cases evaluate to true
|
||||||
|
}
|
||||||
|
|
||||||
|
err := m.synchronizeLdapUsers(ctx, &cfg)
|
||||||
|
if err != nil {
|
||||||
|
slog.Error("failed to synchronize LDAP users", "provider", cfg.ProviderName, "error", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}(ldapCfg)
|
||||||
}
|
}
|
||||||
peers, _ := m.peers.GetUserPeers(ctx, user.Identifier) // ignore error, list will be empty in error case
|
|
||||||
user.LinkedPeerCount = len(peers)
|
|
||||||
return user
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m Manager) getUser(ctx context.Context, id domain.UserIdentifier) (*domain.User, error) {
|
func (m Manager) synchronizeLdapUsers(ctx context.Context, provider *config.LdapProvider) error {
|
||||||
user, err := m.users.GetUser(ctx, id)
|
slog.Debug("starting to synchronize users", "provider", provider.ProviderName)
|
||||||
|
|
||||||
|
dn, err := ldap.ParseDN(provider.AdminGroupDN)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("unable to load user %s: %w", id, err)
|
return fmt.Errorf("failed to parse admin group DN: %w", err)
|
||||||
}
|
}
|
||||||
return m.enrichUser(ctx, user), nil
|
provider.ParsedAdminGroupDN = dn
|
||||||
}
|
|
||||||
|
|
||||||
func (m Manager) update(ctx context.Context, existingUser, user *domain.User, keepAuthentications bool) (
|
conn, err := internal.LdapConnect(provider)
|
||||||
*domain.User,
|
|
||||||
error,
|
|
||||||
) {
|
|
||||||
if err := m.validateModifications(ctx, existingUser, user); err != nil {
|
|
||||||
return nil, fmt.Errorf("update not allowed: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
err := user.HashPassword()
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return fmt.Errorf("failed to setup LDAP connection: %w", err)
|
||||||
}
|
|
||||||
if user.Password == "" { // keep old password
|
|
||||||
user.Password = existingUser.Password
|
|
||||||
}
|
}
|
||||||
|
defer internal.LdapDisconnect(conn)
|
||||||
|
|
||||||
err = m.users.SaveUser(ctx, existingUser.Identifier, func(u *domain.User) (*domain.User, error) {
|
rawUsers, err := internal.LdapFindAllUsers(conn, provider.BaseDN, provider.SyncFilter, &provider.FieldMap)
|
||||||
user.CopyCalculatedAttributes(u, keepAuthentications)
|
|
||||||
return user, nil
|
|
||||||
})
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("update failure: %w", err)
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
m.bus.Publish(app.TopicUserUpdated, *user)
|
slog.Debug("fetched raw ldap users", "count", len(rawUsers), "provider", provider.ProviderName)
|
||||||
|
|
||||||
switch {
|
// Update existing LDAP users
|
||||||
case !existingUser.IsDisabled() && user.IsDisabled():
|
err = m.updateLdapUsers(ctx, provider, rawUsers, &provider.FieldMap, provider.ParsedAdminGroupDN)
|
||||||
m.bus.Publish(app.TopicUserDisabled, *user)
|
if err != nil {
|
||||||
case existingUser.IsDisabled() && !user.IsDisabled():
|
return err
|
||||||
m.bus.Publish(app.TopicUserEnabled, *user)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return user, nil
|
// Disable missing LDAP users
|
||||||
}
|
if provider.DisableMissing {
|
||||||
|
err = m.disableMissingLdapUsers(ctx, provider.ProviderName, rawUsers, &provider.FieldMap)
|
||||||
func (m Manager) create(ctx context.Context, user *domain.User) (*domain.User, error) {
|
if err != nil {
|
||||||
if user.Identifier == "" {
|
return err
|
||||||
return nil, errors.New("missing user identifier")
|
|
||||||
}
|
|
||||||
|
|
||||||
existingUser, err := m.users.GetUser(ctx, user.Identifier)
|
|
||||||
if err != nil && !errors.Is(err, domain.ErrNotFound) {
|
|
||||||
return nil, fmt.Errorf("unable to load existing user %s: %w", user.Identifier, err)
|
|
||||||
}
|
|
||||||
if existingUser != nil {
|
|
||||||
return nil, errors.Join(fmt.Errorf("user %s already exists", user.Identifier), domain.ErrDuplicateEntry)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add default authentication if missing
|
|
||||||
if len(user.Authentications) == 0 {
|
|
||||||
ctxUserInfo := domain.GetUserInfo(ctx)
|
|
||||||
now := time.Now()
|
|
||||||
user.Authentications = []domain.UserAuthentication{
|
|
||||||
{
|
|
||||||
BaseModel: domain.BaseModel{
|
|
||||||
CreatedBy: ctxUserInfo.UserId(),
|
|
||||||
UpdatedBy: ctxUserInfo.UserId(),
|
|
||||||
CreatedAt: now,
|
|
||||||
UpdatedAt: now,
|
|
||||||
},
|
|
||||||
UserIdentifier: user.Identifier,
|
|
||||||
Source: domain.UserSourceDatabase,
|
|
||||||
ProviderName: "",
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := m.validateCreation(ctx, user); err != nil {
|
return nil
|
||||||
return nil, fmt.Errorf("creation not allowed: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
err = user.HashPassword()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
err = m.users.SaveUser(ctx, user.Identifier, func(u *domain.User) (*domain.User, error) {
|
|
||||||
return user, nil
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("creation failure: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
m.bus.Publish(app.TopicUserCreated, *user)
|
|
||||||
|
|
||||||
return user, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// endregion internal-modifiers
|
func (m Manager) updateLdapUsers(
|
||||||
|
ctx context.Context,
|
||||||
|
provider *config.LdapProvider,
|
||||||
|
rawUsers []internal.RawLdapUser,
|
||||||
|
fields *config.LdapFields,
|
||||||
|
adminGroupDN *ldap.DN,
|
||||||
|
) error {
|
||||||
|
for _, rawUser := range rawUsers {
|
||||||
|
user, err := convertRawLdapUser(provider.ProviderName, rawUser, fields, adminGroupDN)
|
||||||
|
if err != nil && !errors.Is(err, domain.ErrNotFound) {
|
||||||
|
return fmt.Errorf("failed to convert LDAP data for %v: %w", rawUser["dn"], err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if provider.SyncLogUserInfo {
|
||||||
|
slog.Debug("ldap user data",
|
||||||
|
"raw-user", rawUser, "user", user.Identifier,
|
||||||
|
"is-admin", user.IsAdmin, "provider", provider.ProviderName)
|
||||||
|
}
|
||||||
|
|
||||||
|
existingUser, err := m.users.GetUser(ctx, user.Identifier)
|
||||||
|
if err != nil && !errors.Is(err, domain.ErrNotFound) {
|
||||||
|
return fmt.Errorf("find error for user id %s: %w", user.Identifier, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
tctx, cancel := context.WithTimeout(ctx, 30*time.Second)
|
||||||
|
tctx = domain.SetUserInfo(tctx, domain.SystemAdminContextUserInfo())
|
||||||
|
|
||||||
|
if existingUser == nil {
|
||||||
|
// create new user
|
||||||
|
slog.Debug("creating new user from provider", "user", user.Identifier, "provider", provider.ProviderName)
|
||||||
|
|
||||||
|
_, err := m.CreateUser(tctx, user)
|
||||||
|
if err != nil {
|
||||||
|
cancel()
|
||||||
|
return fmt.Errorf("create error for user id %s: %w", user.Identifier, err)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// update existing user
|
||||||
|
if provider.AutoReEnable && existingUser.DisabledReason == domain.DisabledReasonLdapMissing {
|
||||||
|
user.Disabled = nil
|
||||||
|
user.DisabledReason = ""
|
||||||
|
} else {
|
||||||
|
user.Disabled = existingUser.Disabled
|
||||||
|
user.DisabledReason = existingUser.DisabledReason
|
||||||
|
}
|
||||||
|
if existingUser.Source == domain.UserSourceLdap && userChangedInLdap(existingUser, user) {
|
||||||
|
err := m.users.SaveUser(tctx, user.Identifier, func(u *domain.User) (*domain.User, error) {
|
||||||
|
u.UpdatedAt = time.Now()
|
||||||
|
u.UpdatedBy = domain.CtxSystemLdapSyncer
|
||||||
|
u.Source = user.Source
|
||||||
|
u.ProviderName = user.ProviderName
|
||||||
|
u.Email = user.Email
|
||||||
|
u.Firstname = user.Firstname
|
||||||
|
u.Lastname = user.Lastname
|
||||||
|
u.Phone = user.Phone
|
||||||
|
u.Department = user.Department
|
||||||
|
u.IsAdmin = user.IsAdmin
|
||||||
|
u.Disabled = nil
|
||||||
|
u.DisabledReason = ""
|
||||||
|
|
||||||
|
return u, nil
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
cancel()
|
||||||
|
return fmt.Errorf("update error for user id %s: %w", user.Identifier, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if existingUser.IsDisabled() && !user.IsDisabled() {
|
||||||
|
m.bus.Publish(app.TopicUserEnabled, *user)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
cancel()
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m Manager) disableMissingLdapUsers(
|
||||||
|
ctx context.Context,
|
||||||
|
providerName string,
|
||||||
|
rawUsers []internal.RawLdapUser,
|
||||||
|
fields *config.LdapFields,
|
||||||
|
) error {
|
||||||
|
allUsers, err := m.users.GetAllUsers(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
for _, user := range allUsers {
|
||||||
|
if user.Source != domain.UserSourceLdap {
|
||||||
|
continue // ignore non ldap users
|
||||||
|
}
|
||||||
|
if user.ProviderName != providerName {
|
||||||
|
continue // user was synchronized through different provider
|
||||||
|
}
|
||||||
|
if user.IsDisabled() {
|
||||||
|
continue // ignore deactivated
|
||||||
|
}
|
||||||
|
|
||||||
|
existsInLDAP := false
|
||||||
|
for _, rawUser := range rawUsers {
|
||||||
|
userId := domain.UserIdentifier(internal.MapDefaultString(rawUser, fields.UserIdentifier, ""))
|
||||||
|
if user.Identifier == userId {
|
||||||
|
existsInLDAP = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if existsInLDAP {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
slog.Debug("user is missing in ldap provider, disabling", "user", user.Identifier, "provider", providerName)
|
||||||
|
|
||||||
|
now := time.Now()
|
||||||
|
user.Disabled = &now
|
||||||
|
user.DisabledReason = domain.DisabledReasonLdapMissing
|
||||||
|
|
||||||
|
err := m.users.SaveUser(ctx, user.Identifier, func(u *domain.User) (*domain.User, error) {
|
||||||
|
u.Disabled = user.Disabled
|
||||||
|
u.DisabledReason = user.DisabledReason
|
||||||
|
return u, nil
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("disable error for user id %s: %w", user.Identifier, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
m.bus.Publish(app.TopicUserDisabled, user)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package models
|
|||||||
import (
|
import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/h44z/wg-portal/internal"
|
|
||||||
"github.com/h44z/wg-portal/internal/domain"
|
"github.com/h44z/wg-portal/internal/domain"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -14,10 +13,11 @@ type User struct {
|
|||||||
CreatedAt time.Time `json:"CreatedAt"`
|
CreatedAt time.Time `json:"CreatedAt"`
|
||||||
UpdatedAt time.Time `json:"UpdatedAt"`
|
UpdatedAt time.Time `json:"UpdatedAt"`
|
||||||
|
|
||||||
Identifier string `json:"Identifier"`
|
Identifier string `json:"Identifier"`
|
||||||
Email string `json:"Email"`
|
Email string `json:"Email"`
|
||||||
AuthSources []UserAuthSource `json:"AuthSources"`
|
Source string `json:"Source"`
|
||||||
IsAdmin bool `json:"IsAdmin"`
|
ProviderName string `json:"ProviderName"`
|
||||||
|
IsAdmin bool `json:"IsAdmin"`
|
||||||
|
|
||||||
Firstname string `json:"Firstname,omitempty"`
|
Firstname string `json:"Firstname,omitempty"`
|
||||||
Lastname string `json:"Lastname,omitempty"`
|
Lastname string `json:"Lastname,omitempty"`
|
||||||
@@ -31,22 +31,8 @@ type User struct {
|
|||||||
LockedReason string `json:"LockedReason,omitempty"`
|
LockedReason string `json:"LockedReason,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// UserAuthSource represents a single authentication source for a user.
|
|
||||||
// For details about the fields, see the domain.UserAuthentication struct.
|
|
||||||
type UserAuthSource struct {
|
|
||||||
Source string `json:"Source"`
|
|
||||||
ProviderName string `json:"ProviderName"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewUser creates a new User model from a domain.User
|
// NewUser creates a new User model from a domain.User
|
||||||
func NewUser(src domain.User) User {
|
func NewUser(src domain.User) User {
|
||||||
authSources := internal.Map(src.Authentications, func(authentication domain.UserAuthentication) UserAuthSource {
|
|
||||||
return UserAuthSource{
|
|
||||||
Source: string(authentication.Source),
|
|
||||||
ProviderName: authentication.ProviderName,
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
return User{
|
return User{
|
||||||
CreatedBy: src.CreatedBy,
|
CreatedBy: src.CreatedBy,
|
||||||
UpdatedBy: src.UpdatedBy,
|
UpdatedBy: src.UpdatedBy,
|
||||||
@@ -54,7 +40,8 @@ func NewUser(src domain.User) User {
|
|||||||
UpdatedAt: src.UpdatedAt,
|
UpdatedAt: src.UpdatedAt,
|
||||||
Identifier: string(src.Identifier),
|
Identifier: string(src.Identifier),
|
||||||
Email: src.Email,
|
Email: src.Email,
|
||||||
AuthSources: authSources,
|
Source: string(src.Source),
|
||||||
|
ProviderName: src.ProviderName,
|
||||||
IsAdmin: src.IsAdmin,
|
IsAdmin: src.IsAdmin,
|
||||||
Firstname: src.Firstname,
|
Firstname: src.Firstname,
|
||||||
Lastname: src.Lastname,
|
Lastname: src.Lastname,
|
||||||
|
|||||||
@@ -374,7 +374,6 @@ func (m Manager) PrepareInterface(ctx context.Context) (*domain.Interface, error
|
|||||||
SaveConfig: m.cfg.Advanced.ConfigStoragePath != "",
|
SaveConfig: m.cfg.Advanced.ConfigStoragePath != "",
|
||||||
DisplayName: string(id),
|
DisplayName: string(id),
|
||||||
Type: domain.InterfaceTypeServer,
|
Type: domain.InterfaceTypeServer,
|
||||||
CreateDefaultPeer: m.cfg.Core.CreateDefaultPeer,
|
|
||||||
DriverType: "",
|
DriverType: "",
|
||||||
Disabled: nil,
|
Disabled: nil,
|
||||||
DisabledReason: "",
|
DisabledReason: "",
|
||||||
|
|||||||
@@ -35,10 +35,6 @@ func (m Manager) CreateDefaultPeer(ctx context.Context, userId domain.UserIdenti
|
|||||||
continue // only create default peers for server interfaces
|
continue // only create default peers for server interfaces
|
||||||
}
|
}
|
||||||
|
|
||||||
if !iface.CreateDefaultPeer {
|
|
||||||
continue // only create default peers if the interface flag is set
|
|
||||||
}
|
|
||||||
|
|
||||||
peerAlreadyCreated := slices.ContainsFunc(userPeers, func(peer domain.Peer) bool {
|
peerAlreadyCreated := slices.ContainsFunc(userPeers, func(peer domain.Peer) bool {
|
||||||
return peer.InterfaceIdentifier == iface.Identifier
|
return peer.InterfaceIdentifier == iface.Identifier
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -78,12 +78,7 @@ func (f *mockDB) GetInterfaceAndPeers(ctx context.Context, id domain.InterfaceId
|
|||||||
func (f *mockDB) GetPeersStats(ctx context.Context, ids ...domain.PeerIdentifier) ([]domain.PeerStatus, error) {
|
func (f *mockDB) GetPeersStats(ctx context.Context, ids ...domain.PeerIdentifier) ([]domain.PeerStatus, error) {
|
||||||
return nil, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
func (f *mockDB) GetAllInterfaces(ctx context.Context) ([]domain.Interface, error) {
|
func (f *mockDB) GetAllInterfaces(ctx context.Context) ([]domain.Interface, error) { return nil, nil }
|
||||||
if f.iface != nil {
|
|
||||||
return []domain.Interface{*f.iface}, nil
|
|
||||||
}
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
func (f *mockDB) GetInterfaceIps(ctx context.Context) (map[domain.InterfaceIdentifier][]domain.Cidr, error) {
|
func (f *mockDB) GetInterfaceIps(ctx context.Context) (map[domain.InterfaceIdentifier][]domain.Cidr, error) {
|
||||||
return nil, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
@@ -197,58 +192,3 @@ func TestCreatePeer_SetsIdentifier_FromPublicKey(t *testing.T) {
|
|||||||
t.Fatalf("expected peer with identifier %q to be saved in DB", expectedId)
|
t.Fatalf("expected peer with identifier %q to be saved in DB", expectedId)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestCreateDefaultPeer_RespectsInterfaceFlag(t *testing.T) {
|
|
||||||
// Arrange
|
|
||||||
cfg := &config.Config{}
|
|
||||||
cfg.Core.CreateDefaultPeer = true
|
|
||||||
|
|
||||||
bus := &mockBus{}
|
|
||||||
ctrlMgr := &ControllerManager{
|
|
||||||
controllers: map[domain.InterfaceBackend]backendInstance{
|
|
||||||
config.LocalBackendName: {Implementation: &mockController{}},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
db := &mockDB{
|
|
||||||
iface: &domain.Interface{
|
|
||||||
Identifier: "wg0",
|
|
||||||
Type: domain.InterfaceTypeServer,
|
|
||||||
CreateDefaultPeer: false, // Flag is disabled!
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
m := Manager{
|
|
||||||
cfg: cfg,
|
|
||||||
bus: bus,
|
|
||||||
db: db,
|
|
||||||
wg: ctrlMgr,
|
|
||||||
}
|
|
||||||
|
|
||||||
userId := domain.UserIdentifier("user@example.com")
|
|
||||||
ctx := domain.SetUserInfo(context.Background(), &domain.ContextUserInfo{Id: userId, IsAdmin: true})
|
|
||||||
|
|
||||||
// Act
|
|
||||||
err := m.CreateDefaultPeer(ctx, userId)
|
|
||||||
|
|
||||||
// Assert
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("CreateDefaultPeer returned error: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(db.savedPeers) != 0 {
|
|
||||||
t.Fatalf("expected no peers to be created because interface flag is false, but got %d", len(db.savedPeers))
|
|
||||||
}
|
|
||||||
|
|
||||||
// Now enable the flag and try again
|
|
||||||
db.iface.CreateDefaultPeer = true
|
|
||||||
err = m.CreateDefaultPeer(ctx, userId)
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("CreateDefaultPeer returned error after enabling flag: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(db.savedPeers) != 1 {
|
|
||||||
t.Fatalf("expected 1 peer to be created because interface flag is true, but got %d", len(db.savedPeers))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -10,12 +10,11 @@ type LoginProviderInfo struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type AuthenticatorUserInfo struct {
|
type AuthenticatorUserInfo struct {
|
||||||
Identifier UserIdentifier
|
Identifier UserIdentifier
|
||||||
Email string
|
Email string
|
||||||
Firstname string
|
Firstname string
|
||||||
Lastname string
|
Lastname string
|
||||||
Phone string
|
Phone string
|
||||||
Department string
|
Department string
|
||||||
IsAdmin bool
|
IsAdmin bool
|
||||||
AdminInfoAvailable bool // true if the IsAdmin flag is valid
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ const (
|
|||||||
CtxSystemLdapSyncer = "_WG_SYS_LDAP_SYNCER_"
|
CtxSystemLdapSyncer = "_WG_SYS_LDAP_SYNCER_"
|
||||||
CtxSystemWgImporter = "_WG_SYS_WG_IMPORTER_"
|
CtxSystemWgImporter = "_WG_SYS_WG_IMPORTER_"
|
||||||
CtxSystemV1Migrator = "_WG_SYS_V1_MIGRATOR_"
|
CtxSystemV1Migrator = "_WG_SYS_V1_MIGRATOR_"
|
||||||
CtxSystemDBMigrator = "_WG_SYS_DB_MIGRATOR_"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type ContextUserInfo struct {
|
type ContextUserInfo struct {
|
||||||
|
|||||||
@@ -53,13 +53,12 @@ type Interface struct {
|
|||||||
SaveConfig bool // automatically persist config changes to the wgX.conf file
|
SaveConfig bool // automatically persist config changes to the wgX.conf file
|
||||||
|
|
||||||
// WG Portal specific
|
// WG Portal specific
|
||||||
DisplayName string // a nice display name/ description for the interface
|
DisplayName string // a nice display name/ description for the interface
|
||||||
Type InterfaceType // the interface type, either InterfaceTypeServer or InterfaceTypeClient
|
Type InterfaceType // the interface type, either InterfaceTypeServer or InterfaceTypeClient
|
||||||
CreateDefaultPeer bool // if true, default peers will be created for this interface
|
Backend InterfaceBackend // the backend that is used to manage the interface (wgctrl, mikrotik, ...)
|
||||||
Backend InterfaceBackend // the backend that is used to manage the interface (wgctrl, mikrotik, ...)
|
DriverType string // the interface driver type (linux, software, ...)
|
||||||
DriverType string // the interface driver type (linux, software, ...)
|
Disabled *time.Time `gorm:"index"` // flag that specifies if the interface is enabled (up) or not (down)
|
||||||
Disabled *time.Time `gorm:"index"` // flag that specifies if the interface is enabled (up) or not (down)
|
DisabledReason string // the reason why the interface has been disabled
|
||||||
DisabledReason string // the reason why the interface has been disabled
|
|
||||||
|
|
||||||
// Default settings for the peer, used for new peers, those settings will be published to ConfigOption options of
|
// Default settings for the peer, used for new peers, those settings will be published to ConfigOption options of
|
||||||
// the peer config
|
// the peer config
|
||||||
|
|||||||
@@ -25,14 +25,6 @@ type UserIdentifier string
|
|||||||
|
|
||||||
type UserSource string
|
type UserSource string
|
||||||
|
|
||||||
type UserAuthentication struct {
|
|
||||||
BaseModel
|
|
||||||
|
|
||||||
UserIdentifier UserIdentifier `gorm:"primaryKey;column:user_identifier"` // sAMAccountName, sub, etc.
|
|
||||||
Source UserSource `gorm:"primaryKey;column:source"`
|
|
||||||
ProviderName string `gorm:"primaryKey;column:provider_name"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// User is the user model that gets linked to peer entries, by default an empty user model with only the email address is created
|
// User is the user model that gets linked to peer entries, by default an empty user model with only the email address is created
|
||||||
type User struct {
|
type User struct {
|
||||||
BaseModel
|
BaseModel
|
||||||
@@ -40,15 +32,10 @@ type User struct {
|
|||||||
// required fields
|
// required fields
|
||||||
Identifier UserIdentifier `gorm:"primaryKey;column:identifier"`
|
Identifier UserIdentifier `gorm:"primaryKey;column:identifier"`
|
||||||
Email string `form:"email" binding:"required,email"`
|
Email string `form:"email" binding:"required,email"`
|
||||||
Source UserSource // deprecated: moved to Authentications.Source
|
Source UserSource
|
||||||
ProviderName string // deprecated: moved to Authentications.ProviderName
|
ProviderName string
|
||||||
IsAdmin bool
|
IsAdmin bool
|
||||||
|
|
||||||
// authentication sources
|
|
||||||
Authentications []UserAuthentication `gorm:"foreignKey:user_identifier"`
|
|
||||||
// synchronization behavior
|
|
||||||
PersistLocalChanges bool `gorm:"column:persist_local_changes"`
|
|
||||||
|
|
||||||
// optional fields
|
// optional fields
|
||||||
Firstname string `form:"firstname" binding:"omitempty"`
|
Firstname string `form:"firstname" binding:"omitempty"`
|
||||||
Lastname string `form:"lastname" binding:"omitempty"`
|
Lastname string `form:"lastname" binding:"omitempty"`
|
||||||
@@ -94,19 +81,15 @@ func (u *User) IsApiEnabled() bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (u *User) CanChangePassword() error {
|
func (u *User) CanChangePassword() error {
|
||||||
if slices.ContainsFunc(u.Authentications, func(e UserAuthentication) bool {
|
if u.Source == UserSourceDatabase {
|
||||||
return e.Source == UserSourceDatabase
|
return nil
|
||||||
}) {
|
|
||||||
return nil // password can be changed for database users
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return errors.New("password change only allowed for database source")
|
return errors.New("password change only allowed for database source")
|
||||||
}
|
}
|
||||||
|
|
||||||
func (u *User) HasWeakPassword(minLength int) error {
|
func (u *User) HasWeakPassword(minLength int) error {
|
||||||
if !slices.ContainsFunc(u.Authentications, func(e UserAuthentication) bool {
|
if u.Source != UserSourceDatabase {
|
||||||
return e.Source == UserSourceDatabase
|
|
||||||
}) {
|
|
||||||
return nil // password is not required for non-database users, so no check needed
|
return nil // password is not required for non-database users, so no check needed
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -122,16 +105,13 @@ func (u *User) HasWeakPassword(minLength int) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (u *User) EditAllowed(new *User) error {
|
func (u *User) EditAllowed(new *User) error {
|
||||||
if len(u.Authentications) == 1 && u.Authentications[0].Source == UserSourceDatabase {
|
if u.Source == UserSourceDatabase {
|
||||||
return nil // database-only users can be edited always
|
return nil
|
||||||
}
|
|
||||||
|
|
||||||
if new.PersistLocalChanges {
|
|
||||||
return nil // if changes will be persisted locally, they can be edited always
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// for users which are not database users, only the notes field and the disabled flag can be updated
|
// for users which are not database users, only the notes field and the disabled flag can be updated
|
||||||
updateOk := u.Identifier == new.Identifier
|
updateOk := u.Identifier == new.Identifier
|
||||||
|
updateOk = updateOk && u.Source == new.Source
|
||||||
updateOk = updateOk && u.IsAdmin == new.IsAdmin
|
updateOk = updateOk && u.IsAdmin == new.IsAdmin
|
||||||
updateOk = updateOk && u.Email == new.Email
|
updateOk = updateOk && u.Email == new.Email
|
||||||
updateOk = updateOk && u.Firstname == new.Firstname
|
updateOk = updateOk && u.Firstname == new.Firstname
|
||||||
@@ -140,7 +120,7 @@ func (u *User) EditAllowed(new *User) error {
|
|||||||
updateOk = updateOk && u.Department == new.Department
|
updateOk = updateOk && u.Department == new.Department
|
||||||
|
|
||||||
if !updateOk {
|
if !updateOk {
|
||||||
return errors.New("edit only allowed for reserved fields")
|
return errors.New("edit only allowed for database source")
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
@@ -151,10 +131,8 @@ func (u *User) DeleteAllowed() error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (u *User) CheckPassword(password string) error {
|
func (u *User) CheckPassword(password string) error {
|
||||||
if !slices.ContainsFunc(u.Authentications, func(e UserAuthentication) bool {
|
if u.Source != UserSourceDatabase {
|
||||||
return e.Source == UserSourceDatabase
|
return errors.New("invalid user source")
|
||||||
}) {
|
|
||||||
return errors.New("invalid user source") // password can only be checked for database users
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if u.IsDisabled() {
|
if u.IsDisabled() {
|
||||||
@@ -202,24 +180,9 @@ func (u *User) HashPassword() error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (u *User) CopyCalculatedAttributes(src *User, withAuthentications bool) {
|
func (u *User) CopyCalculatedAttributes(src *User) {
|
||||||
u.BaseModel = src.BaseModel
|
u.BaseModel = src.BaseModel
|
||||||
u.LinkedPeerCount = src.LinkedPeerCount
|
u.LinkedPeerCount = src.LinkedPeerCount
|
||||||
if withAuthentications {
|
|
||||||
u.Authentications = src.Authentications
|
|
||||||
u.WebAuthnId = src.WebAuthnId
|
|
||||||
u.WebAuthnCredentialList = src.WebAuthnCredentialList
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// MergeAuthSources merges the given authentication sources with the existing ones.
|
|
||||||
// Already existing sources are not overwritten, nor will be added any duplicates.
|
|
||||||
func (u *User) MergeAuthSources(extSources ...UserAuthentication) {
|
|
||||||
for _, src := range extSources {
|
|
||||||
if !slices.Contains(u.Authentications, src) {
|
|
||||||
u.Authentications = append(u.Authentications, src)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// DisplayName returns the display name of the user.
|
// DisplayName returns the display name of the user.
|
||||||
|
|||||||
@@ -35,25 +35,19 @@ func TestUser_IsApiEnabled(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestUser_CanChangePassword(t *testing.T) {
|
func TestUser_CanChangePassword(t *testing.T) {
|
||||||
user := &User{Authentications: []UserAuthentication{{Source: UserSourceDatabase}}}
|
user := &User{Source: UserSourceDatabase}
|
||||||
assert.NoError(t, user.CanChangePassword())
|
assert.NoError(t, user.CanChangePassword())
|
||||||
|
|
||||||
user.Authentications = []UserAuthentication{{Source: UserSourceLdap}}
|
user.Source = UserSourceLdap
|
||||||
assert.Error(t, user.CanChangePassword())
|
assert.Error(t, user.CanChangePassword())
|
||||||
|
|
||||||
user.Authentications = []UserAuthentication{{Source: UserSourceOauth}}
|
user.Source = UserSourceOauth
|
||||||
assert.Error(t, user.CanChangePassword())
|
assert.Error(t, user.CanChangePassword())
|
||||||
|
|
||||||
user.Authentications = []UserAuthentication{{Source: UserSourceLdap}, {Source: UserSourceDatabase}}
|
|
||||||
assert.NoError(t, user.CanChangePassword())
|
|
||||||
|
|
||||||
user.Authentications = []UserAuthentication{{Source: UserSourceOauth}, {Source: UserSourceDatabase}}
|
|
||||||
assert.NoError(t, user.CanChangePassword())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestUser_EditAllowed(t *testing.T) {
|
func TestUser_EditAllowed(t *testing.T) {
|
||||||
user := &User{Authentications: []UserAuthentication{{Source: UserSourceDatabase}}}
|
user := &User{Source: UserSourceDatabase}
|
||||||
newUser := &User{Authentications: []UserAuthentication{{Source: UserSourceDatabase}}}
|
newUser := &User{Source: UserSourceDatabase}
|
||||||
assert.NoError(t, user.EditAllowed(newUser))
|
assert.NoError(t, user.EditAllowed(newUser))
|
||||||
|
|
||||||
newUser.Notes = "notes can be changed"
|
newUser.Notes = "notes can be changed"
|
||||||
@@ -65,8 +59,8 @@ func TestUser_EditAllowed(t *testing.T) {
|
|||||||
newUser.Lastname = "lastname or other fields can be changed"
|
newUser.Lastname = "lastname or other fields can be changed"
|
||||||
assert.NoError(t, user.EditAllowed(newUser))
|
assert.NoError(t, user.EditAllowed(newUser))
|
||||||
|
|
||||||
user.Authentications = []UserAuthentication{{Source: UserSourceLdap}}
|
user.Source = UserSourceLdap
|
||||||
newUser.Authentications = []UserAuthentication{{Source: UserSourceLdap}}
|
newUser.Source = UserSourceLdap
|
||||||
newUser.Disabled = nil
|
newUser.Disabled = nil
|
||||||
newUser.Lastname = ""
|
newUser.Lastname = ""
|
||||||
newUser.Notes = "notes can be changed"
|
newUser.Notes = "notes can be changed"
|
||||||
@@ -78,8 +72,8 @@ func TestUser_EditAllowed(t *testing.T) {
|
|||||||
newUser.Lastname = "lastname or other fields can not be changed"
|
newUser.Lastname = "lastname or other fields can not be changed"
|
||||||
assert.Error(t, user.EditAllowed(newUser))
|
assert.Error(t, user.EditAllowed(newUser))
|
||||||
|
|
||||||
user.Authentications = []UserAuthentication{{Source: UserSourceOauth}}
|
user.Source = UserSourceOauth
|
||||||
newUser.Authentications = []UserAuthentication{{Source: UserSourceOauth}}
|
newUser.Source = UserSourceOauth
|
||||||
newUser.Disabled = nil
|
newUser.Disabled = nil
|
||||||
newUser.Lastname = ""
|
newUser.Lastname = ""
|
||||||
newUser.Notes = "notes can be changed"
|
newUser.Notes = "notes can be changed"
|
||||||
@@ -90,20 +84,6 @@ func TestUser_EditAllowed(t *testing.T) {
|
|||||||
|
|
||||||
newUser.Lastname = "lastname or other fields can not be changed"
|
newUser.Lastname = "lastname or other fields can not be changed"
|
||||||
assert.Error(t, user.EditAllowed(newUser))
|
assert.Error(t, user.EditAllowed(newUser))
|
||||||
|
|
||||||
user.Authentications = []UserAuthentication{{Source: UserSourceOauth}, {Source: UserSourceDatabase}}
|
|
||||||
newUser.Authentications = []UserAuthentication{{Source: UserSourceOauth}, {Source: UserSourceDatabase}}
|
|
||||||
newUser.PersistLocalChanges = true
|
|
||||||
newUser.Disabled = nil
|
|
||||||
newUser.Lastname = ""
|
|
||||||
newUser.Notes = "notes can be changed"
|
|
||||||
assert.NoError(t, user.EditAllowed(newUser))
|
|
||||||
|
|
||||||
newUser.Disabled = &time.Time{}
|
|
||||||
assert.NoError(t, user.EditAllowed(newUser))
|
|
||||||
|
|
||||||
newUser.Lastname = "lastname or other fields can be changed"
|
|
||||||
assert.NoError(t, user.EditAllowed(newUser))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestUser_DeleteAllowed(t *testing.T) {
|
func TestUser_DeleteAllowed(t *testing.T) {
|
||||||
@@ -115,15 +95,13 @@ func TestUser_CheckPassword(t *testing.T) {
|
|||||||
password := "password"
|
password := "password"
|
||||||
hashedPassword, _ := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
|
hashedPassword, _ := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
|
||||||
|
|
||||||
user := &User{
|
user := &User{Source: UserSourceDatabase, Password: PrivateString(hashedPassword)}
|
||||||
Authentications: []UserAuthentication{{Source: UserSourceDatabase}}, Password: PrivateString(hashedPassword),
|
|
||||||
}
|
|
||||||
assert.NoError(t, user.CheckPassword(password))
|
assert.NoError(t, user.CheckPassword(password))
|
||||||
|
|
||||||
user.Password = ""
|
user.Password = ""
|
||||||
assert.Error(t, user.CheckPassword(password))
|
assert.Error(t, user.CheckPassword(password))
|
||||||
|
|
||||||
user.Authentications = []UserAuthentication{{Source: UserSourceLdap}}
|
user.Source = UserSourceLdap
|
||||||
assert.Error(t, user.CheckPassword(password))
|
assert.Error(t, user.CheckPassword(password))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -168,12 +168,3 @@ func BoolToFloat64(b bool) float64 {
|
|||||||
}
|
}
|
||||||
return 0.0
|
return 0.0
|
||||||
}
|
}
|
||||||
|
|
||||||
// Map applies the given function to each element of the given slice and returns the resulting slice
|
|
||||||
func Map[T, V any](ts []T, fn func(T) V) []V {
|
|
||||||
result := make([]V, len(ts))
|
|
||||||
for i, t := range ts {
|
|
||||||
result[i] = fn(t)
|
|
||||||
}
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -81,12 +81,12 @@ nav:
|
|||||||
- Reverse Proxy (HTTPS): documentation/getting-started/reverse-proxy.md
|
- Reverse Proxy (HTTPS): documentation/getting-started/reverse-proxy.md
|
||||||
- Configuration:
|
- Configuration:
|
||||||
- Overview: documentation/configuration/overview.md
|
- Overview: documentation/configuration/overview.md
|
||||||
|
- Mail templates: documentation/configuration/mail-templates.md
|
||||||
- Examples: documentation/configuration/examples.md
|
- Examples: documentation/configuration/examples.md
|
||||||
- Usage:
|
- Usage:
|
||||||
- General: documentation/usage/general.md
|
- General: documentation/usage/general.md
|
||||||
- Backends: documentation/usage/backends.md
|
- Backends: documentation/usage/backends.md
|
||||||
- Authentication: documentation/usage/authentication.md
|
- LDAP: documentation/usage/ldap.md
|
||||||
- User Management: documentation/usage/user-sync.md
|
|
||||||
- Security: documentation/usage/security.md
|
- Security: documentation/usage/security.md
|
||||||
- Webhooks: documentation/usage/webhooks.md
|
- Webhooks: documentation/usage/webhooks.md
|
||||||
- Mail Templates: documentation/usage/mail-templates.md
|
- Mail Templates: documentation/usage/mail-templates.md
|
||||||
|
|||||||
@@ -7,13 +7,11 @@ After=network.target
|
|||||||
Type=simple
|
Type=simple
|
||||||
User=root
|
User=root
|
||||||
Group=root
|
Group=root
|
||||||
AmbientCapabilities=CAP_NET_ADMIN CAP_NET_RAW
|
|
||||||
|
|
||||||
Restart=on-failure
|
Restart=on-failure
|
||||||
RestartSec=10
|
RestartSec=10
|
||||||
|
|
||||||
WorkingDirectory=/opt/wg-portal
|
WorkingDirectory=/opt/wg-portal
|
||||||
Environment=WG_PORTAL_CONFIG=/opt/wg-portal/config.yml
|
|
||||||
ExecStart=/opt/wg-portal/wg-portal-amd64
|
ExecStart=/opt/wg-portal/wg-portal-amd64
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
|
|||||||
Reference in New Issue
Block a user