fix peer creation if custom public key is set (#523)

.github/FUNDING.yml

@@ -1,3 +0,0 @@
-# These are supported funding model platforms
-
-github: h44z # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2020-2025 Christoph Haas
+Copyright (c) 2020-2023 Christoph Haas
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

README.md

@@ -21,7 +21,7 @@ The configuration portal supports using a database (SQLite, MySQL, MsSQL, or Pos
 ## Features
 
 * Self-hosted - the whole application is a single binary
-* Responsive multi-language web UI with dark-mode written in Vue.js
+* Responsive multi-language web UI written in Vue.js
 * Automatically selects IP from the network pool assigned to the client
 * QR-Code for convenient mobile client configuration
 * Sends email to the client with QR-code and client config
@@ -32,7 +32,7 @@ The configuration portal supports using a database (SQLite, MySQL, MsSQL, or Pos
 * Docker ready
 * Can be used with existing WireGuard setups
 * Support for multiple WireGuard interfaces
-* Supports multiple WireGuard backends (wgctrl or MikroTik)
+* Supports multiple WireGuard backends (wgctrl or MikroTik [BETA])
 * Peer Expiry Feature
 * Handles route and DNS settings like wg-quick does
 * Exposes Prometheus metrics for monitoring and alerting
@@ -62,17 +62,6 @@ For the complete documentation visit [wgportal.org](https://wgportal.org).
 
 * MIT License. [MIT](LICENSE.txt) or <https://opensource.org/licenses/MIT>
 
-## Contributors and Sponsors
-
-Thanks so much for all your contributions! They’re truly appreciated and help keep WireGuard Portal moving ahead.
-
-<a href="https://github.com/h44z/wg-portal/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=h44z/wg-portal" />
-</a>
-
-Want to support the project? You can buy me a coffee or join as a contributor - every bit of support helps! 
-[Become a sponsor!](https://github.com/sponsors/h44z)
-
 
 > [!IMPORTANT]
 > Since the project was accepted by the Docker-Sponsored Open Source Program, the Docker image location has moved to [wgportal/wg-portal](https://hub.docker.com/r/wgportal/wg-portal).

SECURITY.md

@@ -7,7 +7,7 @@ If you believe you've found a security issue in one of the supported versions of
 | Version | Supported          |
 |---------|--------------------|
 | v2.x    | :white_check_mark: |
-| v1.x    | :x:                |
+| v1.x    | :white_check_mark: |
 
 ## Reporting a Vulnerability
 

docs/stylesheets/img-comparison-slider.css

@@ -1,15 +0,0 @@
-img-comparison-slider {
-  visibility: hidden;
-}
-
-img-comparison-slider [slot='second'] {
-  display: none;
-}
-
-img-comparison-slider.rendered {
-  visibility: inherit;
-}
-
-img-comparison-slider.rendered [slot='second'] {
-  display: unset;
-}

docs/theme-overrides/layouts/home.html

@@ -300,59 +300,6 @@
   background: var(--md-accent-fg-color--transparent);
 }
 
-.before,
-.after {
-    margin: 0;
-}
-
-.after figcaption {
-    background: #fff;
-    font-weight: bold;
-    border: 1px solid #c0c0c0;
-    color: #000000;
-    opacity: 0.9;
-    padding: 9px;
-    position: absolute;
-    top: 100%;
-    transform: translateY(-100%);
-    line-height: 100%;
-}
-
-.before figcaption {
-    background: #000;
-    font-weight: bold;
-    border: 1px solid #c0c0c0;
-    color: #ffffff;
-    opacity: 0.9;
-    padding: 9px;
-    position: absolute;
-    top: 100%;
-    transform: translateY(-100%);
-    line-height: 100%;
-}
-
-.before figcaption {
-    left: 0px;
-}
-.after figcaption {
-    right: 0px;
-}
-.custom-animated-handle {
-    transition: transform 0.2s;
-}
-
-.slider-with-animated-handle:hover .custom-animated-handle {
-    transform: scale(1.2);
-}
-.md-typeset img-comparison-slider figure {
-    margin: initial;
-}
-
-.first-overlay {
-    color: #000;
-}
-
-
 </style>
 
   <!-- Hero for landing page -->
@@ -379,34 +326,11 @@
 
   <div class="md-container">
     <div class="tx-hero__image">
-      <div>
-        <img-comparison-slider hover="hover">
-          <figure slot="first" class="before">
-            <img src="{{config.site_url}}/assets/images/wgportal_light.png" alt="Light Mode"/>
-            <figcaption>Light Mode</figcaption>
-          </figure>
-          <figure slot="second" class="after">
-            <img src="{{config.site_url}}/assets/images/wgportal_dark.png" alt="Dark Mode"/>
-            <figcaption>Dark Mode</figcaption>
-          </figure>
-          <svg slot="handle" class="custom-animated-handle" xmlns="http://www.w3.org/2000/svg" width="100" viewBox="-8 -3 16 6">
-                <!-- Left arrow (dark) -->
-                <path d="M -5 -2 L -7 0 L -5 2 M -5 -2 L -5 2"
-                      stroke="#1a1a1a"
-                      fill="#1a1a1a"
-                      stroke-width="1"
-                      vector-effect="non-scaling-stroke">
-                </path>
-                <!-- Right arrow (white) -->
-                <path d="M 5 -2 L 7 0 L 5 2 M 5 -2 L 5 2"
-                      stroke="#fff"
-                      fill="#fff"
-                      stroke-width="1"
-                      vector-effect="non-scaling-stroke">
-                </path>
-          </svg>
-        </img-comparison-slider>
-      </div>
+      <img
+        src="{{config.site_url}}/assets/images/screenshot.png"
+        alt=""
+        draggable="false"
+      >
     </div>
   </div>
 

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/go-ldap/ldap/v3 v3.4.11
 	github.com/go-pkgz/routegroup v1.5.3
 	github.com/go-playground/validator/v10 v10.27.0
-	github.com/go-webauthn/webauthn v0.14.0
+	github.com/go-webauthn/webauthn v0.13.4
 	github.com/google/uuid v1.6.0
 	github.com/prometheus-community/pro-bing v0.7.0
 	github.com/prometheus/client_golang v1.23.2
@@ -29,7 +29,7 @@ require (
 	gorm.io/driver/mysql v1.6.0
 	gorm.io/driver/postgres v1.6.0
 	gorm.io/driver/sqlserver v1.6.1
-	gorm.io/gorm v1.31.0
+	gorm.io/gorm v1.30.5
 )
 
 require (
@@ -64,7 +64,7 @@ require (
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-sql-driver/mysql v1.9.3 // indirect
 	github.com/go-test/deep v1.1.1 // indirect
-	github.com/go-webauthn/x v0.1.25 // indirect
+	github.com/go-webauthn/x v0.1.24 // indirect
 	github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
 	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
 	github.com/golang-sql/sqlexp v0.1.0 // indirect

go.sum

@@ -106,10 +106,10 @@ github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1
 github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
 github.com/go-test/deep v1.1.1 h1:0r/53hagsehfO4bzD2Pgr/+RgHqhmf+k1Bpse2cTu1U=
 github.com/go-test/deep v1.1.1/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
-github.com/go-webauthn/webauthn v0.14.0 h1:ZLNPUgPcDlAeoxe+5umWG/tEeCoQIDr7gE2Zx2QnhL0=
-github.com/go-webauthn/webauthn v0.14.0/go.mod h1:QZzPFH3LJ48u5uEPAu+8/nWJImoLBWM7iAH/kSVSo6k=
-github.com/go-webauthn/x v0.1.25 h1:g/0noooIGcz/yCVqebcFgNnGIgBlJIccS+LYAa+0Z88=
-github.com/go-webauthn/x v0.1.25/go.mod h1:ieblaPY1/BVCV0oQTsA/VAo08/TWayQuJuo5Q+XxmTY=
+github.com/go-webauthn/webauthn v0.13.4 h1:q68qusWPcqHbg9STSxBLBHnsKaLxNO0RnVKaAqMuAuQ=
+github.com/go-webauthn/webauthn v0.13.4/go.mod h1:MglN6OH9ECxvhDqoq1wMoF6P6JRYDiQpC9nc5OomQmI=
+github.com/go-webauthn/x v0.1.24 h1:6LaWf2zzWqbyKT8IyQkhje1/1KCGhlEkMz4V1tDnt/A=
+github.com/go-webauthn/x v0.1.24/go.mod h1:2o5XKJ+X1AKqYKGgHdKflGnoQFQZ6flJ2IFCBKSbSOw=
 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.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
@@ -255,8 +255,6 @@ github.com/yeqown/reedsolomon v1.0.0/go.mod h1:P76zpcn2TCuL0ul1Fso373qHRc69LKwAw
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
-go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y=
-go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU=
 go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
 go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
 go.yaml.in/yaml/v3 v3.0.3 h1:bXOww4E/J3f66rav3pX3m8w6jDE4knZjGOw8b5Y6iNE=
@@ -399,8 +397,8 @@ gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXD
 gorm.io/driver/sqlserver v1.6.1 h1:XWISFsu2I2pqd1KJhhTZNJMx1jNQ+zVL/Q8ovDcUjtY=
 gorm.io/driver/sqlserver v1.6.1/go.mod h1:VZeNn7hqX1aXoN5TPAFGWvxWG90xtA8erGn2gQmpc6U=
 gorm.io/gorm v1.30.0/go.mod h1:8Z33v652h4//uMA76KjeDH8mJXPm1QNCYrMeatR0DOE=
-gorm.io/gorm v1.31.0 h1:0VlycGreVhK7RF/Bwt51Fk8v0xLiiiFdbGDPIZQ7mJY=
-gorm.io/gorm v1.31.0/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs=
+gorm.io/gorm v1.30.5 h1:dvEfYwxL+i+xgCNSGGBT1lDjCzfELK8fHZxL3Ee9X0s=
+gorm.io/gorm v1.30.5/go.mod h1:8Z33v652h4//uMA76KjeDH8mJXPm1QNCYrMeatR0DOE=
 modernc.org/cc/v4 v4.26.4 h1:jPhG8oNjtTYuP2FA4YefTJ/wioNUGALmGuEWt7SUR6s=
 modernc.org/cc/v4 v4.26.4/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
 modernc.org/ccgo/v4 v4.28.1 h1:wPKYn5EC/mYTqBO373jKjvX2n+3+aK7+sICCv4Fjy1A=

internal/app/auth/auth.go

@@ -364,7 +364,6 @@ func (a *Authenticator) passwordAuthentication(
 			}
 			ldapUserInfo, err = ldapAuth.ParseUserInfo(rawUserInfo)
 			if err != nil {
-				slog.Error("failed to parse ldap user info", "identifier", identifier, "error", err)
 				continue
 			}
 
@@ -377,13 +376,10 @@ func (a *Authenticator) passwordAuthentication(
 	}
 
 	if userSource == "" {
-		slog.Warn("no user source found for user", "identifier", identifier, "ldapProviderCount", a.ldapAuthenticators)
 		return nil, errors.New("user not found")
 	}
 
 	if userSource == domain.UserSourceLdap && ldapProvider == nil {
-		slog.Warn("no ldap provider found for user",
-			"identifier", identifier, "ldapProviderCount", a.ldapAuthenticators)
 		return nil, errors.New("ldap provider not found")
 	}
 

mkdocs.yml

@@ -6,12 +6,8 @@ repo_name: h44z/wg-portal
 repo_url: https://github.com/h44z/wg-portal
 copyright: Copyright © 2023-2025 WireGuard Portal Project
 
-extra_javascript:
-  - javascript/img-comparison-slider.js
-
 extra_css:
   - stylesheets/extra.css
-  - stylesheets/img-comparison-slider.css
 
 theme:
   name: material