mirror of
https://github.com/h44z/wg-portal.git
synced 2026-04-09 17:06:28 +00:00
Compare commits
2 Commits
master
...
wg_check_i
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7bfbe12d5b | ||
|
|
c3defbf675 |
4
.github/workflows/chart.yml
vendored
4
.github/workflows/chart.yml
vendored
@@ -44,7 +44,7 @@ jobs:
|
|||||||
- name: Run chart-testing (lint)
|
- name: Run chart-testing (lint)
|
||||||
run: ct lint --config ct.yaml
|
run: ct lint --config ct.yaml
|
||||||
|
|
||||||
- uses: nolar/setup-k3d-k3s@8bf8d22160e8b1d184dcb780e390d6952a7eec65 # v1.0.10
|
- uses: nolar/setup-k3d-k3s@293b8e5822a20bc0d5bcdd4826f1a665e72aba96 # v1.0.9
|
||||||
with:
|
with:
|
||||||
github-token: ${{ secrets.GITHUB_TOKEN }}
|
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
@@ -62,7 +62,7 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
|
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
|
||||||
|
|
||||||
- uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
|
- uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.actor }}
|
username: ${{ github.actor }}
|
||||||
|
|||||||
18
.github/workflows/docker-publish.yml
vendored
18
.github/workflows/docker-publish.yml
vendored
@@ -21,10 +21,10 @@ jobs:
|
|||||||
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
|
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
|
||||||
|
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.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@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
|
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
|
||||||
|
|
||||||
- name: Get Version
|
- name: Get Version
|
||||||
shell: bash
|
shell: bash
|
||||||
@@ -32,14 +32,14 @@ jobs:
|
|||||||
|
|
||||||
- name: Login to Docker Hub
|
- name: Login to Docker Hub
|
||||||
if: github.event_name != 'pull_request'
|
if: github.event_name != 'pull_request'
|
||||||
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
|
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKER_USERNAME }}
|
username: ${{ secrets.DOCKER_USERNAME }}
|
||||||
password: ${{ secrets.DOCKER_PASSWORD }}
|
password: ${{ secrets.DOCKER_PASSWORD }}
|
||||||
|
|
||||||
- name: Login to GitHub Container Registry
|
- name: Login to GitHub Container Registry
|
||||||
if: github.event_name != 'pull_request'
|
if: github.event_name != 'pull_request'
|
||||||
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
|
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.actor }}
|
username: ${{ github.actor }}
|
||||||
@@ -47,7 +47,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Extract metadata (tags, labels) for Docker
|
- name: Extract metadata (tags, labels) for Docker
|
||||||
id: meta
|
id: meta
|
||||||
uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0
|
uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
|
||||||
with:
|
with:
|
||||||
images: |
|
images: |
|
||||||
wgportal/wg-portal
|
wgportal/wg-portal
|
||||||
@@ -68,7 +68,7 @@ jobs:
|
|||||||
type=semver,pattern=v{{major}}
|
type=semver,pattern=v{{major}}
|
||||||
|
|
||||||
- name: Build and push Docker image
|
- name: Build and push Docker image
|
||||||
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
|
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
push: ${{ github.event_name != 'pull_request' }}
|
push: ${{ github.event_name != 'pull_request' }}
|
||||||
@@ -80,7 +80,7 @@ jobs:
|
|||||||
BUILD_VERSION=${{ env.BUILD_VERSION }}
|
BUILD_VERSION=${{ env.BUILD_VERSION }}
|
||||||
|
|
||||||
- name: Export binaries from images
|
- name: Export binaries from images
|
||||||
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
|
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
platforms: linux/amd64,linux/arm64,linux/arm/v7
|
platforms: linux/amd64,linux/arm64,linux/arm/v7
|
||||||
@@ -110,12 +110,12 @@ jobs:
|
|||||||
contents: write
|
contents: write
|
||||||
steps:
|
steps:
|
||||||
- name: Download binaries
|
- name: Download binaries
|
||||||
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
|
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
|
||||||
with:
|
with:
|
||||||
name: binaries
|
name: binaries
|
||||||
|
|
||||||
- name: Create GitHub Release
|
- name: Create GitHub Release
|
||||||
uses: softprops/action-gh-release@153bb8e04406b158c6c84fc1615b65b24149a1fe # v2.6.1
|
uses: softprops/action-gh-release@5be0e66d93ac7ed76da52eca8bb058f665c3a5fe # v2.4.2
|
||||||
with:
|
with:
|
||||||
files: 'wg-portal_linux*'
|
files: 'wg-portal_linux*'
|
||||||
generate_release_notes: true
|
generate_release_notes: true
|
||||||
|
|||||||
8
Makefile
8
Makefile
@@ -1,8 +1,7 @@
|
|||||||
# Go parameters
|
# Go parameters
|
||||||
GOCMD=go
|
GOCMD=go
|
||||||
GOVERSION=1.25
|
|
||||||
MODULENAME=github.com/h44z/wg-portal
|
MODULENAME=github.com/h44z/wg-portal
|
||||||
GOFILES=$(shell go list ./... | grep -v /vendor/)
|
GOFILES:=$(shell go list ./... | grep -v /vendor/)
|
||||||
BUILDDIR=dist
|
BUILDDIR=dist
|
||||||
BINARIES=$(subst cmd/,,$(wildcard cmd/*))
|
BINARIES=$(subst cmd/,,$(wildcard cmd/*))
|
||||||
IMAGE=h44z/wg-portal
|
IMAGE=h44z/wg-portal
|
||||||
@@ -52,11 +51,6 @@ format:
|
|||||||
.PHONY: test
|
.PHONY: test
|
||||||
test: test-vet test-race
|
test: test-vet test-race
|
||||||
|
|
||||||
#> test-in-docker: Run tests in Docker (for non-Linux environments e.g. MacOS)
|
|
||||||
.PHONY: test-in-docker
|
|
||||||
test-in-docker:
|
|
||||||
docker run --rm -u $(shell id -u):$(shell id -g) -e HOME=/tmp -v $(PWD):/app -w /app golang:$(GOVERSION) make test
|
|
||||||
|
|
||||||
#< test-vet: Static code analysis
|
#< test-vet: Static code analysis
|
||||||
.PHONY: test-vet
|
.PHONY: test-vet
|
||||||
test-vet: build-dependencies
|
test-vet: build-dependencies
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ func main() {
|
|||||||
internal.AssertNoError(err)
|
internal.AssertNoError(err)
|
||||||
auditRecorder.StartBackgroundJobs(ctx)
|
auditRecorder.StartBackgroundJobs(ctx)
|
||||||
|
|
||||||
userManager, err := users.NewUserManager(cfg, eventBus, database, database, database)
|
userManager, err := users.NewUserManager(cfg, eventBus, database, database)
|
||||||
internal.AssertNoError(err)
|
internal.AssertNoError(err)
|
||||||
userManager.StartBackgroundJobs(ctx)
|
userManager.StartBackgroundJobs(ctx)
|
||||||
|
|
||||||
|
|||||||
@@ -86,9 +86,6 @@ auth:
|
|||||||
memberof: memberOf
|
memberof: memberOf
|
||||||
admin_group: CN=WireGuardAdmins,OU=Some-OU,DC=COMPANY,DC=LOCAL
|
admin_group: CN=WireGuardAdmins,OU=Some-OU,DC=COMPANY,DC=LOCAL
|
||||||
registration_enabled: true
|
registration_enabled: true
|
||||||
# Restrict interface access based on LDAP filters
|
|
||||||
interface_filter:
|
|
||||||
wg0: "(memberOf=CN=VPNUsers,OU=Groups,DC=COMPANY,DC=LOCAL)"
|
|
||||||
log_user_info: true
|
log_user_info: true
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
@@ -742,16 +742,6 @@ Below are the properties for each LDAP provider entry inside `auth.ldap`:
|
|||||||
- **Important**: The `login_filter` must always be a valid LDAP filter. It should at most return one user.
|
- **Important**: The `login_filter` must always be a valid LDAP filter. It should at most return one user.
|
||||||
If the filter returns multiple or no users, the login will fail.
|
If the filter returns multiple or no users, the login will fail.
|
||||||
|
|
||||||
#### `interface_filter`
|
|
||||||
- **Default:** *(empty)*
|
|
||||||
- **Description:** A map of LDAP filters to restrict access to specific WireGuard interfaces. The map keys are the interface identifiers (e.g., `wg0`), and the values are LDAP filters. Only users matching the filter will be allowed to provision peers for the respective interface.
|
|
||||||
For example:
|
|
||||||
```yaml
|
|
||||||
interface_filter:
|
|
||||||
wg0: "(memberOf=CN=VPNUsers,OU=Groups,DC=COMPANY,DC=LOCAL)"
|
|
||||||
wg1: "(description=special-access)"
|
|
||||||
```
|
|
||||||
|
|
||||||
#### `admin_group`
|
#### `admin_group`
|
||||||
- **Default:** *(empty)*
|
- **Default:** *(empty)*
|
||||||
- **Description:** A specific LDAP group whose members are considered administrators in WireGuard Portal.
|
- **Description:** A specific LDAP group whose members are considered administrators in WireGuard Portal.
|
||||||
|
|||||||
@@ -147,26 +147,6 @@ You can map users to admin roles based on their group membership in the LDAP ser
|
|||||||
The `admin_group` property defines the distinguished name of the group that is allowed to log in as admin.
|
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.
|
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.
|
||||||
|
|
||||||
### Interface-specific Provisioning Filters
|
|
||||||
|
|
||||||
You can restrict which users are allowed to provision peers for specific WireGuard interfaces by setting the `interface_filter` property.
|
|
||||||
This property is a map where each key corresponds to a WireGuard interface identifier, and the value is an LDAP filter.
|
|
||||||
A user will only be able to see and provision peers for an interface if they match the specified LDAP filter for that interface.
|
|
||||||
|
|
||||||
Example:
|
|
||||||
```yaml
|
|
||||||
auth:
|
|
||||||
ldap:
|
|
||||||
- provider_name: "ldap1"
|
|
||||||
# ... other settings
|
|
||||||
interface_filter:
|
|
||||||
wg0: "(memberOf=CN=VPNUsers,OU=Groups,DC=COMPANY,DC=LOCAL)"
|
|
||||||
wg1: "(department=IT)"
|
|
||||||
```
|
|
||||||
|
|
||||||
This feature works by materializing the list of authorized users for each interface during the periodic LDAP synchronization.
|
|
||||||
Even if a user bypasses the UI, the backend will enforce these restrictions at the service layer.
|
|
||||||
|
|
||||||
|
|
||||||
## User Synchronization
|
## User Synchronization
|
||||||
|
|
||||||
|
|||||||
@@ -43,12 +43,4 @@ If you set the `disable_missing` property to `true`, any user that is not found
|
|||||||
All peers associated with that user will also be disabled.
|
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`.
|
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.
|
This will only re-enable the user if they were disabled by the synchronization process. Manually disabled users will not be re-enabled.
|
||||||
|
|
||||||
##### Interface-specific Access Materialization
|
|
||||||
|
|
||||||
If `interface_filter` is configured in the LDAP provider, the synchronization process will evaluate these filters for each enabled user.
|
|
||||||
The results are materialized in the `interfaces` table of the database in a hidden field.
|
|
||||||
This materialized list is used by the backend to quickly determine if a user has permission to provision peers for a specific interface, without having to query the LDAP server for every request.
|
|
||||||
The list is refreshed every time the LDAP synchronization runs.
|
|
||||||
For more details on how to configure these filters, see the [Authentication](./authentication.md#interface-specific-provisioning-filters) section.
|
|
||||||
@@ -14,7 +14,7 @@
|
|||||||
let WGPORTAL_SITE_TITLE="WireGuard Portal";
|
let WGPORTAL_SITE_TITLE="WireGuard Portal";
|
||||||
let WGPORTAL_SITE_COMPANY_NAME="WireGuard Portal";
|
let WGPORTAL_SITE_COMPANY_NAME="WireGuard Portal";
|
||||||
</script>
|
</script>
|
||||||
<script src="/api/v0/config/frontend.js" vite-ignore></script>
|
<script src="/api/v0/config/frontend.js"></script>
|
||||||
</head>
|
</head>
|
||||||
<body class="d-flex flex-column min-vh-100">
|
<body class="d-flex flex-column min-vh-100">
|
||||||
<noscript>
|
<noscript>
|
||||||
|
|||||||
2477
frontend/package-lock.json
generated
2477
frontend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -9,28 +9,28 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@fontsource/nunito-sans": "^5.2.7",
|
"@fontsource/nunito-sans": "^5.2.7",
|
||||||
"@fortawesome/fontawesome-free": "^7.2.0",
|
"@fortawesome/fontawesome-free": "^7.1.0",
|
||||||
"@kyvg/vue3-notification": "^3.4.2",
|
"@kyvg/vue3-notification": "^3.4.2",
|
||||||
"@popperjs/core": "^2.11.8",
|
"@popperjs/core": "^2.11.8",
|
||||||
"@simplewebauthn/browser": "^13.3.0",
|
"@simplewebauthn/browser": "^13.2.2",
|
||||||
"@vojtechlanka/vue-tags-input": "^3.1.2",
|
"@vojtechlanka/vue-tags-input": "^3.1.1",
|
||||||
"bootstrap": "^5.3.8",
|
"bootstrap": "^5.3.8",
|
||||||
"bootswatch": "^5.3.8",
|
"bootswatch": "^5.3.8",
|
||||||
"cidr-tools": "^11.3.2",
|
"cidr-tools": "^11.0.3",
|
||||||
"flag-icons": "^7.5.0",
|
"flag-icons": "^7.5.0",
|
||||||
"ip-address": "^10.1.0",
|
"ip-address": "^10.1.0",
|
||||||
"is-cidr": "^6.0.3",
|
"is-cidr": "^6.0.1",
|
||||||
"is-ip": "^5.0.1",
|
"is-ip": "^5.0.1",
|
||||||
"pinia": "^3.0.4",
|
"pinia": "^3.0.4",
|
||||||
"prismjs": "^1.30.0",
|
"prismjs": "^1.30.0",
|
||||||
"vue": "^3.5.31",
|
"vue": "^3.5.25",
|
||||||
"vue-i18n": "^11.3.0",
|
"vue-i18n": "^11.2.2",
|
||||||
"vue-prism-component": "github:h44z/vue-prism-component",
|
"vue-prism-component": "github:h44z/vue-prism-component",
|
||||||
"vue-router": "^5.0.4"
|
"vue-router": "^4.6.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@vitejs/plugin-vue": "^6.0.5",
|
"@vitejs/plugin-vue": "^6.0.2",
|
||||||
"sass-embedded": "^1.98.0",
|
"sass-embedded": "^1.93.3",
|
||||||
"vite": "^8.0.3"
|
"vite": "^7.2.7"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -315,7 +315,6 @@ async function applyPeerDefaults() {
|
|||||||
|
|
||||||
async function del() {
|
async function del() {
|
||||||
if (isDeleting.value) return
|
if (isDeleting.value) return
|
||||||
if (!confirm(t('modals.interface-edit.confirm-delete', {id: selectedInterface.value.Identifier}))) return
|
|
||||||
isDeleting.value = true
|
isDeleting.value = true
|
||||||
try {
|
try {
|
||||||
await interfaces.DeleteInterface(selectedInterface.value.Identifier)
|
await interfaces.DeleteInterface(selectedInterface.value.Identifier)
|
||||||
|
|||||||
@@ -26,13 +26,13 @@
|
|||||||
display:block;
|
display:block;
|
||||||
}
|
}
|
||||||
.modal.show {
|
.modal.show {
|
||||||
opacity: 1.0;
|
opacity: 1;
|
||||||
}
|
}
|
||||||
.modal-backdrop {
|
.modal-backdrop {
|
||||||
background-color: rgba(0,0,0,0.6) !important;
|
background-color: rgba(0,0,0,0.6) !important;
|
||||||
}
|
}
|
||||||
.modal-backdrop.show {
|
.modal-backdrop.show {
|
||||||
opacity: 1.0 !important;
|
opacity: 1 !important;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|||||||
@@ -1,121 +0,0 @@
|
|||||||
<script setup>
|
|
||||||
import { computed } from 'vue';
|
|
||||||
|
|
||||||
const props = defineProps({
|
|
||||||
currentPage: {
|
|
||||||
type: Number,
|
|
||||||
required: true
|
|
||||||
},
|
|
||||||
totalCount: {
|
|
||||||
type: Number,
|
|
||||||
required: true
|
|
||||||
},
|
|
||||||
pageSize: {
|
|
||||||
type: Number,
|
|
||||||
required: true
|
|
||||||
},
|
|
||||||
onGotoPage: {
|
|
||||||
type: Function,
|
|
||||||
required: true
|
|
||||||
},
|
|
||||||
onNextPage: {
|
|
||||||
type: Function,
|
|
||||||
required: true
|
|
||||||
},
|
|
||||||
onPrevPage: {
|
|
||||||
type: Function,
|
|
||||||
required: true
|
|
||||||
},
|
|
||||||
hasNextPage: {
|
|
||||||
type: Boolean,
|
|
||||||
required: true
|
|
||||||
},
|
|
||||||
hasPrevPage: {
|
|
||||||
type: Boolean,
|
|
||||||
required: true
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
const totalPages = computed(() => Math.ceil(props.totalCount / props.pageSize));
|
|
||||||
|
|
||||||
const pages = computed(() => {
|
|
||||||
const current = props.currentPage;
|
|
||||||
const last = totalPages.value;
|
|
||||||
const delta = 2; // Number of pages to show before and after current page
|
|
||||||
|
|
||||||
const range = [];
|
|
||||||
const rangeWithDots = [];
|
|
||||||
|
|
||||||
// If total pages is small, just show all pages
|
|
||||||
if (last <= 7) {
|
|
||||||
for (let i = 1; i <= last; i++) {
|
|
||||||
rangeWithDots.push({ type: 'page', value: i });
|
|
||||||
}
|
|
||||||
return rangeWithDots;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Calculate the range around the current page
|
|
||||||
let start = Math.max(2, current - delta);
|
|
||||||
let end = Math.min(last - 1, current + delta);
|
|
||||||
|
|
||||||
// Adjust range to always show a consistent number of pages if possible
|
|
||||||
if (current <= delta + 2) {
|
|
||||||
end = 2 + delta * 2;
|
|
||||||
} else if (current >= last - delta - 1) {
|
|
||||||
start = last - delta * 2 - 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add dots before the range if needed
|
|
||||||
if (start > 2) {
|
|
||||||
rangeWithDots.push({ type: 'page', value: 1 });
|
|
||||||
rangeWithDots.push({ type: 'dots', value: 'dots-start' });
|
|
||||||
} else {
|
|
||||||
for (let i = 1; i < start; i++) {
|
|
||||||
rangeWithDots.push({ type: 'page', value: i });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add the central range
|
|
||||||
for (let i = start; i <= end; i++) {
|
|
||||||
rangeWithDots.push({ type: 'page', value: i });
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add dots after the range if needed
|
|
||||||
if (end < last - 1) {
|
|
||||||
rangeWithDots.push({ type: 'dots', value: 'dots-end' });
|
|
||||||
rangeWithDots.push({ type: 'page', value: last });
|
|
||||||
} else {
|
|
||||||
for (let i = end + 1; i <= last; i++) {
|
|
||||||
rangeWithDots.push({ type: 'page', value: i });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return rangeWithDots;
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<ul class="pagination pagination-sm mb-0" v-if="totalPages > 1">
|
|
||||||
<li :class="{ disabled: !hasPrevPage }" class="page-item">
|
|
||||||
<a class="page-link" href="#" @click.prevent="hasPrevPage && onPrevPage()">«</a>
|
|
||||||
</li>
|
|
||||||
|
|
||||||
<li v-for="item in pages" :key="item.type === 'page' ? item.value : item.value" :class="{ active: currentPage === item.value, disabled: item.type === 'dots' }" class="page-item">
|
|
||||||
<a v-if="item.type === 'page'" class="page-link" href="#" @click.prevent="onGotoPage(item.value)">{{ item.value }}</a>
|
|
||||||
<span v-else class="page-link">...</span>
|
|
||||||
</li>
|
|
||||||
|
|
||||||
<li :class="{ disabled: !hasNextPage }" class="page-item">
|
|
||||||
<a class="page-link" href="#" @click.prevent="hasNextPage && onNextPage()">»</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<style scoped>
|
|
||||||
.page-link {
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
.page-item.disabled .page-link {
|
|
||||||
cursor: default;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
@@ -294,7 +294,6 @@ async function save() {
|
|||||||
|
|
||||||
async function del() {
|
async function del() {
|
||||||
if (isDeleting.value) return
|
if (isDeleting.value) return
|
||||||
if (!confirm(t('modals.peer-edit.confirm-delete', {id: selectedPeer.value.Identifier}))) return
|
|
||||||
isDeleting.value = true
|
isDeleting.value = true
|
||||||
try {
|
try {
|
||||||
await peers.DeletePeer(selectedPeer.value.Identifier)
|
await peers.DeletePeer(selectedPeer.value.Identifier)
|
||||||
|
|||||||
@@ -114,7 +114,6 @@ async function save() {
|
|||||||
|
|
||||||
async function del() {
|
async function del() {
|
||||||
if (isDeleting.value) return
|
if (isDeleting.value) return
|
||||||
if (!confirm(t('modals.user-edit.confirm-delete', {id: selectedUser.value.Identifier}))) return
|
|
||||||
isDeleting.value = true
|
isDeleting.value = true
|
||||||
try {
|
try {
|
||||||
await users.DeleteUser(selectedUser.value.Identifier)
|
await users.DeleteUser(selectedUser.value.Identifier)
|
||||||
|
|||||||
@@ -382,8 +382,7 @@
|
|||||||
"persist-local-changes": {
|
"persist-local-changes": {
|
||||||
"label": "Lokale Änderungen speichern"
|
"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.",
|
"sync-warning": "Um diesen synchronisierten Benutzer zu bearbeiten, aktivieren Sie die lokale Änderungsspeicherung. Andernfalls werden Ihre Änderungen bei der nächsten Synchronisierung überschrieben."
|
||||||
"confirm-delete": "Benutzer '{id}' wirklich löschen?"
|
|
||||||
},
|
},
|
||||||
"interface-view": {
|
"interface-view": {
|
||||||
"headline": "Konfiguration für Schnittstelle:"
|
"headline": "Konfiguration für Schnittstelle:"
|
||||||
@@ -504,8 +503,7 @@
|
|||||||
"placeholder": "Persistentes Keepalive (0 = Standard)"
|
"placeholder": "Persistentes Keepalive (0 = Standard)"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"button-apply-defaults": "Peer-Standardeinstellungen anwenden",
|
"button-apply-defaults": "Peer-Standardeinstellungen anwenden"
|
||||||
"confirm-delete": "Interface '{id}' wirklich löschen?"
|
|
||||||
},
|
},
|
||||||
"peer-view": {
|
"peer-view": {
|
||||||
"headline-peer": "Peer:",
|
"headline-peer": "Peer:",
|
||||||
@@ -627,8 +625,7 @@
|
|||||||
},
|
},
|
||||||
"expires-at": {
|
"expires-at": {
|
||||||
"label": "Ablaufdatum"
|
"label": "Ablaufdatum"
|
||||||
},
|
}
|
||||||
"confirm-delete": "Peer '{id}' wirklich löschen?"
|
|
||||||
},
|
},
|
||||||
"peer-multi-create": {
|
"peer-multi-create": {
|
||||||
"headline-peer": "Mehrere Peers erstellen",
|
"headline-peer": "Mehrere Peers erstellen",
|
||||||
|
|||||||
@@ -271,16 +271,16 @@
|
|||||||
"headline-preshared-key": "New Preshared Key",
|
"headline-preshared-key": "New Preshared Key",
|
||||||
"button-generate": "Generate",
|
"button-generate": "Generate",
|
||||||
"private-key": {
|
"private-key": {
|
||||||
"label": "Private Key",
|
"label": "Private Key",
|
||||||
"placeholder": "The private key"
|
"placeholder": "The private key"
|
||||||
},
|
},
|
||||||
"public-key": {
|
"public-key": {
|
||||||
"label": "Public Key",
|
"label": "Public Key",
|
||||||
"placeholder": "The public key"
|
"placeholder": "The public key"
|
||||||
},
|
},
|
||||||
"preshared-key": {
|
"preshared-key": {
|
||||||
"label": "Preshared Key",
|
"label": "Preshared Key",
|
||||||
"placeholder": "The pre-shared key"
|
"placeholder": "The pre-shared key"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"calculator": {
|
"calculator": {
|
||||||
@@ -289,18 +289,18 @@
|
|||||||
"headline-allowed-ip": "New Allowed IPs",
|
"headline-allowed-ip": "New Allowed IPs",
|
||||||
"button-exclude-private": "Exclude Private IP Ranges",
|
"button-exclude-private": "Exclude Private IP Ranges",
|
||||||
"allowed-ip": {
|
"allowed-ip": {
|
||||||
"label": "Allowed IPs",
|
"label": "Allowed IPs",
|
||||||
"placeholder": "0.0.0.0/0, ::/0",
|
"placeholder": "0.0.0.0/0, ::/0",
|
||||||
"empty": "Value cannot be empty"
|
"empty": "Value cannot be empty"
|
||||||
},
|
},
|
||||||
"dissallowed-ip": {
|
"dissallowed-ip": {
|
||||||
"label": "Disallowed IPs",
|
"label": "Disallowed IPs",
|
||||||
"placeholder": "10.0.0.0/8, 192.168.0.0/16",
|
"placeholder": "10.0.0.0/8, 192.168.0.0/16",
|
||||||
"invalid": "Invalid address: {addr}"
|
"invalid": "Invalid address: {addr}"
|
||||||
},
|
},
|
||||||
"new-allowed-ip": {
|
"new-allowed-ip": {
|
||||||
"label": "Allowed IPs",
|
"label": "Allowed IPs",
|
||||||
"placeholder": ""
|
"placeholder": ""
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"modals": {
|
"modals": {
|
||||||
@@ -382,8 +382,7 @@
|
|||||||
"persist-local-changes": {
|
"persist-local-changes": {
|
||||||
"label": "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.",
|
"sync-warning": "To modify this synchronized user, enable local change persistence. Otherwise, your changes will be overwritten during the next synchronization."
|
||||||
"confirm-delete": "Are you sure you want to delete user '{id}'?"
|
|
||||||
},
|
},
|
||||||
"interface-view": {
|
"interface-view": {
|
||||||
"headline": "Config for Interface:"
|
"headline": "Config for Interface:"
|
||||||
@@ -504,8 +503,8 @@
|
|||||||
"placeholder": "Persistent Keepalive (0 = default)"
|
"placeholder": "Persistent Keepalive (0 = default)"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"button-apply-defaults": "Apply Peer Defaults",
|
|
||||||
"confirm-delete": "Are you sure you want to delete interface '{id}'?"
|
"button-apply-defaults": "Apply Peer Defaults"
|
||||||
},
|
},
|
||||||
"peer-view": {
|
"peer-view": {
|
||||||
"headline-peer": "Peer:",
|
"headline-peer": "Peer:",
|
||||||
@@ -627,8 +626,7 @@
|
|||||||
},
|
},
|
||||||
"expires-at": {
|
"expires-at": {
|
||||||
"label": "Expiry date"
|
"label": "Expiry date"
|
||||||
},
|
}
|
||||||
"confirm-delete": "Are you sure you want to delete peer '{id}'?"
|
|
||||||
},
|
},
|
||||||
"peer-multi-create": {
|
"peer-multi-create": {
|
||||||
"headline-peer": "Create multiple peers",
|
"headline-peer": "Create multiple peers",
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -126,7 +126,9 @@
|
|||||||
"peer-expiring": "Le pair expire le",
|
"peer-expiring": "Le pair expire le",
|
||||||
"peer-connected": "Connecté",
|
"peer-connected": "Connecté",
|
||||||
"peer-not-connected": "Non connecté",
|
"peer-not-connected": "Non connecté",
|
||||||
"peer-handshake": "Dernière négociation :"
|
"peer-handshake": "Dernière négociation :",
|
||||||
|
"button-show-peer": "Afficher le pair",
|
||||||
|
"button-edit-peer": "Modifier le pair"
|
||||||
},
|
},
|
||||||
"users": {
|
"users": {
|
||||||
"headline": "Administration des utilisateurs",
|
"headline": "Administration des utilisateurs",
|
||||||
@@ -262,8 +264,7 @@
|
|||||||
},
|
},
|
||||||
"admin": {
|
"admin": {
|
||||||
"label": "Est Admin"
|
"label": "Est Admin"
|
||||||
},
|
}
|
||||||
"confirm-delete": "Voulez-vous vraiment supprimer l'utilisateur \"{id}\" ?"
|
|
||||||
},
|
},
|
||||||
"interface-view": {
|
"interface-view": {
|
||||||
"headline": "Configuration pour l'interface :"
|
"headline": "Configuration pour l'interface :"
|
||||||
@@ -376,8 +377,7 @@
|
|||||||
"placeholder": "Persistent Keepalive (0 = par défaut)"
|
"placeholder": "Persistent Keepalive (0 = par défaut)"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"button-apply-defaults": "Appliquer les valeurs par défaut des pairs",
|
"button-apply-defaults": "Appliquer les valeurs par défaut des pairs"
|
||||||
"confirm-delete": "Voulez-vous vraiment supprimer l'interface \"{id}\" ?"
|
|
||||||
},
|
},
|
||||||
"peer-view": {
|
"peer-view": {
|
||||||
"headline-peer": "Pair :",
|
"headline-peer": "Pair :",
|
||||||
@@ -493,8 +493,7 @@
|
|||||||
},
|
},
|
||||||
"expires-at": {
|
"expires-at": {
|
||||||
"label": "Date d'expiration"
|
"label": "Date d'expiration"
|
||||||
},
|
}
|
||||||
"confirm-delete": "Voulez-vous vraiment supprimer le pair \"{id}\" ?"
|
|
||||||
},
|
},
|
||||||
"peer-multi-create": {
|
"peer-multi-create": {
|
||||||
"headline-peer": "Créer plusieurs pairs",
|
"headline-peer": "Créer plusieurs pairs",
|
||||||
|
|||||||
@@ -282,7 +282,6 @@
|
|||||||
"label": "관리자 여부"
|
"label": "관리자 여부"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"confirm-delete": "사용자 '{id}'를 삭제하시겠습니까?",
|
|
||||||
"interface-view": {
|
"interface-view": {
|
||||||
"headline": "인터페이스 구성:"
|
"headline": "인터페이스 구성:"
|
||||||
},
|
},
|
||||||
@@ -394,8 +393,7 @@
|
|||||||
"placeholder": "영구 Keepalive (0 = 기본값)"
|
"placeholder": "영구 Keepalive (0 = 기본값)"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"button-apply-defaults": "피어 기본값 적용",
|
"button-apply-defaults": "피어 기본값 적용"
|
||||||
"confirm-delete": "인터페이스 '{id}'를 삭제하시겠습니까?"
|
|
||||||
},
|
},
|
||||||
"peer-view": {
|
"peer-view": {
|
||||||
"headline-peer": "피어:",
|
"headline-peer": "피어:",
|
||||||
@@ -511,8 +509,7 @@
|
|||||||
},
|
},
|
||||||
"expires-at": {
|
"expires-at": {
|
||||||
"label": "만료 날짜"
|
"label": "만료 날짜"
|
||||||
},
|
}
|
||||||
"confirm-delete": "피어 '{id}'를 삭제하시겠습니까?"
|
|
||||||
},
|
},
|
||||||
"peer-multi-create": {
|
"peer-multi-create": {
|
||||||
"headline-peer": "여러 피어 생성",
|
"headline-peer": "여러 피어 생성",
|
||||||
|
|||||||
@@ -300,8 +300,7 @@
|
|||||||
},
|
},
|
||||||
"admin": {
|
"admin": {
|
||||||
"label": "É Administrador"
|
"label": "É Administrador"
|
||||||
},
|
}
|
||||||
"confirm-delete": "Tem certeza que deseja excluir o utilizador '{id}'?"
|
|
||||||
},
|
},
|
||||||
"interface-view": {
|
"interface-view": {
|
||||||
"headline": "Configuração para a Interface:"
|
"headline": "Configuração para a Interface:"
|
||||||
@@ -414,8 +413,7 @@
|
|||||||
"placeholder": "Keepalive persistente (0 = padrão)"
|
"placeholder": "Keepalive persistente (0 = padrão)"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"button-apply-defaults": "Aplicar Padrões de Peer",
|
"button-apply-defaults": "Aplicar Padrões de Peer"
|
||||||
"confirm-delete": "Tem certeza que deseja excluir a interface '{id}'?"
|
|
||||||
},
|
},
|
||||||
"peer-view": {
|
"peer-view": {
|
||||||
"headline-peer": "Peer:",
|
"headline-peer": "Peer:",
|
||||||
@@ -532,8 +530,7 @@
|
|||||||
},
|
},
|
||||||
"expires-at": {
|
"expires-at": {
|
||||||
"label": "Data de expiração"
|
"label": "Data de expiração"
|
||||||
},
|
}
|
||||||
"confirm-delete": "Tem certeza que deseja excluir o par '{id}'?"
|
|
||||||
},
|
},
|
||||||
"peer-multi-create": {
|
"peer-multi-create": {
|
||||||
"headline-peer": "Criar múltiplos peers",
|
"headline-peer": "Criar múltiplos peers",
|
||||||
|
|||||||
@@ -259,16 +259,16 @@
|
|||||||
"headline-preshared-key": "Новый общий ключ",
|
"headline-preshared-key": "Новый общий ключ",
|
||||||
"button-generate": "Генерировать",
|
"button-generate": "Генерировать",
|
||||||
"private-key": {
|
"private-key": {
|
||||||
"label": "Приватный ключ",
|
"label": "Приватный ключ",
|
||||||
"placeholder": "Приватный ключ"
|
"placeholder": "Приватный ключ"
|
||||||
},
|
},
|
||||||
"public-key": {
|
"public-key": {
|
||||||
"label": "Публичный ключ",
|
"label": "Публичный ключ",
|
||||||
"placeholder": "Публичный ключ"
|
"placeholder": "Публичный ключ"
|
||||||
},
|
},
|
||||||
"preshared-key": {
|
"preshared-key": {
|
||||||
"label": "Общий ключ",
|
"label": "Общий ключ",
|
||||||
"placeholder": "Общий ключ"
|
"placeholder": "Общий ключ"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"calculator": {
|
"calculator": {
|
||||||
@@ -277,18 +277,18 @@
|
|||||||
"headline-allowed-ip": "Новые разрешенные IP-адреса",
|
"headline-allowed-ip": "Новые разрешенные IP-адреса",
|
||||||
"button-exclude-private": "Исключить частные диапазоны IP-адресов",
|
"button-exclude-private": "Исключить частные диапазоны IP-адресов",
|
||||||
"allowed-ip": {
|
"allowed-ip": {
|
||||||
"label": "Разрешенные IP-адреса",
|
"label": "Разрешенные IP-адреса",
|
||||||
"placeholder": "0.0.0.0/0, ::/0",
|
"placeholder": "0.0.0.0/0, ::/0",
|
||||||
"empty": "Поле ввода не должно быть пустым"
|
"empty": "Поле ввода не должно быть пустым"
|
||||||
},
|
},
|
||||||
"dissallowed-ip": {
|
"dissallowed-ip": {
|
||||||
"label": "Запрещенные IP-адреса",
|
"label": "Запрещенные IP-адреса",
|
||||||
"placeholder": "10.0.0.0/8, 192.168.0.0/16",
|
"placeholder": "10.0.0.0/8, 192.168.0.0/16",
|
||||||
"invalid": "Некорректный адрес: {addr}"
|
"invalid": "Некорректный адрес: {addr}"
|
||||||
},
|
},
|
||||||
"new-allowed-ip": {
|
"new-allowed-ip": {
|
||||||
"label": "Разрешенные IP-адреса",
|
"label": "Разрешенные IP-адреса",
|
||||||
"placeholder": ""
|
"placeholder": ""
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"modals": {
|
"modals": {
|
||||||
@@ -366,8 +366,7 @@
|
|||||||
},
|
},
|
||||||
"admin": {
|
"admin": {
|
||||||
"label": "Является администратором"
|
"label": "Является администратором"
|
||||||
},
|
}
|
||||||
"confirm-delete": "Вы уверены, что хотите удалить пользователя «{id}»?"
|
|
||||||
},
|
},
|
||||||
"interface-view": {
|
"interface-view": {
|
||||||
"headline": "Конфигурация интерфейса:"
|
"headline": "Конфигурация интерфейса:"
|
||||||
@@ -485,8 +484,7 @@
|
|||||||
"placeholder": "Постоянное поддержание активности (0 = значение по умолчанию)"
|
"placeholder": "Постоянное поддержание активности (0 = значение по умолчанию)"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"button-apply-defaults": "Применить настройки пира по умолчанию",
|
"button-apply-defaults": "Применить настройки пира по умолчанию"
|
||||||
"confirm-delete": "Вы уверены, что хотите удалить интерфейс «{id}»?"
|
|
||||||
},
|
},
|
||||||
"peer-view": {
|
"peer-view": {
|
||||||
"headline-peer": "Пир:",
|
"headline-peer": "Пир:",
|
||||||
@@ -607,8 +605,7 @@
|
|||||||
},
|
},
|
||||||
"expires-at": {
|
"expires-at": {
|
||||||
"label": "Дата истечения срока действия"
|
"label": "Дата истечения срока действия"
|
||||||
},
|
}
|
||||||
"confirm-delete": "Вы уверены, что хотите удалить пир «{id}»?"
|
|
||||||
},
|
},
|
||||||
"peer-multi-create": {
|
"peer-multi-create": {
|
||||||
"headline-peer": "Создать несколько узлов",
|
"headline-peer": "Создать несколько узлов",
|
||||||
|
|||||||
@@ -151,6 +151,7 @@
|
|||||||
"admin": "Користувач має адміністративні привілеї",
|
"admin": "Користувач має адміністративні привілеї",
|
||||||
"no-admin": "Користувач не має адміністративних привілеїв"
|
"no-admin": "Користувач не має адміністративних привілеїв"
|
||||||
},
|
},
|
||||||
|
|
||||||
"profile": {
|
"profile": {
|
||||||
"headline": "Мої VPN-піри",
|
"headline": "Мої VPN-піри",
|
||||||
"table-heading": {
|
"table-heading": {
|
||||||
@@ -188,6 +189,7 @@
|
|||||||
"api-link": "Документація API"
|
"api-link": "Документація API"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
"modals": {
|
"modals": {
|
||||||
"user-view": {
|
"user-view": {
|
||||||
"headline": "Обліковий запис користувача:",
|
"headline": "Обліковий запис користувача:",
|
||||||
@@ -262,8 +264,7 @@
|
|||||||
},
|
},
|
||||||
"admin": {
|
"admin": {
|
||||||
"label": "Адміністратор"
|
"label": "Адміністратор"
|
||||||
},
|
}
|
||||||
"confirm-delete": "Ви впевнені, що хочете видалити користувача «{id}»?"
|
|
||||||
},
|
},
|
||||||
"interface-view": {
|
"interface-view": {
|
||||||
"headline": "Конфігурація для інтерфейсу:"
|
"headline": "Конфігурація для інтерфейсу:"
|
||||||
@@ -376,8 +377,7 @@
|
|||||||
"placeholder": "Постійний Keepalive (0 = за замовчуванням)"
|
"placeholder": "Постійний Keepalive (0 = за замовчуванням)"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"button-apply-defaults": "Застосувати значення за замовчуванням для пірів",
|
"button-apply-defaults": "Застосувати значення за замовчуванням для пірів"
|
||||||
"confirm-delete": "Ви впевнені, що хочете видалити інтерфейс «{id}»?"
|
|
||||||
},
|
},
|
||||||
"peer-view": {
|
"peer-view": {
|
||||||
"headline-peer": "Пір:",
|
"headline-peer": "Пір:",
|
||||||
@@ -493,8 +493,7 @@
|
|||||||
},
|
},
|
||||||
"expires-at": {
|
"expires-at": {
|
||||||
"label": "Дата закінчення терміну дії"
|
"label": "Дата закінчення терміну дії"
|
||||||
},
|
}
|
||||||
"confirm-delete": "Ви впевнені, що хочете видалити пір «{id}»?"
|
|
||||||
},
|
},
|
||||||
"peer-multi-create": {
|
"peer-multi-create": {
|
||||||
"headline-peer": "Створити декілька пір",
|
"headline-peer": "Створити декілька пір",
|
||||||
|
|||||||
@@ -240,8 +240,7 @@
|
|||||||
},
|
},
|
||||||
"admin": {
|
"admin": {
|
||||||
"label": "Là Quản trị viên"
|
"label": "Là Quản trị viên"
|
||||||
},
|
}
|
||||||
"confirm-delete": "Ban co chac muon xoa nguoi dung '{id}' khong?"
|
|
||||||
},
|
},
|
||||||
"interface-view": {
|
"interface-view": {
|
||||||
"headline": "Cấu hình cho Giao diện:"
|
"headline": "Cấu hình cho Giao diện:"
|
||||||
@@ -354,8 +353,8 @@
|
|||||||
"placeholder": "Giữ kết nối liên tục (0 = mặc định)"
|
"placeholder": "Giữ kết nối liên tục (0 = mặc định)"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"button-apply-defaults": "Áp dụng Cài đặt Mặc định của Peer",
|
|
||||||
"confirm-delete": "Ban co chac muon xoa giao dien '{id}' khong?"
|
"button-apply-defaults": "Áp dụng Cài đặt Mặc định của Peer"
|
||||||
},
|
},
|
||||||
"peer-view": {
|
"peer-view": {
|
||||||
"headline-peer": "Peer:",
|
"headline-peer": "Peer:",
|
||||||
@@ -471,8 +470,7 @@
|
|||||||
},
|
},
|
||||||
"expires-at": {
|
"expires-at": {
|
||||||
"label": "Ngày hết hạn"
|
"label": "Ngày hết hạn"
|
||||||
},
|
}
|
||||||
"confirm-delete": "Ban co chac muon xoa peer '{id}' khong?"
|
|
||||||
},
|
},
|
||||||
"peer-multi-create": {
|
"peer-multi-create": {
|
||||||
"headline-peer": "Tạo nhiều peer",
|
"headline-peer": "Tạo nhiều peer",
|
||||||
|
|||||||
@@ -242,7 +242,6 @@
|
|||||||
"label": "管理员"
|
"label": "管理员"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"confirm-delete": "确定要删除用户“{id}”吗?",
|
|
||||||
"interface-view": {
|
"interface-view": {
|
||||||
"headline": "接口配置: "
|
"headline": "接口配置: "
|
||||||
},
|
},
|
||||||
@@ -354,8 +353,7 @@
|
|||||||
"placeholder": "持久保持连接 (0 = 默认)"
|
"placeholder": "持久保持连接 (0 = 默认)"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"button-apply-defaults": "应用节点默认值",
|
"button-apply-defaults": "应用节点默认值"
|
||||||
"confirm-delete": "确定要删除接口“{id}”吗?"
|
|
||||||
},
|
},
|
||||||
"peer-view": {
|
"peer-view": {
|
||||||
"headline-peer": "节点: ",
|
"headline-peer": "节点: ",
|
||||||
@@ -471,8 +469,7 @@
|
|||||||
},
|
},
|
||||||
"expires-at": {
|
"expires-at": {
|
||||||
"label": "过期日期"
|
"label": "过期日期"
|
||||||
},
|
}
|
||||||
"confirm-delete": "确定要删除对等点“{id}”吗?"
|
|
||||||
},
|
},
|
||||||
"peer-multi-create": {
|
"peer-multi-create": {
|
||||||
"headline-peer": "创建多个节点",
|
"headline-peer": "创建多个节点",
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import {createRouter, createWebHashHistory} from 'vue-router'
|
import {createRouter, createWebHashHistory} from 'vue-router'
|
||||||
import HomeView from '../views/HomeView.vue'
|
import HomeView from '../views/HomeView.vue'
|
||||||
import LoginView from '../views/LoginView.vue'
|
import LoginView from '../views/LoginView.vue'
|
||||||
|
import InterfaceView from '../views/InterfaceView.vue'
|
||||||
|
|
||||||
import {authStore} from '@/stores/auth'
|
import {authStore} from '@/stores/auth'
|
||||||
import {securityStore} from '@/stores/security'
|
import {securityStore} from '@/stores/security'
|
||||||
@@ -19,6 +20,11 @@ const router = createRouter({
|
|||||||
name: 'login',
|
name: 'login',
|
||||||
component: LoginView
|
component: LoginView
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
path: '/interface',
|
||||||
|
name: 'interface',
|
||||||
|
component: InterfaceView
|
||||||
|
},
|
||||||
{
|
{
|
||||||
path: '/interfaces',
|
path: '/interfaces',
|
||||||
name: 'interfaces',
|
name: 'interfaces',
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ export const auditStore = defineStore('audit', {
|
|||||||
filter: "",
|
filter: "",
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
pageOffset: 0,
|
pageOffset: 0,
|
||||||
|
pages: [],
|
||||||
fetching: false,
|
fetching: false,
|
||||||
}),
|
}),
|
||||||
getters: {
|
getters: {
|
||||||
@@ -40,22 +41,33 @@ export const auditStore = defineStore('audit', {
|
|||||||
afterPageSizeChange() {
|
afterPageSizeChange() {
|
||||||
// reset pageOffset to avoid problems with new page sizes
|
// reset pageOffset to avoid problems with new page sizes
|
||||||
this.pageOffset = 0
|
this.pageOffset = 0
|
||||||
|
this.calculatePages()
|
||||||
|
},
|
||||||
|
calculatePages() {
|
||||||
|
let pageCounter = 1;
|
||||||
|
this.pages = []
|
||||||
|
for (let i = 0; i < this.FilteredCount; i+=this.pageSize) {
|
||||||
|
this.pages.push(pageCounter++)
|
||||||
|
}
|
||||||
},
|
},
|
||||||
gotoPage(page) {
|
gotoPage(page) {
|
||||||
this.pageOffset = (page-1) * this.pageSize
|
this.pageOffset = (page-1) * this.pageSize
|
||||||
|
|
||||||
|
this.calculatePages()
|
||||||
},
|
},
|
||||||
nextPage() {
|
nextPage() {
|
||||||
if (this.hasNextPage) {
|
this.pageOffset += this.pageSize
|
||||||
this.pageOffset += this.pageSize
|
|
||||||
}
|
this.calculatePages()
|
||||||
},
|
},
|
||||||
previousPage() {
|
previousPage() {
|
||||||
if (this.hasPrevPage) {
|
this.pageOffset -= this.pageSize
|
||||||
this.pageOffset -= this.pageSize
|
|
||||||
}
|
this.calculatePages()
|
||||||
},
|
},
|
||||||
setEntries(entries) {
|
setEntries(entries) {
|
||||||
this.entries = entries
|
this.entries = entries
|
||||||
|
this.calculatePages()
|
||||||
this.fetching = false
|
this.fetching = false
|
||||||
},
|
},
|
||||||
async LoadEntries() {
|
async LoadEntries() {
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ export const peerStore = defineStore('peers', {
|
|||||||
filter: "",
|
filter: "",
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
pageOffset: 0,
|
pageOffset: 0,
|
||||||
|
pages: [],
|
||||||
fetching: false,
|
fetching: false,
|
||||||
sortKey: 'IsConnected', // Default sort key
|
sortKey: 'IsConnected', // Default sort key
|
||||||
sortOrder: -1, // 1 for ascending, -1 for descending
|
sortOrder: -1, // 1 for ascending, -1 for descending
|
||||||
@@ -86,22 +87,33 @@ export const peerStore = defineStore('peers', {
|
|||||||
afterPageSizeChange() {
|
afterPageSizeChange() {
|
||||||
// reset pageOffset to avoid problems with new page sizes
|
// reset pageOffset to avoid problems with new page sizes
|
||||||
this.pageOffset = 0
|
this.pageOffset = 0
|
||||||
|
this.calculatePages()
|
||||||
|
},
|
||||||
|
calculatePages() {
|
||||||
|
let pageCounter = 1;
|
||||||
|
this.pages = []
|
||||||
|
for (let i = 0; i < this.FilteredCount; i+=this.pageSize) {
|
||||||
|
this.pages.push(pageCounter++)
|
||||||
|
}
|
||||||
},
|
},
|
||||||
gotoPage(page) {
|
gotoPage(page) {
|
||||||
this.pageOffset = (page-1) * this.pageSize
|
this.pageOffset = (page-1) * this.pageSize
|
||||||
|
|
||||||
|
this.calculatePages()
|
||||||
},
|
},
|
||||||
nextPage() {
|
nextPage() {
|
||||||
if (this.hasNextPage) {
|
this.pageOffset += this.pageSize
|
||||||
this.pageOffset += this.pageSize
|
|
||||||
}
|
this.calculatePages()
|
||||||
},
|
},
|
||||||
previousPage() {
|
previousPage() {
|
||||||
if (this.hasPrevPage) {
|
this.pageOffset -= this.pageSize
|
||||||
this.pageOffset -= this.pageSize
|
|
||||||
}
|
this.calculatePages()
|
||||||
},
|
},
|
||||||
setPeers(peers) {
|
setPeers(peers) {
|
||||||
this.peers = peers
|
this.peers = peers
|
||||||
|
this.calculatePages()
|
||||||
this.fetching = false
|
this.fetching = false
|
||||||
this.trafficStats = {}
|
this.trafficStats = {}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ export const profileStore = defineStore('profile', {
|
|||||||
filter: "",
|
filter: "",
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
pageOffset: 0,
|
pageOffset: 0,
|
||||||
|
pages: [],
|
||||||
fetching: false,
|
fetching: false,
|
||||||
sortKey: 'IsConnected', // Default sort key
|
sortKey: 'IsConnected', // Default sort key
|
||||||
sortOrder: -1, // 1 for ascending, -1 for descending
|
sortOrder: -1, // 1 for ascending, -1 for descending
|
||||||
@@ -73,25 +74,34 @@ export const profileStore = defineStore('profile', {
|
|||||||
},
|
},
|
||||||
hasStatistics: (state) => state.statsEnabled,
|
hasStatistics: (state) => state.statsEnabled,
|
||||||
CountInterfaces: (state) => state.interfaces.length,
|
CountInterfaces: (state) => state.interfaces.length,
|
||||||
HasInterface: (state) => (id) => state.interfaces.some((i) => i.Identifier === id),
|
|
||||||
},
|
},
|
||||||
actions: {
|
actions: {
|
||||||
afterPageSizeChange() {
|
afterPageSizeChange() {
|
||||||
// reset pageOffset to avoid problems with new page sizes
|
// reset pageOffset to avoid problems with new page sizes
|
||||||
this.pageOffset = 0
|
this.pageOffset = 0
|
||||||
|
this.calculatePages()
|
||||||
|
},
|
||||||
|
calculatePages() {
|
||||||
|
let pageCounter = 1;
|
||||||
|
this.pages = []
|
||||||
|
for (let i = 0; i < this.FilteredPeerCount; i+=this.pageSize) {
|
||||||
|
this.pages.push(pageCounter++)
|
||||||
|
}
|
||||||
},
|
},
|
||||||
gotoPage(page) {
|
gotoPage(page) {
|
||||||
this.pageOffset = (page-1) * this.pageSize
|
this.pageOffset = (page-1) * this.pageSize
|
||||||
|
|
||||||
|
this.calculatePages()
|
||||||
},
|
},
|
||||||
nextPage() {
|
nextPage() {
|
||||||
if (this.hasNextPage) {
|
this.pageOffset += this.pageSize
|
||||||
this.pageOffset += this.pageSize
|
|
||||||
}
|
this.calculatePages()
|
||||||
},
|
},
|
||||||
previousPage() {
|
previousPage() {
|
||||||
if (this.hasPrevPage) {
|
this.pageOffset -= this.pageSize
|
||||||
this.pageOffset -= this.pageSize
|
|
||||||
}
|
this.calculatePages()
|
||||||
},
|
},
|
||||||
setPeers(peers) {
|
setPeers(peers) {
|
||||||
this.peers = peers
|
this.peers = peers
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ export const userStore = defineStore('users', {
|
|||||||
filter: "",
|
filter: "",
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
pageOffset: 0,
|
pageOffset: 0,
|
||||||
|
pages: [],
|
||||||
fetching: false,
|
fetching: false,
|
||||||
}),
|
}),
|
||||||
getters: {
|
getters: {
|
||||||
@@ -42,22 +43,33 @@ export const userStore = defineStore('users', {
|
|||||||
afterPageSizeChange() {
|
afterPageSizeChange() {
|
||||||
// reset pageOffset to avoid problems with new page sizes
|
// reset pageOffset to avoid problems with new page sizes
|
||||||
this.pageOffset = 0
|
this.pageOffset = 0
|
||||||
|
this.calculatePages()
|
||||||
|
},
|
||||||
|
calculatePages() {
|
||||||
|
let pageCounter = 1;
|
||||||
|
this.pages = []
|
||||||
|
for (let i = 0; i < this.FilteredCount; i+=this.pageSize) {
|
||||||
|
this.pages.push(pageCounter++)
|
||||||
|
}
|
||||||
},
|
},
|
||||||
gotoPage(page) {
|
gotoPage(page) {
|
||||||
this.pageOffset = (page-1) * this.pageSize
|
this.pageOffset = (page-1) * this.pageSize
|
||||||
|
|
||||||
|
this.calculatePages()
|
||||||
},
|
},
|
||||||
nextPage() {
|
nextPage() {
|
||||||
if (this.hasNextPage) {
|
this.pageOffset += this.pageSize
|
||||||
this.pageOffset += this.pageSize
|
|
||||||
}
|
this.calculatePages()
|
||||||
},
|
},
|
||||||
previousPage() {
|
previousPage() {
|
||||||
if (this.hasPrevPage) {
|
this.pageOffset -= this.pageSize
|
||||||
this.pageOffset -= this.pageSize
|
|
||||||
}
|
this.calculatePages()
|
||||||
},
|
},
|
||||||
setUsers(users) {
|
setUsers(users) {
|
||||||
this.users = users
|
this.users = users
|
||||||
|
this.calculatePages()
|
||||||
this.fetching = false
|
this.fetching = false
|
||||||
},
|
},
|
||||||
setUserPeers(peers) {
|
setUserPeers(peers) {
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
import { onMounted } from "vue";
|
import { onMounted } from "vue";
|
||||||
import {auditStore} from "@/stores/audit";
|
import {auditStore} from "@/stores/audit";
|
||||||
import Pagination from "@/components/Pagination.vue";
|
|
||||||
|
|
||||||
const audit = auditStore()
|
const audit = auditStore()
|
||||||
|
|
||||||
@@ -61,24 +60,28 @@ onMounted(async () => {
|
|||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
<hr>
|
<hr>
|
||||||
|
<div class="mt-3">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-12 col-md-6">
|
<div class="col-6">
|
||||||
<Pagination
|
<ul class="pagination pagination-sm">
|
||||||
:currentPage="audit.currentPage"
|
<li :class="{disabled:audit.pageOffset===0}" class="page-item">
|
||||||
:totalCount="audit.FilteredCount"
|
<a class="page-link" @click="audit.previousPage">«</a>
|
||||||
:pageSize="audit.pageSize"
|
</li>
|
||||||
:hasNextPage="audit.hasNextPage"
|
|
||||||
:hasPrevPage="audit.hasPrevPage"
|
<li v-for="page in audit.pages" :key="page" :class="{active:audit.currentPage===page}" class="page-item">
|
||||||
:onGotoPage="audit.gotoPage"
|
<a class="page-link" @click="audit.gotoPage(page)">{{page}}</a>
|
||||||
:onNextPage="audit.nextPage"
|
</li>
|
||||||
:onPrevPage="audit.previousPage"
|
|
||||||
/>
|
<li :class="{disabled:!audit.hasNextPage}" class="page-item">
|
||||||
|
<a class="page-link" @click="audit.nextPage">»</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-12 col-md-6">
|
<div class="col-6">
|
||||||
<div class="form-group row">
|
<div class="form-group row">
|
||||||
<label class="col-sm-6 col-form-label text-md-end" for="paginationSelector">{{ $t('general.pagination.size') }}:</label>
|
<label class="col-sm-6 col-form-label text-end" for="paginationSelector">{{ $t('general.pagination.size') }}:</label>
|
||||||
<div class="col-sm-6">
|
<div class="col-sm-6">
|
||||||
<select id="paginationSelector" v-model.number="audit.pageSize" class="form-select" @change="audit.afterPageSizeChange()">
|
<select id="paginationSelector" v-model.number="audit.pageSize" class="form-select" @click="audit.afterPageSizeChange()">
|
||||||
<option value="10">10</option>
|
<option value="10">10</option>
|
||||||
<option value="25">25</option>
|
<option value="25">25</option>
|
||||||
<option value="50">50</option>
|
<option value="50">50</option>
|
||||||
@@ -89,4 +92,5 @@ onMounted(async () => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -1,10 +1,9 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
import PeerViewModal from "@/components/PeerViewModal.vue";
|
import PeerViewModal from "../components/PeerViewModal.vue";
|
||||||
import PeerEditModal from "@/components/PeerEditModal.vue";
|
import PeerEditModal from "../components/PeerEditModal.vue";
|
||||||
import PeerMultiCreateModal from "@/components/PeerMultiCreateModal.vue";
|
import PeerMultiCreateModal from "../components/PeerMultiCreateModal.vue";
|
||||||
import InterfaceEditModal from "@/components/InterfaceEditModal.vue";
|
import InterfaceEditModal from "../components/InterfaceEditModal.vue";
|
||||||
import InterfaceViewModal from "@/components/InterfaceViewModal.vue";
|
import InterfaceViewModal from "../components/InterfaceViewModal.vue";
|
||||||
import Pagination from "@/components/Pagination.vue";
|
|
||||||
|
|
||||||
import {computed, onMounted, ref} from "vue";
|
import {computed, onMounted, ref} from "vue";
|
||||||
import {peerStore} from "@/stores/peers";
|
import {peerStore} from "@/stores/peers";
|
||||||
@@ -483,23 +482,26 @@ onMounted(async () => {
|
|||||||
<hr v-if="interfaces.Count!==0">
|
<hr v-if="interfaces.Count!==0">
|
||||||
<div v-if="interfaces.Count!==0" class="mt-3">
|
<div v-if="interfaces.Count!==0" class="mt-3">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-12 col-md-6">
|
<div class="col-6">
|
||||||
<Pagination
|
<ul class="pagination pagination-sm">
|
||||||
:currentPage="peers.currentPage"
|
<li :class="{disabled:peers.pageOffset===0}" class="page-item">
|
||||||
:totalCount="peers.FilteredCount"
|
<a class="page-link" @click="peers.previousPage">«</a>
|
||||||
:pageSize="peers.pageSize"
|
</li>
|
||||||
:hasNextPage="peers.hasNextPage"
|
|
||||||
:hasPrevPage="peers.hasPrevPage"
|
<li v-for="page in peers.pages" :key="page" :class="{active:peers.currentPage===page}" class="page-item">
|
||||||
:onGotoPage="peers.gotoPage"
|
<a class="page-link" @click="peers.gotoPage(page)">{{page}}</a>
|
||||||
:onNextPage="peers.nextPage"
|
</li>
|
||||||
:onPrevPage="peers.previousPage"
|
|
||||||
/>
|
<li :class="{disabled:!peers.hasNextPage}" class="page-item">
|
||||||
|
<a class="page-link" @click="peers.nextPage">»</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-12 col-md-6">
|
<div class="col-6">
|
||||||
<div class="form-group row">
|
<div class="form-group row">
|
||||||
<label class="col-sm-6 col-form-label text-md-end" for="paginationSelector">{{ $t('general.pagination.size') }}:</label>
|
<label class="col-sm-6 col-form-label text-end" for="paginationSelector">{{ $t('general.pagination.size') }}:</label>
|
||||||
<div class="col-sm-6">
|
<div class="col-sm-6">
|
||||||
<select id="paginationSelector" v-model.number="peers.pageSize" class="form-select" @change="peers.afterPageSizeChange()">
|
<select id="paginationSelector" v-model.number="peers.pageSize" class="form-select" @click="peers.afterPageSizeChange()">
|
||||||
<option value="10">10</option>
|
<option value="10">10</option>
|
||||||
<option value="25">25</option>
|
<option value="25">25</option>
|
||||||
<option value="50">50</option>
|
<option value="50">50</option>
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import { useI18n } from "vue-i18n";
|
|||||||
import { profileStore } from "@/stores/profile";
|
import { profileStore } from "@/stores/profile";
|
||||||
import { peerStore } from "@/stores/peers";
|
import { peerStore } from "@/stores/peers";
|
||||||
import UserPeerEditModal from "@/components/UserPeerEditModal.vue";
|
import UserPeerEditModal from "@/components/UserPeerEditModal.vue";
|
||||||
import Pagination from "@/components/Pagination.vue";
|
|
||||||
import { settingsStore } from "@/stores/settings";
|
import { settingsStore } from "@/stores/settings";
|
||||||
import { humanFileSize } from "@/helpers/utils";
|
import { humanFileSize } from "@/helpers/utils";
|
||||||
|
|
||||||
@@ -67,6 +66,7 @@ onMounted(async () => {
|
|||||||
await profile.LoadPeers()
|
await profile.LoadPeers()
|
||||||
await profile.LoadStats()
|
await profile.LoadStats()
|
||||||
await profile.LoadInterfaces()
|
await profile.LoadInterfaces()
|
||||||
|
await profile.calculatePages(); // Forces to show initial page number
|
||||||
})
|
})
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
@@ -80,8 +80,6 @@ onMounted(async () => {
|
|||||||
<div class="col-12 col-lg-5">
|
<div class="col-12 col-lg-5">
|
||||||
<h2 class="mt-2">{{ $t('profile.headline') }}</h2>
|
<h2 class="mt-2">{{ $t('profile.headline') }}</h2>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-12 col-lg-3 text-lg-end" v-if="!settings.Setting('SelfProvisioning') || profile.CountInterfaces===0">
|
|
||||||
</div>
|
|
||||||
<div class="col-12 col-lg-4 text-lg-end">
|
<div class="col-12 col-lg-4 text-lg-end">
|
||||||
<div class="form-group d-inline">
|
<div class="form-group d-inline">
|
||||||
<div class="input-group mb-3">
|
<div class="input-group mb-3">
|
||||||
@@ -92,8 +90,8 @@ onMounted(async () => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-12 col-lg-3 text-lg-end" v-if="settings.Setting('SelfProvisioning') && profile.CountInterfaces>0">
|
<div class="col-12 col-lg-3 text-lg-end">
|
||||||
<div class="form-group">
|
<div class="form-group" v-if="settings.Setting('SelfProvisioning')">
|
||||||
<div class="input-group mb-3">
|
<div class="input-group mb-3">
|
||||||
<button class="btn btn-primary" :title="$t('interfaces.button-add-peer')" @click.prevent="editPeerId = '#NEW#'">
|
<button class="btn btn-primary" :title="$t('interfaces.button-add-peer')" @click.prevent="editPeerId = '#NEW#'">
|
||||||
<i class="fa fa-plus me-1"></i><i class="fa fa-user"></i>
|
<i class="fa fa-plus me-1"></i><i class="fa fa-user"></i>
|
||||||
@@ -162,7 +160,8 @@ onMounted(async () => {
|
|||||||
</td>
|
</td>
|
||||||
<td v-if="profile.hasStatistics">
|
<td v-if="profile.hasStatistics">
|
||||||
<div v-if="profile.Statistics(peer.Identifier).IsConnected">
|
<div v-if="profile.Statistics(peer.Identifier).IsConnected">
|
||||||
<span class="badge rounded-pill bg-success" :title="$t('profile.peer-connected')"><i class="fa-solid fa-link"></i></span> <small class="text-muted" :title="$t('interfaces.peer-handshake') + ' ' + profile.Statistics(peer.Identifier).LastHandshake"><i class="fa-solid fa-circle-info"></i></small>
|
<span class="badge rounded-pill bg-success"><i class="fa-solid fa-link"></i></span>
|
||||||
|
<span :title="profile.Statistics(peer.Identifier).LastHandshake">{{ $t('profile.peer-connected') }}</span>
|
||||||
</div>
|
</div>
|
||||||
<div v-else>
|
<div v-else>
|
||||||
<span class="badge rounded-pill bg-light"><i class="fa-solid fa-link-slash"></i></span>
|
<span class="badge rounded-pill bg-light"><i class="fa-solid fa-link-slash"></i></span>
|
||||||
@@ -175,7 +174,7 @@ onMounted(async () => {
|
|||||||
<td class="text-center">
|
<td class="text-center">
|
||||||
<a href="#" :title="$t('profile.button-show-peer')" @click.prevent="viewedPeerId = peer.Identifier"><i
|
<a href="#" :title="$t('profile.button-show-peer')" @click.prevent="viewedPeerId = peer.Identifier"><i
|
||||||
class="fas fa-eye me-2"></i></a>
|
class="fas fa-eye me-2"></i></a>
|
||||||
<a href="#" :title="$t('profile.button-edit-peer')" @click.prevent="editPeerId = peer.Identifier" v-if="settings.Setting('SelfProvisioning') && profile.HasInterface(peer.InterfaceIdentifier)"><i
|
<a href="#" :title="$t('profile.button-edit-peer')" @click.prevent="editPeerId = peer.Identifier"><i
|
||||||
class="fas fa-cog"></i></a>
|
class="fas fa-cog"></i></a>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -185,33 +184,36 @@ onMounted(async () => {
|
|||||||
<hr>
|
<hr>
|
||||||
<div class="mt-3">
|
<div class="mt-3">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-12 col-md-6">
|
<div class="col-6">
|
||||||
<Pagination
|
<ul class="pagination pagination-sm">
|
||||||
:currentPage="profile.currentPage"
|
<li :class="{ disabled: profile.pageOffset === 0 }" class="page-item">
|
||||||
:totalCount="profile.FilteredPeerCount"
|
<a class="page-link" @click="profile.previousPage">«</a>
|
||||||
:pageSize="profile.pageSize"
|
</li>
|
||||||
:hasNextPage="profile.hasNextPage"
|
|
||||||
:hasPrevPage="profile.hasPrevPage"
|
<li v-for="page in profile.pages" :key="page" :class="{ active: profile.currentPage === page }" class="page-item">
|
||||||
:onGotoPage="profile.gotoPage"
|
<a class="page-link" @click="profile.gotoPage(page)">{{ page }}</a>
|
||||||
:onNextPage="profile.nextPage"
|
</li>
|
||||||
:onPrevPage="profile.previousPage"
|
|
||||||
/>
|
<li :class="{ disabled: !profile.hasNextPage }" class="page-item">
|
||||||
|
<a class="page-link" @click="profile.nextPage">»</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-12 col-md-6">
|
<div class="col-6">
|
||||||
<div class="form-group row">
|
<div class="form-group row">
|
||||||
<label class="col-sm-6 col-form-label text-md-end" for="paginationSelector">
|
<label class="col-sm-6 col-form-label text-end" for="paginationSelector">
|
||||||
{{ $t('general.pagination.size')}}:
|
{{ $t('general.pagination.size')}}:
|
||||||
</label>
|
</label>
|
||||||
<div class="col-sm-6">
|
<div class="col-sm-6">
|
||||||
<select id="paginationSelector" v-model.number="profile.pageSize" class="form-select" @change="profile.afterPageSizeChange()">
|
<select id="paginationSelector" v-model.number="profile.pageSize" class="form-select" @click="profile.afterPageSizeChange()">
|
||||||
<option value="10">10</option>
|
<option value="10">10</option>
|
||||||
<option value="25">25</option>
|
<option value="25">25</option>
|
||||||
<option value="50">50</option>
|
<option value="50">50</option>
|
||||||
<option value="100">100</option>
|
<option value="100">100</option>
|
||||||
<option value="999999999">{{ $t('general.pagination.all') }}</option>
|
<option value="999999999">{{ $t('general.pagination.all') }}</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</div></template>
|
</div></template>
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
import {userStore} from "@/stores/users";
|
import {userStore} from "@/stores/users";
|
||||||
import {ref, onMounted, computed} from "vue";
|
import {ref, onMounted, computed} from "vue";
|
||||||
import UserEditModal from "@/components/UserEditModal.vue";
|
import UserEditModal from "../components/UserEditModal.vue";
|
||||||
import UserViewModal from "@/components/UserViewModal.vue";
|
import UserViewModal from "../components/UserViewModal.vue";
|
||||||
import Pagination from "@/components/Pagination.vue";
|
|
||||||
import {useI18n} from "vue-i18n";
|
import {useI18n} from "vue-i18n";
|
||||||
|
|
||||||
const users = userStore()
|
const users = userStore()
|
||||||
@@ -166,24 +165,28 @@ onMounted(() => {
|
|||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
<hr>
|
<hr>
|
||||||
|
<div class="mt-3">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-12 col-md-6">
|
<div class="col-6">
|
||||||
<Pagination
|
<ul class="pagination pagination-sm">
|
||||||
:currentPage="users.currentPage"
|
<li :class="{disabled:users.pageOffset===0}" class="page-item">
|
||||||
:totalCount="users.FilteredCount"
|
<a class="page-link" @click="users.previousPage">«</a>
|
||||||
:pageSize="users.pageSize"
|
</li>
|
||||||
:hasNextPage="users.hasNextPage"
|
|
||||||
:hasPrevPage="users.hasPrevPage"
|
<li v-for="page in users.pages" :key="page" :class="{active:users.currentPage===page}" class="page-item">
|
||||||
:onGotoPage="users.gotoPage"
|
<a class="page-link" @click="users.gotoPage(page)">{{page}}</a>
|
||||||
:onNextPage="users.nextPage"
|
</li>
|
||||||
:onPrevPage="users.previousPage"
|
|
||||||
/>
|
<li :class="{disabled:!users.hasNextPage}" class="page-item">
|
||||||
|
<a class="page-link" @click="users.nextPage">»</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-12 col-md-6">
|
<div class="col-6">
|
||||||
<div class="form-group row">
|
<div class="form-group row">
|
||||||
<label class="col-sm-6 col-form-label text-md-end" for="paginationSelector">{{ $t('general.pagination.size') }}:</label>
|
<label class="col-sm-6 col-form-label text-end" for="paginationSelector">{{ $t('general.pagination.size') }}:</label>
|
||||||
<div class="col-sm-6">
|
<div class="col-sm-6">
|
||||||
<select id="paginationSelector" v-model.number="users.pageSize" class="form-select" @change="users.afterPageSizeChange()">
|
<select id="paginationSelector" v-model.number="users.pageSize" class="form-select" @click="users.afterPageSizeChange()">
|
||||||
<option value="10">10</option>
|
<option value="10">10</option>
|
||||||
<option value="25">25</option>
|
<option value="25">25</option>
|
||||||
<option value="50">50</option>
|
<option value="50">50</option>
|
||||||
@@ -194,4 +197,5 @@ onMounted(() => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
18
go.mod
18
go.mod
@@ -7,10 +7,10 @@ require (
|
|||||||
github.com/alexedwards/scs/v2 v2.9.0
|
github.com/alexedwards/scs/v2 v2.9.0
|
||||||
github.com/coreos/go-oidc/v3 v3.17.0
|
github.com/coreos/go-oidc/v3 v3.17.0
|
||||||
github.com/glebarez/sqlite v1.11.0
|
github.com/glebarez/sqlite v1.11.0
|
||||||
github.com/go-ldap/ldap/v3 v3.4.13
|
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.30.1
|
||||||
github.com/go-webauthn/webauthn v0.16.1
|
github.com/go-webauthn/webauthn v0.16.0
|
||||||
github.com/google/uuid v1.6.0
|
github.com/google/uuid v1.6.0
|
||||||
github.com/gorilla/websocket v1.5.3
|
github.com/gorilla/websocket v1.5.3
|
||||||
github.com/prometheus-community/pro-bing v0.8.0
|
github.com/prometheus-community/pro-bing v0.8.0
|
||||||
@@ -22,9 +22,9 @@ require (
|
|||||||
github.com/xhit/go-simple-mail/v2 v2.16.0
|
github.com/xhit/go-simple-mail/v2 v2.16.0
|
||||||
github.com/yeqown/go-qrcode/v2 v2.2.5
|
github.com/yeqown/go-qrcode/v2 v2.2.5
|
||||||
github.com/yeqown/go-qrcode/writer/compressed v1.0.1
|
github.com/yeqown/go-qrcode/writer/compressed v1.0.1
|
||||||
golang.org/x/crypto v0.49.0
|
golang.org/x/crypto v0.48.0
|
||||||
golang.org/x/oauth2 v0.36.0
|
golang.org/x/oauth2 v0.35.0
|
||||||
golang.org/x/sys v0.42.0
|
golang.org/x/sys v0.41.0
|
||||||
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20241231184526-a9ab2273dd10
|
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20241231184526-a9ab2273dd10
|
||||||
gopkg.in/yaml.v3 v3.0.1
|
gopkg.in/yaml.v3 v3.0.1
|
||||||
gorm.io/driver/mysql v1.6.0
|
gorm.io/driver/mysql v1.6.0
|
||||||
@@ -61,7 +61,7 @@ require (
|
|||||||
github.com/go-sql-driver/mysql v1.9.3 // indirect
|
github.com/go-sql-driver/mysql v1.9.3 // indirect
|
||||||
github.com/go-test/deep v1.1.1 // indirect
|
github.com/go-test/deep v1.1.1 // indirect
|
||||||
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
|
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
|
||||||
github.com/go-webauthn/x v0.2.2 // indirect
|
github.com/go-webauthn/x v0.2.1 // indirect
|
||||||
github.com/golang-jwt/jwt/v5 v5.3.1 // indirect
|
github.com/golang-jwt/jwt/v5 v5.3.1 // indirect
|
||||||
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
|
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
|
||||||
github.com/golang-sql/sqlexp v0.1.0 // indirect
|
github.com/golang-sql/sqlexp v0.1.0 // indirect
|
||||||
@@ -95,9 +95,9 @@ require (
|
|||||||
go.yaml.in/yaml/v3 v3.0.4 // indirect
|
go.yaml.in/yaml/v3 v3.0.4 // indirect
|
||||||
golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa // indirect
|
golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa // indirect
|
||||||
golang.org/x/mod v0.33.0 // indirect
|
golang.org/x/mod v0.33.0 // indirect
|
||||||
golang.org/x/net v0.51.0 // indirect
|
golang.org/x/net v0.50.0 // indirect
|
||||||
golang.org/x/sync v0.20.0 // indirect
|
golang.org/x/sync v0.19.0 // indirect
|
||||||
golang.org/x/text v0.35.0 // indirect
|
golang.org/x/text v0.34.0 // indirect
|
||||||
golang.org/x/tools v0.42.0 // indirect
|
golang.org/x/tools v0.42.0 // indirect
|
||||||
golang.zx2c4.com/wireguard v0.0.0-20250521234502-f333402bd9cb // indirect
|
golang.zx2c4.com/wireguard v0.0.0-20250521234502-f333402bd9cb // indirect
|
||||||
google.golang.org/protobuf v1.36.11 // indirect
|
google.golang.org/protobuf v1.36.11 // indirect
|
||||||
|
|||||||
36
go.sum
36
go.sum
@@ -60,8 +60,8 @@ github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667 h1:BP4M0CvQ
|
|||||||
github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
|
github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
|
||||||
github.com/go-jose/go-jose/v4 v4.1.3 h1:CVLmWDhDVRa6Mi/IgCgaopNosCaHz7zrMeF9MlZRkrs=
|
github.com/go-jose/go-jose/v4 v4.1.3 h1:CVLmWDhDVRa6Mi/IgCgaopNosCaHz7zrMeF9MlZRkrs=
|
||||||
github.com/go-jose/go-jose/v4 v4.1.3/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=
|
github.com/go-jose/go-jose/v4 v4.1.3/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=
|
||||||
github.com/go-ldap/ldap/v3 v3.4.13 h1:+x1nG9h+MZN7h/lUi5Q3UZ0fJ1GyDQYbPvbuH38baDQ=
|
github.com/go-ldap/ldap/v3 v3.4.12 h1:1b81mv7MagXZ7+1r7cLTWmyuTqVqdwbtJSjC0DAp9s4=
|
||||||
github.com/go-ldap/ldap/v3 v3.4.13/go.mod h1:LxsGZV6vbaK0sIvYfsv47rfh4ca0JXokCoKjZxsszv0=
|
github.com/go-ldap/ldap/v3 v3.4.12/go.mod h1:+SPAGcTtOfmGsCb3h1RFiq4xpp4N636G75OEace8lNo=
|
||||||
github.com/go-openapi/jsonpointer v0.22.4 h1:dZtK82WlNpVLDW2jlA1YCiVJFVqkED1MegOUy9kR5T4=
|
github.com/go-openapi/jsonpointer v0.22.4 h1:dZtK82WlNpVLDW2jlA1YCiVJFVqkED1MegOUy9kR5T4=
|
||||||
github.com/go-openapi/jsonpointer v0.22.4/go.mod h1:elX9+UgznpFhgBuaMQ7iu4lvvX1nvNsesQ3oxmYTw80=
|
github.com/go-openapi/jsonpointer v0.22.4/go.mod h1:elX9+UgznpFhgBuaMQ7iu4lvvX1nvNsesQ3oxmYTw80=
|
||||||
github.com/go-openapi/jsonreference v0.21.4 h1:24qaE2y9bx/q3uRK/qN+TDwbok1NhbSmGjjySRCHtC8=
|
github.com/go-openapi/jsonreference v0.21.4 h1:24qaE2y9bx/q3uRK/qN+TDwbok1NhbSmGjjySRCHtC8=
|
||||||
@@ -105,10 +105,10 @@ github.com/go-test/deep v1.1.1 h1:0r/53hagsehfO4bzD2Pgr/+RgHqhmf+k1Bpse2cTu1U=
|
|||||||
github.com/go-test/deep v1.1.1/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
|
github.com/go-test/deep v1.1.1/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
|
||||||
github.com/go-viper/mapstructure/v2 v2.5.0 h1:vM5IJoUAy3d7zRSVtIwQgBj7BiWtMPfmPEgAXnvj1Ro=
|
github.com/go-viper/mapstructure/v2 v2.5.0 h1:vM5IJoUAy3d7zRSVtIwQgBj7BiWtMPfmPEgAXnvj1Ro=
|
||||||
github.com/go-viper/mapstructure/v2 v2.5.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
|
github.com/go-viper/mapstructure/v2 v2.5.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
|
||||||
github.com/go-webauthn/webauthn v0.16.1 h1:x5/SSki5/aIfogaRukqvbg/RXa3Sgxy/9vU7UfFPHKU=
|
github.com/go-webauthn/webauthn v0.16.0 h1:A9BkfYIwWAMPSQCbM2HoWqo6JO5LFI8aqYAzo6nW7AY=
|
||||||
github.com/go-webauthn/webauthn v0.16.1/go.mod h1:RBS+rtQJMkE5VfMQ4diDA2VNrEL8OeUhp4Srz37FHbQ=
|
github.com/go-webauthn/webauthn v0.16.0/go.mod h1:hm9RS/JNYeUu3KqGbzqlnHClhDGCZzTZlABjathwnN0=
|
||||||
github.com/go-webauthn/x v0.2.2 h1:zIiipvMbr48CXi5RG0XdBJR94kd8I5LfzHPb/q+YYmk=
|
github.com/go-webauthn/x v0.2.1 h1:/oB8i0FhSANuoN+YJF5XHMtppa7zGEYaQrrf6ytotjc=
|
||||||
github.com/go-webauthn/x v0.2.2/go.mod h1:IpJ5qyWB9NRhLX3C7gIfjTU7RZLXEP6kzFkoVSE7Fz4=
|
github.com/go-webauthn/x v0.2.1/go.mod h1:Wm0X0zXkzznit4gHj4m82GiBZRMEm+TDUIoJWIQLsE4=
|
||||||
github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
|
github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
|
||||||
github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
|
github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
|
||||||
github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
|
github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
|
||||||
@@ -274,8 +274,8 @@ golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOM
|
|||||||
golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
|
golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
|
||||||
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
|
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
|
||||||
golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
|
golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
|
||||||
golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4=
|
golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts=
|
||||||
golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA=
|
golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos=
|
||||||
golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa h1:Zt3DZoOFFYkKhDT3v7Lm9FDMEV06GpzjG2jrqW+QTE0=
|
golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa h1:Zt3DZoOFFYkKhDT3v7Lm9FDMEV06GpzjG2jrqW+QTE0=
|
||||||
golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa/go.mod h1:K79w1Vqn7PoiZn+TkNpx3BUWUQksGO3JcVX6qIjytmA=
|
golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa/go.mod h1:K79w1Vqn7PoiZn+TkNpx3BUWUQksGO3JcVX6qIjytmA=
|
||||||
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
|
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
|
||||||
@@ -303,10 +303,10 @@ golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
|
|||||||
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
|
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
|
||||||
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
|
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
|
||||||
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
|
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
|
||||||
golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo=
|
golang.org/x/net v0.50.0 h1:ucWh9eiCGyDR3vtzso0WMQinm2Dnt8cFMuQa9K33J60=
|
||||||
golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y=
|
golang.org/x/net v0.50.0/go.mod h1:UgoSli3F/pBgdJBHCTc+tp3gmrU4XswgGRgtnwWTfyM=
|
||||||
golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
|
golang.org/x/oauth2 v0.35.0 h1:Mv2mzuHuZuY2+bkyWXIHMfhNdJAdwW3FuWeCPYN5GVQ=
|
||||||
golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=
|
golang.org/x/oauth2 v0.35.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
|
||||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
@@ -314,8 +314,8 @@ golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
|
|||||||
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||||
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||||
golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||||
golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
|
golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
|
||||||
golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
|
golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
|
||||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
@@ -336,8 +336,8 @@ golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
|||||||
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||||
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||||
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||||
golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
|
golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
|
||||||
golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
|
golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
|
||||||
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
|
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
|
||||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||||
@@ -366,8 +366,8 @@ golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
|
|||||||
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
|
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
|
||||||
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
|
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
|
||||||
golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
|
golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
|
||||||
golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
|
golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
|
||||||
golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
|
golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
|
||||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||||
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||||
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
|
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
|
||||||
|
|||||||
@@ -232,19 +232,21 @@ func (r *SqlRepo) migrate() error {
|
|||||||
slog.Debug("running migration: interface status", "result", r.db.AutoMigrate(&domain.InterfaceStatus{}))
|
slog.Debug("running migration: interface status", "result", r.db.AutoMigrate(&domain.InterfaceStatus{}))
|
||||||
slog.Debug("running migration: audit data", "result", r.db.AutoMigrate(&domain.AuditEntry{}))
|
slog.Debug("running migration: audit data", "result", r.db.AutoMigrate(&domain.AuditEntry{}))
|
||||||
|
|
||||||
var existingSysStat SysStat
|
existingSysStat := SysStat{}
|
||||||
var err error
|
|
||||||
|
|
||||||
r.db.Order("schema_version desc").First(&existingSysStat) // get latest version
|
r.db.Order("schema_version desc").First(&existingSysStat) // get latest version
|
||||||
|
|
||||||
// Migration: 0 --> 1
|
// Migration: 0 --> 1
|
||||||
if existingSysStat.SchemaVersion == 0 {
|
if existingSysStat.SchemaVersion == 0 {
|
||||||
const schemaVersion = 1
|
const schemaVersion = 1
|
||||||
existingSysStat, err = r.addMigration(schemaVersion) // ensure that follow-up checks test against the latest version
|
sysStat := SysStat{
|
||||||
if err != nil {
|
MigratedAt: time.Now(),
|
||||||
return err
|
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)
|
||||||
}
|
}
|
||||||
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
|
// Migration: 1 --> 2
|
||||||
@@ -260,10 +262,14 @@ func (r *SqlRepo) migrate() error {
|
|||||||
}
|
}
|
||||||
slog.Debug("migrated interface create_default_peer flags", "schema_version", schemaVersion)
|
slog.Debug("migrated interface create_default_peer flags", "schema_version", schemaVersion)
|
||||||
}
|
}
|
||||||
existingSysStat, err = r.addMigration(schemaVersion) // ensure that follow-up checks test against the latest version
|
sysStat := SysStat{
|
||||||
if err != nil {
|
MigratedAt: time.Now(),
|
||||||
return err
|
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
|
// Migration: 2 --> 3
|
||||||
@@ -301,45 +307,19 @@ func (r *SqlRepo) migrate() error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("failed to migrate to multi-auth: %w", err)
|
return fmt.Errorf("failed to migrate to multi-auth: %w", err)
|
||||||
}
|
}
|
||||||
existingSysStat, err = r.addMigration(schemaVersion) // ensure that follow-up checks test against the latest version
|
sysStat := SysStat{
|
||||||
if err != nil {
|
MigratedAt: time.Now(),
|
||||||
return err
|
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)
|
||||||
// Migration: 3 --> 4
|
|
||||||
if existingSysStat.SchemaVersion == 3 {
|
|
||||||
const schemaVersion = 4
|
|
||||||
cutoff := time.Date(2000, 1, 1, 0, 0, 0, 0, time.UTC)
|
|
||||||
|
|
||||||
// Fix zero created_at timestamps for users. Set the to the last known update timestamp.
|
|
||||||
err := r.db.Model(&domain.User{}).Where("created_at < ?", cutoff).
|
|
||||||
Update("created_at", gorm.Expr("updated_at")).Error
|
|
||||||
if err != nil {
|
|
||||||
slog.Warn("failed to fix zero created_at for users", "error", err)
|
|
||||||
}
|
|
||||||
slog.Debug("fixed zero created_at timestamps for users", "schema_version", schemaVersion)
|
|
||||||
|
|
||||||
existingSysStat, err = r.addMigration(schemaVersion) // ensure that follow-up checks test against the latest version
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
}
|
||||||
|
existingSysStat = sysStat // ensure that follow-up checks test against the latest version
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *SqlRepo) addMigration(schemaVersion uint64) (SysStat, error) {
|
|
||||||
sysStat := SysStat{
|
|
||||||
MigratedAt: time.Now(),
|
|
||||||
SchemaVersion: schemaVersion,
|
|
||||||
}
|
|
||||||
if err := r.db.Create(&sysStat).Error; err != nil {
|
|
||||||
return SysStat{}, fmt.Errorf("failed to write sysstat entry for schema version %d: %w", schemaVersion, err)
|
|
||||||
}
|
|
||||||
return sysStat, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// region interfaces
|
// region interfaces
|
||||||
|
|
||||||
// GetInterface returns the interface with the given id.
|
// GetInterface returns the interface with the given id.
|
||||||
@@ -502,7 +482,7 @@ func (r *SqlRepo) getOrCreateInterface(
|
|||||||
Identifier: id,
|
Identifier: id,
|
||||||
}
|
}
|
||||||
|
|
||||||
err := tx.Preload("Addresses").Attrs(interfaceDefaults).FirstOrCreate(&in, id).Error
|
err := tx.Attrs(interfaceDefaults).FirstOrCreate(&in, id).Error
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -711,7 +691,7 @@ func (r *SqlRepo) getOrCreatePeer(ui *domain.ContextUserInfo, tx *gorm.DB, id do
|
|||||||
Identifier: id,
|
Identifier: id,
|
||||||
}
|
}
|
||||||
|
|
||||||
err := tx.Preload("Addresses").Attrs(interfaceDefaults).FirstOrCreate(&peer, id).Error
|
err := tx.Attrs(interfaceDefaults).FirstOrCreate(&peer, id).Error
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,168 +0,0 @@
|
|||||||
package adapters
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/glebarez/sqlite"
|
|
||||||
"github.com/stretchr/testify/assert"
|
|
||||||
"github.com/stretchr/testify/require"
|
|
||||||
"gorm.io/gorm"
|
|
||||||
|
|
||||||
"github.com/h44z/wg-portal/internal/config"
|
|
||||||
"github.com/h44z/wg-portal/internal/domain"
|
|
||||||
)
|
|
||||||
|
|
||||||
func newTestDB(t *testing.T) *gorm.DB {
|
|
||||||
t.Helper()
|
|
||||||
db, err := gorm.Open(sqlite.Open("file::memory:"), &gorm.Config{})
|
|
||||||
require.NoError(t, err)
|
|
||||||
return db
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestUpsertUser_SetsCreatedAtWhenZero(t *testing.T) {
|
|
||||||
db := newTestDB(t)
|
|
||||||
require.NoError(t, db.AutoMigrate(&domain.User{}, &domain.UserAuthentication{}, &domain.UserWebauthnCredential{}))
|
|
||||||
|
|
||||||
repo := &SqlRepo{db: db, cfg: &config.Config{}}
|
|
||||||
ui := domain.SystemAdminContextUserInfo()
|
|
||||||
|
|
||||||
user := &domain.User{
|
|
||||||
Identifier: "test-user",
|
|
||||||
Email: "test@example.com",
|
|
||||||
// CreatedAt is zero
|
|
||||||
}
|
|
||||||
|
|
||||||
err := repo.upsertUser(ui, db, user)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
assert.False(t, user.CreatedAt.IsZero(), "CreatedAt should be set when it was zero")
|
|
||||||
assert.Equal(t, ui.UserId(), user.UpdatedBy, "UpdatedBy should be set when it was empty")
|
|
||||||
assert.WithinDuration(t, user.UpdatedAt, user.CreatedAt, time.Second,
|
|
||||||
"CreatedAt should be close to UpdatedAt for new user")
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestUpsertUser_PreservesExistingCreatedAt(t *testing.T) {
|
|
||||||
db := newTestDB(t)
|
|
||||||
require.NoError(t, db.AutoMigrate(&domain.User{}, &domain.UserAuthentication{}, &domain.UserWebauthnCredential{}))
|
|
||||||
|
|
||||||
repo := &SqlRepo{db: db, cfg: &config.Config{}}
|
|
||||||
ui := domain.SystemAdminContextUserInfo()
|
|
||||||
|
|
||||||
originalTime := time.Date(2025, 1, 1, 12, 0, 0, 0, time.UTC)
|
|
||||||
user := &domain.User{
|
|
||||||
Identifier: "test-user",
|
|
||||||
Email: "test@example.com",
|
|
||||||
BaseModel: domain.BaseModel{
|
|
||||||
CreatedAt: originalTime,
|
|
||||||
CreatedBy: "original-creator",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
err := repo.upsertUser(ui, db, user)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
assert.Equal(t, originalTime, user.CreatedAt, "CreatedAt should not be overwritten")
|
|
||||||
assert.Equal(t, "original-creator", user.CreatedBy, "CreatedBy should not be overwritten")
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestSaveUser_NewUserGetsCreatedAt(t *testing.T) {
|
|
||||||
db := newTestDB(t)
|
|
||||||
require.NoError(t, db.AutoMigrate(&domain.User{}, &domain.UserAuthentication{}, &domain.UserWebauthnCredential{}))
|
|
||||||
|
|
||||||
repo := &SqlRepo{db: db, cfg: &config.Config{}}
|
|
||||||
ctx := domain.SetUserInfo(context.Background(), domain.SystemAdminContextUserInfo())
|
|
||||||
|
|
||||||
before := time.Now().Add(-time.Second)
|
|
||||||
|
|
||||||
err := repo.SaveUser(ctx, "new-user", func(u *domain.User) (*domain.User, error) {
|
|
||||||
u.Email = "new@example.com"
|
|
||||||
return u, nil
|
|
||||||
})
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
var saved domain.User
|
|
||||||
require.NoError(t, db.First(&saved, "identifier = ?", "new-user").Error)
|
|
||||||
|
|
||||||
assert.False(t, saved.CreatedAt.IsZero(), "CreatedAt should not be zero")
|
|
||||||
assert.True(t, saved.CreatedAt.After(before), "CreatedAt should be recent")
|
|
||||||
assert.NotEmpty(t, saved.CreatedBy, "CreatedBy should be set")
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestMigration_FixesZeroCreatedAt(t *testing.T) {
|
|
||||||
db := newTestDB(t)
|
|
||||||
|
|
||||||
// Manually create tables and seed schema version 3
|
|
||||||
require.NoError(t, db.AutoMigrate(
|
|
||||||
&SysStat{},
|
|
||||||
&domain.User{},
|
|
||||||
&domain.UserAuthentication{},
|
|
||||||
&domain.Interface{},
|
|
||||||
&domain.Cidr{},
|
|
||||||
&domain.Peer{},
|
|
||||||
&domain.AuditEntry{},
|
|
||||||
&domain.UserWebauthnCredential{},
|
|
||||||
))
|
|
||||||
|
|
||||||
// Insert schema versions 1, 2, 3 so migration starts at 3
|
|
||||||
for v := uint64(1); v <= 3; v++ {
|
|
||||||
require.NoError(t, db.Create(&SysStat{SchemaVersion: v, MigratedAt: time.Now()}).Error)
|
|
||||||
}
|
|
||||||
|
|
||||||
updatedAt := time.Date(2025, 6, 15, 10, 0, 0, 0, time.UTC)
|
|
||||||
|
|
||||||
// Insert a user with zero created_at but valid updated_at
|
|
||||||
require.NoError(t, db.Exec(
|
|
||||||
"INSERT INTO users (identifier, email, created_at, updated_at) VALUES (?, ?, ?, ?)",
|
|
||||||
"zero-user", "zero@example.com", time.Time{}, updatedAt,
|
|
||||||
).Error)
|
|
||||||
|
|
||||||
// Run migration
|
|
||||||
repo := &SqlRepo{db: db, cfg: &config.Config{}}
|
|
||||||
require.NoError(t, repo.migrate())
|
|
||||||
|
|
||||||
// Verify created_at was backfilled from updated_at
|
|
||||||
var user domain.User
|
|
||||||
require.NoError(t, db.First(&user, "identifier = ?", "zero-user").Error)
|
|
||||||
assert.Equal(t, updatedAt, user.CreatedAt, "created_at should be backfilled from updated_at")
|
|
||||||
|
|
||||||
// Verify schema version advanced to 4
|
|
||||||
var latest SysStat
|
|
||||||
require.NoError(t, db.Order("schema_version DESC").First(&latest).Error)
|
|
||||||
assert.Equal(t, uint64(4), latest.SchemaVersion)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestMigration_DoesNotTouchValidCreatedAt(t *testing.T) {
|
|
||||||
db := newTestDB(t)
|
|
||||||
|
|
||||||
require.NoError(t, db.AutoMigrate(
|
|
||||||
&SysStat{},
|
|
||||||
&domain.User{},
|
|
||||||
&domain.UserAuthentication{},
|
|
||||||
&domain.Interface{},
|
|
||||||
&domain.Cidr{},
|
|
||||||
&domain.Peer{},
|
|
||||||
&domain.AuditEntry{},
|
|
||||||
&domain.UserWebauthnCredential{},
|
|
||||||
))
|
|
||||||
|
|
||||||
for v := uint64(1); v <= 3; v++ {
|
|
||||||
require.NoError(t, db.Create(&SysStat{SchemaVersion: v, MigratedAt: time.Now()}).Error)
|
|
||||||
}
|
|
||||||
|
|
||||||
createdAt := time.Date(2024, 3, 1, 8, 0, 0, 0, time.UTC)
|
|
||||||
updatedAt := time.Date(2025, 6, 15, 10, 0, 0, 0, time.UTC)
|
|
||||||
|
|
||||||
require.NoError(t, db.Exec(
|
|
||||||
"INSERT INTO users (identifier, email, created_at, updated_at) VALUES (?, ?, ?, ?)",
|
|
||||||
"valid-user", "valid@example.com", createdAt, updatedAt,
|
|
||||||
).Error)
|
|
||||||
|
|
||||||
repo := &SqlRepo{db: db, cfg: &config.Config{}}
|
|
||||||
require.NoError(t, repo.migrate())
|
|
||||||
|
|
||||||
var user domain.User
|
|
||||||
require.NoError(t, db.First(&user, "identifier = ?", "valid-user").Error)
|
|
||||||
assert.Equal(t, createdAt, user.CreatedAt, "valid created_at should not be modified")
|
|
||||||
}
|
|
||||||
@@ -1,73 +0,0 @@
|
|||||||
package adapters
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"reflect"
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"github.com/glebarez/sqlite"
|
|
||||||
"github.com/h44z/wg-portal/internal/config"
|
|
||||||
"github.com/h44z/wg-portal/internal/domain"
|
|
||||||
"github.com/stretchr/testify/require"
|
|
||||||
"gorm.io/gorm"
|
|
||||||
"gorm.io/gorm/schema"
|
|
||||||
)
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
schema.RegisterSerializer("encstr", dummySerializer{})
|
|
||||||
}
|
|
||||||
|
|
||||||
type dummySerializer struct{}
|
|
||||||
|
|
||||||
func (dummySerializer) Scan(ctx context.Context, field *schema.Field, dst reflect.Value, dbValue any) error {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (dummySerializer) Value(ctx context.Context, field *schema.Field, dst reflect.Value, fieldValue any) (any, error) {
|
|
||||||
if fieldValue == nil {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
if v, ok := fieldValue.(string); ok {
|
|
||||||
return v, nil
|
|
||||||
}
|
|
||||||
if v, ok := fieldValue.(domain.PreSharedKey); ok {
|
|
||||||
return string(v), nil
|
|
||||||
}
|
|
||||||
return fieldValue, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestSqlRepo_SaveInterface_Simple(t *testing.T) {
|
|
||||||
// Initialize in-memory database
|
|
||||||
db, err := gorm.Open(sqlite.Open("file::memory:?cache=shared"), &gorm.Config{})
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
// Migrate only what's needed for this test (avoids Peer and its encstr serializer)
|
|
||||||
require.NoError(t, db.AutoMigrate(&domain.Interface{}, &domain.Cidr{}))
|
|
||||||
|
|
||||||
repo := &SqlRepo{db: db, cfg: &config.Config{}}
|
|
||||||
ctx := domain.SetUserInfo(context.Background(), domain.SystemAdminContextUserInfo())
|
|
||||||
ifaceId := domain.InterfaceIdentifier("wg0")
|
|
||||||
|
|
||||||
// 1. Create an interface with one address
|
|
||||||
addr, _ := domain.CidrFromString("10.0.0.1/24")
|
|
||||||
initialIface := &domain.Interface{
|
|
||||||
Identifier: ifaceId,
|
|
||||||
Addresses: []domain.Cidr{addr},
|
|
||||||
}
|
|
||||||
require.NoError(t, db.Create(initialIface).Error)
|
|
||||||
|
|
||||||
// 2. Perform a "partial" update using SaveInterface (this is the buggy path)
|
|
||||||
err = repo.SaveInterface(ctx, ifaceId, func(in *domain.Interface) (*domain.Interface, error) {
|
|
||||||
in.DisplayName = "New Name"
|
|
||||||
return in, nil
|
|
||||||
})
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
// 3. Verify that the address was NOT deleted
|
|
||||||
var finalIface domain.Interface
|
|
||||||
require.NoError(t, db.Preload("Addresses").First(&finalIface, "identifier = ?", ifaceId).Error)
|
|
||||||
|
|
||||||
require.Equal(t, "New Name", finalIface.DisplayName)
|
|
||||||
require.Len(t, finalIface.Addresses, 1, "Address list should still have 1 entry!")
|
|
||||||
require.Equal(t, "10.0.0.1/24", finalIface.Addresses[0].Cidr)
|
|
||||||
}
|
|
||||||
@@ -30,7 +30,7 @@ type MetricsServer struct {
|
|||||||
// Wireguard metrics labels
|
// Wireguard metrics labels
|
||||||
var (
|
var (
|
||||||
ifaceLabels = []string{"interface"}
|
ifaceLabels = []string{"interface"}
|
||||||
peerLabels = []string{"interface", "addresses", "id", "name", "user"}
|
peerLabels = []string{"interface", "addresses", "id", "name"}
|
||||||
)
|
)
|
||||||
|
|
||||||
// NewMetricsServer returns a new prometheus server
|
// NewMetricsServer returns a new prometheus server
|
||||||
@@ -126,7 +126,6 @@ func (m *MetricsServer) UpdatePeerMetrics(peer *domain.Peer, status domain.PeerS
|
|||||||
peer.Interface.AddressStr(),
|
peer.Interface.AddressStr(),
|
||||||
string(status.PeerId),
|
string(status.PeerId),
|
||||||
peer.DisplayName,
|
peer.DisplayName,
|
||||||
string(peer.UserIdentifier),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if status.LastHandshake != nil {
|
if status.LastHandshake != nil {
|
||||||
|
|||||||
@@ -90,12 +90,6 @@ func (m Manager) synchronizeLdapUsers(ctx context.Context, provider *config.Ldap
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update interface allowed users based on LDAP filters
|
|
||||||
err = m.updateInterfaceLdapFilters(ctx, conn, provider)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -243,59 +237,3 @@ func (m Manager) disableMissingLdapUsers(
|
|||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m Manager) updateInterfaceLdapFilters(
|
|
||||||
ctx context.Context,
|
|
||||||
conn *ldap.Conn,
|
|
||||||
provider *config.LdapProvider,
|
|
||||||
) error {
|
|
||||||
if len(provider.InterfaceFilter) == 0 {
|
|
||||||
return nil // nothing to do if no interfaces are configured for this provider
|
|
||||||
}
|
|
||||||
|
|
||||||
for ifaceName, groupFilter := range provider.InterfaceFilter {
|
|
||||||
ifaceId := domain.InterfaceIdentifier(ifaceName)
|
|
||||||
|
|
||||||
// Combined filter: user must match the provider's base SyncFilter AND the interface's LdapGroupFilter
|
|
||||||
combinedFilter := fmt.Sprintf("(&(%s)(%s))", provider.SyncFilter, groupFilter)
|
|
||||||
|
|
||||||
rawUsers, err := internal.LdapFindAllUsers(conn, provider.BaseDN, combinedFilter, &provider.FieldMap)
|
|
||||||
if err != nil {
|
|
||||||
slog.Error("failed to find users for interface filter",
|
|
||||||
"interface", ifaceId,
|
|
||||||
"provider", provider.ProviderName,
|
|
||||||
"error", err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
matchedUserIds := make([]domain.UserIdentifier, 0, len(rawUsers))
|
|
||||||
for _, rawUser := range rawUsers {
|
|
||||||
userId := domain.UserIdentifier(internal.MapDefaultString(rawUser, provider.FieldMap.UserIdentifier, ""))
|
|
||||||
if userId != "" {
|
|
||||||
matchedUserIds = append(matchedUserIds, userId)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Save the interface
|
|
||||||
err = m.interfaces.SaveInterface(ctx, ifaceId, func(i *domain.Interface) (*domain.Interface, error) {
|
|
||||||
if i.LdapAllowedUsers == nil {
|
|
||||||
i.LdapAllowedUsers = make(map[string][]domain.UserIdentifier)
|
|
||||||
}
|
|
||||||
i.LdapAllowedUsers[provider.ProviderName] = matchedUserIds
|
|
||||||
return i, nil
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
slog.Error("failed to save interface ldap allowed users",
|
|
||||||
"interface", ifaceId,
|
|
||||||
"provider", provider.ProviderName,
|
|
||||||
"error", err)
|
|
||||||
} else {
|
|
||||||
slog.Debug("updated interface ldap allowed users",
|
|
||||||
"interface", ifaceId,
|
|
||||||
"provider", provider.ProviderName,
|
|
||||||
"matched_count", len(matchedUserIds))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -39,11 +39,6 @@ type PeerDatabaseRepo interface {
|
|||||||
GetUserPeers(ctx context.Context, id domain.UserIdentifier) ([]domain.Peer, error)
|
GetUserPeers(ctx context.Context, id domain.UserIdentifier) ([]domain.Peer, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
type InterfaceDatabaseRepo interface {
|
|
||||||
// SaveInterface saves the interface with the given identifier.
|
|
||||||
SaveInterface(ctx context.Context, id domain.InterfaceIdentifier, updateFunc func(i *domain.Interface) (*domain.Interface, error)) error
|
|
||||||
}
|
|
||||||
|
|
||||||
type EventBus interface {
|
type EventBus interface {
|
||||||
// Publish sends a message to the message bus.
|
// Publish sends a message to the message bus.
|
||||||
Publish(topic string, args ...any)
|
Publish(topic string, args ...any)
|
||||||
@@ -55,27 +50,22 @@ type EventBus interface {
|
|||||||
type Manager struct {
|
type Manager struct {
|
||||||
cfg *config.Config
|
cfg *config.Config
|
||||||
|
|
||||||
bus EventBus
|
bus EventBus
|
||||||
users UserDatabaseRepo
|
users UserDatabaseRepo
|
||||||
peers PeerDatabaseRepo
|
peers PeerDatabaseRepo
|
||||||
interfaces InterfaceDatabaseRepo
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewUserManager creates a new user manager instance.
|
// NewUserManager creates a new user manager instance.
|
||||||
func NewUserManager(
|
func NewUserManager(cfg *config.Config, bus EventBus, users UserDatabaseRepo, peers PeerDatabaseRepo) (
|
||||||
cfg *config.Config,
|
*Manager,
|
||||||
bus EventBus,
|
error,
|
||||||
users UserDatabaseRepo,
|
) {
|
||||||
peers PeerDatabaseRepo,
|
|
||||||
interfaces InterfaceDatabaseRepo,
|
|
||||||
) (*Manager, error) {
|
|
||||||
m := &Manager{
|
m := &Manager{
|
||||||
cfg: cfg,
|
cfg: cfg,
|
||||||
bus: bus,
|
bus: bus,
|
||||||
|
|
||||||
users: users,
|
users: users,
|
||||||
peers: peers,
|
peers: peers,
|
||||||
interfaces: interfaces,
|
|
||||||
}
|
}
|
||||||
return m, nil
|
return m, nil
|
||||||
}
|
}
|
||||||
@@ -533,7 +523,6 @@ func (m Manager) create(ctx context.Context, user *domain.User) (*domain.User, e
|
|||||||
}
|
}
|
||||||
|
|
||||||
err = m.users.SaveUser(ctx, user.Identifier, func(u *domain.User) (*domain.User, error) {
|
err = m.users.SaveUser(ctx, user.Identifier, func(u *domain.User) (*domain.User, error) {
|
||||||
user.CopyCalculatedAttributes(u, false)
|
|
||||||
return user, nil
|
return user, nil
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -35,7 +35,6 @@ type InterfaceAndPeerDatabaseRepo interface {
|
|||||||
DeletePeer(ctx context.Context, id domain.PeerIdentifier) error
|
DeletePeer(ctx context.Context, id domain.PeerIdentifier) error
|
||||||
GetPeer(ctx context.Context, id domain.PeerIdentifier) (*domain.Peer, error)
|
GetPeer(ctx context.Context, id domain.PeerIdentifier) (*domain.Peer, error)
|
||||||
GetUsedIpsPerSubnet(ctx context.Context, subnets []domain.Cidr) (map[domain.Cidr][]domain.Cidr, error)
|
GetUsedIpsPerSubnet(ctx context.Context, subnets []domain.Cidr) (map[domain.Cidr][]domain.Cidr, error)
|
||||||
GetUser(ctx context.Context, id domain.UserIdentifier) (*domain.User, error)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type WgQuickController interface {
|
type WgQuickController interface {
|
||||||
|
|||||||
@@ -16,11 +16,6 @@ import (
|
|||||||
"github.com/h44z/wg-portal/internal/domain"
|
"github.com/h44z/wg-portal/internal/domain"
|
||||||
)
|
)
|
||||||
|
|
||||||
// GetInterface returns the interface for the given interface identifier.
|
|
||||||
func (m Manager) GetInterface(ctx context.Context, id domain.InterfaceIdentifier) (*domain.Interface, error) {
|
|
||||||
return m.db.GetInterface(ctx, id)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetInterfaceAndPeers returns the interface and all peers for the given interface identifier.
|
// GetInterfaceAndPeers returns the interface and all peers for the given interface identifier.
|
||||||
func (m Manager) GetInterfaceAndPeers(ctx context.Context, id domain.InterfaceIdentifier) (
|
func (m Manager) GetInterfaceAndPeers(ctx context.Context, id domain.InterfaceIdentifier) (
|
||||||
*domain.Interface,
|
*domain.Interface,
|
||||||
@@ -68,17 +63,12 @@ func (m Manager) GetAllInterfacesAndPeers(ctx context.Context) ([]domain.Interfa
|
|||||||
|
|
||||||
// GetUserInterfaces returns all interfaces that are available for users to create new peers.
|
// GetUserInterfaces returns all interfaces that are available for users to create new peers.
|
||||||
// If self-provisioning is disabled, this function will return an empty list.
|
// If self-provisioning is disabled, this function will return an empty list.
|
||||||
func (m Manager) GetUserInterfaces(ctx context.Context, userId domain.UserIdentifier) ([]domain.Interface, error) {
|
// At the moment, there are no interfaces specific to single users, thus the user id is not used.
|
||||||
|
func (m Manager) GetUserInterfaces(ctx context.Context, _ domain.UserIdentifier) ([]domain.Interface, error) {
|
||||||
if !m.cfg.Core.SelfProvisioningAllowed {
|
if !m.cfg.Core.SelfProvisioningAllowed {
|
||||||
return nil, nil // self-provisioning is disabled - no interfaces for users
|
return nil, nil // self-provisioning is disabled - no interfaces for users
|
||||||
}
|
}
|
||||||
|
|
||||||
user, err := m.db.GetUser(ctx, userId)
|
|
||||||
if err != nil {
|
|
||||||
slog.Error("failed to load user for interface group verification", "user", userId, "error", err)
|
|
||||||
return nil, nil // fail closed
|
|
||||||
}
|
|
||||||
|
|
||||||
interfaces, err := m.db.GetAllInterfaces(ctx)
|
interfaces, err := m.db.GetAllInterfaces(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("unable to load all interfaces: %w", err)
|
return nil, fmt.Errorf("unable to load all interfaces: %w", err)
|
||||||
@@ -93,9 +83,6 @@ func (m Manager) GetUserInterfaces(ctx context.Context, userId domain.UserIdenti
|
|||||||
if iface.Type != domain.InterfaceTypeServer {
|
if iface.Type != domain.InterfaceTypeServer {
|
||||||
continue // skip client interfaces
|
continue // skip client interfaces
|
||||||
}
|
}
|
||||||
if !user.IsAdmin && !iface.IsUserAllowed(userId, m.cfg) {
|
|
||||||
continue // user not allowed due to LDAP group filter
|
|
||||||
}
|
|
||||||
|
|
||||||
userInterfaces = append(userInterfaces, iface.PublicInfo())
|
userInterfaces = append(userInterfaces, iface.PublicInfo())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import (
|
|||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
|
|
||||||
"github.com/h44z/wg-portal/internal/config"
|
|
||||||
"github.com/h44z/wg-portal/internal/domain"
|
"github.com/h44z/wg-portal/internal/domain"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -93,126 +92,3 @@ func TestImportPeer_AddressMapping(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (f *mockDB) GetUser(ctx context.Context, id domain.UserIdentifier) (*domain.User, error) {
|
|
||||||
return &domain.User{
|
|
||||||
Identifier: id,
|
|
||||||
IsAdmin: false,
|
|
||||||
}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestInterface_IsUserAllowed(t *testing.T) {
|
|
||||||
cfg := &config.Config{
|
|
||||||
Auth: config.Auth{
|
|
||||||
Ldap: []config.LdapProvider{
|
|
||||||
{
|
|
||||||
ProviderName: "ldap1",
|
|
||||||
InterfaceFilter: map[string]string{
|
|
||||||
"wg0": "(memberOf=CN=VPNUsers,...)",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
iface domain.Interface
|
|
||||||
userId domain.UserIdentifier
|
|
||||||
expect bool
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
name: "Unrestricted interface",
|
|
||||||
iface: domain.Interface{
|
|
||||||
Identifier: "wg1",
|
|
||||||
},
|
|
||||||
userId: "user1",
|
|
||||||
expect: true,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "Restricted interface - user allowed",
|
|
||||||
iface: domain.Interface{
|
|
||||||
Identifier: "wg0",
|
|
||||||
LdapAllowedUsers: map[string][]domain.UserIdentifier{
|
|
||||||
"ldap1": {"user1"},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
userId: "user1",
|
|
||||||
expect: true,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "Restricted interface - user allowed (at least one match)",
|
|
||||||
iface: domain.Interface{
|
|
||||||
Identifier: "wg0",
|
|
||||||
LdapAllowedUsers: map[string][]domain.UserIdentifier{
|
|
||||||
"ldap1": {"user2"},
|
|
||||||
"ldap2": {"user1"},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
userId: "user1",
|
|
||||||
expect: true,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "Restricted interface - user NOT allowed",
|
|
||||||
iface: domain.Interface{
|
|
||||||
Identifier: "wg0",
|
|
||||||
LdapAllowedUsers: map[string][]domain.UserIdentifier{
|
|
||||||
"ldap1": {"user2"},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
userId: "user1",
|
|
||||||
expect: false,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tt := range tests {
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
assert.Equal(t, tt.expect, tt.iface.IsUserAllowed(tt.userId, cfg))
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestManager_GetUserInterfaces_Filtering(t *testing.T) {
|
|
||||||
cfg := &config.Config{}
|
|
||||||
cfg.Core.SelfProvisioningAllowed = true
|
|
||||||
cfg.Auth.Ldap = []config.LdapProvider{
|
|
||||||
{
|
|
||||||
ProviderName: "ldap1",
|
|
||||||
InterfaceFilter: map[string]string{
|
|
||||||
"wg_restricted": "(some-filter)",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
db := &mockDB{
|
|
||||||
interfaces: []domain.Interface{
|
|
||||||
{Identifier: "wg_public", Type: domain.InterfaceTypeServer},
|
|
||||||
{
|
|
||||||
Identifier: "wg_restricted",
|
|
||||||
Type: domain.InterfaceTypeServer,
|
|
||||||
LdapAllowedUsers: map[string][]domain.UserIdentifier{
|
|
||||||
"ldap1": {"allowed_user"},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
m := Manager{
|
|
||||||
cfg: cfg,
|
|
||||||
db: db,
|
|
||||||
}
|
|
||||||
|
|
||||||
t.Run("Allowed user sees both", func(t *testing.T) {
|
|
||||||
ifaces, err := m.GetUserInterfaces(context.Background(), "allowed_user")
|
|
||||||
assert.NoError(t, err)
|
|
||||||
assert.Equal(t, 2, len(ifaces))
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("Unallowed user sees only public", func(t *testing.T) {
|
|
||||||
ifaces, err := m.GetUserInterfaces(context.Background(), "other_user")
|
|
||||||
assert.NoError(t, err)
|
|
||||||
assert.Equal(t, 1, len(ifaces))
|
|
||||||
if len(ifaces) > 0 {
|
|
||||||
assert.Equal(t, domain.InterfaceIdentifier("wg_public"), ifaces[0].Identifier)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -93,10 +93,6 @@ func (m Manager) PreparePeer(ctx context.Context, id domain.InterfaceIdentifier)
|
|||||||
|
|
||||||
currentUser := domain.GetUserInfo(ctx)
|
currentUser := domain.GetUserInfo(ctx)
|
||||||
|
|
||||||
if err := m.checkInterfaceAccess(ctx, id); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
iface, err := m.db.GetInterface(ctx, id)
|
iface, err := m.db.GetInterface(ctx, id)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("unable to find interface %s: %w", id, err)
|
return nil, fmt.Errorf("unable to find interface %s: %w", id, err)
|
||||||
@@ -192,9 +188,6 @@ func (m Manager) CreatePeer(ctx context.Context, peer *domain.Peer) (*domain.Pee
|
|||||||
if err := domain.ValidateUserAccessRights(ctx, peer.UserIdentifier); err != nil {
|
if err := domain.ValidateUserAccessRights(ctx, peer.UserIdentifier); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if err := m.checkInterfaceAccess(ctx, peer.InterfaceIdentifier); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
sessionUser := domain.GetUserInfo(ctx)
|
sessionUser := domain.GetUserInfo(ctx)
|
||||||
@@ -311,10 +304,6 @@ func (m Manager) UpdatePeer(ctx context.Context, peer *domain.Peer) (*domain.Pee
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := m.checkInterfaceAccess(ctx, existingPeer.InterfaceIdentifier); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := m.validatePeerModifications(ctx, existingPeer, peer); err != nil {
|
if err := m.validatePeerModifications(ctx, existingPeer, peer); err != nil {
|
||||||
return nil, fmt.Errorf("update not allowed: %w", err)
|
return nil, fmt.Errorf("update not allowed: %w", err)
|
||||||
}
|
}
|
||||||
@@ -384,10 +373,6 @@ func (m Manager) DeletePeer(ctx context.Context, id domain.PeerIdentifier) error
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := m.checkInterfaceAccess(ctx, peer.InterfaceIdentifier); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := m.validatePeerDeletion(ctx, peer); err != nil {
|
if err := m.validatePeerDeletion(ctx, peer); err != nil {
|
||||||
return fmt.Errorf("delete not allowed: %w", err)
|
return fmt.Errorf("delete not allowed: %w", err)
|
||||||
}
|
}
|
||||||
@@ -621,22 +606,4 @@ func (m Manager) validatePeerDeletion(ctx context.Context, _ *domain.Peer) error
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m Manager) checkInterfaceAccess(ctx context.Context, id domain.InterfaceIdentifier) error {
|
|
||||||
user := domain.GetUserInfo(ctx)
|
|
||||||
if user.IsAdmin {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
iface, err := m.db.GetInterface(ctx, id)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to get interface %s: %w", id, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if !iface.IsUserAllowed(user.Id, m.cfg) {
|
|
||||||
return fmt.Errorf("user %s is not allowed to access interface %s: %w", user.Id, id, domain.ErrNoPermission)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// endregion helper-functions
|
// endregion helper-functions
|
||||||
|
|||||||
@@ -60,7 +60,6 @@ func (f *mockController) PingAddresses(_ context.Context, _ string) (*domain.Pin
|
|||||||
type mockDB struct {
|
type mockDB struct {
|
||||||
savedPeers map[domain.PeerIdentifier]*domain.Peer
|
savedPeers map[domain.PeerIdentifier]*domain.Peer
|
||||||
iface *domain.Interface
|
iface *domain.Interface
|
||||||
interfaces []domain.Interface
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (f *mockDB) GetInterface(ctx context.Context, id domain.InterfaceIdentifier) (*domain.Interface, error) {
|
func (f *mockDB) GetInterface(ctx context.Context, id domain.InterfaceIdentifier) (*domain.Interface, error) {
|
||||||
@@ -80,9 +79,6 @@ func (f *mockDB) GetPeersStats(ctx context.Context, ids ...domain.PeerIdentifier
|
|||||||
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) {
|
||||||
if f.interfaces != nil {
|
|
||||||
return f.interfaces, nil
|
|
||||||
}
|
|
||||||
if f.iface != nil {
|
if f.iface != nil {
|
||||||
return []domain.Interface{*f.iface}, nil
|
return []domain.Interface{*f.iface}, nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -214,10 +214,6 @@ type LdapProvider struct {
|
|||||||
// If RegistrationEnabled is set to true, wg-portal will create new users that do not exist in the database.
|
// If RegistrationEnabled is set to true, wg-portal will create new users that do not exist in the database.
|
||||||
RegistrationEnabled bool `yaml:"registration_enabled"`
|
RegistrationEnabled bool `yaml:"registration_enabled"`
|
||||||
|
|
||||||
// InterfaceFilter allows restricting interfaces using an LDAP filter.
|
|
||||||
// Map key is the interface identifier (e.g., "wg0"), value is the filter string.
|
|
||||||
InterfaceFilter map[string]string `yaml:"interface_filter"`
|
|
||||||
|
|
||||||
// If LogUserInfo is set to true, the user info retrieved from the LDAP provider will be logged in trace level.
|
// If LogUserInfo is set to true, the user info retrieved from the LDAP provider will be logged in trace level.
|
||||||
LogUserInfo bool `yaml:"log_user_info"`
|
LogUserInfo bool `yaml:"log_user_info"`
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -78,33 +78,6 @@ type Interface struct {
|
|||||||
PeerDefPostUp string // default action that is executed after the device is up
|
PeerDefPostUp string // default action that is executed after the device is up
|
||||||
PeerDefPreDown string // default action that is executed before the device is down
|
PeerDefPreDown string // default action that is executed before the device is down
|
||||||
PeerDefPostDown string // default action that is executed after the device is down
|
PeerDefPostDown string // default action that is executed after the device is down
|
||||||
|
|
||||||
// Self-provisioning access control
|
|
||||||
LdapAllowedUsers map[string][]UserIdentifier `gorm:"serializer:json"` // Materialised during LDAP sync, keyed by ProviderName
|
|
||||||
}
|
|
||||||
|
|
||||||
// IsUserAllowed returns true if the interface has no filter, or if the user is in the allowed list.
|
|
||||||
func (i *Interface) IsUserAllowed(userId UserIdentifier, cfg *config.Config) bool {
|
|
||||||
isRestricted := false
|
|
||||||
for _, provider := range cfg.Auth.Ldap {
|
|
||||||
if _, exists := provider.InterfaceFilter[string(i.Identifier)]; exists {
|
|
||||||
isRestricted = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if !isRestricted {
|
|
||||||
return true // The interface is completely unrestricted by LDAP config
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, allowedUsers := range i.LdapAllowedUsers {
|
|
||||||
for _, uid := range allowedUsers {
|
|
||||||
if uid == userId {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// PublicInfo returns a copy of the interface with only the public information.
|
// PublicInfo returns a copy of the interface with only the public information.
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ type User struct {
|
|||||||
WebAuthnCredentialList []UserWebauthnCredential `gorm:"foreignKey:user_identifier"` // the webauthn credentials of the user, used for webauthn authentication
|
WebAuthnCredentialList []UserWebauthnCredential `gorm:"foreignKey:user_identifier"` // the webauthn credentials of the user, used for webauthn authentication
|
||||||
|
|
||||||
// API token for REST API access
|
// API token for REST API access
|
||||||
ApiToken string `form:"api_token" binding:"omitempty" gorm:"serializer:encstr"`
|
ApiToken string `form:"api_token" binding:"omitempty"`
|
||||||
ApiTokenCreated *time.Time
|
ApiTokenCreated *time.Time
|
||||||
|
|
||||||
LinkedPeerCount int `gorm:"-"`
|
LinkedPeerCount int `gorm:"-"`
|
||||||
|
|||||||
Reference in New Issue
Block a user