diff --git a/assets/js/custom.js b/assets/js/custom.js index 005dc92..df3eaac 100644 --- a/assets/js/custom.js +++ b/assets/js/custom.js @@ -25,6 +25,11 @@ } }); }); + $(function() { + $('select.device-selector').change(function() { + this.form.submit(); + }); + }); })(jQuery); // End of use strict diff --git a/assets/tpl/admin_index.html b/assets/tpl/admin_index.html index 7e7afd3..06a53d1 100644 --- a/assets/tpl/admin_index.html +++ b/assets/tpl/admin_index.html @@ -106,6 +106,7 @@ {{range $i, $p :=.Peers}} + {{$peerUser:=(userForEmail $.Users $p.Email)}} @@ -142,14 +143,14 @@

User details

- {{if not $p.User}} + {{if not $peerUser}}

No user information available...

{{else}} {{end}}

Connection / Traffic

diff --git a/assets/tpl/prt_nav.html b/assets/tpl/prt_nav.html index 6ab5d9b..994f540 100644 --- a/assets/tpl/prt_nav.html +++ b/assets/tpl/prt_nav.html @@ -22,6 +22,19 @@ {{end}} {{end}}{{end}} + {{with eq $.Session.LoggedIn true}}{{with eq $.Session.IsAdmin true}} + {{with startsWith $.Route "/admin/"}} +
+
+ +
+
+ {{end}} + {{end}}{{end}} {{if eq $.Session.LoggedIn true}}
{{$.Session.Firstname}} {{$.Session.Lastname}} @@ -43,6 +56,6 @@ {{if not $.Device.IsValid}}
-
Warning: WireGuard Interface is not fully configured! Configurations may be incomplete and non functional!
+
Warning: WireGuard Interface {{$.Device.DeviceName}} is not fully configured! Configurations may be incomplete and non functional!
{{end}} \ No newline at end of file diff --git a/assets/tpl/user_index.html b/assets/tpl/user_index.html index 33739a3..6f6f1b3 100644 --- a/assets/tpl/user_index.html +++ b/assets/tpl/user_index.html @@ -30,6 +30,7 @@ {{range $i, $p :=.Peers}} + {{$peerUser:=(userForEmail $.Users $p.Email)}} @@ -58,14 +59,14 @@

User details

- {{if not $p.User}} + {{if not $peerUser}}

No user information available...

{{else}}
    -
  • Firstname: {{$p.User.Firstname}}
    • -
  • Lastname: {{$p.User.Lastname}}
    • -
  • Phone: {{$p.User.Phone}}
    • -
  • Mail: {{$p.User.Email}}
    • +
  • Firstname: {{$peerUser.Firstname}}
    • +
  • Lastname: {{$peerUser.Lastname}}
    • +
  • Phone: {{$peerUser.Phone}}
    • +
  • Mail: {{$peerUser.Email}}
{{end}}

Traffic

