+
+
+
+
+
@@ -293,6 +298,12 @@
const allocated_ips = $("#client_allocated_ips").val().split(",");
const allowed_ips = $("#client_allowed_ips").val().split(",");
let use_server_dns = false;
+ let extra_allowed_ips = [];
+
+ if ($("#client_extra_allowed_ips").val() !== "") {
+ extra_allowed_ips = $("#client_extra_allowed_ips").val().split(",");
+ }
+
if ($("#use_server_dns").is(':checked')){
use_server_dns = true;
@@ -305,7 +316,7 @@
}
const data = {"name": name, "email": email, "allocated_ips": allocated_ips, "allowed_ips": allowed_ips,
- "use_server_dns": use_server_dns, "enabled": enabled};
+ "extra_allowed_ips": extra_allowed_ips, "use_server_dns": use_server_dns, "enabled": enabled};
$.ajax({
cache: false,
@@ -376,6 +387,16 @@
'placeholderColor': '#666666'
});
+ $("#client_extra_allowed_ips").tagsInput({
+ 'width': '100%',
+ 'height': '75%',
+ 'interactive': true,
+ 'defaultText': 'Add More',
+ 'removeWithBackspace': true,
+ 'minChars': 0,
+ 'placeholderColor': '#666666'
+ });
+
// New client form validation
$(document).ready(function () {
$.validator.setDefaults({
@@ -414,6 +435,7 @@
$("#client_name").val("");
$("#client_email").val("");
$("#client_allocated_ips").importTags('');
+ $("#client_extra_allowed_ips").importTags('');
updateIPAllocationSuggestion();
});
});
diff --git a/templates/clients.html b/templates/clients.html
index 2426fb7..16d2057 100644
--- a/templates/clients.html
+++ b/templates/clients.html
@@ -57,6 +57,24 @@ Wireguard Clients
+
+
+
+
+
+ ![QR code]()
+
+
+
+
+ QR Code
+ +
@@ -86,6 +104,11 @@ Wireguard Clients
+
+
+
+
@@ -275,7 +298,7 @@ Wireguard Clients
// Edit client modal event
$(document).ready(function () {
- $("#modal_edit_client").on('shown.bs.modal', function (event) {
+ $("#modal_edit_client").on('show.bs.modal', function (event) {
let modal = $(this);
const button = $(event.relatedTarget);
const client_id = button.data('clientid');
@@ -302,6 +325,16 @@ Wireguard Clients
'placeholderColor': '#666666'
});
+ modal.find("#_client_extra_allowed_ips").tagsInput({
+ 'width': '100%',
+ 'height': '75%',
+ 'interactive': true,
+ 'defaultText': 'Add More',
+ 'removeWithBackspace' : true,
+ 'minChars': 0,
+ 'placeholderColor': '#666666'
+ })
+
// update client modal data
$.ajax({
cache: false,
@@ -327,6 +360,11 @@ Wireguard Clients
modal.find("#_client_allowed_ips").addTag(obj);
});
+ modal.find("#_client_extra_allowed_ips").importTags('');
+ client.extra_allowed_ips.forEach(function (obj) {
+ modal.find("#_client_extra_allowed_ips").addTag(obj);
+ });
+
modal.find("#_use_server_dns").prop("checked", client.use_server_dns);
modal.find("#_enabled").prop("checked", client.enabled);
},
@@ -371,6 +409,11 @@ Wireguard Clients
const allocated_ips = $("#_client_allocated_ips").val().split(",");
const allowed_ips = $("#_client_allowed_ips").val().split(",");
let use_server_dns = false;
+ let extra_allowed_ips = [];
+
+ if( $("#_client_extra_allowed_ips").val() !== "" ) {
+ extra_allowed_ips = $("#_client_extra_allowed_ips").val().split(",");
+ }
if ($("#_use_server_dns").is(':checked')){
use_server_dns = true;
@@ -383,7 +426,7 @@ Wireguard Clients
}
const data = {"id": client_id, "name": name, "email": email, "allocated_ips": allocated_ips,
- "allowed_ips": allowed_ips, "use_server_dns": use_server_dns, "enabled": enabled};
+ "allowed_ips": allowed_ips, "extra_allowed_ips": extra_allowed_ips, "use_server_dns": use_server_dns, "enabled": enabled};
$.ajax({
cache: false,
@@ -415,7 +458,7 @@ Wireguard Clients
}
}
- $("#modal_email_client").on('shown.bs.modal', function (event) {
+ $("#modal_email_client").on('show.bs.modal', function (event) {
let modal = $(this);
const button = $(event.relatedTarget);
const client_id = button.data('clientid');
@@ -439,6 +482,31 @@ Wireguard Clients
});
});
+ $("#modal_qr_client").on('show.bs.modal', function (event) {
+ let modal = $(this);
+ const button = $(event.relatedTarget);
+ const client_id = button.data('clientid');
+ const QRCodeImg = modal.find("#qr_code");
+ QRCodeImg.hide();
+ $.ajax({
+ cache: false,
+ method: 'GET',
+ url: '/api/client/' + client_id,
+ dataType: 'json',
+ contentType: "application/json",
+ success: function (resp) {
+ const client = resp.Client;
+
+ modal.find(".modal-title").text("QR Code for " + client.name);
+ QRCodeImg.attr('src', resp.QRCode).show();
+ },
+ error: function (jqXHR, exception) {
+ const responseJson = jQuery.parseJSON(jqXHR.responseText);
+ toastr.error(responseJson['message']);
+ }
+ });
+ });
+
$(document).ready(function () {
$.validator.setDefaults({
submitHandler: function (form) {
diff --git a/templates/wg.conf b/templates/wg.conf
index baca924..745a92f 100644
--- a/templates/wg.conf
+++ b/templates/wg.conf
@@ -20,5 +20,5 @@ PostDown = {{ .serverConfig.Interface.PostDown }}
[Peer]
PublicKey = {{ .Client.PublicKey }}
{{if .Client.PresharedKey }}PresharedKey = {{ .Client.PresharedKey }}
-{{end}}AllowedIPs = {{$first :=true}}{{range .Client.AllocatedIPs }}{{if $first}}{{$first = false}}{{else}},{{end}}{{.}}{{end}}
+{{end}}AllowedIPs = {{$first :=true}}{{range .Client.AllocatedIPs }}{{if $first}}{{$first = false}}{{else}},{{end}}{{.}}{{end}}{{range .Client.ExtraAllowedIPs }},{{.}}{{end}}
{{end}}{{end}}
diff --git a/util/config.go b/util/config.go
index acdb720..80cbc9c 100644
--- a/util/config.go
+++ b/util/config.go
@@ -4,6 +4,12 @@ package util
var (
DisableLogin bool
BindAddress string
+ SmtpHostname string
+ SmtpPort int
+ SmtpUsername string
+ SmtpPassword string
+ SmtpNoTLSCheck bool
+ SmtpAuthType string
SendgridApiKey string
EmailFrom string
EmailFromName string
diff --git a/util/util.go b/util/util.go
index b923f47..7c347a9 100644
--- a/util/util.go
+++ b/util/util.go
@@ -80,10 +80,18 @@ func ValidateCIDR(cidr string) bool {
}
// ValidateCIDRList to validate a list of network CIDR
-func ValidateCIDRList(cidrs []string) bool {
+func ValidateCIDRList(cidrs []string, allowEmpty bool) bool {
for _, cidr := range cidrs {
- if ValidateCIDR(cidr) == false {
- return false
+ if allowEmpty {
+ if len(cidr) > 0 {
+ if ValidateCIDR(cidr) == false {
+ return false
+ }
+ }
+ } else {
+ if ValidateCIDR(cidr) == false {
+ return false
+ }
}
}
return true
@@ -91,7 +99,15 @@ func ValidateCIDRList(cidrs []string) bool {
// ValidateAllowedIPs to validate allowed ip addresses in CIDR format
func ValidateAllowedIPs(cidrs []string) bool {
- if ValidateCIDRList(cidrs) == false {
+ if ValidateCIDRList(cidrs, false) == false {
+ return false
+ }
+ return true
+}
+
+// ValidateExtraAllowedIPs to validate extra Allowed ip addresses, allowing empty strings
+func ValidateExtraAllowedIPs(cidrs []string) bool {
+ if ValidateCIDRList(cidrs, true) == false {
return false
}
return true
@@ -99,7 +115,7 @@ func ValidateAllowedIPs(cidrs []string) bool {
// ValidateServerAddresses to validate allowed ip addresses in CIDR format
func ValidateServerAddresses(cidrs []string) bool {
- if ValidateCIDRList(cidrs) == false {
+ if ValidateCIDRList(cidrs, false) == false {
return false
}
return true