Allow TLS cache wrapper user to specify hard-coded session key

aa

psiphon/common/tlsCache.go

@@ -20,8 +20,6 @@
 package common
 
 import (
-	"fmt"
-
 	tls "github.com/Psiphon-Labs/psiphon-tls"
 	utls "github.com/refraction-networking/utls"
 )
@@ -32,7 +30,7 @@ import (
 type TLSClientSessionCacheWrapper struct {
 	tls.ClientSessionCache
 
-	// sessinoKey specifies the value of the hard-coded TLS session cache key.
+	// sessionKey specifies the value of the hard-coded TLS session cache key.
 	sessionKey string
 }
 
@@ -40,12 +38,12 @@ type TLSClientSessionCacheWrapper struct {
 // derived from the ipAddress and dialPortNumber.
 func WrapClientSessionCache(
 	cache tls.ClientSessionCache,
-	ipAddress string,
-	dialPortNumber int) *TLSClientSessionCacheWrapper {
+	hardCodedSessionKey string,
+) *TLSClientSessionCacheWrapper {
 
 	return &TLSClientSessionCacheWrapper{
 		ClientSessionCache: cache,
-		sessionKey:         sessionKey(ipAddress, dialPortNumber),
+		sessionKey:         hardCodedSessionKey,
 	}
 }
 
@@ -81,12 +79,12 @@ type UtlsClientSessionCacheWrapper struct {
 // derived from the ipAddress and dialPortNumber.
 func WrapUtlsClientSessionCache(
 	cache utls.ClientSessionCache,
-	ipAddress string,
-	dialPortNumber int) *UtlsClientSessionCacheWrapper {
+	hardCodedSessionKey string,
+) *UtlsClientSessionCacheWrapper {
 
 	return &UtlsClientSessionCacheWrapper{
 		ClientSessionCache: cache,
-		sessionKey:         sessionKey(ipAddress, dialPortNumber),
+		sessionKey:         hardCodedSessionKey,
 	}
 }
 
@@ -107,7 +105,3 @@ func (c *UtlsClientSessionCacheWrapper) IsSessionResumptionAvailable() bool {
 func (c *UtlsClientSessionCacheWrapper) RemoveCacheEntry() {
 	c.ClientSessionCache.Put(c.sessionKey, nil)
 }
-
-func sessionKey(ipAddress string, dialPortNumber int) string {
-	return fmt.Sprintf("%s:%d", ipAddress, dialPortNumber)
-}

psiphon/dialParameters.go

@@ -690,10 +690,8 @@ func MakeDialParameters(
 		if err != nil {
 			return nil, errors.Trace(err)
 		}
-		dialParams.tlsClientSessionCache = common.WrapUtlsClientSessionCache(
-			tlsClientSessionCache,
-			serverEntry.IpAddress,
-			dialPortNumber)
+		sessionKey := net.JoinHostPort(serverEntry.IpAddress, strconv.Itoa(dialPortNumber))
+		dialParams.tlsClientSessionCache = common.WrapUtlsClientSessionCache(tlsClientSessionCache, sessionKey)
 
 		if !isReplay {
 			// Remove the cache entry to make a fresh dial when !isReplay.
@@ -833,10 +831,10 @@ func MakeDialParameters(
 		if err != nil {
 			return nil, errors.Trace(err)
 		}
+		sessionKey := net.JoinHostPort(serverEntry.IpAddress, strconv.Itoa(dialPortNumber))
 		dialParams.QUICTLSClientSessionCache = common.WrapClientSessionCache(
 			quicTLSClientSessionCache,
-			serverEntry.IpAddress,
-			dialPortNumber)
+			sessionKey)
 
 		if !isReplay {
 			// Remove the cache entry to make a fresh dial when !isReplay.