Merge pull request #246 from rod-hynes/master

Validate protocol names in config.TunnelProtocolPorts

psiphon/server/config.go

@@ -244,6 +244,9 @@ func LoadConfig(configJSON []byte) (*Config, error) {
 	}
 
 	for tunnelProtocol, _ := range config.TunnelProtocolPorts {
+		if !common.Contains(common.SupportedTunnelProtocols, tunnelProtocol) {
+			return nil, fmt.Errorf("Unsupported tunnel protocol: %s", tunnelProtocol)
+		}
 		if common.TunnelProtocolUsesSSH(tunnelProtocol) ||
 			common.TunnelProtocolUsesObfuscatedSSH(tunnelProtocol) {
 			if config.SSHPrivateKey == "" || config.SSHServerVersion == "" ||