Support for dial non-TLS connection

wabarc · Feb 21, 2024 · 479789b · 479789b
1 parent d0f20ad
commit 479789b
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 1 deletion.
diff --git a/config/config_test.go b/config/config_test.go
@@ -1630,6 +1630,52 @@ func TestIRC(t *testing.T) {
 			tt.call(t, opts, tt.want)
 		})
 	}
+
+	testsBool := []struct {
+		name string
+		envs map[string]bool
+		call func(*testing.T, *Options, bool)
+		want bool
+	}{
+		{
+			name: "default irc secure",
+			envs: map[string]bool{
+				"WAYBACK_IRC_SECURE": true,
+			},
+			call: func(t *testing.T, opts *Options, want bool) {
+				called := opts.IRCSecure()
+				if called != want {
+					t.Errorf(`Unexpected get the irc secure, got %v instead of %v`, called, want)
+				}
+			},
+			want: defIRCSecure,
+		},
+		{
+			name: "specified irc secure",
+			envs: map[string]bool{
+				"WAYBACK_IRC_SECURE": false,
+			},
+			call: func(t *testing.T, opts *Options, want bool) {
+				called := opts.IRCSecure()
+				if called != want {
+					t.Errorf(`Unexpected get the irc secure, got %v instead of %v`, called, want)
+				}
+			},
+			want: false,
+		},
+	}
+	for _, tt := range testsBool {
+		t.Run(tt.name, func(t *testing.T) {
+			for key, val := range tt.envs {
+				t.Setenv(key, strconv.FormatBool(val))
+			}
+			opts, err := NewParser().ParseEnvironmentVariables()
+			if err != nil {
+				t.Fatalf(`Parsing environment variables failed: %v`, err)
+			}
+			tt.call(t, opts, tt.want)
+		})
+	}
 }
 
 func TestMatrix(t *testing.T) {

diff --git a/config/options.go b/config/options.go
@@ -65,6 +65,7 @@ const (
 	defIRCPassword = ""
 	defIRCChannel  = ""
 	defIRCServer   = "irc.libera.chat:6697"
+	defIRCSecure   = true
 
 	defXMPPUsername = ""
 	defXMPPPassword = ""
@@ -229,6 +230,7 @@ type irc struct {
 	password string
 	channel  string
 	server   string
+	secure   bool
 }
 
 type onion struct {
@@ -337,6 +339,7 @@ func NewOptions() *Options {
 			password: defIRCPassword,
 			channel:  defIRCChannel,
 			server:   defIRCServer,
+			secure:   defIRCSecure,
 		},
 		onion: &onion{
 			localPort:   defOnionLocalPort,
@@ -629,6 +632,11 @@ func (o *Options) IRCServer() string {
 	return o.irc.server
 }
 
+// IRCSecure returns whether use TLS for IRC connection.
+func (o *Options) IRCSecure() bool {
+	return o.irc.secure
+}
+
 // PublishToIRCChannel returns whether publish results to IRC channel.
 func (o *Options) PublishToIRCChannel() bool {
 	return o.irc.nick != "" && o.irc.channel != ""

diff --git a/config/parser.go b/config/parser.go
@@ -159,6 +159,8 @@ func (p *Parser) parseLines(lines []string) (err error) {
 			p.opts.irc.channel = parseString(val, defIRCChannel)
 		case "WAYBACK_IRC_SERVER":
 			p.opts.irc.server = parseString(val, defIRCServer)
+		case "WAYBACK_IRC_SECURE":
+			p.opts.irc.secure = parseBool(val, defIRCSecure)
 		case "WAYBACK_MATRIX_HOMESERVER":
 			p.opts.matrix.homeserver = parseString(val, defMatrixHomeserver)
 		case "WAYBACK_MATRIX_USERID":

diff --git a/service/relaychat/relaychat.go b/service/relaychat/relaychat.go
@@ -122,7 +122,9 @@ func (i *IRC) Serve() error {
 	if err != nil {
 		return errors.Wrap(err, "failed to establish connection")
 	}
-	conn = tls.Client(conn, &tls.Config{MinVersion: tls.VersionTLS12, ServerName: srv.Hostname()})
+	if i.opts.IRCSecure() {
+		conn = tls.Client(conn, &tls.Config{MinVersion: tls.VersionTLS12, ServerName: srv.Hostname()})
+	}
 	i.conn = irc.NewClient(conn, config)
 	logger.Info("Serving IRC server: %s, nick: %s", i.opts.IRCServer(), i.conn.CurrentNick())