Browse Source

QUIC-OSSH is disabled by default

Rod Hynes 7 years ago
parent
commit
df3ae0f039
2 changed files with 12 additions and 3 deletions
  1. 4 0
      psiphon/common/protocol/protocol.go
  2. 8 3
      psiphon/common/protocol/serverEntry.go

+ 4 - 0
psiphon/common/protocol/protocol.go

@@ -88,6 +88,10 @@ var SupportedTunnelProtocols = TunnelProtocols{
 	TUNNEL_PROTOCOL_QUIC_OBFUSCATED_SSH,
 }
 
+var DefaultDisabledTunnelProtocols = TunnelProtocols{
+	TUNNEL_PROTOCOL_QUIC_OBFUSCATED_SSH,
+}
+
 var SupportedServerEntrySources = TunnelProtocols{
 	SERVER_ENTRY_SOURCE_EMBEDDED,
 	SERVER_ENTRY_SOURCE_REMOTE,

+ 8 - 3
psiphon/common/protocol/serverEntry.go

@@ -106,9 +106,14 @@ func (serverEntry *ServerEntry) GetSupportedProtocols(
 			continue
 		}
 
-		if len(limitTunnelProtocols) > 0 &&
-			!common.Contains(limitTunnelProtocols, protocol) {
-			continue
+		if len(limitTunnelProtocols) > 0 {
+			if !common.Contains(limitTunnelProtocols, protocol) {
+				continue
+			}
+		} else {
+			if common.Contains(DefaultDisabledTunnelProtocols, protocol) {
+				continue
+			}
 		}
 
 		if len(impairedTunnelProtocols) > 0 &&