Use authorized key parsing instead of reading binary certificates (#3113

) Signed-off-by: florian-feicht <florian.feicht@adesso-afida.com>
argoproj · May 20, 2024 · 70ae784 · 70ae784
1 parent 0cc54eb
commit 70ae784
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 8 deletions.
diff --git a/api/event-source.html b/api/event-source.html
diff --git a/api/event-source.md b/api/event-source.md
diff --git a/api/jsonschema/schema.json b/api/jsonschema/schema.json
@@ -2711,7 +2711,7 @@
         },
         "sshKeySecret": {
           "$ref": "#/definitions/io.k8s.api.core.v1.SecretKeySelector",
-          "description": "SSHKeySecret refers to the secret that contains SSH key"
+          "description": "SSHKeySecret refers to the secret that contains SSH key. Key needs to contain private key and public key."
         },
         "username": {
           "$ref": "#/definitions/io.k8s.api.core.v1.SecretKeySelector",

diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
diff --git a/eventsources/sources/sftp/start.go b/eventsources/sources/sftp/start.go
@@ -95,7 +95,7 @@ func (el *EventListener) StartListening(ctx context.Context, dispatch func([]byt
 		if err != nil {
 			return fmt.Errorf("failed to parse private ssh key. err: %+v", err)
 		}
-		publicKey, err := ssh.ParsePublicKey(sshKey)
+		publicKey, _, _, _, err := ssh.ParseAuthorizedKey(sshKey)
 		if err != nil {
 			return fmt.Errorf("failed to parse public ssh key. err: %+v", err)
 		}

diff --git a/pkg/apis/eventsource/v1alpha1/generated.proto b/pkg/apis/eventsource/v1alpha1/generated.proto
diff --git a/pkg/apis/eventsource/v1alpha1/openapi_generated.go b/pkg/apis/eventsource/v1alpha1/openapi_generated.go
diff --git a/pkg/apis/eventsource/v1alpha1/types.go b/pkg/apis/eventsource/v1alpha1/types.go
@@ -303,7 +303,7 @@ type SFTPEventSource struct {
 	Username *corev1.SecretKeySelector `json:"username,omitempty" protobuf:"bytes,3,opt,name=username"`
 	// Password required for authentication if any.
 	Password *corev1.SecretKeySelector `json:"password,omitempty" protobuf:"bytes,4,opt,name=password"`
-	// SSHKeySecret refers to the secret that contains SSH key
+	// SSHKeySecret refers to the secret that contains SSH key. Key needs to contain private key and public key.
 	SSHKeySecret *corev1.SecretKeySelector `json:"sshKeySecret,omitempty" protobuf:"bytes,5,opt,name=sshKeySecret"`
 	// Address sftp address.
 	Address *corev1.SecretKeySelector `json:"address,omitempty" protobuf:"bytes,6,opt,name=address"`