Cherry picks

client/fsm.go

@@ -115,6 +115,7 @@ func newFSM(
 			Transitions: []FSMTransition{
 				{To: StateMain, Description: "Authorized"},
 				{To: StateDisconnected, Description: "Cancel, was disconnected"},
+				{To: StateGotConfig, Description: "Cancel, was got config"},
 			},
 		},
 		StateGettingConfig: FSMState{
@@ -140,6 +141,7 @@ func newFSM(
 			Transitions: []FSMTransition{
 				{To: StateGettingConfig, Description: "Get a VPN config again"},
 				{To: StateConnecting, Description: "VPN is connecting"},
+				{To: StateOAuthStarted, Description: "Renew"},
 			},
 		},
 		StateConnecting: FSMState{

internal/api/api.go

@@ -301,6 +301,9 @@ func (a *API) Connect(ctx context.Context, prof profiles.Profile, protos []proto
 
 	// Parse expiry
 	expH := h.Get("expires")
+	if expH == "" {
+		return nil, errors.New("the server did not give an expires header")
+	}
 	expT, err := http.ParseTime(expH)
 	if err != nil {
 		return nil, fmt.Errorf("failed parsing expiry time: %w", err)

internal/failover/monitor.go

@@ -2,7 +2,6 @@ package failover
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"time"
 
@@ -43,8 +42,8 @@ func (m *DroppedConMon) dropped(startBytes int64) (bool, error) {
 // This does not check Rx bytes every tick, but rather when pAlive or pDropped is reached
 // It returns an error if there was an invalid input or a ping was failed to be sent
 func (m *DroppedConMon) Start(ctx context.Context, gateway string, mtuSize int) (bool, error) {
-	if mtuSize <= 0 {
-		return false, errors.New("invalid mtu size given")
+	if mtuSize < mtuOverhead {
+		return false, fmt.Errorf("invalid MTU size given, MTU has to be at least: %v bytes", mtuOverhead)
 	}
 
 	// Create a ping struct with our mtu size