fix(portforward): different validation when vpn is up or not

This commit is contained in:
Quentin McGaw
2023-10-07 12:43:36 +00:00
parent ee413f59a2
commit ec1f252528
3 changed files with 25 additions and 13 deletions

View File

@@ -34,17 +34,28 @@ func (s *Settings) OverrideWith(update Settings) {
}
var (
ErrServerNameNotSet = errors.New("server name not set")
ErrFilepathNotSet = errors.New("file path not set")
ErrInterfaceNotSet = errors.New("interface not set")
ErrPortForwarderNotSet = errors.New("port forwarder not set")
ErrServerNameNotSet = errors.New("server name not set")
ErrFilepathNotSet = errors.New("file path not set")
ErrInterfaceNotSet = errors.New("interface not set")
)
func (s *Settings) Validate() (err error) {
switch {
// Port forwarder can be nil when the loop updates
// to stop the service.
case s.Filepath == "":
func (s *Settings) Validate(forStartup bool) (err error) {
// Minimal validation
if s.Filepath == "" {
return fmt.Errorf("%w", ErrFilepathNotSet)
}
if !forStartup {
// No additional validation needed if the service
// is not to be started with the given settings.
return nil
}
// Startup validation requires additional fields set.
switch {
case s.PortForwarder == nil:
return fmt.Errorf("%w", ErrPortForwarderNotSet)
case s.Interface == "":
return fmt.Errorf("%w", ErrInterfaceNotSet)
case s.PortForwarder.Name() == providers.PrivateInternetAccess && s.ServerName == "":