diff --git a/internal/authentication/providers/password/provider.go b/internal/authentication/providers/password/provider.go index c6f937d..fbe95c5 100644 --- a/internal/authentication/providers/password/provider.go +++ b/internal/authentication/providers/password/provider.go @@ -7,6 +7,8 @@ import ( "strings" "time" + "github.com/h44z/wg-portal/internal/common" + "github.com/gin-gonic/gin" "github.com/h44z/wg-portal/internal/authentication" "github.com/h44z/wg-portal/internal/users" @@ -22,11 +24,11 @@ type Provider struct { db *gorm.DB } -func New(cfg *users.Config) (*Provider, error) { +func New(cfg *common.DatabaseConfig) (*Provider, error) { p := &Provider{} var err error - p.db, err = users.GetDatabaseForConfig(cfg) + p.db, err = common.GetDatabaseForConfig(cfg) if err != nil { return nil, errors.Wrapf(err, "failed to setup authentication database %s", cfg.Database) } diff --git a/internal/common/db.go b/internal/common/db.go new file mode 100644 index 0000000..9261c58 --- /dev/null +++ b/internal/common/db.go @@ -0,0 +1,76 @@ +package common + +import ( + "fmt" + "os" + "path/filepath" + "time" + + "github.com/pkg/errors" + "github.com/sirupsen/logrus" + "gorm.io/driver/mysql" + "gorm.io/driver/sqlite" + "gorm.io/gorm" + "gorm.io/gorm/logger" +) + +type SupportedDatabase string + +const ( + SupportedDatabaseMySQL SupportedDatabase = "mysql" + SupportedDatabaseSQLite SupportedDatabase = "sqlite" +) + +type DatabaseConfig struct { + Typ SupportedDatabase `yaml:"typ" envconfig:"DATABASE_TYPE"` //mysql or sqlite + Host string `yaml:"host" envconfig:"DATABASE_HOST"` + Port int `yaml:"port" envconfig:"DATABASE_PORT"` + Database string `yaml:"database" envconfig:"DATABASE_NAME"` // On SQLite: the database file-path, otherwise the database name + User string `yaml:"user" envconfig:"DATABASE_USERNAME"` + Password string `yaml:"password" envconfig:"DATABASE_PASSWORD"` +} + +func GetDatabaseForConfig(cfg *DatabaseConfig) (db *gorm.DB, err error) { + switch cfg.Typ { + case SupportedDatabaseSQLite: + if _, err = os.Stat(filepath.Dir(cfg.Database)); os.IsNotExist(err) { + if err = os.MkdirAll(filepath.Dir(cfg.Database), 0700); err != nil { + return + } + } + db, err = gorm.Open(sqlite.Open(cfg.Database), &gorm.Config{}) + if err != nil { + return + } + case SupportedDatabaseMySQL: + connectionString := fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?charset=utf8mb4&parseTime=True&loc=Local", cfg.User, cfg.Password, cfg.Host, cfg.Port, cfg.Database) + db, err = gorm.Open(mysql.Open(connectionString), &gorm.Config{}) + if err != nil { + return + } + + sqlDB, _ := db.DB() + sqlDB.SetConnMaxLifetime(time.Minute * 5) + sqlDB.SetMaxIdleConns(2) + sqlDB.SetMaxOpenConns(10) + err = sqlDB.Ping() // This DOES open a connection if necessary. This makes sure the database is accessible + if err != nil { + return nil, errors.Wrap(err, "failed to ping mysql authentication database") + } + } + + // Enable Logger (logrus) + logCfg := logger.Config{ + SlowThreshold: time.Second, // all slower than one second + Colorful: false, + LogLevel: logger.Silent, // default: log nothing + } + + if logrus.StandardLogger().GetLevel() == logrus.TraceLevel { + logCfg.LogLevel = logger.Info + logCfg.SlowThreshold = 500 * time.Millisecond // all slower than half a second + } + + db.Config.Logger = logger.New(logrus.StandardLogger(), logCfg) + return +} diff --git a/internal/common/util.go b/internal/common/util.go index fc974b1..bbde700 100644 --- a/internal/common/util.go +++ b/internal/common/util.go @@ -60,6 +60,16 @@ func ListToString(lst []string) string { return strings.Join(lst, ", ") } +// ListContains checks if a needle exists in the given list. +func ListContains(lst []string, needle string) bool { + for _, entry := range lst { + if entry == needle { + return true + } + } + return false +} + // https://yourbasic.org/golang/formatting-byte-size-to-human-readable-format/ func ByteCountSI(b int64) string { const unit = 1000 diff --git a/internal/common/configuration.go b/internal/server/configuration.go similarity index 91% rename from internal/common/configuration.go rename to internal/server/configuration.go index 3912b38..a88d964 100644 --- a/internal/common/configuration.go +++ b/internal/server/configuration.go @@ -1,12 +1,12 @@ -package common +package server import ( "os" "reflect" "runtime" + "github.com/h44z/wg-portal/internal/common" "github.com/h44z/wg-portal/internal/ldap" - "github.com/h44z/wg-portal/internal/users" "github.com/h44z/wg-portal/internal/wireguard" "github.com/kelseyhightower/envconfig" "github.com/pkg/errors" @@ -66,10 +66,10 @@ type Config struct { CreateDefaultPeer bool `yaml:"createDefaultPeer" envconfig:"CREATE_DEFAULT_PEER"` LdapEnabled bool `yaml:"ldapEnabled" envconfig:"LDAP_ENABLED"` } `yaml:"core"` - Database users.Config `yaml:"database"` - Email MailConfig `yaml:"email"` - LDAP ldap.Config `yaml:"ldap"` - WG wireguard.Config `yaml:"wg"` + Database common.DatabaseConfig `yaml:"database"` + Email common.MailConfig `yaml:"email"` + LDAP ldap.Config `yaml:"ldap"` + WG wireguard.Config `yaml:"wg"` } func NewConfig() *Config { @@ -103,8 +103,9 @@ func NewConfig() *Config { cfg.LDAP.DisabledAttribute = "userAccountControl" cfg.LDAP.AdminLdapGroup = "CN=WireGuardAdmins,OU=_O_IT,DC=COMPANY,DC=LOCAL" - cfg.WG.DeviceName = "wg0" - cfg.WG.WireGuardConfig = "/etc/wireguard/wg0.conf" + cfg.WG.DeviceNames = []string{"wg0"} + cfg.WG.DefaultDeviceName = "wg0" + cfg.WG.ConfigDirectoryPath = "/etc/wireguard" cfg.WG.ManageIPAddresses = true cfg.Email.Host = "127.0.0.1" cfg.Email.Port = 25 diff --git a/internal/server/handlers_auth.go b/internal/server/handlers_auth.go index bb70b95..72833cc 100644 --- a/internal/server/handlers_auth.go +++ b/internal/server/handlers_auth.go @@ -98,7 +98,7 @@ func (s *Server) PostLogin(c *gin.Context) { Firstname: userData.Firstname, Lastname: userData.Lastname, Phone: userData.Phone, - }); err != nil { + }, s.wg.Cfg.DefaultDeviceName); err != nil { s.GetHandleError(c, http.StatusInternalServerError, "login error", "failed to update user data") return } @@ -121,9 +121,10 @@ func (s *Server) PostLogin(c *gin.Context) { sessionData.Email = user.Email sessionData.Firstname = user.Firstname sessionData.Lastname = user.Lastname + sessionData.DeviceName = s.wg.Cfg.DeviceNames[0] // Check if user already has a peer setup, if not create one - if err := s.CreateUserDefaultPeer(user.Email); err != nil { + if err := s.CreateUserDefaultPeer(user.Email, s.wg.Cfg.DefaultDeviceName); err != nil { // Not a fatal error, just log it... logrus.Errorf("failed to automatically create vpn peer for %s: %v", sessionData.Email, err) } diff --git a/internal/server/handlers_common.go b/internal/server/handlers_common.go index 0ff0885..054acb8 100644 --- a/internal/server/handlers_common.go +++ b/internal/server/handlers_common.go @@ -4,37 +4,42 @@ import ( "net/http" "strconv" + "github.com/h44z/wg-portal/internal/users" + + "github.com/h44z/wg-portal/internal/common" + "github.com/pkg/errors" "github.com/gin-gonic/gin" ) func (s *Server) GetHandleError(c *gin.Context, code int, message, details string) { + currentSession := GetSessionData(c) + c.HTML(code, "error.html", gin.H{ "Data": gin.H{ "Code": strconv.Itoa(code), "Message": message, "Details": details, }, - "Route": c.Request.URL.Path, - "Session": GetSessionData(c), - "Static": s.getStaticData(), + "Route": c.Request.URL.Path, + "Session": GetSessionData(c), + "Static": s.getStaticData(), + "Device": s.peers.GetDevice(currentSession.DeviceName), + "DeviceNames": s.wg.Cfg.DeviceNames, }) } func (s *Server) GetIndex(c *gin.Context) { - c.HTML(http.StatusOK, "index.html", struct { - Route string - Alerts []FlashData - Session SessionData - Static StaticData - Device Device - }{ - Route: c.Request.URL.Path, - Alerts: GetFlashes(c), - Session: GetSessionData(c), - Static: s.getStaticData(), - Device: s.peers.GetDevice(), + currentSession := GetSessionData(c) + + c.HTML(http.StatusOK, "index.html", gin.H{ + "Route": c.Request.URL.Path, + "Alerts": GetFlashes(c), + "Session": currentSession, + "Static": s.getStaticData(), + "Device": s.peers.GetDevice(currentSession.DeviceName), + "DeviceNames": s.wg.Cfg.DeviceNames, }) } @@ -74,25 +79,35 @@ func (s *Server) GetAdminIndex(c *gin.Context) { return } - device := s.peers.GetDevice() - users := s.peers.GetFilteredAndSortedPeers(currentSession.SortedBy["peers"], currentSession.SortDirection["peers"], currentSession.Search["peers"]) + deviceName := c.Query("device") + if deviceName != "" { + if !common.ListContains(s.wg.Cfg.DeviceNames, deviceName) { + s.GetHandleError(c, http.StatusInternalServerError, "device selection error", "no such device") + return + } + currentSession.DeviceName = deviceName - c.HTML(http.StatusOK, "admin_index.html", struct { - Route string - Alerts []FlashData - Session SessionData - Static StaticData - Peers []Peer - TotalPeers int - Device Device - }{ - Route: c.Request.URL.Path, - Alerts: GetFlashes(c), - Session: currentSession, - Static: s.getStaticData(), - Peers: users, - TotalPeers: len(s.peers.GetAllPeers()), - Device: device, + if err := UpdateSessionData(c, currentSession); err != nil { + s.GetHandleError(c, http.StatusInternalServerError, "device selection error", "failed to save session") + return + } + c.Redirect(http.StatusSeeOther, "/admin/") + return + } + + device := s.peers.GetDevice(currentSession.DeviceName) + users := s.peers.GetFilteredAndSortedPeers(currentSession.DeviceName, currentSession.SortedBy["peers"], currentSession.SortDirection["peers"], currentSession.Search["peers"]) + + c.HTML(http.StatusOK, "admin_index.html", gin.H{ + "Route": c.Request.URL.Path, + "Alerts": GetFlashes(c), + "Session": currentSession, + "Static": s.getStaticData(), + "Peers": users, + "TotalPeers": len(s.peers.GetAllPeers(currentSession.DeviceName)), + "Users": s.users.GetUsers(), + "Device": device, + "DeviceNames": s.wg.Cfg.DeviceNames, }) } @@ -120,25 +135,18 @@ func (s *Server) GetUserIndex(c *gin.Context) { return } - device := s.peers.GetDevice() - users := s.peers.GetSortedPeersForEmail(currentSession.SortedBy["userpeers"], currentSession.SortDirection["userpeers"], currentSession.Email) + peers := s.peers.GetSortedPeersForEmail(currentSession.SortedBy["userpeers"], currentSession.SortDirection["userpeers"], currentSession.Email) - c.HTML(http.StatusOK, "user_index.html", struct { - Route string - Alerts []FlashData - Session SessionData - Static StaticData - Peers []Peer - TotalPeers int - Device Device - }{ - Route: c.Request.URL.Path, - Alerts: GetFlashes(c), - Session: currentSession, - Static: s.getStaticData(), - Peers: users, - TotalPeers: len(users), - Device: device, + c.HTML(http.StatusOK, "user_index.html", gin.H{ + "Route": c.Request.URL.Path, + "Alerts": GetFlashes(c), + "Session": currentSession, + "Static": s.getStaticData(), + "Peers": peers, + "TotalPeers": len(peers), + "Users": []users.User{*s.users.GetUser(currentSession.Email)}, + "Device": s.peers.GetDevice(currentSession.DeviceName), + "DeviceNames": s.wg.Cfg.DeviceNames, }) } @@ -158,7 +166,7 @@ func (s *Server) setNewPeerFormInSession(c *gin.Context) (SessionData, error) { // If session does not contain a peer form ignore update // If url contains a formerr parameter reset the form if currentSession.FormData == nil || c.Query("formerr") == "" { - user, err := s.PrepareNewPeer() + user, err := s.PrepareNewPeer(currentSession.DeviceName) if err != nil { return currentSession, errors.WithMessage(err, "failed to prepare new peer") } diff --git a/internal/server/handlers_interface.go b/internal/server/handlers_interface.go index 77a152e..d3f3655 100644 --- a/internal/server/handlers_interface.go +++ b/internal/server/handlers_interface.go @@ -4,44 +4,37 @@ import ( "net/http" "strings" + "github.com/h44z/wg-portal/internal/wireguard" + "github.com/gin-gonic/gin" "github.com/h44z/wg-portal/internal/common" ) func (s *Server) GetAdminEditInterface(c *gin.Context) { - device := s.peers.GetDevice() - users := s.peers.GetAllPeers() - + currentSession := GetSessionData(c) + device := s.peers.GetDevice(currentSession.DeviceName) currentSession, err := s.setFormInSession(c, device) if err != nil { s.GetHandleError(c, http.StatusInternalServerError, "Session error", err.Error()) return } - c.HTML(http.StatusOK, "admin_edit_interface.html", struct { - Route string - Alerts []FlashData - Session SessionData - Static StaticData - Peers []Peer - Device Device - EditableKeys bool - }{ - Route: c.Request.URL.Path, - Alerts: GetFlashes(c), - Session: currentSession, - Static: s.getStaticData(), - Peers: users, - Device: currentSession.FormData.(Device), - EditableKeys: s.config.Core.EditableKeys, + c.HTML(http.StatusOK, "admin_edit_interface.html", gin.H{ + "Route": c.Request.URL.Path, + "Alerts": GetFlashes(c), + "Session": currentSession, + "Static": s.getStaticData(), + "Device": currentSession.FormData.(wireguard.Device), + "EditableKeys": s.config.Core.EditableKeys, + "DeviceNames": s.wg.Cfg.DeviceNames, }) } func (s *Server) PostAdminEditInterface(c *gin.Context) { currentSession := GetSessionData(c) - var formDevice Device + var formDevice wireguard.Device if currentSession.FormData != nil { - formDevice = currentSession.FormData.(Device) + formDevice = currentSession.FormData.(wireguard.Device) } if err := c.ShouldBind(&formDevice); err != nil { _ = s.updateFormInSession(c, formDevice) @@ -76,7 +69,7 @@ func (s *Server) PostAdminEditInterface(c *gin.Context) { } // Update WireGuard config file - err = s.WriteWireGuardConfigFile() + err = s.WriteWireGuardConfigFile(currentSession.DeviceName) if err != nil { _ = s.updateFormInSession(c, formDevice) SetFlashMessage(c, "Failed to update WireGuard config-file: "+err.Error(), "danger") @@ -86,12 +79,12 @@ func (s *Server) PostAdminEditInterface(c *gin.Context) { // Update interface IP address if s.config.WG.ManageIPAddresses { - if err := s.wg.SetIPAddress(formDevice.IPs); err != nil { + if err := s.wg.SetIPAddress(currentSession.DeviceName, formDevice.IPs); err != nil { _ = s.updateFormInSession(c, formDevice) SetFlashMessage(c, "Failed to update ip address: "+err.Error(), "danger") c.Redirect(http.StatusSeeOther, "/admin/device/edit?formerr=update") } - if err := s.wg.SetMTU(formDevice.Mtu); err != nil { + if err := s.wg.SetMTU(currentSession.DeviceName, formDevice.Mtu); err != nil { _ = s.updateFormInSession(c, formDevice) SetFlashMessage(c, "Failed to update MTU: "+err.Error(), "danger") c.Redirect(http.StatusSeeOther, "/admin/device/edit?formerr=update") @@ -106,9 +99,10 @@ func (s *Server) PostAdminEditInterface(c *gin.Context) { } func (s *Server) GetInterfaceConfig(c *gin.Context) { - device := s.peers.GetDevice() - users := s.peers.GetActivePeers() - cfg, err := device.GetConfigFile(users) + currentSession := GetSessionData(c) + device := s.peers.GetDevice(currentSession.DeviceName) + peers := s.peers.GetActivePeers(device.DeviceName) + cfg, err := device.GetConfigFile(peers) if err != nil { s.GetHandleError(c, http.StatusInternalServerError, "ConfigFile error", err.Error()) return @@ -122,13 +116,14 @@ func (s *Server) GetInterfaceConfig(c *gin.Context) { } func (s *Server) GetApplyGlobalConfig(c *gin.Context) { - device := s.peers.GetDevice() - users := s.peers.GetAllPeers() + currentSession := GetSessionData(c) + device := s.peers.GetDevice(currentSession.DeviceName) + peers := s.peers.GetAllPeers(device.DeviceName) - for _, user := range users { - user.AllowedIPs = device.AllowedIPs - user.AllowedIPsStr = device.AllowedIPsStr - if err := s.peers.UpdatePeer(user); err != nil { + for _, peer := range peers { + peer.AllowedIPs = device.AllowedIPs + peer.AllowedIPsStr = device.AllowedIPsStr + if err := s.peers.UpdatePeer(peer); err != nil { SetFlashMessage(c, err.Error(), "danger") c.Redirect(http.StatusSeeOther, "/admin/device/edit") } diff --git a/internal/server/handlers_peer.go b/internal/server/handlers_peer.go index ae05236..9f2de38 100644 --- a/internal/server/handlers_peer.go +++ b/internal/server/handlers_peer.go @@ -8,9 +8,10 @@ import ( "strings" "time" + "github.com/h44z/wg-portal/internal/wireguard" + "github.com/gin-gonic/gin" "github.com/h44z/wg-portal/internal/common" - "github.com/h44z/wg-portal/internal/users" "github.com/sirupsen/logrus" "github.com/tatsushid/go-fastping" ) @@ -21,7 +22,6 @@ type LdapCreateForm struct { } func (s *Server) GetAdminEditPeer(c *gin.Context) { - device := s.peers.GetDevice() peer := s.peers.GetPeerByKey(c.Query("pkey")) currentSession, err := s.setFormInSession(c, peer) @@ -30,22 +30,15 @@ func (s *Server) GetAdminEditPeer(c *gin.Context) { return } - c.HTML(http.StatusOK, "admin_edit_client.html", struct { - Route string - Alerts []FlashData - Session SessionData - Static StaticData - Peer Peer - Device Device - EditableKeys bool - }{ - Route: c.Request.URL.Path, - Alerts: GetFlashes(c), - Session: currentSession, - Static: s.getStaticData(), - Peer: currentSession.FormData.(Peer), - Device: device, - EditableKeys: s.config.Core.EditableKeys, + c.HTML(http.StatusOK, "admin_edit_client.html", gin.H{ + "Route": c.Request.URL.Path, + "Alerts": GetFlashes(c), + "Session": currentSession, + "Static": s.getStaticData(), + "Peer": currentSession.FormData.(wireguard.Peer), + "EditableKeys": s.config.Core.EditableKeys, + "Device": s.peers.GetDevice(currentSession.DeviceName), + "DeviceNames": s.wg.Cfg.DeviceNames, }) } @@ -54,9 +47,9 @@ func (s *Server) PostAdminEditPeer(c *gin.Context) { urlEncodedKey := url.QueryEscape(c.Query("pkey")) currentSession := GetSessionData(c) - var formPeer Peer + var formPeer wireguard.Peer if currentSession.FormData != nil { - formPeer = currentSession.FormData.(Peer) + formPeer = currentSession.FormData.(wireguard.Peer) } if err := c.ShouldBind(&formPeer); err != nil { _ = s.updateFormInSession(c, formPeer) @@ -92,37 +85,28 @@ func (s *Server) PostAdminEditPeer(c *gin.Context) { } func (s *Server) GetAdminCreatePeer(c *gin.Context) { - device := s.peers.GetDevice() - currentSession, err := s.setNewPeerFormInSession(c) if err != nil { s.GetHandleError(c, http.StatusInternalServerError, "Session error", err.Error()) return } - c.HTML(http.StatusOK, "admin_edit_client.html", struct { - Route string - Alerts []FlashData - Session SessionData - Static StaticData - Peer Peer - Device Device - EditableKeys bool - }{ - Route: c.Request.URL.Path, - Alerts: GetFlashes(c), - Session: currentSession, - Static: s.getStaticData(), - Peer: currentSession.FormData.(Peer), - Device: device, - EditableKeys: s.config.Core.EditableKeys, + c.HTML(http.StatusOK, "admin_edit_client.html", gin.H{ + "Route": c.Request.URL.Path, + "Alerts": GetFlashes(c), + "Session": currentSession, + "Static": s.getStaticData(), + "Peer": currentSession.FormData.(wireguard.Peer), + "EditableKeys": s.config.Core.EditableKeys, + "Device": s.peers.GetDevice(currentSession.DeviceName), + "DeviceNames": s.wg.Cfg.DeviceNames, }) } func (s *Server) PostAdminCreatePeer(c *gin.Context) { currentSession := GetSessionData(c) - var formPeer Peer + var formPeer wireguard.Peer if currentSession.FormData != nil { - formPeer = currentSession.FormData.(Peer) + formPeer = currentSession.FormData.(wireguard.Peer) } if err := c.ShouldBind(&formPeer); err != nil { _ = s.updateFormInSession(c, formPeer) @@ -143,7 +127,7 @@ func (s *Server) PostAdminCreatePeer(c *gin.Context) { formPeer.DeactivatedAt = &now } - if err := s.CreatePeer(formPeer); err != nil { + if err := s.CreatePeer(currentSession.DeviceName, formPeer); err != nil { _ = s.updateFormInSession(c, formPeer) SetFlashMessage(c, "failed to add user: "+err.Error(), "danger") c.Redirect(http.StatusSeeOther, "/admin/peer/create?formerr=create") @@ -161,22 +145,15 @@ func (s *Server) GetAdminCreateLdapPeers(c *gin.Context) { return } - c.HTML(http.StatusOK, "admin_create_clients.html", struct { - Route string - Alerts []FlashData - Session SessionData - Static StaticData - Users []users.User - FormData LdapCreateForm - Device Device - }{ - Route: c.Request.URL.Path, - Alerts: GetFlashes(c), - Session: currentSession, - Static: s.getStaticData(), - Users: s.users.GetFilteredAndSortedUsers("lastname", "asc", ""), - FormData: currentSession.FormData.(LdapCreateForm), - Device: s.peers.GetDevice(), + c.HTML(http.StatusOK, "admin_create_clients.html", gin.H{ + "Route": c.Request.URL.Path, + "Alerts": GetFlashes(c), + "Session": currentSession, + "Static": s.getStaticData(), + "Users": s.users.GetFilteredAndSortedUsers("lastname", "asc", ""), + "FormData": currentSession.FormData.(LdapCreateForm), + "Device": s.peers.GetDevice(currentSession.DeviceName), + "DeviceNames": s.wg.Cfg.DeviceNames, }) } @@ -207,7 +184,7 @@ func (s *Server) PostAdminCreateLdapPeers(c *gin.Context) { logrus.Infof("creating %d ldap peers", len(emails)) for i := range emails { - if err := s.CreatePeerByEmail(emails[i], formData.Identifier, false); err != nil { + if err := s.CreatePeerByEmail(currentSession.DeviceName, emails[i], formData.Identifier, false); err != nil { _ = s.updateFormInSession(c, formData) SetFlashMessage(c, "failed to add user: "+err.Error(), "danger") c.Redirect(http.StatusSeeOther, "/admin/peer/createldap?formerr=create") @@ -225,7 +202,7 @@ func (s *Server) GetAdminDeletePeer(c *gin.Context) { s.GetHandleError(c, http.StatusInternalServerError, "Deletion error", err.Error()) return } - SetFlashMessage(c, "user deleted successfully", "success") + SetFlashMessage(c, "peer deleted successfully", "success") c.Redirect(http.StatusSeeOther, "/admin") } @@ -254,7 +231,7 @@ func (s *Server) GetPeerConfig(c *gin.Context) { return } - cfg, err := user.GetConfigFile(s.peers.GetDevice()) + cfg, err := user.GetConfigFile(s.peers.GetDevice(currentSession.DeviceName)) if err != nil { s.GetHandleError(c, http.StatusInternalServerError, "ConfigFile error", err.Error()) return @@ -273,7 +250,7 @@ func (s *Server) GetPeerConfigMail(c *gin.Context) { return } - cfg, err := user.GetConfigFile(s.peers.GetDevice()) + cfg, err := user.GetConfigFile(s.peers.GetDevice(currentSession.DeviceName)) if err != nil { s.GetHandleError(c, http.StatusInternalServerError, "ConfigFile error", err.Error()) return @@ -286,7 +263,7 @@ func (s *Server) GetPeerConfigMail(c *gin.Context) { // Apply mail template var tplBuff bytes.Buffer if err := s.mailTpl.Execute(&tplBuff, struct { - Client Peer + Client wireguard.Peer QrcodePngName string PortalUrl string }{ diff --git a/internal/server/handlers_user.go b/internal/server/handlers_user.go index c96a37c..0bdfc95 100644 --- a/internal/server/handlers_user.go +++ b/internal/server/handlers_user.go @@ -49,22 +49,15 @@ func (s *Server) GetAdminUsersIndex(c *gin.Context) { dbUsers := s.users.GetFilteredAndSortedUsersUnscoped(currentSession.SortedBy["users"], currentSession.SortDirection["users"], currentSession.Search["users"]) - c.HTML(http.StatusOK, "admin_user_index.html", struct { - Route string - Alerts []FlashData - Session SessionData - Static StaticData - Users []users.User - TotalUsers int - Device Device - }{ - Route: c.Request.URL.Path, - Alerts: GetFlashes(c), - Session: currentSession, - Static: s.getStaticData(), - Users: dbUsers, - TotalUsers: len(s.users.GetUsers()), - Device: s.peers.GetDevice(), + c.HTML(http.StatusOK, "admin_user_index.html", gin.H{ + "Route": c.Request.URL.Path, + "Alerts": GetFlashes(c), + "Session": currentSession, + "Static": s.getStaticData(), + "Users": dbUsers, + "TotalUsers": len(s.users.GetUsers()), + "Device": s.peers.GetDevice(currentSession.DeviceName), + "DeviceNames": s.wg.Cfg.DeviceNames, }) } @@ -77,21 +70,14 @@ func (s *Server) GetAdminUsersEdit(c *gin.Context) { return } - c.HTML(http.StatusOK, "admin_edit_user.html", struct { - Route string - Alerts []FlashData - Session SessionData - Static StaticData - User users.User - Device Device - Epoch time.Time - }{ - Route: c.Request.URL.Path, - Alerts: GetFlashes(c), - Session: currentSession, - Static: s.getStaticData(), - User: currentSession.FormData.(users.User), - Device: s.peers.GetDevice(), + c.HTML(http.StatusOK, "admin_edit_user.html", gin.H{ + "Route": c.Request.URL.Path, + "Alerts": GetFlashes(c), + "Session": currentSession, + "Static": s.getStaticData(), + "User": currentSession.FormData.(users.User), + "Device": s.peers.GetDevice(currentSession.DeviceName), + "DeviceNames": s.wg.Cfg.DeviceNames, }) } @@ -160,21 +146,14 @@ func (s *Server) GetAdminUsersCreate(c *gin.Context) { return } - c.HTML(http.StatusOK, "admin_edit_user.html", struct { - Route string - Alerts []FlashData - Session SessionData - Static StaticData - User users.User - Device Device - Epoch time.Time - }{ - Route: c.Request.URL.Path, - Alerts: GetFlashes(c), - Session: currentSession, - Static: s.getStaticData(), - User: currentSession.FormData.(users.User), - Device: s.peers.GetDevice(), + c.HTML(http.StatusOK, "admin_edit_user.html", gin.H{ + "Route": c.Request.URL.Path, + "Alerts": GetFlashes(c), + "Session": currentSession, + "Static": s.getStaticData(), + "User": currentSession.FormData.(users.User), + "Device": s.peers.GetDevice(currentSession.DeviceName), + "DeviceNames": s.wg.Cfg.DeviceNames, }) } @@ -218,7 +197,7 @@ func (s *Server) PostAdminUsersCreate(c *gin.Context) { formUser.IsAdmin = c.PostForm("isadmin") == "true" formUser.Source = users.UserSourceDatabase - if err := s.CreateUser(formUser); err != nil { + if err := s.CreateUser(formUser, currentSession.DeviceName); err != nil { _ = s.updateFormInSession(c, formUser) SetFlashMessage(c, "failed to add user: "+err.Error(), "danger") c.Redirect(http.StatusSeeOther, "/admin/users/create?formerr=create") diff --git a/internal/server/routes.go b/internal/server/routes.go index e1d3a47..03cf998 100644 --- a/internal/server/routes.go +++ b/internal/server/routes.go @@ -4,14 +4,14 @@ import ( "net/http" "github.com/gin-gonic/gin" - wg_portal "github.com/h44z/wg-portal" + wgportal "github.com/h44z/wg-portal" ) func SetupRoutes(s *Server) { // Startpage s.server.GET("/", s.GetIndex) s.server.GET("/favicon.ico", func(c *gin.Context) { - file, _ := wg_portal.Statics.ReadFile("assets/img/favicon.ico") + file, _ := wgportal.Statics.ReadFile("assets/img/favicon.ico") c.Data( http.StatusOK, "image/x-icon", diff --git a/internal/server/server.go b/internal/server/server.go index 8bb6f38..6b35a71 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -11,12 +11,15 @@ import ( "net/url" "os" "path/filepath" + "strings" "time" + "gorm.io/gorm" + "github.com/gin-contrib/sessions" "github.com/gin-contrib/sessions/memstore" "github.com/gin-gonic/gin" - wg_portal "github.com/h44z/wg-portal" + wgportal "github.com/h44z/wg-portal" ldapprovider "github.com/h44z/wg-portal/internal/authentication/providers/ldap" passwordprovider "github.com/h44z/wg-portal/internal/authentication/providers/password" "github.com/h44z/wg-portal/internal/common" @@ -32,18 +35,19 @@ const SessionIdentifier = "wgPortalSession" func init() { gob.Register(SessionData{}) gob.Register(FlashData{}) - gob.Register(Peer{}) - gob.Register(Device{}) + gob.Register(wireguard.Peer{}) + gob.Register(wireguard.Device{}) gob.Register(LdapCreateForm{}) gob.Register(users.User{}) } type SessionData struct { - LoggedIn bool - IsAdmin bool - Firstname string - Lastname string - Email string + LoggedIn bool + IsAdmin bool + Firstname string + Lastname string + Email string + DeviceName string SortedBy map[string]string SortDirection map[string]string @@ -69,14 +73,15 @@ type StaticData struct { type Server struct { ctx context.Context - config *common.Config + config *Config server *gin.Engine mailTpl *template.Template auth *AuthManager + db *gorm.DB users *users.Manager wg *wireguard.Manager - peers *PeerManager + peers *wireguard.PeerManager } func (s *Server) Setup(ctx context.Context) error { @@ -90,9 +95,15 @@ func (s *Server) Setup(ctx context.Context) error { // Init rand rand.Seed(time.Now().UnixNano()) - s.config = common.NewConfig() + s.config = NewConfig() s.ctx = ctx + // Setup database connection + s.db, err = common.GetDatabaseForConfig(&s.config.Database) + if err != nil { + return errors.WithMessage(err, "database setup failed") + } + // Setup http server gin.SetMode(gin.DebugMode) gin.DefaultWriter = ioutil.Discard @@ -104,24 +115,33 @@ func (s *Server) Setup(ctx context.Context) error { s.server.SetFuncMap(template.FuncMap{ "formatBytes": common.ByteCountSI, "urlEncode": url.QueryEscape, + "startsWith": strings.HasPrefix, + "userForEmail": func(users []users.User, email string) *users.User { + for i := range users { + if users[i].Email == email { + return &users[i] + } + } + return nil + }, }) // Setup templates - templates := template.Must(template.New("").Funcs(s.server.FuncMap).ParseFS(wg_portal.Templates, "assets/tpl/*.html")) + templates := template.Must(template.New("").Funcs(s.server.FuncMap).ParseFS(wgportal.Templates, "assets/tpl/*.html")) s.server.SetHTMLTemplate(templates) s.server.Use(sessions.Sessions("authsession", memstore.NewStore([]byte("secret")))) // TODO: change key? // Serve static files - s.server.StaticFS("/css", http.FS(fsMust(fs.Sub(wg_portal.Statics, "assets/css")))) - s.server.StaticFS("/js", http.FS(fsMust(fs.Sub(wg_portal.Statics, "assets/js")))) - s.server.StaticFS("/img", http.FS(fsMust(fs.Sub(wg_portal.Statics, "assets/img")))) - s.server.StaticFS("/fonts", http.FS(fsMust(fs.Sub(wg_portal.Statics, "assets/fonts")))) + s.server.StaticFS("/css", http.FS(fsMust(fs.Sub(wgportal.Statics, "assets/css")))) + s.server.StaticFS("/js", http.FS(fsMust(fs.Sub(wgportal.Statics, "assets/js")))) + s.server.StaticFS("/img", http.FS(fsMust(fs.Sub(wgportal.Statics, "assets/img")))) + s.server.StaticFS("/fonts", http.FS(fsMust(fs.Sub(wgportal.Statics, "assets/fonts")))) // Setup all routes SetupRoutes(s) // Setup user database (also needed for database authentication) - s.users, err = users.NewManager(&s.config.Database) + s.users, err = users.NewManager(s.db) if err != nil { return errors.WithMessage(err, "user-manager initialization failed") } @@ -153,18 +173,21 @@ func (s *Server) Setup(ctx context.Context) error { } // Setup peer manager - if s.peers, err = NewPeerManager(s.config, s.wg, s.users); err != nil { + if s.peers, err = wireguard.NewPeerManager(s.db, s.wg); err != nil { return errors.WithMessage(err, "unable to setup peer manager") } - if err = s.peers.InitFromCurrentInterface(); err != nil { - return errors.WithMessage(err, "unable to initialize peer manager") + if err = s.peers.InitFromPhysicalInterface(); err != nil { + return errors.WithMessagef(err, "unable to initialize peer manager") } - if err = s.RestoreWireGuardInterface(); err != nil { - return errors.WithMessage(err, "unable to restore WireGuard state") + + for _, deviceName := range s.wg.Cfg.DeviceNames { + if err = s.RestoreWireGuardInterface(deviceName); err != nil { + return errors.WithMessagef(err, "unable to restore WireGuard state for %s", deviceName) + } } // Setup mail template - s.mailTpl, err = template.New("email.html").ParseFS(wg_portal.Templates, "assets/tpl/email.html") + s.mailTpl, err = template.New("email.html").ParseFS(wgportal.Templates, "assets/tpl/email.html") if err != nil { return errors.Wrap(err, "unable to pare mail template") } @@ -174,6 +197,8 @@ func (s *Server) Setup(ctx context.Context) error { } func (s *Server) Run() { + logrus.Infof("starting web service on %s", s.config.Core.ListeningAddress) + // Start ldap sync if s.config.Core.LdapEnabled { go s.SyncLdapWithUserDatabase() @@ -238,6 +263,7 @@ func GetSessionData(c *gin.Context) SessionData { Email: "", Firstname: "", Lastname: "", + DeviceName: "", IsAdmin: false, LoggedIn: false, } diff --git a/internal/server/server_helper.go b/internal/server/server_helper.go index 41fd7dc..177a4fe 100644 --- a/internal/server/server_helper.go +++ b/internal/server/server_helper.go @@ -4,9 +4,12 @@ import ( "crypto/md5" "fmt" "io/ioutil" + "path" "syscall" "time" + "github.com/h44z/wg-portal/internal/wireguard" + "github.com/h44z/wg-portal/internal/common" "github.com/h44z/wg-portal/internal/users" "github.com/pkg/errors" @@ -15,28 +18,29 @@ import ( "gorm.io/gorm" ) -func (s *Server) PrepareNewPeer() (Peer, error) { - device := s.peers.GetDevice() +// PrepareNewPeer initiates a new peer for the given WireGuard device. +func (s *Server) PrepareNewPeer(device string) (wireguard.Peer, error) { + dev := s.peers.GetDevice(device) - peer := Peer{} + peer := wireguard.Peer{} peer.IsNew = true - peer.AllowedIPsStr = device.AllowedIPsStr - peer.IPs = make([]string, len(device.IPs)) - for i := range device.IPs { - freeIP, err := s.peers.GetAvailableIp(device.IPs[i]) + peer.AllowedIPsStr = dev.AllowedIPsStr + peer.IPs = make([]string, len(dev.IPs)) + for i := range dev.IPs { + freeIP, err := s.peers.GetAvailableIp(device, dev.IPs[i]) if err != nil { - return Peer{}, errors.WithMessage(err, "failed to get available IP addresses") + return wireguard.Peer{}, errors.WithMessage(err, "failed to get available IP addresses") } peer.IPs[i] = freeIP } peer.IPsStr = common.ListToString(peer.IPs) psk, err := wgtypes.GenerateKey() if err != nil { - return Peer{}, errors.Wrap(err, "failed to generate key") + return wireguard.Peer{}, errors.Wrap(err, "failed to generate key") } key, err := wgtypes.GeneratePrivateKey() if err != nil { - return Peer{}, errors.Wrap(err, "failed to generate private key") + return wireguard.Peer{}, errors.Wrap(err, "failed to generate private key") } peer.PresharedKey = psk.String() peer.PrivateKey = key.String() @@ -46,54 +50,39 @@ func (s *Server) PrepareNewPeer() (Peer, error) { return peer, nil } -func (s *Server) CreatePeerByEmail(email, identifierSuffix string, disabled bool) error { +// CreatePeerByEmail creates a new peer for the given email. If no user with the specified email was found, a new one +// will be created. +func (s *Server) CreatePeerByEmail(device, email, identifierSuffix string, disabled bool) error { user, err := s.users.GetOrCreateUser(email) if err != nil { return errors.WithMessagef(err, "failed to load/create related user %s", email) } - device := s.peers.GetDevice() - peer := Peer{} - peer.User = user - peer.AllowedIPsStr = device.AllowedIPsStr - peer.IPs = make([]string, len(device.IPs)) - for i := range device.IPs { - freeIP, err := s.peers.GetAvailableIp(device.IPs[i]) - if err != nil { - return errors.WithMessage(err, "failed to get available IP addresses") - } - peer.IPs[i] = freeIP - } - peer.IPsStr = common.ListToString(peer.IPs) - psk, err := wgtypes.GenerateKey() + peer, err := s.PrepareNewPeer(device) if err != nil { - return errors.Wrap(err, "failed to generate key") + return errors.WithMessage(err, "failed to prepare new peer") } - key, err := wgtypes.GeneratePrivateKey() - if err != nil { - return errors.Wrap(err, "failed to generate private key") - } - peer.PresharedKey = psk.String() - peer.PrivateKey = key.String() - peer.PublicKey = key.PublicKey().String() - peer.UID = fmt.Sprintf("u%x", md5.Sum([]byte(peer.PublicKey))) peer.Email = email peer.Identifier = fmt.Sprintf("%s %s (%s)", user.Firstname, user.Lastname, identifierSuffix) + now := time.Now() if disabled { peer.DeactivatedAt = &now } - return s.CreatePeer(peer) + return s.CreatePeer(device, peer) } -func (s *Server) CreatePeer(peer Peer) error { - device := s.peers.GetDevice() - peer.AllowedIPsStr = device.AllowedIPsStr +// CreatePeer creates the new peer in the database. If the peer has no assigned ip addresses, a new one will be assigned +// automatically. Also, if the private key is empty, a new key-pair will be generated. +// This function also configures the new peer on the physical WireGuard interface if the peer is not deactivated. +func (s *Server) CreatePeer(device string, peer wireguard.Peer) error { + dev := s.peers.GetDevice(device) + peer.AllowedIPsStr = dev.AllowedIPsStr if peer.IPs == nil || len(peer.IPs) == 0 { - peer.IPs = make([]string, len(device.IPs)) - for i := range device.IPs { - freeIP, err := s.peers.GetAvailableIp(device.IPs[i]) + peer.IPs = make([]string, len(dev.IPs)) + for i := range dev.IPs { + freeIP, err := s.peers.GetAvailableIp(device, dev.IPs[i]) if err != nil { return errors.WithMessage(err, "failed to get available IP addresses") } @@ -114,11 +103,12 @@ func (s *Server) CreatePeer(peer Peer) error { peer.PrivateKey = key.String() peer.PublicKey = key.PublicKey().String() } + peer.DeviceName = dev.DeviceName peer.UID = fmt.Sprintf("u%x", md5.Sum([]byte(peer.PublicKey))) // Create WireGuard interface if peer.DeactivatedAt == nil { - if err := s.wg.AddPeer(peer.GetConfig()); err != nil { + if err := s.wg.AddPeer(device, peer.GetConfig()); err != nil { return errors.WithMessage(err, "failed to add WireGuard peer") } } @@ -128,21 +118,22 @@ func (s *Server) CreatePeer(peer Peer) error { return errors.WithMessage(err, "failed to create peer") } - return s.WriteWireGuardConfigFile() + return s.WriteWireGuardConfigFile(device) } -func (s *Server) UpdatePeer(peer Peer, updateTime time.Time) error { +// UpdatePeer updates the physical WireGuard interface and the database. +func (s *Server) UpdatePeer(peer wireguard.Peer, updateTime time.Time) error { currentPeer := s.peers.GetPeerByKey(peer.PublicKey) // Update WireGuard device var err error switch { case peer.DeactivatedAt == &updateTime: - err = s.wg.RemovePeer(peer.PublicKey) + err = s.wg.RemovePeer(peer.DeviceName, peer.PublicKey) case peer.DeactivatedAt == nil && currentPeer.Peer != nil: - err = s.wg.UpdatePeer(peer.GetConfig()) + err = s.wg.UpdatePeer(peer.DeviceName, peer.GetConfig()) case peer.DeactivatedAt == nil && currentPeer.Peer == nil: - err = s.wg.AddPeer(peer.GetConfig()) + err = s.wg.AddPeer(peer.DeviceName, peer.GetConfig()) } if err != nil { return errors.WithMessage(err, "failed to update WireGuard peer") @@ -153,12 +144,13 @@ func (s *Server) UpdatePeer(peer Peer, updateTime time.Time) error { return errors.WithMessage(err, "failed to update peer") } - return s.WriteWireGuardConfigFile() + return s.WriteWireGuardConfigFile(peer.DeviceName) } -func (s *Server) DeletePeer(peer Peer) error { +// DeletePeer removes the peer from the physical WireGuard interface and the database. +func (s *Server) DeletePeer(peer wireguard.Peer) error { // Delete WireGuard peer - if err := s.wg.RemovePeer(peer.PublicKey); err != nil { + if err := s.wg.RemovePeer(peer.DeviceName, peer.PublicKey); err != nil { return errors.WithMessage(err, "failed to remove WireGuard peer") } @@ -167,15 +159,16 @@ func (s *Server) DeletePeer(peer Peer) error { return errors.WithMessage(err, "failed to remove peer") } - return s.WriteWireGuardConfigFile() + return s.WriteWireGuardConfigFile(peer.DeviceName) } -func (s *Server) RestoreWireGuardInterface() error { - activePeers := s.peers.GetActivePeers() +// RestoreWireGuardInterface restores the state of the physical WireGuard interface from the database. +func (s *Server) RestoreWireGuardInterface(device string) error { + activePeers := s.peers.GetActivePeers(device) for i := range activePeers { if activePeers[i].Peer == nil { - if err := s.wg.AddPeer(activePeers[i].GetConfig()); err != nil { + if err := s.wg.AddPeer(device, activePeers[i].GetConfig()); err != nil { return errors.WithMessage(err, "failed to add WireGuard peer") } } @@ -184,26 +177,29 @@ func (s *Server) RestoreWireGuardInterface() error { return nil } -func (s *Server) WriteWireGuardConfigFile() error { - if s.config.WG.WireGuardConfig == "" { +// WriteWireGuardConfigFile writes the configuration file for the physical WireGuard interface. +func (s *Server) WriteWireGuardConfigFile(device string) error { + if s.config.WG.ConfigDirectoryPath == "" { return nil // writing disabled } - if err := syscall.Access(s.config.WG.WireGuardConfig, syscall.O_RDWR); err != nil { + if err := syscall.Access(s.config.WG.ConfigDirectoryPath, syscall.O_RDWR); err != nil { return errors.Wrap(err, "failed to check WireGuard config access rights") } - device := s.peers.GetDevice() - cfg, err := device.GetConfigFile(s.peers.GetActivePeers()) + dev := s.peers.GetDevice(device) + cfg, err := dev.GetConfigFile(s.peers.GetActivePeers(device)) if err != nil { return errors.WithMessage(err, "failed to get config file") } - if err := ioutil.WriteFile(s.config.WG.WireGuardConfig, cfg, 0644); err != nil { + filePath := path.Join(s.config.WG.ConfigDirectoryPath, dev.DeviceName+".conf") + if err := ioutil.WriteFile(filePath, cfg, 0644); err != nil { return errors.Wrap(err, "failed to write WireGuard config file") } return nil } -func (s *Server) CreateUser(user users.User) error { +// CreateUser creates the user in the database and optionally adds a default WireGuard peer for the user. +func (s *Server) CreateUser(user users.User, device string) error { if user.Email == "" { return errors.New("cannot create user with empty email address") } @@ -220,9 +216,11 @@ func (s *Server) CreateUser(user users.User) error { } // Check if user already has a peer setup, if not, create one - return s.CreateUserDefaultPeer(user.Email) + return s.CreateUserDefaultPeer(user.Email, device) } +// UpdateUser updates the user in the database. If the user is marked as deleted, it will get remove from the database. +// Also, if the user is re-enabled, all it's linked WireGuard peers will be activated again. func (s *Server) UpdateUser(user users.User) error { if user.DeletedAt.Valid { return s.DeleteUser(user) @@ -249,6 +247,8 @@ func (s *Server) UpdateUser(user users.User) error { return nil } +// DeleteUser removes the user from the database. +// Also, if the user has linked WireGuard peers, they will be deactivated. func (s *Server) DeleteUser(user users.User) error { currentUser := s.users.GetUserUnscoped(user.Email) @@ -271,7 +271,7 @@ func (s *Server) DeleteUser(user users.User) error { return nil } -func (s *Server) CreateUserDefaultPeer(email string) error { +func (s *Server) CreateUserDefaultPeer(email, device string) error { // Check if user is active, if not, quit var existingUser *users.User if existingUser = s.users.GetUser(email); existingUser == nil { @@ -282,7 +282,7 @@ func (s *Server) CreateUserDefaultPeer(email string) error { if s.config.Core.CreateDefaultPeer { peers := s.peers.GetPeersByMail(email) if len(peers) == 0 { // Create default vpn peer - if err := s.CreatePeer(Peer{ + if err := s.CreatePeer(device, wireguard.Peer{ Identifier: existingUser.Firstname + " " + existingUser.Lastname + " (Default)", Email: existingUser.Email, CreatedBy: existingUser.Email, diff --git a/internal/users/config.go b/internal/users/config.go deleted file mode 100644 index 98e8954..0000000 --- a/internal/users/config.go +++ /dev/null @@ -1,17 +0,0 @@ -package users - -type SupportedDatabase string - -const ( - SupportedDatabaseMySQL SupportedDatabase = "mysql" - SupportedDatabaseSQLite SupportedDatabase = "sqlite" -) - -type Config struct { - Typ SupportedDatabase `yaml:"typ" envconfig:"DATABASE_TYPE"` //mysql or sqlite - Host string `yaml:"host" envconfig:"DATABASE_HOST"` - Port int `yaml:"port" envconfig:"DATABASE_PORT"` - Database string `yaml:"database" envconfig:"DATABASE_NAME"` // On SQLite: the database file-path, otherwise the database name - User string `yaml:"user" envconfig:"DATABASE_USERNAME"` - Password string `yaml:"password" envconfig:"DATABASE_PASSWORD"` -} diff --git a/internal/users/manager.go b/internal/users/manager.go index 1c06154..8cd9fe7 100644 --- a/internal/users/manager.go +++ b/internal/users/manager.go @@ -1,9 +1,6 @@ package users import ( - "fmt" - "os" - "path/filepath" "sort" "strconv" "strings" @@ -11,69 +8,15 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - "gorm.io/driver/mysql" - "gorm.io/driver/sqlite" "gorm.io/gorm" - "gorm.io/gorm/logger" ) -func GetDatabaseForConfig(cfg *Config) (db *gorm.DB, err error) { - switch cfg.Typ { - case SupportedDatabaseSQLite: - if _, err = os.Stat(filepath.Dir(cfg.Database)); os.IsNotExist(err) { - if err = os.MkdirAll(filepath.Dir(cfg.Database), 0700); err != nil { - return - } - } - db, err = gorm.Open(sqlite.Open(cfg.Database), &gorm.Config{}) - if err != nil { - return - } - case SupportedDatabaseMySQL: - connectionString := fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?charset=utf8mb4&parseTime=True&loc=Local", cfg.User, cfg.Password, cfg.Host, cfg.Port, cfg.Database) - db, err = gorm.Open(mysql.Open(connectionString), &gorm.Config{}) - if err != nil { - return - } - - sqlDB, _ := db.DB() - sqlDB.SetConnMaxLifetime(time.Minute * 5) - sqlDB.SetMaxIdleConns(2) - sqlDB.SetMaxOpenConns(10) - err = sqlDB.Ping() // This DOES open a connection if necessary. This makes sure the database is accessible - if err != nil { - return nil, errors.Wrap(err, "failed to ping mysql authentication database") - } - } - - // Enable Logger (logrus) - logCfg := logger.Config{ - SlowThreshold: time.Second, // all slower than one second - Colorful: false, - LogLevel: logger.Silent, // default: log nothing - } - - if logrus.StandardLogger().GetLevel() == logrus.TraceLevel { - logCfg.LogLevel = logger.Info - logCfg.SlowThreshold = 500 * time.Millisecond // all slower than half a second - } - - db.Config.Logger = logger.New(logrus.StandardLogger(), logCfg) - return -} - type Manager struct { db *gorm.DB } -func NewManager(cfg *Config) (*Manager, error) { - m := &Manager{} - - var err error - m.db, err = GetDatabaseForConfig(cfg) - if err != nil { - return nil, errors.Wrapf(err, "failed to setup user database %s", cfg.Database) - } +func NewManager(db *gorm.DB) (*Manager, error) { + m := &Manager{db: db} // check if old user table exists (from version <= 1.0.2), if so rename it to peers. if m.db.Migrator().HasTable("users") && !m.db.Migrator().HasTable("peers") { @@ -84,14 +27,11 @@ func NewManager(cfg *Config) (*Manager, error) { } } - return m, m.MigrateUserDB() -} - -func (m Manager) MigrateUserDB() error { if err := m.db.AutoMigrate(&User{}); err != nil { - return errors.Wrap(err, "failed to migrate user database") + return nil, errors.Wrap(err, "failed to migrate user database") } - return nil + + return m, nil } func (m Manager) GetUsers() []User { diff --git a/internal/wireguard/config.go b/internal/wireguard/config.go index 5b9d4c6..027d928 100644 --- a/internal/wireguard/config.go +++ b/internal/wireguard/config.go @@ -1,7 +1,8 @@ package wireguard type Config struct { - DeviceName string `yaml:"device" envconfig:"WG_DEVICE"` - WireGuardConfig string `yaml:"configFile" envconfig:"WG_CONFIG_FILE"` // optional, if set, updates will be written to this file - ManageIPAddresses bool `yaml:"manageIPAddresses" envconfig:"MANAGE_IPS"` // handle ip-address setup of interface + DeviceNames []string `yaml:"devices" envconfig:"WG_DEVICES"` // managed devices + DefaultDeviceName string `yaml:"devices" envconfig:"WG_DEFAULT_DEVICE"` // this device is used for auto-created peers + ConfigDirectoryPath string `yaml:"configDirectory" envconfig:"WG_CONFIG_PATH"` // optional, if set, updates will be written to this path, filename: .conf + ManageIPAddresses bool `yaml:"manageIPAddresses" envconfig:"MANAGE_IPS"` // handle ip-address setup of interface } diff --git a/internal/wireguard/manager.go b/internal/wireguard/manager.go index f7f2a78..6cd0de5 100644 --- a/internal/wireguard/manager.go +++ b/internal/wireguard/manager.go @@ -9,6 +9,7 @@ import ( "golang.zx2c4.com/wireguard/wgctrl/wgtypes" ) +// Manager offers a synchronized management interface to the real WireGuard interface. type Manager struct { Cfg *Config wg *wgctrl.Client @@ -25,8 +26,8 @@ func (m *Manager) Init() error { return nil } -func (m *Manager) GetDeviceInfo() (*wgtypes.Device, error) { - dev, err := m.wg.Device(m.Cfg.DeviceName) +func (m *Manager) GetDeviceInfo(device string) (*wgtypes.Device, error) { + dev, err := m.wg.Device(device) if err != nil { return nil, errors.Wrap(err, "could not get WireGuard device") } @@ -34,11 +35,11 @@ func (m *Manager) GetDeviceInfo() (*wgtypes.Device, error) { return dev, nil } -func (m *Manager) GetPeerList() ([]wgtypes.Peer, error) { +func (m *Manager) GetPeerList(device string) ([]wgtypes.Peer, error) { m.mux.RLock() defer m.mux.RUnlock() - dev, err := m.wg.Device(m.Cfg.DeviceName) + dev, err := m.wg.Device(device) if err != nil { return nil, errors.Wrap(err, "could not get WireGuard device") } @@ -46,7 +47,7 @@ func (m *Manager) GetPeerList() ([]wgtypes.Peer, error) { return dev.Peers, nil } -func (m *Manager) GetPeer(pubKey string) (*wgtypes.Peer, error) { +func (m *Manager) GetPeer(device string, pubKey string) (*wgtypes.Peer, error) { m.mux.RLock() defer m.mux.RUnlock() @@ -55,7 +56,7 @@ func (m *Manager) GetPeer(pubKey string) (*wgtypes.Peer, error) { return nil, errors.Wrap(err, "invalid public key") } - peers, err := m.GetPeerList() + peers, err := m.GetPeerList(device) if err != nil { return nil, errors.Wrap(err, "could not get WireGuard peers") } @@ -69,11 +70,11 @@ func (m *Manager) GetPeer(pubKey string) (*wgtypes.Peer, error) { return nil, errors.Errorf("could not find WireGuard peer: %s", pubKey) } -func (m *Manager) AddPeer(cfg wgtypes.PeerConfig) error { +func (m *Manager) AddPeer(device string, cfg wgtypes.PeerConfig) error { m.mux.Lock() defer m.mux.Unlock() - err := m.wg.ConfigureDevice(m.Cfg.DeviceName, wgtypes.Config{Peers: []wgtypes.PeerConfig{cfg}}) + err := m.wg.ConfigureDevice(device, wgtypes.Config{Peers: []wgtypes.PeerConfig{cfg}}) if err != nil { return errors.Wrap(err, "could not configure WireGuard device") } @@ -81,12 +82,12 @@ func (m *Manager) AddPeer(cfg wgtypes.PeerConfig) error { return nil } -func (m *Manager) UpdatePeer(cfg wgtypes.PeerConfig) error { +func (m *Manager) UpdatePeer(device string, cfg wgtypes.PeerConfig) error { m.mux.Lock() defer m.mux.Unlock() cfg.UpdateOnly = true - err := m.wg.ConfigureDevice(m.Cfg.DeviceName, wgtypes.Config{Peers: []wgtypes.PeerConfig{cfg}}) + err := m.wg.ConfigureDevice(device, wgtypes.Config{Peers: []wgtypes.PeerConfig{cfg}}) if err != nil { return errors.Wrap(err, "could not configure WireGuard device") } @@ -94,7 +95,7 @@ func (m *Manager) UpdatePeer(cfg wgtypes.PeerConfig) error { return nil } -func (m *Manager) RemovePeer(pubKey string) error { +func (m *Manager) RemovePeer(device string, pubKey string) error { m.mux.Lock() defer m.mux.Unlock() @@ -108,7 +109,7 @@ func (m *Manager) RemovePeer(pubKey string) error { Remove: true, } - err = m.wg.ConfigureDevice(m.Cfg.DeviceName, wgtypes.Config{Peers: []wgtypes.PeerConfig{peer}}) + err = m.wg.ConfigureDevice(device, wgtypes.Config{Peers: []wgtypes.PeerConfig{peer}}) if err != nil { return errors.Wrap(err, "could not configure WireGuard device") } @@ -116,6 +117,6 @@ func (m *Manager) RemovePeer(pubKey string) error { return nil } -func (m *Manager) UpdateDevice(name string, cfg wgtypes.Config) error { - return m.wg.ConfigureDevice(name, cfg) +func (m *Manager) UpdateDevice(device string, cfg wgtypes.Config) error { + return m.wg.ConfigureDevice(device, cfg) } diff --git a/internal/wireguard/net.go b/internal/wireguard/manager_net.go similarity index 80% rename from internal/wireguard/net.go rename to internal/wireguard/manager_net.go index 0b9e68b..76ec646 100644 --- a/internal/wireguard/net.go +++ b/internal/wireguard/manager_net.go @@ -11,10 +11,10 @@ import ( const DefaultMTU = 1420 -func (m *Manager) GetIPAddress() ([]string, error) { - wgInterface, err := tenus.NewLinkFrom(m.Cfg.DeviceName) +func (m *Manager) GetIPAddress(device string) ([]string, error) { + wgInterface, err := tenus.NewLinkFrom(device) if err != nil { - return nil, errors.Wrapf(err, "could not retrieve WireGuard interface %s", m.Cfg.DeviceName) + return nil, errors.Wrapf(err, "could not retrieve WireGuard interface %s", device) } // Get golang net.interface @@ -52,14 +52,14 @@ func (m *Manager) GetIPAddress() ([]string, error) { return ipAddresses, nil } -func (m *Manager) SetIPAddress(cidrs []string) error { - wgInterface, err := tenus.NewLinkFrom(m.Cfg.DeviceName) +func (m *Manager) SetIPAddress(device string, cidrs []string) error { + wgInterface, err := tenus.NewLinkFrom(device) if err != nil { - return errors.Wrapf(err, "could not retrieve WireGuard interface %s", m.Cfg.DeviceName) + return errors.Wrapf(err, "could not retrieve WireGuard interface %s", device) } // First remove existing IP addresses - existingIPs, err := m.GetIPAddress() + existingIPs, err := m.GetIPAddress(device) if err != nil { return errors.Wrap(err, "could not retrieve IP addresses") } @@ -89,10 +89,10 @@ func (m *Manager) SetIPAddress(cidrs []string) error { return nil } -func (m *Manager) GetMTU() (int, error) { - wgInterface, err := tenus.NewLinkFrom(m.Cfg.DeviceName) +func (m *Manager) GetMTU(device string) (int, error) { + wgInterface, err := tenus.NewLinkFrom(device) if err != nil { - return 0, errors.Wrapf(err, "could not retrieve WireGuard interface %s", m.Cfg.DeviceName) + return 0, errors.Wrapf(err, "could not retrieve WireGuard interface %s", device) } // Get golang net.interface @@ -104,10 +104,10 @@ func (m *Manager) GetMTU() (int, error) { return iface.MTU, nil } -func (m *Manager) SetMTU(mtu int) error { - wgInterface, err := tenus.NewLinkFrom(m.Cfg.DeviceName) +func (m *Manager) SetMTU(device string, mtu int) error { + wgInterface, err := tenus.NewLinkFrom(device) if err != nil { - return errors.Wrapf(err, "could not retrieve WireGuard interface %s", m.Cfg.DeviceName) + return errors.Wrapf(err, "could not retrieve WireGuard interface %s", device) } if mtu == 0 { @@ -115,7 +115,7 @@ func (m *Manager) SetMTU(mtu int) error { } if err := wgInterface.SetLinkMTU(mtu); err != nil { - return errors.Wrapf(err, "could not set MTU on interface %s", m.Cfg.DeviceName) + return errors.Wrapf(err, "could not set MTU on interface %s", device) } return nil diff --git a/internal/server/peermanager.go b/internal/wireguard/peermanager.go similarity index 75% rename from internal/server/peermanager.go rename to internal/wireguard/peermanager.go index ad95fd1..099b491 100644 --- a/internal/server/peermanager.go +++ b/internal/wireguard/peermanager.go @@ -1,4 +1,4 @@ -package server +package wireguard import ( "bytes" @@ -15,8 +15,6 @@ import ( "github.com/gin-gonic/gin/binding" "github.com/go-playground/validator/v10" "github.com/h44z/wg-portal/internal/common" - "github.com/h44z/wg-portal/internal/users" - "github.com/h44z/wg-portal/internal/wireguard" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/skip2/go-qrcode" @@ -66,7 +64,6 @@ func init() { type Peer struct { Peer *wgtypes.Peer `gorm:"-"` // WireGuard peer - User *users.User `gorm:"-"` // user reference for the peer Config string `gorm:"-"` UID string `form:"uid" binding:"alphanum"` // uid for html identification @@ -85,6 +82,7 @@ type Peer struct { IPs []string `gorm:"-"` // The IPs of the client PrivateKey string `form:"privkey" binding:"omitempty,base64"` PublicKey string `gorm:"primaryKey" form:"pubkey" binding:"required,base64"` + DeviceName string `gorm:"index"` DeactivatedAt *time.Time CreatedBy string @@ -122,7 +120,7 @@ func (p Peer) GetConfig() wgtypes.PeerConfig { } func (p Peer) GetConfigFile(device Device) ([]byte, error) { - tpl, err := template.New("client").Funcs(template.FuncMap{"StringsJoin": strings.Join}).Parse(wireguard.ClientCfgTpl) + tpl, err := template.New("client").Funcs(template.FuncMap{"StringsJoin": strings.Join}).Parse(ClientCfgTpl) if err != nil { return nil, errors.Wrap(err, "failed to parse client template") } @@ -245,7 +243,7 @@ func (d Device) GetConfig() wgtypes.Config { } func (d Device) GetConfigFile(peers []Peer) ([]byte, error) { - tpl, err := template.New("server").Funcs(template.FuncMap{"StringsJoin": strings.Join}).Parse(wireguard.DeviceCfgTpl) + tpl, err := template.New("server").Funcs(template.FuncMap{"StringsJoin": strings.Join}).Parse(DeviceCfgTpl) if err != nil { return nil, errors.Wrap(err, "failed to parse server template") } @@ -271,63 +269,61 @@ func (d Device) GetConfigFile(peers []Peer) ([]byte, error) { // type PeerManager struct { - db *gorm.DB - wg *wireguard.Manager - users *users.Manager + db *gorm.DB + wg *Manager } -func NewPeerManager(cfg *common.Config, wg *wireguard.Manager, userDB *users.Manager) (*PeerManager, error) { - um := &PeerManager{wg: wg, users: userDB} - var err error - um.db, err = users.GetDatabaseForConfig(&cfg.Database) - if err != nil { - return nil, errors.WithMessage(err, "failed to open peer database") - } +func NewPeerManager(db *gorm.DB, wg *Manager) (*PeerManager, error) { + um := &PeerManager{db: db, wg: wg} - err = um.db.AutoMigrate(&Peer{}, &Device{}) - if err != nil { + if err := um.db.AutoMigrate(&Peer{}, &Device{}); err != nil { return nil, errors.WithMessage(err, "failed to migrate peer database") } return um, nil } -func (u *PeerManager) InitFromCurrentInterface() error { - peers, err := u.wg.GetPeerList() - if err != nil { - return errors.Wrapf(err, "failed to get peer list") - } - device, err := u.wg.GetDeviceInfo() - if err != nil { - return errors.Wrapf(err, "failed to get device info") - } - var ipAddresses []string - var mtu int - if u.wg.Cfg.ManageIPAddresses { - if ipAddresses, err = u.wg.GetIPAddress(); err != nil { - return errors.Wrapf(err, "failed to get ip address") +// InitFromPhysicalInterface read all WireGuard peers from the WireGuard interface configuration. If a peer does not +// exist in the local database, it gets created. +func (m *PeerManager) InitFromPhysicalInterface() error { + for _, deviceName := range m.wg.Cfg.DeviceNames { + peers, err := m.wg.GetPeerList(deviceName) + if err != nil { + return errors.Wrapf(err, "failed to get peer list for device %s", deviceName) } - if mtu, err = u.wg.GetMTU(); err != nil { - return errors.Wrapf(err, "failed to get MTU") + device, err := m.wg.GetDeviceInfo(deviceName) + if err != nil { + return errors.Wrapf(err, "failed to get device info for device %s", deviceName) + } + var ipAddresses []string + var mtu int + if m.wg.Cfg.ManageIPAddresses { + if ipAddresses, err = m.wg.GetIPAddress(deviceName); err != nil { + return errors.Wrapf(err, "failed to get ip address for device %s", deviceName) + } + if mtu, err = m.wg.GetMTU(deviceName); err != nil { + return errors.Wrapf(err, "failed to get MTU for device %s", deviceName) + } } - } - // Check if entries already exist in database, if not create them - for _, peer := range peers { - if err := u.validateOrCreatePeer(peer); err != nil { - return errors.WithMessagef(err, "failed to validate peer %s", peer.PublicKey) + // Check if entries already exist in database, if not create them + for _, peer := range peers { + if err := m.validateOrCreatePeer(deviceName, peer); err != nil { + return errors.WithMessagef(err, "failed to validate peer %s for device %s", peer.PublicKey, deviceName) + } + } + if err := m.validateOrCreateDevice(*device, ipAddresses, mtu); err != nil { + return errors.WithMessagef(err, "failed to validate device %s", device.Name) } - } - if err := u.validateOrCreateDevice(*device, ipAddresses, mtu); err != nil { - return errors.WithMessagef(err, "failed to validate device %s", device.Name) } return nil } -func (u *PeerManager) validateOrCreatePeer(wgPeer wgtypes.Peer) error { +// validateOrCreatePeer checks if the given WireGuard peer already exists in the database, if not, the peer entry will be created +func (m *PeerManager) validateOrCreatePeer(device string, wgPeer wgtypes.Peer) error { peer := Peer{} - u.db.Where("public_key = ?", wgPeer.PublicKey.String()).FirstOrInit(&peer) + m.db.Where("public_key = ?", wgPeer.PublicKey.String()).FirstOrInit(&peer) if peer.PublicKey == "" { // peer not found, create peer.UID = fmt.Sprintf("u%x", md5.Sum([]byte(wgPeer.PublicKey.String()))) @@ -347,8 +343,9 @@ func (u *PeerManager) validateOrCreatePeer(wgPeer wgtypes.Peer) error { } peer.AllowedIPsStr = strings.Join(peer.AllowedIPs, ", ") peer.IPsStr = strings.Join(peer.IPs, ", ") + peer.DeviceName = device - res := u.db.Create(&peer) + res := m.db.Create(&peer) if res.Error != nil { return errors.Wrapf(res.Error, "failed to create autodetected peer %s", peer.PublicKey) } @@ -357,9 +354,10 @@ func (u *PeerManager) validateOrCreatePeer(wgPeer wgtypes.Peer) error { return nil } -func (u *PeerManager) validateOrCreateDevice(dev wgtypes.Device, ipAddresses []string, mtu int) error { +// validateOrCreateDevice checks if the given WireGuard device already exists in the database, if not, the peer entry will be created +func (m *PeerManager) validateOrCreateDevice(dev wgtypes.Device, ipAddresses []string, mtu int) error { device := Device{} - u.db.Where("device_name = ?", dev.Name).FirstOrInit(&device) + m.db.Where("device_name = ?", dev.Name).FirstOrInit(&device) if device.PublicKey == "" { // device not found, create device.PublicKey = dev.PublicKey.String() @@ -369,12 +367,12 @@ func (u *PeerManager) validateOrCreateDevice(dev wgtypes.Device, ipAddresses []s device.Mtu = 0 device.PersistentKeepalive = 16 // Default device.IPsStr = strings.Join(ipAddresses, ", ") - if mtu == wireguard.DefaultMTU { + if mtu == DefaultMTU { mtu = 0 } device.Mtu = mtu - res := u.db.Create(&device) + res := m.db.Create(&device) if res.Error != nil { return errors.Wrapf(res.Error, "failed to create autodetected device") } @@ -383,21 +381,22 @@ func (u *PeerManager) validateOrCreateDevice(dev wgtypes.Device, ipAddresses []s return nil } -func (u *PeerManager) populatePeerData(peer *Peer) { +// populatePeerData enriches the peer struct with WireGuard live data like last handshake, ... +func (m *PeerManager) populatePeerData(peer *Peer) { peer.AllowedIPs = strings.Split(peer.AllowedIPsStr, ", ") peer.IPs = strings.Split(peer.IPsStr, ", ") // Set config file - tmpCfg, _ := peer.GetConfigFile(u.GetDevice()) + tmpCfg, _ := peer.GetConfigFile(m.GetDevice(peer.DeviceName)) peer.Config = string(tmpCfg) // set data from WireGuard interface - peer.Peer, _ = u.wg.GetPeer(peer.PublicKey) + peer.Peer, _ = m.wg.GetPeer(peer.DeviceName, peer.PublicKey) peer.LastHandshake = "never" peer.LastHandshakeTime = "Never connected, or user is disabled." if peer.Peer != nil { since := time.Since(peer.Peer.LastHandshakeTime) sinceSeconds := int(since.Round(time.Second).Seconds()) - sinceMinutes := int(sinceSeconds / 60) + sinceMinutes := sinceSeconds / 60 sinceSeconds -= sinceMinutes * 60 if sinceMinutes > 2*10080 { // 2 weeks @@ -410,49 +409,47 @@ func (u *PeerManager) populatePeerData(peer *Peer) { peer.LastHandshakeTime = peer.Peer.LastHandshakeTime.Format(time.UnixDate) } peer.IsOnline = false - - // set user data - peer.User = u.users.GetUser(peer.Email) } -func (u *PeerManager) populateDeviceData(device *Device) { +// populateDeviceData enriches the device struct with WireGuard live data like interface information +func (m *PeerManager) populateDeviceData(device *Device) { device.AllowedIPs = strings.Split(device.AllowedIPsStr, ", ") device.IPs = strings.Split(device.IPsStr, ", ") device.DNS = strings.Split(device.DNSStr, ", ") // set data from WireGuard interface - device.Interface, _ = u.wg.GetDeviceInfo() + device.Interface, _ = m.wg.GetDeviceInfo(device.DeviceName) } -func (u *PeerManager) GetAllPeers() []Peer { +func (m *PeerManager) GetAllPeers(device string) []Peer { peers := make([]Peer, 0) - u.db.Find(&peers) + m.db.Where("device_name = ?", device).Find(&peers) for i := range peers { - u.populatePeerData(&peers[i]) + m.populatePeerData(&peers[i]) } return peers } -func (u *PeerManager) GetActivePeers() []Peer { +func (m *PeerManager) GetActivePeers(device string) []Peer { peers := make([]Peer, 0) - u.db.Where("deactivated_at IS NULL").Find(&peers) + m.db.Where("device_name = ? AND deactivated_at IS NULL", device).Find(&peers) for i := range peers { - u.populatePeerData(&peers[i]) + m.populatePeerData(&peers[i]) } return peers } -func (u *PeerManager) GetFilteredAndSortedPeers(sortKey, sortDirection, search string) []Peer { +func (m *PeerManager) GetFilteredAndSortedPeers(device, sortKey, sortDirection, search string) []Peer { peers := make([]Peer, 0) - u.db.Find(&peers) + m.db.Where("device_name = ?", device).Find(&peers) filteredPeers := make([]Peer, 0, len(peers)) for i := range peers { - u.populatePeerData(&peers[i]) + m.populatePeerData(&peers[i]) if search == "" || strings.Contains(peers[i].Email, search) || @@ -499,12 +496,12 @@ func (u *PeerManager) GetFilteredAndSortedPeers(sortKey, sortDirection, search s return filteredPeers } -func (u *PeerManager) GetSortedPeersForEmail(sortKey, sortDirection, email string) []Peer { +func (m *PeerManager) GetSortedPeersForEmail(sortKey, sortDirection, email string) []Peer { peers := make([]Peer, 0) - u.db.Where("email = ?", email).Find(&peers) + m.db.Where("email = ?", email).Find(&peers) for i := range peers { - u.populatePeerData(&peers[i]) + m.populatePeerData(&peers[i]) } sort.Slice(peers, func(i, j int) bool { @@ -544,42 +541,42 @@ func (u *PeerManager) GetSortedPeersForEmail(sortKey, sortDirection, email strin return peers } -func (u *PeerManager) GetDevice() Device { - devices := make([]Device, 0, 1) - u.db.Find(&devices) +func (m *PeerManager) GetDevice(device string) Device { + dev := Device{} - for i := range devices { - u.populateDeviceData(&devices[i]) - } + m.db.Where("device_name = ?", device).First(&dev) + m.populateDeviceData(&dev) - return devices[0] // use first device for now... more to come? + return dev } -func (u *PeerManager) GetPeerByKey(publicKey string) Peer { +func (m *PeerManager) GetPeerByKey(publicKey string) Peer { peer := Peer{} - u.db.Where("public_key = ?", publicKey).FirstOrInit(&peer) - u.populatePeerData(&peer) + m.db.Where("public_key = ?", publicKey).FirstOrInit(&peer) + m.populatePeerData(&peer) return peer } -func (u *PeerManager) GetPeersByMail(mail string) []Peer { +func (m *PeerManager) GetPeersByMail(mail string) []Peer { var peers []Peer - u.db.Where("email = ?", mail).Find(&peers) + m.db.Where("email = ?", mail).Find(&peers) for i := range peers { - u.populatePeerData(&peers[i]) + m.populatePeerData(&peers[i]) } return peers } -func (u *PeerManager) CreatePeer(peer Peer) error { +// ---- Database helpers ----- + +func (m *PeerManager) CreatePeer(peer Peer) error { peer.UID = fmt.Sprintf("u%x", md5.Sum([]byte(peer.PublicKey))) peer.UpdatedAt = time.Now() peer.CreatedAt = time.Now() peer.AllowedIPsStr = strings.Join(peer.AllowedIPs, ", ") peer.IPsStr = strings.Join(peer.IPs, ", ") - res := u.db.Create(&peer) + res := m.db.Create(&peer) if res.Error != nil { logrus.Errorf("failed to create peer: %v", res.Error) return errors.Wrap(res.Error, "failed to create peer") @@ -588,12 +585,12 @@ func (u *PeerManager) CreatePeer(peer Peer) error { return nil } -func (u *PeerManager) UpdatePeer(peer Peer) error { +func (m *PeerManager) UpdatePeer(peer Peer) error { peer.UpdatedAt = time.Now() peer.AllowedIPsStr = strings.Join(peer.AllowedIPs, ", ") peer.IPsStr = strings.Join(peer.IPs, ", ") - res := u.db.Save(&peer) + res := m.db.Save(&peer) if res.Error != nil { logrus.Errorf("failed to update peer: %v", res.Error) return errors.Wrap(res.Error, "failed to update peer") @@ -602,8 +599,8 @@ func (u *PeerManager) UpdatePeer(peer Peer) error { return nil } -func (u *PeerManager) DeletePeer(peer Peer) error { - res := u.db.Delete(&peer) +func (m *PeerManager) DeletePeer(peer Peer) error { + res := m.db.Delete(&peer) if res.Error != nil { logrus.Errorf("failed to delete peer: %v", res.Error) return errors.Wrap(res.Error, "failed to delete peer") @@ -612,13 +609,13 @@ func (u *PeerManager) DeletePeer(peer Peer) error { return nil } -func (u *PeerManager) UpdateDevice(device Device) error { +func (m *PeerManager) UpdateDevice(device Device) error { device.UpdatedAt = time.Now() device.AllowedIPsStr = strings.Join(device.AllowedIPs, ", ") device.IPsStr = strings.Join(device.IPs, ", ") device.DNSStr = strings.Join(device.DNS, ", ") - res := u.db.Save(&device) + res := m.db.Save(&device) if res.Error != nil { logrus.Errorf("failed to update device: %v", res.Error) return errors.Wrap(res.Error, "failed to update device") @@ -627,9 +624,11 @@ func (u *PeerManager) UpdateDevice(device Device) error { return nil } -func (u *PeerManager) GetAllReservedIps() ([]string, error) { +// ---- IP helpers ---- + +func (m *PeerManager) GetAllReservedIps(device string) ([]string, error) { reservedIps := make([]string, 0) - peers := u.GetAllPeers() + peers := m.GetAllPeers(device) for _, user := range peers { for _, cidr := range user.IPs { if cidr == "" { @@ -643,8 +642,8 @@ func (u *PeerManager) GetAllReservedIps() ([]string, error) { } } - device := u.GetDevice() - for _, cidr := range device.IPs { + dev := m.GetDevice(device) + for _, cidr := range dev.IPs { if cidr == "" { continue } @@ -659,8 +658,8 @@ func (u *PeerManager) GetAllReservedIps() ([]string, error) { return reservedIps, nil } -func (u *PeerManager) IsIPReserved(cidr string) bool { - reserved, err := u.GetAllReservedIps() +func (m *PeerManager) IsIPReserved(device string, cidr string) bool { + reserved, err := m.GetAllReservedIps(device) if err != nil { return true // in case something failed, assume the ip is reserved } @@ -688,10 +687,10 @@ func (u *PeerManager) IsIPReserved(cidr string) bool { } // GetAvailableIp search for an available ip in cidr against a list of reserved ips -func (u *PeerManager) GetAvailableIp(cidr string) (string, error) { - reserved, err := u.GetAllReservedIps() +func (m *PeerManager) GetAvailableIp(device string, cidr string) (string, error) { + reserved, err := m.GetAllReservedIps(device) if err != nil { - return "", errors.WithMessage(err, "failed to get all reserved IP addresses") + return "", errors.WithMessagef(err, "failed to get all reserved IP addresses for %s", device) } ip, ipnet, err := net.ParseCIDR(cidr) if err != nil {