admin/wireguard-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove hardcoded values in the client config generation

Browse Source
This commit is contained in:
Khanh Ngo
2020-04-20 10:36:20 +07:00
parent e99a5ba92b
commit deecd9c267
2 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
handler/routes.go
View File

@@ -31,6 +31,28 @@ func WireGuardClients() echo.HandlerFunc {
log.Error("Cannot fetch clients from database: ", err)
}
// read server information
serverInterface := model.ServerInterface{}
if err := db.Read("server", "interfaces", &serverInterface); err != nil {
log.Error("Cannot fetch server interface config from database: ", err)
}
serverKeyPair := model.ServerKeypair{}
if err := db.Read("server", "keypair", &serverKeyPair); err != nil {
log.Error("Cannot fetch server key pair from database: ", err)
}
// read global settings
globalSettings := model.GlobalSetting{}
if err := db.Read("server", "global_settings", &globalSettings); err != nil {
log.Error("Cannot fetch global settings from database: ", err)
}
server := model.Server{}
server.Interface = &serverInterface
server.KeyPair = &serverKeyPair
// read client information and build a client list
clientDataList := []model.ClientData{}
for _, f := range records {
client := model.Client{}
@@ -43,7 +65,7 @@ func WireGuardClients() echo.HandlerFunc {
clientData.Client = &client
// generate client qrcode image in base64
png, err := qrcode.Encode(util.BuildClientConfig(client), qrcode.Medium, 256)
png, err := qrcode.Encode(util.BuildClientConfig(client, server, globalSettings), qrcode.Medium, 256)
if err != nil {
log.Error("Cannot generate QRCode: ", err)
}