passepartoutvpn
/
tunnelkit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'overlapping-soft-reset'

This commit is contained in:
Davide De Rosa 2019-07-09 12:47:12 +02:00
parent 1dcf4d7745 2c56a8ea95
commit 5ea185fd75
3 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TunnelKit/Sources/Protocols/OpenVPN/CoreConfiguration+OpenVPN.swift
View File

@ -57,8 +57,6 @@ extension CoreConfiguration {
static let retransmissionLimit = 0.1
static let softResetDelay = 5.0
static let softNegotiationTimeout = 120.0
// MARK: Authentication

39
TunnelKit/Sources/Protocols/OpenVPN/OpenVPNSession.swift
View File

@ -116,6 +116,8 @@ public class OpenVPNSession: Session {
private var currentKeyIdx: UInt8?
private var isRenegotiating: Bool
private var negotiationKey: OpenVPN.SessionKey {
guard let key = keys[negotiationKeyIdx] else {
fatalError("Keys are empty or index \(negotiationKeyIdx) not found in \(keys.keys)")
@ -196,6 +198,7 @@ public class OpenVPNSession: Session {
keys = [:]
oldKeys = []
negotiationKeyIdx = 0
isRenegotiating = false
lastPing = BidirectionalState(withResetValue: Date.distantPast)
isStopping = false
@ -324,6 +327,7 @@ public class OpenVPNSession: Session {
oldKeys.removeAll()
negotiationKeyIdx = 0
currentKeyIdx = nil
isRenegotiating = false
nextPushRequestDate = nil
connectedDate = nil
@ -479,11 +483,20 @@ public class OpenVPNSession: Session {
// deferStop(.shutdown, e)
// return
}
if (code == .hardResetServerV2) && (negotiationKey.controlState == .connected) {
deferStop(.shutdown, OpenVPNError.staleSession)
return
} else if (code == .softResetV1) && !negotiationKey.softReset {
softReset(isServerInitiated: true)
switch code {
case .hardResetServerV2:
guard negotiationKey.state == .hardReset else {
deferStop(.shutdown, OpenVPNError.staleSession)
return
}
case .softResetV1:
if !isRenegotiating {
softReset(isServerInitiated: true)
}
default:
break
}
sendAck(for: controlPacket)
@ -571,7 +584,7 @@ public class OpenVPNSession: Session {
continuatedPushReplyMessage = nil
pushReply = nil
negotiationKeyIdx = 0
let newKey = OpenVPN.SessionKey(id: UInt8(negotiationKeyIdx))
let newKey = OpenVPN.SessionKey(id: UInt8(negotiationKeyIdx), timeout: CoreConfiguration.OpenVPN.negotiationTimeout)
keys[negotiationKeyIdx] = newKey
log.debug("Negotiation key index is \(negotiationKeyIdx)")
@ -605,6 +618,10 @@ public class OpenVPNSession: Session {
// Ruby: soft_reset
private func softReset(isServerInitiated: Bool) {
guard !isRenegotiating else {
log.warning("Renegotiation already in progress")
return
}
if isServerInitiated {
log.debug("Handle soft reset")
} else {
@ -613,12 +630,12 @@ public class OpenVPNSession: Session {
resetControlChannel(forNewSession: false)
negotiationKeyIdx = max(1, (negotiationKeyIdx + 1) % OpenVPN.ProtocolMacros.numberOfKeys)
let newKey = OpenVPN.SessionKey(id: UInt8(negotiationKeyIdx))
let newKey = OpenVPN.SessionKey(id: UInt8(negotiationKeyIdx), timeout: CoreConfiguration.OpenVPN.softNegotiationTimeout)
keys[negotiationKeyIdx] = newKey
log.debug("Negotiation key index is \(negotiationKeyIdx)")
negotiationKey.state = .softReset
negotiationKey.softReset = true
isRenegotiating = true
loopNegotiation()
if !isServerInitiated {
enqueueControlPackets(code: .softResetV1, key: UInt8(negotiationKeyIdx), payload: Data())
@ -685,8 +702,9 @@ public class OpenVPNSession: Session {
log.debug("TLS.ifconfig: Send pulled ciphertext (\(cipherTextOut.count) bytes)")
enqueueControlPackets(code: .controlV1, key: negotiationKey.id, payload: cipherTextOut)
if negotiationKey.softReset {
if isRenegotiating {
completeConnection()
isRenegotiating = false
}
nextPushRequestDate = Date().addingTimeInterval(CoreConfiguration.OpenVPN.pushRequestInterval)
}
@ -853,8 +871,9 @@ public class OpenVPNSession: Session {
}
negotiationKey.controlState = .preIfConfig
nextPushRequestDate = Date().addingTimeInterval(negotiationKey.softReset ? CoreConfiguration.OpenVPN.softResetDelay : CoreConfiguration.OpenVPN.retransmissionLimit)
nextPushRequestDate = Date()
pushRequest()
nextPushRequestDate?.addTimeInterval(isRenegotiating ? CoreConfiguration.OpenVPN.pushRequestInterval : CoreConfiguration.OpenVPN.retransmissionLimit)
}
for message in auth.parseMessages() {

10
TunnelKit/Sources/Protocols/OpenVPN/SessionKey.swift
View File

@ -53,6 +53,8 @@ extension OpenVPN {
let id: UInt8 // 3-bit
let timeout: TimeInterval
let startTime: Date
var state = State.invalid
@ -70,16 +72,14 @@ extension OpenVPN {
var dataPath: DataPath?
var softReset: Bool
private var isTLSConnected: Bool
init(id: UInt8) {
init(id: UInt8, timeout: TimeInterval) {
self.id = id
self.timeout = timeout
startTime = Date()
state = .invalid
softReset = false
isTLSConnected = false
}
@ -90,8 +90,6 @@ extension OpenVPN {
// Ruby: Key.negotiate_timeout
func didNegotiationTimeOut(link: LinkInterface) -> Bool {
let timeout = (softReset ? CoreConfiguration.OpenVPN.softNegotiationTimeout : CoreConfiguration.OpenVPN.negotiationTimeout)
return ((controlState != .connected) && (-startTime.timeIntervalSinceNow > timeout))
}