Add PLAIN sasl

PeerDB-io · Mar 12, 2024 · 0bf6a12 · 0bf6a12
1 parent e0f1cd5
commit 0bf6a12
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/flow/connectors/kafka/kafka.go b/flow/connectors/kafka/kafka.go
@@ -10,6 +10,7 @@ import (
 	"sync"
 
 	"github.com/twmb/franz-go/pkg/kgo"
+	"github.com/twmb/franz-go/pkg/sasl/plain"
 	"github.com/twmb/franz-go/pkg/sasl/scram"
 	"github.com/twmb/franz-go/plugin/kslog"
 	"github.com/yuin/gopher-lua"
@@ -44,11 +45,15 @@ func NewKafkaConnector(
 		optionalOpts = append(optionalOpts, kgo.DialTLSConfig(&tls.Config{MinVersion: tls.VersionTLS13}))
 	}
 	if config.Username != "" {
-		auth := scram.Auth{User: config.Username, Pass: config.Password}
 		switch config.Sasl {
+		case "PLAIN":
+			auth := plain.Auth{User: config.Username, Pass: config.Password}
+			optionalOpts = append(optionalOpts, kgo.SASL(auth.AsMechanism()))
 		case "SCRAM-SHA-256":
+			auth := scram.Auth{User: config.Username, Pass: config.Password}
 			optionalOpts = append(optionalOpts, kgo.SASL(auth.AsSha256Mechanism()))
 		case "SCRAM-SHA-512":
+			auth := scram.Auth{User: config.Username, Pass: config.Password}
 			optionalOpts = append(optionalOpts, kgo.SASL(auth.AsSha512Mechanism()))
 		default:
 			return nil, fmt.Errorf("unsupported SASL mechanism: %s", config.Sasl)

diff --git a/ui/app/peers/create/[peerType]/helpers/ka.ts b/ui/app/peers/create/[peerType]/helpers/ka.ts
@@ -42,6 +42,6 @@ export const blankKaSetting: KafkaConfig = {
   servers: [],
   username: '',
   password: '',
-  sasl: 'SCRAM-SHA-512',
+  sasl: 'PLAIN',
   disableTls: false,
 };
diff --git a/ui/app/peers/create/[peerType]/schema.ts b/ui/app/peers/create/[peerType]/schema.ts
@@ -290,9 +290,9 @@ export const kaSchema = z.object({
     .string({ required_error: 'Password is required' })
     .min(1, { message: 'Password cannot be empty' }),
   sasl: z
-    .union([z.literal('SCRAM-SHA-256'), z.literal('SCRAM-SHA-512')], {
+    .union([z.literal('PLAIN'), z.literal('SCRAM-SHA-256'), z.literal('SCRAM-SHA-512')], {
       errorMap: () => ({
-        message: 'Either SCRAM-SHA-256 or SCRAM-SHA-512 is required.',
+        message: 'One of PLAIN, SCRAM-SHA-256, or SCRAM-SHA-512 is required.',
       }),
     })
     .optional(),

diff --git a/ui/components/PeerForms/KafkaConfig.tsx b/ui/components/PeerForms/KafkaConfig.tsx
@@ -14,6 +14,7 @@ interface KafkaProps {
 }
 
 const saslOptions = [
+  { value: 'PLAIN', label: 'PLAIN' },
   { value: 'SCRAM-SHA-256', label: 'SCRAM-SHA-256' },
   { value: 'SCRAM-SHA-512', label: 'SCRAM-SHA-512' },
 ];